Merge "[MSB] change comment style"