v0.51.6.4
38d91ab3 · Manual backport of #50779 to 51 (#50790) ·