Squashed 'ccut/' changes from c835fe0..3252d3a

3252d3a fix string assertions
2a5e4f3 enable cpp

git-subtree-dir: ccut
git-subtree-split: 3252d3ac2d6762981b3acf2c13126330441ec656
Merge commit '5f7bf524c12f54440d2ce708588a238d613b93aa'