Backport of #3315