Backport of gh-36151
Backport of gh-36151