Backport of gh-26167
Backport of gh-26167