Syncing up the Release 1.0 branch