Backport of fix-70