Merge "Revert^2 "Use ConcurrentHashMap to make private maps thread safe"" into main