Merge "[CLI] change comment style"