CMS Core merge