merging 2.4-latest into master