Merge release candidate 3.2.1