Merge branch 'release/0.3.2.1'