Backport of gh-26459
Backport of gh-26459