CON-1016: Changes after code review