Merge gone wrong...
DB upgrade is not performed if DB_VERSION is updated