Merge with the latest master in preparation for merging into master. Rebake to resolve conflicts in generated files.