[CCCv2] Sync with version of CDF