Merge 3.5.