Merge "Don't compare FQDN with providerFriendlyName"