Merge branch 'release/3.2.1'