Backport of gh-26183
Backport of gh-26183