diff --git a/src/Mod/Draft/draftviewproviders/view_layer.py b/src/Mod/Draft/draftviewproviders/view_layer.py
index 04c0199921..a4d676ebb9 100644
--- a/src/Mod/Draft/draftviewproviders/view_layer.py
+++ b/src/Mod/Draft/draftviewproviders/view_layer.py
@@ -228,16 +228,15 @@ class ViewProviderLayer:
         # Return if the property does not exist
         if not hasattr(vobj, prop):
             return
+        # If the override properties are not set return without change
+        if prop == "LineColor" and not vobj.OverrideLineColorChildren:
+            return
+        elif prop == "ShapeAppearance" and not vobj.OverrideShapeAppearanceChildren:
+            return
 
         for target_obj in obj.Group:
             target_vobj = target_obj.ViewObject
 
-            # If the override properties are not set return without change
-            if prop == "LineColor" and not vobj.OverrideLineColorChildren:
-                return
-            elif prop == "ShapeAppearance" and not vobj.OverrideShapeAppearanceChildren:
-                return
-
             # This checks that the property exists in the target object,
             # and then sets the target property accordingly
             if hasattr(target_vobj, prop):
diff --git a/src/Mod/Import/App/dxf/ImpExpDxf.cpp b/src/Mod/Import/App/dxf/ImpExpDxf.cpp
index 6b55fb45b9..24c49d492d 100644
--- a/src/Mod/Import/App/dxf/ImpExpDxf.cpp
+++ b/src/Mod/Import/App/dxf/ImpExpDxf.cpp
@@ -112,14 +112,8 @@ bool ImpExpDxfRead::ReadEntitiesSection()
         }
     }
     if (m_preserveLayers) {
-        // Hide the Hidden layers if possible (if GUI exists)
-        // We do this now rather than when the layer is created so all objects
-        // within the layers also become hidden.
         for (auto& layerEntry : Layers) {
-            auto layer = (Layer*)layerEntry.second;
-            if (layer->DraftLayerView != nullptr && layer->Hidden) {
-                PyObject_CallMethod(layer->DraftLayerView, "hide", nullptr);
-            }
+            ((Layer*)layerEntry.second)->FinishLayer();
         }
     }
     return true;
@@ -610,16 +604,38 @@ ImpExpDxfRead::Layer::Layer(const std::string& name,
                             std::string&& lineType,
                             PyObject* drawingLayer)
     : CDxfRead::Layer(name, color, std::move(lineType))
-    , DraftLayer(drawingLayer)
+    , GroupContents(
+          drawingLayer == nullptr
+              ? nullptr
+              : (App::PropertyLinkListHidden*)(((App::FeaturePythonPyT<App::DocumentObjectPy>*)
+                                                    drawingLayer)
+                                                   ->getPropertyContainerPtr())
+                    ->getDynamicPropertyByName("Group"))
     , DraftLayerView(drawingLayer == nullptr ? nullptr
                                              : PyObject_GetAttrString(drawingLayer, "ViewObject"))
 {}
 ImpExpDxfRead::Layer::~Layer()
 {
-    Py_XDECREF(DraftLayer);
     Py_XDECREF(DraftLayerView);
 }
 
+void ImpExpDxfRead::Layer::FinishLayer() const
+{
+    if (GroupContents != nullptr) {
+        // We have to move the object to layer->DraftLayer
+        // The DraftLayer will have a Proxy attribute which has a addObject attribute which we
+        // call with (draftLayer, draftObject) Checking from python, the layer is a
+        // App::FeaturePython, and its Proxy is a draftobjects.layer.Layer
+        GroupContents->setValue(Contents);
+    }
+    if (DraftLayerView != nullptr && Hidden) {
+        // Hide the Hidden layers if possible (if GUI exists)
+        // We do this now rather than when the layer is created so all objects
+        // within the layers also become hidden.
+        PyObject_CallMethod(DraftLayerView, "hide", nullptr);
+    }
+}
+
 CDxfRead::Layer*
 ImpExpDxfRead::MakeLayer(const std::string& name, ColorIndex_t color, std::string&& lineType)
 {
@@ -669,26 +685,7 @@ ImpExpDxfRead::MakeLayer(const std::string& name, ColorIndex_t color, std::strin
 void ImpExpDxfRead::MoveToLayer(App::DocumentObject* object) const
 {
     if (m_preserveLayers) {
-        static PyObject* addObjectName =
-            PyUnicode_FromString("addObject");  // This never gets freed, we always have a reference
-        auto layer = static_cast<const Layer*>(m_entityAttributes.m_Layer);
-        if (layer->DraftLayer != nullptr) {
-            // We have to move the object to layer->DraftLayer
-            // The DraftLayer will have a Proxy attribute which has a addObject attribute which we
-            // call with (draftLayer, draftObject) Checking from python, the layer is a
-            // App::FeaturePython, and its Proxy is a draftobjects.layer.Layer
-            PyObject* proxy = PyObject_GetAttrString(layer->DraftLayer, "Proxy");
-            if (proxy != nullptr) {
-                // TODO: De we have to check if the method exists? The legacy importer does.
-                PyObject_CallMethodObjArgs(proxy,
-                                           addObjectName,
-                                           layer->DraftLayer,
-                                           object->getPyObject(),
-                                           nullptr);
-                Py_DECREF(proxy);
-                return;
-            }
-        }
+        static_cast<Layer*>(m_entityAttributes.m_Layer)->Contents.push_back(object);
     }
     // TODO: else Hide the object if it is in a Hidden layer? That won't work because we've cleared
     // out m_entityAttributes.m_Layer
diff --git a/src/Mod/Import/App/dxf/ImpExpDxf.h b/src/Mod/Import/App/dxf/ImpExpDxf.h
index d219e0f99f..5c0478c936 100644
--- a/src/Mod/Import/App/dxf/ImpExpDxf.h
+++ b/src/Mod/Import/App/dxf/ImpExpDxf.h
@@ -143,8 +143,10 @@ protected:
         void operator=(const Layer&) = delete;
         void operator=(Layer&&) = delete;
         ~Layer() override;
-        PyObject* const DraftLayer;
         PyObject* const DraftLayerView;
+        std::vector<App::DocumentObject*> Contents;
+        void FinishLayer() const;
+        App::PropertyLinkListHidden* GroupContents;
     };
 
     using FeaturePythonBuilder =