Merge branch 'prerelease-3.2.1'