Pass config name to database extensions.
Fix conflicts and merge.