Backport of gh-10602
Backport of gh-10602