CON-1447: Changes after code review