Merge branch 'hotfix/v2.0.4'
fix dropdb
Merge branch 'hotfix/v2.0.5' into develop