CON-1598 CR fixes