Synched with WFK 2.4.0.Final 840b7f9
Prepare for 2.4.0.Final release
Prepare for development of 2.4.0-build-SNAPSHOT