Backport of gh-24357
Backport of gh-24357