Merge from CM