Backport of gh-26182
Backport of gh-26182