diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/ValueSetProcessBase.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/ValueSetProcessBase.java
index e72e0b484..6e4c7532e 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/ValueSetProcessBase.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/ValueSetProcessBase.java
@@ -182,6 +182,7 @@ public class ValueSetProcessBase {
     // this is a testing hack - see TerminologyServiceTests
     iss.get(0).setUserData("status-msg-name", "warning-"+id);
     iss.get(0).setUserData("status-msg-value", new UriType(resource.getVersionedUrl()));
+    ToolingExtensions.setStringExtension(iss.get(0), ToolingExtensions.EXT_ISSUE_MSG_ID, msg);
     
     return iss;
   }
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java
index 69aa3548c..827710f3b 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java
@@ -736,6 +736,10 @@ public class BaseValidator implements IValidationContextResourceLoader {
     if (issue.getExtensionString(ToolingExtensions.EXT_ISSUE_SERVER) != null) {
       vmsg.setServer(issue.getExtensionString(ToolingExtensions.EXT_ISSUE_SERVER).replace("local.fhir.org", "tx-dev.fhir.org"));
     }
+    if (issue.getExtensionString(ToolingExtensions.EXT_ISSUE_MSG_ID) != null) {
+      vmsg.setMessageId(issue.getExtensionString(ToolingExtensions.EXT_ISSUE_MSG_ID));
+    }
+    
     errors.add(vmsg);
     return vmsg;
   }