Merge branch 'jc/rename-degrade-cc-to-c' into maint