Merge remote-tracking branch 'Alberto96/cm-11.0' into cm-11.0