upgraded to 2.5.2-SNAPSHOT (change to 2.5.0 for using the latest release)