Merge "Change version in pom.xml to 2.4-SNAPSHOT"