Resync master

cherry-picked the changes made during the release process