Merge "Fixed ServiceNameBaseResolver" into udc-dev