Merge to 3.2.