Merge branch 'release/v0.1.6' into develop