CON-814: Changes after code review