Merge Carbon Manifest changes