Backport of #48609
Backport of #48609