Merge "Change strings in resolver switch" into udc-dev