Backport of gh-36502
Backport of gh-36502