Merge "[POMBA] change comment style"