Synched with last 2.4.x commit
Prepare for 2.4.0-build-3 release
Prepare for development of 2.4.0-build-SNAPSHOT