CON-420: Changes after code review