diff --git a/.gitignore b/.gitignore
index 986c94f912..4f0dee318c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ Bin/_setLatestBuildConfig.bat
 Bin/_setroot.bat
 Lib/debug/DebugProcs.lib
 Lib/debug/Generic.lib
+Lib/debug/System.Buffers.dll
 Lib/debug/System.ValueTuple.dll
 Lib/debug/unit++.*
 Lib/release/DebugProcs.lib
diff --git a/DistFiles/Language Explorer/Configuration/Grammar/DataTreeInclude.xml b/DistFiles/Language Explorer/Configuration/Grammar/DataTreeInclude.xml
index 2a41684852..9a1fbf89bc 100644
--- a/DistFiles/Language Explorer/Configuration/Grammar/DataTreeInclude.xml	
+++ b/DistFiles/Language Explorer/Configuration/Grammar/DataTreeInclude.xml	
@@ -103,7 +103,7 @@
     <command id="CmdDataTree-MoveDown-POS-AffixTemplate" label="Move Affix Template Down" message="MoveDownObjectInSequence" icon="MoveDown">
       <parameters field="AffixTemplates" className="MoInflAffixTemplate"/>
     </command>
-    <command id="CmdDataTree-Insert-POS-InflectionClass-Subclasses" label="Insert Inflection Class" message="DataTreeInsert">
+    <command id="CmdDataTree-Insert-POS-InflectionClass-Subclasses" label="Insert Inflection Subclass" message="DataTreeInsert">
 	  <parameters field="Subclasses" className="MoInflClass"/>
 	</command>
 	<command id="CmdDataTree-Insert-POS-InflectionClass" label="Insert Inflection Class" message="DataTreeInsert">
@@ -248,7 +248,7 @@
 	  <!-- <item command="CmdDataTree-Help"/> -->
 	</menu>
 	<menu id="mnuDataTree-POS-InflectionClass">
-	  <item command="CmdDataTree-Delete-POS-InflectionClass"/>
+      <item command="CmdDataTree-Delete-POS-InflectionClass"/>
 	  <!-- <item command="CmdDataTree-Help"/> -->
 	</menu>
 	<menu id="mnuDataTree-POS-StemNames">
diff --git a/DistFiles/Language Explorer/Configuration/Parts/Morphology.fwlayout b/DistFiles/Language Explorer/Configuration/Parts/Morphology.fwlayout
index 42d822feac..719519c6d8 100644
--- a/DistFiles/Language Explorer/Configuration/Parts/Morphology.fwlayout	
+++ b/DistFiles/Language Explorer/Configuration/Parts/Morphology.fwlayout	
@@ -453,27 +453,31 @@
 		</part>
 	</layout>
 
-   <layout class="MoInflClass" type="detail" name="SubClassesAllA">
-	  <part ref="NameAllA" label="Subclass Name" menu="mnuDataTree-POS-InflectionClass"/>
-	  <part ref="AbbreviationAllA"/>
-	  <part ref="DescriptionAllA"/>
-	  <part ref="SubClassesSection" label="Subclasses" menu="mnuDataTree-POS-InflectionClass-Subclasses">
-		 <indent indent="true">
-			<part ref="SubClasses" label="Subclasses"/>
-		 </indent>
-	  </part>
-   </layout>
+	<layout class="MoInflClass" type="detail" name="SubClassesAllA">
+		<part ref="NameAllA" label="Subclass Name" menu="mnuDataTree-POS-InflectionClass"/>
+		<part ref="AbbreviationAllA"/>
+		<part ref="DescriptionAllA"/>
+		<indent indent="true">
+			<part ref="SubClassesSection" label="Subclasses" menu="mnuDataTree-POS-InflectionClass-Subclasses">
+				<indent>
+					<part ref="SubClasses" label="Subclasses"/>
+				</indent>
+			</part>
+		</indent>
+	</layout>
 
-   <layout class="MoInflClass" type="detail" name="EditInflectionClass">
-	  <part ref="NameAllA" label="Inflection Class Name"  menu="mnuDataTree-POS-InflectionClass"/>
-	  <part ref="AbbreviationAllA"/>
-	  <part ref="DescriptionAllA"/>
-	  <part ref="SubClassesSection" label="Subclasses" menu="mnuDataTree-POS-InflectionClass-Subclasses">
-		  <indent indent="true">
-			 <part ref="SubClasses" label="Subclasses"/>
-		  </indent>
-	 </part>
-  </layout>
+	<layout class="MoInflClass" type="detail" name="EditInflectionClass">
+		<part ref="NameAllA" label="Inflection Class Name"  menu="mnuDataTree-POS-InflectionClass"/>
+		<part ref="AbbreviationAllA"/>
+		<part ref="DescriptionAllA"/>
+		<indent indent="true">
+			<part ref="SubClassesSection" label="Subclasses" menu="mnuDataTree-POS-InflectionClass-Subclasses">
+				<indent>
+					<part ref="SubClasses" label="Subclasses"/>
+				</indent>
+			</part>
+		</indent>
+	</layout>
    <layout class="MoInflClass" type="detail" name="SubClasses">
 	  <part ref="SubclassesAllA" label="Subclass" >
 		 </part>
diff --git a/Src/Common/Controls/DetailControls/DataTree.cs b/Src/Common/Controls/DetailControls/DataTree.cs
index 5520e6f302..23fef10d7f 100644
--- a/Src/Common/Controls/DetailControls/DataTree.cs
+++ b/Src/Common/Controls/DetailControls/DataTree.cs
@@ -2044,6 +2044,13 @@ private NodeTestResult ProcessPartRefNode(XmlNode partRef, ArrayList path, ObjSe
 					path.RemoveAt(path.Count - 1);
 					break;
 
+				case "indent":
+					foreach (XmlNode node in partRef.ChildNodes)
+					{
+						ProcessPartRefNode(node, path, reuseMap, obj, parentSlice, indent + Slice.ExtraIndent(partRef), ref insPos, isTestOnly);
+					}
+					break;
+
 				case "part":
 					// If the previously selected slice doesn't display in this refresh, we try for the next
 					// visible slice instead.  So m_fSetCurrentSliceNew might still be set.  See LT-9010.