diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
index 9b670a7e8d..15f022d539 100644
--- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py
+++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
@@ -277,24 +277,50 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
         self._combineElement(result, second)
         return result
 
+    def _createKey(self, element):
+        key = element.tag.split("}")[-1]
+        if "key" in element.attrib:
+            key += " key:" + element.attrib["key"]
+        if "manufacturer" in element.attrib:
+            key += " manufacturer:" + element.attrib["manufacturer"]
+        if "product" in element.attrib:
+            key += " product:" + element.attrib["product"]
+        if key == "machine":
+            for item in element:
+                if "machine_identifier" in item.tag:
+                    key += " " + item.attrib["product"]
+        return key
+
     # Recursively merges XML elements. Updates either the text or children if another element is found in first.
     # If it does not exist, copies it from second.
     def _combineElement(self, first, second):
         # Create a mapping from tag name to element.
-        mapping = {el.tag: el for el in first}
-        for el in second:
-            if len(el):  # Check if element has children.
+
+        mapping = {}
+        for element in first:
+            key = self._createKey(element)
+            mapping[key] = element
+        for element in second:
+            key = self._createKey(element)
+            if len(element):  # Check if element has children.
                 try:
-                    self._combineElement(mapping[el.tag], el)  # Multiple elements, handle those.
+                    if "setting " in key:
+                        # Setting can have points in it. In that case, delete all values and override them.
+                        for child in list(mapping[key]):
+                            mapping[key].remove(child)
+                        for child in element:
+                            mapping[key].append(child)
+                    else:
+                        self._combineElement(mapping[key], element)  # Multiple elements, handle those.
                 except KeyError:
-                    mapping[el.tag] = el
-                    first.append(el)
+                    mapping[key] = element
+                    first.append(element)
             else:
                 try:
-                    mapping[el.tag].text = el.text
+                    mapping[key].text = element.text
                 except KeyError:  # Not in the mapping, so simply add it
-                    mapping[el.tag] = el
-                    first.append(el)
+                    mapping[key] = element
+                    first.append(element)
 
     ##  Overridden from InstanceContainer
     def deserialize(self, serialized):
@@ -305,7 +331,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
 
         # TODO: Add material verfication
         self.addMetaDataEntry("status", "unknown")
-        #for inherit in data.findall("./um:inherits", self.__namespaces):
+
         inherits = data.find("./um:inherits", self.__namespaces)
         if inherits is not None:
             inherited = self._resolveInheritance(inherits.text)