Merge 2.4 source