Merge "Switch to ConcurrentHashMap for CompatConfig" into sc-v2-dev