VE-742 More changes for code review