Backport changes to Release 1.0.0