diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 3409a681fb..e4eb4b94f6 100755
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1178,6 +1178,7 @@
                     "default_value": 20,
                     "minimum_value": "0",
                     "maximum_value_warning": "100",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true,
                     "children":
                     {
@@ -1191,6 +1192,7 @@
                             "minimum_value": "0",
                             "minimum_value_warning": "infill_line_width",
                             "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' else 1)))",
+                            "limit_to_extruder": "infill_extruder_nr",
                             "settable_per_mesh": true
                         }
                     }
@@ -1215,6 +1217,7 @@
                     "default_value": "grid",
                     "enabled": "infill_sparse_density > 0",
                     "value": "'lines' if infill_sparse_density > 25 else 'grid'",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "infill_angles":
@@ -1225,6 +1228,7 @@
                     "default_value": "[ ]",
                     "enabled": "infill_pattern != 'concentric' and infill_pattern != 'concentric_3d' and infill_pattern != 'cubicsubdiv'",
                     "enabled": "infill_sparse_density > 0",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "spaghetti_infill_enabled":
@@ -1234,6 +1238,7 @@
                     "type": "bool",
                     "default_value": false,
                     "enabled": "infill_sparse_density > 0",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "spaghetti_max_infill_angle":
@@ -1247,6 +1252,7 @@
                     "maximum_value": "90",
                     "maximum_value_warning": "45",
                     "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "spaghetti_max_height":
@@ -1259,6 +1265,7 @@
                     "minimum_value": "layer_height",
                     "maximum_value_warning": "10.0",
                     "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "spaghetti_inset":
@@ -1271,6 +1278,7 @@
                     "minimum_value_warning": "0",
                     "maximum_value_warning": "5.0",
                     "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "spaghetti_flow":
@@ -1283,6 +1291,7 @@
                     "minimum_value": "0",
                     "maximum_value_warning": "100",
                     "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "sub_div_rad_mult":
@@ -1296,6 +1305,7 @@
                     "minimum_value_warning": "100",
                     "maximum_value_warning": "200",
                     "enabled": "infill_sparse_density > 0 and infill_pattern == 'cubicsubdiv'",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "sub_div_rad_add":
@@ -1309,6 +1319,7 @@
                     "minimum_value_warning": "-1 * infill_line_distance",
                     "maximum_value_warning": "5 * infill_line_distance",
                     "enabled": "infill_sparse_density > 0 and infill_pattern == 'cubicsubdiv'",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "infill_overlap":
@@ -1394,6 +1405,7 @@
                     "maximum_value": "resolveOrValue('layer_height') * (1.45 if spaghetti_infill_enabled else 8)",
                     "value": "resolveOrValue('layer_height')",
                     "enabled": "infill_sparse_density > 0 and not spaghetti_infill_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "gradual_infill_steps":
@@ -1406,6 +1418,7 @@
                     "maximum_value_warning": "4",
                     "maximum_value": "(20 - math.log(infill_line_distance) / math.log(2)) if infill_line_distance > 0 and not spaghetti_infill_enabled else 0",
                     "enabled": "infill_sparse_density > 0 and infill_pattern != 'cubicsubdiv' and not spaghetti_infill_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "gradual_infill_step_height":
@@ -1419,6 +1432,7 @@
                     "minimum_value_warning": "3 * resolveOrValue('layer_height')",
                     "maximum_value_warning": "100",
                     "enabled": "infill_sparse_density > 0 and gradual_infill_steps > 0 and infill_pattern != 'cubicsubdiv'",
+                    "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
                 "infill_before_walls":