CHEF-3404: Provider Resolver