Merge "Rework CDS chart"