Backport of gh-35908
Backport of gh-35908