移植了部分Model
Merge remote-tracking branch 'origin/beta' into beta