[Bug] CC should be external
Merge branch 'master' into develop