Merge 3.2.1rc1 release changes to default.