merge#database-fixes