[Code Cleanup]
Merge branch '6.7.1' into stable