update master branch to 2.5 version