improvements to CCM, ssn6
Merge branch 'ccm'