Merge to master.

Generating a comprehensive PR of changes, may not merge most of these.