Manual merge with "database" branch