Merge branch 'release/1.0.7'
Merge tag '1.0.7' into develop

1.0.7