Backport of gh-36318
Backport of gh-36318