CON-1284 CR fixes