Included in 2.6.1-rc2-bk2