diff --git a/packaging/MacOS/build_macos.py b/packaging/MacOS/build_macos.py
index a495a02769..a7063f688d 100644
--- a/packaging/MacOS/build_macos.py
+++ b/packaging/MacOS/build_macos.py
@@ -154,7 +154,7 @@ if __name__ == "__main__":
     parser.add_argument("--app_name", required = True, type = str, help = "Filename of the .app that will be contained within the dmg/pkg")
     args = parser.parse_args()
 
-    cura_version = args.cura_conan_version.split("/")[-1]
+    cura_version = args.cura_conan_version.replace("+","-") # + is not allowed for bundle identifier
 
     app_name = f"{args.app_name}.app"
 
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index c930a624d0..8471c59f82 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -4412,6 +4412,21 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
+                "retraction_combing_avoid_distance":
+                {
+                    "label": "Inside Travel Avoid Distance",
+                    "description": "The distance between the nozzle and already printed outer walls when travelling inside a model.",
+                    "unit": "mm",
+                    "type": "float",
+                    "default_value": 0,
+                    "value": "machine_nozzle_size * 1.5",
+                    "minimum_value": "0",
+                    "minimum_value_warning": "machine_nozzle_size * 0.5",
+                    "maximum_value_warning": "machine_nozzle_size * 10",
+                    "enabled": "resolveOrValue('retraction_combing') != 'off'",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
                 "travel_retract_before_outer_wall":
                 {
                     "label": "Retract Before Outer Wall",