Backport of gh-26838
Backport of gh-26838