diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 09cd190e56..5a9a07d213 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -2554,6 +2554,53 @@
                             "value": "lightning_infill_support_angle"
                         }
                     }
+                },
+                "infill_move_inwards_length":
+                {
+                    "label": "Infill Start/End Move Inwards Length",
+                    "description": "When starting or ending infill print, add an inwards extrusion move so that the tips of the infill won't impact the outer wall. This can be useful when the infill is printed at very high speed.",
+                    "unit": "mm",
+                    "type": "float",
+                    "minimum_value": "0",
+                    "maximum_value_warning": "line_width * 10",
+                    "default_value": 0,
+                    "limit_to_extruder": "infill_extruder_nr",
+                    "enabled": "infill_sparse_density > 0",
+                    "settable_per_mesh": true,
+                    "settable_per_extruder": true,
+                    "children":
+                    {
+                        "infill_start_move_inwards_length":
+                        {
+                            "label": "Infill Start Move Inwards Length",
+                            "description": "When starting infill print, add an inwards extrusion move so that the tips of the infill won't impact the outer wall. This can be useful when the infill is printed at very high speed.",
+                            "unit": "mm",
+                            "type": "float",
+                            "minimum_value": "0",
+                            "maximum_value_warning": "line_width * 10",
+                            "default_value": 0,
+                            "value": "infill_move_inwards_length",
+                            "limit_to_extruder": "infill_extruder_nr",
+                            "enabled": "infill_sparse_density > 0",
+                            "settable_per_mesh": true,
+                            "settable_per_extruder": true
+                        },
+                        "infill_end_move_inwards_length":
+                        {
+                            "label": "Infill End Move Inwards Length",
+                            "description": "When starting or ending infill print, add an inwards extrusion move so that the tips of the infill won't impact the outer wall. This can be useful when the infill is printed at very high speed.",
+                            "unit": "mm",
+                            "type": "float",
+                            "minimum_value": "0",
+                            "maximum_value_warning": "line_width * 10",
+                            "default_value": 0,
+                            "value": "infill_move_inwards_length",
+                            "limit_to_extruder": "infill_extruder_nr",
+                            "enabled": "infill_sparse_density > 0",
+                            "settable_per_mesh": true,
+                            "settable_per_extruder": true
+                        }
+                    }
                 }
             }
         },
diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json
index a49dd432af..760f82c52a 100644
--- a/resources/definitions/ultimaker_sketch.def.json
+++ b/resources/definitions/ultimaker_sketch.def.json
@@ -106,7 +106,7 @@
             "enabled": false,
             "value": false
         },
-        "layer_height_0": { "value": "layer_height * 1.25" },
+        "layer_height_0": { "value": "layer_height * 2" },
         "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
         "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
         "machine_center_is_zero": { "default_value": true },