Merge branch 'release/0.3.1' into develop