Merge cm updates