Merge branch '7.0' into 8.0