Fixing dev branch issues
Merge branch 'release/1.0.7'