Merge cm Changes