Merge from cm