Partial sync with cm-11.0 branch