release-v1.0
Merge branch 'release-v1.0' into development