Backport of gh-26658
Backport of gh-26658