6.4-rc checkpoint