Fix #16654 and partially fix #16583 #17592
+36
−6
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.