1.0.7 test
Merge branch 'release/1.0.7'