Merge "[VID] change comment style"