CON-1887 partial CR fixes