diff --git a/plugins/VersionUpgrade/VersionUpgrade33to34/VersionUpgrade33to34.py b/plugins/VersionUpgrade/VersionUpgrade33to34/VersionUpgrade33to34.py
index 17abace547..e2241fd195 100644
--- a/plugins/VersionUpgrade/VersionUpgrade33to34/VersionUpgrade33to34.py
+++ b/plugins/VersionUpgrade/VersionUpgrade33to34/VersionUpgrade33to34.py
@@ -6,6 +6,9 @@ import io #To serialise the preference files afterwards.
 
 from UM.VersionUpgrade import VersionUpgrade #We're inheriting from this.
 
+_renamed_settings = {
+    "infill_hollow": "infill_support_enabled"
+}
 
 ##  Upgrades configurations from the state they were in at version 3.3 to the
 #   state they should be in at version 3.4.
@@ -38,6 +41,17 @@ class VersionUpgrade33to34(VersionUpgrade):
         # Update version number.
         parser["general"]["version"] = "4"
 
+        if "values" in parser:
+            #If infill_hollow was enabled and the overhang angle was adjusted, copy that overhang angle to the new infill support angle.
+            if "infill_hollow" in parser["values"] and parser["values"]["infill_hollow"] and "support_angle" in parser["values"]:
+                parser["values"]["infill_support_angle"] = parser["values"]["support_angle"]
+
+            #Renamed settings.
+            for original, replacement in _renamed_settings.items():
+                if original in parser["values"]:
+                    parser["values"][replacement] = parser["values"][original]
+                    del parser["values"][original]
+
         result = io.StringIO()
         parser.write(result)
-        return [filename], [result.getvalue()]
+        return [filename], [result.getvalue()]
\ No newline at end of file
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 570b6c8625..b3932de827 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1807,6 +1807,30 @@
                     "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
+                "infill_support_enabled":
+                {
+                    "label": "Infill Support",
+                    "description": "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "infill_sparse_density > 0",
+                    "limit_to_extruder": "infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
+                "infill_support_angle":
+                {
+                    "label": "Infill Overhang Angle",
+                    "description": "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill.",
+                    "unit": "°",
+                    "type": "float",
+                    "minimum_value": "0",
+                    "minimum_value_warning": "2",
+                    "maximum_value": "90",
+                    "default_value": 40,
+                    "enabled": "infill_sparse_density > 0 and infill_support_enabled",
+                    "limit_to_extruder": "infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
                 "skin_preshrink":
                 {
                     "label": "Skin Removal Width",
@@ -5918,14 +5942,6 @@
                     "limit_to_extruder": "support_infill_extruder_nr",
                     "settable_per_mesh": true
                 },
-                "infill_hollow":
-                {
-                    "label": "Hollow Out Objects",
-                    "description": "Remove all infill and make the inside of the object eligible for support.",
-                    "type": "bool",
-                    "default_value": false,
-                    "settable_per_mesh": true
-                },
                 "magic_fuzzy_skin_enabled":
                 {
                     "label": "Fuzzy Skin",