Merge branch 'release-1.0.0-beta.2' into develop