Backport Everything 1.0-1.0.1