diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages.properties b/org.hl7.fhir.utilities/src/main/resources/Messages.properties
index 4c4e156d9..a0cc31f31 100644
--- a/org.hl7.fhir.utilities/src/main/resources/Messages.properties
+++ b/org.hl7.fhir.utilities/src/main/resources/Messages.properties
@@ -642,7 +642,7 @@ SECURITY_STRING_CONTENT_ERROR = The string value contains text that looks like e
SECURITY_STRING_CONTENT_WARNING = The string value contains text that looks like embedded HTML tags. If this content is rendered to HTML without appropriate post-processing, it may be a security risk
SLICING_CANNOT_BE_EVALUATED = Slicing cannot be evaluated: {0}
SM_DEPENDENT_PARAM_MODE_MISMATCH = The parameter {0} refers to the variable {1} but it''s mode is {2} which is not the same as the mode required for the group {3}
-SM_DEPENDENT_PARAM_NOT_FOUND = The {1} parameter ''{0}'' was not found
+SM_DEPENDENT_PARAM_NOT_FOUND = The {1} parameter ''{0}'' was not found. Known variables: {2}
SM_DEPENDENT_PARAM_TYPE_MISMATCH = The parameter ''{0}'' refers to the variable ''{1}'' but it''s type is ''{2}'' which is not compatible with the type required for the group ''{3}'', which is ''{4}'' (from map ''{5}'')
SM_DEPENDENT_PARAM_TYPE_MISMATCH_DUPLICATE = The group {0} has already been used with different parameters, so the type checking may be incorrect (other = [{1}]; this = [{2}])
SM_GROUP_INPUT_DUPLICATE = The name {0} is already used
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/SpecialExtensions.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/SpecialExtensions.java
index 81cd30b72..630913d64 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/SpecialExtensions.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/SpecialExtensions.java
@@ -23,8 +23,8 @@ public class SpecialExtensions {
"http://hl7.org/fhir/StructureDefinition/elementdefinition-type-must-support",
"http://hl7.org/fhir/StructureDefinition/instance-name",
"http://hl7.org/fhir/StructureDefinition/instance-description",
- "http://hl7.org/fhir/build/StructureDefinition/definition", // wrongly defined in used in early R4B/R5 builds - changed to http://hl7.org/build/fhir/StructureDefinition/binding-definition
- "http://hl7.org/fhir/build/StructureDefinition/binding-definition", // wrongly defined in used in early R4B/R5 builds - changed to http://hl7.org/build/fhir/StructureDefinition/binding-definition
+ "http://hl7.org/fhir/build/StructureDefinition/definition", // wrongly defined in used in R4B/R5 builds - changed to http://hl7.org/fhir/tools/StructureDefinition/binding-definition
+ "http://hl7.org/fhir/build/StructureDefinition/binding-definition", // wrongly defined in used in R4B/R5 builds - http://hl7.org/fhir/tools/StructureDefinition/binding-definition
"http://hl7.org/fhir/StructureDefinition/codesystem-properties-mode",
"http://hl7.org/fhir/StructureDefinition/structuredefinition-rdf-type",
"http://hl7.org/fhir/StructureDefinition/structuredefinition-conformance-derivedFrom", // this is defined in R5, but needed earlier
diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/validationService/http___covidcare.au_app_alert.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/validationService/http___covidcare.au_app_alert.cache
new file mode 100644
index 000000000..895f9ab4e
--- /dev/null
+++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/validationService/http___covidcare.au_app_alert.cache
@@ -0,0 +1,47 @@
+-------------------------------------------------------------------------------------
+{"code" : {
+ "system" : "http://covidcare.au/app/alert",
+ "code" : "trendNegative",
+ "display" : "CovidCare: Vital signs trend negative alert: re-check recommended"
+}, "valueSet" :null, "langs":"en", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+ "resourceType" : "Parameters",
+ "parameter" : [{
+ "name" : "profile-url",
+ "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+ },
+ {
+ "name" : "system-version",
+ "valueCanonical" : "http://snomed.info/sct|http://snomed.info/sct/900000000000207008"
+ }]
+}}####
+v: {
+ "code" : "trendNegative",
+ "system" : "http://covidcare.au/app/alert",
+ "severity" : "error",
+ "error" : "A definition for CodeSystem 'http://covidcare.au/app/alert' could not be found, so the code cannot be validated",
+ "class" : "CODESYSTEM_UNSUPPORTED",
+ "server" : "http://tx-dev.fhir.org/r4",
+ "unknown-systems" : "http://covidcare.au/app/alert",
+ "issues" : {
+ "resourceType" : "OperationOutcome",
+ "issue" : [{
+ "extension" : [{
+ "url" : "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-server",
+ "valueUrl" : "http://tx-dev.fhir.org/r4"
+ }],
+ "severity" : "error",
+ "code" : "not-found",
+ "details" : {
+ "coding" : [{
+ "system" : "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type",
+ "code" : "not-found"
+ }],
+ "text" : "A definition for CodeSystem 'http://covidcare.au/app/alert' could not be found, so the code cannot be validated"
+ },
+ "location" : ["Coding.system"],
+ "expression" : ["Coding.system"]
+ }]
+}
+
+}
+-------------------------------------------------------------------------------------
diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/validationService/version.ctl b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/validationService/version.ctl
new file mode 100644
index 000000000..bf0d87ab1
--- /dev/null
+++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/validationService/version.ctl
@@ -0,0 +1 @@
+4
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e3fa0de1b..632e1337a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
1.26.0
32.0.1-jre
6.4.1
- 1.5.24
+ 1.5.25-SNAPSHOT
2.17.0
5.9.2
1.8.2