Cspp eng cspp

Jira CIDEVMI-1391