Merge remote-tracking branch 'upstream/stable/cm-11.0' into stable/cm-11.0