Backport of gh-36801
Backport of gh-36801