CON-1251 CR fixes