Update from codina cm-11.0 branch