diff --git a/.gitignore b/.gitignore
index 3e472f2f6..5b889a468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ htmlReport/
 .flattened-pom.xml
 .factorypath
 .DS_Store
+.cursorignore
 
 pom.xml.versionsBackup
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1b0009db0..8c346e25e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -84,6 +84,7 @@
         "testng",
         "unsignedint",
         "Unvalidated",
+        "unversioned",
         "uscore",
         "VALUESET",
         "valuesets",
diff --git a/cqf-fhir-api/pom.xml b/cqf-fhir-api/pom.xml
index 6dc433c9e..1f4fc5200 100644
--- a/cqf-fhir-api/pom.xml
+++ b/cqf-fhir-api/pom.xml
@@ -5,14 +5,14 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-api</artifactId>
-  <version>3.13.0-SNAPSHOT</version>
+  <version>3.13.0</version>
   <name>FHIR Clinical Reasoning (APIs)</name>
   <description>FHIR Repository APIs used by this project. Implement these to incorporate clinical reasoning on your platform</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
   </parent>
 
   <dependencies>
diff --git a/cqf-fhir-benchmark/pom.xml b/cqf-fhir-benchmark/pom.xml
index a546bbd71..b0a9ab412 100644
--- a/cqf-fhir-benchmark/pom.xml
+++ b/cqf-fhir-benchmark/pom.xml
@@ -5,26 +5,26 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir-benchmark</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
     <name>FHIR Clinical Reasoning (Benchmarks)</name>
     <description>Tests validating performance of FHIR Clinical Reasoning operations</description>
 
     <parent>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir</artifactId>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
-            <version>3.13.0-SNAPSHOT</version>
+            <version>3.13.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-test</artifactId>
-            <version>3.13.0-SNAPSHOT</version>
+            <version>3.13.0</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -34,14 +34,14 @@
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
-            <version>3.13.0-SNAPSHOT</version>
+            <version>3.13.0</version>
             <!--TODO: test-jars don't seem to work very well. Need to investigate some alternatives -->
             <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-jackson</artifactId>
-            <version>3.13.0-SNAPSHOT</version>
+            <version>3.13.0</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>
diff --git a/cqf-fhir-bom/pom.xml b/cqf-fhir-bom/pom.xml
index 25e4e3e61..9b107a5e5 100644
--- a/cqf-fhir-bom/pom.xml
+++ b/cqf-fhir-bom/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-bom</artifactId>
-  <version>3.13.0-SNAPSHOT</version>
+  <version>3.13.0</version>
   <packaging>pom</packaging>
   <name>FHIR Clinical Reasoning (Bill Of Materials)</name>
   <description>This bom can be used to simplify dependency management when using this project</description>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
   </parent>
 
   <dependencyManagement>
@@ -21,44 +21,44 @@
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-api</artifactId>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-test</artifactId>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-utility</artifactId>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-cql</artifactId>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-jackson</artifactId>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-jaxb</artifactId>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-cr</artifactId>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
       </dependency>
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-cr-cli</artifactId>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/cqf-fhir-cql/pom.xml b/cqf-fhir-cql/pom.xml
index 661a7f995..2988b1415 100644
--- a/cqf-fhir-cql/pom.xml
+++ b/cqf-fhir-cql/pom.xml
@@ -5,26 +5,26 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-cql</artifactId>
-  <version>3.13.0-SNAPSHOT</version>
+  <version>3.13.0</version>
   <name>FHIR Clinical Reasoning (CQL)</name>
   <description>Tools, utilities, code gen to support CQL in FHIR Clinical Reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-api</artifactId>
-      <version>3.13.0-SNAPSHOT</version>
+      <version>3.13.0</version>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-utility</artifactId>
-      <version>3.13.0-SNAPSHOT</version>
+      <version>3.13.0</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
@@ -62,13 +62,13 @@
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-test</artifactId>
-      <version>3.13.0-SNAPSHOT</version>
+      <version>3.13.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-jackson</artifactId>
-      <version>3.13.0-SNAPSHOT</version>
+      <version>3.13.0</version>
       <type>pom</type>
       <scope>test</scope>
     </dependency>
diff --git a/cqf-fhir-cr-cli/pom.xml b/cqf-fhir-cr-cli/pom.xml
index 8a272223f..647213356 100644
--- a/cqf-fhir-cr-cli/pom.xml
+++ b/cqf-fhir-cr-cli/pom.xml
@@ -6,36 +6,36 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir-cr-cli</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
     <name>FHIR Clinical Reasoning (CLI)</name>
     <description>CLI for running FHIR Clincial Reasoning operations</description>
 
     <parent>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir</artifactId>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-api</artifactId>
-            <version>3.13.0-SNAPSHOT</version>
+            <version>3.13.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-utility</artifactId>
-            <version>3.13.0-SNAPSHOT</version>
+            <version>3.13.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cql</artifactId>
-            <version>3.13.0-SNAPSHOT</version>
+            <version>3.13.0</version>
         </dependency>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-jackson</artifactId>
-            <version>3.13.0-SNAPSHOT</version>
+            <version>3.13.0</version>
             <type>pom</type>
         </dependency>
         <dependency>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-test</artifactId>
-            <version>3.13.0-SNAPSHOT</version>
+            <version>3.13.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/cqf-fhir-cr-spring/pom.xml b/cqf-fhir-cr-spring/pom.xml
index 852a141db..04720133f 100644
--- a/cqf-fhir-cr-spring/pom.xml
+++ b/cqf-fhir-cr-spring/pom.xml
@@ -7,21 +7,21 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir-cr-spring</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
     <name>FHIR Clinical Reasoning (Spring)</name>
     <description>Spring configurations for FHIR Clinical Reasoning</description>
 
     <parent>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir</artifactId>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
-            <version>3.13.0-SNAPSHOT</version>
+            <version>3.13.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/cqf-fhir-cr/pom.xml b/cqf-fhir-cr/pom.xml
index 287d040b4..ad8155b9e 100644
--- a/cqf-fhir-cr/pom.xml
+++ b/cqf-fhir-cr/pom.xml
@@ -5,45 +5,45 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-cr</artifactId>
-  <version>3.13.0-SNAPSHOT</version>
+  <version>3.13.0</version>
   <name>FHIR Clinical Reasoning (Operations)</name>
   <description>Implementations of clinical reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-api</artifactId>
-      <version>3.13.0-SNAPSHOT</version>
+      <version>3.13.0</version>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-cql</artifactId>
-      <version>3.13.0-SNAPSHOT</version>
+      <version>3.13.0</version>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-utility</artifactId>
-      <version>3.13.0-SNAPSHOT</version>
+      <version>3.13.0</version>
     </dependency>
 
     <!-- test dependencies-->
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-jackson</artifactId>
-      <version>3.13.0-SNAPSHOT</version>
+      <version>3.13.0</version>
       <type>pom</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-test</artifactId>
-      <version>3.13.0-SNAPSHOT</version>
+      <version>3.13.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/cqf-fhir-jackson/pom.xml b/cqf-fhir-jackson/pom.xml
index c1fe58b7b..bd9744827 100644
--- a/cqf-fhir-jackson/pom.xml
+++ b/cqf-fhir-jackson/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-jackson</artifactId>
-  <version>3.13.0-SNAPSHOT</version>
+  <version>3.13.0</version>
   <packaging>pom</packaging>
   <name>FHIR Clinical Reasoning (Jackson)</name>
   <description>Aggregator module for Jackson dependencies</description>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
   </parent>
 
   <dependencies>
diff --git a/cqf-fhir-jaxb/pom.xml b/cqf-fhir-jaxb/pom.xml
index 599e73d60..c892172b1 100644
--- a/cqf-fhir-jaxb/pom.xml
+++ b/cqf-fhir-jaxb/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-jaxb</artifactId>
-  <version>3.13.0-SNAPSHOT</version>
+  <version>3.13.0</version>
   <packaging>pom</packaging>
   <name>FHIR Clinical Reasoning (JAXB)</name>
   <description>Aggregator module for JAXB dependencies</description>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
   </parent>
 
   <dependencies>
diff --git a/cqf-fhir-test/pom.xml b/cqf-fhir-test/pom.xml
index c714299a5..c56dc314d 100644
--- a/cqf-fhir-test/pom.xml
+++ b/cqf-fhir-test/pom.xml
@@ -5,21 +5,21 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-test</artifactId>
-  <version>3.13.0-SNAPSHOT</version>
+  <version>3.13.0</version>
   <name>FHIR Clinical Reasoning (Test Utilities)</name>
   <description>Utilities to support unit testing clinical reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-api</artifactId>
-      <version>3.13.0-SNAPSHOT</version>
+      <version>3.13.0</version>
     </dependency>
     <dependency>
         <groupId>ca.uhn.hapi.fhir</groupId>
diff --git a/cqf-fhir-utility/pom.xml b/cqf-fhir-utility/pom.xml
index 39ae073fe..0ae702c0c 100644
--- a/cqf-fhir-utility/pom.xml
+++ b/cqf-fhir-utility/pom.xml
@@ -5,21 +5,21 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>cqf-fhir-utility</artifactId>
-  <version>3.13.0-SNAPSHOT</version>
+  <version>3.13.0</version>
   <name>FHIR Clinical Reasoning (Utilities)</name>
   <description>Utilities to help develop clinical reasoning operations</description>
 
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.opencds.cqf.fhir</groupId>
       <artifactId>cqf-fhir-api</artifactId>
-      <version>3.13.0-SNAPSHOT</version>
+      <version>3.13.0</version>
     </dependency>
     <dependency>
       <groupId>info.cqframework</groupId>
@@ -89,7 +89,7 @@
       <dependency>
         <groupId>org.opencds.cqf.fhir</groupId>
         <artifactId>cqf-fhir-test</artifactId>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/docs/pom.xml b/docs/pom.xml
index 6a991adff..dab9546eb 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.opencds.cqf.fhir</groupId>
   <artifactId>docs</artifactId>
-  <version>3.13.0-SNAPSHOT</version>
+  <version>3.13.0</version>
 
   <name>FHIR Clinical Reasoning (Documentation)</name>
   <description>Documentation website for FHIR Clinical Reasoning</description>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
   </parent>
 
   <dependencyManagement>
@@ -23,7 +23,7 @@
         <artifactId>cqf-fhir-bom</artifactId>
         <type>pom</type>
         <scope>import</scope>
-        <version>3.13.0-SNAPSHOT</version>
+        <version>3.13.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 4e943d7e8..aa84b72d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.opencds.cqf.fhir</groupId>
     <artifactId>cqf-fhir</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>3.13.0</version>
     <packaging>pom</packaging>
     <name>FHIR Clinical Reasoning</name>
     <description>FHIR Clinical Reasoning Implementations</description>
@@ -20,10 +20,10 @@
 
         <junit.version>5.9.1</junit.version>
         <slf4j.version>2.0.4</slf4j.version>
-        <cql.version>3.16.0</cql.version>
+        <cql.version>3.17.0</cql.version>
         <jmh.version>1.36</jmh.version>
         <spring.version>5.3.39</spring.version>
-        <hapi.version>7.4.2</hapi.version>
+        <hapi.version>7.4.3</hapi.version>
         <picocli.version>4.6.1</picocli.version>
         <guava.version>32.1.2-jre</guava.version>
         <error-prone.version>2.24.1</error-prone.version>