Bringing CSD changes to master/0.3

Needed for Shark 0.8.0