diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml
index 8e65a481c4..d8e136f156 100644
--- a/.github/workflows/printer-linter-format.yml
+++ b/.github/workflows/printer-linter-format.yml
@@ -16,7 +16,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   name: Checkout
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
 
             -   uses: technote-space/get-diff-action@v6
                 with:
diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml
index ed51f8b2f8..e70cabce7d 100644
--- a/.github/workflows/printer-linter-pr-diagnose.yml
+++ b/.github/workflows/printer-linter-pr-diagnose.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 2
 
@@ -55,7 +55,7 @@ jobs:
           echo ${{ github.event.pull_request.head.repo.full_name }} > printer-linter-result/pr-head-repo.txt
           echo ${{ github.event.pull_request.head.sha }} > printer-linter-result/pr-head-sha.txt
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: printer-linter-result
           path: printer-linter-result/
diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml
index 3d59817996..1afb8aad04 100644
--- a/.github/workflows/release-process_release-candidate.yml
+++ b/.github/workflows/release-process_release-candidate.yml
@@ -9,6 +9,11 @@ on:
         required: true
         type: string
 
+      publish_release_description:
+        description: 'Create the GitHub release (if existing, the description will be overridden based on the changelog)'
+        required: true
+        type: boolean
+
 jobs:
   parse-version:
     name: Parse input version string
@@ -65,6 +70,8 @@ jobs:
     name: Create tags
     runs-on: ubuntu-latest
     needs: [parse-version, find-rc-tag]
+    outputs:
+      main_commit: ${{ steps.export-main-commit.outputs.main_commit }}
     strategy:
       matrix:
         repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials]
@@ -76,11 +83,23 @@ jobs:
           ref: ${{ needs.parse-version.outputs.branch_name }}
           token: ${{ secrets.CURA_AUTORELEASE_PAT }}
 
-      - name: Create tag
+      - name: Create RC tag
         run: |
           git tag ${{ needs.find-rc-tag.outputs.tag_name }}
           git push origin tag ${{ needs.find-rc-tag.outputs.tag_name }}
 
+      - name: Create or update release tag
+        run: |
+          git tag -f ${{ inputs.cura_version }}
+          git push -f origin tag ${{ inputs.cura_version }}
+
+      - name: Export Cura tagged commit
+        id: export-main-commit
+        if: ${{ matrix.repository == 'Cura' }}
+        run: |
+          echo "main_commit=`git rev-parse HEAD`" >> "$GITHUB_OUTPUT"
+
+
   create-dependencies-packages:
     name: Create conan packages for dependencies
     uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main
@@ -131,7 +150,7 @@ jobs:
   create-release-draft:
     name: Create the release draft
     runs-on: ubuntu-latest
-    needs: [create-installers, parse-version]
+    needs: [create-installers, parse-version, create-tags]
     steps:
       - name: Checkout Cura repo
         uses: actions/checkout@v4
@@ -139,18 +158,14 @@ jobs:
           ref: ${{ needs.parse-version.outputs.branch_name }}
 
       - name: Extract changelog
+        if: ${{ inputs.publish_release_description }}
         run: python ./scripts/extract_changelog.py --version ${{ needs.parse-version.outputs.version_major }}.${{ needs.parse-version.outputs.version_minor }}.${{ needs.parse-version.outputs.version_patch }} --changelog ./resources/texts/change_log.txt > formatted_changelog.txt
 
-      - name: Get commit id for release
-        id: get-commit-id
-        uses: iawia002/get-tag-or-commit-id@v1.0.1
-        with:
-          length: 40
-
       - name: Create release
         uses: notpeelz/action-gh-create-release@v5.0.1
+        if: ${{ inputs.publish_release_description }}
         with:
-          target: ${{ steps.get-commit-id.outputs.id }}
+          target: ${{ needs.create-tags.outputs.main_commit }}
           tag: ${{ inputs.cura_version }}
           strategy: replace
           title: UltiMaker Cura ${{ inputs.cura_version }}
diff --git a/conandata.yml b/conandata.yml
index 0640813146..eda0a7c164 100644
--- a/conandata.yml
+++ b/conandata.yml
@@ -5,13 +5,12 @@ requirements:
   - "curaengine/(latest)@ultimaker/testing"
   - "cura_binary_data/(latest)@ultimaker/testing"
   - "fdm_materials/(latest)@ultimaker/testing"
-  - "curaengine_plugin_gradual_flow/0.1.0-beta.4"
   - "dulcificum/0.2.1"
   - "pysavitar/5.3.0"
   - "pynest2d/5.3.0"
   - "native_cad_plugin/2.0.0"
 requirements_internal:
-  - "fdm_materials/(latest)@internal/testing"
+  - "fdm_materials/5.8.1"
   - "cura_private_data/(latest)@internal/testing"
 urls:
     default:
@@ -34,14 +33,6 @@ pyinstaller:
             package: "cura"
             src: "plugins"
             dst: "share/cura/plugins"
-        curaengine_gradual_flow_plugin:
-            package: "curaengine_plugin_gradual_flow"
-            src: "res/plugins/CuraEngineGradualFlow"
-            dst: "share/cura/plugins/CuraEngineGradualFlow"
-        curaengine_gradual_flow_plugin_bundled:
-            package: "curaengine_plugin_gradual_flow"
-            src: "res/bundled_packages"
-            dst: "share/cura/resources/bundled_packages"
         native_cad_plugin:
           package: "native_cad_plugin"
           src: "res/plugins/NativeCADplugin"
@@ -105,11 +96,6 @@ pyinstaller:
             src: "bin"
             dst: "."
             binary: "CuraEngine"
-        curaengine_gradual_flow_plugin_service:
-            package: "curaengine_plugin_gradual_flow"
-            src: "bin"
-            dst: "."
-            binary: "curaengine_plugin_gradual_flow"
     hiddenimports:
         - "pySavitar"
         - "pyArcus"
diff --git a/conanfile.py b/conanfile.py
index 787c26785f..999cca3362 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -390,17 +390,11 @@ class CuraConan(ConanFile):
             copy(self, "CuraEngine", curaengine.bindirs[0], self.source_folder, keep_path = False)
 
             # Copy the external plugins that we want to bundle with Cura
-            rmdir(self,str(self.source_path.joinpath("plugins", "CuraEngineGradualFlow")))
-            curaengine_plugin_gradual_flow = self.dependencies["curaengine_plugin_gradual_flow"].cpp_info
-            copy(self, "*", curaengine_plugin_gradual_flow.resdirs[0], str(self.source_path.joinpath("plugins", "CuraEngineGradualFlow")), keep_path = True)
-            copy(self, "*", curaengine_plugin_gradual_flow.bindirs[0], self.source_folder, keep_path = False)
-            copy(self, "bundled_*.json", curaengine_plugin_gradual_flow.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False)
-
             if self._enterprise:
                 rmdir(self, str(self.source_path.joinpath("plugins", "NativeCADplugin")))
-                curaengine_plugin_gradual_flow = self.dependencies["native_cad_plugin"].cpp_info
-                copy(self, "*", curaengine_plugin_gradual_flow.resdirs[0], str(self.source_path.joinpath("plugins", "NativeCADplugin")), keep_path = True)
-                copy(self, "bundled_*.json", curaengine_plugin_gradual_flow.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False)
+                native_cad_plugin = self.dependencies["native_cad_plugin"].cpp_info
+                copy(self, "*", native_cad_plugin.resdirs[0], str(self.source_path.joinpath("plugins", "NativeCADplugin")), keep_path = True)
+                copy(self, "bundled_*.json", native_cad_plugin.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False)
 
         # Copy resources of cura_binary_data
         cura_binary_data = self.dependencies["cura_binary_data"].cpp_info
@@ -517,10 +511,6 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV
         copy(self, "requirement*.txt", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.resdirs[-1]))
         copy(self, "*", src = os.path.join(self.source_folder, "packaging"), dst = os.path.join(self.package_folder, self.cpp.package.resdirs[2]))
 
-        # Remove the CuraEngineGradualFlow plugin from the package
-        rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[1], "CuraEngineGradualFlow"))
-        rm(self, "bundled_*.json", os.path.join(self.package_folder, self.cpp.package.resdirs[0], "bundled_packages"), recursive = False)
-
         # Remove the fdm_materials from the package
         rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[0], "materials"))
 
diff --git a/cura/API/Account.py b/cura/API/Account.py
index d126a52d60..2fc5b8de6c 100644
--- a/cura/API/Account.py
+++ b/cura/API/Account.py
@@ -232,6 +232,7 @@ class Account(QObject):
 
     def _onProfileChanged(self, profile: Optional[UserProfile]) -> None:
         self._user_profile = profile
+        self._updatePermissions()
         self.userProfileChanged.emit()
 
     def _sync(self) -> None:
diff --git a/cura/Machines/MachineNode.py b/cura/Machines/MachineNode.py
index aa4db8bb8f..67b8559b2e 100644
--- a/cura/Machines/MachineNode.py
+++ b/cura/Machines/MachineNode.py
@@ -1,8 +1,9 @@
-# Copyright (c) 2019 Ultimaker B.V.
+# Copyright (c) 2024 UltiMaker
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from typing import Dict, List
 
+from UM.Decorators import deprecated
 from UM.Logger import Logger
 from UM.Signal import Signal
 from UM.Util import parseBool
@@ -168,13 +169,18 @@ class MachineNode(ContainerNode):
 
         return self.global_qualities.get(self.preferred_quality_type, next(iter(self.global_qualities.values())))
 
-    def isExcludedMaterial(self, material: MaterialNode) -> bool:
+    def isExcludedMaterialBaseFile(self, material_base_file: str) -> bool:
         """Returns whether the material should be excluded from the list of materials."""
         for exclude_material in self.exclude_materials:
-            if exclude_material in material["id"]:
+            if exclude_material in material_base_file:
                 return True
         return False
 
+    @deprecated("Use isExcludedMaterialBaseFile instead.", since = "5.9.0")
+    def isExcludedMaterial(self, material: MaterialNode) -> bool:
+        """Returns whether the material should be excluded from the list of materials."""
+        return self.isExcludedMaterialBaseFile(material.base_file)
+
     @UM.FlameProfiler.profile
     def _loadAll(self) -> None:
         """(Re)loads all variants under this printer."""
diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py
index b976841aa7..e037c9259d 100644
--- a/cura/Machines/VariantNode.py
+++ b/cura/Machines/VariantNode.py
@@ -60,7 +60,7 @@ class VariantNode(ContainerNode):
             materials = list(materials_per_base_file.values())
 
         # Filter materials based on the exclude_materials property.
-        filtered_materials = [material for material in materials if not self.machine.isExcludedMaterial(material)]
+        filtered_materials = [material for material in materials if not self.machine.isExcludedMaterialBaseFile(material["id"])]
 
         for material in filtered_materials:
             base_file = material["base_file"]
@@ -127,7 +127,7 @@ class VariantNode(ContainerNode):
         material_definition = container.getMetaDataEntry("definition")
 
         base_file = container.getMetaDataEntry("base_file")
-        if base_file in self.machine.exclude_materials:
+        if self.machine.isExcludedMaterialBaseFile(base_file):
             return  # Material is forbidden for this printer.
         if base_file not in self.materials:  # Completely new base file. Always better than not having a file as long as it matches our set-up.
             if material_definition != "fdmprinter" and material_definition != self.machine.container_id:
diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py
index b5b8a1b721..ef1c9561af 100755
--- a/cura/Settings/CuraContainerStack.py
+++ b/cura/Settings/CuraContainerStack.py
@@ -5,7 +5,7 @@ from typing import Any, cast, List, Optional, Dict
 from PyQt6.QtCore import pyqtProperty, pyqtSignal, QObject
 
 from UM.Application import Application
-from UM.Decorators import override
+from UM.Decorators import CachedMemberFunctions, override
 from UM.FlameProfiler import pyqtSlot
 from UM.Logger import Logger
 from UM.Settings.ContainerStack import ContainerStack, InvalidContainerStackError
@@ -237,6 +237,7 @@ class CuraContainerStack(ContainerStack):
         :param new_value: The new value to set the property to.
         """
 
+        CachedMemberFunctions.clearInstanceCache(self)
         container_index = _ContainerIndexes.UserChanges
         self._containers[container_index].setProperty(key, property_name, property_value, container, set_from_cache)
 
diff --git a/cura/Settings/ExtruderStack.py b/cura/Settings/ExtruderStack.py
index eba41569b7..645abeb0f6 100644
--- a/cura/Settings/ExtruderStack.py
+++ b/cura/Settings/ExtruderStack.py
@@ -5,7 +5,7 @@ from typing import Any, Dict, TYPE_CHECKING, Optional
 
 from PyQt6.QtCore import pyqtProperty, pyqtSignal
 
-from UM.Decorators import override
+from UM.Decorators import CachedMemberFunctions, override
 from UM.MimeTypeDatabase import MimeType, MimeTypeDatabase
 from UM.Settings.ContainerStack import ContainerStack
 from UM.Settings.ContainerRegistry import ContainerRegistry
@@ -86,6 +86,7 @@ class ExtruderStack(CuraContainerStack):
     def setCompatibleMaterialDiameter(self, value: float) -> None:
         old_approximate_diameter = self.getApproximateMaterialDiameter()
         if self.getCompatibleMaterialDiameter() != value:
+            CachedMemberFunctions.clearInstanceCache(self)
             self.definitionChanges.setProperty("material_diameter", "value", value)
             self.compatibleMaterialDiameterChanged.emit()
 
diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py
index 6da0edb2a7..0789e8a684 100644
--- a/plugins/CuraEngineBackend/StartSliceJob.py
+++ b/plugins/CuraEngineBackend/StartSliceJob.py
@@ -49,7 +49,20 @@ class StartJobResult(IntEnum):
     ObjectsWithDisabledExtruder = 8
 
 
-class GcodeStartEndFormatter(Formatter):
+class GcodeConditionState(IntEnum):
+    OutsideCondition = 1
+    ConditionFalse = 2
+    ConditionTrue = 3
+    ConditionDone = 4
+
+
+class GcodeInstruction(IntEnum):
+    Skip = 1
+    Evaluate = 2
+    EvaluateAndWrite = 3
+
+
+class GcodeStartEndFormatter:
     # Formatter class that handles token expansion in start/end gcode
     # Example of a start/end gcode string:
     # ```
@@ -63,22 +76,50 @@ class GcodeStartEndFormatter(Formatter):
     # will be used. Alternatively, if the expression is formatted as "{[expression], [extruder_nr]}",
     # then the expression will be evaluated with the extruder stack of the specified extruder_nr.
 
-    _extruder_regex = re.compile(r"^\s*(?P<expression>.*)\s*,\s*(?P<extruder_nr_expr>.*)\s*$")
+    _instruction_regex = re.compile(r"{(?P<condition>if|else|elif|endif)?\s*(?P<expression>.*?)\s*(?:,\s*(?P<extruder_nr_expr>.*))?\s*}(?P<end_of_line>\n?)")
 
-    def __init__(self, all_extruder_settings: Dict[str, Any], default_extruder_nr: int = -1) -> None:
+    def __init__(self, all_extruder_settings: Dict[str, Dict[str, Any]], default_extruder_nr: int = -1) -> None:
         super().__init__()
-        self._all_extruder_settings: Dict[str, Any] = all_extruder_settings
+        self._all_extruder_settings: Dict[str, Dict[str, Any]] = all_extruder_settings
         self._default_extruder_nr: int = default_extruder_nr
+        self._cura_application = CuraApplication.getInstance()
+        self._extruder_manager = ExtruderManager.getInstance()
 
-    def get_field(self, field_name, args: [str], kwargs: dict) -> Tuple[str, str]:
-        # get_field method parses all fields in the format-string and parses them individually to the get_value method.
-        # e.g. for a string "Hello {foo.bar}" would the complete field "foo.bar" would be passed to get_field, and then
-        # the individual parts "foo" and "bar" would be passed to get_value. This poses a problem for us, because  want
-        # to parse the entire field as a single expression. To solve this, we override the get_field method and return
-        # the entire field as the expression.
-        return self.get_value(field_name, args, kwargs), field_name
+    def format(self, text: str) -> str:
+        remaining_text: str = text
+        result: str = ""
 
-    def get_value(self, expression: str, args: [str], kwargs: dict) -> str:
+        self._condition_state: GcodeConditionState = GcodeConditionState.OutsideCondition
+
+        while len(remaining_text) > 0:
+            next_code_match = self._instruction_regex.search(remaining_text)
+            if next_code_match is not None:
+                expression_start, expression_end = next_code_match.span()
+
+                if expression_start > 0:
+                    result += self._process_statement(remaining_text[:expression_start])
+
+                result += self._process_code(next_code_match)
+
+                remaining_text = remaining_text[expression_end:]
+
+            else:
+                result += self._process_statement(remaining_text)
+                remaining_text = ""
+
+        return result
+
+    def _process_statement(self, statement: str) -> str:
+        if self._condition_state in [GcodeConditionState.OutsideCondition, GcodeConditionState.ConditionTrue]:
+            return statement
+        else:
+            return ""
+
+    def _process_code(self, code: re.Match) -> str:
+        condition: Optional[str] = code.group("condition")
+        expression: Optional[str] = code.group("expression")
+        extruder_nr_expr: Optional[str] = code.group("extruder_nr_expr")
+        end_of_line: Optional[str] = code.group("end_of_line")
 
         # The following variables are not settings, but only become available after slicing.
         # when these variables are encountered, we return them as-is. They are replaced later
@@ -87,53 +128,100 @@ class GcodeStartEndFormatter(Formatter):
         if expression in post_slice_data_variables:
             return f"{{{expression}}}"
 
-        extruder_nr = str(self._default_extruder_nr)
+        extruder_nr: str = str(self._default_extruder_nr)
+        instruction: GcodeInstruction = GcodeInstruction.Skip
 
         # The settings may specify a specific extruder to use. This is done by
         # formatting the expression as "{expression}, {extruder_nr_expr}". If the
         # expression is formatted like this, we extract the extruder_nr and use
         # it to get the value from the correct extruder stack.
-        match = self._extruder_regex.match(expression)
-        if match:
-            expression = match.group("expression")
-            extruder_nr_expr = match.group("extruder_nr_expr")
-
-            if extruder_nr_expr.isdigit():
-                extruder_nr = extruder_nr_expr
+        if condition is None:
+            # This is a classic statement
+            if self._condition_state in [GcodeConditionState.OutsideCondition, GcodeConditionState.ConditionTrue]:
+                # Skip and move to next
+                instruction = GcodeInstruction.EvaluateAndWrite
+        else:
+            # This is a condition statement, first check validity
+            if condition == "if":
+                if self._condition_state != GcodeConditionState.OutsideCondition:
+                    raise SyntaxError("Nested conditions are not supported")
             else:
-                # We get the value of the extruder_nr_expr from `_all_extruder_settings` dictionary
-                # rather than the global container stack. The `_all_extruder_settings["-1"]` is a
-                # dict-representation of the global container stack, with additional properties such
-                # as `initial_extruder_nr`. As users may enter such expressions we can't use the
-                # global container stack.
-                extruder_nr = str(self._all_extruder_settings["-1"].get(extruder_nr_expr, "-1"))
+                if self._condition_state == GcodeConditionState.OutsideCondition:
+                    raise SyntaxError("Condition should start with an 'if' statement")
 
-        if extruder_nr in self._all_extruder_settings:
-            additional_variables = self._all_extruder_settings[extruder_nr].copy()
-        else:
-            Logger.warning(f"Extruder {extruder_nr} does not exist, using global settings")
-            additional_variables = self._all_extruder_settings["-1"].copy()
+            if condition == "if":
+                # First instruction, just evaluate it
+                instruction = GcodeInstruction.Evaluate
 
-        # Add the arguments and keyword arguments to the additional settings. These
-        # are currently _not_ used, but they are added for consistency with the
-        # base Formatter class.
-        for key, value in enumerate(args):
-            additional_variables[key] = value
-        for key, value in kwargs.items():
-            additional_variables[key] = value
+            else:
+                if self._condition_state == GcodeConditionState.ConditionTrue:
+                    # We have reached the next condition after a valid one has been found, skip the rest
+                    self._condition_state = GcodeConditionState.ConditionDone
 
-        if extruder_nr == "-1":
-            container_stack = CuraApplication.getInstance().getGlobalContainerStack()
-        else:
-            container_stack = ExtruderManager.getInstance().getExtruderStack(extruder_nr)
-            if not container_stack:
+                if condition == "elif":
+                    if self._condition_state == GcodeConditionState.ConditionFalse:
+                        # New instruction, and valid condition has not been reached so far => evaluate it
+                        instruction = GcodeInstruction.Evaluate
+                    else:
+                        # New instruction, but valid condition has already been reached => skip it
+                        instruction = GcodeInstruction.Skip
+
+                elif condition == "else":
+                    instruction = GcodeInstruction.Skip # Never evaluate, expression should be empty
+                    if self._condition_state == GcodeConditionState.ConditionFalse:
+                        # Fallback instruction, and valid condition has not been reached so far => active next
+                        self._condition_state = GcodeConditionState.ConditionTrue
+
+                elif condition == "endif":
+                    instruction = GcodeInstruction.Skip  # Never evaluate, expression should be empty
+                    self._condition_state = GcodeConditionState.OutsideCondition
+
+        if instruction >= GcodeInstruction.Evaluate and extruder_nr_expr is not None:
+            extruder_nr_function = SettingFunction(extruder_nr_expr)
+            container_stack = self._cura_application.getGlobalContainerStack()
+
+            # We add the variables contained in `_all_extruder_settings["-1"]`, which is a dict-representation of the
+            # global container stack, with additional properties such as `initial_extruder_nr`. As users may enter such
+            # expressions we can't use the global container stack. The variables contained in the global container stack
+            # will then be inserted twice, which is not optimal but works well.
+            extruder_nr = str(extruder_nr_function(container_stack, additional_variables=self._all_extruder_settings["-1"]))
+
+        if instruction >= GcodeInstruction.Evaluate:
+            if extruder_nr in self._all_extruder_settings:
+                additional_variables = self._all_extruder_settings[extruder_nr].copy()
+            else:
                 Logger.warning(f"Extruder {extruder_nr} does not exist, using global settings")
-                container_stack = CuraApplication.getInstance().getGlobalContainerStack()
+                additional_variables = self._all_extruder_settings["-1"].copy()
 
-        setting_function = SettingFunction(expression)
-        value = setting_function(container_stack, additional_variables=additional_variables)
+            if extruder_nr == "-1":
+                container_stack = self._cura_application.getGlobalContainerStack()
+            else:
+                container_stack = self._extruder_manager.getExtruderStack(extruder_nr)
+                if not container_stack:
+                    Logger.warning(f"Extruder {extruder_nr} does not exist, using global settings")
+                    container_stack = self._cura_application.getGlobalContainerStack()
 
-        return value
+            setting_function = SettingFunction(expression)
+            value = setting_function(container_stack, additional_variables=additional_variables)
+
+            if instruction == GcodeInstruction.Evaluate:
+                if value:
+                    self._condition_state = GcodeConditionState.ConditionTrue
+                else:
+                    self._condition_state = GcodeConditionState.ConditionFalse
+
+                return ""
+            else:
+                value_str = str(value)
+
+                if end_of_line is not None:
+                    # If we are evaluating an expression that is not a condition, restore the end of line
+                    value_str += end_of_line
+
+                return value_str
+
+        else:
+            return ""
 
 
 class StartSliceJob(Job):
@@ -470,6 +558,9 @@ class StartSliceJob(Job):
         result["day"] = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"][int(time.strftime("%w"))]
         result["initial_extruder_nr"] = CuraApplication.getInstance().getExtruderManager().getInitialExtruderNr()
 
+        # If adding or changing a setting here, please update the associated wiki page
+        # https://github.com/Ultimaker/Cura/wiki/Start-End-G%E2%80%90Code
+
         return result
 
     def _cacheAllExtruderSettings(self):
diff --git a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml
index ee827a6d68..99ba51a512 100644
--- a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml
+++ b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml
@@ -208,7 +208,14 @@ Item
         anchors.rightMargin: UM.Theme.getSize("thin_margin").height
 
         enabled: UM.Backend.state == UM.Backend.Done
-        currentIndex: UM.Backend.state == UM.Backend.Done ? (Cura.MachineManager.activeMachine.getOutputFileFormats.includes("application/x-makerbot") ? 1 : 0) : 2
+
+        // Pre-select the correct index, depending on the situation (see the model-property below):
+        // - Don't select any post-slice-file-format when the engine isn't done.
+        // - Choose either the S-series or the Makerbot-series of printers' format otherwise, depending on the active printer.
+        // This way, the user can just click 'save' without having to worry about wether or not the format is right.
+        property int isMakerbotFormat: Cura.MachineManager.activeMachine.getOutputFileFormats.includes("application/x-makerbot") || Cura.MachineManager.activeMachine.getOutputFileFormats.includes("application/x-makerbot-sketch")
+        property int isBackendDone: UM.Backend.state == UM.Backend.Done
+        currentIndex: isBackendDone ? (isMakerbotFormat ? 1 : 0) : 2
 
         textRole: "text"
         valueRole: "value"
diff --git a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml
index 5e1ddc2f3f..ab7442bd4e 100644
--- a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml
@@ -182,7 +182,7 @@ Item
         Cura.GcodeTextArea   // "Extruder Start G-code"
         {
             anchors.top: parent.top
-            anchors.bottom: parent.bottom
+            anchors.bottom: buttonLearnMore.top
             anchors.bottomMargin: UM.Theme.getSize("default_margin").height
             anchors.left: parent.left
             width: base.columnWidth - UM.Theme.getSize("default_margin").width
@@ -196,7 +196,7 @@ Item
         Cura.GcodeTextArea   // "Extruder End G-code"
         {
             anchors.top: parent.top
-            anchors.bottom: parent.bottom
+            anchors.bottom: buttonLearnMore.top
             anchors.bottomMargin: UM.Theme.getSize("default_margin").height
             anchors.right: parent.right
             width: base.columnWidth - UM.Theme.getSize("default_margin").width
@@ -206,5 +206,17 @@ Item
             settingKey: "machine_extruder_end_code"
             settingStoreIndex: propertyStoreIndex
         }
+
+        Cura.TertiaryButton
+        {
+            id: buttonLearnMore
+
+            text: catalog.i18nc("@button", "Learn more")
+            iconSource: UM.Theme.getIcon("LinkExternal")
+            isIconOnRightSide: true
+            onClicked: Qt.openUrlExternally("https://github.com/Ultimaker/Cura/wiki/Start-End-G%E2%80%90Code")
+            anchors.bottom: parent.bottom
+            anchors.right: parent.right
+        }
     }
 }
diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
index 740e248828..b01060c1df 100644
--- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
@@ -376,7 +376,7 @@ Item
         anchors
         {
             top: upperBlock.bottom
-            bottom: parent.bottom
+            bottom: buttonLearnMore.top
             left: parent.left
             right: parent.right
             margins: UM.Theme.getSize("default_margin").width
@@ -403,5 +403,19 @@ Item
             settingKey: "machine_end_gcode"
             settingStoreIndex: propertyStoreIndex
         }
+
+    }
+
+    Cura.TertiaryButton
+    {
+        id: buttonLearnMore
+
+        text: catalog.i18nc("@button", "Learn more")
+        iconSource: UM.Theme.getIcon("LinkExternal")
+        isIconOnRightSide: true
+        onClicked: Qt.openUrlExternally("https://github.com/Ultimaker/Cura/wiki/Start-End-G%E2%80%90Code")
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.margins: UM.Theme.getSize("default_margin").width
     }
 }
diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
index 4feb77222a..3c8e53b2e9 100644
--- a/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
+++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
@@ -42,7 +42,7 @@ class CloudApiClient:
     CLUSTER_API_ROOT = f"{ROOT_PATH}/connect/v1"
     CURA_API_ROOT = f"{ROOT_PATH}/cura/v1"
 
-    DEFAULT_REQUEST_TIMEOUT = 10  # seconds
+    DEFAULT_REQUEST_TIMEOUT = 30  # seconds
 
     # In order to avoid garbage collection we keep the callbacks in this list.
     _anti_gc_callbacks = []  # type: List[Callable[[Any], None]]
diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
index 49b5e7661d..eb2bb2a788 100644
--- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py
+++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
@@ -11,6 +11,7 @@ import xml.etree.ElementTree as ET
 from UM.PluginRegistry import PluginRegistry
 from UM.Resources import Resources
 from UM.Logger import Logger
+from UM.Decorators import CachedMemberFunctions
 import UM.Dictionary
 from UM.Settings.InstanceContainer import InstanceContainer
 from UM.Settings.ContainerRegistry import ContainerRegistry
@@ -71,6 +72,8 @@ class XmlMaterialProfile(InstanceContainer):
             Logger.log("w", "Can't change metadata {key} of material {material_id} because it's read-only.".format(key = key, material_id = self.getId()))
             return
 
+        CachedMemberFunctions.clearInstanceCache(self)
+
         # Some metadata such as diameter should also be instantiated to be a setting. Go though all values for the
         # "properties" field and apply the new values to SettingInstances as well.
         new_setting_values_dict = {}
@@ -480,6 +483,7 @@ class XmlMaterialProfile(InstanceContainer):
                     first.append(element)
 
     def clearData(self):
+        CachedMemberFunctions.clearInstanceCache(self)
         self._metadata = {
             "id": self.getId(),
             "name": ""
@@ -519,6 +523,8 @@ class XmlMaterialProfile(InstanceContainer):
     def deserialize(self, serialized, file_name = None):
         """Overridden from InstanceContainer"""
 
+        CachedMemberFunctions.clearInstanceCache(self)
+
         containers_to_add = []
         # update the serialized data first
         from UM.Settings.Interfaces import ContainerInterface
@@ -1084,9 +1090,8 @@ class XmlMaterialProfile(InstanceContainer):
             # Skip material properties (eg diameter) or metadata (eg GUID)
             return
 
-        truth_map = { True: "yes", False: "no" }
-        if tag_name != "cura:setting" and instance.value in truth_map:
-            data = truth_map[instance.value]
+        if tag_name != "cura:setting" and isinstance(instance.value, bool):
+            data = "yes" if instance.value else "no"
         else:
             data = str(instance.value)
 
diff --git a/resources/conandata.yml b/resources/conandata.yml
index d43b7d4dd2..9e4e8b5271 100644
--- a/resources/conandata.yml
+++ b/resources/conandata.yml
@@ -1 +1 @@
-version: "5.8.0"
+version: "5.9.0-alpha.0"
diff --git a/resources/definitions/creality_ender3v3se.def.json b/resources/definitions/creality_ender3v3se.def.json
index bf49d8dd1b..6248e5c851 100644
--- a/resources/definitions/creality_ender3v3se.def.json
+++ b/resources/definitions/creality_ender3v3se.def.json
@@ -36,9 +36,9 @@
         },
         "machine_heated_bed": { "default_value": true },
         "machine_height": { "default_value": 250 },
-        "machine_max_acceleration_e": { "value": 5000 },
-        "machine_max_acceleration_x": { "value": 5000.0 },
-        "machine_max_acceleration_y": { "value": 5000.0 },
+        "machine_max_acceleration_e": { "value": 2500 },
+        "machine_max_acceleration_x": { "value": 2500.0 },
+        "machine_max_acceleration_y": { "value": 2500.0 },
         "machine_max_acceleration_z": { "value": 500.0 },
         "machine_max_feedrate_e": { "value": 100 },
         "machine_max_feedrate_x": { "value": 500 },
diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json
new file mode 100644
index 0000000000..70ab78a5a6
--- /dev/null
+++ b/resources/definitions/eazao_m500.def.json
@@ -0,0 +1,74 @@
+{
+    "version": 2,
+    "name": "Eazao M500",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "Eazao",
+        "manufacturer": "Eazao",
+        "file_formats": "text/x-gcode",
+        "has_machine_quality": false,
+        "has_materials": false,
+        "machine_extruder_trains": { "0": "eazao_m500_extruder_0" },
+        "preferred_quality_type": "normal"
+    },
+    "overrides":
+    {
+        "acceleration_print": { "value": 300 },
+        "acceleration_travel": { "value": 300 },
+        "adhesion_type": { "default_value": "'none'" },
+        "bottom_layers": { "value": 2 },
+        "cool_fan_enabled": { "value": false },
+        "infill_sparse_density": { "value": 0 },
+        "initial_bottom_layers": { "value": 2 },
+        "jerk_print": { "value": 10 },
+        "jerk_travel": { "value": "jerk_print" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+        "layer_height": { "value": 1.0 },
+        "layer_height_0": { "value": 1.0 },
+        "line_width": { "value": 3.0 },
+        "machine_acceleration": { "value": 300 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 320 },
+        "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y300 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 520 },
+        "machine_max_acceleration_e": { "value": 500 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 50 },
+        "machine_max_feedrate_e": { "value": 25 },
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 5 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Eazao M500" },
+        "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" },
+        "machine_width": { "default_value": 320 },
+        "magic_spiralize": { "value": true },
+        "material_final_print_temperature": { "value": "0" },
+        "material_initial_print_temperature": { "value": "0" },
+        "material_print_temperature": { "value": "0" },
+        "material_print_temperature_layer_0": { "value": "0" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 7 },
+        "retraction_combing": { "value": "'noskin'" },
+        "retraction_count_max": { "value": 100 },
+        "retraction_enable": { "value": false },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 0.2 },
+        "speed_print": { "value": 20.0 },
+        "speed_travel": { "value": 20.0 },
+        "speed_wall": { "value": 20.0 },
+        "speed_wall_0": { "value": 20.0 },
+        "speed_wall_x": { "value": 20.0 },
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
+        "top_bottom_pattern": { "value": "concentric" },
+        "top_bottom_thickness": { "value": 3 },
+        "wall_thickness": { "value": 5.0 }
+    }
+}
\ No newline at end of file
diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json
new file mode 100644
index 0000000000..35a946e25e
--- /dev/null
+++ b/resources/definitions/eazao_m600.def.json
@@ -0,0 +1,74 @@
+{
+    "version": 2,
+    "name": "Eazao M600",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "Eazao",
+        "manufacturer": "Eazao",
+        "file_formats": "text/x-gcode",
+        "has_machine_quality": false,
+        "has_materials": false,
+        "machine_extruder_trains": { "0": "eazao_m600_extruder_0" },
+        "preferred_quality_type": "normal"
+    },
+    "overrides":
+    {
+        "acceleration_print": { "value": 300 },
+        "acceleration_travel": { "value": 300 },
+        "adhesion_type": { "default_value": "'none'" },
+        "bottom_layers": { "value": 2 },
+        "cool_fan_enabled": { "value": false },
+        "infill_sparse_density": { "value": 0 },
+        "initial_bottom_layers": { "value": 2 },
+        "jerk_print": { "value": 10 },
+        "jerk_travel": { "value": "jerk_print" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+        "layer_height": { "value": 1.0 },
+        "layer_height_0": { "value": 1.0 },
+        "line_width": { "value": 3.0 },
+        "machine_acceleration": { "value": 300 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 420 },
+        "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y400 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 620 },
+        "machine_max_acceleration_e": { "value": 500 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 50 },
+        "machine_max_feedrate_e": { "value": 25 },
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 5 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Eazao M600" },
+        "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.87; Set Mix Factor\nM163 S1 P0.13; Set Mix Factor\nM164 S0" },
+        "machine_width": { "default_value": 420 },
+        "magic_spiralize": { "value": true },
+        "material_final_print_temperature": { "value": "0" },
+        "material_initial_print_temperature": { "value": "0" },
+        "material_print_temperature": { "value": "0" },
+        "material_print_temperature_layer_0": { "value": "0" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 7 },
+        "retraction_combing": { "value": "'noskin'" },
+        "retraction_count_max": { "value": 100 },
+        "retraction_enable": { "value": false },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 0.2 },
+        "speed_print": { "value": 20.0 },
+        "speed_travel": { "value": 20.0 },
+        "speed_wall": { "value": 20.0 },
+        "speed_wall_0": { "value": 20.0 },
+        "speed_wall_x": { "value": 20.0 },
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
+        "top_bottom_pattern": { "value": "concentric" },
+        "top_bottom_thickness": { "value": 3 },
+        "wall_thickness": { "value": 5.0 }
+    }
+}
\ No newline at end of file
diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json
new file mode 100644
index 0000000000..8459b3625d
--- /dev/null
+++ b/resources/definitions/eazao_m700.def.json
@@ -0,0 +1,74 @@
+{
+    "version": 2,
+    "name": "Eazao M700",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "Eazao",
+        "manufacturer": "Eazao",
+        "file_formats": "text/x-gcode",
+        "has_machine_quality": false,
+        "has_materials": false,
+        "machine_extruder_trains": { "0": "eazao_m700_extruder_0" },
+        "preferred_quality_type": "normal"
+    },
+    "overrides":
+    {
+        "acceleration_print": { "value": 300 },
+        "acceleration_travel": { "value": 300 },
+        "adhesion_type": { "default_value": "none" },
+        "bottom_layers": { "value": 2 },
+        "cool_fan_enabled": { "value": false },
+        "infill_sparse_density": { "value": 0 },
+        "initial_bottom_layers": { "value": 2 },
+        "jerk_print": { "value": 10 },
+        "jerk_travel": { "value": "jerk_print" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+        "layer_height": { "value": 1.0 },
+        "layer_height_0": { "value": 1.0 },
+        "line_width": { "value": 3.0 },
+        "machine_acceleration": { "value": 300 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 520 },
+        "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y500 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 720 },
+        "machine_max_acceleration_e": { "value": 500 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 50 },
+        "machine_max_feedrate_e": { "value": 25 },
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 5 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Eazao M700" },
+        "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.87; Set Mix Factor\nM163 S1 P0.13; Set Mix Factor\nM164 S0" },
+        "machine_width": { "default_value": 520 },
+        "magic_spiralize": { "value": true },
+        "material_final_print_temperature": { "value": "0" },
+        "material_initial_print_temperature": { "value": "0" },
+        "material_print_temperature": { "value": "0" },
+        "material_print_temperature_layer_0": { "value": "0" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 7 },
+        "retraction_combing": { "value": "'noskin'" },
+        "retraction_count_max": { "value": 100 },
+        "retraction_enable": { "value": false },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 0.2 },
+        "speed_print": { "value": 20.0 },
+        "speed_travel": { "value": 20.0 },
+        "speed_wall": { "value": 20.0 },
+        "speed_wall_0": { "value": 20.0 },
+        "speed_wall_x": { "value": 20.0 },
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
+        "top_bottom_pattern": { "value": "concentric" },
+        "top_bottom_thickness": { "value": 3 },
+        "wall_thickness": { "value": 5.0 }
+    }
+}
\ No newline at end of file
diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json
new file mode 100644
index 0000000000..0ff84ab429
--- /dev/null
+++ b/resources/definitions/eazao_potter.def.json
@@ -0,0 +1,74 @@
+{
+    "version": 2,
+    "name": "Eazao Potter",
+    "inherits": "fdmprinter",
+    "metadata":
+    {
+        "visible": true,
+        "author": "Eazao",
+        "manufacturer": "Eazao",
+        "file_formats": "text/x-gcode",
+        "has_machine_quality": false,
+        "has_materials": false,
+        "machine_extruder_trains": { "0": "eazao_potter_extruder_0" },
+        "preferred_quality_type": "normal"
+    },
+    "overrides":
+    {
+        "acceleration_print": { "value": 300 },
+        "acceleration_travel": { "value": 300 },
+        "adhesion_type": { "default_value": "'none'" },
+        "bottom_layers": { "value": 3 },
+        "cool_fan_enabled": { "value": false },
+        "infill_sparse_density": { "value": 0 },
+        "initial_bottom_layers": { "value": 3 },
+        "jerk_print": { "value": 10 },
+        "jerk_travel": { "value": "jerk_print" },
+        "jerk_travel_layer_0": { "value": "jerk_travel" },
+        "layer_height": { "value": 1.0 },
+        "layer_height_0": { "value": 1.0 },
+        "line_width": { "value": 3.0 },
+        "machine_acceleration": { "value": 300 },
+        "machine_center_is_zero": { "default_value": false },
+        "machine_depth": { "default_value": 167 },
+        "machine_end_gcode": { "default_value": "G92 Z0 E0\nG1 F1500 Z10 E-2\nM82\nM84 ;steppers off\n" },
+        "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 280 },
+        "machine_max_acceleration_e": { "value": 500 },
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 50 },
+        "machine_max_feedrate_e": { "value": 25 },
+        "machine_max_feedrate_x": { "value": 100 },
+        "machine_max_feedrate_y": { "value": 100 },
+        "machine_max_feedrate_z": { "value": 5 },
+        "machine_max_jerk_e": { "value": 5 },
+        "machine_max_jerk_xy": { "value": 10 },
+        "machine_max_jerk_z": { "value": 0.3 },
+        "machine_name": { "default_value": "Eazao Potter" },
+        "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 25mm\nG92 E0 ;extruder reset\nG1 F1500 E2\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" },
+        "machine_width": { "default_value": 167 },
+        "magic_spiralize": { "value": true },
+        "material_final_print_temperature": { "value": "0" },
+        "material_initial_print_temperature": { "value": "0" },
+        "material_print_temperature": { "value": "0" },
+        "material_print_temperature_layer_0": { "value": "0" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "retraction_amount": { "value": 7 },
+        "retraction_combing": { "value": "'noskin'" },
+        "retraction_count_max": { "value": 100 },
+        "retraction_enable": { "value": false },
+        "retraction_extrusion_window": { "value": 10 },
+        "retraction_hop": { "value": 0.2 },
+        "speed_print": { "value": 25.0 },
+        "speed_travel": { "value": 25.0 },
+        "speed_wall": { "value": 25.0 },
+        "speed_wall_0": { "value": 25.0 },
+        "speed_wall_x": { "value": 25.0 },
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
+        "top_bottom_pattern": { "value": "concentric" },
+        "top_bottom_thickness": { "value": 3 },
+        "wall_thickness": { "value": 3.0 }
+    }
+}
\ No newline at end of file
diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json
index f849e25eb5..df6f4faa18 100644
--- a/resources/definitions/eazao_zero.def.json
+++ b/resources/definitions/eazao_zero.def.json
@@ -9,9 +9,8 @@
         "manufacturer": "Eazao",
         "file_formats": "text/x-gcode",
         "has_machine_quality": false,
-        "has_materials": true,
+        "has_materials": false,
         "machine_extruder_trains": { "0": "eazao_zero_extruder_0" },
-        "preferred_material": "generic_pla",
         "preferred_quality_type": "normal"
     },
     "overrides":
@@ -20,11 +19,10 @@
         "acceleration_print": { "value": 300 },
         "acceleration_travel": { "value": 300 },
         "adhesion_type": { "default_value": "none" },
-        "bottom_layers": { "value": 2 },
+        "bottom_layers": { "value": 3 },
         "cool_fan_enabled": { "value": false },
         "infill_sparse_density": { "value": 0 },
-        "initial_bottom_layers": { "value": 2 },
-        "jerk_enabled": { "value": false },
+        "initial_bottom_layers": { "value": 3 },
         "jerk_print": { "value": 10 },
         "jerk_travel": { "value": "jerk_print" },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
@@ -34,7 +32,7 @@
         "machine_acceleration": { "value": 300 },
         "machine_center_is_zero": { "default_value": false },
         "machine_depth": { "default_value": 150 },
-        "machine_end_gcode": { "default_value": "G92 E10\nG1 E-10 F300\nG28 X0 Y0 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" },
+        "machine_end_gcode": { "default_value": "G92 Z0 E0\nG1 F1500 E-2\nG1 F1500 Z10\nG28 X0;move X Y to min endstops\nM82\nM84 ;steppers off\n" },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "machine_heated_bed": { "default_value": false },
         "machine_height": { "default_value": 240 },
@@ -49,9 +47,10 @@
         "machine_max_jerk_e": { "value": 5 },
         "machine_max_jerk_xy": { "value": 10 },
         "machine_max_jerk_z": { "value": 0.3 },
-        "machine_name": { "default_value": "EAZAO Zero" },
-        "machine_start_gcode": { "default_value": "G21 \nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home \nG1 Z15.0 F1500 ;move the platform down 15mm\nG92 E0 \nG1 F300 E10\nG92 E0\nM302\nM163 S0 P0.9; Set Mix Factor\nM163 S1 P0.1; Set Mix Factor\nM164 S0\n" },
+        "machine_name": { "default_value": "Eazao Zero" },
+        "machine_start_gcode": { "default_value": "G21 \nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home \nG1 Z15.0 F1500 ;move the platform down 15mm\nG92 E0 \nG1 F1500 E2\nG92 E0\nM302\nM163 S0 P0.8; Set Mix Factor\nM163 S1 P0.2; Set Mix Factor\nM164 S0\n" },
         "machine_width": { "default_value": 150 },
+        "magic_spiralize": { "value": true },
         "material_final_print_temperature": { "value": "0" },
         "material_initial_print_temperature": { "value": "0" },
         "material_print_temperature": { "value": "0" },
@@ -64,18 +63,10 @@
         "retraction_enable": { "value": false },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_hop": { "value": 0.2 },
-        "retraction_hop_enabled": { "value": false },
-        "retraction_speed": { "value": 25 },
-        "speed_print": { "value": 20.0 },
-        "speed_travel": { "value": 20.0 },
-        "speed_wall": { "value": 20.0 },
-        "speed_wall_0": { "value": 20.0 },
-        "speed_wall_x": { "value": 20.0 },
+        "speed_print": { "value": 25.0 },
         "speed_z_hop": { "value": "machine_max_feedrate_z" },
-        "top_bottom_thickness": { "value": 0 },
-        "travel_avoid_other_parts": { "value": true },
-        "travel_avoid_supports": { "value": false },
-        "travel_retract_before_outer_wall": { "value": false },
+        "top_bottom_pattern": { "value": "concentric" },
+        "top_bottom_thickness": { "value": 3 },
         "wall_thickness": { "value": 3.0 }
     }
 }
\ No newline at end of file
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index c0c90dc6d7..571d501212 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -765,6 +765,15 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": false
+                },
+                "reset_flow_duration":
+                {
+                    "enabled": "gradual_flow_enabled",
+                    "value": 2.0,
+                    "label": "Reset flow duration",
+                    "description": "For any travel move longer than this value, the material flow is reset to the paths target flow",
+                    "unit": "s",
+                    "type": "float"
                 }
             }
         },
@@ -2327,7 +2336,7 @@
                     "label": "Skin Edge Support Thickness",
                     "description": "The thickness of the extra infill that supports skin edges.",
                     "unit": "mm",
-                    "default_value": 0.8,
+                    "default_value": 0,
                     "minimum_value": "0",
                     "maximum_value": "machine_height",
                     "maximum_value_warning": "resolveOrValue('infill_sparse_thickness') * 10",
@@ -2342,7 +2351,7 @@
                         {
                             "label": "Skin Edge Support Layers",
                             "description": "The number of infill layers that supports skin edges.",
-                            "default_value": 4,
+                            "default_value": 0,
                             "minimum_value": "0",
                             "maximum_value_warning": "10",
                             "type": "int",
@@ -2354,6 +2363,21 @@
                         }
                     }
                 },
+                "extra_infill_lines_to_support_skins":
+                {
+                    "label": "Extra Infill Lines To Support Skins",
+                    "description": "Add extra lines into the infill pattern to support skins above.   This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above.  'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin.",
+                    "type": "enum",
+                    "options":
+                    {
+                        "walls_and_lines": "Walls and Lines",
+                        "walls": "Walls Only",
+                        "none": "None"
+                    },
+                    "default_value": "walls_and_lines",
+                    "value": "'none' if infill_sparse_density > 50 else 'walls' if skin_edge_support_thickness > 0 else 'walls_and_lines'",
+                    "enabled": "infill_sparse_density > 0 and infill_pattern not in ('lightning', 'concentric', 'cross','cross_3d') and wall_line_count > 0 and top_layers > 0"
+                },
                 "lightning_infill_support_angle":
                 {
                     "label": "Lightning Infill Support Angle",
@@ -3140,6 +3164,60 @@
                     "enabled": false,
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
+                },
+                "gradual_flow_enabled":
+                {
+                    "label": "Gradual flow enabled",
+                    "description": "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops.",
+                    "type": "bool",
+                    "default_value": false,
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
+                "max_flow_acceleration":
+                {
+                    "enabled": "gradual_flow_enabled",
+                    "label": "Gradual flow max acceleration",
+                    "description": "Maximum acceleration for gradual flow changes",
+                    "type": "float",
+                    "unit": "mm\u00b3/s\u00b2",
+                    "default_value": 1,
+                    "minimum_value_warning": 0.1,
+                    "maximum_value_warning": 99999,
+                    "minimum_value": 0.01,
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true,
+                    "comments": "when enabled, each second the flow will at max be increased/decreased by this value"
+                },
+                "layer_0_max_flow_acceleration":
+                {
+                    "enabled": "gradual_flow_enabled",
+                    "value": "max_flow_acceleration",
+                    "label": "Initial layer max flow acceleration",
+                    "description": "Minimum speed for gradual flow changes for the first layer",
+                    "type": "float",
+                    "unit": "mm\u00b3/s\u00b2",
+                    "default_value": 1,
+                    "minimum_value_warning": 0.1,
+                    "maximum_value_warning": 99999,
+                    "minimum_value": 0.01,
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
+                "gradual_flow_discretisation_step_size":
+                {
+                    "enabled": "gradual_flow_enabled",
+                    "label": "Gradual flow discretisation step size",
+                    "description": "Duration of each step in the gradual flow change",
+                    "type": "float",
+                    "unit": "s",
+                    "default_value": 0.2,
+                    "maximum_value_warning": 1.0,
+                    "maximum_value": 5.0,
+                    "minimum_value_warning": 0.1,
+                    "minimum_value": 0.01,
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
                 }
             }
         },
diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index 48353244be..21e905fdf8 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -111,7 +111,6 @@
         "roofing_layer_count": { "value": "1" },
         "roofing_material_flow": { "value": "material_flow" },
         "skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" },
-        "skin_edge_support_thickness": { "value": "4 * layer_height if infill_sparse_density < 30 else 0" },
         "skin_material_flow": { "value": "0.95 * material_flow" },
         "skin_material_flow_layer_0": { "value": "95" },
         "skin_monotonic": { "value": "roofing_layer_count == 0" },
diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json
index 573b26cf50..5945d3a262 100644
--- a/resources/definitions/ultimaker_factor4.def.json
+++ b/resources/definitions/ultimaker_factor4.def.json
@@ -112,10 +112,10 @@
         "machine_head_with_fans_polygon":
         {
             "default_value": [
-                [-30, -80],
-                [-30, 20],
-                [50, 20],
-                [50, -80]
+                [-35, -80],
+                [-35, 30],
+                [55, 30],
+                [55, -80]
             ]
         },
         "machine_heated_bed": { "default_value": true },
diff --git a/resources/extruders/eazao_m500_extruder_0.def.json b/resources/extruders/eazao_m500_extruder_0.def.json
new file mode 100644
index 0000000000..6f95c06cc9
--- /dev/null
+++ b/resources/extruders/eazao_m500_extruder_0.def.json
@@ -0,0 +1,16 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "eazao_m500",
+        "position": "0"
+    },
+    "overrides":
+    {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 2.3 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
\ No newline at end of file
diff --git a/resources/extruders/eazao_m600_extruder_0.def.json b/resources/extruders/eazao_m600_extruder_0.def.json
new file mode 100644
index 0000000000..bcbad3ab0f
--- /dev/null
+++ b/resources/extruders/eazao_m600_extruder_0.def.json
@@ -0,0 +1,16 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "eazao_m600",
+        "position": "0"
+    },
+    "overrides":
+    {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 2.3 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
\ No newline at end of file
diff --git a/resources/extruders/eazao_m700_extruder_0.def.json b/resources/extruders/eazao_m700_extruder_0.def.json
new file mode 100644
index 0000000000..fada355172
--- /dev/null
+++ b/resources/extruders/eazao_m700_extruder_0.def.json
@@ -0,0 +1,16 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "eazao_m700",
+        "position": "0"
+    },
+    "overrides":
+    {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 2.3 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
\ No newline at end of file
diff --git a/resources/extruders/eazao_potter_extruder_0.def.json b/resources/extruders/eazao_potter_extruder_0.def.json
new file mode 100644
index 0000000000..e2c1451896
--- /dev/null
+++ b/resources/extruders/eazao_potter_extruder_0.def.json
@@ -0,0 +1,16 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "eazao_potter",
+        "position": "0"
+    },
+    "overrides":
+    {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 1.6 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}
\ No newline at end of file
diff --git a/resources/extruders/eazao_zero_extruder_0.def.json b/resources/extruders/eazao_zero_extruder_0.def.json
index 5d34008337..f4b958fba7 100644
--- a/resources/extruders/eazao_zero_extruder_0.def.json
+++ b/resources/extruders/eazao_zero_extruder_0.def.json
@@ -10,7 +10,7 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
-        "machine_nozzle_size": { "default_value": 1.5 },
+        "machine_nozzle_size": { "default_value": 1.6 },
         "material_diameter": { "default_value": 1.75 }
     }
 }
\ No newline at end of file
diff --git a/resources/i18n/cs_CZ/fdmprinter.def.json.po b/resources/i18n/cs_CZ/fdmprinter.def.json.po
index eb23f73c28..c2a02d7e40 100644
--- a/resources/i18n/cs_CZ/fdmprinter.def.json.po
+++ b/resources/i18n/cs_CZ/fdmprinter.def.json.po
@@ -5893,53 +5893,53 @@ msgstr "cestování"
 #~ msgid "Brim Only on Outside"
 #~ msgstr "Límec pouze venku"
 
-#~ msgctxt "gradual_flow_discretisation_step_size description"
-#~ msgid "Duration of each step in the gradual flow change"
-#~ msgstr "Doba trvání každého kroku v postupné změně průtoku"
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "Doba trvání každého kroku v postupné změně průtoku"
 
-#~ msgctxt "gradual_flow_enabled description"
-#~ msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-#~ msgstr "Povolit postupné změny průtoku. Když je povoleno, průtok se postupně zvyšuje / snižuje na cílový průtok. Toto je užitečné pro tiskárny s Bowdenovou trubicí, kde se průtok okamžitě nezmění, když se spustí / zastaví extrudér."
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "Povolit postupné změny průtoku. Když je povoleno, průtok se postupně zvyšuje / snižuje na cílový průtok. Toto je užitečné pro tiskárny s Bowdenovou trubicí, kde se průtok okamžitě nezmění, když se spustí / zastaví extrudér."
 
-#~ msgctxt "reset_flow_duration description"
-#~ msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-#~ msgstr "Pro jakýkoli pohyb delší než tato hodnota se materiálový průtok resetuje na cílový průtok dráhy"
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "Pro jakýkoli pohyb delší než tato hodnota se materiálový průtok resetuje na cílový průtok dráhy"
 
-#~ msgctxt "gradual_flow_discretisation_step_size label"
-#~ msgid "Gradual flow discretisation step size"
-#~ msgstr "Velikost kroku diskretizace postupné změny průtoku"
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "Velikost kroku diskretizace postupné změny průtoku"
 
-#~ msgctxt "gradual_flow_enabled label"
-#~ msgid "Gradual flow enabled"
-#~ msgstr "Postupné změny průtoku povoleny"
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "Postupné změny průtoku povoleny"
 
-#~ msgctxt "max_flow_acceleration label"
-#~ msgid "Gradual flow max acceleration"
-#~ msgstr "Maximální zrychlení postupných změn průtoku"
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "Maximální zrychlení postupných změn průtoku"
 
-#~ msgctxt "layer_0_max_flow_acceleration label"
-#~ msgid "Initial layer max flow acceleration"
-#~ msgstr "Maximální zrychlení průtoku pro první vrstvu"
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "Maximální zrychlení průtoku pro první vrstvu"
 
 #~ msgctxt "layer_0_z_overlap description"
 #~ msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount."
 #~ msgstr "První a druhá vrstva modelu se překrývají ve směru Z, aby se kompenzovalo vlákno ztracené ve vzduchové mezeře. Všechny modely nad první vrstvou modelu budou o tuto částku posunuty dolů."
 
-#~ msgctxt "max_flow_acceleration description"
-#~ msgid "Maximum acceleration for gradual flow changes"
-#~ msgstr "Maximální zrychlení pro postupné změny průtoku"
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "Maximální zrychlení pro postupné změny průtoku"
 
-#~ msgctxt "layer_0_max_flow_acceleration description"
-#~ msgid "Minimum speed for gradual flow changes for the first layer"
-#~ msgstr "Minimální rychlost pro postupné změny průtoku pro první vrstvu"
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "Minimální rychlost pro postupné změny průtoku pro první vrstvu"
 
 #~ msgctxt "brim_outside_only description"
 #~ msgid "Only print the brim on the outside of the model. This reduces the amount of brim you need to remove afterwards, while it doesn't reduce the bed adhesion that much."
 #~ msgstr "Límec tiskněte pouze na vnější stranu modelu. Tím se snižuje množství límce, který je třeba následně odstranit, zatímco to tolik nesnižuje přilnavost k podložce."
 
-#~ msgctxt "reset_flow_duration label"
-#~ msgid "Reset flow duration"
-#~ msgstr "Doba trvání resetování průtoku"
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "Doba trvání resetování průtoku"
 
 #~ msgctxt "support_interface_skip_height label"
 #~ msgid "Support Interface Resolution"
diff --git a/resources/i18n/cs_CZ/gradual_flow_settings.def.json.po b/resources/i18n/cs_CZ/gradual_flow_settings.def.json.po
deleted file mode 100644
index 2529ed73e4..0000000000
--- a/resources/i18n/cs_CZ/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: 2024-03-11 11:28+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr ""
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr ""
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr ""
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr ""
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr ""
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr ""
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr ""
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr ""
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr ""
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr ""
diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po
index 37b95d2d07..dc2fb4f21d 100644
--- a/resources/i18n/de_DE/fdmprinter.def.json.po
+++ b/resources/i18n/de_DE/fdmprinter.def.json.po
@@ -5860,3 +5860,43 @@ msgstr "Beim Drucken der ersten Schicht der Raft-Oberfläche verschieben Sie um
 msgctxt "z_seam_on_vertex label"
 msgid "Z Seam On Vertex"
 msgstr "Z-Naht auf Scheitelpunkt"
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "Dauer jedes Schritts bei der sukzessiven Durchflusssänderung"
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "Aktivieren Sie sukzessive Durchflussänderungen. Wenn diese Option aktiviert ist, wird der Durchfluss sukzessiv auf den angestrebten Durchfluss erhöht/verringert. Dies ist nützlich für Drucker mit einem Bowdenschlauch, bei denen der Durchfluss nicht sofort geändert wird, wenn der Extrudermotor startet/stoppt."
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "Für jede Verfahrbewegung, die länger als dieser Wert ist, wird der Materialfluss auf den Sollwegfluss zurückgesetzt."
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "Umfang des Diskretisierungsvorgangs bei sukzessivem Durchfluss"
+
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "Sukzessiver Durchfluss aktiviert"
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "Maximale Beschleunigung bei sukzessivem Durchfluss"
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "Maximale Durchflussbeschleunigung bei der Anfangsschicht"
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "Maximale Beschleunigung für sukzessive Durchflussänderungen"
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "Mindestgeschwindigkeit für sukzessive Durchflussänderungen bei der Anfangsschicht"
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "Durchflussdauer zurücksetzen"
diff --git a/resources/i18n/de_DE/gradual_flow_settings.def.json.po b/resources/i18n/de_DE/gradual_flow_settings.def.json.po
deleted file mode 100644
index 3fac955623..0000000000
--- a/resources/i18n/de_DE/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,53 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: de_DE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr "Dauer jedes Schritts bei der sukzessiven Durchflusssänderung"
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr "Aktivieren Sie sukzessive Durchflussänderungen. Wenn diese Option aktiviert ist, wird der Durchfluss sukzessiv auf den angestrebten Durchfluss erhöht/verringert. Dies ist nützlich für Drucker mit einem Bowdenschlauch, bei denen der Durchfluss nicht sofort geändert wird, wenn der Extrudermotor startet/stoppt."
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr "Für jede Verfahrbewegung, die länger als dieser Wert ist, wird der Materialfluss auf den Sollwegfluss zurückgesetzt."
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr "Umfang des Diskretisierungsvorgangs bei sukzessivem Durchfluss"
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr "Sukzessiver Durchfluss aktiviert"
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr "Maximale Beschleunigung bei sukzessivem Durchfluss"
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr "Maximale Durchflussbeschleunigung bei der Anfangsschicht"
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr "Maximale Beschleunigung für sukzessive Durchflussänderungen"
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr "Mindestgeschwindigkeit für sukzessive Durchflussänderungen bei der Anfangsschicht"
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr "Durchflussdauer zurücksetzen"
diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po
index db2d43b4d8..662e6c372c 100644
--- a/resources/i18n/es_ES/fdmprinter.def.json.po
+++ b/resources/i18n/es_ES/fdmprinter.def.json.po
@@ -5860,3 +5860,43 @@ msgstr "Cuando se imprima la primera capa de la superficie del conjunto, convier
 msgctxt "z_seam_on_vertex label"
 msgid "Z Seam On Vertex"
 msgstr "Juntura Z en el vértice"
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "Duración de cada intervalo en el cambio de flujo gradual"
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "Habilite cambios de flujo gradual. Al habilitarse, el flujo se incrementa/decrementa gradualmente hasta el flujo objetivo. Esto es útil para impresoras con tubo bowden en las que el flujo no cambia inmediatamente cuando el motor extrusor arranca o se detiene."
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "Para cualquier movimiento de desplazamiento superior a este valor, el flujo material se restablece al flujo objetivo de las trayectorias"
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "Tamaño del intervalo para discretización de flujo gradual"
+
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "Flujo gradual habilitado"
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "Flujo gradual de aceleración máxima"
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "Aceleración máxima de flujo de capa inicial"
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "Aceleración máxima para cambios graduales de flujo"
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "Velocidad mínima para cambios graduales de flujo en la primera capa"
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "Restablecer duración de flujo"
diff --git a/resources/i18n/es_ES/gradual_flow_settings.def.json.po b/resources/i18n/es_ES/gradual_flow_settings.def.json.po
deleted file mode 100644
index 3437e28849..0000000000
--- a/resources/i18n/es_ES/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,53 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: es_ES\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr "Duración de cada intervalo en el cambio de flujo gradual"
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr "Habilite cambios de flujo gradual. Al habilitarse, el flujo se incrementa/decrementa gradualmente hasta el flujo objetivo. Esto es útil para impresoras con tubo bowden en las que el flujo no cambia inmediatamente cuando el motor extrusor arranca o se detiene."
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr "Para cualquier movimiento de desplazamiento superior a este valor, el flujo material se restablece al flujo objetivo de las trayectorias"
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr "Tamaño del intervalo para discretización de flujo gradual"
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr "Flujo gradual habilitado"
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr "Flujo gradual de aceleración máxima"
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr "Aceleración máxima de flujo de capa inicial"
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr "Aceleración máxima para cambios graduales de flujo"
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr "Velocidad mínima para cambios graduales de flujo en la primera capa"
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr "Restablecer duración de flujo"
diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot
index 89729e177d..8a09cf9129 100644
--- a/resources/i18n/fdmprinter.def.json.pot
+++ b/resources/i18n/fdmprinter.def.json.pot
@@ -5860,3 +5860,43 @@ msgctxt "mesh_rotation_matrix description"
 msgid "Transformation matrix to be applied to the model when loading it from file."
 msgstr ""
 
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr ""
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr ""
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr ""
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr ""
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr ""
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr ""
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr ""
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr ""
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr ""
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr ""
+
diff --git a/resources/i18n/fi_FI/gradual_flow_settings.def.json.po b/resources/i18n/fi_FI/gradual_flow_settings.def.json.po
deleted file mode 100644
index 2529ed73e4..0000000000
--- a/resources/i18n/fi_FI/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: 2024-03-11 11:28+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr ""
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr ""
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr ""
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr ""
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr ""
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr ""
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr ""
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr ""
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr ""
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr ""
diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po
index 6ebc9cfecb..7ae71602a3 100644
--- a/resources/i18n/fr_FR/fdmprinter.def.json.po
+++ b/resources/i18n/fr_FR/fdmprinter.def.json.po
@@ -5860,3 +5860,43 @@ msgstr "Lors de l'impression de la première couche de la surface du radeau, il
 msgctxt "z_seam_on_vertex label"
 msgid "Z Seam On Vertex"
 msgstr "Joint en Z sur le sommet"
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "Durée de chaque pas dans la variation progressive du débit"
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "Activer les variations de débit progressives. Lorsque cette option est activée, le débit est augmenté ou réduit progressivement jusqu'au débit souhaité. Cette option est utile pour les imprimantes avec un tube bowden où le débit n'est pas modifié immédiatement lorsque le moteur de l'extrudeur démarre ou s'arrête."
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "Pour tout déplacement supérieur à cette valeur, le débit de matière est réinitialisé au débit souhaité pour les trajectoires"
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "Taille de pas de la discrétisation du débit progressif"
+
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "Débit progressif activé"
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "Accélération progressive jusqu'au débit max"
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "Accélération maximale du débit lors de la première couche"
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "Accélération maximale pour les variations de débit progressives"
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "Vitesse minimale pour les variations de débit progressives pour la première couche"
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "Réinitialiser la durée du débit"
diff --git a/resources/i18n/fr_FR/gradual_flow_settings.def.json.po b/resources/i18n/fr_FR/gradual_flow_settings.def.json.po
deleted file mode 100644
index 6b1a40e614..0000000000
--- a/resources/i18n/fr_FR/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,53 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: fr_FR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n>1;\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr "Durée de chaque pas dans la variation progressive du débit"
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr "Activer les variations de débit progressives. Lorsque cette option est activée, le débit est augmenté ou réduit progressivement jusqu'au débit souhaité. Cette option est utile pour les imprimantes avec un tube bowden où le débit n'est pas modifié immédiatement lorsque le moteur de l'extrudeur démarre ou s'arrête."
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr "Pour tout déplacement supérieur à cette valeur, le débit de matière est réinitialisé au débit souhaité pour les trajectoires"
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr "Taille de pas de la discrétisation du débit progressif"
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr "Débit progressif activé"
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr "Accélération progressive jusqu'au débit max"
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr "Accélération maximale du débit lors de la première couche"
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr "Accélération maximale pour les variations de débit progressives"
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr "Vitesse minimale pour les variations de débit progressives pour la première couche"
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr "Réinitialiser la durée du débit"
diff --git a/resources/i18n/gradual_flow_settings.def.json.pot b/resources/i18n/gradual_flow_settings.def.json.pot
deleted file mode 100644
index 7d9afba68f..0000000000
--- a/resources/i18n/gradual_flow_settings.def.json.pot
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-
-
-
-
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr ""
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr ""
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr ""
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr ""
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr ""
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr ""
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr ""
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr ""
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr ""
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr ""
-
diff --git a/resources/i18n/hu_HU/gradual_flow_settings.def.json.po b/resources/i18n/hu_HU/gradual_flow_settings.def.json.po
deleted file mode 100644
index 2529ed73e4..0000000000
--- a/resources/i18n/hu_HU/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: 2024-03-11 11:28+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr ""
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr ""
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr ""
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr ""
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr ""
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr ""
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr ""
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr ""
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr ""
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr ""
diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po
index dab6b12a71..2efce196db 100644
--- a/resources/i18n/it_IT/fdmprinter.def.json.po
+++ b/resources/i18n/it_IT/fdmprinter.def.json.po
@@ -5860,3 +5860,43 @@ msgstr "Quando si stampa il primo strato della superficie del raft, traslare con
 msgctxt "z_seam_on_vertex label"
 msgid "Z Seam On Vertex"
 msgstr "Cucitura Z sul vertice"
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "Durata di ogni gradino per la variazione graduale del flusso"
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "Abilitare le variazioni graduali del flusso. Quando abilitate, il flusso viene aumentato/diminuito gradualmente fino al flusso target. Ciò è utile per le stampanti dotate di tubo bowden dove il flusso non viene modificato immediatamente all'avvio/arresto del motore dell'estrusore."
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "Per ogni spostamento del percorso superiore a questo valore, il flusso del materiale viene reimpostato su quello target dei percorsi."
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "Dimensione del gradino di discretizzazione del flusso graduale"
+
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "Flusso graduale abilitato"
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "Accelerazione massima del flusso graduale"
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "Accelerazione massima del flusso per lo strato iniziale"
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "Accelerazione massima per le variazioni graduali del flusso"
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "Velocità minima per le variazioni graduali del flusso per il primo strato."
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "Reimpostare la durata del flusso"
diff --git a/resources/i18n/it_IT/gradual_flow_settings.def.json.po b/resources/i18n/it_IT/gradual_flow_settings.def.json.po
deleted file mode 100644
index f3c4fca088..0000000000
--- a/resources/i18n/it_IT/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,53 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: it_IT\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr "Durata di ogni gradino per la variazione graduale del flusso"
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr "Abilitare le variazioni graduali del flusso. Quando abilitate, il flusso viene aumentato/diminuito gradualmente fino al flusso target. Ciò è utile per le stampanti dotate di tubo bowden dove il flusso non viene modificato immediatamente all'avvio/arresto del motore dell'estrusore."
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr "Per ogni spostamento del percorso superiore a questo valore, il flusso del materiale viene reimpostato su quello target dei percorsi."
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr "Dimensione del gradino di discretizzazione del flusso graduale"
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr "Flusso graduale abilitato"
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr "Accelerazione massima del flusso graduale"
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr "Accelerazione massima del flusso per lo strato iniziale"
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr "Accelerazione massima per le variazioni graduali del flusso"
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr "Velocità minima per le variazioni graduali del flusso per il primo strato."
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr "Reimpostare la durata del flusso"
diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po
index f0924c7ae8..9feb3284fe 100644
--- a/resources/i18n/ja_JP/fdmprinter.def.json.po
+++ b/resources/i18n/ja_JP/fdmprinter.def.json.po
@@ -5862,3 +5862,43 @@ msgstr "ラフトサーフェスの第1層をプリントする際に,このオ
 msgctxt "z_seam_on_vertex label"
 msgid "Z Seam On Vertex"
 msgstr "頂点のZシーム"
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "段階的なフローの変化におけるステップごとの継続時間"
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "段階的なフローの変化を有効にします。有効にすると,フローは目標フローまで段階的に増減します。これは,押し出しモーターの始動/停止時にフローがすぐに変化しないボーデンチューブを備えたプリンターに便利です。"
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "この値より長い移動の場合,素材フローはパスの目標フローにリセットされます。"
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "段階的なフローの離散化ステップのサイズ"
+
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "段階的なフローが有効"
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "段階的なフローの最大加速度"
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "初期層の最大フロー加速度"
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "フローを段階的に変化させるための最大加速度"
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "第1層のフローを段階的に変化させるための最低速度"
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "フローの継続時間をリセット"
diff --git a/resources/i18n/ja_JP/gradual_flow_settings.def.json.po b/resources/i18n/ja_JP/gradual_flow_settings.def.json.po
deleted file mode 100644
index d8548e3849..0000000000
--- a/resources/i18n/ja_JP/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,53 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ja_JP\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr "段階的なフローの変化におけるステップごとの継続時間"
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr "段階的なフローの変化を有効にします。有効にすると,フローは目標フローまで段階的に増減します。これは,押し出しモーターの始動/停止時にフローがすぐに変化しないボーデンチューブを備えたプリンターに便利です。"
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr "この値より長い移動の場合,素材フローはパスの目標フローにリセットされます。"
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr "段階的なフローの離散化ステップのサイズ"
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr "段階的なフローが有効"
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr "段階的なフローの最大加速度"
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr "初期層の最大フロー加速度"
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr "フローを段階的に変化させるための最大加速度"
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr "第1層のフローを段階的に変化させるための最低速度"
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr "フローの継続時間をリセット"
diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po
index 371c8badaf..778ecf3663 100644
--- a/resources/i18n/ko_KR/fdmprinter.def.json.po
+++ b/resources/i18n/ko_KR/fdmprinter.def.json.po
@@ -5860,3 +5860,43 @@ msgstr "래프트 서피스의 첫 번째 레이어를 인쇄 시, 해당 오프
 msgctxt "z_seam_on_vertex label"
 msgid "Z Seam On Vertex"
 msgstr "버텍스 상의 Z 심"
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "점진적 흐름 변경에서 각 단계의 지속 시간"
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "점진적 흐름 변경을 활성화합니다. 활성화하면 흐름이 목표 흐름까지 점진적으로 증가/감소합니다. 이는 압출기 모터가 시작/정지될 때 흐름이 즉시 변경되지 않는 보우덴 튜브가 있는 프린터에 유용합니다."
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "이 값보다 긴 이동에 대해서는 재료 흐름이 경로 목표 흐름으로 재설정됩니다"
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "점진적 흐름 이산화 단계 크기"
+
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "점진적 흐름 활성화됨"
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "점진적 흐름 최대 가속"
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "초기 레이어 최대 흐름 가속"
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "점진적 흐름 변경에 대한 최대 가속"
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "첫 번째 레이어의 점진적 흐름 변경에 대한 최소 속도"
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "흐름 지속 시간 재설정"
diff --git a/resources/i18n/ko_KR/gradual_flow_settings.def.json.po b/resources/i18n/ko_KR/gradual_flow_settings.def.json.po
deleted file mode 100644
index 7b13d00199..0000000000
--- a/resources/i18n/ko_KR/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,53 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ko_KR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr "점진적 흐름 변경에서 각 단계의 지속 시간"
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr "점진적 흐름 변경을 활성화합니다. 활성화하면 흐름이 목표 흐름까지 점진적으로 증가/감소합니다. 이는 압출기 모터가 시작/정지될 때 흐름이 즉시 변경되지 않는 보우덴 튜브가 있는 프린터에 유용합니다."
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr "이 값보다 긴 이동에 대해서는 재료 흐름이 경로 목표 흐름으로 재설정됩니다"
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr "점진적 흐름 이산화 단계 크기"
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr "점진적 흐름 활성화됨"
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr "점진적 흐름 최대 가속"
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr "초기 레이어 최대 흐름 가속"
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr "점진적 흐름 변경에 대한 최대 가속"
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr "첫 번째 레이어의 점진적 흐름 변경에 대한 최소 속도"
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr "흐름 지속 시간 재설정"
diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po
index 1ff63009b6..ae67b0c910 100644
--- a/resources/i18n/nl_NL/fdmprinter.def.json.po
+++ b/resources/i18n/nl_NL/fdmprinter.def.json.po
@@ -5860,3 +5860,43 @@ msgstr "Bij het printen van de eerste laag van het raftoppervlak: gebruik deze o
 msgctxt "z_seam_on_vertex label"
 msgid "Z Seam On Vertex"
 msgstr "Z-naad op vertex"
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "Duur van elke stap in de geleidelijke stroomverandering"
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "Geleidelijke stroomwijzigingen inschakelen. Als deze optie is ingeschakeld, wordt de stroom geleidelijk verhoogd/verlaagd tot de doelstroom. Dit is handig voor printers met een bowdenbuis waarbij de stroom niet onmiddellijk verandert wanneer de extrudermotor start/stopt."
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "Voor elke af te leggen afstand die langer is dan deze waarde, wordt de materiaalstroom opnieuw ingesteld op de doelstroom van de paden."
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "Stapgrootte geleidelijke stroomdiscretisatie"
+
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "Geleidelijke stroom ingeschakeld"
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "Maximale versnelling voor geleidelijke stroom"
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "Maximale stroomversnelling eerste laag"
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "Maximale versnelling voor geleidelijke stroomveranderingen"
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "Minimumsnelheid voor geleidelijke stroomveranderingen voor de eerste laag"
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "Stroomduur opnieuw instellen"
diff --git a/resources/i18n/nl_NL/gradual_flow_settings.def.json.po b/resources/i18n/nl_NL/gradual_flow_settings.def.json.po
deleted file mode 100644
index fcb179f9b3..0000000000
--- a/resources/i18n/nl_NL/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,53 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nl_NL\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr "Duur van elke stap in de geleidelijke stroomverandering"
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr "Geleidelijke stroomwijzigingen inschakelen. Als deze optie is ingeschakeld, wordt de stroom geleidelijk verhoogd/verlaagd tot de doelstroom. Dit is handig voor printers met een bowdenbuis waarbij de stroom niet onmiddellijk verandert wanneer de extrudermotor start/stopt."
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr "Voor elke af te leggen afstand die langer is dan deze waarde, wordt de materiaalstroom opnieuw ingesteld op de doelstroom van de paden."
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr "Stapgrootte geleidelijke stroomdiscretisatie"
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr "Geleidelijke stroom ingeschakeld"
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr "Maximale versnelling voor geleidelijke stroom"
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr "Maximale stroomversnelling eerste laag"
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr "Maximale versnelling voor geleidelijke stroomveranderingen"
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr "Minimumsnelheid voor geleidelijke stroomveranderingen voor de eerste laag"
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr "Stroomduur opnieuw instellen"
diff --git a/resources/i18n/pl_PL/gradual_flow_settings.def.json.po b/resources/i18n/pl_PL/gradual_flow_settings.def.json.po
deleted file mode 100644
index 2529ed73e4..0000000000
--- a/resources/i18n/pl_PL/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: 2024-03-11 11:28+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr ""
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr ""
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr ""
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr ""
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr ""
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr ""
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr ""
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr ""
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr ""
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr ""
diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po
index d668c8841a..9a14afb3e8 100644
--- a/resources/i18n/pt_BR/fdmprinter.def.json.po
+++ b/resources/i18n/pt_BR/fdmprinter.def.json.po
@@ -5906,54 +5906,14 @@ msgstr "percurso"
 #~ msgid "Brim Only on Outside"
 #~ msgstr "Brim Somente Para Fora"
 
-#~ msgctxt "gradual_flow_discretisation_step_size description"
-#~ msgid "Duration of each step in the gradual flow change"
-#~ msgstr "Duração de cada passo na alteração de fluxo gradual"
-
-#~ msgctxt "gradual_flow_enabled description"
-#~ msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-#~ msgstr "Habilita mudanças graduais de fluxo. Quando habilitado, o fluxo é gradualmente aumentado ou reduzido para o fluxo alvo. Útil para impressoras com tubo bowden onde o fluxo não é imediatamente alterado quando o motor do extrusor inicia ou para."
-
-#~ msgctxt "reset_flow_duration description"
-#~ msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-#~ msgstr "Para qualquer movimento mais longo que este valor, o fluxo material é resetado para o fluxo-alvo do percurso."
-
-#~ msgctxt "gradual_flow_discretisation_step_size label"
-#~ msgid "Gradual flow discretisation step size"
-#~ msgstr "Tamanho de passo da discretização de fluxo gradual"
-
-#~ msgctxt "gradual_flow_enabled label"
-#~ msgid "Gradual flow enabled"
-#~ msgstr "Fluxo gradual habilitado"
-
-#~ msgctxt "max_flow_acceleration label"
-#~ msgid "Gradual flow max acceleration"
-#~ msgstr "Aceleração máxima do fluxo gradual"
-
-#~ msgctxt "layer_0_max_flow_acceleration label"
-#~ msgid "Initial layer max flow acceleration"
-#~ msgstr "Aceleração máxima de fluxo da camada inicial"
-
 #~ msgctxt "layer_0_z_overlap description"
 #~ msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount."
 #~ msgstr "Faz a primeira e segunda camadas do modelo se sobreporem na direção Z para compensar pelo filamento perdido no vão aéreo. Todos os modelos acima da primeira camada de modelo serão deslocados para baixo por essa distância."
 
-#~ msgctxt "max_flow_acceleration description"
-#~ msgid "Maximum acceleration for gradual flow changes"
-#~ msgstr "Aceleração máxima para alterações de fluxo gradual"
-
-#~ msgctxt "layer_0_max_flow_acceleration description"
-#~ msgid "Minimum speed for gradual flow changes for the first layer"
-#~ msgstr "Velocidade mínima para alterações graduais de fluxo na primeira camada"
-
 #~ msgctxt "brim_outside_only description"
 #~ msgid "Only print the brim on the outside of the model. This reduces the amount of brim you need to remove afterwards, while it doesn't reduce the bed adhesion that much."
 #~ msgstr "Imprimir o Brim somente no lado de fora do modelo. Isto reduz a quantidade de brim a ser removida no final, e não reduz tanto a aderência à mesa."
 
-#~ msgctxt "reset_flow_duration label"
-#~ msgid "Reset flow duration"
-#~ msgstr "Duração de reset do fluxo"
-
 #~ msgctxt "support_interface_skip_height label"
 #~ msgid "Support Interface Resolution"
 #~ msgstr "Resolução da Interface de Suporte"
@@ -5961,3 +5921,43 @@ msgstr "percurso"
 #~ msgctxt "support_interface_skip_height description"
 #~ msgid "When checking where there's model above and below the support, take steps of the given height. Lower values will slice slower, while higher values may cause normal support to be printed in some places where there should have been support interface."
 #~ msgstr "Quando verificar se há partes do modelo abaixo e acima do suporte, usar passos de dada altura. Valores baixos fatiarão mais lentamente, enquanto que valores altos farão com que suporte convencional seja impresso em lugares em que deveria haver interface de suporte."
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "Duração de cada passo na mudança gradual de fluxo"
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "Habilita mudanças graduais de fluxo. Quando habilitado, o fluxo é gradualmente aumentado ou diminuído ao fluxo-alvo. Isto é útil para impressoras com tubo bowden em que o fluxo não é imediatamente alterado quando o motor de extrusor para ou inicia."
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "Para cada movimento de percurso menor que este valor, o fluxo de material é resetado para o fluxo-alvo dos caminhos"
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "Tamanho de passo de discretização gradual de fluxo"
+
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "Fluxo gradual habilitado"
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "Aceleração máximo de fluxo gradual"
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "Aceleração máxima de fluxo da camada inicial"
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "Aceleração máxima para mudanças de fluxo gradual"
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "Velocidade mínima para mudanças de fluxo gradual da primeira camada"
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "Duração de reset de fluxo"
diff --git a/resources/i18n/pt_BR/gradual_flow_settings.def.json.po b/resources/i18n/pt_BR/gradual_flow_settings.def.json.po
deleted file mode 100644
index 24b118429c..0000000000
--- a/resources/i18n/pt_BR/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: 2024-04-01 22:35+0200\n"
-"Last-Translator: Cláudio Sampaio <patola@gmail.com>\n"
-"Language-Team: none\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.4.2\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr "Duração de cada passo na mudança gradual de fluxo"
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr "Habilita mudanças graduais de fluxo. Quando habilitado, o fluxo é gradualmente aumentado ou diminuído ao fluxo-alvo. Isto é útil para impressoras com tubo bowden em que o fluxo não é imediatamente alterado quando o motor de extrusor para ou inicia."
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr "Para cada movimento de percurso menor que este valor, o fluxo de material é resetado para o fluxo-alvo dos caminhos"
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr "Tamanho de passo de discretização gradual de fluxo"
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr "Fluxo gradual habilitado"
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr "Aceleração máximo de fluxo gradual"
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr "Aceleração máxima de fluxo da camada inicial"
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr "Aceleração máxima para mudanças de fluxo gradual"
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr "Velocidade mínima para mudanças de fluxo gradual da primeira camada"
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr "Duração de reset de fluxo"
diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po
index c00e46ef23..e7c9077cfb 100644
--- a/resources/i18n/pt_PT/fdmprinter.def.json.po
+++ b/resources/i18n/pt_PT/fdmprinter.def.json.po
@@ -5860,3 +5860,43 @@ msgstr "Ao imprimir a primeira camada da superfície da jangada, traduza por est
 msgctxt "z_seam_on_vertex label"
 msgid "Z Seam On Vertex"
 msgstr "Junta Z no vértice"
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "Duração de cada etapa da mudança gradual de fluxo"
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "Ativar alterações graduais de fluxo. Quando ativado, o fluxo é gradualmente aumentado/diminuído para o fluxo alvo. Isto é útil para impressoras com um tubo bowden em que o fluxo não é imediatamente alterado quando o motor da extrusora arranca/para."
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "Para qualquer deslocação superior a este valor, o fluxo de material é reposto no fluxo teórico das vias"
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "Tamanho do passo de discretização do fluxo gradual"
+
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "Fluxo gradual ativado"
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "Aceleração máxima do fluxo gradual"
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "Aceleração do fluxo máximo da camada inicial"
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "Aceleração máxima para mudanças graduais de fluxo"
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "Velocidade mínima para mudanças graduais de fluxo para a primeira camada"
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "Redefinir a duração do fluxo"
diff --git a/resources/i18n/pt_PT/gradual_flow_settings.def.json.po b/resources/i18n/pt_PT/gradual_flow_settings.def.json.po
deleted file mode 100644
index 28faebc914..0000000000
--- a/resources/i18n/pt_PT/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,53 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: pt_PT\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr "Duração de cada etapa da mudança gradual de fluxo"
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr "Ativar alterações graduais de fluxo. Quando ativado, o fluxo é gradualmente aumentado/diminuído para o fluxo alvo. Isto é útil para impressoras com um tubo bowden em que o fluxo não é imediatamente alterado quando o motor da extrusora arranca/para."
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr "Para qualquer deslocação superior a este valor, o fluxo de material é reposto no fluxo teórico das vias"
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr "Tamanho do passo de discretização do fluxo gradual"
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr "Fluxo gradual ativado"
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr "Aceleração máxima do fluxo gradual"
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr "Aceleração do fluxo máximo da camada inicial"
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr "Aceleração máxima para mudanças graduais de fluxo"
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr "Velocidade mínima para mudanças graduais de fluxo para a primeira camada"
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr "Redefinir a duração do fluxo"
diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po
index a0cc7af6d3..fe630270c6 100644
--- a/resources/i18n/ru_RU/fdmprinter.def.json.po
+++ b/resources/i18n/ru_RU/fdmprinter.def.json.po
@@ -5860,3 +5860,43 @@ msgstr "При печати первого слоя поверхности ра
 msgctxt "z_seam_on_vertex label"
 msgid "Z Seam On Vertex"
 msgstr "Z-шов на вершине"
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "Продолжительность каждого шага изменения плавного потока"
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "Включите изменения плавного потока. Если эта функция включена, поток постепенно увеличивается/уменьшается до целевого значения. Это полезно для принтеров с трубкой Боудена, где поток не меняется сразу при запуске/остановке двигателя экструдера."
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "Для любого перемещения, превышающего это значение, поток материала сбрасывается до целевого потока пути."
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "Размер шага дискретизации плавного потока"
+
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "Плавный поток включен"
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "Максимальное ускорение плавного потока"
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "Максимальное ускорение потока начального слоя"
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "Максимальное ускорение для изменения плавного потока"
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "Минимальная скорость изменения плавного потока для первого слоя"
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "Сбросить продолжительность потока"
diff --git a/resources/i18n/ru_RU/gradual_flow_settings.def.json.po b/resources/i18n/ru_RU/gradual_flow_settings.def.json.po
deleted file mode 100644
index 6addfef87c..0000000000
--- a/resources/i18n/ru_RU/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,53 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ru_RU\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr "Продолжительность каждого шага изменения плавного потока"
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr "Включите изменения плавного потока. Если эта функция включена, поток постепенно увеличивается/уменьшается до целевого значения. Это полезно для принтеров с трубкой Боудена, где поток не меняется сразу при запуске/остановке двигателя экструдера."
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr "Для любого перемещения, превышающего это значение, поток материала сбрасывается до целевого потока пути."
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr "Размер шага дискретизации плавного потока"
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr "Плавный поток включен"
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr "Максимальное ускорение плавного потока"
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr "Максимальное ускорение потока начального слоя"
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr "Максимальное ускорение для изменения плавного потока"
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr "Минимальная скорость изменения плавного потока для первого слоя"
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr "Сбросить продолжительность потока"
diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po
index d58e746295..7bf31aa660 100644
--- a/resources/i18n/tr_TR/fdmprinter.def.json.po
+++ b/resources/i18n/tr_TR/fdmprinter.def.json.po
@@ -5860,3 +5860,43 @@ msgstr "Raft yüzeyinin ilk katmanını yazdırırken arayüz ve yüzey arasınd
 msgctxt "z_seam_on_vertex label"
 msgid "Z Seam On Vertex"
 msgstr "Tepe Noktasında Z Dikiş İzi"
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "Kademeli akış değişimindeki her adımın süresi"
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "Kademeli akış değişikliklerini etkinleştirin. Etkinleştirildiğinde akış, hedef akışa doğru kademeli olarak artırılır/azaltılır. Bu, akışın ekstrüder motoru çalıştığında/durduğunda hemen değişmediği bowden tüplü yazıcılar için kullanışlıdır."
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "Bu değerden daha uzun herhangi bir seyahat hareketi için malzeme akışı, hedef akış yollarına sıfırlanır"
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "Kademeli akış ayrıklaştırma adım boyutu"
+
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "Kademeli akış etkinleştirildi"
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "Kademeli akış maksimum ivme"
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "İlk katman maksimum akış ivmesi"
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "Kademeli akış değişiklikleri için maksimum ivme"
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "İlk katman için kademeli akış değişiklikleri için minimum hız"
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "Akış süresini sıfırla"
diff --git a/resources/i18n/tr_TR/gradual_flow_settings.def.json.po b/resources/i18n/tr_TR/gradual_flow_settings.def.json.po
deleted file mode 100644
index 8fd89fdcb9..0000000000
--- a/resources/i18n/tr_TR/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,53 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tr_TR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr "Kademeli akış değişimindeki her adımın süresi"
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr "Kademeli akış değişikliklerini etkinleştirin. Etkinleştirildiğinde akış, hedef akışa doğru kademeli olarak artırılır/azaltılır. Bu, akışın ekstrüder motoru çalıştığında/durduğunda hemen değişmediği bowden tüplü yazıcılar için kullanışlıdır."
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr "Bu değerden daha uzun herhangi bir seyahat hareketi için malzeme akışı, hedef akış yollarına sıfırlanır"
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr "Kademeli akış ayrıklaştırma adım boyutu"
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr "Kademeli akış etkinleştirildi"
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr "Kademeli akış maksimum ivme"
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr "İlk katman maksimum akış ivmesi"
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr "Kademeli akış değişiklikleri için maksimum ivme"
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr "İlk katman için kademeli akış değişiklikleri için minimum hız"
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr "Akış süresini sıfırla"
diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po
index c2887f13d4..d1a7b9fe52 100644
--- a/resources/i18n/zh_CN/fdmprinter.def.json.po
+++ b/resources/i18n/zh_CN/fdmprinter.def.json.po
@@ -5860,3 +5860,43 @@ msgstr "打印第一层木筏表面时,通过这个偏移来自定义筏底和
 msgctxt "z_seam_on_vertex label"
 msgid "Z Seam On Vertex"
 msgstr "顶点上的 Z 形接缝"
+
+msgctxt "gradual_flow_discretisation_step_size description"
+msgid "Duration of each step in the gradual flow change"
+msgstr "渐变流量变化中每个步骤的持续时间"
+
+msgctxt "gradual_flow_enabled description"
+msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
+msgstr "启用渐变流量变化。启用之后,流量将会逐渐增加/减少到目标流量。这对于带有波登管的打印机非常有用,因为当挤出机电机启动/停止时,流量并不会立即改变。"
+
+msgctxt "reset_flow_duration description"
+msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
+msgstr "对于任何长于此值的移动,材料流量将被重置为路径的目标流量"
+
+msgctxt "gradual_flow_discretisation_step_size label"
+msgid "Gradual flow discretisation step size"
+msgstr "渐变流量离散化步长"
+
+msgctxt "gradual_flow_enabled label"
+msgid "Gradual flow enabled"
+msgstr "启用渐变流量"
+
+msgctxt "max_flow_acceleration label"
+msgid "Gradual flow max acceleration"
+msgstr "渐变流量最大加速度"
+
+msgctxt "layer_0_max_flow_acceleration label"
+msgid "Initial layer max flow acceleration"
+msgstr "初始层最大流量加速"
+
+msgctxt "max_flow_acceleration description"
+msgid "Maximum acceleration for gradual flow changes"
+msgstr "渐变流量变化的最大加速度"
+
+msgctxt "layer_0_max_flow_acceleration description"
+msgid "Minimum speed for gradual flow changes for the first layer"
+msgstr "第一层渐变流量变化的最小速度"
+
+msgctxt "reset_flow_duration label"
+msgid "Reset flow duration"
+msgstr "重置流量持续时间"
diff --git a/resources/i18n/zh_CN/gradual_flow_settings.def.json.po b/resources/i18n/zh_CN/gradual_flow_settings.def.json.po
deleted file mode 100644
index 188deec65f..0000000000
--- a/resources/i18n/zh_CN/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,53 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: zh_CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr "渐变流量变化中每个步骤的持续时间"
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr "启用渐变流量变化。启用之后,流量将会逐渐增加/减少到目标流量。这对于带有波登管的打印机非常有用,因为当挤出机电机启动/停止时,流量并不会立即改变。"
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr "对于任何长于此值的移动,材料流量将被重置为路径的目标流量"
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr "渐变流量离散化步长"
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr "启用渐变流量"
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr "渐变流量最大加速度"
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr "初始层最大流量加速"
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr "渐变流量变化的最大加速度"
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr "第一层渐变流量变化的最小速度"
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr "重置流量持续时间"
diff --git a/resources/i18n/zh_TW/gradual_flow_settings.def.json.po b/resources/i18n/zh_TW/gradual_flow_settings.def.json.po
deleted file mode 100644
index 2529ed73e4..0000000000
--- a/resources/i18n/zh_TW/gradual_flow_settings.def.json.po
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Uranium json setting files\n"
-"Report-Msgid-Bugs-To: plugins@ultimaker.com\n"
-"POT-Creation-Date: 2024-03-11 11:28+0000\n"
-"PO-Revision-Date: 2024-03-11 11:28+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "gradual_flow_discretisation_step_size description"
-msgid "Duration of each step in the gradual flow change"
-msgstr ""
-
-msgctxt "gradual_flow_enabled description"
-msgid "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops."
-msgstr ""
-
-msgctxt "reset_flow_duration description"
-msgid "For any travel move longer than this value, the material flow is reset to the paths target flow"
-msgstr ""
-
-msgctxt "gradual_flow_discretisation_step_size label"
-msgid "Gradual flow discretisation step size"
-msgstr ""
-
-msgctxt "gradual_flow_enabled label"
-msgid "Gradual flow enabled"
-msgstr ""
-
-msgctxt "max_flow_acceleration label"
-msgid "Gradual flow max acceleration"
-msgstr ""
-
-msgctxt "layer_0_max_flow_acceleration label"
-msgid "Initial layer max flow acceleration"
-msgstr ""
-
-msgctxt "max_flow_acceleration description"
-msgid "Maximum acceleration for gradual flow changes"
-msgstr ""
-
-msgctxt "layer_0_max_flow_acceleration description"
-msgid "Minimum speed for gradual flow changes for the first layer"
-msgstr ""
-
-msgctxt "reset_flow_duration label"
-msgid "Reset flow duration"
-msgstr ""
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm_visual.inst.cfg
index b29c0a9521..1e753b709f 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_engineering.inst.cfg
index 162e979a83..8c7c905efc 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_visual.inst.cfg
index e3a7c7c27c..1a0270a2d6 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_engineering.inst.cfg
index de545bf35e..e48adbd359 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_visual.inst.cfg
index ccc826e880..772f5f3b5f 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_engineering.inst.cfg
index d7a8e06998..feb3ed912c 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_quick.inst.cfg
index 0efe56e0dc..93ed657adc 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_visual.inst.cfg
index 27c578bb70..8db25985f2 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm_quick.inst.cfg
index 1155247785..9b411e9537 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm_visual.inst.cfg
index cfe96cd0f0..cd3723ae12 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_engineering.inst.cfg
index 205b8f4d51..f56a12ccd5 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_visual.inst.cfg
index 19208319d8..d1bd9c3d19 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_engineering.inst.cfg
index 09d2f2ba99..b3122bb558 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_visual.inst.cfg
index a12c1ebfd3..b4b831828e 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_engineering.inst.cfg
index 286a6b0e07..9092ec0763 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_quick.inst.cfg
index 6254e3b68f..fa7ae3769d 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_visual.inst.cfg
index 9dafc8b132..8e081833b8 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm_quick.inst.cfg
index 09673e6098..e947a85a49 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm_visual.inst.cfg
index 9e82f05e6c..a52c5e9ab2 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_engineering.inst.cfg
index 9454381e88..e56f5b3654 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_visual.inst.cfg
index 64110998e3..1400f9be38 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_engineering.inst.cfg
index 77c867c2ad..e77d171c1f 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_visual.inst.cfg
index 239f5815cc..4d47697a81 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_engineering.inst.cfg
index 14f9aa110c..1f63abd0a0 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_quick.inst.cfg
index 0889942919..0a7bf91f91 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_visual.inst.cfg
index 2854968225..054bbe216c 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm_quick.inst.cfg
index 6371e933dc..837caa6364 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg
index f43a885619..59057404ba 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm_engineering.inst.cfg
index bb457acb89..07d71edeca 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg
index 2ea031a390..831e3f9153 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg
index 7b66700a7d..2287978d4b 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg
index eec67d4aa5..c73cc61b0a 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_engineering.inst.cfg
index 24c1c424b8..717ba0f470 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_quick.inst.cfg
index b1abec1364..1d9571d438 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg
index 686ee6ccb2..32fbfb238d 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm_quick.inst.cfg
index 61b6704313..1c49a0c6a1 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_engineering.inst.cfg
index c1db44dcc4..44970d9291 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_quick.inst.cfg
index 1d6c709517..399f738a59 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_visual.inst.cfg
index 1e824ed44c..ae2fe0a914 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm_quick.inst.cfg
index 6552e6e66a..4e1f306768 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm_quick.inst.cfg
index 9ed04a2141..2cb242399d 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_engineering.inst.cfg
index b961efe0eb..15b362e1fe 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_quick.inst.cfg
index 1f65b1be8a..d1a15b77a9 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_visual.inst.cfg
index 40cbea238f..73628b8b81 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm_quick.inst.cfg
index 339f02e070..f8c47b7ebf 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm_quick.inst.cfg
index f1aa58b68e..795ce12794 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_engineering.inst.cfg
index 1a94de81f8..06d1c6a428 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_quick.inst.cfg
index 7769b3ed66..b0372a8323 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_visual.inst.cfg
index 51e407aa52..74dc24a600 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm_quick.inst.cfg
index 1e55929f44..8c08d82b9a 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm_quick.inst.cfg
index 531ffab063..f7f666afe5 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_engineering.inst.cfg
index 5d470eabca..c3f5932ea7 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_quick.inst.cfg
index 010abc2354..adf505c728 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg
index 701b852b80..8bbc9fc4c4 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm_quick.inst.cfg
index f8d86eb50a..22c8e4c446 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm_quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm_quick.inst.cfg
index 365fea42ab..897d30978d 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm_visual.inst.cfg
index 4207e39a8c..a9d3028429 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm_engineering.inst.cfg
index e74ed67f23..0d11537558 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm_visual.inst.cfg
index 74de88b39c..a42fa7db7e 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_engineering.inst.cfg
index 17a78ae0f4..487726e73d 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_visual.inst.cfg
index 7f14d6b9be..be663c0a78 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_engineering.inst.cfg
index 20d5b34c30..dd4a05a622 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_quick.inst.cfg
index 663980f2e9..b1dec2d9b2 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_visual.inst.cfg
index ae48539ca6..a58d62fdca 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm_quick.inst.cfg
index db1684399e..aa304b9e23 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm_visual.inst.cfg
index c18fad115e..fe7a8eb0fa 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm_engineering.inst.cfg
index e03d98bbd8..1f708d6b2a 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm_visual.inst.cfg
index d49ea90995..996c9e853b 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_engineering.inst.cfg
index 056ecd4177..1008436a4a 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_visual.inst.cfg
index ce82524afc..7ca248bf43 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_engineering.inst.cfg
index ac93bc17d5..15391221cc 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_quick.inst.cfg
index a6d971eb51..50acde656a 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_visual.inst.cfg
index dadd4384af..16d7ecc5f6 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm_quick.inst.cfg
index be73a3ad1b..100fcabd0d 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm_visual.inst.cfg
index 367c5a8ab1..52ee35cb85 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm_engineering.inst.cfg
index 9f15ad8ed6..a2d2a11274 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm_visual.inst.cfg
index 7a789b8668..7378ebd4ae 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_engineering.inst.cfg
index 7b2b42ae0b..4c267c3244 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_visual.inst.cfg
index 33d52d7ec7..34206cde02 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_engineering.inst.cfg
index ce5666e06a..ccdc99233e 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_quick.inst.cfg
index de02366f81..bc059f536a 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_visual.inst.cfg
index 0aaf94199e..e0511a9319 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm_quick.inst.cfg
index 15891975a3..304f30ec9e 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg
index bbf46cce48..e48171a12a 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm_engineering.inst.cfg
index 6ef21ed75f..b4dc0b021d 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg
index 44e1053064..4dd1ad681b 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg
index 0f4db503b2..8bc5205951 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg
index bce5174047..c609823cae 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_engineering.inst.cfg
index eedc26a947..43ef55f44b 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_quick.inst.cfg
index 3831ec4895..1c74429109 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg
index 20ae02a33e..4a297b1c60 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm_quick.inst.cfg
index 0eef7bf1ed..7a50c54724 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_engineering.inst.cfg
index ded0f97db3..073a1be60c 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_quick.inst.cfg
index 7881350346..57bdd71b43 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_visual.inst.cfg
index 458e5a301f..53c272de4b 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm_quick.inst.cfg
index f6defe9a0c..701ebfa4fe 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm_quick.inst.cfg
index cf05092f62..2eb8cd1942 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_engineering.inst.cfg
index 83c84bf162..75d640e177 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_quick.inst.cfg
index 5990c5cb2b..47f946a89d 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_visual.inst.cfg
index aa0e6b305f..a8b446cd3d 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm_quick.inst.cfg
index 5584c5e00a..801adab4aa 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm_quick.inst.cfg
index eba95b253b..7922fbfb7c 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_engineering.inst.cfg
index 5688775572..5ae6042076 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_quick.inst.cfg
index efbe56dee7..f327ff9fb8 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_visual.inst.cfg
index afc9e10f57..95302a6578 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm_quick.inst.cfg
index c32dce45b5..26e9837df4 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm_quick.inst.cfg
index 8f24be0b25..099a265920 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_engineering.inst.cfg
index cc382d57f5..c0966adb2a 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_engineering.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_engineering.inst.cfg
@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_quick.inst.cfg
index b270814153..58b78defb4 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg
index 94930d23a6..1ea845e0b9 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm_visual.inst.cfg
@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm_quick.inst.cfg
index c844739f28..54ee602bdd 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm_quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm_quick.inst.cfg
index 1e60bc8806..5324df80b5 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm_quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm_quick.inst.cfg
@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.8
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40
diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index 7acf39ecb2..0c673a9409 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -62,7 +62,6 @@ Item
 
     property alias showProfileFolder: showProfileFolderAction
     property alias documentation: documentationAction
-    property alias showTroubleshooting: showTroubleShootingAction
     property alias openSponsershipPage: openSponsershipPageAction
     property alias reportBug: reportBugAction
     property alias whatsNew: whatsNewAction
@@ -86,14 +85,6 @@ Item
 
     UM.I18nCatalog{id: catalog; name: "cura"}
 
-
-    Action
-    {
-        id: showTroubleShootingAction
-        onTriggered: Qt.openUrlExternally("https://ultimaker.com/en/troubleshooting?utm_source=cura&utm_medium=software&utm_campaign=dropdown-troubleshooting")
-        text: catalog.i18nc("@action:inmenu", "Show Online Troubleshooting")
-    }
-
     Action
     {
         id: openSponsershipPageAction
diff --git a/resources/qml/MachineSettings/GcodeTextArea.qml b/resources/qml/MachineSettings/GcodeTextArea.qml
index 2538cd9f65..05d3711bae 100644
--- a/resources/qml/MachineSettings/GcodeTextArea.qml
+++ b/resources/qml/MachineSettings/GcodeTextArea.qml
@@ -12,20 +12,16 @@ import Cura 1.1 as Cura
 //
 // TextArea widget for editing Gcode in the Machine Settings dialog.
 //
-UM.TooltipArea
+Item
 {
     id: control
 
     UM.I18nCatalog { id: catalog; name: "cura"; }
 
-    text: tooltip
-
     property alias containerStackId: propertyProvider.containerStackId
     property alias settingKey: propertyProvider.key
     property alias settingStoreIndex: propertyProvider.storeIndex
 
-    property string tooltip: propertyProvider.properties.description ? propertyProvider.properties.description : ""
-
     property alias labelText: titleLabel.text
     property alias labelFont: titleLabel.font
 
diff --git a/resources/qml/Menus/HelpMenu.qml b/resources/qml/Menus/HelpMenu.qml
index 6a57a99515..c257db0527 100644
--- a/resources/qml/Menus/HelpMenu.qml
+++ b/resources/qml/Menus/HelpMenu.qml
@@ -14,7 +14,6 @@ Cura.Menu
     title: catalog.i18nc("@title:menu menubar:toplevel", "&Help")
 
     Cura.MenuItem { action: Cura.Actions.showProfileFolder }
-    Cura.MenuItem { action: Cura.Actions.showTroubleshooting}
     Cura.MenuItem { action: Cura.Actions.documentation }
     Cura.MenuItem { action: Cura.Actions.reportBug }
     Cura.MenuItem { action: Cura.Actions.openSponsershipPage }
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.25_petg_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.25_petg_0.1mm.inst.cfg
index a43607553c..bbb9d0f6e1 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.25_petg_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.25_petg_0.1mm.inst.cfg
@@ -12,9 +12,9 @@ variant = AA 0.25
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.25_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.25_pla_0.1mm.inst.cfg
index 005afd9d7c..3709b1fb9c 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.25_pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.25_pla_0.1mm.inst.cfg
@@ -12,9 +12,9 @@ variant = AA 0.25
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.93
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.25_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.25_tough-pla_0.1mm.inst.cfg
index de686a7325..185d5b9f22 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.25_tough-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.25_tough-pla_0.1mm.inst.cfg
@@ -12,9 +12,9 @@ variant = AA 0.25
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_abs_0.2mm.inst.cfg
index 19bbdea933..307af32184 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_abs_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_abs_0.2mm.inst.cfg
@@ -12,10 +12,10 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.93
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg
index 44ae90f27d..bb10a276a2 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg
@@ -12,13 +12,13 @@ variant = AA 0.4
 weight = -1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 brim_replaces_support = False
 build_volume_temperature = =50 if extruders_enabled_count > 1 else 35
 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 machine_nozzle_heat_up_speed = 1.56
+max_flow_acceleration = 1
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
 skin_material_flow = =material_flow * 0.965
 support_angle = 45
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg
index 4d19af3298..946e1d73a3 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg
@@ -12,14 +12,14 @@ variant = AA 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 brim_replaces_support = False
 build_volume_temperature = =50 if extruders_enabled_count > 1 else 35
 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 machine_nozzle_heat_up_speed = 1.56
 material_print_temperature = =default_material_print_temperature - 5
+max_flow_acceleration = 1
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
 skin_material_flow = =material_flow * 0.965
 speed_print = 60
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg
index bb057c5cda..fbc7ac702c 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg
@@ -12,13 +12,13 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 brim_replaces_support = False
 build_volume_temperature = =50 if extruders_enabled_count > 1 else 35
 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 machine_nozzle_heat_up_speed = 1.56
+max_flow_acceleration = 1
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
 skin_material_flow = =material_flow * 0.965
 speed_print = 60
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg
index 7203764593..338533ee03 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg
@@ -12,13 +12,13 @@ variant = AA 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 brim_replaces_support = False
 build_volume_temperature = =50 if extruders_enabled_count > 1 else 35
 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 machine_nozzle_heat_up_speed = 1.56
+max_flow_acceleration = 1
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
 skin_material_flow = =material_flow * 0.965
 speed_print = 50
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg
index a35f2d6e10..d788d72111 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg
@@ -12,10 +12,10 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.93
 speed_print = 80
 wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe_0.2mm.inst.cfg
index 8956b5287f..f121a419f1 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe_0.2mm.inst.cfg
@@ -12,10 +12,10 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_nylon_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_nylon_0.2mm.inst.cfg
index f6ae48bf11..9bae566648 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_nylon_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_nylon_0.2mm.inst.cfg
@@ -12,10 +12,10 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg
index 3257605cd2..5ce773528b 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg
@@ -12,10 +12,10 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 speed_print = 80
 wall_thickness = =line_width * 3
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_petg_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_petg_0.1mm.inst.cfg
index b0794b514e..5dc170dd46 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_petg_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_petg_0.1mm.inst.cfg
@@ -12,11 +12,11 @@ variant = AA 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
 material_print_temperature = =default_material_print_temperature - 10
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_petg_0.2mm.inst.cfg
index f11d73dbbd..decc1b6846 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_petg_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_petg_0.2mm.inst.cfg
@@ -12,10 +12,10 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_petg_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_petg_0.3mm.inst.cfg
index 988c06664e..46d802a0c6 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_petg_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_petg_0.3mm.inst.cfg
@@ -12,10 +12,10 @@ variant = AA 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pla_0.1mm.inst.cfg
index 1ca784384a..ab89cfa7b0 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pla_0.1mm.inst.cfg
@@ -12,10 +12,10 @@ variant = AA 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.93
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pla_0.2mm.inst.cfg
index 5a22723bfd..85ef72980e 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pla_0.2mm.inst.cfg
@@ -12,10 +12,10 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.93
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pla_0.3mm.inst.cfg
index 76b9af883d..8493737087 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pla_0.3mm.inst.cfg
@@ -12,11 +12,11 @@ variant = AA 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
 material_print_temperature = =default_material_print_temperature + 15
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.93
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pp_0.2mm.inst.cfg
index d4cb4e3f0a..ddf058629a 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pp_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pp_0.2mm.inst.cfg
@@ -12,11 +12,11 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 brim_width = 20
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.1mm.inst.cfg
index 5606af1f31..bbaa81e380 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.1mm.inst.cfg
@@ -12,10 +12,10 @@ variant = AA 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm.inst.cfg
index ffdc37f93f..e3f13bb208 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm.inst.cfg
@@ -12,10 +12,10 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.3mm.inst.cfg
index d900773976..59b7f0cc0d 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.3mm.inst.cfg
@@ -12,11 +12,11 @@ variant = AA 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
 material_print_temperature = =default_material_print_temperature + 15
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 speed_print = 60
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_tpu_0.2mm.inst.cfg
index f7a360beaa..a68fb26c1a 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_tpu_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_tpu_0.2mm.inst.cfg
@@ -12,12 +12,12 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d'
 infill_sparse_density = 10
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.9
 skin_material_flow_layer_0 = 90
 speed_layer_0 = 20
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_abs_0.2mm.inst.cfg
index b5bb6abc8f..fb1e113270 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_abs_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_abs_0.2mm.inst.cfg
@@ -12,9 +12,9 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.93
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_cpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_cpe_0.2mm.inst.cfg
index 9908a3bb85..4f9bf33860 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_cpe_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_cpe_0.2mm.inst.cfg
@@ -12,9 +12,9 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_nylon_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_nylon_0.2mm.inst.cfg
index a6b9e84f6c..c2c1c74379 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_nylon_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_nylon_0.2mm.inst.cfg
@@ -12,9 +12,9 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_petg_0.2mm.inst.cfg
index 57355ea4f1..411fe42d59 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_petg_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_petg_0.2mm.inst.cfg
@@ -12,9 +12,9 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_petg_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_petg_0.4mm.inst.cfg
index 134a7c2684..22b06849b2 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_petg_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_petg_0.4mm.inst.cfg
@@ -12,9 +12,9 @@ variant = AA 0.8
 weight = -4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_pla_0.2mm.inst.cfg
index 536aed0d0d..885f39e5f1 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_pla_0.2mm.inst.cfg
@@ -12,11 +12,11 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
 material_print_temperature = =default_material_print_temperature + 15
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.93
 speed_print = 50
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_pla_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_pla_0.4mm.inst.cfg
index a6e58a1a62..fb86282cf6 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_pla_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_pla_0.4mm.inst.cfg
@@ -12,11 +12,11 @@ variant = AA 0.8
 weight = -4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
 material_print_temperature = =default_material_print_temperature + 15
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.93
 speed_print = 50
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tough-pla_0.2mm.inst.cfg
index ed182ab57d..89ad814e07 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tough-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tough-pla_0.2mm.inst.cfg
@@ -12,11 +12,11 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
 material_print_temperature = =default_material_print_temperature + 15
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 speed_print = 50
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tough-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tough-pla_0.4mm.inst.cfg
index 70a6f9925d..381df3a6e9 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tough-pla_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tough-pla_0.4mm.inst.cfg
@@ -12,11 +12,11 @@ variant = AA 0.8
 weight = -4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
 material_print_temperature = =default_material_print_temperature + 15
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.965
 speed_print = 50
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg
index 7db0c220f4..c3291f77a1 100644
--- a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.2mm.inst.cfg
@@ -12,12 +12,12 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d'
 infill_sparse_density = 10
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.9
 skin_material_flow_layer_0 = 90
 speed_layer_0 = 20
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg
new file mode 100644
index 0000000000..7949c64afc
--- /dev/null
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.3mm.inst.cfg
@@ -0,0 +1,26 @@
+[general]
+definition = ultimaker_factor4
+name = Extra Fast
+version = 4
+
+[metadata]
+material = generic_tpu
+quality_type = verydraft
+setting_version = 23
+type = quality
+variant = AA 0.8
+weight = -3
+
+[values]
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
+infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d'
+infill_sparse_density = 20
+inset_direction = outside_in
+material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 1
+skin_material_flow = =material_flow * 0.9
+skin_material_flow_layer_0 = 90
+speed_layer_0 = 20
+speed_print = 35
+
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg
new file mode 100644
index 0000000000..4b1d25bd18
--- /dev/null
+++ b/resources/quality/ultimaker_factor4/um_f4_aa0.8_tpu_0.4mm.inst.cfg
@@ -0,0 +1,26 @@
+[general]
+definition = ultimaker_factor4
+name = Sprint
+version = 4
+
+[metadata]
+material = generic_tpu
+quality_type = superdraft
+setting_version = 23
+type = quality
+variant = AA 0.8
+weight = -4
+
+[values]
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
+infill_pattern = ='zigzag' if infill_sparse_density > 50 else 'cross_3d'
+infill_sparse_density = 20
+inset_direction = outside_in
+material_print_temperature = =default_material_print_temperature + 8
+max_flow_acceleration = 1
+skin_material_flow = =material_flow * 0.9
+skin_material_flow_layer_0 = 90
+speed_layer_0 = 20
+speed_print = 35
+
diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg
index bae4a519f3..37e9bb8b73 100644
--- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg
@@ -12,20 +12,32 @@ variant = BB 0.4
 weight = -1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+acceleration_print = 1000.0
 acceleration_support_bottom = 100
-acceleration_support_interface = 1500
+acceleration_support_interface = 1000
 brim_replaces_support = False
 build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
-initial_layer_line_width_factor = 150
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
+gradual_support_infill_steps = 0
+initial_layer_line_width_factor = 125
+jerk_print = 10
+material_flow_layer_0 = 90
+max_flow_acceleration = 1
 minimum_support_area = 4
+prime_tower_flow = 90
 prime_tower_min_volume = 15
+retraction_min_travel = 5.0
+retraction_prime_speed = 10.0
 skin_material_flow = =material_flow * 0.93
+speed_print = 30
+support_angle = 45
+support_infill_rate = 20
 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
 support_interface_offset = 1
 support_offset = 3
+support_xy_distance = 2
 support_z_distance = 0
+switch_extruder_prime_speed = 10.0
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg
index 95b7c1856d..4c83276641 100644
--- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg
@@ -12,21 +12,32 @@ variant = BB 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+acceleration_print = 1000.0
 acceleration_support_bottom = 100
-acceleration_support_interface = 1500
+acceleration_support_interface = 1000
 brim_replaces_support = False
 build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
-initial_layer_line_width_factor = 150
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
+gradual_support_infill_steps = 0
+initial_layer_line_width_factor = 125
+jerk_print = 10
+material_flow_layer_0 = 90
+max_flow_acceleration = 1
 minimum_support_area = 4
+prime_tower_flow = 90
 prime_tower_min_volume = 15
+retraction_min_travel = 5.0
+retraction_prime_speed = 10.0
 skin_material_flow = =material_flow * 0.93
-speed_print = 50
+speed_print = 30
+support_angle = 45
+support_infill_rate = 20
 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
 support_interface_offset = 1
 support_offset = 3
+support_xy_distance = 2
 support_z_distance = 0
+switch_extruder_prime_speed = 10.0
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg
index 8de45aa01b..93f62df983 100644
--- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg
@@ -12,21 +12,32 @@ variant = BB 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+acceleration_print = 1000.0
 acceleration_support_bottom = 100
-acceleration_support_interface = 1500
+acceleration_support_interface = 1000
 brim_replaces_support = False
 build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
-initial_layer_line_width_factor = 150
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
+gradual_support_infill_steps = 0
+initial_layer_line_width_factor = 125
+jerk_print = 10
+material_flow_layer_0 = 90
+max_flow_acceleration = 1
 minimum_support_area = 4
+prime_tower_flow = 90
 prime_tower_min_volume = 15
+retraction_min_travel = 5.0
+retraction_prime_speed = 10.0
 skin_material_flow = =material_flow * 0.93
-speed_print = 50
+speed_print = 30
+support_angle = 45
+support_infill_rate = 20
 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
 support_interface_offset = 1
 support_offset = 3
+support_xy_distance = 2
 support_z_distance = 0
+switch_extruder_prime_speed = 10.0
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg
index be24017486..0d946c0092 100644
--- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg
@@ -12,21 +12,32 @@ variant = BB 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+acceleration_print = 1000.0
 acceleration_support_bottom = 100
-acceleration_support_interface = 1500
+acceleration_support_interface = 1000
 brim_replaces_support = False
 build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
-initial_layer_line_width_factor = 150
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
+gradual_support_infill_steps = 0
+initial_layer_line_width_factor = 125
+jerk_print = 10
+material_flow_layer_0 = 90
+max_flow_acceleration = 1
 minimum_support_area = 4
+prime_tower_flow = 90
 prime_tower_min_volume = 15
+retraction_min_travel = 5.0
+retraction_prime_speed = 10.0
 skin_material_flow = =material_flow * 0.93
-speed_print = 40
+speed_print = 30
+support_angle = 45
+support_infill_rate = 20
 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
 support_interface_offset = 1
 support_offset = 3
+support_xy_distance = 2
 support_z_distance = 0
+switch_extruder_prime_speed = 10.0
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg
index 1e1ab101f4..148a82c991 100644
--- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg
@@ -12,20 +12,32 @@ variant = BB 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+acceleration_print = 1000.0
 acceleration_support_bottom = 100
-acceleration_support_interface = 1500
+acceleration_support_interface = 1000
 brim_replaces_support = False
 build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
-initial_layer_line_width_factor = 150
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
+gradual_support_infill_steps = 0
+initial_layer_line_width_factor = 125
+jerk_print = 10
+material_flow_layer_0 = 90
+max_flow_acceleration = 1
 minimum_support_area = 4
+prime_tower_flow = 90
 prime_tower_min_volume = 15
+retraction_min_travel = 5.0
+retraction_prime_speed = 10.0
 skin_material_flow = =material_flow * 0.93
+speed_print = 30
+support_angle = 45
+support_infill_rate = 20
 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
 support_interface_offset = 1
 support_offset = 3
+support_xy_distance = 2
 support_z_distance = 0
+switch_extruder_prime_speed = 10.0
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg
index 2ae11eb441..8ab2146046 100644
--- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg
@@ -12,20 +12,32 @@ variant = BB 0.8
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+acceleration_print = 1000.0
 acceleration_support_bottom = 100
-acceleration_support_interface = 1500
+acceleration_support_interface = 1000
 brim_replaces_support = False
 build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
-initial_layer_line_width_factor = 150
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
+gradual_support_infill_steps = 0
+initial_layer_line_width_factor = 125
+jerk_print = 10
+material_flow_layer_0 = 90
+max_flow_acceleration = 1
 minimum_support_area = 4
+prime_tower_flow = 90
 prime_tower_min_volume = 15
+retraction_min_travel = 5.0
+retraction_prime_speed = 10.0
 skin_material_flow = =material_flow * 0.93
+speed_print = 30
+support_angle = 45
+support_infill_rate = 20
 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
 support_interface_offset = 1
 support_offset = 3
+support_xy_distance = 2
 support_z_distance = 0
+switch_extruder_prime_speed = 10.0
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg
index 448152ca8e..52134575b0 100644
--- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg
@@ -12,20 +12,32 @@ variant = BB 0.8
 weight = -4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+acceleration_print = 1000.0
 acceleration_support_bottom = 100
-acceleration_support_interface = 1500
+acceleration_support_interface = 1000
 brim_replaces_support = False
 build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
-initial_layer_line_width_factor = 150
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
+gradual_support_infill_steps = 0
+initial_layer_line_width_factor = 125
+jerk_print = 10
+material_flow_layer_0 = 90
+max_flow_acceleration = 1
 minimum_support_area = 4
+prime_tower_flow = 90
 prime_tower_min_volume = 15
+retraction_min_travel = 5.0
+retraction_prime_speed = 10.0
 skin_material_flow = =material_flow * 0.93
+speed_print = 30
+support_angle = 45
+support_infill_rate = 20
 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
 support_interface_offset = 1
 support_offset = 3
+support_xy_distance = 2
 support_z_distance = 0
+switch_extruder_prime_speed = 10.0
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.4_petcf_0.2mm.inst.cfg
index 3f00103ddd..1b5ae5b4a1 100644
--- a/resources/quality/ultimaker_factor4/um_f4_cc0.4_petcf_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_cc0.4_petcf_0.2mm.inst.cfg
@@ -12,13 +12,13 @@ variant = CC 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.5
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.1
 cool_fan_speed_max = =cool_fan_speed
+gradual_flow_discretisation_step_size = 0.5
+gradual_flow_enabled = True
 infill_wall_line_count = 1
 material_shrinkage_percentage = 100.15
 material_shrinkage_percentage_z = 100.15
+max_flow_acceleration = 0.1
 skin_material_flow = =material_flow * 0.93
 speed_print = 60
 xy_offset = =machine_nozzle_size * -0.25
diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_petcf_0.2mm.inst.cfg
index b33a4c38e3..0b1fa30c04 100644
--- a/resources/quality/ultimaker_factor4/um_f4_cc0.6_petcf_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_cc0.6_petcf_0.2mm.inst.cfg
@@ -12,13 +12,13 @@ variant = CC 0.6
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.5
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.1
 cool_fan_speed_max = =cool_fan_speed
+gradual_flow_discretisation_step_size = 0.5
+gradual_flow_enabled = True
 infill_wall_line_count = 1
 material_shrinkage_percentage = 100.15
 material_shrinkage_percentage_z = 100.15
+max_flow_acceleration = 0.1
 skin_material_flow = =material_flow * 0.93
 speed_print = 60
 xy_offset = =machine_nozzle_size * -0.25
diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_pla_0.2mm.inst.cfg
index 8e4a105358..89fd1dc556 100644
--- a/resources/quality/ultimaker_factor4/um_f4_cc0.6_pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_cc0.6_pla_0.2mm.inst.cfg
@@ -13,9 +13,9 @@ variant = CC 0.6
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.93
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_pla_0.3mm.inst.cfg
index a168b8f7d0..eff621dcc3 100644
--- a/resources/quality/ultimaker_factor4/um_f4_cc0.6_pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_cc0.6_pla_0.3mm.inst.cfg
@@ -13,9 +13,9 @@ variant = CC 0.6
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 inset_direction = outside_in
+max_flow_acceleration = 1
 skin_material_flow = =material_flow * 0.93
 
diff --git a/resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg
index 6aa1be79a3..48feef8723 100644
--- a/resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_global_Verydraft_Quality.inst.cfg
@@ -1,6 +1,6 @@
 [general]
 definition = ultimaker_factor4
-name = Sprint
+name = Extra Fast
 version = 4
 
 [metadata]
diff --git a/resources/quality/ultimaker_factor4/um_f4_ht0.6_cffpps_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_ht0.6_cffpps_0.2mm.inst.cfg
index 8204135cc0..875b7a06a0 100644
--- a/resources/quality/ultimaker_factor4/um_f4_ht0.6_cffpps_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_ht0.6_cffpps_0.2mm.inst.cfg
@@ -12,11 +12,11 @@ variant = HT 0.6
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 adhesion_type = brim
+gradual_flow_discretisation_step_size = 0.1
+gradual_flow_enabled = True
 infill_wall_line_count = 1
+max_flow_acceleration = 1
 retraction_combing_max_distance = 2
 skin_material_flow = =material_flow * 0.93
 speed_print = 60
diff --git a/resources/quality/ultimaker_factor4/um_f4_ht0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_ht0.6_petcf_0.2mm.inst.cfg
index aa4022bc5d..90249026a4 100644
--- a/resources/quality/ultimaker_factor4/um_f4_ht0.6_petcf_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_factor4/um_f4_ht0.6_petcf_0.2mm.inst.cfg
@@ -12,13 +12,13 @@ variant = HT 0.6
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.5
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 0.1
 cool_fan_speed_max = =cool_fan_speed
+gradual_flow_discretisation_step_size = 0.5
+gradual_flow_enabled = True
 infill_wall_line_count = 1
 material_shrinkage_percentage = 100.15
 material_shrinkage_percentage_z = 100.15
+max_flow_acceleration = 0.1
 skin_material_flow = =material_flow * 0.93
 speed_print = 60
 xy_offset = =machine_nozzle_size * -0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg
index fefbf8b615..a84295c169 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.25
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -29,6 +26,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_fan_speed_0 = 0
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ jerk_wall_0 = =max(30, speed_wall_0/2)
 machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.8
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = False
 raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-petg_0.1mm.inst.cfg
index 94de34ad72..054bcf2b44 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-petg_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-petg_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.25
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -40,6 +39,7 @@ jerk_wall_0 = =max(30, speed_wall_0/2)
 machine_nozzle_cool_down_speed = 1.4
 machine_nozzle_heat_up_speed = 1.7
 material_extrusion_cool_down_speed = 0.7
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = False
 retraction_amount = 8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg
index 4ed588e9e3..6cb160cbef 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.25
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -40,6 +39,7 @@ jerk_wall_0 = =max(30, speed_wall_0/2)
 machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 raft_airgap = 0.25
 retraction_amount = 6.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-tough-pla_0.1mm.inst.cfg
index 7daf38b312..f1b85fc195 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-tough-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-tough-pla_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.25
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -40,6 +39,7 @@ jerk_wall_0 = =max(30, speed_wall_0/2)
 machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 prime_tower_enable = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm.inst.cfg
index 89614bec9c..602fe454b2 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.8
 material_max_flowrate = 20
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = False
 raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg
index 6716a2f504..a349a726af 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.8
 material_max_flowrate = 20
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm.inst.cfg
index 10f0c211cf..9ca4211c14 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.8
 material_max_flowrate = 20
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = False
 raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg
index 829dd29d22..36778c2c61 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_material_flow = =1.05 * material_flow
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
@@ -43,6 +42,7 @@ machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.8
 material_max_flowrate = 20
 material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg
index c42fbd390e..55cf6e1567 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -42,6 +41,7 @@ machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.8
 material_max_flowrate = 20
 material_print_temperature = =default_material_print_temperature + 7
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm.inst.cfg
index 2ab5c2fbfb..fc111b08c5 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.4
 machine_nozzle_heat_up_speed = 1.7
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 20
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = False
 retraction_amount = 8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg
index e21e8ffdca..3e9b93f899 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.4
 machine_nozzle_heat_up_speed = 1.7
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 20
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm.inst.cfg
index 629f53baf9..43e91a53bc 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.4
 machine_nozzle_heat_up_speed = 1.7
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 20
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = False
 retraction_amount = 8
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg
index c155871f26..4d2ca6a1b1 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_material_flow = =1.1 * material_flow
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
@@ -43,6 +42,7 @@ machine_nozzle_heat_up_speed = 1.7
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 20
 material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg
index 4c2671ff69..e8155d504f 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -42,6 +41,7 @@ machine_nozzle_heat_up_speed = 1.7
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 20
 material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg
index 163c3c400e..ae0b95e9a5 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 raft_airgap = 0.25
 retraction_amount = 6.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg
index be380e6b23..f1fcd1845b 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg
index e53e2b3dbd..d562e3da55 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 raft_airgap = 0.25
 retraction_amount = 6.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg
index 7b75e78fb5..e12b58fc5e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_material_flow = =1.1 * material_flow
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
@@ -43,6 +42,7 @@ machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
 material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg
index 0ea189daf8..53c19ef901 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -42,6 +41,7 @@ machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
 material_print_temperature = =default_material_print_temperature + 10
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm.inst.cfg
index 87c575b978..4fe9eb1058 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 14
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 prime_tower_enable = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg
index bcfad903cf..7a8bb668c5 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.15mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 14
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm.inst.cfg
index 244309d77e..afc9e7f629 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 14
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 prime_tower_enable = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg
index eb5bdba073..b14d3228d7 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_material_flow = =1.1 * material_flow
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
@@ -42,6 +41,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 14
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg
index efd4f4ecef..2dc9b448cb 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -42,6 +41,7 @@ machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 14
 material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm.inst.cfg
index acddb2300a..f81a8e8036 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -30,6 +27,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_material_flow = 200
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -45,6 +44,7 @@ material_extrusion_cool_down_speed = 0.8
 material_flow = 93
 material_max_flowrate = 22
 material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm.inst.cfg
index e7d9686a98..c32d5a2ced 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -43,6 +42,7 @@ material_extrusion_cool_down_speed = 0.8
 material_flow = 93
 material_max_flowrate = 22
 material_print_temperature = =default_material_print_temperature + 7
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = True
 raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm.inst.cfg
index 5b1795f87e..7b53c58c63 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-abs_0.4mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -43,6 +42,7 @@ material_extrusion_cool_down_speed = 0.8
 material_flow = 93
 material_max_flowrate = 22
 material_print_temperature = =default_material_print_temperature + 10
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = True
 raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg
index 913f3f96cb..6d29fb456b 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -30,6 +27,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_material_flow = 200
 bridge_wall_speed = 20
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -45,6 +44,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 23
 material_print_temperature = =default_material_print_temperature - 5
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm.inst.cfg
index cab1ac9ae6..846849481f 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -30,6 +27,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_material_flow = 100
 bridge_wall_speed = 20
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -45,6 +44,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 23
 material_print_temperature = =default_material_print_temperature - 5
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = True
 retraction_amount = 3.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm.inst.cfg
index cf81658b7a..fe03ad75e0 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.4mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -30,6 +27,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_material_flow = 100
 bridge_wall_speed = 20
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -45,6 +44,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 23
 material_print_temperature = =default_material_print_temperature - 5
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = True
 retraction_amount = 3.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg
index d5469d6378..6008ccfd82 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -30,6 +27,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_material_flow = 200
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -45,6 +44,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 15
 material_print_temperature = =default_material_print_temperature + 10
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg
index c5bb22fb17..f41ed952ba 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -43,6 +42,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 15
 material_print_temperature = =default_material_print_temperature + 10
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 raft_airgap = 0.25
 retraction_amount = 4
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg
index 260fb5ba10..ab876bc815 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -43,6 +42,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 15
 material_print_temperature = =default_material_print_temperature + 15
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 raft_airgap = 0.25
 retraction_amount = 4
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm.inst.cfg
index c0919d2192..86acb0e63e 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -30,6 +27,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_material_flow = 200
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -45,6 +44,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 17
 material_print_temperature = =default_material_print_temperature + 10
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = True
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm.inst.cfg
index 3d3f3b9eed..f7fc9ae731 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -43,6 +42,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 17
 material_print_temperature = =default_material_print_temperature + 15
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 prime_tower_enable = True
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm.inst.cfg
index d0aad55cf3..cf55675d59 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-tough-pla_0.4mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -43,6 +42,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 17
 material_print_temperature = =default_material_print_temperature + 15
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 prime_tower_enable = True
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg
index d5486c1a55..d968c3f056 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.25
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -29,6 +26,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_fan_speed_0 = 0
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ jerk_wall_0 = =max(30, speed_wall_0/2)
 machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.8
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = False
 raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-petg_0.1mm.inst.cfg
index f2a9e39e7a..78e41e520b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-petg_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-petg_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.25
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -40,6 +39,7 @@ jerk_wall_0 = =max(30, speed_wall_0/2)
 machine_nozzle_cool_down_speed = 1.4
 machine_nozzle_heat_up_speed = 1.7
 material_extrusion_cool_down_speed = 0.7
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = False
 retraction_amount = 8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg
index 3fff3081c9..34ceff41c4 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.25
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -40,6 +39,7 @@ jerk_wall_0 = =max(30, speed_wall_0/2)
 machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 raft_airgap = 0.25
 retraction_amount = 6.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-tough-pla_0.1mm.inst.cfg
index 8168ef5278..b9b5fb5a0f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-tough-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-tough-pla_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.25
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -40,6 +39,7 @@ jerk_wall_0 = =max(30, speed_wall_0/2)
 machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 prime_tower_enable = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm.inst.cfg
index 4241f393e9..2654bd2d40 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.06mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.8
 material_max_flowrate = 20
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = False
 raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm.inst.cfg
index cf38fd6c7e..f4e10c3833 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.15mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.8
 material_max_flowrate = 20
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm.inst.cfg
index 8d0b516c7e..13d8b3c4ef 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.8
 material_max_flowrate = 20
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = False
 raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm.inst.cfg
index 7ddd9784c9..2f690ce044 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_material_flow = =1.05 * material_flow
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
@@ -43,6 +42,7 @@ machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.8
 material_max_flowrate = 20
 material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm.inst.cfg
index 1f13c14837..fe4fb9cdd1 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-abs_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -42,6 +41,7 @@ machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.8
 material_max_flowrate = 20
 material_print_temperature = =default_material_print_temperature + 7
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm.inst.cfg
index 1ae9940414..386745d6e9 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.06mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.4
 machine_nozzle_heat_up_speed = 1.7
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 20
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = False
 retraction_amount = 8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm.inst.cfg
index ff9b960365..8fbbf3b6b8 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.15mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.4
 machine_nozzle_heat_up_speed = 1.7
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 20
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm.inst.cfg
index aad464cb8a..9333073ede 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.4
 machine_nozzle_heat_up_speed = 1.7
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 20
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = False
 retraction_amount = 8
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm.inst.cfg
index 2614301965..79bdcf5b20 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_material_flow = =1.1 * material_flow
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
@@ -43,6 +42,7 @@ machine_nozzle_heat_up_speed = 1.7
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 20
 material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm.inst.cfg
index 731f07dd61..21079c5b3f 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-petg_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -42,6 +41,7 @@ machine_nozzle_heat_up_speed = 1.7
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 20
 material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg
index d1df42d929..93bb855a80 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 raft_airgap = 0.25
 retraction_amount = 6.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg
index 37c25af4f9..8100de75aa 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg
index 4669dcb57f..223e74c38d 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 raft_airgap = 0.25
 retraction_amount = 6.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg
index 7207ff17fa..539732d456 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_material_flow = =1.1 * material_flow
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
@@ -43,6 +42,7 @@ machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
 material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg
index 19b344a1b0..f5f0a531a8 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -42,6 +41,7 @@ machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 12
 material_print_temperature = =default_material_print_temperature + 10
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm.inst.cfg
index 347a2f6898..8878caf4c7 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.06mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 14
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 prime_tower_enable = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm.inst.cfg
index 6973077df4..702d91f3b9 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.15mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -1
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 14
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm.inst.cfg
index 86ed61ff0c..0d18de8d71 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.1mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = 0
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -41,6 +40,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 14
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 prime_tower_enable = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm.inst.cfg
index f0f022a0fa..5078538dc6 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_material_flow = =1.1 * material_flow
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
@@ -42,6 +41,7 @@ machine_nozzle_cool_down_speed = 1.3
 machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 14
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm.inst.cfg
index 82d20f7498..7d96d6abb8 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-tough-pla_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.4
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -42,6 +41,7 @@ machine_nozzle_heat_up_speed = 1.9
 material_extrusion_cool_down_speed = 0.7
 material_max_flowrate = 14
 material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm.inst.cfg
index 278ead1594..eba4ace386 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -30,6 +27,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_material_flow = 200
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -45,6 +44,7 @@ material_extrusion_cool_down_speed = 0.8
 material_flow = 93
 material_max_flowrate = 22
 material_print_temperature = =default_material_print_temperature + 5
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = True
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm.inst.cfg
index 0d5d710e7b..2838efbdd7 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -43,6 +42,7 @@ material_extrusion_cool_down_speed = 0.8
 material_flow = 93
 material_max_flowrate = 22
 material_print_temperature = =default_material_print_temperature + 7
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = True
 raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm.inst.cfg
index 8854b681d7..e703fb64d1 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-abs_0.4mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -43,6 +42,7 @@ material_extrusion_cool_down_speed = 0.8
 material_flow = 93
 material_max_flowrate = 22
 material_print_temperature = =default_material_print_temperature + 10
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = True
 raft_airgap = 0.15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg
index dbff5632b7..5b6bd77b61 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -30,6 +27,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_material_flow = 200
 bridge_wall_speed = 20
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -45,6 +44,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 23
 material_print_temperature = =default_material_print_temperature - 5
+max_flow_acceleration = 1
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = True
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm.inst.cfg
index c149805400..c19e138144 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -30,6 +27,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_material_flow = 100
 bridge_wall_speed = 20
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -45,6 +44,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 23
 material_print_temperature = =default_material_print_temperature - 5
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = True
 retraction_amount = 3.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm.inst.cfg
index 785f23c008..d5b889e61a 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.4mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -30,6 +27,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_material_flow = 100
 bridge_wall_speed = 20
 cool_min_layer_time = 4
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -45,6 +44,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 23
 material_print_temperature = =default_material_print_temperature - 5
+max_flow_acceleration = 1
 optimize_wall_printing_order = False
 prime_tower_enable = True
 retraction_amount = 3.5
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg
index 9b3dbc2cf2..78d63336fe 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -30,6 +27,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_material_flow = 200
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -45,6 +44,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 15
 material_print_temperature = =default_material_print_temperature + 10
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg
index ded73ff086..4c2089a98b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -43,6 +42,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 15
 material_print_temperature = =default_material_print_temperature + 10
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 raft_airgap = 0.25
 retraction_amount = 4
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg
index 9e435e175a..dc6bf3ebf6 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -43,6 +42,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 15
 material_print_temperature = =default_material_print_temperature + 15
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 raft_airgap = 0.25
 retraction_amount = 4
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm.inst.cfg
index 757c7ce680..766194ac04 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.2mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -2
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -30,6 +27,8 @@ bridge_sparse_infill_max_density = 50
 bridge_wall_material_flow = 200
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -45,6 +44,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 17
 material_print_temperature = =default_material_print_temperature + 10
+max_flow_acceleration = 2
 meshfix_maximum_resolution = 0.7
 optimize_wall_printing_order = False
 prime_tower_enable = True
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm.inst.cfg
index a701865092..00b743dec2 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.3mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -3
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -43,6 +42,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 17
 material_print_temperature = =default_material_print_temperature + 15
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 prime_tower_enable = True
 raft_airgap = 0.25
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm.inst.cfg
index e68093c7b2..676ec0d8af 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-tough-pla_0.4mm.inst.cfg
@@ -12,9 +12,6 @@ variant = AA 0.8
 weight = -4
 
 [values]
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.2
-_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
-_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 2
 acceleration_infill = =acceleration_print
 acceleration_ironing = 1000
 acceleration_layer_0 = =acceleration_wall_0
@@ -28,6 +25,8 @@ bridge_skin_speed = =bridge_wall_speed
 bridge_sparse_infill_max_density = 50
 bridge_wall_speed = 30
 cool_min_layer_time = 6
+gradual_flow_discretisation_step_size = 0.2
+gradual_flow_enabled = True
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
 infill_sparse_density = 15
 jerk_infill = =jerk_print
@@ -43,6 +42,7 @@ material_extrusion_cool_down_speed = 0.7
 material_flow = 93
 material_max_flowrate = 17
 material_print_temperature = =default_material_print_temperature + 15
+max_flow_acceleration = 2
 optimize_wall_printing_order = False
 prime_tower_enable = True
 raft_airgap = 0.25
diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg
index f0ba478a53..9950957081 100644
--- a/resources/setting_visibility/expert.cfg
+++ b/resources/setting_visibility/expert.cfg
@@ -110,6 +110,7 @@ min_skin_width_for_expansion
 infill_randomize_start_location
 skin_edge_support_thickness
 skin_edge_support_layers
+extra_infill_lines_to_support_skins
 
 [material]
 default_material_print_temperature
diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt
index cb5aa3d2a6..237caedea9 100644
--- a/resources/texts/change_log.txt
+++ b/resources/texts/change_log.txt
@@ -1,3 +1,11 @@
+[5.8.1]
+
+* Bug fixes:
+- Fixed an issue where materials could not be synced to UltiMaker Printers
+
+* Profile Improvements
+- Significant improvements for PVA and TPU 95A profiles for UltiMaker Factor 4
+
 [5.8]
 
 * New Z Seam Settings:
diff --git a/resources/variants/creality/creality_crm4_0.2.inst.cfg b/resources/variants/creality/creality_crm4_0.2.inst.cfg
new file mode 100644
index 0000000000..4f9f76ac7a
--- /dev/null
+++ b/resources/variants/creality/creality_crm4_0.2.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 0.2mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.2
+
diff --git a/resources/variants/creality/creality_crm4_0.3.inst.cfg b/resources/variants/creality/creality_crm4_0.3.inst.cfg
new file mode 100644
index 0000000000..f4145b1c5c
--- /dev/null
+++ b/resources/variants/creality/creality_crm4_0.3.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 0.3mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.3
+
diff --git a/resources/variants/creality/creality_crm4_0.4.inst.cfg b/resources/variants/creality/creality_crm4_0.4.inst.cfg
new file mode 100644
index 0000000000..083efae740
--- /dev/null
+++ b/resources/variants/creality/creality_crm4_0.4.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 0.4mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+
diff --git a/resources/variants/creality/creality_crm4_0.5.inst.cfg b/resources/variants/creality/creality_crm4_0.5.inst.cfg
new file mode 100644
index 0000000000..1eea25e779
--- /dev/null
+++ b/resources/variants/creality/creality_crm4_0.5.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 0.5mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.5
+
diff --git a/resources/variants/creality/creality_crm4_0.6.inst.cfg b/resources/variants/creality/creality_crm4_0.6.inst.cfg
new file mode 100644
index 0000000000..d24f24eece
--- /dev/null
+++ b/resources/variants/creality/creality_crm4_0.6.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 0.6mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.6
+
diff --git a/resources/variants/creality/creality_crm4_0.8.inst.cfg b/resources/variants/creality/creality_crm4_0.8.inst.cfg
new file mode 100644
index 0000000000..f76a54078b
--- /dev/null
+++ b/resources/variants/creality/creality_crm4_0.8.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 0.8mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.8
+
diff --git a/resources/variants/creality/creality_crm4_1.0.inst.cfg b/resources/variants/creality/creality_crm4_1.0.inst.cfg
new file mode 100644
index 0000000000..f8734d6f3c
--- /dev/null
+++ b/resources/variants/creality/creality_crm4_1.0.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+definition = creality_crm4
+name = 1.0mm Nozzle
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 1.0
+
diff --git a/tests/Machines/TestStartEndGCode.py b/tests/Machines/TestStartEndGCode.py
new file mode 100644
index 0000000000..13c14f5acc
--- /dev/null
+++ b/tests/Machines/TestStartEndGCode.py
@@ -0,0 +1,310 @@
+# Copyright (c) 2024 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
+
+import pytest
+from unittest.mock import MagicMock
+
+from plugins.CuraEngineBackend.StartSliceJob import GcodeStartEndFormatter
+
+
+# def createMockedInstanceContainer(container_id):
+#     result = MagicMock()
+#     result.getId = MagicMock(return_value=container_id)
+#     result.getMetaDataEntry = MagicMock(side_effect=getMetadataEntrySideEffect)
+#     return result
+
+class MockValueProvider:
+    ##  Creates a mock value provider.
+    #
+    #   This initialises a dictionary with key-value pairs.
+    def __init__(self, values):
+        self._values = values
+
+    ##  Provides a value.
+    #
+    #   \param name The key of the value to provide.
+    def getProperty(self, key, property_name, context = None):
+        if not (key in self._values):
+            return None
+        return self._values[key]
+
+extruder_0_values = {
+    "material_temperature": 190.0
+}
+
+extruder_1_values = {
+    "material_temperature": 210.0
+}
+
+global_values = {
+    "bed_temperature": 50.0,
+    "initial_extruder": 0
+}
+
+extruder_0_provider = MockValueProvider(extruder_0_values)
+extruder_1_provider = MockValueProvider(extruder_1_values)
+
+all_extruder_settings = {"-1": global_values, "0": extruder_0_values, "1": extruder_1_values}
+
+test_cases = [
+    ('Static code', None, 'G0', 'G0'),
+
+    ('Basic replacement', None, 'M128 {bed_temperature}', 'M128 50.0'),
+
+    (
+        'Conditional expression with global setting',
+        None,
+'''{if bed_temperature > 30}
+G123
+{else}
+G456
+{endif}''',
+'''G123
+'''
+    ),
+
+    (
+        'Conditional expression with extruder setting directly specified by index 0',
+        None,
+'''{if material_temperature > 200, 0}
+G10
+{else}
+G20
+{endif}''',
+'''G20
+'''
+    ),
+    (
+        'Conditional expression with extruder setting directly specified by index 1',
+        None,
+'''{if material_temperature > 200, 1}
+G100
+{else}
+G200
+{endif}''',
+'''G100
+'''
+    ),
+
+    (
+        'Conditional expression with extruder index specified by setting',
+        None,
+'''{if material_temperature > 200, initial_extruder}
+G1000
+{else}
+G2000
+{endif}''',
+'''G2000
+'''
+    ),
+
+    (
+        'Conditional expression with extruder index specified by formula',
+        None,
+'''{if material_temperature > 200, (initial_extruder + 1) % 2}
+X1000
+{else}
+X2000
+{endif}''',
+'''X1000
+'''
+    ),
+
+    (
+        'Conditional expression with elsif',
+        None,
+'''{if bed_temperature < 30}
+T30
+{elif bed_temperature >= 30 and bed_temperature < 40}
+T40
+{elif bed_temperature >= 40 and bed_temperature < 50}
+T50
+{elif bed_temperature >= 50 and bed_temperature < 60}
+T60
+{elif bed_temperature >= 60 and bed_temperature < 70}
+T70
+{else}
+T-800
+{endif}''',
+'''T60
+'''
+    ),
+
+    (
+        'Formula inside a conditional expression',
+        None,
+'''{if bed_temperature < 30}
+Z000
+{else}
+Z{bed_temperature + 10}
+{endif}''',
+'''Z60.0
+'''
+    ),
+
+    (
+        'Other commands around conditional expression',
+        None,
+'''
+R000
+# My super initial command
+R111 X123 Y456 Z789
+{if bed_temperature > 30}
+R987
+R654 X321
+{else}
+R963 X852 Y741
+R321 X654 Y987
+{endif}
+# And finally, the end of the start at the beginning of the header
+R369
+R357 X951 Y843''',
+'''
+R000
+# My super initial command
+R111 X123 Y456 Z789
+R987
+R654 X321
+# And finally, the end of the start at the beginning of the header
+R369
+R357 X951 Y843'''
+    ),
+
+    (
+        'Multiple conditional expressions',
+        None,
+'''
+A999
+{if bed_temperature > 30}
+A000
+{else}
+A100
+{endif}
+A888
+{if material_temperature > 200, 0}
+A200
+{else}
+A300
+{endif}
+A777
+''',
+'''
+A999
+A000
+A888
+A300
+A777
+'''
+    ),
+
+    (
+        'Nested condition expression',
+        SyntaxError,
+'''{if bed_temperature < 30}
+{if material_temperature < 30, 0}
+M000
+{else}
+M888
+{endif}
+{else}
+M{bed_temperature + 10}
+{endif}''',
+        ''
+    ),
+
+    (
+        'Wrong condition expression',
+        SyntaxError,
+'''{of material_temperature > 200, 1}
+G100
+{else}
+G200
+{endif}''',
+        ''
+    ),
+
+    (
+        'Condition expression without start',
+        SyntaxError,
+'''
+W100
+{else}
+W200
+{endif}''',
+        ''
+    ),
+
+    (
+        'Formula with non-existing variable',
+        None,
+        '{material_storage_temperature}',
+        '0'
+    ),
+
+    (
+        'Missing formula end character',
+        None,
+        '{material_temperature, 0',
+        '{material_temperature, 0'
+    ),
+
+    (
+        'Conditional expression with missing end character',
+        SyntaxError,
+'''{if material_temperature > 200, 0
+Q1000
+{else}
+Q2000
+{endif}''',
+        ''
+    ),
+
+(
+        'Unexpected end character',
+        None,
+'''{if material_temperature > 200, 0}}
+S1000
+{else}
+S2000
+{endif}''',
+'''S2000
+'''
+    ),
+]
+
+def pytest_generate_tests(metafunc):
+    if "original_gcode" in metafunc.fixturenames:
+        tests_ids = [test[0] for test in test_cases]
+        tests_data = [test[1:] for test in test_cases]
+        metafunc.parametrize("exception_type, original_gcode, expected_gcode", tests_data, ids = tests_ids)
+
+@pytest.fixture
+def cura_application():
+    result = MagicMock()
+    result.getGlobalContainerStack = MagicMock(return_value = MockValueProvider(global_values))
+    return result
+
+@pytest.fixture
+def extruder_manager():
+    def get_extruder(extruder_nr: str):
+        if extruder_nr == "0":
+            return extruder_0_provider
+        elif extruder_nr == "1":
+            return extruder_1_provider
+        else:
+            return None
+
+    result = MagicMock()
+    result.getExtruderStack = MagicMock(side_effect = get_extruder)
+    return result
+
+def test_startEndGCode_replace(cura_application, extruder_manager, exception_type, original_gcode, expected_gcode):
+    formatter = GcodeStartEndFormatter(all_extruder_settings, -1)
+    formatter._cura_application = cura_application
+    formatter._extruder_manager = extruder_manager
+
+    if exception_type is not None:
+        with pytest.raises(exception_type):
+            formatter.format(original_gcode)
+    else:
+        assert formatter.format(original_gcode) == expected_gcode
diff --git a/tests/Machines/TestVariantNode.py b/tests/Machines/TestVariantNode.py
index e15d64a444..c84aaae36d 100644
--- a/tests/Machines/TestVariantNode.py
+++ b/tests/Machines/TestVariantNode.py
@@ -46,7 +46,7 @@ def getInstanceContainerSideEffect(*args, **kwargs):
 def machine_node():
     mocked_machine_node = MagicMock()
     mocked_machine_node.container_id = "machine_1"
-    mocked_machine_node.isExcludedMaterial = MagicMock(return_value=False)
+    mocked_machine_node.isExcludedMaterialBaseFile = MagicMock(return_value=False)
     mocked_machine_node.preferred_material = "preferred_material"
     return mocked_machine_node
 
@@ -96,7 +96,7 @@ def test_variantNodeInit(container_registry, machine_node):
 
 def test_variantNodeInit_excludedMaterial(container_registry, machine_node):
     machine_node.exclude_materials = ["material_1"]
-    machine_node.isExcludedMaterial = MagicMock(side_effect=lambda material: material["id"] == "material_1")
+    machine_node.isExcludedMaterialBaseFile = MagicMock(side_effect=lambda material: material == "material_1")
     node = createVariantNode("variant_1", machine_node, container_registry)
 
     assert "material_1" not in node.materials