diff --git a/pom.xml b/pom.xml
index bc2f2a2..73a4ce0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-		  <version>5.6.0-PRE5_NIH</version>
+	<version>5.6.0-PRE7_NIH-SNAPSHOT</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
index 98113b2..aa14015 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
@@ -23,6 +23,7 @@ public class AppProperties {
 
   private Boolean cql_enabled = false;
   private Boolean mdm_enabled = false;
+  private boolean advanced_lucene_indexing = false;
   private Boolean allow_cascading_deletes = false;
   private Boolean allow_contains_searches = true;
   private Boolean allow_external_references = false;
@@ -206,7 +207,15 @@ public class AppProperties {
     this.client_id_strategy = client_id_strategy;
   }
 
-  public Boolean getAllow_cascading_deletes() {
+	public boolean getAdvanced_lucene_indexing() {
+		return this.advanced_lucene_indexing;
+	}
+
+	public void setAdvanced_lucene_indexing(boolean theAdvanced_lucene_indexing) {
+		advanced_lucene_indexing = theAdvanced_lucene_indexing;
+	}
+
+	public Boolean getAllow_cascading_deletes() {
     return allow_cascading_deletes;
   }
 
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
index 74d46bc..63f675f 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
@@ -120,6 +120,7 @@ public class FhirServerConfigCommon {
     }
 
     retVal.setFilterParameterEnabled(appProperties.getFilter_search_enabled());
+	 retVal.setAdvancedLuceneIndexing(appProperties.getAdvanced_lucene_indexing());
 
     return retVal;
   }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 8861c3e..e775be2 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -71,6 +71,8 @@ hapi:
 #    enable_repository_validating_interceptor: false
 #    enable_index_missing_fields: false
 #    enable_index_contained_resource: false
+#    advanced_lucene_indexing: false
+    advanced_lucene_indexing: true
 #    enforce_referential_integrity_on_delete: false
 #    enforce_referential_integrity_on_write: false
 #    etag_support_enabled: true