fix merge from cm-11