Backport of gh-35840
Backport of gh-35840