Included in 2.6.5-bk1