post 2.6.4-rc1