Merge branch 'release/1.0.0' into dev
Merge branch 'dev'