Merge 3.2.