Merge CM stuff