Merge "Change Location Resolver DS to Configuration"