Merge "Fix `DataManagerTest` in the main branch" into main