Merge "Blacklist support for ExtraConfig"