Backport of gh-36217
Backport of gh-36217