Merging in the cmc project.