CON-2306: Changes after code review