Merge "[CDS] Chart cleanup from TLS/AAF options"