Merge "[OOF] change comment style"