Backport of gh-26199
Backport of gh-26199