Made a few updates.

Ready to commit.  Note we are theoretically feature frozen for 9.12.