update master branch to 7