- optimized database-connection generation
Merge origin/master