Merge branch 'release/0.7.0' into develop
Add back forgotten import.
0.7.1
Merge branch 'release/0.7.1'