Update to kk_3.5_rb1.21