Version 1.0.7
Merge branch 'release/v1.0.7' into develop