Merge pull request #3502 from dev-ggallon/Database

Database Driver Clean and Fix