2.4 version updates.
Merge branch 'master' into release
Updated to version 2.4.