CON-751: Changes after code review