upstream CM changes