patches applied to 2.6.4 beta 4