Merge "Update mini-resolver string to match requirements" into udc-dev