[Code Cleanup]
Merge branch '6.7.8' into 6.8