CON-1656 CR fixes