Merge "New function signature for setResolverConfiguration"