DDF-725 - updating master to 2.5.0-SNAPSHOT