CON-1016: Changes after designer review