Adds account_tpye
Rollback analytics change
Fix specs
Fixes specs
Merge CDB-1604 into release/2.13.0