Merge 2.4-dev into master