Merge tag '1.0.7' into develop

version 1.0.7
Merge branch 'release/1.0.8'
a