Upstream CM changes