Merge "Use the new compat_configs property"