Do nothing to database on upgrade instead of dropping all
Merge branch 'dev'