Merge branch 'release-1.0.X' into develop