Merge branch 'release/1.0' into develop
fix tag
Merge branch 'release/1.0'