Delete C* from devel branch
Merge branch 'devel'
Delete C*