Merge branch '7.0' into 8.0 until 7318cd0