merge from CM