Update to branch kk_2.7_rb1.16