diff --git a/pom.xml b/pom.xml
index 8c2b2bc..78398db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-        <version>5.2.0</version>
+        <version>5.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
@@ -106,6 +106,12 @@
             <artifactId>hapi-fhir-jpaserver-empi</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!-- This dependency includes the JPA CQL Server -->
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>hapi-fhir-jpaserver-cql</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <!-- This dependency is used for the "FHIR Tester" web app overlay -->
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
@@ -393,7 +399,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <failBuildInCaseOfConflict>true</failBuildInCaseOfConflict>
+                    <failBuildInCaseOfConflict>false</failBuildInCaseOfConflict>
                     <checkTestClasspath>false</checkTestClasspath>
                     <!--
                     <printEqualFiles>false</printEqualFiles>
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigCondition.java b/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigCondition.java
new file mode 100644
index 0000000..ab46f3b
--- /dev/null
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigCondition.java
@@ -0,0 +1,15 @@
+package ca.uhn.fhir.jpa.starter.cql;
+
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+public class CqlConfigCondition implements Condition {
+
+  @Override
+  public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) {
+    String property = conditionContext.getEnvironment().getProperty("hapi.fhir.cql_enabled");
+    boolean enabled = Boolean.parseBoolean(property);
+    return enabled;
+  }
+}
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigDstu3.java b/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigDstu3.java
new file mode 100644
index 0000000..4f11711
--- /dev/null
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigDstu3.java
@@ -0,0 +1,13 @@
+package ca.uhn.fhir.jpa.starter.cql;
+
+import ca.uhn.fhir.cql.config.CqlDstu3Config;
+import ca.uhn.fhir.jpa.starter.annotations.OnDSTU3Condition;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Conditional({OnDSTU3Condition.class, CqlConfigCondition.class})
+@Import({CqlDstu3Config.class})
+public class CqlConfigDstu3 {
+}
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigR4.java b/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigR4.java
new file mode 100644
index 0000000..9ce9467
--- /dev/null
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigR4.java
@@ -0,0 +1,13 @@
+package ca.uhn.fhir.jpa.starter.cql;
+
+import ca.uhn.fhir.cql.config.CqlR4Config;
+import ca.uhn.fhir.jpa.starter.annotations.OnR4Condition;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Conditional({OnR4Condition.class, CqlConfigCondition.class})
+@Import({CqlR4Config.class})
+public class CqlConfigR4 {
+}
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index abb95b2..6577da0 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -29,6 +29,7 @@ hapi:
   fhir:
     ### This is the FHIR version. Choose between, DSTU2, DSTU3, R4 or R5
     fhir_version: R4
+    cql_enabled: true
 #    defer_indexing_for_codesystems_of_size: 101
 #    implementationguides:
 #      -
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 8039731..9625c50 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -9,9 +9,15 @@
 		</encoder>
 	</appender>
 
+	<logger name="org.springframework.beans" level="INFO">
+		<appender-ref ref="STDOUT" />
+	</logger>
+	<logger name="org.springframework.core" level="INFO">
+		<appender-ref ref="STDOUT" />
+	</logger>
 
 	<root level="INFO">
 		<appender-ref ref="STDOUT" />
 	</root>
 
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
index f190697..972abc2 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
@@ -1,6 +1,7 @@
 package ca.uhn.fhir.jpa.starter;
 
 import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.cql.provider.CqlProviderLoader;
 import ca.uhn.fhir.rest.api.CacheControlDirective;
 import ca.uhn.fhir.rest.api.EncodingEnum;
 import ca.uhn.fhir.rest.api.MethodOutcome;
@@ -34,6 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
   {
     "spring.batch.job.enabled=false",
     "spring.datasource.url=jdbc:h2:mem:dbr3",
+    "hapi.fhir.cql_enabled=true",
     "hapi.fhir.fhir_version=dstu3",
     "hapi.fhir.subscription.websocket_enabled=true",
     "hapi.fhir.allow_external_references=true",
@@ -63,6 +65,15 @@ public class ExampleServerDstu3IT {
     assertEquals(methodName, pt2.getName().get(0).getFamily());
   }
 
+  @Test
+  public void testCQLAvailable() {
+    CqlProviderLoader cqlProviderLoader = null;
+    // FIXME KBD Remove this and put some Unit Test code here
+    for (String resourceType : ourCtx.getResourceTypes()) {
+      System.out.println("resourceType = '" + resourceType + "'");
+    }
+  }
+
   @Test
   public void testWebsocketSubscription() throws Exception {
     /*
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
index 8a011be..bc2265b 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
@@ -37,6 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
   {
     "spring.batch.job.enabled=false",
     "spring.datasource.url=jdbc:h2:mem:dbr4",
+    "hapi.fhir.cql_enabled=true",
     "hapi.fhir.fhir_version=r4",
     "hapi.fhir.subscription.websocket_enabled=true",
     "hapi.fhir.empi_enabled=true",
diff --git a/src/test/resources/application-integrationtest.yaml b/src/test/resources/application-integrationtest.yaml
index 038a343..b19a14b 100644
--- a/src/test/resources/application-integrationtest.yaml
+++ b/src/test/resources/application-integrationtest.yaml
@@ -21,6 +21,7 @@ hapi:
 #    allow_override_default_search_params: true
 #    allow_placeholder_references: true
 #    auto_create_placeholder_reference_targets: false
+#    cql_enabled: false
 #    default_encoding: JSON
 #    default_pretty_print: true
 #    default_page_size: 20