Merge branch 'release/1.0.0' into develop
micro fixes
Merge branch 'release/1.0.1'