changes after CC and spc API changes
Merge branch 'master' of github.com:luca-penasa/vombat into debug
a pair of changes
merge from master