CHANGED: database, comment table.
Merge remote-tracking branch 'origin/liang'