Merge 0.8.0-candidate-csd branch to master-csd