Merge branch 'hotfix/1.0.7' into develop
Merge branch 'master' into develop