* Merge upstream updates into cc_interface