prepare 0.7
Merge branch 'dev' into 0.8
closed 1516
closed #1519
closed #1522
closed #1522