Backport of gh-26202
Backport of gh-26202