Merge in cm source...