Merge upstream CM changes