tag 1.0.7
Merge branch 'hotfix/1.0.7'