diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py
index c5b38034b5..b1dd6d77b0 100644
--- a/plugins/CuraEngineBackend/CuraEngineBackend.py
+++ b/plugins/CuraEngineBackend/CuraEngineBackend.py
@@ -105,6 +105,9 @@ class CuraEngineBackend(Backend):
 
         return [Preferences.getInstance().getValue("backend/location"), "connect", "127.0.0.1:{0}".format(self._port), "-j", json_path, "-vv"]
 
+    def close(self):
+        self._terminate()   # Forcefully shutdown the backend.
+
     ##  Emitted when we get a message containing print duration and material amount. This also implies the slicing has finished.
     #   \param time The amount of time the print will take.
     #   \param material_amount The amount of material the print will use.
diff --git a/plugins/LegacyProfileReader/DictionaryOfDoom.json b/plugins/LegacyProfileReader/DictionaryOfDoom.json
index e30460f103..9dd0c04a05 100644
--- a/plugins/LegacyProfileReader/DictionaryOfDoom.json
+++ b/plugins/LegacyProfileReader/DictionaryOfDoom.json
@@ -50,7 +50,8 @@
         "skirt_minimal_length": "skirt_minimal_length",
         "brim_line_count": "brim_line_count",
         "raft_margin": "raft_margin",
-        "raft_airgap": "raft_airgap_all",
+        "raft_airgap": "float(raft_airgap_all) + float(raft_airgap)",
+        "layer_0_z_overlap": "raft_airgap",
         "raft_surface_layers": "raft_surface_layers",
         "raft_surface_thickness": "raft_surface_thickness",
         "raft_surface_line_width": "raft_surface_linewidth",
diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json
index ba374072bc..7171d140ff 100644
--- a/resources/machines/fdmprinter.json
+++ b/resources/machines/fdmprinter.json
@@ -1537,13 +1537,26 @@
                     "description": "The gap between the final raft layer and the first layer of the object. Only the first layer is raised by this amount to lower the bonding between the raft layer and the object. Makes it easier to peel off the raft.",
                     "unit": "mm",
                     "type": "float",
-                    "default": 0.35,
+                    "default": 0.3,
                     "min_value": "0",
                     "max_value_warning": "1.0",
                     "enabled": "adhesion_type == \"raft\"",
                     "global_only": "True",
                     "visible": true
                 },
+                "layer_0_z_overlap": {
+                    "label": "Initial Layer Z Overlap",
+                    "description": "Make the first and second layer of the object overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount.",
+                    "unit": "mm",
+                    "type": "float",
+                    "default": 0.05,
+                    "inherit_function": "layer_height / 2",
+                    "min_value": "0",
+                    "max_value_warning": "layer_height",
+                    "enabled": "adhesion_type == \"raft\"",
+                    "global_only": "True",
+                    "visible": true
+                },
                 "raft_surface_layers": {
                     "label": "Raft Top Layers",
                     "description": "The number of top layers on top of the 2nd raft layer. These are fully filled layers that the object sits on. 2 layers result in a smoother top surface than 1.",