merging diffs for 9.12
one more thingie.
9.12.0 prep work.