Backport of #36141
Backport of #36141