* A few bugfixes and cleanup
Merge branch 'HotFix/0.16.2' into develop