CON-999: Changes after code review