- minor bug fixes
Merge branch 'release/0.6' into develop

- minor bug fixes