Merge branch `7.0` into master