Cherry Picks for Hotfix

This branch has a bunch of cherry-picked bugfix patches for the proposed upcoming hotfix release.

Note that this is a PR for the stable branch.