Backport of gh-26019
Backport of gh-26019