Merge branch '7.0'