Merge branch 'v7.0' tag v7.0.1