Backport of #5525
Backport of #5525