merge CM changes