Merge remote-tracking branch 'upstream/main' into pyoti-v2

fetch upstream and merge

nis2/machinetag.json

@@ -1,7 +1,7 @@
 {
   "namespace": "nis2",
   "description": "The taxonomy is meant for large scale cybersecurity incidents, as mentioned in the Commission Recommendation of 13 May 2022, also known as the provisional agreement. It has two core parts: The nature of the incident, i.e. the underlying cause, that triggered the incident, and the impact of the incident, i.e. the impact on services, in which sector(s) of economy and society.",
-  "version": 2,
+  "version": 3,
   "predicates": [
     {
       "value": "impact-sectors-impacted",
@@ -36,6 +36,21 @@
       "value": "test",
       "expanded": "Test",
       "description": "A test predicate meant to test interoperability between tools. Tags contained within this predicate are to be ignored."
+    },
+    {
+      "value": "impact-subsectors-important-entities",
+      "expanded": "Impact subsectors important entities",
+      "description": "Impact subsectors important entities"
+    },
+    {
+      "value": "important-entities",
+      "expanded": "Important entities",
+      "description": "Important entities"
+    },
+    {
+      "value": "impact-subsectors-impacted",
+      "expanded": "Impact subsectors impacted",
+      "description": "Impact subsectors impacted"
     }
   ],
   "values": [