Merge 3.6.