Backport of gh-26828
Backport of gh-26828