Merge "Fixed database not closed after use"