Merge "[DCAEMOD] change comment style"