Backport of gh-35883
Backport of gh-35883