CON-1598 add changes after design review