Merge branch 'release/v0.1.5' into develop