diff --git a/designer/menueditor.pp b/designer/menueditor.pp
index ce910f636d..31b7e34246 100644
--- a/designer/menueditor.pp
+++ b/designer/menueditor.pp
@@ -1853,7 +1853,7 @@ begin
   FInitialSelectedMenuItem := aSelect;
   SetInitialBounds(0, 0, aWidth, aHeight);
   Name := 'ShadowMenu';
-  DisableAutoSizing;
+  DisableAutoSizing{$IFDEF DebugDisableAutoSizing}('TShadowMenu.Create'){$ENDIF};
   try
     FItemsPopupMenu := TPopupMenu.Create(Self);
     FItemsPopupMenu.Name := 'ItemsPopupMenu';
@@ -1888,7 +1888,7 @@ begin
     AutoSize := False;
     Align := alClient;
   finally
-    EnableAutoSizing;
+    EnableAutoSizing{$IFDEF DebugDisableAutoSizing}('TShadowMenu.Create'){$ENDIF};
   end;
 end;
 
diff --git a/examples/SynEdit/Completion/SynCompletionSample.res b/examples/SynEdit/Completion/SynCompletionSample.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/examples/SynEdit/Completion/SynCompletionSample.res and b/examples/SynEdit/Completion/SynCompletionSample.res differ
diff --git a/examples/SynEdit/SynGutterMarks/SynGutterMarkExample.res b/examples/SynEdit/SynGutterMarks/SynGutterMarkExample.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/examples/SynEdit/SynGutterMarks/SynGutterMarkExample.res and b/examples/SynEdit/SynGutterMarks/SynGutterMarkExample.res differ
diff --git a/examples/affinetransforms/project1.res b/examples/affinetransforms/project1.res
index e66ecf85fe..e1df0e994f 100644
Binary files a/examples/affinetransforms/project1.res and b/examples/affinetransforms/project1.res differ
diff --git a/examples/canvas_test/canvastest.res b/examples/canvas_test/canvastest.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/examples/canvas_test/canvastest.res and b/examples/canvas_test/canvastest.res differ
diff --git a/examples/controlhint/Project1.res b/examples/controlhint/Project1.res
index e66ecf85fe..e1df0e994f 100644
Binary files a/examples/controlhint/Project1.res and b/examples/controlhint/Project1.res differ
diff --git a/examples/customhint/CustomHint1.res b/examples/customhint/CustomHint1.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/examples/customhint/CustomHint1.res and b/examples/customhint/CustomHint1.res differ
diff --git a/examples/database/dblookup/project1.res b/examples/database/dblookup/project1.res
index e66ecf85fe..e1df0e994f 100644
Binary files a/examples/database/dblookup/project1.res and b/examples/database/dblookup/project1.res differ
diff --git a/examples/database/image_mushrooms/project1.res b/examples/database/image_mushrooms/project1.res
index 73c8ea3a59..a7bbde576d 100644
Binary files a/examples/database/image_mushrooms/project1.res and b/examples/database/image_mushrooms/project1.res differ
diff --git a/examples/database/sqlite_encryption_pragma/project1.res b/examples/database/sqlite_encryption_pragma/project1.res
index e66ecf85fe..e1df0e994f 100644
Binary files a/examples/database/sqlite_encryption_pragma/project1.res and b/examples/database/sqlite_encryption_pragma/project1.res differ
diff --git a/examples/database/tsqlscript/tsqlscriptsample.res b/examples/database/tsqlscript/tsqlscriptsample.res
index e66ecf85fe..e1df0e994f 100644
Binary files a/examples/database/tsqlscript/tsqlscriptsample.res and b/examples/database/tsqlscript/tsqlscriptsample.res differ
diff --git a/examples/dbeditmask/project1.res b/examples/dbeditmask/project1.res
index e66ecf85fe..e1df0e994f 100644
Binary files a/examples/dbeditmask/project1.res and b/examples/dbeditmask/project1.res differ
diff --git a/examples/docking/project1.res b/examples/docking/project1.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/examples/docking/project1.res and b/examples/docking/project1.res differ
diff --git a/examples/dockmanager/easyedit/easyeditor.res b/examples/dockmanager/easyedit/easyeditor.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/examples/dockmanager/easyedit/easyeditor.res and b/examples/dockmanager/easyedit/easyeditor.res differ
diff --git a/examples/dockmanager/elasticsite/MakeSite.res b/examples/dockmanager/elasticsite/MakeSite.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/examples/dockmanager/elasticsite/MakeSite.res and b/examples/dockmanager/elasticsite/MakeSite.res differ
diff --git a/examples/dockmanager/elasticsite/SiteTest.res b/examples/dockmanager/elasticsite/SiteTest.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/examples/dockmanager/elasticsite/SiteTest.res and b/examples/dockmanager/elasticsite/SiteTest.res differ
diff --git a/examples/groupedcontrol/EditButtonDemo.res b/examples/groupedcontrol/EditButtonDemo.res
index e66ecf85fe..e1df0e994f 100644
Binary files a/examples/groupedcontrol/EditButtonDemo.res and b/examples/groupedcontrol/EditButtonDemo.res differ
diff --git a/examples/icons/project1.res b/examples/icons/project1.res
index e66ecf85fe..e1df0e994f 100644
Binary files a/examples/icons/project1.res and b/examples/icons/project1.res differ
diff --git a/examples/imagelist/project1.res b/examples/imagelist/project1.res
index e66ecf85fe..e1df0e994f 100644
Binary files a/examples/imagelist/project1.res and b/examples/imagelist/project1.res differ
diff --git a/examples/imgviewer/imgview.res b/examples/imgviewer/imgview.res
index 1fee89b02d..d1524f0d19 100644
Binary files a/examples/imgviewer/imgview.res and b/examples/imgviewer/imgview.res differ
diff --git a/examples/lazresexplorer/resexplorer.lpi b/examples/lazresexplorer/resexplorer.lpi
index aeee3fe8d2..ab3cf9ef0c 100644
--- a/examples/lazresexplorer/resexplorer.lpi
+++ b/examples/lazresexplorer/resexplorer.lpi
@@ -18,10 +18,14 @@
       <UseVersionInfo Value="True"/>
       <AutoIncrementBuild Value="True"/>
       <MinorVersionNr Value="1"/>
-      <BuildNr Value="3"/>
+      <BuildNr Value="5"/>
       <CharSet Value="04B0"/>
-      <StringTable Comments="Explore your resources in executables and resource files" CompanyName="Alexey Lagunov" FileDescription="Resource Explorer" InternalName="LazResExplorer" LegalCopyright="Alexey Lagunov" LegalTrademarks="No Trademarks" OriginalFilename="lazresexplorer" ProductName="Lazarus Resource Explorer" ProductVersion=""/>
+      <StringTable Comments="Explore your resources in executables and resource files" CompanyName="Alexey Lagunov" FileDescription="Resource Explorer" InternalName="LazResExplorer" LegalCopyright="Alexey Lagunov" LegalTrademarks="No Trademarks" OriginalFilename="lazresexplorer" ProductName="Lazarus Resource Explorer" ProductVersion="0.1.0.3"/>
     </VersionInfo>
+    <MacroValues Count="2">
+      <Macro1 Name="LCLWidgetType" Value="gtk2"/>
+      <Macro2 Name="LCLWidgetType" Value="gtk2"/>
+    </MacroValues>
     <BuildModes Count="2">
       <Item1 Name="Release" Default="True"/>
       <Item2 Name="Debug">
@@ -121,17 +125,4 @@
       </Options>
     </Linking>
   </CompilerOptions>
-  <Debugging>
-    <Exceptions Count="3">
-      <Item1>
-        <Name Value="EAbort"/>
-      </Item1>
-      <Item2>
-        <Name Value="ECodetoolError"/>
-      </Item2>
-      <Item3>
-        <Name Value="EFOpenError"/>
-      </Item3>
-    </Exceptions>
-  </Debugging>
 </CONFIG>
diff --git a/examples/lazresexplorer/resexplorer.res b/examples/lazresexplorer/resexplorer.res
index 26b66c034d..a1e7eb59b4 100644
Binary files a/examples/lazresexplorer/resexplorer.res and b/examples/lazresexplorer/resexplorer.res differ
diff --git a/examples/levelgraph/lvlgraph_dependencies.res b/examples/levelgraph/lvlgraph_dependencies.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/examples/levelgraph/lvlgraph_dependencies.res and b/examples/levelgraph/lvlgraph_dependencies.res differ
diff --git a/examples/motiongraphics/motiongraphics.res b/examples/motiongraphics/motiongraphics.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/examples/motiongraphics/motiongraphics.res and b/examples/motiongraphics/motiongraphics.res differ
diff --git a/examples/openurltest/openurltest.res b/examples/openurltest/openurltest.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/examples/openurltest/openurltest.res and b/examples/openurltest/openurltest.res differ
diff --git a/examples/propstorage/project1.res b/examples/propstorage/project1.res
index e66ecf85fe..e1df0e994f 100644
Binary files a/examples/propstorage/project1.res and b/examples/propstorage/project1.res differ
diff --git a/examples/stock_images/project1.res b/examples/stock_images/project1.res
index 7c6cf3e4be..e994dfa65a 100644
Binary files a/examples/stock_images/project1.res and b/examples/stock_images/project1.res differ
diff --git a/examples/trayicon/wndtray.res b/examples/trayicon/wndtray.res
index e66ecf85fe..e1df0e994f 100644
Binary files a/examples/trayicon/wndtray.res and b/examples/trayicon/wndtray.res differ
diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp
index 34e3d005ac..521f589aa2 100644
--- a/lcl/comctrls.pp
+++ b/lcl/comctrls.pp
@@ -3382,6 +3382,7 @@ type
     function CanEdit(Node: TTreeNode): Boolean; virtual;
     function CanExpand(Node: TTreeNode): Boolean; virtual;
     function CreateNode: TTreeNode; virtual;
+    function CreateNodes: TTreeNodes; virtual;
     function CustomDraw(const ARect: TRect;
       Stage: TCustomDrawStage): Boolean; virtual;
     function CustomDrawItem(Node: TTreeNode; State: TCustomDrawState;
diff --git a/lcl/include/treeview.inc b/lcl/include/treeview.inc
index 8ea231445b..8a7bef739f 100644
--- a/lcl/include/treeview.inc
+++ b/lcl/include/treeview.inc
@@ -3178,7 +3178,7 @@ begin
   FDefItemHeight := DefaultTreeNodeHeight;
   FExpandSignType := tvestTheme;
   UpdateExpandSignSize;
-  FTreeNodes := TTreeNodes.Create(Self);
+  FTreeNodes := CreateNodes;
   BorderStyle := bsSingle;
   BorderWidth := 0;
   FMultiSelectStyle := DefaultMultiSelectStyle;
@@ -5329,6 +5329,11 @@ begin
   end;
 end;
 
+function TCustomTreeView.CreateNodes: TTreeNodes;
+begin
+  Result := TTreeNodes.Create(Self);
+end;
+
 procedure TCustomTreeView.ImageListChange(Sender: TObject);
 begin
   Invalidate;