a few more over to jb-4.2.2_r1