Backport of gh-35897
Backport of gh-35897