diff --git a/app/Model/Galaxy.php b/app/Model/Galaxy.php
diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
diff --git a/app/Model/GalaxyClusterBlocklist.php b/app/Model/GalaxyClusterBlocklist.php
diff --git a/app/Model/GalaxyClusterRelation.php b/app/Model/GalaxyClusterRelation.php
diff --git a/app/Model/GalaxyClusterRelationTag.php b/app/Model/GalaxyClusterRelationTag.php
diff --git a/app/Model/GalaxyElement.php b/app/Model/GalaxyElement.php
diff --git a/app/Model/Log.php b/app/Model/Log.php
diff --git a/app/Model/MispObject.php b/app/Model/MispObject.php
diff --git a/app/Model/Organisation.php b/app/Model/Organisation.php
diff --git a/app/Model/Role.php b/app/Model/Role.php
diff --git a/app/Model/Server.php b/app/Model/Server.php
diff --git a/app/Model/SharingGroup.php b/app/Model/SharingGroup.php
diff --git a/app/Model/Sighting.php b/app/Model/Sighting.php
diff --git a/app/Model/Tag.php b/app/Model/Tag.php
diff --git a/app/Model/Taxonomy.php b/app/Model/Taxonomy.php
diff --git a/app/Model/Template.php b/app/Model/Template.php
diff --git a/app/Model/User.php b/app/Model/User.php
diff --git a/app/Model/Warninglist.php b/app/Model/Warninglist.php
diff --git a/app/Plugin/SysLog/Lib/SysLog.php b/app/Plugin/SysLog/Lib/SysLog.php
diff --git a/app/Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php b/app/Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php
diff --git a/app/Test/JSONConverterToolTest.php b/app/Test/JSONConverterToolTest.php
diff --git a/app/View/AuthKeys/add.ctp b/app/View/AuthKeys/add.ctp
diff --git a/app/View/AuthKeys/authkey_display.ctp b/app/View/AuthKeys/authkey_display.ctp
diff --git a/app/View/AuthKeys/index.ctp b/app/View/AuthKeys/index.ctp
diff --git a/app/View/AuthKeys/view.ctp b/app/View/AuthKeys/view.ctp
diff --git a/app/View/Elements/Events/View/related_event.ctp b/app/View/Elements/Events/View/related_event.ctp
diff --git a/app/View/Elements/Events/View/row_attribute.ctp b/app/View/Elements/Events/View/row_attribute.ctp
diff --git a/app/View/Elements/Events/View/row_object.ctp b/app/View/Elements/Events/View/row_object.ctp
diff --git a/app/View/Elements/GalaxyClusters/clusterElementUI.ctp b/app/View/Elements/GalaxyClusters/clusterElementUI.ctp
diff --git a/app/View/Elements/GalaxyClusters/relations_graph.ctp b/app/View/Elements/GalaxyClusters/relations_graph.ctp
diff --git a/app/View/Elements/GalaxyClusters/view_relation_tree.ctp b/app/View/Elements/GalaxyClusters/view_relation_tree.ctp
diff --git a/app/View/Elements/Users/userIndexTable.ctp b/app/View/Elements/Users/userIndexTable.ctp
diff --git a/app/View/Elements/dashboard/Widgets/MultiLineChart.ctp b/app/View/Elements/dashboard/Widgets/MultiLineChart.ctp
diff --git a/app/View/Elements/eventattribute.ctp b/app/View/Elements/eventattribute.ctp
diff --git a/app/View/Elements/galaxyQuickView.ctp b/app/View/Elements/galaxyQuickView.ctp
diff --git a/app/View/Elements/galaxyQuickViewMini.ctp b/app/View/Elements/galaxyQuickViewMini.ctp
diff --git a/app/View/Elements/genericElements/Form/genericForm.ctp b/app/View/Elements/genericElements/Form/genericForm.ctp
diff --git a/app/View/Elements/genericElements/Form/submitButton.ctp b/app/View/Elements/genericElements/Form/submitButton.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/action_toggle.ctp b/app/View/Elements/genericElements/IndexTable/Fields/action_toggle.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/actions.ctp b/app/View/Elements/genericElements/IndexTable/Fields/actions.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/authkey.ctp b/app/View/Elements/genericElements/IndexTable/Fields/authkey.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp b/app/View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/expiration.ctp b/app/View/Elements/genericElements/IndexTable/Fields/expiration.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/galaxy_cluster_link.ctp b/app/View/Elements/genericElements/IndexTable/Fields/galaxy_cluster_link.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/in_out_counts.ctp b/app/View/Elements/genericElements/IndexTable/Fields/in_out_counts.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/org.ctp b/app/View/Elements/genericElements/IndexTable/Fields/org.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/tags.ctp b/app/View/Elements/genericElements/IndexTable/Fields/tags.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/toggle.ctp b/app/View/Elements/genericElements/IndexTable/Fields/toggle.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/tree.ctp b/app/View/Elements/genericElements/IndexTable/Fields/tree.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/tree_node.ctp b/app/View/Elements/genericElements/IndexTable/Fields/tree_node.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/row.ctp b/app/View/Elements/genericElements/IndexTable/row.ctp
diff --git a/app/View/Elements/genericElements/IndexTable/scaffold.ctp b/app/View/Elements/genericElements/IndexTable/scaffold.ctp
diff --git a/app/View/Elements/genericElements/ListTopBar/element_simple.ctp b/app/View/Elements/genericElements/ListTopBar/element_simple.ctp
diff --git a/app/View/Elements/genericElements/ListTopBar/group_search.ctp b/app/View/Elements/genericElements/ListTopBar/group_search.ctp
diff --git a/app/View/Elements/genericElements/SideMenu/side_menu.ctp b/app/View/Elements/genericElements/SideMenu/side_menu.ctp
diff --git a/app/View/Elements/genericElements/SingleViews/Fields/alignmentField.ctp b/app/View/Elements/genericElements/SingleViews/Fields/alignmentField.ctp
diff --git a/app/View/Elements/genericElements/SingleViews/Fields/authkeyField.ctp b/app/View/Elements/genericElements/SingleViews/Fields/authkeyField.ctp
diff --git a/app/View/Elements/genericElements/SingleViews/Fields/booleanField.ctp b/app/View/Elements/genericElements/SingleViews/Fields/booleanField.ctp
diff --git a/app/View/Elements/genericElements/SingleViews/Fields/dateField.ctp b/app/View/Elements/genericElements/SingleViews/Fields/dateField.ctp
diff --git a/app/View/Elements/genericElements/SingleViews/Fields/datetimeField.ctp b/app/View/Elements/genericElements/SingleViews/Fields/datetimeField.ctp
diff --git a/app/View/Elements/genericElements/SingleViews/Fields/expirationField.ctp b/app/View/Elements/genericElements/SingleViews/Fields/expirationField.ctp
diff --git a/app/View/Elements/genericElements/SingleViews/Fields/genericField.ctp b/app/View/Elements/genericElements/SingleViews/Fields/genericField.ctp
diff --git a/app/View/Elements/genericElements/SingleViews/Fields/mappingField.ctp b/app/View/Elements/genericElements/SingleViews/Fields/mappingField.ctp
diff --git a/app/View/Elements/genericElements/SingleViews/Fields/modelField.ctp b/app/View/Elements/genericElements/SingleViews/Fields/modelField.ctp
diff --git a/app/View/Elements/genericElements/SingleViews/child.ctp b/app/View/Elements/genericElements/SingleViews/child.ctp
diff --git a/app/View/Elements/genericElements/SingleViews/single_view.ctp b/app/View/Elements/genericElements/SingleViews/single_view.ctp
diff --git a/app/View/Elements/genericElements/accordion.ctp b/app/View/Elements/genericElements/accordion.ctp
diff --git a/app/View/Elements/generic_picker.ctp b/app/View/Elements/generic_picker.ctp
diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp
diff --git a/app/View/Elements/healthElements/db_schema_diagnostic.ctp b/app/View/Elements/healthElements/db_schema_diagnostic.ctp
diff --git a/app/View/Elements/healthElements/diagnostics.ctp b/app/View/Elements/healthElements/diagnostics.ctp
diff --git a/app/View/Elements/healthElements/settings_row.ctp b/app/View/Elements/healthElements/settings_row.ctp
diff --git a/app/View/EventReports/ajax/indexForEvent.ctp b/app/View/EventReports/ajax/indexForEvent.ctp
diff --git a/app/View/EventReports/ajax/reportFromEvent.ctp b/app/View/EventReports/ajax/reportFromEvent.ctp
diff --git a/app/View/EventReports/index.ctp b/app/View/EventReports/index.ctp
diff --git a/app/View/EventReports/view.ctp b/app/View/EventReports/view.ctp
diff --git a/app/View/Events/automation.ctp b/app/View/Events/automation.ctp
diff --git a/app/View/Events/json/view.ctp b/app/View/Events/json/view.ctp
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
diff --git a/app/View/Events/view_cluster_relations.ctp b/app/View/Events/view_cluster_relations.ctp
diff --git a/app/View/Galaxies/export.ctp b/app/View/Galaxies/export.ctp
diff --git a/app/View/Galaxies/fork_tree.ctp b/app/View/Galaxies/fork_tree.ctp
diff --git a/app/View/Galaxies/import.ctp b/app/View/Galaxies/import.ctp
diff --git a/app/View/Galaxies/index.ctp b/app/View/Galaxies/index.ctp
diff --git a/app/View/Galaxies/relations_graph.ctp b/app/View/Galaxies/relations_graph.ctp
diff --git a/app/View/Galaxies/view.ctp b/app/View/Galaxies/view.ctp
diff --git a/app/View/GalaxyClusterBlocklists/add.ctp b/app/View/GalaxyClusterBlocklists/add.ctp
diff --git a/app/View/GalaxyClusterBlocklists/index.ctp b/app/View/GalaxyClusterBlocklists/index.ctp
diff --git a/app/View/GalaxyClusterRelations/add.ctp b/app/View/GalaxyClusterRelations/add.ctp
diff --git a/app/View/GalaxyClusterRelations/index.ctp b/app/View/GalaxyClusterRelations/index.ctp
diff --git a/app/View/GalaxyClusters/add.ctp b/app/View/GalaxyClusters/add.ctp
diff --git a/app/View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp b/app/View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp
diff --git a/app/View/GalaxyClusters/ajax/index.ctp b/app/View/GalaxyClusters/ajax/index.ctp
diff --git a/app/View/GalaxyClusters/ajax/publishConfirmationForm.ctp b/app/View/GalaxyClusters/ajax/publishConfirmationForm.ctp
diff --git a/app/View/GalaxyClusters/update_cluster.ctp b/app/View/GalaxyClusters/update_cluster.ctp
diff --git a/app/View/GalaxyClusters/view.ctp b/app/View/GalaxyClusters/view.ctp
diff --git a/app/View/GalaxyClusters/view_relations.ctp b/app/View/GalaxyClusters/view_relations.ctp
diff --git a/app/View/Helper/OrgImgHelper.php b/app/View/Helper/OrgImgHelper.php
diff --git a/app/View/Roles/admin_add.ctp b/app/View/Roles/admin_add.ctp
diff --git a/app/View/Roles/admin_index.ctp b/app/View/Roles/admin_index.ctp
diff --git a/app/View/Roles/admin_set_default.ctp b/app/View/Roles/admin_set_default.ctp
diff --git a/app/View/Roles/view.ctp b/app/View/Roles/view.ctp
diff --git a/app/View/Servers/add.ctp b/app/View/Servers/add.ctp
diff --git a/app/View/Servers/ajax/get_api_info.ctp b/app/View/Servers/ajax/get_api_info.ctp
diff --git a/app/View/Servers/ajax/update.ctp b/app/View/Servers/ajax/update.ctp
diff --git a/app/View/Servers/edit.ctp b/app/View/Servers/edit.ctp
diff --git a/app/View/Servers/index.ctp b/app/View/Servers/index.ctp
diff --git a/app/View/Servers/rest.ctp b/app/View/Servers/rest.ctp
diff --git a/app/View/Tags/index.ctp b/app/View/Tags/index.ctp
diff --git a/app/View/TemplateElements/ajax/ajaxIndex.ctp b/app/View/TemplateElements/ajax/ajaxIndex.ctp
diff --git a/app/View/Users/accept_registrations.ctp b/app/View/Users/accept_registrations.ctp
diff --git a/app/View/Users/admin_add.ctp b/app/View/Users/admin_add.ctp
diff --git a/app/View/Users/admin_edit.ctp b/app/View/Users/admin_edit.ctp
diff --git a/app/View/Users/admin_index.ctp b/app/View/Users/admin_index.ctp
diff --git a/app/View/Users/admin_view.ctp b/app/View/Users/admin_view.ctp
diff --git a/app/View/Users/change_pw.ctp b/app/View/Users/change_pw.ctp
diff --git a/app/View/Users/edit.ctp b/app/View/Users/edit.ctp
diff --git a/app/View/Users/view.ctp b/app/View/Users/view.ctp
diff --git a/app/View/Warninglists/index.ctp b/app/View/Warninglists/index.ctp
diff --git a/app/View/genericTemplates/delete.ctp b/app/View/genericTemplates/delete.ctp
diff --git a/app/composer.json b/app/composer.json
diff --git a/app/files/misp-galaxy b/app/files/misp-galaxy
diff --git a/app/files/misp-objects b/app/files/misp-objects
diff --git a/app/files/scripts/selftest.php b/app/files/scripts/selftest.php
diff --git a/app/files/scripts/stix2/stix2misp.py b/app/files/scripts/stix2/stix2misp.py
diff --git a/app/files/warninglists b/app/files/warninglists
diff --git a/app/webroot/css/codemirror/lint.css b/app/webroot/css/codemirror/lint.css
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
diff --git a/app/webroot/css/markdownEditor/markdownEditor.css b/app/webroot/css/markdownEditor/markdownEditor.css
diff --git a/app/webroot/js/codemirror/addons/closebrackets.js b/app/webroot/js/codemirror/addons/closebrackets.js
diff --git a/app/webroot/js/codemirror/addons/json-lint.js b/app/webroot/js/codemirror/addons/json-lint.js
diff --git a/app/webroot/js/codemirror/addons/jsonlint.js b/app/webroot/js/codemirror/addons/jsonlint.js
diff --git a/app/webroot/js/codemirror/addons/lint.js b/app/webroot/js/codemirror/addons/lint.js
diff --git a/app/webroot/js/markdownEditor/event-report.js b/app/webroot/js/markdownEditor/event-report.js
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
diff --git a/app/webroot/js/restClient.js b/app/webroot/js/restClient.js
diff --git a/build/github-action-ci-apache b/build/github-action-ci-apache
diff --git a/db_schema.json b/db_schema.json
diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
diff --git a/docs/INSTALL.ubuntu1804.md b/docs/INSTALL.ubuntu1804.md
diff --git a/docs/INSTALL.ubuntu2004.md b/docs/INSTALL.ubuntu2004.md
diff --git a/docs/generic/globalVariables.md b/docs/generic/globalVariables.md
diff --git a/docs/generic/supportFunctions.md b/docs/generic/supportFunctions.md
diff --git a/docs/xINSTALL.OpenBSD.md b/docs/xINSTALL.OpenBSD.md
diff --git a/docs/xINSTALL.centos6.md b/docs/xINSTALL.centos6.md
diff --git a/docs/xINSTALL.centos7.md b/docs/xINSTALL.centos7.md
diff --git a/docs/xINSTALL.debian10.md b/docs/xINSTALL.debian10.md
diff --git a/docs/xINSTALL.debian9.md b/docs/xINSTALL.debian9.md
diff --git a/docs/xINSTALL.ubuntu1804.with.webmin.md b/docs/xINSTALL.ubuntu1804.with.webmin.md
diff --git a/tests/curl_tests_GH.sh b/tests/curl_tests_GH.sh
+10 −0		clusters/rat.json
+9 −5		clusters/threat-actor.json
+29 −0		clusters/tool.json
+219 −219		lists/alexa/list.json
+140 −2		lists/amazon-aws/list.json
+170 −170		lists/cisco_top1000/list.json
+1,757 −1,757		lists/cisco_top10k/list.json
+3,174 −3,174		lists/cisco_top20k/list.json
+996 −996		lists/cisco_top5k/list.json
+1 −1		lists/cloudflare/list.json
+1 −1		lists/covid-19-cyber-threat-coalition-whitelist/list.json
+1 −1		lists/covid-19-krassi-whitelist/list.json
+1 −1		lists/crl-ip-hostname/list.json
+1 −1		lists/disposable-email/list.json
+32 −0		lists/fastly/list.json
+334 −334		lists/majestic_million/list.json
+757 −20		lists/microsoft-azure/list.json
+1 −1		lists/microsoft-office365-ip/list.json
+5 −4		lists/microsoft-office365/list.json
+50 −50		lists/moz-top500/list.json
+1 −1		lists/mozilla-CA/list.json
+10 −64		lists/mozilla-IntermediateCA/list.json
+33 −2		lists/phone_numbers/list.json
+284 −175		lists/public-dns-hostname/list.json
+479 −272		lists/public-dns-v4/list.json
+3 −9		lists/public-dns-v6/list.json
+1 −2		lists/tlds/list.json
+113,946 −113,946		lists/tranco/list.json
+427 −427		lists/tranco10k/list.json
+4 −1		lists/university_domains/list.json
+1 −1		lists/vpn-ipv4/list.json
+1 −1		lists/vpn-ipv6/list.json
+1 −1		lists/wikimedia/list.json
+85 −1		tools/generate_phone_numbers.py