Backport of gh-35892
Backport of gh-35892