Backport of gh-26558
Backport of gh-26558