Merge "[SO] change comment style"