Fixing merge issue on LocalDataManager.