[Core/DB] Merge