Backport of 1.0.0.0