diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 92a0e17622..212437f460 100755
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1967,6 +1967,7 @@
                             "default_value": 60,
                             "value": "speed_print",
                             "enabled": "infill_sparse_density > 0",
+                            "limit_to_extruder": "infilll_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "speed_wall":
@@ -1980,6 +1981,7 @@
                             "maximum_value_warning": "150",
                             "default_value": 30,
                             "value": "speed_print / 2",
+                            "limit_to_extruder": "wall_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {
@@ -1994,6 +1996,7 @@
                                     "maximum_value_warning": "150",
                                     "default_value": 30,
                                     "value": "speed_wall",
+                                    "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
                                 "speed_wall_x":
@@ -2007,6 +2010,7 @@
                                     "maximum_value_warning": "150",
                                     "default_value": 60,
                                     "value": "speed_wall * 2",
+                                    "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 }
                             }
@@ -2022,6 +2026,7 @@
                             "maximum_value_warning": "150",
                             "default_value": 30,
                             "value": "speed_print / 2",
+                            "limit_to_extruder": "top_bottom_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "speed_support":
@@ -2284,6 +2289,7 @@
                             "default_value": 3000,
                             "value": "acceleration_print",
                             "enabled": "resolveOrValue('acceleration_enabled') and infill_sparse_density > 0",
+                            "limit_to_extruder": "infill_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "acceleration_wall":
@@ -2298,6 +2304,7 @@
                             "default_value": 3000,
                             "value": "acceleration_print",
                             "enabled": "resolveOrValue('acceleration_enabled')",
+                            "limit_to_extruder": "wall_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {
@@ -2313,6 +2320,7 @@
                                     "default_value": 3000,
                                     "value": "acceleration_wall",
                                     "enabled": "resolveOrValue('acceleration_enabled')",
+                                    "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
                                 "acceleration_wall_x":
@@ -2327,6 +2335,7 @@
                                     "default_value": 3000,
                                     "value": "acceleration_wall",
                                     "enabled": "resolveOrValue('acceleration_enabled')",
+                                    "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 }
                             }
@@ -2343,6 +2352,7 @@
                             "default_value": 3000,
                             "value": "acceleration_print",
                             "enabled": "resolveOrValue('acceleration_enabled')",
+                            "limit_to_extruder": "top_bottom_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "acceleration_support":
@@ -2558,6 +2568,7 @@
                             "default_value": 20,
                             "value": "jerk_print",
                             "enabled": "resolveOrValue('jerk_enabled') and infill_sparse_density > 0",
+                            "limit_to_extruder": "infill_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "jerk_wall":
@@ -2572,6 +2583,7 @@
                             "default_value": 20,
                             "value": "jerk_print",
                             "enabled": "resolveOrValue('jerk_enabled')",
+                            "limit_to_extruder": "wall_extruder_nr",
                             "settable_per_mesh": true,
                             "children":
                             {
@@ -2587,6 +2599,7 @@
                                     "default_value": 20,
                                     "value": "jerk_wall",
                                     "enabled": "resolveOrValue('jerk_enabled')",
+                                    "limit_to_extruder": "wall_0_extruder_nr",
                                     "settable_per_mesh": true
                                 },
                                 "jerk_wall_x":
@@ -2601,6 +2614,7 @@
                                     "default_value": 20,
                                     "value": "jerk_wall",
                                     "enabled": "resolveOrValue('jerk_enabled')",
+                                    "limit_to_extruder": "wall_x_extruder_nr",
                                     "settable_per_mesh": true
                                 }
                             }
@@ -2617,6 +2631,7 @@
                             "default_value": 20,
                             "value": "jerk_print",
                             "enabled": "resolveOrValue('jerk_enabled')",
+                            "limit_to_extruder": "top_bottom_extruder_nr",
                             "settable_per_mesh": true
                         },
                         "jerk_support":