CON-1445 CR fixes