Merge "Revert "Revert "Blacklist support for ExtraConfig"""