Added support for CC
Fix conflicts and linting
Merge branch 'bsorin-Support-CC'