diff --git a/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java
index eec08ff133df..7d59cb63ea5b 100644
--- a/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java
+++ b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java
@@ -184,6 +184,7 @@ public HadoopIndexTask createTask(Interval interval, String version, List<DataSe
         tuningConfig.getAppendableIndexSpec(),
         tuningConfig.getMaxRowsInMemory(),
         tuningConfig.getMaxBytesInMemory(),
+        tuningConfig.isUseMaxMemoryEstimates(),
         tuningConfig.isLeaveIntermediate(),
         tuningConfig.isCleanupOnFailure(),
         tuningConfig.isOverwriteFiles(),
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java
index 3a18bf10d9fe..9da6ead38cf1 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java
@@ -23,8 +23,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import org.apache.druid.common.config.Configs;
 import org.apache.druid.indexer.partitions.DimensionBasedPartitionsSpec;
 import org.apache.druid.indexer.partitions.HashedPartitionsSpec;
 import org.apache.druid.java.util.common.DateTimes;
@@ -33,6 +33,7 @@
 import org.apache.druid.segment.indexing.TuningConfig;
 
 import javax.annotation.Nullable;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -62,6 +63,7 @@ public static HadoopTuningConfig makeDefaultTuningConfig()
         DEFAULT_MAX_ROWS_IN_MEMORY_BATCH,
         0L,
         false,
+        false,
         true,
         false,
         false,
@@ -90,6 +92,7 @@ public static HadoopTuningConfig makeDefaultTuningConfig()
   private final AppendableIndexSpec appendableIndexSpec;
   private final int maxRowsInMemory;
   private final long maxBytesInMemory;
+  private final boolean useMaxMemoryEstimates;
   private final boolean leaveIntermediate;
   private final boolean cleanupOnFailure;
   private final boolean overwriteFiles;
@@ -126,6 +129,7 @@ public HadoopTuningConfig(
       final @JsonProperty("appendableIndexSpec") @Nullable AppendableIndexSpec appendableIndexSpec,
       final @JsonProperty("maxRowsInMemory") @Nullable Integer maxRowsInMemory,
       final @JsonProperty("maxBytesInMemory") @Nullable Long maxBytesInMemory,
+      final @JsonProperty("useMaxMemoryEstimates") @Nullable Boolean useMaxMemoryEstimates,
       final @JsonProperty("leaveIntermediate") boolean leaveIntermediate,
       final @JsonProperty("cleanupOnFailure") @Nullable Boolean cleanupOnFailure,
       final @JsonProperty("overwriteFiles") boolean overwriteFiles,
@@ -147,48 +151,47 @@ public HadoopTuningConfig(
   )
   {
     this.workingPath = workingPath;
-    this.version = version == null ? DateTimes.nowUtc().toString() : version;
-    this.partitionsSpec = partitionsSpec == null ? DEFAULT_PARTITIONS_SPEC : partitionsSpec;
-    this.shardSpecs = shardSpecs == null ? DEFAULT_SHARD_SPECS : shardSpecs;
-    this.indexSpec = indexSpec == null ? DEFAULT_INDEX_SPEC : indexSpec;
-    this.indexSpecForIntermediatePersists = indexSpecForIntermediatePersists == null ?
-                                            this.indexSpec : indexSpecForIntermediatePersists;
-    this.maxRowsInMemory = maxRowsInMemory == null ? maxRowsInMemoryCOMPAT == null
-                                                      ? DEFAULT_MAX_ROWS_IN_MEMORY_BATCH
-                                                      : maxRowsInMemoryCOMPAT : maxRowsInMemory;
-    this.appendableIndexSpec = appendableIndexSpec == null ? DEFAULT_APPENDABLE_INDEX : appendableIndexSpec;
+    this.version = Configs.valueOrDefault(version, DateTimes.nowUtc().toString());
+    this.partitionsSpec = Configs.valueOrDefault(partitionsSpec, DEFAULT_PARTITIONS_SPEC);
+    this.shardSpecs = Configs.valueOrDefault(shardSpecs, DEFAULT_SHARD_SPECS);
+    this.indexSpec = Configs.valueOrDefault(indexSpec, DEFAULT_INDEX_SPEC);
+    this.indexSpecForIntermediatePersists = Configs.valueOrDefault(
+        indexSpecForIntermediatePersists,
+        this.indexSpec
+    );
+    this.maxRowsInMemory = Configs.valueOrDefault(
+        maxRowsInMemory,
+        Configs.valueOrDefault(maxRowsInMemoryCOMPAT, DEFAULT_MAX_ROWS_IN_MEMORY_BATCH)
+    );
+    this.useMaxMemoryEstimates = Configs.valueOrDefault(useMaxMemoryEstimates, false);
+    this.appendableIndexSpec = Configs.valueOrDefault(appendableIndexSpec, DEFAULT_APPENDABLE_INDEX);
     // initializing this to 0, it will be lazily initialized to a value
     // @see #getMaxBytesInMemoryOrDefault()
-    this.maxBytesInMemory = maxBytesInMemory == null ? 0 : maxBytesInMemory;
+    this.maxBytesInMemory = Configs.valueOrDefault(maxBytesInMemory, 0);
     this.leaveIntermediate = leaveIntermediate;
-    this.cleanupOnFailure = cleanupOnFailure == null ? true : cleanupOnFailure;
+    this.cleanupOnFailure = Configs.valueOrDefault(cleanupOnFailure, true);
     this.overwriteFiles = overwriteFiles;
     this.jobProperties = (jobProperties == null
                           ? ImmutableMap.of()
                           : ImmutableMap.copyOf(jobProperties));
     this.combineText = combineText;
-    this.useCombiner = useCombiner == null ? DEFAULT_USE_COMBINER : useCombiner;
-    this.numBackgroundPersistThreads = numBackgroundPersistThreads == null
-                                       ? DEFAULT_NUM_BACKGROUND_PERSIST_THREADS
-                                       : numBackgroundPersistThreads;
+    this.useCombiner = Configs.valueOrDefault(useCombiner, DEFAULT_USE_COMBINER);
+    this.numBackgroundPersistThreads = Configs.valueOrDefault(
+        numBackgroundPersistThreads,
+        DEFAULT_NUM_BACKGROUND_PERSIST_THREADS
+    );
     this.forceExtendableShardSpecs = forceExtendableShardSpecs;
     Preconditions.checkArgument(this.numBackgroundPersistThreads >= 0, "Not support persistBackgroundCount < 0");
     this.useExplicitVersion = useExplicitVersion;
-    this.allowedHadoopPrefix = allowedHadoopPrefix == null ? ImmutableList.of() : allowedHadoopPrefix;
-
-    this.ignoreInvalidRows = ignoreInvalidRows == null ? false : ignoreInvalidRows;
-    if (maxParseExceptions != null) {
-      this.maxParseExceptions = maxParseExceptions;
-    } else {
-      if (!this.ignoreInvalidRows) {
-        this.maxParseExceptions = 0;
-      } else {
-        this.maxParseExceptions = TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS;
-      }
-    }
-    this.logParseExceptions = logParseExceptions == null ? TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS : logParseExceptions;
+    this.allowedHadoopPrefix = Configs.valueOrDefault(allowedHadoopPrefix, Collections.emptyList());
 
-    this.useYarnRMJobStatusFallback = useYarnRMJobStatusFallback == null ? true : useYarnRMJobStatusFallback;
+    this.ignoreInvalidRows = Configs.valueOrDefault(ignoreInvalidRows, false);
+    this.maxParseExceptions = Configs.valueOrDefault(
+        maxParseExceptions,
+        this.ignoreInvalidRows ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS : 0
+    );
+    this.logParseExceptions = Configs.valueOrDefault(logParseExceptions, TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS);
+    this.useYarnRMJobStatusFallback = Configs.valueOrDefault(useYarnRMJobStatusFallback, true);
 
     if (awaitSegmentAvailabilityTimeoutMillis == null || awaitSegmentAvailabilityTimeoutMillis < 0) {
       this.awaitSegmentAvailabilityTimeoutMillis = DEFAULT_AWAIT_SEGMENT_AVAILABILITY_TIMEOUT_MILLIS;
@@ -263,6 +266,12 @@ public long getMaxBytesInMemory()
     return maxBytesInMemory;
   }
 
+  @JsonProperty
+  public boolean isUseMaxMemoryEstimates()
+  {
+    return useMaxMemoryEstimates;
+  }
+
   @JsonProperty
   public boolean isLeaveIntermediate()
   {
@@ -372,6 +381,7 @@ public HadoopTuningConfig withWorkingPath(String path)
         appendableIndexSpec,
         maxRowsInMemory,
         maxBytesInMemory,
+        useMaxMemoryEstimates,
         leaveIntermediate,
         cleanupOnFailure,
         overwriteFiles,
@@ -404,6 +414,7 @@ public HadoopTuningConfig withVersion(String ver)
         appendableIndexSpec,
         maxRowsInMemory,
         maxBytesInMemory,
+        useMaxMemoryEstimates,
         leaveIntermediate,
         cleanupOnFailure,
         overwriteFiles,
@@ -436,6 +447,7 @@ public HadoopTuningConfig withShardSpecs(Map<Long, List<HadoopyShardSpec>> specs
         appendableIndexSpec,
         maxRowsInMemory,
         maxBytesInMemory,
+        useMaxMemoryEstimates,
         leaveIntermediate,
         cleanupOnFailure,
         overwriteFiles,
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java
index 967b55665c85..c60874e7111d 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java
@@ -310,6 +310,7 @@ private static IncrementalIndex makeIncrementalIndex(
                                             .setIndexSchema(indexSchema)
                                             .setMaxRowCount(tuningConfig.getMaxRowsInMemory())
                                             .setMaxBytesInMemory(tuningConfig.getMaxBytesInMemoryOrDefault())
+                                            .setUseMaxMemoryEstimates(tuningConfig.isUseMaxMemoryEstimates())
                                             .build();
 
     if (oldDimOrder != null && !indexSchema.getDimensionsSpec().hasCustomDimensions()) {
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java
index ce725230b963..ed8b8c0bb093 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java
@@ -478,6 +478,7 @@ private HadoopDruidIndexerConfig makeHadoopDruidIndexerConfig(
                 false,
                 false,
                 false,
+                false,
                 null,
                 false,
                 false,
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineHashedPartitionsJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineHashedPartitionsJobTest.java
index fb1ff1520a28..24a8ee0ef7eb 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineHashedPartitionsJobTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineHashedPartitionsJobTest.java
@@ -220,6 +220,7 @@ public DetermineHashedPartitionsJobTest(
             false,
             false,
             false,
+            false,
             null,
             false,
             false,
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DeterminePartitionsJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DeterminePartitionsJobTest.java
index 5f338936a409..a3c98f29565b 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DeterminePartitionsJobTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DeterminePartitionsJobTest.java
@@ -331,6 +331,7 @@ public DeterminePartitionsJobTest(
                 false,
                 false,
                 false,
+                false,
                 null,
                 false,
                 false,
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineRangePartitionsJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineRangePartitionsJobTest.java
index f10a898d1260..e79d066ab55c 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineRangePartitionsJobTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineRangePartitionsJobTest.java
@@ -382,7 +382,7 @@ public DetermineRangePartitionsJobTest(
                 null,
                 null,
                 null,
-                false,
+                false, false,
                 false,
                 false,
                 false,
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerConfigTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerConfigTest.java
index f69ad04915c5..8aead05d625b 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerConfigTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerConfigTest.java
@@ -269,6 +269,7 @@ HadoopIngestionSpec build()
           false,
           false,
           false,
+          false,
           null,
           false,
           false,
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java
index 97c764dd10b1..5857f92172f2 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java
@@ -48,6 +48,7 @@ public void testSerde() throws Exception
         null,
         100,
         null,
+        false,
         true,
         true,
         true,
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java
index 2b8fc6749e31..e14ade454f4c 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java
@@ -532,6 +532,7 @@ public void setUp() throws Exception
                 null,
                 maxRowsInMemory,
                 maxBytesInMemory,
+                false,
                 true,
                 false,
                 false,
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java
index 3c1b80166c51..7069e9a78de3 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java
@@ -168,6 +168,7 @@ public void setup() throws Exception
                 false,
                 false,
                 false,
+                false,
                 //Map of job properties
                 ImmutableMap.of(
                     "fs.s3.impl",
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularityPathSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularityPathSpecTest.java
index d1aee3d66992..8af77ca0e4fd 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularityPathSpecTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularityPathSpecTest.java
@@ -68,6 +68,7 @@ public class GranularityPathSpecTest
       false,
       false,
       false,
+      false,
       null,
       false,
       false,
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/AppendableIndexBuilder.java b/processing/src/main/java/org/apache/druid/segment/incremental/AppendableIndexBuilder.java
index 777c4cc1fd7a..fcfca99cdfe8 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/AppendableIndexBuilder.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/AppendableIndexBuilder.java
@@ -37,7 +37,7 @@ public abstract class AppendableIndexBuilder
   // DruidInputSource since that is the only case where we can have existing metrics.
   // This is currently only use by auto compaction and should not be use for anything else.
   protected boolean preserveExistingMetrics = false;
-  protected boolean useMaxMemoryEstimates = true;
+  protected boolean useMaxMemoryEstimates = false;
 
   protected final Logger log = new Logger(this.getClass());
 
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/AppendableIndexSpec.java b/processing/src/main/java/org/apache/druid/segment/incremental/AppendableIndexSpec.java
index 67cdabdf5673..44b56aaa13ad 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/AppendableIndexSpec.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/AppendableIndexSpec.java
@@ -22,14 +22,18 @@
 import org.apache.druid.guice.annotations.UnstableApi;
 
 /**
- * AppendableIndexSpec describes the in-memory indexing method for data ingestion.
+ * Describes the in-memory indexing method for data ingestion.
  */
 @UnstableApi
 public interface AppendableIndexSpec
 {
-  // Returns a builder of the appendable index.
+  /**
+   * Creates a new builder of the appendable index.
+   */
   AppendableIndexBuilder builder();
 
-  // Returns the default max bytes in memory for this index.
+  /**
+   * Returns the default max bytes in memory for this index.
+   */
   long getDefaultMaxBytesInMemory();
 }