Backport of gh-26155
Backport of gh-26155