Backport of gh-36158
Backport of gh-36158