CON-1887 CR fixes