Update 2.0.x release branch for 2.0.2

This PR cherry-picks the changes from #1269, #1270, #1278, #1279, and #1281 to update the release/2.0.x branch ready for a 2.0.2 release.