Do not send account_type prefixed with import_
Merge remote-tracking branch 'origin/feature/CDB-615' into release/2.3.0+