Merge remote-tracking branch 'ca/kk_2.7_rb1.13' into kk-4.4