CON-1445 changes after design review