client/server changes needed for hardware -> cloud AIMS migration.
DO NOT merge/release before migration.