fix db migration
Merge origin/master