Merge "fix check for provider resolution" into oc-dev