Backport of #489
Backport of #489