CM: Upstream updates