CMS data updates

Merging CMS data updates from @pherterich and @katilp.