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