Singlethreaded - Bugfixes
Merge branch 'release/0.7.0'