Minor upstream updates

From codina cm-11.0 branch