feb14 merge moved to cm-11.0 branch