Brining CSD changes to master/0.3