CON-1813 CR fixes