Merge branch 'jc/cc-stat'