#1519630 make CMS buildable