CON-1790 CR fixes