diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml
index 004f4840d..05b5a683e 100644
--- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml
+++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml
@@ -196,6 +196,12 @@
          can perform merges in the background using separate threads.
          The SerialMergeScheduler (Lucene 2.2 default) does not.
      -->
+     
+    <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+        <int name="maxMergedSegmentMB">${merge.policy.maxMergedSegmentMB:5120}</int>
+        <int name="maxMergeAtOnce">${merge.policy.maxMergeAtOnce:10}</int>
+        <int name="segmentsPerTier">${merge.policy.segmentsPerTier:10}</int>
+    </mergePolicy>
     
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler">
         <int name="maxMergeCount">${merger.maxMergeCount:6}</int>
diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties
index 9b2a7584a..fe9484a66 100644
--- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties
+++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrcore.properties
@@ -194,10 +194,10 @@ alfresco.metadata.ignore.datatype.1=app:configurations
 alfresco.metadata.skipDescendantDocsForSpecificAspects=false
 #alfresco.metadata.ignore.aspect.0=
 
-# If you are experimenting OOM errors, probably your Paths information is too large to be 
+# If you are experimenting OOM errors, probably your Paths information is too large to be
  # recovered for node batches. You can change this property to "false" in order to get
  # paths information only for single nodes. Be aware that when using "false", memory requirements
- # are lower but also indexing performance is slower.  
+ # are lower but also indexing performance is slower.
  alfresco.metadata.getPathsInNodeBatches=true
 
 # Date/Datetime fields only: if this property is set to true (default value) each date/datetime field
@@ -230,14 +230,34 @@ solr.request.content.compress=false
 #
 # When checking repo and index consistency, first transaction is compared in both Repository and Index repositories.
 # In order to get that initial transaction from database, 0-2000 range for txnId should be enough, but this parameter
-# can be used when initial transaction Id is greater than 2000. 
+# can be used when initial transaction Id is greater than 2000.
 #
 solr.initial.transaction.range=0-2000
 
+#
+# Merge Policy tuning
+#
+# Default is 5120 (5 GB)
+# Increase this number for large deployments (40+ million indexed nodes with content)
+merge.policy.maxMergedSegmentMB=5120
+# Default is 10: use the same value for both properties
+# Decrease these numbers in order to reduce the number of segments and improve searching performance
+# for large deployments
+merge.policy.maxMergeAtOnce=10
+merge.policy.segmentsPerTier=10
+
+# Default is 6
+# Increment this number for large deployments
+merger.maxMergeCount=6
+# Default is 3, this number should be lower than the amount of CPUs in a dedicated server
+# and always lower than maxMergeCount
+# Increment this number for large deployments using your available CPU threads
+merger.maxThreadCount=3
+
 #
 # Limit the maximum text size of transformed content sent to the index - in bytes
 #
 alfresco.contentStreamLimit=10000000
 #Shard setup
 shard.method=DB_ID
-#END of solrcore
\ No newline at end of file
+#END of solrcore