cm upstream updates