Merge cm-11.0 branch