1.0/dev-BUG09 Fix: DB_DATABASE name
Merge branch '1.0/dev'