minor CHANGES edits

Merged Evan Hunt requested to merge cleanup-changes-v9_12 into v9_12

Merge request reports