[Code Cleanup]
Merge branch '6.8' into stable