Merge remote-tracking branch 'caf/kk_2.7_rb1.24' into cm-11.0