Merge branch '7.8'