Backport of gh-35853
Backport of gh-35853