Merge "[CDS] change comment style"