VE-742 More changes from CR