2.4.0.0

Merge 2.4.0.0 changes from Dev branch.