Merge "[VFC] change comment style"