Backport of gh-26134
Backport of gh-26134