[backport] Several small fixes for 12.x #735
+17
−8
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.