[release-1.23] Backport fixes/bumps from master #5951
+116
−95
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.