diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index 505c988a13..6c95dc2c92 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -435,6 +435,18 @@ Cura.MachineAction
                             property bool allowNegative: true
                         }
 
+                        Loader
+                        {
+                            id: extruderCoolingFanNumberField
+                            sourceComponent: numericTextFieldWithUnit
+                            property string settingKey: "machine_extruder_cooling_fan_number"
+                            property string label: catalog.i18nc("@label", "Cooling Fan Number")
+                            property string unit: catalog.i18nc("@label", "")
+                            property bool isExtruderSetting: true
+                            property bool forceUpdateOnChange: true
+                            property bool allowNegative: false
+                        }
+
                         Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height }
 
                         Row
diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
index e9aaf39226..cba55051f5 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
@@ -126,7 +126,7 @@ Item
                         return ""
                     }
                     var date = new Date(details.last_updated)
-                    return date.toLocaleDateString(UM.Preferences.getValue("general/language"))
+                    return date.toLocaleString(UM.Preferences.getValue("general/language"))
                 }
                 font: UM.Theme.getFont("very_small")
                 color: UM.Theme.getColor("text")
diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json
index 3f84ed69a4..19c9e92d18 100644
--- a/resources/definitions/fdmextruder.def.json
+++ b/resources/definitions/fdmextruder.def.json
@@ -178,7 +178,19 @@
                     "maximum_value": "machine_height",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
-                }
+                },
+               "machine_extruder_cooling_fan_number":
+                {
+                    "label": "Extruder Print Cooling Fan",
+                    "description": "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder.",
+                    "type": "int",
+                    "default_value": 0,
+                    "minimum_value": "0",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true,
+                    "settable_per_meshgroup": false,
+                    "setttable_globally": false
+               }
             }
         },
         "platform_adhesion":