ValueEnvironment changes
merged merge conflicts