CON-1435 CR fixes