Merge branch 'release/0.1.6' into develop
Fix issues with shared data
Merge branch 'release/0.1.7'