Merge branch 'release/1.0.1' into develop
converting to thor-scmversion
Merge branch 'develop'