Backport of gh-10898
Backport of gh-10898