Close the database correctly
Merge branch 'develop'