Merge remote-tracking branch 'cm11/cm-11.0' into kk-4.4