Merge 2.4 patch.