Merge branch '7.8' into master