diff --git a/Cura-workflows b/Cura-workflows
new file mode 160000
index 0000000000..a38e2d1e10
--- /dev/null
+++ b/Cura-workflows
@@ -0,0 +1 @@
+Subproject commit a38e2d1e1029e5a350f7ecbee037e7ccabb7044a
diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
index c2238d2205..d40efbee8a 100644
--- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
@@ -214,7 +214,7 @@ Item
 
                 settingStoreIndex: propertyStoreIndex
 
-                labelText: catalog.i18nc("@label", "Y min")
+                labelText: catalog.i18nc("@label", "Y min ( '-' towards back)")
                 labelFont: base.labelFont
                 labelWidth: base.labelWidth
                 controlWidth: base.controlWidth
@@ -254,7 +254,7 @@ Item
                 settingKey: "machine_head_with_fans_polygon"
                 settingStoreIndex: propertyStoreIndex
 
-                labelText: catalog.i18nc("@label", "Y max")
+                labelText: catalog.i18nc("@label", "Y max ( '+' towards front)")
                 labelFont: base.labelFont
                 labelWidth: base.labelWidth
                 controlWidth: base.controlWidth
diff --git a/pydir.txt b/pydir.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/pydir.txt
@@ -0,0 +1 @@
+
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 9ce93cd4eb..b9ab1054cf 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -461,7 +461,7 @@
                 "machine_head_with_fans_polygon":
                 {
                     "label": "Machine Head & Fan Polygon",
-                    "description": "The shape of the print head. These are coordinates relative to the position of the print head, which is usually the position of its first extruder. The dimensions left and in front of the print head must be negative coordinates.",
+                    "description": "The dimensions of the print head used to determine 'Safe Model Distance' when printing 'One at a Time'. These numbers relate to the centerline of the first extruder nozzle. Left of the nozzle is 'X Min' and must be negative.  Rear of the nozzle is 'Y Min' and must be negative.  X Max (right) and Y Max (front) are positive numbers.  Gantry height is the dimension from the build plate to the X gantry beam.",
                     "type": "polygon",
                     "default_value": [
                         [-20, 10],
diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml
index a686fca8e5..62cab53a78 100644
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@@ -669,12 +669,12 @@ UM.PreferencesPage
             {
                 width: childrenRect.width
                 height: childrenRect.height
-                text: catalog.i18nc("@info:tooltip", "Should the Y axis of the translate toolhandle be flipped?")
+                text: catalog.i18nc("@info:tooltip", "Should the Y axis of the translate toolhandle be flipped? This will only affect model's Y coordinate, all other settings such as machine Printhead settings are unaffected and still behave as before.")
 
                 UM.CheckBox
                 {
                     id: flipToolhandleYCheckbox
-                    text: catalog.i18nc("@option:check", "Flip toolhandle Y axis")
+                    text: catalog.i18nc("@option:check", "Flip model's toolhandle Y axis (restart required)")
                     checked: boolCheck(UM.Preferences.getValue("tool/flip_y_axis_tool_handle"))
                     onCheckedChanged: UM.Preferences.setValue("tool/flip_y_axis_tool_handle", checked)
                 }