Backport of gh-35829
Backport of gh-35829