Merge "[PORTAL] change comment style"