[Code Cleanup]
6.5-release checkpoint