Merge "Maven release version 2.4.0 for E release"