Merge "Use a RwLock for DB_PATH"