Backport changes to 1.0.0 [Needs Review]