upgrade master to 2.5.0-SNAPSHOT