3.0 version upgrade master branch