Update from CAF caf/kk_2.7_r1