diff --git a/include/LayerPlan.h b/include/LayerPlan.h
index d978cbdbd7..1d3b3628a3 100644
--- a/include/LayerPlan.h
+++ b/include/LayerPlan.h
@@ -13,6 +13,7 @@
 #include "pathPlanning/GCodePath.h"
 #include "pathPlanning/NozzleTempInsert.h"
 #include "pathPlanning/TimeMaterialEstimates.h"
+#include "raft.h"
 #include "settings/PathConfigStorage.h"
 #include "settings/types/LayerIndex.h"
 #include "utils/ExtrusionJunction.h"
@@ -63,7 +64,7 @@ class LayerPlan : public NoCopy
     const SliceDataStorage& storage_; //!< The polygon data obtained from FffPolygonProcessor
     const LayerIndex layer_nr_; //!< The layer number of this layer plan
     const bool is_initial_layer_; //!< Whether this is the first layer (which might be raft)
-    const bool is_raft_layer_; //!< Whether this is a layer which is part of the raft
+    const Raft::LayerType layer_type_; //!< Which part of the raft, airgap or model this layer is.
     coord_t layer_thickness_;
 
     std::vector<Point2LL> layer_start_pos_per_extruder_; //!< The starting position of a layer for each extruder
diff --git a/include/raft.h b/include/raft.h
index 1019bef761..b6f837f53e 100644
--- a/include/raft.h
+++ b/include/raft.h
@@ -1,9 +1,10 @@
-//Copyright (c) 2018 Ultimaker B.V.
-//CuraEngine is released under the terms of the AGPLv3 or higher.
+// Copyright (c) 2018 Ultimaker B.V.
+// CuraEngine is released under the terms of the AGPLv3 or higher.
 
 #ifndef RAFT_H
 #define RAFT_H
 
+#include "settings/types/LayerIndex.h"
 #include "utils/Coord_t.h"
 
 namespace cura
@@ -29,7 +30,7 @@ class Raft
     /*!
      * \brief Get the amount of layers to fill the airgap and initial layer with
      * helper parts (support, prime tower, etc.).
-     * 
+     *
      * The initial layer gets a separate filler layer because we don't want to
      * apply the layer_0_z_overlap to it.
      */
@@ -49,13 +50,28 @@ class Raft
     /*!
      * \brief Get the total amount of extra layers below zero because there is a
      * raft.
-     * 
+     *
      * This includes the filler layers which are introduced in the air gap.
      */
     static size_t getTotalExtraLayers();
 
+    enum LayerType
+    {
+        RaftBase,
+        RaftInterface,
+        RaftSurface,
+        Airgap,
+        Model
+    };
+
+    /*!
+     * \brief Get the type of layer at the given layer index.
+     * \param layer_index The layer index to get the type of.
+     * \return The type of layer at the given layer index.
+     */
+    static LayerType getLayerType(LayerIndex layer_index);
 };
 
-}//namespace cura
+} // namespace cura
 
-#endif//RAFT_H
+#endif // RAFT_H
diff --git a/include/sliceDataStorage.h b/include/sliceDataStorage.h
index 74d2047336..e18a3783d3 100644
--- a/include/sliceDataStorage.h
+++ b/include/sliceDataStorage.h
@@ -355,7 +355,11 @@ class SliceDataStorage : public NoCopy
 
     std::vector<SkirtBrimLine> skirt_brim[MAX_EXTRUDERS]; //!< Skirt/brim polygons per extruder, ordered from inner to outer polygons.
     Polygons support_brim; //!< brim lines for support, going from the edge of the support inward. \note Not ordered by inset.
-    Polygons raftOutline; // Storage for the outline of the raft. Will be filled with lines when the GCode is generated.
+
+    // Storage for the outline of the raft-parts. Will be filled with lines when the GCode is generated.
+    Polygons raftBaseOutline;
+    Polygons raftInterfaceOutline;
+    Polygons raftSurfaceOutline;
 
     int max_print_height_second_to_last_extruder; //!< Used in multi-extrusion: the layer number beyond which all models are printed with the same extruder
     std::vector<int> max_print_height_per_extruder; //!< For each extruder the highest layer number at which it is used.
diff --git a/src/FffGcodeWriter.cpp b/src/FffGcodeWriter.cpp
index ed0414dee4..c218b09212 100644
--- a/src/FffGcodeWriter.cpp
+++ b/src/FffGcodeWriter.cpp
@@ -630,7 +630,7 @@ void FffGcodeWriter::processRaft(const SliceDataStorage& storage)
         };
 
         std::vector<ParameterizedRaftPath> raft_outline_paths;
-        raft_outline_paths.emplace_back(ParameterizedRaftPath{ line_spacing, storage.raftOutline });
+        raft_outline_paths.emplace_back(ParameterizedRaftPath{ line_spacing, storage.raftBaseOutline });
         if (storage.primeTower.enabled_)
         {
             const Polygons& raft_outline_prime_tower = storage.primeTower.getOuterPoly(layer_nr);
@@ -761,7 +761,7 @@ void FffGcodeWriter::processRaft(const SliceDataStorage& storage)
         Polygons raft_outline_path;
         const coord_t small_offset = gcode_layer.configs_storage_.raft_interface_config.getLineWidth()
                                    / 2; // Do this manually because of micron-movement created in corners when insetting a polygon that was offset with round joint type.
-        raft_outline_path = storage.raftOutline.offset(-small_offset);
+        raft_outline_path = storage.raftInterfaceOutline.offset(-small_offset);
         raft_outline_path = Simplify(interface_settings).polygon(raft_outline_path); // Remove those micron-movements.
         const coord_t infill_outline_width = gcode_layer.configs_storage_.raft_interface_config.getLineWidth();
         Polygons raft_lines;
@@ -903,7 +903,7 @@ void FffGcodeWriter::processRaft(const SliceDataStorage& storage)
         Polygons raft_outline_path;
         const coord_t small_offset = gcode_layer.configs_storage_.raft_interface_config.getLineWidth()
                                    / 2; // Do this manually because of micron-movement created in corners when insetting a polygon that was offset with round joint type.
-        raft_outline_path = storage.raftOutline.offset(-small_offset);
+        raft_outline_path = storage.raftSurfaceOutline.offset(-small_offset);
         raft_outline_path = Simplify(interface_settings).polygon(raft_outline_path); // Remove those micron-movements.
         const coord_t infill_outline_width = gcode_layer.configs_storage_.raft_surface_config.getLineWidth();
         Polygons raft_lines;
diff --git a/src/LayerPlan.cpp b/src/LayerPlan.cpp
index 7d4ede0d0f..4f498caffd 100644
--- a/src/LayerPlan.cpp
+++ b/src/LayerPlan.cpp
@@ -95,7 +95,7 @@ LayerPlan::LayerPlan(
     , storage_(storage)
     , layer_nr_(layer_nr)
     , is_initial_layer_(layer_nr == 0 - static_cast<LayerIndex>(Raft::getTotalExtraLayers()))
-    , is_raft_layer_(layer_nr < 0 - static_cast<LayerIndex>(Raft::getFillerLayerCount()))
+    , layer_type_(Raft::getLayerType(layer_nr))
     , layer_thickness_(layer_thickness)
     , has_prime_tower_planned_per_extruder_(Application::getInstance().current_slice_->scene.extruders.size(), false)
     , current_mesh_(nullptr)
@@ -124,11 +124,12 @@ LayerPlan::LayerPlan(
         layer_start_pos_per_extruder_.emplace_back(extruder.settings_.get<coord_t>("layer_start_x"), extruder.settings_.get<coord_t>("layer_start_y"));
     }
     extruder_plans_.reserve(Application::getInstance().current_slice_->scene.extruders.size());
+    const auto is_raft_layer = layer_type_ == Raft::LayerType::RaftBase || layer_type_ == Raft::LayerType::RaftInterface || layer_type_ == Raft::LayerType::RaftSurface;
     extruder_plans_.emplace_back(
         current_extruder,
         layer_nr,
         is_initial_layer_,
-        is_raft_layer_,
+        is_raft_layer,
         layer_thickness,
         fan_speed_layer_time_settings_per_extruder[current_extruder],
         storage.retraction_wipe_config_per_extruder[current_extruder].retraction_config);
@@ -156,12 +157,25 @@ Polygons LayerPlan::computeCombBoundary(const CombBoundary boundary_type)
     const CombingMode mesh_combing_mode = Application::getInstance().current_slice_->scene.current_mesh_group->settings.get<CombingMode>("retraction_combing");
     if (mesh_combing_mode != CombingMode::OFF && (layer_nr_ >= 0 || mesh_combing_mode != CombingMode::NO_SKIN))
     {
-        if (layer_nr_ < 0)
-        {
-            comb_boundary = storage_.raftOutline.offset(MM2INT(0.1));
-        }
-        else
+        switch (layer_type_)
         {
+        case Raft::LayerType::RaftBase:
+            comb_boundary = storage_.raftBaseOutline.offset(MM2INT(0.1));
+            break;
+
+        case Raft::LayerType::RaftInterface:
+            comb_boundary = storage_.raftInterfaceOutline.offset(MM2INT(0.1));
+            break;
+
+        case Raft::LayerType::RaftSurface:
+            comb_boundary = storage_.raftSurfaceOutline.offset(MM2INT(0.1));
+            break;
+
+        case Raft::LayerType::Airgap:
+            // do nothing for airgap
+            break;
+
+        case Raft::LayerType::Model:
             for (const std::shared_ptr<SliceMeshStorage>& mesh_ptr : storage_.meshes)
             {
                 const auto& mesh = *mesh_ptr;
@@ -216,6 +230,7 @@ Polygons LayerPlan::computeCombBoundary(const CombBoundary boundary_type)
                     }
                 }
             }
+            break;
         }
     }
     return comb_boundary;
@@ -255,11 +270,13 @@ bool LayerPlan::setExtruder(const size_t extruder_nr)
     { // first extruder plan in a layer might be empty, cause it is made with the last extruder planned in the previous layer
         extruder_plans_.back().extruder_nr_ = extruder_nr;
     }
+
+    const auto is_raft_layer = layer_type_ == Raft::LayerType::RaftBase || layer_type_ == Raft::LayerType::RaftInterface || layer_type_ == Raft::LayerType::RaftSurface;
     extruder_plans_.emplace_back(
         extruder_nr,
         layer_nr_,
         is_initial_layer_,
-        is_raft_layer_,
+        is_raft_layer,
         layer_thickness_,
         fan_speed_layer_time_settings_per_extruder_[extruder_nr],
         storage_.retraction_wipe_config_per_extruder[extruder_nr].retraction_config);
diff --git a/src/raft.cpp b/src/raft.cpp
index 0bdc72bbfe..2fb12e100b 100644
--- a/src/raft.cpp
+++ b/src/raft.cpp
@@ -17,39 +17,58 @@ namespace cura
 
 void Raft::generate(SliceDataStorage& storage)
 {
-    assert(storage.raftOutline.size() == 0 && "Raft polygon isn't generated yet, so should be empty!");
+    assert(
+        storage.raftBaseOutline.size() == 0 && storage.raftInterfaceOutline.size() == 0 && storage.raftSurfaceOutline.size() == 0
+        && "Raft polygon isn't generated yet, so should be empty!");
     const Settings& settings = Application::getInstance().current_slice_->scene.current_mesh_group->settings.get<ExtruderTrain&>("raft_base_extruder_nr").settings_;
-    const coord_t distance = settings.get<coord_t>("raft_margin");
     constexpr bool include_support = true;
     constexpr bool dont_include_prime_tower = false; // Prime tower raft will be handled separately in 'storage.primeRaftOutline'; see below.
-    storage.raftOutline = storage.getLayerOutlines(0, include_support, dont_include_prime_tower).offset(distance, ClipperLib::jtRound);
+    const auto raft_base_margin = settings.get<coord_t>("raft_base_margin");
+    const auto raft_interface_margin = settings.get<coord_t>("raft_interface_margin");
+    const auto raft_surface_margin = settings.get<coord_t>("raft_surface_margin");
+
+    storage.raftBaseOutline = storage.raftSurfaceOutline = storage.raftInterfaceOutline = storage.getLayerOutlines(0, include_support, dont_include_prime_tower);
+    storage.raftBaseOutline = storage.raftBaseOutline.offset(raft_base_margin, ClipperLib::jtRound);
+    storage.raftInterfaceOutline = storage.raftInterfaceOutline.offset(raft_interface_margin, ClipperLib::jtRound);
+    storage.raftSurfaceOutline = storage.raftSurfaceOutline.offset(raft_surface_margin, ClipperLib::jtRound);
+
     const coord_t shield_line_width_layer0 = settings.get<coord_t>("skirt_brim_line_width");
+    const coord_t max_raft_distance = std::max(std::max(raft_base_margin, raft_interface_margin), raft_surface_margin);
     if (storage.draft_protection_shield.size() > 0)
     {
         Polygons draft_shield_raft
             = storage.draft_protection_shield
                   .offset(shield_line_width_layer0) // start half a line width outside shield
-                  .difference(storage.draft_protection_shield.offset(-distance - shield_line_width_layer0 / 2, ClipperLib::jtRound)); // end distance inside shield
-        storage.raftOutline = storage.raftOutline.unionPolygons(draft_shield_raft);
+                  .difference(storage.draft_protection_shield.offset(-max_raft_distance - shield_line_width_layer0 / 2, ClipperLib::jtRound)); // end distance inside shield
+        storage.raftBaseOutline = storage.raftBaseOutline.unionPolygons(draft_shield_raft);
+        storage.raftSurfaceOutline = storage.raftSurfaceOutline.unionPolygons(draft_shield_raft);
+        storage.raftInterfaceOutline = storage.raftInterfaceOutline.unionPolygons(draft_shield_raft);
     }
     if (storage.oozeShield.size() > 0 && storage.oozeShield[0].size() > 0)
     {
         const Polygons& ooze_shield = storage.oozeShield[0];
         Polygons ooze_shield_raft = ooze_shield
                                         .offset(shield_line_width_layer0) // start half a line width outside shield
-                                        .difference(ooze_shield.offset(-distance - shield_line_width_layer0 / 2, ClipperLib::jtRound)); // end distance inside shield
-        storage.raftOutline = storage.raftOutline.unionPolygons(ooze_shield_raft);
+                                        .difference(ooze_shield.offset(-max_raft_distance - shield_line_width_layer0 / 2, ClipperLib::jtRound)); // end distance inside shield
+        storage.raftBaseOutline = storage.raftBaseOutline.unionPolygons(ooze_shield_raft);
+        storage.raftSurfaceOutline = storage.raftSurfaceOutline.unionPolygons(ooze_shield_raft);
+        storage.raftInterfaceOutline = storage.raftInterfaceOutline.unionPolygons(ooze_shield_raft);
     }
 
-    if (settings.get<bool>("raft_remove_inside_corners"))
-    {
-        storage.raftOutline.makeConvex();
-    }
-    else
+    const auto remove_inside_corners = [](Polygons& outline, bool remove_inside_corners, coord_t smoothing)
     {
-        const coord_t smoothing = settings.get<coord_t>("raft_smoothing");
-        storage.raftOutline = storage.raftOutline.offset(smoothing, ClipperLib::jtRound).offset(-smoothing, ClipperLib::jtRound); // remove small holes and smooth inward corners
-    }
+        if (remove_inside_corners)
+        {
+            outline.makeConvex();
+        }
+        else
+        {
+            outline = outline.offset(smoothing, ClipperLib::jtRound).offset(-smoothing, ClipperLib::jtRound);
+        }
+    };
+    remove_inside_corners(storage.raftBaseOutline, settings.get<bool>("raft_base_remove_inside_corners"), settings.get<coord_t>("raft_base_smoothing"));
+    remove_inside_corners(storage.raftInterfaceOutline, settings.get<bool>("raft_interface_remove_inside_corners"), settings.get<coord_t>("raft_interface_smoothing"));
+    remove_inside_corners(storage.raftSurfaceOutline, settings.get<bool>("raft_surface_remove_inside_corners"), settings.get<coord_t>("raft_surface_smoothing"));
 
     if (storage.primeTower.enabled_ && ! storage.primeTower.would_have_actual_tower_)
     {
@@ -121,5 +140,37 @@ size_t Raft::getTotalExtraLayers()
     return 1 + interface_train.settings_.get<size_t>("raft_interface_layers") + surface_train.settings_.get<size_t>("raft_surface_layers") + getFillerLayerCount();
 }
 
+Raft::LayerType Raft::getLayerType(LayerIndex layer_index)
+{
+    const Settings& mesh_group_settings = Application::getInstance().current_slice_->scene.current_mesh_group->settings;
+    const ExtruderTrain& base_train = mesh_group_settings.get<ExtruderTrain&>("raft_base_extruder_nr");
+    const ExtruderTrain& interface_train = mesh_group_settings.get<ExtruderTrain&>("raft_interface_extruder_nr");
+    const ExtruderTrain& surface_train = mesh_group_settings.get<ExtruderTrain&>("raft_surface_extruder_nr");
+    const auto airgap = Raft::getFillerLayerCount();
+    const auto interface_layers = interface_train.settings_.get<size_t>("raft_interface_layers");
+    const auto surface_layers = surface_train.settings_.get<size_t>("raft_surface_layers");
+
+    if (layer_index < -airgap - surface_layers - interface_layers)
+    {
+        return LayerType::RaftBase;
+    }
+    if (layer_index < -airgap - surface_layers)
+    {
+        return LayerType::RaftInterface;
+    }
+    if (layer_index < -airgap)
+    {
+        return LayerType::RaftSurface;
+    }
+    else if (layer_index < 0)
+    {
+        return LayerType::Airgap;
+    }
+    else
+    {
+        return LayerType::Model;
+    }
+}
+
 
 } // namespace cura
diff --git a/src/sliceDataStorage.cpp b/src/sliceDataStorage.cpp
index 94e2ccf16f..e87250191b 100644
--- a/src/sliceDataStorage.cpp
+++ b/src/sliceDataStorage.cpp
@@ -271,13 +271,41 @@ Polygons
         const
 {
     const Settings& mesh_group_settings = Application::getInstance().current_slice_->scene.current_mesh_group->settings;
-    if (layer_nr < 0 && layer_nr < -static_cast<LayerIndex>(Raft::getFillerLayerCount()))
-    { // when processing raft
-        if (include_support && (extruder_nr == -1 || extruder_nr == int(mesh_group_settings.get<ExtruderTrain&>("adhesion_extruder_nr").extruder_nr_)))
+
+    const auto layer_type = Raft::getLayerType(layer_nr);
+    switch (layer_type)
+    {
+    case Raft::LayerType::RaftBase:
+    case Raft::LayerType::RaftInterface:
+    case Raft::LayerType::RaftSurface:
+    {
+        const Polygons* raftOutline;
+        bool use_current_extruder_for_raft = extruder_nr == -1;
+
+        switch (layer_type)
+        {
+        case Raft::LayerType::RaftBase:
+            raftOutline = &raftBaseOutline;
+            use_current_extruder_for_raft |= extruder_nr == int(mesh_group_settings.get<ExtruderTrain&>("raft_base_extruder_nr").extruder_nr_);
+            break;
+        case Raft::LayerType::RaftInterface:
+            raftOutline = &raftInterfaceOutline;
+            use_current_extruder_for_raft |= extruder_nr == int(mesh_group_settings.get<ExtruderTrain&>("raft_interface_extruder_nr").extruder_nr_);
+            break;
+        case Raft::LayerType::RaftSurface:
+            raftOutline = &raftSurfaceOutline;
+            use_current_extruder_for_raft |= extruder_nr == int(mesh_group_settings.get<ExtruderTrain&>("raft_surface_extruder_nr").extruder_nr_);
+            break;
+        default:
+            assert(false && "unreachable due to outer switch statement");
+            return Polygons();
+        }
+
+        if (include_support && use_current_extruder_for_raft)
         {
             if (external_polys_only)
             {
-                std::vector<PolygonsPart> parts = raftOutline.splitIntoParts();
+                std::vector<PolygonsPart> parts = raftOutline->splitIntoParts();
                 Polygons result;
                 for (PolygonsPart& part : parts)
                 {
@@ -287,15 +315,17 @@ Polygons
             }
             else
             {
-                return raftOutline;
+                return *raftOutline;
             }
         }
         else
         {
             return Polygons();
         }
+        break;
     }
-    else
+    case Raft::LayerType::Airgap:
+    case Raft::LayerType::Model:
     {
         Polygons total;
         if (layer_nr >= 0)
@@ -338,6 +368,10 @@ Polygons
         }
         return total;
     }
+    default:
+        assert(false && "unreachable as switch statement is exhaustive");
+        return Polygons();
+    }
 }
 
 std::vector<bool> SliceDataStorage::getExtrudersUsed() const
diff --git a/src/support.cpp b/src/support.cpp
index 5db274bfdd..09aff457c7 100644
--- a/src/support.cpp
+++ b/src/support.cpp
@@ -539,9 +539,9 @@ Polygons AreaSupport::join(const SliceDataStorage& storage, const Polygons& supp
             break;
         case EPlatformAdhesion::RAFT:
         {
-            adhesion_size = std::max({ mesh_group_settings.get<ExtruderTrain&>("raft_base_extruder_nr").settings_.get<coord_t>("raft_margin"),
-                                       mesh_group_settings.get<ExtruderTrain&>("raft_interface_extruder_nr").settings_.get<coord_t>("raft_margin"),
-                                       mesh_group_settings.get<ExtruderTrain&>("raft_surface_extruder_nr").settings_.get<coord_t>("raft_margin") });
+            adhesion_size = std::max({ mesh_group_settings.get<ExtruderTrain&>("raft_base_extruder_nr").settings_.get<coord_t>("raft_base_margin"),
+                                       mesh_group_settings.get<ExtruderTrain&>("raft_interface_extruder_nr").settings_.get<coord_t>("raft_interface_margin"),
+                                       mesh_group_settings.get<ExtruderTrain&>("raft_surface_extruder_nr").settings_.get<coord_t>("raft_surface_margin") });
             break;
         }
         case EPlatformAdhesion::NONE:
diff --git a/stress_benchmark/resources/001.settings b/stress_benchmark/resources/001.settings
index d56461c776..71ee472bd9 100644
--- a/stress_benchmark/resources/001.settings
+++ b/stress_benchmark/resources/001.settings
@@ -271,7 +271,9 @@ infill_mesh_order=0
 retraction_prime_speed=5
 z_seam_type=sharpest_corner
 ironing_only_highest_layer=False
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 acceleration_topbottom=300
 machine_settings=0
 travel_retract_before_outer_wall=False
@@ -502,7 +504,9 @@ acceleration_infill=300
 support_skip_some_zags=False
 material_end_of_filament_purge_speed=0.5
 machine_max_jerk_e=5.0
-raft_margin=3
+raft_base_margin=3
+raft_interface_margin=3
+raft_surface_margin=3
 support_interface_angles=[]
 support_roof_height=1.015
 smooth_spiralized_contours=True
diff --git a/stress_benchmark/resources/002.settings b/stress_benchmark/resources/002.settings
index c5ec85db58..c63aba30f3 100644
--- a/stress_benchmark/resources/002.settings
+++ b/stress_benchmark/resources/002.settings
@@ -83,7 +83,9 @@ ironing_line_spacing=0.1
 support_infill_sparse_thickness=0.2
 material_bed_temperature_layer_0=50
 machine_max_jerk_e=5
-raft_margin=5
+raft_base_margin=5
+raft_interface_margin=5
+raft_surface_margin=5
 machine_scale_fan_speed_zero_to_one=False
 wall_x_material_flow=100
 cool_fan_speed=100.0
@@ -596,7 +598,9 @@ support_bottom_wall_count=0
 jerk_wall_x=8
 draft_shield_height_limitation=full
 bridge_sparse_infill_max_density=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 cooling=0
 infill_support_angle=40
@@ -1057,7 +1061,9 @@ bridge_skin_density_3=80
 min_feature_size=0.1
 infill_sparse_thickness=0.2
 command_line_settings=0
-raft_margin=5
+raft_base_margin=5
+raft_interface_margin=5
+raft_surface_margin=5
 material_end_of_filament_purge_speed=0.5
 speed_support=25.0
 machine_extruder_cooling_fan_number=0
diff --git a/stress_benchmark/resources/003.settings b/stress_benchmark/resources/003.settings
index d0fd7a001a..1a0de365f5 100644
--- a/stress_benchmark/resources/003.settings
+++ b/stress_benchmark/resources/003.settings
@@ -83,7 +83,9 @@ ironing_line_spacing=0.1
 support_infill_sparse_thickness=0.12
 material_bed_temperature_layer_0=65
 machine_max_jerk_e=5
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 machine_scale_fan_speed_zero_to_one=False
 wall_x_material_flow=100
 cool_fan_speed=100.0
@@ -597,7 +599,9 @@ support_bottom_wall_count=0
 jerk_wall_x=8
 draft_shield_height_limitation=full
 bridge_sparse_infill_max_density=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 cooling=0
 infill_support_angle=40
@@ -1058,7 +1062,9 @@ bridge_skin_density_3=80
 min_feature_size=0.105
 infill_sparse_thickness=0.12
 command_line_settings=0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 material_end_of_filament_purge_speed=0.5
 speed_support=25.0
 machine_extruder_cooling_fan_number=0
diff --git a/stress_benchmark/resources/004.settings b/stress_benchmark/resources/004.settings
index 4683743db7..74603b80f0 100644
--- a/stress_benchmark/resources/004.settings
+++ b/stress_benchmark/resources/004.settings
@@ -83,7 +83,9 @@ ironing_line_spacing=0.1
 support_infill_sparse_thickness=0.1
 material_bed_temperature_layer_0=70
 machine_max_jerk_e=5
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 machine_scale_fan_speed_zero_to_one=False
 wall_x_material_flow=100
 cool_fan_speed=100.0
@@ -597,7 +599,9 @@ support_bottom_wall_count=0
 jerk_wall_x=8
 draft_shield_height_limitation=full
 bridge_sparse_infill_max_density=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 cooling=0
 infill_support_angle=40
@@ -1058,7 +1062,9 @@ bridge_skin_density_3=80
 min_feature_size=0.1
 infill_sparse_thickness=0.1
 command_line_settings=0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 material_end_of_filament_purge_speed=0.5
 speed_support=30
 machine_extruder_cooling_fan_number=0
diff --git a/stress_benchmark/resources/005.settings b/stress_benchmark/resources/005.settings
index b4ee5d4563..4352f108a2 100644
--- a/stress_benchmark/resources/005.settings
+++ b/stress_benchmark/resources/005.settings
@@ -83,7 +83,9 @@ ironing_line_spacing=0.1
 support_infill_sparse_thickness=0.2
 material_bed_temperature_layer_0=55
 machine_max_jerk_e=5
-raft_margin=5.0
+raft_base_margin=5
+raft_interface_margin=5
+raft_surface_margin=5
 machine_scale_fan_speed_zero_to_one=False
 wall_x_material_flow=100
 cool_fan_speed=100.0
@@ -598,7 +600,9 @@ support_bottom_wall_count=0
 jerk_wall_x=8
 draft_shield_height_limitation=full
 bridge_sparse_infill_max_density=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 cooling=0
 infill_support_angle=40
@@ -1059,7 +1063,9 @@ bridge_skin_density_3=80
 min_feature_size=0.1
 infill_sparse_thickness=0.2
 command_line_settings=0
-raft_margin=5.0
+raft_base_margin=5
+raft_interface_margin=5
+raft_surface_margin=5
 material_end_of_filament_purge_speed=0.5
 speed_support=25.0
 machine_extruder_cooling_fan_number=0
diff --git a/stress_benchmark/resources/006.settings b/stress_benchmark/resources/006.settings
index ec75660851..9a94d8f6da 100644
--- a/stress_benchmark/resources/006.settings
+++ b/stress_benchmark/resources/006.settings
@@ -83,7 +83,9 @@ ironing_line_spacing=0.1
 support_infill_sparse_thickness=0.2
 material_bed_temperature_layer_0=60
 machine_max_jerk_e=5
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 machine_scale_fan_speed_zero_to_one=False
 wall_x_material_flow=100
 cool_fan_speed=100.0
@@ -598,7 +600,9 @@ support_bottom_wall_count=0
 jerk_wall_x=8
 draft_shield_height_limitation=full
 bridge_sparse_infill_max_density=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 cooling=0
 infill_support_angle=40
@@ -1059,7 +1063,9 @@ bridge_skin_density_3=80
 min_feature_size=0.1
 infill_sparse_thickness=0.2
 command_line_settings=0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 material_end_of_filament_purge_speed=0.5
 speed_support=25.0
 machine_extruder_cooling_fan_number=0
diff --git a/stress_benchmark/resources/007.settings b/stress_benchmark/resources/007.settings
index 635226ed8c..4e98a3d2e7 100644
--- a/stress_benchmark/resources/007.settings
+++ b/stress_benchmark/resources/007.settings
@@ -83,7 +83,9 @@ ironing_line_spacing=0.1
 support_infill_sparse_thickness=0.2
 material_bed_temperature_layer_0=60
 machine_max_jerk_e=5
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 machine_scale_fan_speed_zero_to_one=False
 wall_x_material_flow=100
 cool_fan_speed=100.0
@@ -598,7 +600,9 @@ support_bottom_wall_count=0
 jerk_wall_x=8
 draft_shield_height_limitation=full
 bridge_sparse_infill_max_density=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 cooling=0
 infill_support_angle=40
@@ -1059,7 +1063,9 @@ bridge_skin_density_3=80
 min_feature_size=0.1
 infill_sparse_thickness=0.2
 command_line_settings=0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 material_end_of_filament_purge_speed=0.5
 speed_support=40.0
 machine_extruder_cooling_fan_number=0
diff --git a/stress_benchmark/resources/008.settings b/stress_benchmark/resources/008.settings
index f4771e572b..b4aca3d5ff 100644
--- a/stress_benchmark/resources/008.settings
+++ b/stress_benchmark/resources/008.settings
@@ -347,7 +347,9 @@ wall_0_material_flow=100
 meshfix_maximum_extrusion_area_deviation=50000
 wall_0_wipe_dist=0.2
 ironing_only_highest_layer=False
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 machine_max_feedrate_e=45
 prime_tower_line_width=0.4
 wall_line_width_x=0.4
@@ -370,7 +372,9 @@ support_tree_top_rate=10
 cross_infill_pocket_size=6.0
 material_end_of_filament_purge_speed=0.5
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 acceleration_support_roof=1000
 support_roof_offset=0.0
 wipe_retraction_prime_speed=45
@@ -899,7 +903,9 @@ wall_line_width_0=0.4
 support_tree_top_rate=10
 cross_infill_pocket_size=6.0
 material_end_of_filament_purge_speed=0.5
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 material_break_preparation_temperature=210
 wall_transition_filter_deviation=0.1
 support_tree_max_diameter_increase_by_merges_when_support_to_model=1
diff --git a/stress_benchmark/resources/009.settings b/stress_benchmark/resources/009.settings
index f4771e572b..b4aca3d5ff 100644
--- a/stress_benchmark/resources/009.settings
+++ b/stress_benchmark/resources/009.settings
@@ -347,7 +347,9 @@ wall_0_material_flow=100
 meshfix_maximum_extrusion_area_deviation=50000
 wall_0_wipe_dist=0.2
 ironing_only_highest_layer=False
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 machine_max_feedrate_e=45
 prime_tower_line_width=0.4
 wall_line_width_x=0.4
@@ -370,7 +372,9 @@ support_tree_top_rate=10
 cross_infill_pocket_size=6.0
 material_end_of_filament_purge_speed=0.5
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 acceleration_support_roof=1000
 support_roof_offset=0.0
 wipe_retraction_prime_speed=45
@@ -899,7 +903,9 @@ wall_line_width_0=0.4
 support_tree_top_rate=10
 cross_infill_pocket_size=6.0
 material_end_of_filament_purge_speed=0.5
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 material_break_preparation_temperature=210
 wall_transition_filter_deviation=0.1
 support_tree_max_diameter_increase_by_merges_when_support_to_model=1
diff --git a/stress_benchmark/resources/010.settings b/stress_benchmark/resources/010.settings
index f4771e572b..b4aca3d5ff 100644
--- a/stress_benchmark/resources/010.settings
+++ b/stress_benchmark/resources/010.settings
@@ -347,7 +347,9 @@ wall_0_material_flow=100
 meshfix_maximum_extrusion_area_deviation=50000
 wall_0_wipe_dist=0.2
 ironing_only_highest_layer=False
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 machine_max_feedrate_e=45
 prime_tower_line_width=0.4
 wall_line_width_x=0.4
@@ -370,7 +372,9 @@ support_tree_top_rate=10
 cross_infill_pocket_size=6.0
 material_end_of_filament_purge_speed=0.5
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 acceleration_support_roof=1000
 support_roof_offset=0.0
 wipe_retraction_prime_speed=45
@@ -899,7 +903,9 @@ wall_line_width_0=0.4
 support_tree_top_rate=10
 cross_infill_pocket_size=6.0
 material_end_of_filament_purge_speed=0.5
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 material_break_preparation_temperature=210
 wall_transition_filter_deviation=0.1
 support_tree_max_diameter_increase_by_merges_when_support_to_model=1
diff --git a/stress_benchmark/resources/011.settings b/stress_benchmark/resources/011.settings
index 3f63e86a10..c789ab5a63 100644
--- a/stress_benchmark/resources/011.settings
+++ b/stress_benchmark/resources/011.settings
@@ -83,7 +83,9 @@ ironing_line_spacing=0.1
 support_infill_sparse_thickness=0.2
 material_bed_temperature_layer_0=60
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 machine_scale_fan_speed_zero_to_one=False
 wall_x_material_flow=100
 cool_fan_speed=100.0
@@ -599,7 +601,9 @@ support_bottom_wall_count=0
 jerk_wall_x=20
 draft_shield_height_limitation=full
 bridge_sparse_infill_max_density=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 cooling=0
 infill_support_angle=40
@@ -1059,7 +1063,9 @@ bridge_skin_density_3=80
 min_feature_size=0.1
 infill_sparse_thickness=0.2
 command_line_settings=0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 material_end_of_filament_purge_speed=0.5
 speed_support=60
 machine_extruder_cooling_fan_number=0
diff --git a/stress_benchmark/resources/012.settings b/stress_benchmark/resources/012.settings
index 712087c5e2..db4584485c 100644
--- a/stress_benchmark/resources/012.settings
+++ b/stress_benchmark/resources/012.settings
@@ -28,7 +28,9 @@ material_initial_print_temperature=250
 jerk_skirt_brim=12.5
 roofing_monotonic=True
 machine_max_jerk_e=5.0
-raft_margin=3
+raft_base_margin=3
+raft_interface_margin=3
+raft_surface_margin=3
 bottom_thickness=1.0
 skirt_height=3
 speed_travel_layer_0=250.0
@@ -588,7 +590,9 @@ jerk_infill=12.5
 draft_shield_height_limitation=full
 layer_height_0=0.2
 jerk_print=12.5
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 support_pattern=lines
 infill_support_angle=40
 raft_base_acceleration=300
diff --git a/stress_benchmark/resources/013.settings b/stress_benchmark/resources/013.settings
index dd1893e2c9..692c6164cc 100644
--- a/stress_benchmark/resources/013.settings
+++ b/stress_benchmark/resources/013.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=8
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.04
 small_feature_max_length=0.0
@@ -212,7 +214,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=55
 raft_base_speed=16.875
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/014.settings b/stress_benchmark/resources/014.settings
index 3838f85463..77d3f128f7 100644
--- a/stress_benchmark/resources/014.settings
+++ b/stress_benchmark/resources/014.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=8
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.02
 small_feature_max_length=0.0
@@ -212,7 +214,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=50
 raft_base_speed=30.0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/015.settings b/stress_benchmark/resources/015.settings
index b2a53600c9..55af6339c5 100644
--- a/stress_benchmark/resources/015.settings
+++ b/stress_benchmark/resources/015.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=20
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.02
 small_feature_max_length=0.0
@@ -212,7 +214,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=0
 raft_base_speed=37.5
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/016.settings b/stress_benchmark/resources/016.settings
index af2f42cf1e..fed8689b55 100644
--- a/stress_benchmark/resources/016.settings
+++ b/stress_benchmark/resources/016.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=8
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5
-raft_margin=5
+raft_base_margin=5
+raft_interface_margin=5
+raft_surface_margin=5
 roofing_monotonic=True
 skin_overlap_mm=0.04
 small_feature_max_length=0.0
@@ -212,7 +214,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=45
 raft_base_speed=18.75
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/017.settings b/stress_benchmark/resources/017.settings
index 02d045445e..d63440f363 100644
--- a/stress_benchmark/resources/017.settings
+++ b/stress_benchmark/resources/017.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=12.0
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.12
 small_feature_max_length=0.0
@@ -212,7 +214,9 @@ support_interface_line_width=0.42
 support_skip_zag_per_mm=20
 support_angle=40
 raft_base_speed=18.75
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.38
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/018.settings b/stress_benchmark/resources/018.settings
index 2b377d53e0..64168b1780 100644
--- a/stress_benchmark/resources/018.settings
+++ b/stress_benchmark/resources/018.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=8
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5
-raft_margin=5.0
+raft_base_margin=5
+raft_interface_margin=5
+raft_surface_margin=5
 roofing_monotonic=True
 skin_overlap_mm=0.04
 small_feature_max_length=0.0
@@ -212,7 +214,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=65.0
 raft_base_speed=18.75
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/019.settings b/stress_benchmark/resources/019.settings
index 8910e83a35..e1a9b826ee 100644
--- a/stress_benchmark/resources/019.settings
+++ b/stress_benchmark/resources/019.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=8
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.04
 small_feature_max_length=0.0
@@ -212,7 +214,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=45
 raft_base_speed=30.0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/020.settings b/stress_benchmark/resources/020.settings
index 87cecf33c7..a38b801b56 100644
--- a/stress_benchmark/resources/020.settings
+++ b/stress_benchmark/resources/020.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=20
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.04
 small_feature_max_length=0.0
@@ -212,7 +214,9 @@ support_interface_line_width=0.8
 support_skip_zag_per_mm=20
 support_angle=55
 raft_base_speed=30.0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.8
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/021.settings b/stress_benchmark/resources/021.settings
index 8ddb9175ff..8f09ee7382 100644
--- a/stress_benchmark/resources/021.settings
+++ b/stress_benchmark/resources/021.settings
@@ -135,7 +135,9 @@ raft_interface_jerk=30
 material_shrinkage_percentage=100.1
 support_interface_wall_count=1
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.08
 small_feature_max_length=0.0
@@ -213,7 +215,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=60
 raft_base_speed=15
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/022.settings b/stress_benchmark/resources/022.settings
index 6d484adf38..ca4041d688 100644
--- a/stress_benchmark/resources/022.settings
+++ b/stress_benchmark/resources/022.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=20
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5.0
-raft_margin=15.0
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.084
 small_feature_max_length=0.0
@@ -212,7 +214,9 @@ support_interface_line_width=0.42000000000000004
 support_skip_zag_per_mm=20
 support_angle=50
 raft_base_speed=12.0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.42000000000000004
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/023.settings b/stress_benchmark/resources/023.settings
index abc56c6905..c630167843 100644
--- a/stress_benchmark/resources/023.settings
+++ b/stress_benchmark/resources/023.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=10.0
 material_shrinkage_percentage=100.0
 support_interface_wall_count=1
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.044000000000000004
 small_feature_max_length=15.707963267948966
@@ -212,7 +214,9 @@ support_interface_line_width=0.44
 support_skip_zag_per_mm=20
 support_angle=50
 raft_base_speed=56.25
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=True
 roofing_line_width=0.44
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/024.settings b/stress_benchmark/resources/024.settings
index 05c420b03e..4ccc228f0e 100644
--- a/stress_benchmark/resources/024.settings
+++ b/stress_benchmark/resources/024.settings
@@ -135,7 +135,9 @@ raft_interface_jerk=8
 material_shrinkage_percentage=100.0
 support_interface_wall_count=1
 machine_max_jerk_e=5
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.08
 small_feature_max_length=0.0
@@ -213,7 +215,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=45
 raft_base_speed=26.25
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/025.settings b/stress_benchmark/resources/025.settings
index a6e3d3500e..70275e935e 100644
--- a/stress_benchmark/resources/025.settings
+++ b/stress_benchmark/resources/025.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=20
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.02
 small_feature_max_length=0.0
@@ -212,7 +214,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=50
 raft_base_speed=22.5
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/026.settings b/stress_benchmark/resources/026.settings
index a008515e9f..83110138e7 100644
--- a/stress_benchmark/resources/026.settings
+++ b/stress_benchmark/resources/026.settings
@@ -135,7 +135,9 @@ raft_interface_jerk=20
 material_shrinkage_percentage=100.2
 support_interface_wall_count=1
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.08
 small_feature_max_length=0.0
@@ -213,7 +215,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=45
 raft_base_speed=15
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/027.settings b/stress_benchmark/resources/027.settings
index 1b4b00078a..6dccc78fad 100644
--- a/stress_benchmark/resources/027.settings
+++ b/stress_benchmark/resources/027.settings
@@ -135,7 +135,9 @@ raft_interface_jerk=50.0
 material_shrinkage_percentage=100.3
 support_interface_wall_count=1
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.08
 small_feature_max_length=0.0
@@ -213,7 +215,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=45
 raft_base_speed=15
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/028.settings b/stress_benchmark/resources/028.settings
index 7f958d05c2..7e1d34e6f2 100644
--- a/stress_benchmark/resources/028.settings
+++ b/stress_benchmark/resources/028.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=20
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.1
 small_feature_max_length=0.0
@@ -212,7 +214,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=50
 raft_base_speed=22.5
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/029.settings b/stress_benchmark/resources/029.settings
index 823bf8129b..2863e74b64 100644
--- a/stress_benchmark/resources/029.settings
+++ b/stress_benchmark/resources/029.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=20
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.04
 small_feature_max_length=15.707963267948966
@@ -212,7 +214,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=60
 raft_base_speed=56.25
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=True
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/030.settings b/stress_benchmark/resources/030.settings
index f003931b0a..fda295d176 100644
--- a/stress_benchmark/resources/030.settings
+++ b/stress_benchmark/resources/030.settings
@@ -135,7 +135,9 @@ raft_interface_jerk=20
 material_shrinkage_percentage=100.2
 support_interface_wall_count=1
 machine_max_jerk_e=5.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.08
 small_feature_max_length=0.0
@@ -213,7 +215,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=60
 raft_base_speed=15
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/031.settings b/stress_benchmark/resources/031.settings
index 35ea2a8526..40d89ac715 100644
--- a/stress_benchmark/resources/031.settings
+++ b/stress_benchmark/resources/031.settings
@@ -134,7 +134,9 @@ raft_interface_jerk=8
 material_shrinkage_percentage=100.0
 support_interface_wall_count=0
 machine_max_jerk_e=5
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 roofing_monotonic=True
 skin_overlap_mm=0.04
 small_feature_max_length=0.0
@@ -212,7 +214,9 @@ support_interface_line_width=0.4
 support_skip_zag_per_mm=20
 support_angle=45
 raft_base_speed=18.75
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 ironing_only_highest_layer=False
 roofing_line_width=0.4
 hole_xy_offset=0
diff --git a/stress_benchmark/resources/032.settings b/stress_benchmark/resources/032.settings
index 8187ab3099..d27cae81b7 100644
--- a/stress_benchmark/resources/032.settings
+++ b/stress_benchmark/resources/032.settings
@@ -443,7 +443,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=sharpest_corner
 prime_tower_base_size=7
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -555,7 +557,9 @@ wipe_pause=0
 material_standby_temperature=175
 jerk_wall=8
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=1000
 support_roof_wall_count=0
 raft_jerk=8
diff --git a/stress_benchmark/resources/033.settings b/stress_benchmark/resources/033.settings
index 5783e17291..e061183e7e 100644
--- a/stress_benchmark/resources/033.settings
+++ b/stress_benchmark/resources/033.settings
@@ -445,7 +445,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=sharpest_corner
 prime_tower_base_size=8.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -557,7 +559,9 @@ wipe_pause=0
 material_standby_temperature=175
 jerk_wall=20
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=3000
 support_roof_wall_count=0
 raft_jerk=20
diff --git a/stress_benchmark/resources/034.settings b/stress_benchmark/resources/034.settings
index 0ed9af0382..ef2d14e75c 100644
--- a/stress_benchmark/resources/034.settings
+++ b/stress_benchmark/resources/034.settings
@@ -442,7 +442,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=back
 prime_tower_base_size=5
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -554,7 +556,9 @@ wipe_pause=0
 material_standby_temperature=180
 jerk_wall=8
 machine_nozzle_cool_down_speed=2.0
-raft_margin=5
+raft_base_margin=5
+raft_interface_margin=5
+raft_surface_margin=5
 raft_acceleration=500
 support_roof_wall_count=0
 raft_jerk=8
diff --git a/stress_benchmark/resources/035.settings b/stress_benchmark/resources/035.settings
index 0106e70349..07cfade33e 100644
--- a/stress_benchmark/resources/035.settings
+++ b/stress_benchmark/resources/035.settings
@@ -444,7 +444,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=sharpest_corner
 prime_tower_base_size=8.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -556,7 +558,9 @@ wipe_pause=0
 material_standby_temperature=180
 jerk_wall=8
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=500
 support_roof_wall_count=0
 raft_jerk=8
diff --git a/stress_benchmark/resources/036.settings b/stress_benchmark/resources/036.settings
index 496ddb57a3..5a87f6f72f 100644
--- a/stress_benchmark/resources/036.settings
+++ b/stress_benchmark/resources/036.settings
@@ -443,7 +443,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=sharpest_corner
 prime_tower_base_size=8.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -555,7 +557,9 @@ wipe_pause=0
 material_standby_temperature=180
 jerk_wall=12.0
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=500
 support_roof_wall_count=0
 raft_jerk=12.0
diff --git a/stress_benchmark/resources/037.settings b/stress_benchmark/resources/037.settings
index 4a40bf459b..c3b00ba245 100644
--- a/stress_benchmark/resources/037.settings
+++ b/stress_benchmark/resources/037.settings
@@ -443,7 +443,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=back
 prime_tower_base_size=8.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -555,7 +557,9 @@ wipe_pause=0
 material_standby_temperature=175
 jerk_wall=8
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=350
 support_roof_wall_count=0
 raft_jerk=8
diff --git a/stress_benchmark/resources/038.settings b/stress_benchmark/resources/038.settings
index 853b097d2d..4fa621641d 100644
--- a/stress_benchmark/resources/038.settings
+++ b/stress_benchmark/resources/038.settings
@@ -444,7 +444,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=back
 prime_tower_base_size=5.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -556,7 +558,9 @@ wipe_pause=0
 material_standby_temperature=175
 jerk_wall=8
 machine_nozzle_cool_down_speed=2.0
-raft_margin=5.0
+raft_base_margin=5
+raft_interface_margin=5
+raft_surface_margin=5
 raft_acceleration=500
 support_roof_wall_count=0
 raft_jerk=8
diff --git a/stress_benchmark/resources/039.settings b/stress_benchmark/resources/039.settings
index 3810b98181..be719c02d9 100644
--- a/stress_benchmark/resources/039.settings
+++ b/stress_benchmark/resources/039.settings
@@ -444,7 +444,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=back
 prime_tower_base_size=8.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -556,7 +558,9 @@ wipe_pause=0
 material_standby_temperature=180.0
 jerk_wall=8
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=500
 support_roof_wall_count=0
 raft_jerk=8
diff --git a/stress_benchmark/resources/040.settings b/stress_benchmark/resources/040.settings
index 9df0af97c1..86c045c3f9 100644
--- a/stress_benchmark/resources/040.settings
+++ b/stress_benchmark/resources/040.settings
@@ -443,7 +443,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=back
 prime_tower_base_size=8.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -556,7 +558,9 @@ wipe_pause=0
 material_standby_temperature=175
 jerk_wall=20
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=3000
 support_roof_wall_count=0
 raft_jerk=20
diff --git a/stress_benchmark/resources/041.settings b/stress_benchmark/resources/041.settings
index 6054309199..68d1e291d4 100644
--- a/stress_benchmark/resources/041.settings
+++ b/stress_benchmark/resources/041.settings
@@ -447,7 +447,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=sharpest_corner
 prime_tower_base_size=8.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0
 material_shrinkage_percentage_z=100.0
@@ -559,7 +561,9 @@ wipe_pause=0
 material_standby_temperature=180.0
 jerk_wall=8
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=500
 support_roof_wall_count=1
 raft_jerk=8
diff --git a/stress_benchmark/resources/042.settings b/stress_benchmark/resources/042.settings
index 91100ebe88..6407e893e6 100644
--- a/stress_benchmark/resources/042.settings
+++ b/stress_benchmark/resources/042.settings
@@ -444,7 +444,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=sharpest_corner
 prime_tower_base_size=8.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -557,7 +559,9 @@ wipe_pause=0
 material_standby_temperature=175
 jerk_wall=8
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=500
 support_roof_wall_count=0
 raft_jerk=8
diff --git a/stress_benchmark/resources/043.settings b/stress_benchmark/resources/043.settings
index 6e142cc7e7..74cf037495 100644
--- a/stress_benchmark/resources/043.settings
+++ b/stress_benchmark/resources/043.settings
@@ -446,7 +446,9 @@ multiple_mesh_overlap=0
 z_seam_type=sharpest_corner
 prime_tower_base_size=3
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.8
 material_shrinkage_percentage_z=100.0
@@ -558,7 +560,9 @@ wipe_pause=0
 material_standby_temperature=100
 jerk_wall=20
 machine_nozzle_cool_down_speed=0.75
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=3500
 support_roof_wall_count=1
 raft_jerk=20
diff --git a/stress_benchmark/resources/044.settings b/stress_benchmark/resources/044.settings
index db0ea47a59..6c76fcfa34 100644
--- a/stress_benchmark/resources/044.settings
+++ b/stress_benchmark/resources/044.settings
@@ -446,7 +446,9 @@ multiple_mesh_overlap=0
 z_seam_type=sharpest_corner
 prime_tower_base_size=3
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.2
@@ -558,7 +560,9 @@ wipe_pause=0
 material_standby_temperature=100
 jerk_wall=20
 machine_nozzle_cool_down_speed=0.75
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=3500
 support_roof_wall_count=1
 raft_jerk=20
diff --git a/stress_benchmark/resources/045.settings b/stress_benchmark/resources/045.settings
index c93fd544aa..442c9a56b7 100644
--- a/stress_benchmark/resources/045.settings
+++ b/stress_benchmark/resources/045.settings
@@ -445,7 +445,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=sharpest_corner
 prime_tower_base_size=8.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -558,7 +560,9 @@ wipe_pause=0
 material_standby_temperature=175
 jerk_wall=20
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=3000
 support_roof_wall_count=0
 raft_jerk=20
diff --git a/stress_benchmark/resources/046.settings b/stress_benchmark/resources/046.settings
index 2ebb338bdb..8d590679fb 100644
--- a/stress_benchmark/resources/046.settings
+++ b/stress_benchmark/resources/046.settings
@@ -445,7 +445,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=back
 prime_tower_base_size=8.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -557,7 +559,9 @@ wipe_pause=0
 material_standby_temperature=175
 jerk_wall=5
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=1500
 support_roof_wall_count=0
 raft_jerk=5
diff --git a/stress_benchmark/resources/047.settings b/stress_benchmark/resources/047.settings
index 49e632dc16..0d58cef982 100644
--- a/stress_benchmark/resources/047.settings
+++ b/stress_benchmark/resources/047.settings
@@ -445,7 +445,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=sharpest_corner
 prime_tower_base_size=4.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -557,7 +559,9 @@ wipe_pause=0
 material_standby_temperature=175
 jerk_wall=8
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=1800
 support_roof_wall_count=0
 raft_jerk=8
diff --git a/stress_benchmark/resources/048.settings b/stress_benchmark/resources/048.settings
index 73eacc8380..d293d5f621 100644
--- a/stress_benchmark/resources/048.settings
+++ b/stress_benchmark/resources/048.settings
@@ -443,7 +443,9 @@ multiple_mesh_overlap=0.15
 z_seam_type=back
 prime_tower_base_size=8.0
 material_print_temp_wait=True
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wall_distribution_count=1
 support_roof_offset=0.0
 material_shrinkage_percentage_z=100.0
@@ -555,7 +557,9 @@ wipe_pause=0
 material_standby_temperature=180
 jerk_wall=8
 machine_nozzle_cool_down_speed=2.0
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 raft_acceleration=500
 support_roof_wall_count=0
 raft_jerk=8
diff --git a/stress_benchmark/resources/049.settings b/stress_benchmark/resources/049.settings
index 8a534c14c4..cc70c56c37 100644
--- a/stress_benchmark/resources/049.settings
+++ b/stress_benchmark/resources/049.settings
@@ -67,7 +67,9 @@ material_initial_print_temperature=205.0
 layer_0_z_overlap=0.15
 support_roof_enable=True
 acceleration_wall_x_roofing=500
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.12
 machine_nozzle_head_distance=3
@@ -222,7 +224,9 @@ support_bottom_line_distance=1.800018000180002
 support_enable=False
 adhesion_extruder_nr=-1
 print_temperature=210
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wipe_retraction_retract_speed=40
 material_anti_ooze_retracted_position=-4
 layer_height=0.12
diff --git a/stress_benchmark/resources/050.settings b/stress_benchmark/resources/050.settings
index bee0e8f4ce..a16b860daf 100644
--- a/stress_benchmark/resources/050.settings
+++ b/stress_benchmark/resources/050.settings
@@ -67,7 +67,9 @@ material_initial_print_temperature=220
 layer_0_z_overlap=0.15
 support_roof_enable=False
 acceleration_wall_x_roofing=1000
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.2
 machine_nozzle_head_distance=3
@@ -222,7 +224,9 @@ support_bottom_line_distance=0.8
 support_enable=False
 adhesion_extruder_nr=-1
 print_temperature=210
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wipe_retraction_retract_speed=50
 material_anti_ooze_retracted_position=-4
 layer_height=0.2
diff --git a/stress_benchmark/resources/051.settings b/stress_benchmark/resources/051.settings
index fd55479c67..78c8abbd15 100644
--- a/stress_benchmark/resources/051.settings
+++ b/stress_benchmark/resources/051.settings
@@ -67,7 +67,9 @@ material_initial_print_temperature=210.0
 layer_0_z_overlap=0.15
 support_roof_enable=True
 acceleration_wall_x_roofing=400.0
-raft_margin=0
+raft_base_margin=0
+raft_interface_margin=0
+raft_surface_margin=0
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.12
 machine_nozzle_head_distance=3
@@ -223,7 +225,9 @@ support_bottom_line_distance=0.5
 support_enable=False
 adhesion_extruder_nr=-1
 print_temperature=210
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wipe_retraction_retract_speed=20.0
 material_anti_ooze_retracted_position=-4
 layer_height=0.12
diff --git a/stress_benchmark/resources/052.settings b/stress_benchmark/resources/052.settings
index 629a0a2715..dfab6c8c61 100644
--- a/stress_benchmark/resources/052.settings
+++ b/stress_benchmark/resources/052.settings
@@ -67,7 +67,9 @@ material_initial_print_temperature=200
 layer_0_z_overlap=0.15
 support_roof_enable=False
 acceleration_wall_x_roofing=500
-raft_margin=5
+raft_base_margin=5
+raft_interface_margin=5
+raft_surface_margin=5
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.28
 machine_nozzle_head_distance=3
@@ -222,7 +224,9 @@ support_bottom_line_distance=2.8800288002880032
 support_enable=True
 adhesion_extruder_nr=-1
 print_temperature=210
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wipe_retraction_retract_speed=45
 material_anti_ooze_retracted_position=-4
 layer_height=0.28
diff --git a/stress_benchmark/resources/053.settings b/stress_benchmark/resources/053.settings
index 5f59343201..b8cdb66682 100644
--- a/stress_benchmark/resources/053.settings
+++ b/stress_benchmark/resources/053.settings
@@ -67,7 +67,9 @@ material_initial_print_temperature=190
 layer_0_z_overlap=0.15
 support_roof_enable=False
 acceleration_wall_x_roofing=3000
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.1
 machine_nozzle_head_distance=5
@@ -223,7 +225,9 @@ support_bottom_line_distance=0.4
 support_enable=False
 adhesion_extruder_nr=-1
 print_temperature=210
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wipe_retraction_retract_speed=25
 material_anti_ooze_retracted_position=-4
 layer_height=0.1
diff --git a/stress_benchmark/resources/054.settings b/stress_benchmark/resources/054.settings
index 41766d28d4..4903e9647f 100644
--- a/stress_benchmark/resources/054.settings
+++ b/stress_benchmark/resources/054.settings
@@ -67,7 +67,9 @@ material_initial_print_temperature=225.0
 layer_0_z_overlap=0.15
 support_roof_enable=False
 acceleration_wall_x_roofing=1800
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.2
 machine_nozzle_head_distance=3
@@ -222,7 +224,9 @@ support_bottom_line_distance=0.4
 support_enable=True
 adhesion_extruder_nr=-1
 print_temperature=210
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wipe_retraction_retract_speed=25
 material_anti_ooze_retracted_position=-4
 layer_height=0.2
diff --git a/stress_benchmark/resources/055.settings b/stress_benchmark/resources/055.settings
index d4d7856ea3..6868231de8 100644
--- a/stress_benchmark/resources/055.settings
+++ b/stress_benchmark/resources/055.settings
@@ -67,7 +67,9 @@ material_initial_print_temperature=190
 layer_0_z_overlap=0.15
 support_roof_enable=False
 acceleration_wall_x_roofing=3000
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.2
 machine_nozzle_head_distance=3
@@ -223,7 +225,9 @@ support_bottom_line_distance=0.35
 support_enable=False
 adhesion_extruder_nr=-1
 print_temperature=210
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wipe_retraction_retract_speed=50
 material_anti_ooze_retracted_position=-4
 layer_height=0.2
diff --git a/stress_benchmark/resources/056.settings b/stress_benchmark/resources/056.settings
index ae77715c21..8973474b86 100644
--- a/stress_benchmark/resources/056.settings
+++ b/stress_benchmark/resources/056.settings
@@ -67,7 +67,9 @@ material_initial_print_temperature=180
 layer_0_z_overlap=0.15
 support_roof_enable=True
 acceleration_wall_x_roofing=3000
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.1
 machine_nozzle_head_distance=3
@@ -222,7 +224,9 @@ support_bottom_line_distance=0.4
 support_enable=False
 adhesion_extruder_nr=0
 print_temperature=210
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wipe_retraction_retract_speed=60
 material_anti_ooze_retracted_position=-4
 layer_height=0.1
diff --git a/stress_benchmark/resources/057.settings b/stress_benchmark/resources/057.settings
index e69a30998b..bb247ec669 100644
--- a/stress_benchmark/resources/057.settings
+++ b/stress_benchmark/resources/057.settings
@@ -67,7 +67,9 @@ material_initial_print_temperature=183
 layer_0_z_overlap=0.15
 support_roof_enable=True
 acceleration_wall_x_roofing=500
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.5
 machine_nozzle_head_distance=3
@@ -222,7 +224,9 @@ support_bottom_line_distance=5.333333333333333
 support_enable=True
 adhesion_extruder_nr=-1
 print_temperature=210
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wipe_retraction_retract_speed=70
 material_anti_ooze_retracted_position=-4
 layer_height=0.5
diff --git a/stress_benchmark/resources/058.settings b/stress_benchmark/resources/058.settings
index 146ed80f11..39446ad26e 100644
--- a/stress_benchmark/resources/058.settings
+++ b/stress_benchmark/resources/058.settings
@@ -67,7 +67,9 @@ material_initial_print_temperature=200
 layer_0_z_overlap=0.15
 support_roof_enable=True
 acceleration_wall_x_roofing=500
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.12
 machine_nozzle_head_distance=3
@@ -222,7 +224,9 @@ support_bottom_line_distance=2.4000240002400024
 support_enable=False
 adhesion_extruder_nr=-1
 print_temperature=210
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 wipe_retraction_retract_speed=45
 material_anti_ooze_retracted_position=-4
 layer_height=0.12
diff --git a/stress_benchmark/resources/059.settings b/stress_benchmark/resources/059.settings
index 878cc7f8b5..97eb1229c2 100644
--- a/stress_benchmark/resources/059.settings
+++ b/stress_benchmark/resources/059.settings
@@ -192,7 +192,9 @@ roofing_line_width=0.4
 material_flow_layer_0=100
 minimum_roof_area=10
 blackmagic=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 support_interface_pattern=grid
 xy_offset=0
 prime_tower_brim_enable=True
@@ -221,7 +223,9 @@ acceleration_support_bottom=500
 bridge_skin_density=100
 raft_airgap=0.3
 mold_angle=40
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 speed_print_layer_0=25
 hole_xy_offset_max_diameter=0
 cool_fan_full_layer=2
diff --git a/stress_benchmark/resources/060.settings b/stress_benchmark/resources/060.settings
index 9fd982aca1..f07e7c3030 100644
--- a/stress_benchmark/resources/060.settings
+++ b/stress_benchmark/resources/060.settings
@@ -192,7 +192,9 @@ roofing_line_width=0.4
 material_flow_layer_0=100
 minimum_roof_area=10
 blackmagic=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 support_interface_pattern=grid
 xy_offset=0
 prime_tower_brim_enable=True
@@ -221,7 +223,9 @@ acceleration_support_bottom=500
 bridge_skin_density=100
 raft_airgap=0.3
 mold_angle=40
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 speed_print_layer_0=20.0
 hole_xy_offset_max_diameter=0
 cool_fan_full_layer=4
diff --git a/stress_benchmark/resources/061.settings b/stress_benchmark/resources/061.settings
index 3a05b93091..9a2e6f80a8 100644
--- a/stress_benchmark/resources/061.settings
+++ b/stress_benchmark/resources/061.settings
@@ -192,7 +192,9 @@ roofing_line_width=0.4
 material_flow_layer_0=100
 minimum_roof_area=1.0
 blackmagic=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 support_interface_pattern=concentric
 xy_offset=0
 prime_tower_brim_enable=False
@@ -222,7 +224,9 @@ bridge_skin_density=100
 raft_airgap=0.3
 mold_angle=40
 quality_name=Draft
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 speed_print_layer_0=10.0
 hole_xy_offset_max_diameter=0
 cool_fan_full_layer=2
diff --git a/stress_benchmark/resources/062.settings b/stress_benchmark/resources/062.settings
index d6c59d5fec..19969a024d 100644
--- a/stress_benchmark/resources/062.settings
+++ b/stress_benchmark/resources/062.settings
@@ -192,7 +192,9 @@ roofing_line_width=0.4
 material_flow_layer_0=100
 minimum_roof_area=1.0
 blackmagic=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 support_interface_pattern=concentric
 xy_offset=0
 prime_tower_brim_enable=False
@@ -221,7 +223,9 @@ acceleration_support_bottom=3000
 bridge_skin_density=100
 raft_airgap=0.3
 mold_angle=40
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 speed_print_layer_0=30.0
 hole_xy_offset_max_diameter=0
 cool_fan_full_layer=2
diff --git a/stress_benchmark/resources/063.settings b/stress_benchmark/resources/063.settings
index 4757dbfedc..f31688e84e 100644
--- a/stress_benchmark/resources/063.settings
+++ b/stress_benchmark/resources/063.settings
@@ -192,7 +192,9 @@ roofing_line_width=0.4
 material_flow_layer_0=100
 minimum_roof_area=1.0
 blackmagic=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 support_interface_pattern=concentric
 xy_offset=0
 prime_tower_brim_enable=False
@@ -222,7 +224,9 @@ bridge_skin_density=100
 raft_airgap=0.3
 mold_angle=40
 quality_name=Draft
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 speed_print_layer_0=75.0
 hole_xy_offset_max_diameter=0
 cool_fan_full_layer=2
diff --git a/stress_benchmark/resources/064.settings b/stress_benchmark/resources/064.settings
index ad14e390a1..7cf1a24790 100644
--- a/stress_benchmark/resources/064.settings
+++ b/stress_benchmark/resources/064.settings
@@ -191,7 +191,9 @@ roofing_line_width=0.4
 material_flow_layer_0=85
 minimum_roof_area=2
 blackmagic=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 support_interface_pattern=grid
 xy_offset=0
 prime_tower_brim_enable=True
@@ -220,7 +222,9 @@ acceleration_support_bottom=400
 bridge_skin_density=100
 raft_airgap=0.3
 mold_angle=40
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 speed_print_layer_0=10
 hole_xy_offset_max_diameter=0
 cool_fan_full_layer=45
diff --git a/stress_benchmark/resources/065.settings b/stress_benchmark/resources/065.settings
index e82e8ae600..0515cd4b53 100644
--- a/stress_benchmark/resources/065.settings
+++ b/stress_benchmark/resources/065.settings
@@ -193,7 +193,9 @@ roofing_line_width=0.25
 material_flow_layer_0=100
 minimum_roof_area=1.0
 blackmagic=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 support_interface_pattern=zigzag
 xy_offset=-0.010000000000000002
 prime_tower_brim_enable=True
@@ -223,7 +225,9 @@ bridge_skin_density=80
 raft_airgap=0
 mold_angle=40
 quality_name=Fine
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 speed_print_layer_0=10.0
 roofing_angles=[]
 hole_xy_offset_max_diameter=0
diff --git a/stress_benchmark/resources/066.settings b/stress_benchmark/resources/066.settings
index 3b324482ff..79f3d54d8b 100644
--- a/stress_benchmark/resources/066.settings
+++ b/stress_benchmark/resources/066.settings
@@ -193,7 +193,9 @@ roofing_line_width=0.4
 material_flow_layer_0=100
 minimum_roof_area=1.0
 blackmagic=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 support_interface_pattern=zigzag
 xy_offset=-0.010000000000000002
 prime_tower_brim_enable=False
@@ -223,7 +225,9 @@ bridge_skin_density=80
 raft_airgap=0.3
 mold_angle=40
 quality_name=Fine
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 speed_print_layer_0=16.0
 roofing_angles=[]
 hole_xy_offset_max_diameter=0
diff --git a/stress_benchmark/resources/067.settings b/stress_benchmark/resources/067.settings
index 8fead7495b..1f04d38ae0 100644
--- a/stress_benchmark/resources/067.settings
+++ b/stress_benchmark/resources/067.settings
@@ -192,7 +192,9 @@ roofing_line_width=0.45
 material_flow_layer_0=100
 minimum_roof_area=10
 blackmagic=0
-raft_remove_inside_corners=False
+raft_base_remove_inside_corners=False
+raft_interface_remove_inside_corners=False
+raft_surface_remove_inside_corners=False
 support_interface_pattern=grid
 xy_offset=0
 prime_tower_brim_enable=False
@@ -221,7 +223,9 @@ acceleration_support_bottom=500.0
 bridge_skin_density=100
 raft_airgap=0.3
 mold_angle=40
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 speed_print_layer_0=25
 roofing_angles=[45,135]
 hole_xy_offset_max_diameter=0
diff --git a/tests/test_global_settings.txt b/tests/test_global_settings.txt
index cb0c373c6a..7861bc4139 100644
--- a/tests/test_global_settings.txt
+++ b/tests/test_global_settings.txt
@@ -260,7 +260,9 @@ jerk_ironing=5
 retraction_combing_max_distance=0
 acceleration_layer_0=500
 coasting_min_volume=0.8
-raft_margin=15
+raft_base_margin=15
+raft_interface_margin=15
+raft_surface_margin=15
 support_tower_diameter=3.0
 cool_fan_speed_max=100
 machine_endstop_positive_direction_x=False