Backport of gh-26010
Backport of gh-26010