CON-1385 CR fixes