Included in 2.6.5-rc1-bk1