CDB-1858 fixed specs now failing due to merge with named maps
Merge remote-tracking branch 'origin/CDB-1858'