merge nhan's brand #8

Closed syhcmus closed 2 years ago