Merge branch 'release/1.0' into develop
Release 2.0
Merge branch 'release/2.0'