merge cm-11 branch