Merge 2.7 heads.