Backport of gh-36298
Backport of gh-36298