From b569fc7f40727163b56a81dada95b07b67f3d524 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Sun, 30 Oct 2022 20:02:44 +0100
Subject: [PATCH 001/173] Refactored things.js and split into smaller files -
 Enabled visual code type checking

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/jsconfig.json                  |  10 +
 ui/main.js                        |   4 +
 ui/modules/things/searchFilter.js |  53 +----
 ui/modules/things/things.js       | 344 ++----------------------------
 ui/modules/things/thingsCRUD.js   | 168 +++++++++++++++
 ui/modules/things/thingsSearch.js | 260 ++++++++++++++++++++++
 6 files changed, 469 insertions(+), 370 deletions(-)
 create mode 100644 ui/jsconfig.json
 create mode 100644 ui/modules/things/thingsCRUD.js
 create mode 100644 ui/modules/things/thingsSearch.js

diff --git a/ui/jsconfig.json b/ui/jsconfig.json
new file mode 100644
index 00000000000..0c1857a8d62
--- /dev/null
+++ b/ui/jsconfig.json
@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "module": "es6",
+    "target": "es6",
+    "lib": [
+      "es2016", "DOM"
+    ]
+  },
+  "exclude": ["node_modules", "**/node_modules/*"]
+}
\ No newline at end of file
diff --git a/ui/main.js b/ui/main.js
index 0b4540c0406..25855cec186 100644
--- a/ui/main.js
+++ b/ui/main.js
@@ -20,6 +20,8 @@ import * as FeatureMessages from './modules/things/featureMessages.js';
 import * as Fields from './modules/things/fields.js';
 import * as SearchFilter from './modules/things/searchFilter.js';
 import * as Things from './modules/things/things.js';
+import * as ThingsSearch from './modules/things/thingsSearch.js';
+import * as ThingsCRUD from './modules/things/thingsCRUD.js';
 import * as Connections from './modules/connections/connections.js';
 import * as Policies from './modules/policies/policies.js';
 import * as API from './modules/api.js';
@@ -44,6 +46,8 @@ document.addEventListener('DOMContentLoaded', async function() {
 
   Utils.ready();
   await Things.ready();
+  ThingsSearch.ready();
+  ThingsCRUD.ready();
   Attributes.ready();
   await Fields.ready();
   await SearchFilter.ready();
diff --git a/ui/modules/things/searchFilter.js b/ui/modules/things/searchFilter.js
index be48d2aafe2..6eabd8b6086 100644
--- a/ui/modules/things/searchFilter.js
+++ b/ui/modules/things/searchFilter.js
@@ -10,10 +10,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
+// @ts-check
 
 import * as Environments from '../environments/environments.js';
 import * as Utils from '../utils.js';
-import * as Things from './things.js';
+import * as ThingsSearch from './thingsSearch.js';
 
 const filterExamples = [
   'eq(attributes/location,"kitchen")',
@@ -27,8 +28,6 @@ const filterExamples = [
 
 let keyStrokeTimeout;
 
-let lastSearch = '';
-
 const dom = {
   filterList: null,
   favIcon: null,
@@ -47,16 +46,19 @@ export async function ready() {
 
   Utils.getAllElementsById(dom);
 
+  dom.pinnedThings.onclick = ThingsSearch.pinnedTriggered;
+
+
   dom.filterList.addEventListener('click', (event) => {
     if (event.target && event.target.classList.contains('dropdown-item')) {
       dom.searchFilterEdit.value = event.target.textContent;
       checkIfFavourite();
-      Things.searchThings(event.target.textContent);
+      ThingsSearch.searchThings(event.target.textContent);
     }
   });
 
   dom.searchThings.onclick = () => {
-    searchTriggered(dom.searchFilterEdit.value);
+    ThingsSearch.searchTriggered(dom.searchFilterEdit.value);
   };
 
   dom.searchFavourite.onclick = () => {
@@ -68,7 +70,7 @@ export async function ready() {
 
   dom.searchFilterEdit.onkeyup = (event) => {
     if (event.key === 'Enter' || event.code === 13) {
-      searchTriggered(dom.searchFilterEdit.value);
+      ThingsSearch.searchTriggered(dom.searchFilterEdit.value);
     } else {
       clearTimeout(keyStrokeTimeout);
       keyStrokeTimeout = setTimeout(checkIfFavourite, 1000);
@@ -81,7 +83,9 @@ export async function ready() {
     }
   };
 
-  dom.pinnedThings.onclick = pinnedTriggered;
+  dom.searchFilterEdit.onchange = ThingsSearch.removeMoreFromThingList;
+
+  dom.searchFilterEdit.focus();
 }
 
 /**
@@ -97,41 +101,6 @@ function onEnvironmentChanged() {
   updateFilterList();
 }
 
-/**
- * Tests if the search filter is an RQL. If yes, things search is called otherwise just things get
- * @param {String} filter search filter string containing an RQL or a thingId
- */
-function searchTriggered(filter) {
-  lastSearch = filter;
-  const regex = /^(eq\(|ne\(|gt\(|ge\(|lt\(|le\(|in\(|like\(|exists\(|and\(|or\(|not\().*/;
-  if (filter === '' || regex.test(filter)) {
-    Things.searchThings(filter);
-  } else {
-    Things.getThings([filter]);
-  }
-}
-
-/**
- * Gets the list of pinned things
- */
-function pinnedTriggered() {
-  lastSearch = 'pinned';
-  dom.searchFilterEdit.value = null;
-  dom.favIcon.classList.replace('bi-star-fill', 'bi-star');
-  Things.getThings(Environments.current()['pinnedThings']);
-}
-
-/**
- * Performs the last search by the user using the last used filter.
- * If the user used pinned things last time, the pinned things are reloaded
- */
-export function performLastSearch() {
-  if (lastSearch === 'pinned') {
-    pinnedTriggered();
-  } else {
-    searchTriggered(lastSearch);
-  }
-}
 
 /**
  * Updates the UI filterList
diff --git a/ui/modules/things/things.js b/ui/modules/things/things.js
index da397b1a179..e8fff1e728c 100644
--- a/ui/modules/things/things.js
+++ b/ui/modules/things/things.js
@@ -1,54 +1,32 @@
-/* eslint-disable require-jsdoc */
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-
-/* eslint-disable new-cap */
-/* eslint-disable no-invalid-this */
-import {JSONPath} from 'https://cdn.jsdelivr.net/npm/jsonpath-plus@5.0.3/dist/index-browser-esm.min.js';
+* Copyright (c) 2022 Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Eclipse Public License 2.0 which is available at
+* http://www.eclipse.org/legal/epl-2.0
+*
+* SPDX-License-Identifier: EPL-2.0
+*/
+/* eslint-disable require-jsdoc */
+// @ts-check
 import * as API from '../api.js';
 
 import * as Environments from '../environments/environments.js';
-import * as SearchFilter from './searchFilter.js';
 import * as Utils from '../utils.js';
-import * as Fields from './fields.js';
+import * as ThingsSearch from './thingsSearch.js';
 
 export let theThing;
-let theSearchCursor;
-
-let thingJsonEditor;
-
-let thingTemplates;
 
 const observers = [];
 
 const dom = {
-  thingsTableHead: null,
-  thingsTableBody: null,
-  thingDetails: null,
-  thingId: null,
-  buttonCreateThing: null,
-  buttonSaveThing: null,
-  buttonDeleteThing: null,
-  inputThingDefinition: null,
-  ulThingDefinitions: null,
-  tabModifyThing: null,
-  searchFilterEdit: null,
   collapseThings: null,
   tabThings: null,
 };
 
-const uuidRegex = /([0-9a-f]{7})[0-9a-f]-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/g;
-
 /**
  * Adds a listener function for the currently selected thing
  * @param {function} observer function that will be called if the current thing was changed
@@ -65,216 +43,7 @@ export async function ready() {
 
   Utils.getAllElementsById(dom);
 
-  thingJsonEditor = Utils.createAceEditor('thingJsonEditor', 'ace/mode/json');
-
-  loadThingTemplates();
-
-  dom.ulThingDefinitions.addEventListener('click', (event) => {
-    setTheThing(null);
-    Utils.tableAdjustSelection(dom.thingsTableBody, () => false);
-    dom.inputThingDefinition.value = event.target.textContent;
-    thingJsonEditor.setValue(JSON.stringify(thingTemplates[event.target.textContent], null, 2), -1);
-  });
-
-  dom.searchFilterEdit.onchange = removeMoreFromThingList;
-
-  dom.buttonCreateThing.onclick = async () => {
-    const editorValue = thingJsonEditor.getValue();
-    if (dom.thingId.value !== undefined && dom.thingId.value !== '') {
-      API.callDittoREST('PUT',
-          '/things/' + dom.thingId.value,
-          editorValue === '' ? {} : JSON.parse(editorValue),
-          {
-            'if-none-match': '*',
-          },
-      ).then((data) => {
-        refreshThing(data.thingId, () => {
-          getThings([data.thingId]);
-        });
-      });
-    } else {
-      API.callDittoREST('POST', '/things', editorValue === '' ? {} : JSON.parse(editorValue))
-          .then((data) => {
-            refreshThing(data.thingId, () => {
-              getThings([data.thingId]);
-            });
-          });
-    }
-  };
-
-  dom.buttonSaveThing.onclick = () => {
-    Utils.assert(dom.thingId.value, 'Thing ID is empty', dom.thingId);
-    modifyThing('PUT');
-  };
-
-  dom.buttonDeleteThing.onclick = () => {
-    Utils.assert(dom.thingId.value, 'Thing ID is empty', dom.thingId);
-    Utils.confirm(`Are you sure you want to delete thing<br>'${theThing.thingId}'?`, 'Delete', () => {
-      modifyThing('DELETE');
-    });
-  };
-
-  dom.thingsTableBody.addEventListener('click', (event) => {
-    if (event.target && event.target.nodeName === 'TD') {
-      const row = event.target.parentNode;
-      if (row.id === 'searchThingsMore') {
-        row.style.pointerEvents = 'none';
-        event.stopImmediatePropagation();
-        searchThings(dom.searchFilterEdit.value, theSearchCursor);
-      } else {
-        if (theThing && theThing.thingId === row.id) {
-          setTheThing(null);
-        } else {
-          refreshThing(row.id);
-        }
-      }
-    }
-  });
-
-  document.querySelector('a[data-bs-target="#tabModifyThing"]').addEventListener('shown.bs.tab', (event) => {
-    thingJsonEditor.renderer.updateFull();
-  });
-
   dom.tabThings.onclick = onTabActivated;
-
-  dom.searchFilterEdit.focus();
-}
-
-function loadThingTemplates() {
-  fetch('templates/thingTemplates.json')
-      .then((response) => {
-        response.json().then((loadedTemplates) => {
-          thingTemplates = loadedTemplates;
-          Utils.addDropDownEntries(dom.ulThingDefinitions, Object.keys(thingTemplates));
-        });
-      });
-}
-
-/**
- * Fills the things table UI with the given things
- * @param {Array} thingsList Array of thing json objects
- */
-function fillThingsTable(thingsList) {
-  const activeFields = Environments.current().fieldList.filter((f) => f.active);
-  fillHeaderRow();
-  let thingSelected = false;
-  thingsList.forEach((item, t) => {
-    const row = dom.thingsTableBody.insertRow();
-    fillBodyRow(row, item);
-  });
-  if (!thingSelected) {
-    setTheThing(null);
-  }
-
-  function fillHeaderRow() {
-    dom.thingsTableHead.innerHTML = '';
-    // Utils.addCheckboxToRow(dom.thingsTableHead, 'checkboxHead', false, null);
-    Utils.insertHeaderCell(dom.thingsTableHead, '');
-    Utils.insertHeaderCell(dom.thingsTableHead, 'Thing ID');
-    activeFields.forEach((field) => {
-      Utils.insertHeaderCell(dom.thingsTableHead, field['label'] ? field.label : field.path);
-    });
-  }
-
-  function fillBodyRow(row, item) {
-    row.id = item.thingId;
-    if (theThing && (item.thingId === theThing.thingId)) {
-      thingSelected = true;
-      row.classList.add('table-active');
-    }
-    Utils.addCheckboxToRow(
-        row,
-        item.thingId,
-        Environments.current().pinnedThings.includes(item.thingId),
-        togglePinnedThing,
-    );
-    Utils.addCellToRow(row, beautifyId(item.thingId), item.thingId);
-    activeFields.forEach((field) => {
-      let path = field.path.replace(/\//g, '.');
-      if (path.charAt(0) !== '.') {
-        path = '$.' + path;
-      }
-      const elem = JSONPath({
-        json: item,
-        path: path,
-      });
-      Utils.addCellToRow(row, elem.length !== 0 ? elem[0] : '');
-    });
-  }
-
-  function beautifyId(longId) {
-    let result = longId;
-    if (Environments.current()['shortenUUID']) {
-      result = result.replace(uuidRegex, '$1');
-    }
-    if (Environments.current()['defaultNamespace']) {
-      result = result.replace(Environments.current()['defaultNamespace'], 'dn');
-    }
-    return result;
-  }
-}
-
-/**
- * Calls Ditto search api and fills UI with the result
- * @param {String} filter Ditto search filter (rql)
- * @param {String} cursor (optional) cursor returned from things search for additional pages
- */
-export function searchThings(filter, cursor) {
-  document.body.style.cursor = 'progress';
-
-  const namespaces = Environments.current().searchNamespaces;
-
-  API.callDittoREST('GET',
-      '/search/things?' + Fields.getQueryParameter() +
-      ((filter && filter !== '') ? '&filter=' + encodeURIComponent(filter) : '') +
-      ((namespaces && namespaces !== '') ? '&namespaces=' + namespaces : '') +
-      '&option=sort(%2BthingId)' +
-      // ',size(3)' +
-      (cursor ? ',cursor(' + cursor + ')' : ''),
-  ).then((searchResult) => {
-    if (cursor) {
-      removeMoreFromThingList();
-    } else {
-      theSearchCursor = null;
-      dom.thingsTableBody.innerHTML = '';
-    }
-    fillThingsTable(searchResult.items);
-    checkMorePages(searchResult);
-  }).catch((error) => {
-    theSearchCursor = null;
-    dom.thingsTableBody.innerHTML = '';
-  }).finally(() => {
-    document.body.style.cursor = 'default';
-  });
-}
-
-/**
- * Gets things from Ditto by thingIds and fills the UI with the result
- * @param {Array} thingIds Array of thingIds
- */
-export function getThings(thingIds) {
-  dom.thingsTableBody.innerHTML = '';
-  if (thingIds.length > 0) {
-    API.callDittoREST('GET',
-        `/things?${Fields.getQueryParameter()}&ids=${thingIds}&option=sort(%2BthingId)`,
-    ).then(fillThingsTable);
-  }
-}
-
-/**
- * Returns a click handler for Update thing and delete thing
- * @param {String} method PUT or DELETE
- */
-function modifyThing(method) {
-  API.callDittoREST(method,
-      '/things/' + dom.thingId.value,
-      method === 'PUT' ? JSON.parse(thingJsonEditor.getValue()) : null,
-      {
-        'if-match': '*',
-      },
-  ).then(() => {
-    method === 'PUT' ? refreshThing(dom.thingId.value) : SearchFilter.performLastSearch();
-  });
 }
 
 /**
@@ -297,90 +66,9 @@ export function refreshThing(thingId, successCallback) {
  * Update all UI components for the given Thing
  * @param {Object} thingJson Thing json
  */
-function setTheThing(thingJson) {
+export function setTheThing(thingJson) {
   theThing = thingJson;
-
-  updateThingDetailsTable();
-  updateThingJsonEditor();
-
   observers.forEach((observer) => observer.call(null, theThing));
-
-  function updateThingDetailsTable() {
-    dom.thingDetails.innerHTML = '';
-    if (theThing) {
-      Utils.addTableRow(dom.thingDetails, 'thingId', false, true, theThing.thingId);
-      Utils.addTableRow(dom.thingDetails, 'policyId', false, true, theThing.policyId);
-      Utils.addTableRow(dom.thingDetails, 'definition', false, true, theThing.definition ?? '');
-      Utils.addTableRow(dom.thingDetails, 'revision', false, true, theThing._revision);
-      Utils.addTableRow(dom.thingDetails, 'created', false, true, theThing._created);
-      Utils.addTableRow(dom.thingDetails, 'modified', false, true, theThing._modified);
-    }
-  }
-
-  function updateThingJsonEditor() {
-    if (theThing) {
-      dom.thingId.value = theThing.thingId;
-      dom.inputThingDefinition.value = theThing.definition ?? '';
-      const thingCopy = JSON.parse(JSON.stringify(theThing));
-      delete thingCopy['_revision'];
-      delete thingCopy['_created'];
-      delete thingCopy['_modified'];
-      thingJsonEditor.setValue(JSON.stringify(thingCopy, null, 2), -1);
-    } else {
-      dom.thingId.value = null;
-      dom.inputThingDefinition.value = null;
-      thingJsonEditor.setValue('');
-    }
-  }
-}
-
-/**
- * Updates UI depepending on existing additional pages on Ditto things search
- * @param {Object} searchResult Result from Ditto thing search
- */
-function checkMorePages(searchResult) {
-  if (searchResult['cursor']) {
-    addMoreToThingList();
-    theSearchCursor = searchResult.cursor;
-  } else {
-    theSearchCursor = null;
-  }
-}
-
-/**
- * Adds a clickable "more" line to the things table UI
- */
-function addMoreToThingList() {
-  const moreCell = dom.thingsTableBody.insertRow().insertCell(-1);
-  moreCell.innerHTML = 'load more...';
-  moreCell.colSpan = dom.thingsTableBody.rows[0].childElementCount;
-  moreCell.style.textAlign = 'center';
-  moreCell.style.cursor = 'pointer';
-  moreCell.disabled = true;
-  moreCell.style.color = '#3a8c9a';
-  moreCell.parentNode.id = 'searchThingsMore';
-}
-
-/**
- * remove the "more" line from the things table
- */
-function removeMoreFromThingList() {
-  const moreRow = document.getElementById('searchThingsMore');
-  if (moreRow) {
-    moreRow.parentNode.removeChild(moreRow);
-  }
-}
-
-function togglePinnedThing(evt) {
-  if (evt.target.checked) {
-    Environments.current().pinnedThings.push(this.id);
-  } else {
-    const index = Environments.current().pinnedThings.indexOf(this.id);
-    if (index > -1) {
-      Environments.current().pinnedThings.splice(index, 1);
-    }
-  }
-  Environments.environmentsJsonChanged('pinnedThings');
 }
 
 let viewDirty = false;
@@ -404,7 +92,7 @@ function onEnvironmentChanged(modifiedField) {
 }
 
 function refreshView() {
-  SearchFilter.performLastSearch();
+  ThingsSearch.performLastSearch();
 }
 
 
diff --git a/ui/modules/things/thingsCRUD.js b/ui/modules/things/thingsCRUD.js
new file mode 100644
index 00000000000..faa55f821af
--- /dev/null
+++ b/ui/modules/things/thingsCRUD.js
@@ -0,0 +1,168 @@
+/*
+* Copyright (c) 2022 Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Eclipse Public License 2.0 which is available at
+* http://www.eclipse.org/legal/epl-2.0
+*
+* SPDX-License-Identifier: EPL-2.0
+*/
+/* eslint-disable require-jsdoc */
+// @ts-check
+import * as API from '../api.js';
+
+import * as Utils from '../utils.js';
+import * as ThingsSearch from './thingsSearch.js';
+import * as Things from './things.js';
+
+let thingJsonEditor;
+
+let thingTemplates;
+
+const dom = {
+  thingDetails: null,
+  thingId: null,
+  buttonCreateThing: null,
+  buttonSaveThing: null,
+  buttonDeleteThing: null,
+  inputThingDefinition: null,
+  ulThingDefinitions: null,
+};
+
+/**
+ * Initializes components. Should be called after DOMContentLoaded event
+ */
+export async function ready() {
+  Things.addChangeListener(onThingChanged);
+
+  Utils.getAllElementsById(dom);
+
+  thingJsonEditor = Utils.createAceEditor('thingJsonEditor', 'ace/mode/json');
+
+  loadThingTemplates();
+
+  dom.ulThingDefinitions.addEventListener('click', onThingDefinitionsClick);
+  dom.buttonCreateThing.onclick = onCreateThingClick;
+  dom.buttonSaveThing.onclick = onSaveThingClick;
+  dom.buttonDeleteThing.onclick = onDeleteThingClick;
+
+  document.querySelector('a[data-bs-target="#tabModifyThing"]').addEventListener('shown.bs.tab', (event) => {
+    thingJsonEditor.renderer.updateFull();
+  });
+}
+
+function onDeleteThingClick() {
+  return () => {
+    Utils.assert(dom.thingId.value, 'Thing ID is empty', dom.thingId);
+    Utils.confirm(`Are you sure you want to delete thing<br>'${dom.thingId.value}'?`, 'Delete', () => {
+      deleteThing(dom.thingId.value);
+    });
+  };
+}
+
+function onSaveThingClick() {
+  Utils.assert(dom.thingId.value, 'Thing ID is empty', dom.thingId);
+  putThing(dom.thingId.value, JSON.parse(thingJsonEditor.getValue()));
+}
+
+async function onCreateThingClick() {
+  const editorValue = thingJsonEditor.getValue();
+  if (dom.thingId.value !== undefined && dom.thingId.value !== '') {
+    API.callDittoREST('PUT',
+        '/things/' + dom.thingId.value,
+        editorValue === '' ? {} : JSON.parse(editorValue),
+        {
+          'if-none-match': '*',
+        },
+    ).then((data) => {
+      Things.refreshThing(data.thingId, () => {
+        ThingsSearch.getThings([data.thingId]);
+      });
+    });
+  } else {
+    API.callDittoREST('POST', '/things', editorValue === '' ? {} : JSON.parse(editorValue))
+        .then((data) => {
+          Things.refreshThing(data.thingId, () => {
+            ThingsSearch.getThings([data.thingId]);
+          });
+        });
+  }
+}
+
+function onThingDefinitionsClick(event) {
+  Things.setTheThing(null);
+  dom.inputThingDefinition.value = event.target.textContent;
+  thingJsonEditor.setValue(JSON.stringify(thingTemplates[event.target.textContent], null, 2), -1);
+}
+
+function loadThingTemplates() {
+  fetch('templates/thingTemplates.json')
+      .then((response) => {
+        response.json().then((loadedTemplates) => {
+          thingTemplates = loadedTemplates;
+          Utils.addDropDownEntries(dom.ulThingDefinitions, Object.keys(thingTemplates));
+        });
+      });
+}
+
+function putThing(thingId, thingJson) {
+  API.callDittoREST('PUT', `/things/${thingId}`, thingJson,
+      {
+        'if-match': '*',
+      },
+  ).then(() => {
+    Things.refreshThing(thingId, null);
+  });
+}
+
+function deleteThing(thingId) {
+  API.callDittoREST('DELETE', `/things/${thingId}`, null,
+      {
+        'if-match': '*',
+      },
+  ).then(() => {
+    ThingsSearch.performLastSearch();
+  });
+}
+
+/**
+ * Update UI components for the given Thing
+ * @param {Object} thingJson Thing json
+ */
+function onThingChanged(thingJson) {
+  updateThingDetailsTable();
+  updateThingJsonEditor();
+
+  function updateThingDetailsTable() {
+    dom.thingDetails.innerHTML = '';
+    if (thingJson) {
+      Utils.addTableRow(dom.thingDetails, 'thingId', false, true, thingJson.thingId);
+      Utils.addTableRow(dom.thingDetails, 'policyId', false, true, thingJson.policyId);
+      Utils.addTableRow(dom.thingDetails, 'definition', false, true, thingJson.definition ?? '');
+      Utils.addTableRow(dom.thingDetails, 'revision', false, true, thingJson._revision);
+      Utils.addTableRow(dom.thingDetails, 'created', false, true, thingJson._created);
+      Utils.addTableRow(dom.thingDetails, 'modified', false, true, thingJson._modified);
+    }
+  }
+
+  function updateThingJsonEditor() {
+    if (thingJson) {
+      dom.thingId.value = thingJson.thingId;
+      dom.inputThingDefinition.value = thingJson.definition ?? '';
+      const thingCopy = JSON.parse(JSON.stringify(thingJson));
+      delete thingCopy['_revision'];
+      delete thingCopy['_created'];
+      delete thingCopy['_modified'];
+      thingJsonEditor.setValue(JSON.stringify(thingCopy, null, 2), -1);
+    } else {
+      dom.thingId.value = null;
+      dom.inputThingDefinition.value = null;
+      thingJsonEditor.setValue('');
+    }
+  }
+}
+
+
diff --git a/ui/modules/things/thingsSearch.js b/ui/modules/things/thingsSearch.js
new file mode 100644
index 00000000000..f8a9bce4a76
--- /dev/null
+++ b/ui/modules/things/thingsSearch.js
@@ -0,0 +1,260 @@
+/*
+* Copyright (c) 2022 Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Eclipse Public License 2.0 which is available at
+* http://www.eclipse.org/legal/epl-2.0
+*
+* SPDX-License-Identifier: EPL-2.0
+*/
+
+/* eslint-disable require-jsdoc */
+/* eslint-disable new-cap */
+/* eslint-disable no-invalid-this */
+
+// @ts-check
+
+// @ts-ignore
+import {JSONPath} from 'https://cdn.jsdelivr.net/npm/jsonpath-plus@5.0.3/dist/index-browser-esm.min.js';
+
+import * as API from '../api.js';
+
+import * as Utils from '../utils.js';
+import * as Fields from './fields.js';
+import * as Things from './things.js';
+import * as Environments from '../environments/environments.js';
+
+let lastSearch = '';
+let theSearchCursor;
+
+const dom = {
+  thingsTableHead: null,
+  thingsTableBody: null,
+  searchFilterEdit: null,
+  favIcon: null,
+};
+
+export async function ready() {
+  Things.addChangeListener(onThingChanged);
+
+  Utils.getAllElementsById(dom);
+
+  dom.thingsTableBody.addEventListener('click', onThingsTableClicked);
+}
+
+function onThingsTableClicked(event) {
+  if (event.target && event.target.nodeName === 'TD') {
+    const row = event.target.parentNode;
+    if (row.id === 'searchThingsMore') {
+      row.style.pointerEvents = 'none';
+      event.stopImmediatePropagation();
+      searchThings(dom.searchFilterEdit.value, true);
+    } else {
+      if (Things.theThing && Things.theThing.thingId === row.id) {
+        Things.setTheThing(null);
+      } else {
+        Things.refreshThing(row.id, null);
+      }
+    }
+  }
+}
+
+/**
+ * Tests if the search filter is an RQL. If yes, things search is called otherwise just things get
+ * @param {String} filter search filter string containing an RQL or a thingId
+ */
+export function searchTriggered(filter) {
+  lastSearch = filter;
+  const regex = /^(eq\(|ne\(|gt\(|ge\(|lt\(|le\(|in\(|like\(|exists\(|and\(|or\(|not\().*/;
+  if (filter === '' || regex.test(filter)) {
+    searchThings(filter);
+  } else {
+    getThings([filter]);
+  }
+}
+
+/**
+ * Gets the list of pinned things
+ */
+export function pinnedTriggered() {
+  lastSearch = 'pinned';
+  dom.searchFilterEdit.value = null;
+  dom.favIcon.classList.replace('bi-star-fill', 'bi-star');
+  getThings(Environments.current()['pinnedThings']);
+}
+
+/**
+ * Performs the last search by the user using the last used filter.
+ * If the user used pinned things last time, the pinned things are reloaded
+ */
+export function performLastSearch() {
+  if (lastSearch === 'pinned') {
+    pinnedTriggered();
+  } else {
+    searchTriggered(lastSearch);
+  }
+}
+
+/**
+ * Gets things from Ditto by thingIds and fills the UI with the result
+ * @param {Array} thingIds Array of thingIds
+ */
+export function getThings(thingIds) {
+  dom.thingsTableBody.innerHTML = '';
+  if (thingIds.length > 0) {
+    API.callDittoREST('GET',
+        `/things?${Fields.getQueryParameter()}&ids=${thingIds}&option=sort(%2BthingId)`,
+    ).then(fillThingsTable);
+  }
+}
+
+/**
+ * Calls Ditto search api and fills UI with the result
+ * @param {String} filter Ditto search filter (rql)
+ * @param {boolean} isMore (optional) use cursor from previous search for additional pages
+ */
+export function searchThings(filter, isMore = false) {
+  document.body.style.cursor = 'progress';
+
+  const namespaces = Environments.current().searchNamespaces;
+
+  API.callDittoREST('GET',
+      '/search/things?' + Fields.getQueryParameter() +
+      ((filter && filter !== '') ? '&filter=' + encodeURIComponent(filter) : '') +
+      ((namespaces && namespaces !== '') ? '&namespaces=' + namespaces : '') +
+      '&option=sort(%2BthingId)' +
+      // ',size(3)' +
+      (isMore ? ',cursor(' + theSearchCursor + ')' : ''),
+  ).then((searchResult) => {
+    if (isMore) {
+      removeMoreFromThingList();
+    } else {
+      theSearchCursor = null;
+      dom.thingsTableBody.innerHTML = '';
+    }
+    fillThingsTable(searchResult.items);
+    checkMorePages(searchResult);
+  }).catch((error) => {
+    theSearchCursor = null;
+    dom.thingsTableBody.innerHTML = '';
+  }).finally(() => {
+    document.body.style.cursor = 'default';
+  });
+
+  function checkMorePages(searchResult) {
+    if (searchResult['cursor']) {
+      addMoreToThingList();
+      theSearchCursor = searchResult.cursor;
+    } else {
+      theSearchCursor = null;
+    }
+  }
+
+  function addMoreToThingList() {
+    const moreCell = dom.thingsTableBody.insertRow().insertCell(-1);
+    moreCell.innerHTML = 'load more...';
+    moreCell.colSpan = dom.thingsTableBody.rows[0].childElementCount;
+    moreCell.style.textAlign = 'center';
+    moreCell.style.cursor = 'pointer';
+    moreCell.disabled = true;
+    moreCell.style.color = '#3a8c9a';
+    moreCell.parentNode.id = 'searchThingsMore';
+  }
+}
+
+/**
+ * remove the "more" line from the things table
+ */
+export function removeMoreFromThingList() {
+  const moreRow = document.getElementById('searchThingsMore');
+  if (moreRow) {
+    moreRow.parentNode.removeChild(moreRow);
+  }
+}
+
+
+/**
+ * Fills the things table UI with the given things
+ * @param {Array} thingsList Array of thing json objects
+ */
+function fillThingsTable(thingsList) {
+  const activeFields = Environments.current().fieldList.filter((f) => f.active);
+  fillHeaderRow();
+  let thingSelected = false;
+  thingsList.forEach((item, t) => {
+    const row = dom.thingsTableBody.insertRow();
+    fillBodyRow(row, item);
+  });
+  if (!thingSelected) {
+    Things.setTheThing(null);
+  }
+
+  function fillHeaderRow() {
+    dom.thingsTableHead.innerHTML = '';
+    // Utils.addCheckboxToRow(dom.thingsTableHead, 'checkboxHead', false, null);
+    Utils.insertHeaderCell(dom.thingsTableHead, '');
+    Utils.insertHeaderCell(dom.thingsTableHead, 'Thing ID');
+    activeFields.forEach((field) => {
+      Utils.insertHeaderCell(dom.thingsTableHead, field['label'] ? field.label : field.path);
+    });
+  }
+
+  function fillBodyRow(row, item) {
+    row.id = item.thingId;
+    if (Things.theThing && (item.thingId === Things.theThing.thingId)) {
+      thingSelected = true;
+      row.classList.add('table-active');
+    }
+    Utils.addCheckboxToRow(
+        row,
+        item.thingId,
+        Environments.current().pinnedThings.includes(item.thingId),
+        togglePinnedThing,
+    );
+    Utils.addCellToRow(row, beautifyId(item.thingId), item.thingId);
+    activeFields.forEach((field) => {
+      let path = field.path.replace(/\//g, '.');
+      if (path.charAt(0) !== '.') {
+        path = '$.' + path;
+      }
+      const elem = JSONPath({
+        json: item,
+        path: path,
+      });
+      Utils.addCellToRow(row, elem.length !== 0 ? elem[0] : '');
+    });
+  }
+
+  function beautifyId(longId) {
+    const uuidRegex = /([0-9a-f]{7})[0-9a-f]-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/g;
+    let result = longId;
+    if (Environments.current()['shortenUUID']) {
+      result = result.replace(uuidRegex, '$1');
+    }
+    if (Environments.current()['defaultNamespace']) {
+      result = result.replace(Environments.current()['defaultNamespace'], 'dn');
+    }
+    return result;
+  }
+}
+
+function togglePinnedThing(evt) {
+  if (evt.target.checked) {
+    Environments.current().pinnedThings.push(this.id);
+  } else {
+    const index = Environments.current().pinnedThings.indexOf(this.id);
+    if (index > -1) {
+      Environments.current().pinnedThings.splice(index, 1);
+    }
+  }
+  Environments.environmentsJsonChanged('pinnedThings');
+}
+
+function onThingChanged(thingJson) {
+  if (!thingJson) {
+    Utils.tableAdjustSelection(dom.thingsTableBody, () => false);
+  }
+}

From 4d09b9013338db1b777f08bc3f6b5473ad48f4fe Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Mon, 7 Nov 2022 06:23:56 +0100
Subject: [PATCH 002/173] Add SSE support to Explorer UI

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/index.html               |  6 ++++++
 ui/modules/api.js           | 10 ++++++++++
 ui/modules/things/things.js | 21 +++++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/ui/index.html b/ui/index.html
index 4778015816b..a0ac85ed67c 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -32,6 +32,12 @@
     <link rel="icon" type="image/png"
         href="https://raw.githubusercontent.com/eclipse/ditto/master/documentation/src/main/resources/images/favicon-96x96.png"
         sizes="96x96">
+    <script src="https://cdn.jsdelivr.net/npm/event-source-polyfill@1.0.31/src/eventsource.min.js"
+        integrity="sha256-JBw2DF7FFaUo0jG/NptzuAmOVSFJz+Z86wxbKIHK4yc="
+        crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js"
+        integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k="
+        crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"
         integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p"
         crossorigin="anonymous"></script>
diff --git a/ui/modules/api.js b/ui/modules/api.js
index 67a89c7663f..83044077291 100644
--- a/ui/modules/api.js
+++ b/ui/modules/api.js
@@ -333,6 +333,16 @@ export async function callDittoREST(method, path, body, additionalHeaders) {
   }
 }
 
+export function getEventSource(thingId) {
+  return new EventSourcePolyfill(
+      Environments.current().api_uri + '/api/2/things?ids=' + thingId, {
+        headers: {
+          [authHeaderKey]: authHeaderValue,
+        },
+      },
+  );
+}
+
 /**
  * Calls connections api. Uses devops api in case of Ditto and the solutions api in case of Things
  * @param {*} operation connections api operation
diff --git a/ui/modules/things/things.js b/ui/modules/things/things.js
index e8fff1e728c..e099fe1cd04 100644
--- a/ui/modules/things/things.js
+++ b/ui/modules/things/things.js
@@ -20,6 +20,8 @@ import * as ThingsSearch from './thingsSearch.js';
 
 export let theThing;
 
+let thingEventSource;
+
 const observers = [];
 
 const dom = {
@@ -67,10 +69,29 @@ export function refreshThing(thingId, successCallback) {
  * @param {Object} thingJson Thing json
  */
 export function setTheThing(thingJson) {
+  adjustEventSource(thingJson);
   theThing = thingJson;
   observers.forEach((observer) => observer.call(null, theThing));
 }
 
+function adjustEventSource(newThingJson) {
+  if (!newThingJson) {
+    thingEventSource && thingEventSource.close();
+  } else {
+    if (!theThing || theThing.thingId !== newThingJson.thingId) {
+      console.log('Start SSE: ' + newThingJson.thingId);
+      thingEventSource = API.getEventSource(newThingJson.thingId);
+      thingEventSource.onmessage = (event) => {
+        console.log(event);
+        if (event.data && event.data !== '') {
+          const merged = _.merge(theThing, JSON.parse(event.data));
+          setTheThing(merged);
+        }
+      };
+    }
+  }
+}
+
 let viewDirty = false;
 
 function onTabActivated() {

From 7f7c44e4ab6d1b3575e38c3a1271463dd82ab846 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Mon, 19 Dec 2022 07:48:58 +0100
Subject: [PATCH 003/173] SSE for explorer UI next step - Explicit editing for
 thing CRUD - Split of thing.js file

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/index.css                      | 19 +++++++
 ui/index.html                     |  1 +
 ui/main.js                        |  2 +
 ui/modules/api.js                 |  4 +-
 ui/modules/things/things.html     | 23 +++++---
 ui/modules/things/things.js       | 26 +--------
 ui/modules/things/thingsCRUD.js   | 92 ++++++++++++++++++++++---------
 ui/modules/things/thingsSSE.js    | 48 ++++++++++++++++
 ui/modules/things/thingsSearch.js |  1 +
 9 files changed, 155 insertions(+), 61 deletions(-)
 create mode 100644 ui/modules/things/thingsSSE.js

diff --git a/ui/index.css b/ui/index.css
index 21689489a4e..42d6adc8627 100644
--- a/ui/index.css
+++ b/ui/index.css
@@ -151,3 +151,22 @@ h5, h6 {
 hr {
     margin: 0.25rem;
 }
+
+.editBackground {
+    display: block;
+    position: fixed;
+    z-index: 1100;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    background-color: rgb(0,0,0);
+    background-color: rgba(0,0,0,0.4);
+  }
+
+  .editForground {
+      z-index: 1200;
+      position: relative;
+      background-color: white;
+  }
diff --git a/ui/index.html b/ui/index.html
index a0ac85ed67c..cc3d1f59465 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -128,6 +128,7 @@
             </div>
         </div>
     </div>
+    <div id="modalThingsEdit"></div>
 
 </body>
 
diff --git a/ui/main.js b/ui/main.js
index 25855cec186..cddd2a77f83 100644
--- a/ui/main.js
+++ b/ui/main.js
@@ -22,6 +22,7 @@ import * as SearchFilter from './modules/things/searchFilter.js';
 import * as Things from './modules/things/things.js';
 import * as ThingsSearch from './modules/things/thingsSearch.js';
 import * as ThingsCRUD from './modules/things/thingsCRUD.js';
+import * as ThingsSSE from './modules/things/thingsSSE.js';
 import * as Connections from './modules/connections/connections.js';
 import * as Policies from './modules/policies/policies.js';
 import * as API from './modules/api.js';
@@ -48,6 +49,7 @@ document.addEventListener('DOMContentLoaded', async function() {
   await Things.ready();
   ThingsSearch.ready();
   ThingsCRUD.ready();
+  ThingsSSE.ready();
   Attributes.ready();
   await Fields.ready();
   await SearchFilter.ready();
diff --git a/ui/modules/api.js b/ui/modules/api.js
index 83044077291..a512d2c746e 100644
--- a/ui/modules/api.js
+++ b/ui/modules/api.js
@@ -333,9 +333,9 @@ export async function callDittoREST(method, path, body, additionalHeaders) {
   }
 }
 
-export function getEventSource(thingId) {
+export function getEventSource(thingId, urlParams) {
   return new EventSourcePolyfill(
-      Environments.current().api_uri + '/api/2/things?ids=' + thingId, {
+      `${Environments.current().api_uri}/api/2/things?ids=${thingId}${urlParams ?? ''}`, {
         headers: {
           [authHeaderKey]: authHeaderValue,
         },
diff --git a/ui/modules/things/things.html b/ui/modules/things/things.html
index c1cca4278fc..67a85438ee4 100644
--- a/ui/modules/things/things.html
+++ b/ui/modules/things/things.html
@@ -59,7 +59,8 @@ <h5>Things</h5>
                             Details</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" data-bs-toggle="tab" data-bs-target="#tabModifyThing">CRUD Thing</a>
+                            <a class="nav-link" data-bs-toggle="tab" data-bs-target="#tabModifyThing">
+                                CRUD Thing<span class="badge badge-warn" id="thingsCrudWaring">!</span></a>
                         </li>
                     </ul>
                     <div id="tabContentThing" class="tab-content" style="flex-grow:1; overflow:hidden;">
@@ -71,18 +72,22 @@ <h5>Things</h5>
                             </div>
                     </div>
                     <div class="tab-pane fade container no-margin" style="height:100%;" id="tabModifyThing">
-                        <div class="resizable_flex_column">
+                        <div id="divThingsCRUD" class="resizable_flex_column px-1">
                             <div class="input-group input-group-sm mb-1 mt-1 has-validation">
                                 <label class="input-group-text">Thing ID</label>
-                                <input type="text" class="form-control" id="thingId">
-                                <button class="btn btn-outline-secondary btn-sm" id="buttonCreateThing"
+                                <input type="text" class="form-control" disabled id="thingId">
+                                <button class="btn btn-secondary btn-sm" id="buttonEditThing"
+                                    data-bs-toggle="tooltip" title="Enable fields for editing">
+                                    <i id="iThingsEdit" class="bi bi-pencil-square"></i>
+                                </button>
+                                <button class="btn btn-secondary btn-sm" disabled id="buttonCreateThing"
                                     data-bs-toggle="tooltip" title="Create an empty thing with a default policy">
                                     <i class="bi bi-plus-circle"></i>
                                 </button>
-                                <button class="btn btn-outline-secondary btn-sm" id="buttonSaveThing">
+                                <button class="btn btn-secondary btn-sm" disabled id="buttonSaveThing">
                                     <i class="bi bi-save"></i>
                                 </button>
-                                <button class="btn btn-outline-secondary btn-sm" id="buttonDeleteThing">
+                                <button class="btn btn-secondary btn-sm" disabled id="buttonDeleteThing">
                                     <i class="bi bi-trash3"></i>
                                 </button>
                                 <div class="invalid-feedback"></div>
@@ -91,12 +96,12 @@ <h5>Things</h5>
                                 <label class="input-group-text">Definition</label>
                                 <div class="btn-group dropend">
                                     <button class="btn btn-outline-secondary btn-sm dropdown-toggle"
-                                    data-bs-toggle="dropdown"></button>
+                                    data-bs-toggle="dropdown" disabled id="buttonThingDefinitions"></button>
                                     <ul id="ulThingDefinitions" class="dropdown-menu" style="position: fixed; top: auto;"></ul>                                    
                                 </div>
-                                <input type="text" class="form-control" id="inputThingDefinition"></input>
+                                <input type="text" class="form-control" id="inputThingDefinition" disabled></input>
                             </div>
-                            <div class="ace_container" style="flex-grow: 1;">
+                            <div class="ace_container mb-1" style="flex-grow: 1;">
                                 <div class="script_editor" id="thingJsonEditor"></div>
                             </div>
                         </div>
diff --git a/ui/modules/things/things.js b/ui/modules/things/things.js
index e099fe1cd04..2c0aaa2a487 100644
--- a/ui/modules/things/things.js
+++ b/ui/modules/things/things.js
@@ -20,8 +20,6 @@ import * as ThingsSearch from './thingsSearch.js';
 
 export let theThing;
 
-let thingEventSource;
-
 const observers = [];
 
 const dom = {
@@ -54,6 +52,7 @@ export async function ready() {
  * @param {function} successCallback callback function that is called after refresh is finished
  */
 export function refreshThing(thingId, successCallback) {
+  console.assert(thingId && thingId !== '', 'thingId expected');
   API.callDittoREST('GET',
       `/things/${thingId}?` +
       'fields=thingId%2CpolicyId%2Cdefinition%2Cattributes%2Cfeatures%2C_created%2C_modified%2C_revision')
@@ -69,27 +68,9 @@ export function refreshThing(thingId, successCallback) {
  * @param {Object} thingJson Thing json
  */
 export function setTheThing(thingJson) {
-  adjustEventSource(thingJson);
+  const isNewThingId = thingJson && (!theThing || theThing.thingId !== thingJson.thingId);
   theThing = thingJson;
-  observers.forEach((observer) => observer.call(null, theThing));
-}
-
-function adjustEventSource(newThingJson) {
-  if (!newThingJson) {
-    thingEventSource && thingEventSource.close();
-  } else {
-    if (!theThing || theThing.thingId !== newThingJson.thingId) {
-      console.log('Start SSE: ' + newThingJson.thingId);
-      thingEventSource = API.getEventSource(newThingJson.thingId);
-      thingEventSource.onmessage = (event) => {
-        console.log(event);
-        if (event.data && event.data !== '') {
-          const merged = _.merge(theThing, JSON.parse(event.data));
-          setTheThing(merged);
-        }
-      };
-    }
-  }
+  observers.forEach((observer) => observer.call(null, theThing, isNewThingId));
 }
 
 let viewDirty = false;
@@ -116,4 +97,3 @@ function refreshView() {
   ThingsSearch.performLastSearch();
 }
 
-
diff --git a/ui/modules/things/thingsCRUD.js b/ui/modules/things/thingsCRUD.js
index faa55f821af..90e613ef323 100644
--- a/ui/modules/things/thingsCRUD.js
+++ b/ui/modules/things/thingsCRUD.js
@@ -20,14 +20,21 @@ import * as Things from './things.js';
 
 let thingJsonEditor;
 
+let isEditing = false;
+
 let thingTemplates;
 
 const dom = {
   thingDetails: null,
   thingId: null,
+  modalThingsEdit: null,
+  iThingsEdit: null,
+  divThingsCRUD: null,
+  buttonEditThing: null,
   buttonCreateThing: null,
   buttonSaveThing: null,
   buttonDeleteThing: null,
+  buttonThingDefinitions: null,
   inputThingDefinition: null,
   ulThingDefinitions: null,
 };
@@ -40,7 +47,7 @@ export async function ready() {
 
   Utils.getAllElementsById(dom);
 
-  thingJsonEditor = Utils.createAceEditor('thingJsonEditor', 'ace/mode/json');
+  thingJsonEditor = Utils.createAceEditor('thingJsonEditor', 'ace/mode/json', true);
 
   loadThingTemplates();
 
@@ -48,6 +55,7 @@ export async function ready() {
   dom.buttonCreateThing.onclick = onCreateThingClick;
   dom.buttonSaveThing.onclick = onSaveThingClick;
   dom.buttonDeleteThing.onclick = onDeleteThingClick;
+  dom.buttonEditThing.onclick = toggleEdit;
 
   document.querySelector('a[data-bs-target="#tabModifyThing"]').addEventListener('shown.bs.tab', (event) => {
     thingJsonEditor.renderer.updateFull();
@@ -55,17 +63,28 @@ export async function ready() {
 }
 
 function onDeleteThingClick() {
-  return () => {
-    Utils.assert(dom.thingId.value, 'Thing ID is empty', dom.thingId);
-    Utils.confirm(`Are you sure you want to delete thing<br>'${dom.thingId.value}'?`, 'Delete', () => {
-      deleteThing(dom.thingId.value);
+  Utils.assert(dom.thingId.value, 'Thing ID is empty', dom.thingId);
+  Utils.confirm(`Are you sure you want to delete thing<br>'${dom.thingId.value}'?`, 'Delete', () => {
+    API.callDittoREST('DELETE', `/things/${dom.thingId.value}`, null,
+        {
+          'if-match': '*',
+        },
+    ).then(() => {
+      ThingsSearch.performLastSearch();
     });
-  };
+  });
 }
 
 function onSaveThingClick() {
   Utils.assert(dom.thingId.value, 'Thing ID is empty', dom.thingId);
-  putThing(dom.thingId.value, JSON.parse(thingJsonEditor.getValue()));
+  API.callDittoREST('PUT', `/things/${dom.thingId.value}`, JSON.parse(thingJsonEditor.getValue()),
+      {
+        'if-match': '*',
+      },
+  ).then(() => {
+    toggleEdit();
+    Things.refreshThing(dom.thingId.value, null);
+  });
 }
 
 async function onCreateThingClick() {
@@ -78,6 +97,7 @@ async function onCreateThingClick() {
           'if-none-match': '*',
         },
     ).then((data) => {
+      toggleEdit();
       Things.refreshThing(data.thingId, () => {
         ThingsSearch.getThings([data.thingId]);
       });
@@ -85,6 +105,7 @@ async function onCreateThingClick() {
   } else {
     API.callDittoREST('POST', '/things', editorValue === '' ? {} : JSON.parse(editorValue))
         .then((data) => {
+          toggleEdit();
           Things.refreshThing(data.thingId, () => {
             ThingsSearch.getThings([data.thingId]);
           });
@@ -94,6 +115,7 @@ async function onCreateThingClick() {
 
 function onThingDefinitionsClick(event) {
   Things.setTheThing(null);
+  isEditing = true;
   dom.inputThingDefinition.value = event.target.textContent;
   thingJsonEditor.setValue(JSON.stringify(thingTemplates[event.target.textContent], null, 2), -1);
 }
@@ -108,31 +130,15 @@ function loadThingTemplates() {
       });
 }
 
-function putThing(thingId, thingJson) {
-  API.callDittoREST('PUT', `/things/${thingId}`, thingJson,
-      {
-        'if-match': '*',
-      },
-  ).then(() => {
-    Things.refreshThing(thingId, null);
-  });
-}
-
-function deleteThing(thingId) {
-  API.callDittoREST('DELETE', `/things/${thingId}`, null,
-      {
-        'if-match': '*',
-      },
-  ).then(() => {
-    ThingsSearch.performLastSearch();
-  });
-}
-
 /**
  * Update UI components for the given Thing
  * @param {Object} thingJson Thing json
  */
 function onThingChanged(thingJson) {
+  if (isEditing) {
+    return;
+  }
+
   updateThingDetailsTable();
   updateThingJsonEditor();
 
@@ -151,6 +157,7 @@ function onThingChanged(thingJson) {
   function updateThingJsonEditor() {
     if (thingJson) {
       dom.thingId.value = thingJson.thingId;
+      dom.buttonDeleteThing.disabled = false;
       dom.inputThingDefinition.value = thingJson.definition ?? '';
       const thingCopy = JSON.parse(JSON.stringify(thingJson));
       delete thingCopy['_revision'];
@@ -159,6 +166,37 @@ function onThingChanged(thingJson) {
       thingJsonEditor.setValue(JSON.stringify(thingCopy, null, 2), -1);
     } else {
       dom.thingId.value = null;
+      dom.buttonDeleteThing.disabled = true;
+      dom.inputThingDefinition.value = null;
+      thingJsonEditor.setValue('');
+    }
+  }
+}
+
+function toggleEdit() {
+  isEditing = !isEditing;
+  dom.modalThingsEdit.classList.toggle('editBackground');
+  dom.divThingsCRUD.classList.toggle('editForground');
+  dom.iThingsEdit.classList.toggle('bi-pencil-square');
+  dom.iThingsEdit.classList.toggle('bi-x-square');
+  dom.buttonThingDefinitions.disabled = !dom.buttonThingDefinitions.disabled;
+  dom.inputThingDefinition.disabled = !dom.inputThingDefinition.disabled;
+  thingJsonEditor.setReadOnly(!isEditing);
+  thingJsonEditor.renderer.setShowGutter(isEditing);
+  if (dom.thingId.value) {
+    dom.buttonSaveThing.disabled = !dom.buttonSaveThing.disabled;
+  } else {
+    dom.buttonCreateThing.disabled = !dom.buttonCreateThing.disabled;
+    dom.thingId.disabled = !dom.thingId.disabled;
+  }
+  if (!isEditing) {
+    clearEditorsAfterCancel();
+  }
+
+  function clearEditorsAfterCancel() {
+    if (dom.thingId.value && dom.thingId.value !== '') {
+      Things.refreshThing(dom.thingId.value, null);
+    } else {
       dom.inputThingDefinition.value = null;
       thingJsonEditor.setValue('');
     }
diff --git a/ui/modules/things/thingsSSE.js b/ui/modules/things/thingsSSE.js
new file mode 100644
index 00000000000..f87eb7a7039
--- /dev/null
+++ b/ui/modules/things/thingsSSE.js
@@ -0,0 +1,48 @@
+/*
+* Copyright (c) 2022 Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Eclipse Public License 2.0 which is available at
+* http://www.eclipse.org/legal/epl-2.0
+*
+* SPDX-License-Identifier: EPL-2.0
+*/
+/* eslint-disable require-jsdoc */
+// @ts-check
+import * as API from '../api.js';
+
+import * as Things from './things.js';
+
+let thingEventSource;
+
+
+/**
+ * Initializes components. Should be called after DOMContentLoaded event
+ */
+export async function ready() {
+  Things.addChangeListener(onThingChanged);
+}
+
+function onThingChanged(newThingJson, isNewThingId) {
+  if (!newThingJson) {
+    thingEventSource && thingEventSource.close();
+    thingEventSource = null;
+  } else if (isNewThingId) {
+    thingEventSource && thingEventSource.close();
+    console.log('Start SSE: ' + newThingJson.thingId);
+    thingEventSource = API.getEventSource(newThingJson.thingId, '&extraFields=_revision,_modified');
+    thingEventSource.onmessage = onMessage;
+  }
+}
+
+function onMessage(event) {
+  if (event.data && event.data !== '') {
+    console.log(event);
+    const merged = _.merge(Things.theThing, JSON.parse(event.data));
+    Things.setTheThing(merged);
+  }
+}
+
diff --git a/ui/modules/things/thingsSearch.js b/ui/modules/things/thingsSearch.js
index f8a9bce4a76..1eb7674bf6f 100644
--- a/ui/modules/things/thingsSearch.js
+++ b/ui/modules/things/thingsSearch.js
@@ -54,6 +54,7 @@ function onThingsTableClicked(event) {
       searchThings(dom.searchFilterEdit.value, true);
     } else {
       if (Things.theThing && Things.theThing.thingId === row.id) {
+        event.stopImmediatePropagation();
         Things.setTheThing(null);
       } else {
         Things.refreshThing(row.id, null);

From 0a6e4113278f7915d5b672912ff2e292463f3e87 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Mon, 19 Dec 2022 20:00:21 +0100
Subject: [PATCH 004/173] SSE for explorer UI: resolved error from merge

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/modules/things/searchFilter.js | 44 +++----------------------------
 1 file changed, 4 insertions(+), 40 deletions(-)

diff --git a/ui/modules/things/searchFilter.js b/ui/modules/things/searchFilter.js
index 55cd00d0eda..c0a97d54e6b 100644
--- a/ui/modules/things/searchFilter.js
+++ b/ui/modules/things/searchFilter.js
@@ -1,3 +1,4 @@
+/* eslint-disable require-jsdoc */
 /*
  * Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
@@ -30,8 +31,6 @@ const filterHistory = [];
 
 let keyStrokeTimeout;
 
-let lastSearch = '';
-
 const FILTER_PLACEHOLDER = '*****';
 
 const dom = {
@@ -61,12 +60,13 @@ export async function ready() {
       checkIfFavourite();
       const filterEditNeeded = checkAndMarkParameter();
       if (!filterEditNeeded) {
-        Things.searchThings(event.target.textContent);
+        ThingsSearch.searchThings(event.target.textContent);
       }
     }
   });
 
   dom.searchThings.onclick = () => {
+    fillHistory(dom.searchFilterEdit.value);
     ThingsSearch.searchTriggered(dom.searchFilterEdit.value);
   };
 
@@ -79,6 +79,7 @@ export async function ready() {
 
   dom.searchFilterEdit.onkeyup = (event) => {
     if (event.key === 'Enter' || event.code === 13) {
+      fillHistory(dom.searchFilterEdit.value);
       ThingsSearch.searchTriggered(dom.searchFilterEdit.value);
     } else {
       clearTimeout(keyStrokeTimeout);
@@ -110,43 +111,6 @@ function onEnvironmentChanged() {
   updateFilterList();
 }
 
-/**
- * Tests if the search filter is an RQL. If yes, things search is called otherwise just things get
- * @param {String} filter search filter string containing an RQL or a thingId
- */
-function searchTriggered(filter) {
-  lastSearch = filter;
-  fillHistory(filter);
-  const regex = /^(eq\(|ne\(|gt\(|ge\(|lt\(|le\(|in\(|like\(|exists\(|and\(|or\(|not\().*/;
-  if (filter === '' || regex.test(filter)) {
-    Things.searchThings(filter);
-  } else {
-    Things.getThings([filter]);
-  }
-}
-
-/**
- * Gets the list of pinned things
- */
-function pinnedTriggered() {
-  lastSearch = 'pinned';
-  dom.searchFilterEdit.value = null;
-  dom.favIcon.classList.replace('bi-star-fill', 'bi-star');
-  Things.getThings(Environments.current()['pinnedThings']);
-}
-
-/**
- * Performs the last search by the user using the last used filter.
- * If the user used pinned things last time, the pinned things are reloaded
- */
-export function performLastSearch() {
-  if (lastSearch === 'pinned') {
-    pinnedTriggered();
-  } else {
-    searchTriggered(lastSearch);
-  }
-}
-
 /**
  * Updates the UI filterList
  */

From 01c921eb719e4878bd301bca27473b3e46c58a54 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Mon, 26 Sep 2022 15:07:43 +0200
Subject: [PATCH 005/173] Enable "History API" support: * streaming of journal
 entries of a given entity (thing/policy) as DittoProtocol events (via
 Websocket/Connections/SSE) * accessing an entity (thing/policy/connection)
 "at" a specific revision or "at" a specific timestamp * added a configurable
 "history-retention-duration" config for things/policies/connections in order
 to delay the cleanup for at least that amount of time -> that way we can e.g.
 keep 30d of snapshots/events * made history API work via connectivity * added
 documentation for history capabilities

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../CleanupPersistenceResponseTest.java       |   3 +-
 .../cleanup/CleanupPersistenceTest.java       |   3 +-
 .../ditto/base/model/entity/id/EntityId.java  |   8 +-
 .../model/headers/DittoHeaderDefinition.java  |  40 +-
 .../base/model/signals/FeatureToggle.java     |  42 +++
 .../signals/WithStreamingSubscriptionId.java  |  50 +++
 .../base/model/signals/commands/Command.java  |   8 +-
 ...treamingSubscriptionNotFoundException.java | 110 ++++++
 ...ingSubscriptionProtocolErrorException.java | 121 ++++++
 ...StreamingSubscriptionTimeoutException.java | 110 ++++++
 .../AbstractStreamingSubscriptionCommand.java | 140 +++++++
 .../CancelStreamingSubscription.java          | 146 ++++++++
 .../RequestFromStreamingSubscription.java     | 188 ++++++++++
 .../StreamingSubscriptionCommand.java         |  73 ++++
 .../SubscribeForPersistedEvents.java          | 344 ++++++++++++++++++
 .../commands/streaming/package-info.java      |  15 +
 .../model/signals/events/AbstractEvent.java   |   1 +
 .../events/AbstractEventsourcedEvent.java     |   1 +
 .../signals/events/EventJsonDeserializer.java |   4 +-
 .../AbstractStreamingSubscriptionEvent.java   | 172 +++++++++
 .../StreamingSubscriptionComplete.java        | 106 ++++++
 .../StreamingSubscriptionCreated.java         | 108 ++++++
 .../streaming/StreamingSubscriptionEvent.java |  76 ++++
 .../StreamingSubscriptionFailed.java          | 166 +++++++++
 .../StreamingSubscriptionHasNext.java         | 165 +++++++++
 .../events/streaming/package-info.java        |  15 +
 .../headers/ImmutableDittoHeadersTest.java    |  19 +-
 .../signals/ShardedMessageEnvelopeTest.java   |   7 +-
 .../CancelStreamingSubscriptionTest.java      |  57 +++
 .../RequestFromStreamingSubscriptionTest.java |  56 +++
 .../SubscribeForPersistedEventsTest.java      | 136 +++++++
 .../StreamingSubscriptionCompleteTest.java    |  51 +++
 .../StreamingSubscriptionCreatedTest.java     |  51 +++
 .../StreamingSubscriptionFailedTest.java      |  58 +++
 .../StreamingSubscriptionHasNextTest.java     |  56 +++
 ...nnectionHistoryNotAccessibleException.java | 178 +++++++++
 .../service/ConnectivityRootActor.java        |   6 +-
 .../service/config/ConnectionConfig.java      |  12 +-
 .../config/DefaultConnectionConfig.java       |  13 +-
 .../service/messaging/BaseClientActor.java    |  56 ++-
 .../service/messaging/BasePublisherActor.java |  11 +-
 .../messaging/InboundDispatchingSink.java     |   6 +-
 .../messaging/OutboundDispatchingActor.java   |   2 +
 .../ConnectionPersistenceActor.java           |  46 ++-
 .../ConnectionSupervisorActor.java            |  17 +-
 .../ConnectivityMongoEventAdapter.java        |  30 +-
 .../src/main/resources/connectivity.conf      |  64 +++-
 ...ivityServiceGlobalCommandRegistryTest.java |   4 +-
 ...ctivityServiceGlobalEventRegistryTest.java |   4 +-
 .../service/messaging/TestConstants.java      |   4 +-
 .../ConnectionPersistenceActorTest.java       |  21 +-
 ...onnectionPersistenceOperationsActorIT.java |   5 +-
 .../_data/sidebars/ditto_sidebar.yml          |   7 +
 .../src/main/resources/_data/tags.yml         |   1 +
 ...streaming-subscription-failed-payload.json |  35 ++
 ...l-streaming-subscription-next-payload.json |  16 +
 ...treaming-subscription-request-payload.json |  17 +
 ...ubscribe-for-persisted-events-payload.json |  26 ++
 .../protocol-streaming-subscriptionid.json    |  13 +
 .../resources/pages/ditto/basic-history.md    | 178 +++++++++
 .../pages/ditto/installation-operating.md     |  85 ++++-
 ...ol-specification-streaming-subscription.md | 168 +++++++++
 .../pages/ditto/protocol-specification.md     |  35 +-
 .../main/resources/pages/tags/tag_history.md  |   9 +
 .../EdgeCommandForwarderActor.java            |  37 +-
 .../streaming/StreamingSubscriptionActor.java | 285 +++++++++++++++
 .../StreamingSubscriptionManager.java         | 205 +++++++++++
 .../routes/sse/ThingsSseRouteBuilder.java     | 131 +++++--
 .../actors/SessionedJsonifiable.java          |  16 +-
 .../streaming/actors/StreamingActor.java      |  11 +-
 .../actors/StreamingSessionActor.java         |  63 ++++
 .../service/src/main/resources/gateway.conf   |   4 +-
 ...tewayServiceGlobalCommandRegistryTest.java |   4 +-
 ...GatewayServiceGlobalEventRegistryTest.java |   4 +-
 ...mingSessionActorHeaderInteractionTest.java |   5 +-
 .../actors/StreamingSessionActorTest.java     |   1 +
 .../src/main/resources/ditto-devops.conf      |   4 +
 .../mongo/AbstractMongoEventAdapter.java      |  48 ++-
 .../mongo/config/DefaultEventConfig.java      |  84 +++++
 .../mongo/config/DefaultSnapshotConfig.java   |   2 +-
 .../persistence/mongo/config/EventConfig.java |  71 ++++
 .../mongo/streaming/MongoReadJournal.java     | 155 ++++++--
 .../mongo/streaming/SnapshotFilter.java       |  58 ++-
 .../mongo/config/DefaultEventConfigTest.java  |  75 ++++
 .../src/test/resources/event-test.conf        |   6 +
 .../resources/mongo-read-journal-test.conf    |  11 +
 .../persistence/src/test/resources/test.conf  |  11 +
 .../AbstractPersistenceActor.java             | 271 +++++++++++++-
 .../AbstractPersistenceSupervisor.java        |  99 ++++-
 .../persistentactors/cleanup/Cleanup.java     |  17 +-
 .../cleanup/CleanupConfig.java                |  18 +-
 .../cleanup/DefaultCleanupConfig.java         |  37 +-
 .../events/AbstractEventStrategies.java       |   4 +-
 .../events/EventStrategy.java                 |   4 +-
 .../persistentactors/cleanup/CleanupTest.java |  13 +-
 .../persistentactors/cleanup/CreditsTest.java |   5 +-
 .../ditto/policies/model/WithPolicyId.java    |  28 ++
 .../model/signals/commands/PolicyCommand.java |  12 +-
 .../commands/PolicyCommandResponse.java       |   9 +-
 .../PolicyHistoryNotAccessibleException.java  | 177 +++++++++
 .../signals/events/AbstractPolicyEvent.java   |   7 +-
 .../model/signals/events/PolicyEvent.java     |  10 +-
 .../events/SubjectsDeletedPartially.java      |  10 +-
 .../events/SubjectsModifiedPartially.java     |  10 +-
 .../common/config/DefaultPolicyConfig.java    |  17 +-
 .../service/common/config/PolicyConfig.java   |   8 +
 .../enforcement/PolicyCommandEnforcement.java |  83 +++--
 .../actors/PolicyEnforcerActor.java           |   2 +-
 .../actors/PolicyPersistenceActor.java        |  28 +-
 .../actors/PolicySupervisorActor.java         |  17 +-
 .../events/PolicyEventStrategies.java         |   2 +-
 .../AbstractPolicyMongoEventAdapter.java      |  19 +-
 .../DefaultPolicyMongoEventAdapter.java       |   4 +-
 .../service/starter/PoliciesRootActor.java    |  10 +-
 .../service/src/main/resources/policies.conf  |  57 +++
 .../PolicyCommandEnforcementTest.java         |   3 +-
 ...olicyPersistenceActorSnapshottingTest.java |   4 +-
 .../actors/PolicyPersistenceActorTest.java    |  10 +-
 .../PolicyPersistenceOperationsActorIT.java   |   6 +-
 .../actors/PolicySupervisorActorTest.java     |  11 +-
 ...iciesServiceGlobalCommandRegistryTest.java |   4 +-
 ...oliciesServiceGlobalEventRegistryTest.java |   4 +-
 .../ditto/protocol/ImmutablePayload.java      |   8 +-
 .../ditto/protocol/ImmutableTopicPath.java    |  87 ++++-
 .../ditto/protocol/ProtocolFactory.java       |  34 ++
 .../protocol/StreamingTopicPathBuilder.java   |  78 ++++
 .../org/eclipse/ditto/protocol/TopicPath.java | 100 ++++-
 .../ditto/protocol/TopicPathBuilder.java      |   9 +
 .../AbstractStreamingMessageAdapter.java      |  69 ++++
 .../ditto/protocol/adapter/Adapter.java       |  11 +
 .../adapter/AdapterResolverBySignal.java      |  24 +-
 .../adapter/DefaultAdapterResolver.java       |  10 +-
 .../adapter/DittoProtocolAdapter.java         |  20 +-
 .../protocol/adapter/ProtocolAdapter.java     |  10 +-
 .../StreamingSubscriptionCommandAdapter.java  |  78 ++++
 .../StreamingSubscriptionEventAdapter.java    |  88 +++++
 .../adapter/connectivity/package-info.java    |  14 +
 .../DefaultPolicyCommandAdapterProvider.java  |  11 +-
 .../adapter/policies/PolicyEventAdapter.java  |  63 ++++
 .../PolicyCommandAdapterProvider.java         |   4 +-
 .../mapper/AbstractCommandSignalMapper.java   |   4 +-
 .../mapper/PolicyEventSignalMapper.java       |  92 +++++
 .../protocol/mapper/SignalMapperFactory.java  |  15 +
 ...eamingSubscriptionCommandSignalMapper.java | 137 +++++++
 ...treamingSubscriptionEventSignalMapper.java | 108 ++++++
 .../AbstractPolicyMappingStrategies.java      |  34 ++
 ...treamingSubscriptionMappingStrategies.java |  72 ++++
 .../MappingStrategiesFactory.java             |  13 +
 .../PolicyEventMappingStrategies.java         | 239 ++++++++++++
 ...gSubscriptionCommandMappingStrategies.java | 103 ++++++
 ...ingSubscriptionEventMappingStrategies.java |  79 ++++
 ...DittoProtocolAdapterParameterizedTest.java |   9 +-
 .../InvalidThingFieldSelectionException.java  |   6 +-
 .../things/model/ThingFieldSelector.java      |   2 +-
 .../ditto/things/model/WithThingId.java       |   2 +-
 .../ThingHistoryNotAccessibleException.java   | 177 +++++++++
 .../common/config/DefaultThingConfig.java     |  14 +-
 .../service/common/config/ThingConfig.java    |   8 +
 .../StreamRequestingCommandEnforcement.java   |  89 +++++
 .../service/enforcement/ThingEnforcement.java |   3 +-
 .../actors/ThingPersistenceActor.java         |  22 +-
 .../ThingPersistenceActorPropsFactory.java    |   8 +-
 .../actors/ThingSupervisorActor.java          |  24 +-
 ...hingsPersistenceStreamingActorCreator.java |  10 +-
 .../events/ThingEventStrategies.java          |   4 +-
 .../serializer/ThingMongoEventAdapter.java    |  34 +-
 ...aultThingPersistenceActorPropsFactory.java |   6 +-
 .../service/starter/ThingsRootActor.java      |  12 +-
 things/service/src/main/resources/things.conf |  60 +++
 .../AbstractThingEnforcementTest.java         |   4 +-
 .../actors/PersistenceActorTestBase.java      |  15 +-
 ...ThingPersistenceActorSnapshottingTest.java |  12 +-
 .../actors/ThingPersistenceActorTest.java     |   5 +-
 .../ThingPersistenceOperationsActorIT.java    |  12 +-
 .../ThingMongoEventAdapterTest.java           |  15 +-
 ...hingsServiceGlobalCommandRegistryTest.java |   3 +
 .../ThingsServiceGlobalEventRegistryTest.java |   7 +-
 ...earchServiceGlobalCommandRegistryTest.java |   4 +-
 ...sSearchServiceGlobalEventRegistryTest.java |   4 +-
 179 files changed, 7870 insertions(+), 401 deletions(-)
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/WithStreamingSubscriptionId.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/exceptions/StreamingSubscriptionNotFoundException.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/exceptions/StreamingSubscriptionProtocolErrorException.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/exceptions/StreamingSubscriptionTimeoutException.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/AbstractStreamingSubscriptionCommand.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/CancelStreamingSubscription.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/RequestFromStreamingSubscription.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/StreamingSubscriptionCommand.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/SubscribeForPersistedEvents.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/package-info.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/AbstractStreamingSubscriptionEvent.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionComplete.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionCreated.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionEvent.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionFailed.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionHasNext.java
 create mode 100755 base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/package-info.java
 create mode 100755 base/model/src/test/java/org/eclipse/ditto/base/model/signals/commands/streaming/CancelStreamingSubscriptionTest.java
 create mode 100755 base/model/src/test/java/org/eclipse/ditto/base/model/signals/commands/streaming/RequestFromStreamingSubscriptionTest.java
 create mode 100755 base/model/src/test/java/org/eclipse/ditto/base/model/signals/commands/streaming/SubscribeForPersistedEventsTest.java
 create mode 100644 base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionCompleteTest.java
 create mode 100644 base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionCreatedTest.java
 create mode 100644 base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionFailedTest.java
 create mode 100644 base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionHasNextTest.java
 create mode 100755 connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionHistoryNotAccessibleException.java
 create mode 100644 documentation/src/main/resources/jsonschema/protocol-streaming-subscription-failed-payload.json
 create mode 100644 documentation/src/main/resources/jsonschema/protocol-streaming-subscription-next-payload.json
 create mode 100644 documentation/src/main/resources/jsonschema/protocol-streaming-subscription-request-payload.json
 create mode 100644 documentation/src/main/resources/jsonschema/protocol-streaming-subscription-subscribe-for-persisted-events-payload.json
 create mode 100644 documentation/src/main/resources/jsonschema/protocol-streaming-subscriptionid.json
 create mode 100644 documentation/src/main/resources/pages/ditto/basic-history.md
 create mode 100644 documentation/src/main/resources/pages/ditto/protocol-specification-streaming-subscription.md
 create mode 100644 documentation/src/main/resources/pages/tags/tag_history.md
 create mode 100644 edge/service/src/main/java/org/eclipse/ditto/edge/service/streaming/StreamingSubscriptionActor.java
 create mode 100644 edge/service/src/main/java/org/eclipse/ditto/edge/service/streaming/StreamingSubscriptionManager.java
 create mode 100644 internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultEventConfig.java
 create mode 100644 internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/EventConfig.java
 create mode 100644 internal/utils/persistence/src/test/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultEventConfigTest.java
 create mode 100644 internal/utils/persistence/src/test/resources/event-test.conf
 create mode 100644 policies/model/src/main/java/org/eclipse/ditto/policies/model/WithPolicyId.java
 create mode 100755 policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/exceptions/PolicyHistoryNotAccessibleException.java
 create mode 100644 protocol/src/main/java/org/eclipse/ditto/protocol/StreamingTopicPathBuilder.java
 create mode 100644 protocol/src/main/java/org/eclipse/ditto/protocol/adapter/AbstractStreamingMessageAdapter.java
 create mode 100644 protocol/src/main/java/org/eclipse/ditto/protocol/adapter/StreamingSubscriptionCommandAdapter.java
 create mode 100644 protocol/src/main/java/org/eclipse/ditto/protocol/adapter/StreamingSubscriptionEventAdapter.java
 create mode 100755 protocol/src/main/java/org/eclipse/ditto/protocol/adapter/connectivity/package-info.java
 create mode 100644 protocol/src/main/java/org/eclipse/ditto/protocol/adapter/policies/PolicyEventAdapter.java
 create mode 100644 protocol/src/main/java/org/eclipse/ditto/protocol/mapper/PolicyEventSignalMapper.java
 create mode 100644 protocol/src/main/java/org/eclipse/ditto/protocol/mapper/StreamingSubscriptionCommandSignalMapper.java
 create mode 100644 protocol/src/main/java/org/eclipse/ditto/protocol/mapper/StreamingSubscriptionEventSignalMapper.java
 create mode 100644 protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/AbstractStreamingSubscriptionMappingStrategies.java
 create mode 100644 protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/PolicyEventMappingStrategies.java
 create mode 100644 protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/StreamingSubscriptionCommandMappingStrategies.java
 create mode 100644 protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/StreamingSubscriptionEventMappingStrategies.java
 create mode 100755 things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/exceptions/ThingHistoryNotAccessibleException.java
 create mode 100644 things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/StreamRequestingCommandEnforcement.java

diff --git a/base/api/src/test/java/org/eclipse/ditto/base/api/persistence/cleanup/CleanupPersistenceResponseTest.java b/base/api/src/test/java/org/eclipse/ditto/base/api/persistence/cleanup/CleanupPersistenceResponseTest.java
index b46a3584672..3e5406a7965 100644
--- a/base/api/src/test/java/org/eclipse/ditto/base/api/persistence/cleanup/CleanupPersistenceResponseTest.java
+++ b/base/api/src/test/java/org/eclipse/ditto/base/api/persistence/cleanup/CleanupPersistenceResponseTest.java
@@ -20,6 +20,7 @@
 
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
 import org.eclipse.ditto.base.model.entity.type.EntityType;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
@@ -33,7 +34,7 @@
  */
 public final class CleanupPersistenceResponseTest {
 
-    private static final EntityId ID = EntityId.of(EntityType.of("thing"), "eclipse:ditto");
+    private static final EntityId ID = NamespacedEntityId.of(EntityType.of("thing"), "eclipse:ditto");
     private static final JsonObject KNOWN_JSON = JsonObject.newBuilder()
             .set(CommandResponse.JsonFields.TYPE, CleanupPersistenceResponse.TYPE)
             .set(CleanupCommandResponse.JsonFields.ENTITY_TYPE, ID.getEntityType().toString())
diff --git a/base/api/src/test/java/org/eclipse/ditto/base/api/persistence/cleanup/CleanupPersistenceTest.java b/base/api/src/test/java/org/eclipse/ditto/base/api/persistence/cleanup/CleanupPersistenceTest.java
index c1de951f4bd..43ba4297412 100644
--- a/base/api/src/test/java/org/eclipse/ditto/base/api/persistence/cleanup/CleanupPersistenceTest.java
+++ b/base/api/src/test/java/org/eclipse/ditto/base/api/persistence/cleanup/CleanupPersistenceTest.java
@@ -18,6 +18,7 @@
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
 import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
 import org.eclipse.ditto.base.model.entity.type.EntityType;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
@@ -31,7 +32,7 @@
  */
 public class CleanupPersistenceTest {
 
-    private static final EntityId ID = EntityId.of(EntityType.of("thing"), "eclipse:ditto");
+    private static final EntityId ID = NamespacedEntityId.of(EntityType.of("thing"), "eclipse:ditto");
     private static final JsonObject KNOWN_JSON = JsonObject.newBuilder()
             .set(Command.JsonFields.TYPE, CleanupPersistence.TYPE)
             .set(CleanupCommand.JsonFields.ENTITY_TYPE, ID.getEntityType().toString())
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/EntityId.java b/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/EntityId.java
index 32566d5fd02..47f71909a7a 100644
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/EntityId.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/EntityId.java
@@ -35,7 +35,13 @@ public interface EntityId extends CharSequence, Comparable<EntityId> {
      */
     static EntityId of(final EntityType entityType, final CharSequence entityId) {
         final EntityIds entityIds = EntityIds.getInstance();
-        return entityIds.getEntityId(entityType, entityId);
+        try {
+            // most entity ids are namespaces, so try that first
+            return entityIds.getNamespacedEntityId(entityType, entityId);
+        } catch (final NamespacedEntityIdInvalidException namespacedEntityIdInvalidException) {
+            // only in the exceptional case, fall back to non-namespaced flavor:
+            return entityIds.getEntityId(entityType, entityId);
+        }
     }
 
     @Override
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaderDefinition.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaderDefinition.java
index b8f520c80a4..c01d45e9b01 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaderDefinition.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaderDefinition.java
@@ -349,7 +349,7 @@ public enum DittoHeaderDefinition implements HeaderDefinition {
      *
      * @since 3.0.0
      */
-    DITTO_METADATA("ditto-metadata", JsonObject.class, false, true, HeaderValueValidators.getNoOpValidator()),
+    DITTO_METADATA("ditto-metadata", JsonObject.class, false, true, HeaderValueValidators.getJsonObjectValidator()),
 
     /**
      * Header definition for allowing the policy lockout (i.e. a subject can create a policy without having WRITE
@@ -484,7 +484,43 @@ public enum DittoHeaderDefinition implements HeaderDefinition {
             Boolean.class,
             false,
             true,
-            HeaderValueValidators.getBooleanValidator());
+            HeaderValueValidators.getBooleanValidator()),
+
+    /**
+     * Header containing a specific historical revision to retrieve when retrieving a persisted entity
+     * (thing/policy/connection).
+     *
+     * @since 3.2.0
+     */
+    AT_HISTORICAL_REVISION("at-historical-revision",
+            Long.class,
+            true,
+            false,
+            HeaderValueValidators.getLongValidator()),
+
+    /**
+     * Header containing a specific historical timestamp to retrieve when retrieving a persisted entity
+     * (thing/policy/connection).
+     *
+     * @since 3.2.0
+     */
+    AT_HISTORICAL_TIMESTAMP("at-historical-timestamp",
+            String.class,
+            true,
+            false,
+            HeaderValueValidators.getNoOpValidator()),
+
+    /**
+     * Header containing retrieved historical headers to be returned for e.g. a historical retrieve command.
+     * Useful for audit-log information, e.g. which "originator" did a change to a thing/policy/connection.
+     *
+     * @since 3.2.0
+     */
+    HISTORICAL_HEADERS("historical-headers",
+            JsonObject.class,
+            false,
+            true,
+            HeaderValueValidators.getJsonObjectValidator());
 
     /**
      * Map to speed up lookup of header definition by key.
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/FeatureToggle.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/FeatureToggle.java
index 07ee3bcc1d8..7bfc5bb5c9c 100644
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/FeatureToggle.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/FeatureToggle.java
@@ -33,6 +33,12 @@ public final class FeatureToggle {
      */
     public static final String WOT_INTEGRATION_ENABLED = "ditto.devops.feature.wot-integration-enabled";
 
+    /**
+     * System property name of the property defining whether the historical API access is enabled.
+     * @since 3.2.0
+     */
+    public static final String HISTORICAL_APIS_ENABLED = "ditto.devops.feature.historical-apis-enabled";
+
     /**
      * Resolves the system property {@value MERGE_THINGS_ENABLED}.
      */
@@ -43,6 +49,11 @@ public final class FeatureToggle {
      */
     private static final boolean IS_WOT_INTEGRATION_ENABLED = resolveProperty(WOT_INTEGRATION_ENABLED);
 
+    /**
+     * Resolves the system property {@value HISTORICAL_APIS_ENABLED}.
+     */
+    private static final boolean IS_HISTORICAL_APIS_ENABLED = resolveProperty(HISTORICAL_APIS_ENABLED);
+
     private static boolean resolveProperty(final String propertyName) {
         final String propertyValue = System.getProperty(propertyName, Boolean.TRUE.toString());
         return !Boolean.FALSE.toString().equalsIgnoreCase(propertyValue);
@@ -101,4 +112,35 @@ public static DittoHeaders checkWotIntegrationFeatureEnabled(final String signal
     public static boolean isWotIntegrationFeatureEnabled() {
         return IS_WOT_INTEGRATION_ENABLED;
     }
+
+    /**
+     * Checks if the historical API access feature is enabled based on the system property {@value HISTORICAL_APIS_ENABLED}.
+     *
+     * @param signal the name of the signal that was supposed to be processed
+     * @param dittoHeaders headers used to build exception
+     * @return the unmodified headers parameters
+     * @throws UnsupportedSignalException if the system property
+     * {@value HISTORICAL_APIS_ENABLED} resolves to {@code false}
+     * @since 3.2.0
+     */
+    public static DittoHeaders checkHistoricalApiAccessFeatureEnabled(final String signal, final DittoHeaders dittoHeaders) {
+        if (!isHistoricalApiAccessFeatureEnabled()) {
+            throw UnsupportedSignalException
+                    .newBuilder(signal)
+                    .dittoHeaders(dittoHeaders)
+                    .build();
+        }
+        return dittoHeaders;
+    }
+
+    /**
+     * Returns whether the historical API access feature is enabled based on the system property
+     * {@value HISTORICAL_APIS_ENABLED}.
+     *
+     * @return whether the historical API access feature is enabled or not.
+     * @since 3.2.0
+     */
+    public static boolean isHistoricalApiAccessFeatureEnabled() {
+        return IS_HISTORICAL_APIS_ENABLED;
+    }
 }
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/WithStreamingSubscriptionId.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/WithStreamingSubscriptionId.java
new file mode 100755
index 00000000000..a6810d5113a
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/WithStreamingSubscriptionId.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals;
+
+import org.eclipse.ditto.base.model.signals.commands.streaming.StreamingSubscriptionCommand;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+
+/**
+ * Interface of streaming commands/events addressing a particular session identified by a subscription ID.
+ *
+ * @since 3.2.0
+ */
+public interface WithStreamingSubscriptionId<T extends WithStreamingSubscriptionId<T>> extends
+        StreamingSubscriptionCommand<T> {
+
+    /**
+     * Returns the subscriptionId identifying the session of this streaming signal.
+     *
+     * @return the subscriptionId.
+     */
+    String getSubscriptionId();
+
+    /**
+     * Json fields of this command.
+     */
+    final class JsonFields {
+
+        /**
+         * JSON field for the streaming subscription ID.
+         */
+        public static final JsonFieldDefinition<String> SUBSCRIPTION_ID =
+                JsonFactory.newStringFieldDefinition("subscriptionId");
+
+        JsonFields() {
+            throw new AssertionError();
+        }
+
+    }
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/Command.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/Command.java
index 4afd8b0ff4b..c4277fa6960 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/Command.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/Command.java
@@ -159,7 +159,13 @@ enum Category {
          * Category of commands that are neither of the above 3 (query, modify, delete) but perform an action on the
          * entity.
          */
-        ACTION;
+        ACTION,
+
+        /**
+         * Category of commands that stream e.g. historical events.
+         * @since 3.2.0
+         */
+        STREAM;
 
         /**
          * Determines whether the passed {@code category} effectively modifies the targeted entity.
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/exceptions/StreamingSubscriptionNotFoundException.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/exceptions/StreamingSubscriptionNotFoundException.java
new file mode 100755
index 00000000000..f0a4c9e3e03
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/exceptions/StreamingSubscriptionNotFoundException.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.commands.exceptions;
+
+import java.net.URI;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.NotThreadSafe;
+
+import org.eclipse.ditto.base.model.common.HttpStatus;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
+import org.eclipse.ditto.base.model.exceptions.GeneralException;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.json.JsonObject;
+
+/**
+ * Error response for streaming subscription commands addressing a nonexistent subscription.
+ *
+ * @since 3.2.0
+ */
+@JsonParsableException(errorCode = StreamingSubscriptionNotFoundException.ERROR_CODE)
+public class StreamingSubscriptionNotFoundException extends DittoRuntimeException implements GeneralException {
+
+    /**
+     * Error code of this exception.
+     */
+    public static final String ERROR_CODE = ERROR_CODE_PREFIX + "streaming.subscription.not.found";
+
+    private static final HttpStatus STATUS_CODE = HttpStatus.NOT_FOUND;
+
+    private StreamingSubscriptionNotFoundException(final DittoHeaders dittoHeaders,
+            @Nullable final String message,
+            @Nullable final String description,
+            @Nullable final Throwable cause,
+            @Nullable final URI href) {
+
+        super(ERROR_CODE, STATUS_CODE, dittoHeaders, message, description, cause, href);
+    }
+
+    /**
+     * Create a {@code StreamingSubscriptionNotFoundException}.
+     *
+     * @param subscriptionId ID of the nonexistent subscription.
+     * @param dittoHeaders the Ditto headers.
+     * @return the exception.
+     */
+    public static StreamingSubscriptionNotFoundException of(final String subscriptionId, final DittoHeaders dittoHeaders) {
+        return new Builder()
+                .message(String.format("No subscription with ID '%s' exists.", subscriptionId))
+                .dittoHeaders(dittoHeaders)
+                .build();
+    }
+
+    /**
+     * Constructs a new {@code StreamingSubscriptionNotFoundException} object with the exception message extracted from the
+     * given JSON object.
+     *
+     * @param jsonObject the JSON to read the {@link DittoRuntimeException.JsonFields#MESSAGE} field from.
+     * @param dittoHeaders the headers of the command which resulted in this exception.
+     * @return the new StreamingSubscriptionNotFoundException.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonMissingFieldException if this JsonObject did not contain an error message.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static StreamingSubscriptionNotFoundException fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
+        return DittoRuntimeException.fromJson(jsonObject, dittoHeaders, new Builder());
+    }
+
+    @Override
+    public DittoRuntimeException setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new Builder()
+                .message(getMessage())
+                .description(getDescription().orElse(null))
+                .cause(getCause())
+                .href(getHref().orElse(null))
+                .dittoHeaders(dittoHeaders)
+                .build();
+    }
+
+    /**
+     * A mutable builder with a fluent API for a {@link StreamingSubscriptionNotFoundException}.
+     */
+    @NotThreadSafe
+    public static final class Builder extends DittoRuntimeExceptionBuilder<StreamingSubscriptionNotFoundException> {
+
+        private Builder() {}
+
+        @Override
+        protected StreamingSubscriptionNotFoundException doBuild(final DittoHeaders dittoHeaders,
+                @Nullable final String message,
+                @Nullable final String description,
+                @Nullable final Throwable cause,
+                @Nullable final URI href) {
+            return new StreamingSubscriptionNotFoundException(dittoHeaders, message, description, cause, href);
+        }
+    }
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/exceptions/StreamingSubscriptionProtocolErrorException.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/exceptions/StreamingSubscriptionProtocolErrorException.java
new file mode 100755
index 00000000000..5875e8660db
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/exceptions/StreamingSubscriptionProtocolErrorException.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.commands.exceptions;
+
+import java.net.URI;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.NotThreadSafe;
+
+import org.eclipse.ditto.base.model.common.HttpStatus;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
+import org.eclipse.ditto.base.model.exceptions.GeneralException;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.json.JsonObject;
+
+/**
+ * Error response for subscriptions with no interaction for a long time.
+ *
+ * @since 3.2.0
+ */
+@JsonParsableException(errorCode = StreamingSubscriptionProtocolErrorException.ERROR_CODE)
+public class StreamingSubscriptionProtocolErrorException extends DittoRuntimeException implements GeneralException {
+
+    /**
+     * Error code of this exception.
+     */
+    public static final String ERROR_CODE = ERROR_CODE_PREFIX + "streaming.subscription.protocol.error";
+
+    private static final HttpStatus STATUS_CODE = HttpStatus.BAD_REQUEST;
+
+    private StreamingSubscriptionProtocolErrorException(final DittoHeaders dittoHeaders,
+            @Nullable final String message,
+            @Nullable final String description,
+            @Nullable final Throwable cause,
+            @Nullable final URI href) {
+
+        super(ERROR_CODE, STATUS_CODE, dittoHeaders, message, description, cause, href);
+    }
+
+    /**
+     * Create a {@code StreamingSubscriptionProtocolErrorException}.
+     *
+     * @param cause the actual protocol error.
+     * @param dittoHeaders the Ditto headers.
+     * @return the exception.
+     */
+    public static StreamingSubscriptionProtocolErrorException of(final Throwable cause, final DittoHeaders dittoHeaders) {
+        return new Builder()
+                .message(cause.getMessage())
+                .cause(cause)
+                .dittoHeaders(dittoHeaders)
+                .build();
+    }
+
+    /**
+     * Create an empty builder for this exception.
+     *
+     * @return an empty builder.
+     */
+    public static DittoRuntimeExceptionBuilder<StreamingSubscriptionProtocolErrorException> newBuilder() {
+        return new Builder();
+    }
+
+    /**
+     * Constructs a new {@code StreamingSubscriptionProtocolErrorException} object with the exception message extracted from the
+     * given JSON object.
+     *
+     * @param jsonObject the JSON to read the {@link DittoRuntimeException.JsonFields#MESSAGE} field from.
+     * @param dittoHeaders the headers of the command which resulted in this exception.
+     * @return the new StreamingSubscriptionProtocolErrorException.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonMissingFieldException if this JsonObject did not contain an error message.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static StreamingSubscriptionProtocolErrorException fromJson(final JsonObject jsonObject,
+            final DittoHeaders dittoHeaders) {
+        return DittoRuntimeException.fromJson(jsonObject, dittoHeaders, new Builder());
+    }
+
+    @Override
+    public DittoRuntimeException setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new Builder()
+                .message(getMessage())
+                .description(getDescription().orElse(null))
+                .cause(getCause())
+                .href(getHref().orElse(null))
+                .dittoHeaders(dittoHeaders)
+                .build();
+    }
+
+    /**
+     * A mutable builder with a fluent API for a {@link StreamingSubscriptionProtocolErrorException}.
+     */
+    @NotThreadSafe
+    public static final class Builder extends DittoRuntimeExceptionBuilder<StreamingSubscriptionProtocolErrorException> {
+
+        private Builder() {}
+
+        @Override
+        protected StreamingSubscriptionProtocolErrorException doBuild(final DittoHeaders dittoHeaders,
+                @Nullable final String message,
+                @Nullable final String description,
+                @Nullable final Throwable cause,
+                @Nullable final URI href) {
+            return new StreamingSubscriptionProtocolErrorException(dittoHeaders, message, description, cause, href);
+        }
+    }
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/exceptions/StreamingSubscriptionTimeoutException.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/exceptions/StreamingSubscriptionTimeoutException.java
new file mode 100755
index 00000000000..a55feff9a31
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/exceptions/StreamingSubscriptionTimeoutException.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.commands.exceptions;
+
+import java.net.URI;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.NotThreadSafe;
+
+import org.eclipse.ditto.base.model.common.HttpStatus;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
+import org.eclipse.ditto.base.model.exceptions.GeneralException;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.json.JsonObject;
+
+/**
+ * Error response for subscriptions with no interaction for a long time.
+ *
+ * @since 3.2.0
+ */
+@JsonParsableException(errorCode = StreamingSubscriptionTimeoutException.ERROR_CODE)
+public class StreamingSubscriptionTimeoutException extends DittoRuntimeException implements GeneralException {
+
+    /**
+     * Error code of this exception.
+     */
+    public static final String ERROR_CODE = ERROR_CODE_PREFIX + "streaming.subscription.timeout";
+
+    private static final HttpStatus STATUS_CODE = HttpStatus.REQUEST_TIMEOUT;
+
+    private StreamingSubscriptionTimeoutException(final DittoHeaders dittoHeaders,
+            @Nullable final String message,
+            @Nullable final String description,
+            @Nullable final Throwable cause,
+            @Nullable final URI href) {
+
+        super(ERROR_CODE, STATUS_CODE, dittoHeaders, message, description, cause, href);
+    }
+
+    /**
+     * Create a {@code StreamingSubscriptionTimeoutException}.
+     *
+     * @param subscriptionId ID of the nonexistent subscription.
+     * @param dittoHeaders the Ditto headers.
+     * @return the exception.
+     */
+    public static StreamingSubscriptionTimeoutException of(final String subscriptionId, final DittoHeaders dittoHeaders) {
+        return new Builder()
+                .message(String.format("The subscription '%s' stopped due to a lack of interaction.", subscriptionId))
+                .dittoHeaders(dittoHeaders)
+                .build();
+    }
+
+    /**
+     * Constructs a new {@code StreamingSubscriptionTimeoutException} object with the exception message extracted from the
+     * given JSON object.
+     *
+     * @param jsonObject the JSON to read the {@link DittoRuntimeException.JsonFields#MESSAGE} field from.
+     * @param dittoHeaders the headers of the command which resulted in this exception.
+     * @return the new StreamingSubscriptionTimeoutException.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonMissingFieldException if this JsonObject did not contain an error message.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static StreamingSubscriptionTimeoutException fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
+        return DittoRuntimeException.fromJson(jsonObject, dittoHeaders, new Builder());
+    }
+
+    @Override
+    public DittoRuntimeException setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new Builder()
+                .message(getMessage())
+                .description(getDescription().orElse(null))
+                .cause(getCause())
+                .href(getHref().orElse(null))
+                .dittoHeaders(dittoHeaders)
+                .build();
+    }
+
+    /**
+     * A mutable builder with a fluent API for a {@link StreamingSubscriptionTimeoutException}.
+     */
+    @NotThreadSafe
+    public static final class Builder extends DittoRuntimeExceptionBuilder<StreamingSubscriptionTimeoutException> {
+
+        private Builder() {}
+
+        @Override
+        protected StreamingSubscriptionTimeoutException doBuild(final DittoHeaders dittoHeaders,
+                @Nullable final String message,
+                @Nullable final String description,
+                @Nullable final Throwable cause,
+                @Nullable final URI href) {
+            return new StreamingSubscriptionTimeoutException(dittoHeaders, message, description, cause, href);
+        }
+    }
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/AbstractStreamingSubscriptionCommand.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/AbstractStreamingSubscriptionCommand.java
new file mode 100755
index 00000000000..1b8ff670875
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/AbstractStreamingSubscriptionCommand.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.commands.streaming;
+
+import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
+
+import java.util.Objects;
+import java.util.function.Predicate;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.entity.id.EntityIdJsonDeserializer;
+import org.eclipse.ditto.base.model.entity.type.EntityType;
+import org.eclipse.ditto.base.model.entity.type.EntityTypeJsonDeserializer;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.base.model.signals.commands.AbstractCommand;
+import org.eclipse.ditto.json.JsonField;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
+import org.eclipse.ditto.json.JsonPointer;
+
+/**
+ * Abstract base class for streaming commands.
+ *
+ * @param <T> the type of the AbstractStreamingSubscriptionCommand
+ * @since 3.2.0
+ */
+@Immutable
+abstract class AbstractStreamingSubscriptionCommand<T extends AbstractStreamingSubscriptionCommand<T>>
+        extends AbstractCommand<T>
+        implements StreamingSubscriptionCommand<T> {
+
+    protected final EntityId entityId;
+    protected final JsonPointer resourcePath;
+
+    protected AbstractStreamingSubscriptionCommand(final String type,
+            final EntityId entityId,
+            final JsonPointer resourcePath,
+            final DittoHeaders dittoHeaders) {
+
+        super(type, dittoHeaders);
+        this.entityId = checkNotNull(entityId, "entityId");
+        this.resourcePath = checkNotNull(resourcePath, "resourcePath");
+    }
+
+    protected static EntityId deserializeEntityId(final JsonObject jsonObject) {
+        return EntityIdJsonDeserializer.deserializeEntityId(jsonObject,
+                StreamingSubscriptionCommand.JsonFields.JSON_ENTITY_ID,
+                EntityTypeJsonDeserializer.deserializeEntityType(jsonObject,
+                        StreamingSubscriptionCommand.JsonFields.JSON_ENTITY_TYPE));
+    }
+
+    @Override
+    public Category getCategory() {
+        return Category.STREAM;
+    }
+
+    @Override
+    public EntityId getEntityId() {
+        return entityId;
+    }
+
+    @Override
+    public EntityType getEntityType() {
+        return entityId.getEntityType();
+    }
+
+    @Override
+    public JsonPointer getResourcePath() {
+        return resourcePath;
+    }
+
+    @Override
+    public String getResourceType() {
+        return getEntityType().toString();
+    }
+
+    @Override
+    protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder,
+            final JsonSchemaVersion schemaVersion,
+            final Predicate<JsonField> thePredicate) {
+
+        final Predicate<JsonField> predicate = schemaVersion.and(thePredicate);
+        jsonObjectBuilder.set(StreamingSubscriptionCommand.JsonFields.JSON_ENTITY_TYPE,
+                entityId.getEntityType().toString(), predicate);
+        jsonObjectBuilder.set(StreamingSubscriptionCommand.JsonFields.JSON_ENTITY_ID,
+                entityId.toString(), predicate);
+        jsonObjectBuilder.set(StreamingSubscriptionCommand.JsonFields.JSON_RESOURCE_PATH,
+                resourcePath.toString(), predicate);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), entityId, resourcePath);
+    }
+
+    @SuppressWarnings({"squid:MethodCyclomaticComplexity", "squid:S1067", "OverlyComplexMethod"})
+    @Override
+    public boolean equals(@Nullable final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        final AbstractStreamingSubscriptionCommand<?> other = (AbstractStreamingSubscriptionCommand<?>) obj;
+
+        return other.canEqual(this) &&
+                super.equals(other) &&
+                Objects.equals(entityId, other.entityId) &&
+                Objects.equals(resourcePath, other.resourcePath);
+    }
+
+    @Override
+    protected boolean canEqual(@Nullable final Object other) {
+        return other instanceof AbstractStreamingSubscriptionCommand;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() +
+                ", entityId=" + entityId +
+                ", entityType=" + getEntityType() +
+                ", resourcePath=" + resourcePath;
+    }
+
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/CancelStreamingSubscription.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/CancelStreamingSubscription.java
new file mode 100755
index 00000000000..8586c5cd5fe
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/CancelStreamingSubscription.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.commands.streaming;
+
+import java.util.Objects;
+import java.util.function.Predicate;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableCommand;
+import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.base.model.signals.WithStreamingSubscriptionId;
+import org.eclipse.ditto.base.model.signals.commands.CommandJsonDeserializer;
+import org.eclipse.ditto.json.JsonField;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
+import org.eclipse.ditto.json.JsonPointer;
+
+/**
+ * Command for cancelling a subscription of streaming results.
+ * Corresponds to the reactive-streams signal {@code Subscription#cancel()}.
+ *
+ * @since 3.2.0
+ */
+@Immutable
+@JsonParsableCommand(typePrefix = StreamingSubscriptionCommand.TYPE_PREFIX, name = CancelStreamingSubscription.NAME)
+public final class CancelStreamingSubscription extends AbstractStreamingSubscriptionCommand<CancelStreamingSubscription>
+        implements WithStreamingSubscriptionId<CancelStreamingSubscription> {
+
+    /**
+     * Name of the command.
+     */
+    public static final String NAME = "cancel";
+
+    /**
+     * Type of this command.
+     */
+    public static final String TYPE = TYPE_PREFIX + NAME;
+
+    private final String subscriptionId;
+
+    private CancelStreamingSubscription(final EntityId entityId,
+            final JsonPointer resourcePath,
+            final String subscriptionId,
+            final DittoHeaders dittoHeaders) {
+        super(TYPE, entityId, resourcePath, dittoHeaders);
+        this.subscriptionId = subscriptionId;
+    }
+
+    /**
+     * Returns a new instance of the command.
+     *
+     * @param entityId the entityId that should be streamed.
+     * @param resourcePath the resource path for which to stream.
+     * @param subscriptionId ID of the subscription to cancel.
+     * @param dittoHeaders the headers of the command.
+     * @return a new command to cancel a subscription.
+     * @throws NullPointerException if {@code dittoHeaders} is {@code null}.
+     */
+    public static CancelStreamingSubscription of(final EntityId entityId,
+            final JsonPointer resourcePath,
+            final String subscriptionId,
+            final DittoHeaders dittoHeaders) {
+        return new CancelStreamingSubscription(entityId, resourcePath, subscriptionId, dittoHeaders);
+    }
+
+    /**
+     * Creates a new {@code CancelStreamingSubscription} from a JSON object.
+     *
+     * @param jsonObject the JSON object of which the command is to be created.
+     * @param dittoHeaders the headers of the command.
+     * @return the command.
+     * @throws NullPointerException if {@code jsonObject} is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static CancelStreamingSubscription fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
+        return new CommandJsonDeserializer<CancelStreamingSubscription>(TYPE, jsonObject).deserialize(() ->
+                new CancelStreamingSubscription(deserializeEntityId(jsonObject),
+                        JsonPointer.of(
+                                jsonObject.getValueOrThrow(StreamingSubscriptionCommand.JsonFields.JSON_RESOURCE_PATH)),
+                        jsonObject.getValueOrThrow(WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID),
+                        dittoHeaders
+                )
+        );
+    }
+
+    @Override
+    public String getSubscriptionId() {
+        return subscriptionId;
+    }
+
+    @Override
+    protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final JsonSchemaVersion schemaVersion,
+            final Predicate<JsonField> thePredicate) {
+
+        super.appendPayload(jsonObjectBuilder, schemaVersion, thePredicate);
+        jsonObjectBuilder.set(WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID, subscriptionId);
+    }
+
+    @Override
+    public CancelStreamingSubscription setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new CancelStreamingSubscription(entityId, resourcePath, subscriptionId, dittoHeaders);
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof CancelStreamingSubscription)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        final CancelStreamingSubscription that = (CancelStreamingSubscription) o;
+        return Objects.equals(subscriptionId, that.subscriptionId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), subscriptionId);
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "[" +
+                super.toString() +
+                ", subscriptionId=" + subscriptionId +
+                ']';
+    }
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/RequestFromStreamingSubscription.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/RequestFromStreamingSubscription.java
new file mode 100755
index 00000000000..4a72cde4204
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/RequestFromStreamingSubscription.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.commands.streaming;
+
+import java.util.Objects;
+import java.util.function.Predicate;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableCommand;
+import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.base.model.signals.WithStreamingSubscriptionId;
+import org.eclipse.ditto.base.model.signals.commands.CommandJsonDeserializer;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonField;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
+import org.eclipse.ditto.json.JsonPointer;
+
+/**
+ * Command for requesting items from a subscription of streaming results.
+ * Corresponds to the reactive-streams signal {@code Subscription#request(long)}.
+ *
+ * @since 3.2.0
+ */
+@Immutable
+@JsonParsableCommand(typePrefix = StreamingSubscriptionCommand.TYPE_PREFIX, name = RequestFromStreamingSubscription.NAME)
+public final class RequestFromStreamingSubscription extends AbstractStreamingSubscriptionCommand<RequestFromStreamingSubscription>
+        implements WithStreamingSubscriptionId<RequestFromStreamingSubscription> {
+
+    /**
+     * Name of the command.
+     */
+    public static final String NAME = "request";
+
+    /**
+     * Type of this command.
+     */
+    public static final String TYPE = TYPE_PREFIX + NAME;
+
+    private final String subscriptionId;
+    private final long demand;
+
+    private RequestFromStreamingSubscription(final EntityId entityId,
+            final JsonPointer resourcePath,
+            final String subscriptionId,
+            final long demand,
+            final DittoHeaders dittoHeaders) {
+
+        super(TYPE, entityId, resourcePath, dittoHeaders);
+        this.subscriptionId = subscriptionId;
+        this.demand = demand;
+    }
+
+    /**
+     * Returns a new instance of the command.
+     *
+     * @param entityId the entityId that should be streamed.
+     * @param resourcePath the resource path for which to stream.
+     * @param subscriptionId ID of the subscription to request from.
+     * @param demand how many pages to request.
+     * @param dittoHeaders the headers of the command.
+     * @return a new command to request from a subscription.
+     * @throws NullPointerException if {@code dittoHeaders} is {@code null}.
+     */
+    public static RequestFromStreamingSubscription of(final EntityId entityId,
+            final JsonPointer resourcePath,
+            final String subscriptionId,
+            final long demand,
+            final DittoHeaders dittoHeaders) {
+        return new RequestFromStreamingSubscription(entityId, resourcePath, subscriptionId, demand, dittoHeaders);
+    }
+
+    /**
+     * Creates a new {@code RequestSubscription} from a JSON object.
+     *
+     * @param jsonObject the JSON object of which the command is to be created.
+     * @param dittoHeaders the headers of the command.
+     * @return the command.
+     * @throws NullPointerException if {@code jsonObject} is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static RequestFromStreamingSubscription fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
+        return new CommandJsonDeserializer<RequestFromStreamingSubscription>(TYPE, jsonObject).deserialize(() ->
+                new RequestFromStreamingSubscription(deserializeEntityId(jsonObject),
+                        JsonPointer.of(
+                                jsonObject.getValueOrThrow(StreamingSubscriptionCommand.JsonFields.JSON_RESOURCE_PATH)),
+                        jsonObject.getValueOrThrow(WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID),
+                        jsonObject.getValueOrThrow(JsonFields.DEMAND),
+                        dittoHeaders
+                )
+        );
+    }
+
+
+    @Override
+    public String getSubscriptionId() {
+        return subscriptionId;
+    }
+
+
+    /**
+     * Returns the demand which is to be included in the JSON of the retrieved entity.
+     *
+     * @return the demand.
+     */
+    public long getDemand() {
+        return demand;
+    }
+
+    @Override
+    protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final JsonSchemaVersion schemaVersion,
+            final Predicate<JsonField> thePredicate) {
+
+        super.appendPayload(jsonObjectBuilder, schemaVersion, thePredicate);
+        jsonObjectBuilder.set(WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID, subscriptionId);
+        jsonObjectBuilder.set(JsonFields.DEMAND, demand);
+    }
+
+    @Override
+    public String getResourceType() {
+        return getEntityType().toString();
+    }
+
+    @Override
+    public RequestFromStreamingSubscription setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new RequestFromStreamingSubscription(entityId, resourcePath, subscriptionId, demand, dittoHeaders);
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof RequestFromStreamingSubscription)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        final RequestFromStreamingSubscription that = (RequestFromStreamingSubscription) o;
+        return Objects.equals(subscriptionId, that.subscriptionId) && demand == that.demand;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), subscriptionId, demand);
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "[" +
+                super.toString() +
+                ", subscriptionId=" + subscriptionId +
+                ", demand=" + demand +
+                ']';
+    }
+
+    /**
+     * JSON fields of this command.
+     */
+    public static final class JsonFields {
+
+        /**
+         * JSON field for number of pages demanded by this command.
+         */
+        public static final JsonFieldDefinition<Long> DEMAND = JsonFactory.newLongFieldDefinition("demand");
+
+        JsonFields() {
+            throw new AssertionError();
+        }
+    }
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/StreamingSubscriptionCommand.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/StreamingSubscriptionCommand.java
new file mode 100755
index 00000000000..f57d240d934
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/StreamingSubscriptionCommand.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.commands.streaming;
+
+import static org.eclipse.ditto.base.model.json.FieldType.REGULAR;
+import static org.eclipse.ditto.base.model.json.JsonSchemaVersion.V_2;
+
+import org.eclipse.ditto.base.model.entity.type.WithEntityType;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
+import org.eclipse.ditto.base.model.signals.WithResource;
+import org.eclipse.ditto.base.model.signals.commands.Command;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+
+/**
+ * Aggregates all {@link Command}s which request a stream (e.g. a {@code SourceRef}) of
+ * {@link org.eclipse.ditto.base.model.signals.Signal}s to subscribe for.
+ *
+ * @param <T> the type of the implementing class.
+ * @since 3.2.0
+ */
+public interface StreamingSubscriptionCommand<T extends StreamingSubscriptionCommand<T>> extends Command<T>,
+        WithEntityType, SignalWithEntityId<T>, WithResource {
+
+    /**
+     * Resource type of streaming subscription commands.
+     */
+    String RESOURCE_TYPE = "streaming.subscription";
+
+    /**
+     * Type Prefix of Streaming commands.
+     */
+    String TYPE_PREFIX = RESOURCE_TYPE + "." + TYPE_QUALIFIER + ":";
+
+    @Override
+    default String getTypePrefix() {
+        return TYPE_PREFIX;
+    }
+
+    @Override
+    T setDittoHeaders(DittoHeaders dittoHeaders);
+
+    /**
+     * This class contains definitions for all specific fields of this command's JSON representation.
+     */
+    final class JsonFields {
+
+        private JsonFields() {
+            throw new AssertionError();
+        }
+
+        public static final JsonFieldDefinition<String> JSON_ENTITY_ID =
+                JsonFactory.newStringFieldDefinition("entityId", REGULAR, V_2);
+
+        public static final JsonFieldDefinition<String> JSON_ENTITY_TYPE =
+                JsonFactory.newStringFieldDefinition("entityType", REGULAR, V_2);
+
+        public static final JsonFieldDefinition<String> JSON_RESOURCE_PATH =
+                JsonFactory.newStringFieldDefinition("resourcePath", REGULAR, V_2);
+
+    }
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/SubscribeForPersistedEvents.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/SubscribeForPersistedEvents.java
new file mode 100755
index 00000000000..aeca3a7738f
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/SubscribeForPersistedEvents.java
@@ -0,0 +1,344 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.commands.streaming;
+
+import static org.eclipse.ditto.base.model.json.FieldType.REGULAR;
+import static org.eclipse.ditto.base.model.json.JsonSchemaVersion.V_2;
+
+import java.time.Instant;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableCommand;
+import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonField;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
+import org.eclipse.ditto.json.JsonPointer;
+
+/**
+ * Command which starts a stream of journal entries as persisted events for a given EntityId.
+ * Corresponds to the reactive-streams signal {@code Publisher#subscribe(Subscriber)}.
+ *
+ * @since 3.2.0
+ */
+@Immutable
+@JsonParsableCommand(typePrefix = StreamingSubscriptionCommand.TYPE_PREFIX, name = SubscribeForPersistedEvents.NAME)
+public final class SubscribeForPersistedEvents extends AbstractStreamingSubscriptionCommand<SubscribeForPersistedEvents>
+        implements StreamingSubscriptionCommand<SubscribeForPersistedEvents> {
+
+    /**
+     * The name of this streaming subscription command.
+     */
+    public static final String NAME = "subscribeForPersistedEvents";
+
+    /**
+     * Type of this command.
+     */
+    public static final String TYPE = TYPE_PREFIX + NAME;
+
+    private final long fromHistoricalRevision;
+    private final long toHistoricalRevision;
+
+    @Nullable private final Instant fromHistoricalTimestamp;
+    @Nullable private final Instant toHistoricalTimestamp;
+    @Nullable private final String prefix;
+
+    private SubscribeForPersistedEvents(final EntityId entityId,
+            final JsonPointer resourcePath,
+            final long fromHistoricalRevision,
+            final long toHistoricalRevision,
+            @Nullable final Instant fromHistoricalTimestamp,
+            @Nullable final Instant toHistoricalTimestamp,
+            @Nullable final String prefix,
+            final DittoHeaders dittoHeaders) {
+
+        super(TYPE, entityId, resourcePath, dittoHeaders);
+        this.fromHistoricalRevision = fromHistoricalRevision;
+        this.toHistoricalRevision = toHistoricalRevision;
+        this.fromHistoricalTimestamp = fromHistoricalTimestamp;
+        this.toHistoricalTimestamp = toHistoricalTimestamp;
+        this.prefix = prefix;
+    }
+
+    /**
+     * Creates a new {@code SudoStreamSnapshots} command based on "from" and "to" {@code long} revisions.
+     *
+     * @param entityId the entityId that should be streamed.
+     * @param resourcePath the resource path for which to stream events.
+     * @param fromHistoricalRevision the revision to start the streaming from.
+     * @param toHistoricalRevision the revision to stop the streaming at.
+     * @param dittoHeaders the command headers of the request.
+     * @return the command.
+     * @throws NullPointerException if any non-nullable argument is {@code null}.
+     */
+    public static SubscribeForPersistedEvents of(final EntityId entityId,
+            final JsonPointer resourcePath,
+            final long fromHistoricalRevision,
+            final long toHistoricalRevision,
+            final DittoHeaders dittoHeaders) {
+
+        return new SubscribeForPersistedEvents(entityId,
+                resourcePath,
+                fromHistoricalRevision,
+                toHistoricalRevision,
+                null,
+                null,
+                null,
+                dittoHeaders);
+    }
+
+    /**
+     * Creates a new {@code SudoStreamSnapshots} command based on "from" and "to" {@code Instant} timestamps.
+     *
+     * @param entityId the entityId that should be streamed.
+     * @param resourcePath the resource path for which to stream events.
+     * @param fromHistoricalTimestamp the timestamp to start the streaming from.
+     * @param toHistoricalTimestamp the timestamp to stop the streaming at.
+     * @param dittoHeaders the command headers of the request.
+     * @return the command.
+     * @throws NullPointerException if any non-nullable argument is {@code null}.
+     */
+    public static SubscribeForPersistedEvents of(final EntityId entityId,
+            final JsonPointer resourcePath,
+            @Nullable final Instant fromHistoricalTimestamp,
+            @Nullable final Instant toHistoricalTimestamp,
+            final DittoHeaders dittoHeaders) {
+
+        return new SubscribeForPersistedEvents(entityId,
+                resourcePath,
+                0L,
+                Long.MAX_VALUE,
+                fromHistoricalTimestamp,
+                toHistoricalTimestamp,
+                null,
+                dittoHeaders);
+    }
+
+    /**
+     * Creates a new {@code SudoStreamSnapshots} command based on "from" and "to" {@code Instant} timestamps.
+     *
+     * @param entityId the entityId that should be streamed.
+     * @param resourcePath the resource path for which to stream events.
+     * @param fromHistoricalRevision the revision to start the streaming from.
+     * @param toHistoricalRevision the revision to stop the streaming at.
+     * @param fromHistoricalTimestamp the timestamp to start the streaming from.
+     * @param toHistoricalTimestamp the timestamp to stop the streaming at.
+     * @param dittoHeaders the command headers of the request.
+     * @return the command.
+     * @throws NullPointerException if any non-nullable argument is {@code null}.
+     */
+    public static SubscribeForPersistedEvents of(final EntityId entityId,
+            final JsonPointer resourcePath,
+            @Nullable final Long fromHistoricalRevision,
+            @Nullable final Long toHistoricalRevision,
+            @Nullable final Instant fromHistoricalTimestamp,
+            @Nullable final Instant toHistoricalTimestamp,
+            final DittoHeaders dittoHeaders) {
+
+        return new SubscribeForPersistedEvents(entityId,
+                resourcePath,
+                null != fromHistoricalRevision ? fromHistoricalRevision : 0L,
+                null != toHistoricalRevision ? toHistoricalRevision : Long.MAX_VALUE,
+                fromHistoricalTimestamp,
+                toHistoricalTimestamp,
+                null,
+                dittoHeaders);
+    }
+
+    /**
+     * Deserializes a {@code SubscribeForPersistedEvents} from the specified {@link JsonObject} argument.
+     *
+     * @param jsonObject the JSON object to be deserialized.
+     * @return the deserialized {@code SubscribeForPersistedEvents}.
+     * @throws NullPointerException if {@code jsonObject} is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonMissingFieldException if {@code jsonObject} did not contain all required
+     * fields.
+     * @throws org.eclipse.ditto.json.JsonParseException if {@code jsonObject} was not in the expected format.
+     */
+    public static SubscribeForPersistedEvents fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
+        return new SubscribeForPersistedEvents(deserializeEntityId(jsonObject),
+                JsonPointer.of(jsonObject.getValueOrThrow(StreamingSubscriptionCommand.JsonFields.JSON_RESOURCE_PATH)),
+                jsonObject.getValueOrThrow(JsonFields.JSON_FROM_HISTORICAL_REVISION),
+                jsonObject.getValueOrThrow(JsonFields.JSON_TO_HISTORICAL_REVISION),
+                jsonObject.getValue(JsonFields.JSON_FROM_HISTORICAL_TIMESTAMP).map(Instant::parse).orElse(null),
+                jsonObject.getValue(JsonFields.JSON_TO_HISTORICAL_TIMESTAMP).map(Instant::parse).orElse(null),
+                jsonObject.getValue(JsonFields.PREFIX).orElse(null),
+                dittoHeaders
+        );
+    }
+
+    /**
+     * Create a copy of this command with prefix set. The prefix is used to identify a streaming subscription manager
+     * if multiple are deployed in the cluster.
+     *
+     * @param prefix the subscription ID prefix.
+     * @return the new command.
+     */
+    public SubscribeForPersistedEvents setPrefix(@Nullable final String prefix) {
+        return new SubscribeForPersistedEvents(entityId, resourcePath, fromHistoricalRevision, toHistoricalRevision,
+                fromHistoricalTimestamp, toHistoricalTimestamp, prefix, getDittoHeaders());
+    }
+
+    /**
+     * Returns the revision to start the streaming from.
+     *
+     * @return the revision to start the streaming from.
+     */
+    public long getFromHistoricalRevision() {
+        return fromHistoricalRevision;
+    }
+
+    /**
+     * Returns the timestamp to stop the streaming at.
+     *
+     * @return the timestamp to stop the streaming at.
+     */
+    public long getToHistoricalRevision() {
+        return toHistoricalRevision;
+    }
+
+    /**
+     * Returns the optional timestamp to start the streaming from.
+     *
+     * @return the optional timestamp to start the streaming from.
+     */
+    public Optional<Instant> getFromHistoricalTimestamp() {
+        return Optional.ofNullable(fromHistoricalTimestamp);
+    }
+
+    /**
+     * Returns the optional timestamp to stop the streaming at.
+     *
+     * @return the optional timestamp to stop the streaming at.
+     */
+    public Optional<Instant> getToHistoricalTimestamp() {
+        return Optional.ofNullable(toHistoricalTimestamp);
+    }
+
+    /**
+     * Get the prefix of subscription IDs. The prefix is used to identify a streaming subscription manager if multiple
+     * are deployed in the cluster.
+     *
+     * @return the subscription ID prefix.
+     */
+    public Optional<String> getPrefix() {
+        return Optional.ofNullable(prefix);
+    }
+
+    @Override
+    protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder,
+            final JsonSchemaVersion schemaVersion,
+            final Predicate<JsonField> thePredicate) {
+
+        super.appendPayload(jsonObjectBuilder, schemaVersion, thePredicate);
+
+        final Predicate<JsonField> predicate = schemaVersion.and(thePredicate);
+        jsonObjectBuilder.set(JsonFields.JSON_FROM_HISTORICAL_REVISION, fromHistoricalRevision, predicate);
+        jsonObjectBuilder.set(JsonFields.JSON_TO_HISTORICAL_REVISION, toHistoricalRevision, predicate);
+        jsonObjectBuilder.set(JsonFields.JSON_TO_HISTORICAL_REVISION, toHistoricalRevision, predicate);
+        if (null != fromHistoricalTimestamp) {
+            jsonObjectBuilder.set(JsonFields.JSON_FROM_HISTORICAL_TIMESTAMP, fromHistoricalTimestamp.toString(),
+                    predicate);
+        }
+        if (null != toHistoricalTimestamp) {
+            jsonObjectBuilder.set(JsonFields.JSON_TO_HISTORICAL_TIMESTAMP, toHistoricalTimestamp.toString(), predicate);
+        }
+        getPrefix().ifPresent(thePrefix -> jsonObjectBuilder.set(JsonFields.PREFIX, thePrefix));
+    }
+
+    @Override
+    public String getTypePrefix() {
+        return TYPE_PREFIX;
+    }
+
+    @Override
+    public SubscribeForPersistedEvents setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new SubscribeForPersistedEvents(entityId, resourcePath, fromHistoricalRevision, toHistoricalRevision,
+                fromHistoricalTimestamp, toHistoricalTimestamp, prefix, dittoHeaders);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), entityId, resourcePath, fromHistoricalRevision, toHistoricalRevision,
+                fromHistoricalTimestamp, toHistoricalTimestamp, prefix);
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        final SubscribeForPersistedEvents that = (SubscribeForPersistedEvents) obj;
+
+        return that.canEqual(this) && super.equals(that) &&
+                fromHistoricalRevision == that.fromHistoricalRevision &&
+                toHistoricalRevision == that.toHistoricalRevision &&
+                Objects.equals(fromHistoricalTimestamp, that.fromHistoricalTimestamp) &&
+                Objects.equals(toHistoricalTimestamp, that.toHistoricalTimestamp) &&
+                Objects.equals(prefix, that.prefix);
+    }
+
+    @Override
+    protected boolean canEqual(@Nullable final Object other) {
+        return other instanceof SubscribeForPersistedEvents;
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + " [" + super.toString()
+                + ", fromHistoricalRevision=" + fromHistoricalRevision
+                + ", toHistoricalRevision=" + toHistoricalRevision
+                + ", fromHistoricalTimestamp=" + fromHistoricalTimestamp
+                + ", toHistoricalTimestamp=" + toHistoricalTimestamp
+                + ", prefix=" + prefix
+                + "]";
+    }
+
+    /**
+     * This class contains definitions for all specific fields of this command's JSON representation.
+     */
+    public static final class JsonFields {
+
+        private JsonFields() {
+            throw new AssertionError();
+        }
+
+        public static final JsonFieldDefinition<Long> JSON_FROM_HISTORICAL_REVISION =
+                JsonFactory.newLongFieldDefinition("fromHistoricalRevision", REGULAR, V_2);
+
+        public static final JsonFieldDefinition<Long> JSON_TO_HISTORICAL_REVISION =
+                JsonFactory.newLongFieldDefinition("toHistoricalRevision", REGULAR, V_2);
+
+        public static final JsonFieldDefinition<String> JSON_FROM_HISTORICAL_TIMESTAMP =
+                JsonFactory.newStringFieldDefinition("fromHistoricalTimestamp", REGULAR, V_2);
+
+        public static final JsonFieldDefinition<String> JSON_TO_HISTORICAL_TIMESTAMP =
+                JsonFactory.newStringFieldDefinition("toHistoricalTimestamp", REGULAR, V_2);
+
+        static final JsonFieldDefinition<String> PREFIX =
+                JsonFactory.newStringFieldDefinition("prefix", REGULAR, V_2);
+    }
+
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/package-info.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/package-info.java
new file mode 100755
index 00000000000..565442a816b
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/commands/streaming/package-info.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+@org.eclipse.ditto.utils.jsr305.annotations.AllValuesAreNonnullByDefault
+package org.eclipse.ditto.base.model.signals.commands.streaming;
+
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/AbstractEvent.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/AbstractEvent.java
index 3f19feec46a..815c280930a 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/AbstractEvent.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/AbstractEvent.java
@@ -98,6 +98,7 @@ public String getManifest() {
     @Override
     public JsonObject toJson(final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {
         final Predicate<JsonField> predicate = schemaVersion.and(thePredicate);
+
         final JsonObjectBuilder jsonObjectBuilder = JsonFactory.newObjectBuilder()
                 // TYPE is included unconditionally:
                 .set(JsonFields.TYPE, type)
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/AbstractEventsourcedEvent.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/AbstractEventsourcedEvent.java
index af20d1b37e7..0276fa4d5e0 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/AbstractEventsourcedEvent.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/AbstractEventsourcedEvent.java
@@ -96,6 +96,7 @@ public JsonObject toJson(final JsonSchemaVersion schemaVersion, final Predicate<
         //  it shall not invoke super.toJson(...) because in that case "appendPayloadAndBuild" would be invoked twice
         //  and the order of the fields to appear in the JSON would not be controllable!
         final Predicate<JsonField> predicate = schemaVersion.and(thePredicate);
+
         final JsonObjectBuilder jsonObjectBuilder = JsonFactory.newObjectBuilder()
                 // TYPE + entityId is included unconditionally:
                 .set(Event.JsonFields.TYPE, getType())
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/EventJsonDeserializer.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/EventJsonDeserializer.java
index 782ea697881..e8704a716b9 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/EventJsonDeserializer.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/EventJsonDeserializer.java
@@ -22,13 +22,13 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.entity.metadata.Metadata;
+import org.eclipse.ditto.base.model.exceptions.DittoJsonException;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonMissingFieldException;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonParseException;
 import org.eclipse.ditto.json.JsonValue;
-import org.eclipse.ditto.base.model.entity.metadata.Metadata;
-import org.eclipse.ditto.base.model.exceptions.DittoJsonException;
 
 /**
  * This class helps to deserialize JSON to a sub-class of {@link Event}. Hereby this class extracts the values which
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/AbstractStreamingSubscriptionEvent.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/AbstractStreamingSubscriptionEvent.java
new file mode 100755
index 00000000000..ce0089bc51d
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/AbstractStreamingSubscriptionEvent.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.events.streaming;
+
+import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
+
+import java.time.Instant;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.entity.id.EntityIdJsonDeserializer;
+import org.eclipse.ditto.base.model.entity.metadata.Metadata;
+import org.eclipse.ditto.base.model.entity.type.EntityType;
+import org.eclipse.ditto.base.model.entity.type.EntityTypeJsonDeserializer;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.base.model.signals.WithStreamingSubscriptionId;
+import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonField;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
+
+/**
+ * Abstract base class of subscription events. Package-private. Not to be extended in user code.
+ *
+ * @param <T> the type of the implementing class.
+ * @since 3.2.0
+ */
+@Immutable
+abstract class AbstractStreamingSubscriptionEvent<T extends AbstractStreamingSubscriptionEvent<T>> implements
+        StreamingSubscriptionEvent<T> {
+
+    private final String type;
+    private final String subscriptionId;
+
+    private final EntityId entityId;
+    private final DittoHeaders dittoHeaders;
+
+    /**
+     * Constructs a new {@code AbstractStreamingSubscriptionEvent} object.
+     *
+     * @param type the type of this event.
+     * @param subscriptionId the subscription ID.
+     * @param entityId the entity ID of this streaming subscription event.
+     * @param dittoHeaders the headers of the command which was the cause of this event.
+     * @throws NullPointerException if any argument but {@code timestamp} is {@code null}.
+     */
+    protected AbstractStreamingSubscriptionEvent(final String type,
+            final String subscriptionId,
+            final EntityId entityId,
+            final DittoHeaders dittoHeaders) {
+
+        this.type = checkNotNull(type, "type");
+        this.subscriptionId = checkNotNull(subscriptionId, "subscriptionId");
+        this.entityId = checkNotNull(entityId, "entityId");
+        this.dittoHeaders = checkNotNull(dittoHeaders, "dittoHeaders");
+    }
+
+    @Override
+    public String getSubscriptionId() {
+        return subscriptionId;
+    }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public EntityId getEntityId() {
+        return entityId;
+    }
+
+    @Override
+    public EntityType getEntityType() {
+        return entityId.getEntityType();
+    }
+
+    @Override
+    public Optional<Instant> getTimestamp() {
+        // subscription events have no timestamp.
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<Metadata> getMetadata() {
+        return Optional.empty();
+    }
+
+    @Override
+    public DittoHeaders getDittoHeaders() {
+        return dittoHeaders;
+    }
+
+    @Nonnull
+    @Override
+    public String getManifest() {
+        return getType();
+    }
+
+    @Override
+    public JsonObject toJson(final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {
+        final JsonObjectBuilder jsonObjectBuilder = JsonFactory.newObjectBuilder()
+                // TYPE is included unconditionally
+                .set(Event.JsonFields.TYPE, type)
+                .set(WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID, subscriptionId)
+                .set(StreamingSubscriptionEvent.JsonFields.JSON_ENTITY_ID, entityId.toString())
+                .set(StreamingSubscriptionEvent.JsonFields.JSON_ENTITY_TYPE, entityId.getEntityType().toString());
+
+        appendPayload(jsonObjectBuilder);
+
+        return jsonObjectBuilder.build();
+    }
+
+    protected static EntityId deserializeEntityId(final JsonObject jsonObject) {
+        return EntityIdJsonDeserializer.deserializeEntityId(jsonObject,
+                StreamingSubscriptionEvent.JsonFields.JSON_ENTITY_ID,
+                EntityTypeJsonDeserializer.deserializeEntityType(jsonObject,
+                        StreamingSubscriptionEvent.JsonFields.JSON_ENTITY_TYPE));
+    }
+
+    /**
+     * Appends the event specific custom payload to the passed {@code jsonObjectBuilder}.
+     *
+     * @param jsonObjectBuilder the JsonObjectBuilder to add the custom payload to.
+     */
+    protected abstract void appendPayload(final JsonObjectBuilder jsonObjectBuilder);
+
+    @Override
+    public boolean equals(@Nullable final Object o) {
+        if (o != null && getClass() == o.getClass()) {
+            final AbstractStreamingSubscriptionEvent<?> that = (AbstractStreamingSubscriptionEvent<?>) o;
+            return Objects.equals(type, that.type) &&
+                    Objects.equals(subscriptionId, that.subscriptionId) &&
+                    Objects.equals(entityId, that.entityId) &&
+                    Objects.equals(dittoHeaders, that.dittoHeaders);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(type, subscriptionId, entityId, dittoHeaders);
+    }
+
+    @Override
+    public String toString() {
+        return "type=" + type +
+                ", subscriptionId=" + subscriptionId +
+                ", entityId=" + entityId +
+                ", dittoHeaders=" + dittoHeaders;
+    }
+
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionComplete.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionComplete.java
new file mode 100755
index 00000000000..e6bd039cddd
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionComplete.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.events.streaming;
+
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableEvent;
+import org.eclipse.ditto.base.model.signals.WithStreamingSubscriptionId;
+import org.eclipse.ditto.base.model.signals.events.EventJsonDeserializer;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
+import org.eclipse.ditto.json.JsonPointer;
+
+/**
+ * This event is emitted after all items of a subscription are sent.
+ * Corresponds to the reactive-streams signal {@code Subscriber#onComplete()}.
+ *
+ * @since 3.2.0
+ */
+@Immutable
+@JsonParsableEvent(name = StreamingSubscriptionComplete.NAME, typePrefix = StreamingSubscriptionEvent.TYPE_PREFIX)
+public final class StreamingSubscriptionComplete
+        extends AbstractStreamingSubscriptionEvent<StreamingSubscriptionComplete> {
+
+    /**
+     * Name of the event.
+     */
+    public static final String NAME = "complete";
+
+    /**
+     * Type of this event.
+     */
+    public static final String TYPE = TYPE_PREFIX + NAME;
+
+    private StreamingSubscriptionComplete(final String subscriptionId, final EntityId entityId,
+            final DittoHeaders dittoHeaders) {
+        super(TYPE, subscriptionId, entityId, dittoHeaders);
+    }
+
+    /**
+     * Constructs a new {@code StreamingSubscriptionComplete} object.
+     *
+     * @param subscriptionId the subscription ID.
+     * @param entityId the entity ID of this streaming subscription event.
+     * @param dittoHeaders the headers of the command which was the cause of this event.
+     * @return the StreamingSubscriptionComplete created.
+     * @throws NullPointerException if either argument is null.
+     */
+    public static StreamingSubscriptionComplete of(final String subscriptionId, final EntityId entityId,
+            final DittoHeaders dittoHeaders) {
+        return new StreamingSubscriptionComplete(subscriptionId, entityId, dittoHeaders);
+    }
+
+    /**
+     * Creates a new {@code StreamingSubscriptionComplete} from a JSON object.
+     *
+     * @param jsonObject the JSON object from which a new StreamingSubscriptionComplete instance is to be created.
+     * @param dittoHeaders the headers of the command which was the cause of this event.
+     * @return the {@code StreamingSubscriptionComplete} which was created from the given JSON object.
+     * @throws NullPointerException if {@code jsonObject} is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static StreamingSubscriptionComplete fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
+        return new EventJsonDeserializer<StreamingSubscriptionComplete>(TYPE, jsonObject)
+                .deserialize((revision, timestamp, metadata) -> {
+                    final String subscriptionId = jsonObject
+                            .getValueOrThrow(WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID);
+                    final EntityId entityId = deserializeEntityId(jsonObject);
+                    return new StreamingSubscriptionComplete(subscriptionId, entityId, dittoHeaders);
+                });
+    }
+
+    @Override
+    public JsonPointer getResourcePath() {
+        return JsonPointer.empty();
+    }
+
+    @Override
+    public StreamingSubscriptionComplete setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new StreamingSubscriptionComplete(getSubscriptionId(), getEntityId(), dittoHeaders);
+    }
+
+    @Override
+    protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder) {
+        // nothing to add
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + " [" + super.toString() + "]";
+    }
+
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionCreated.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionCreated.java
new file mode 100755
index 00000000000..6c6ffc518e2
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionCreated.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.events.streaming;
+
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableEvent;
+import org.eclipse.ditto.base.model.signals.WithStreamingSubscriptionId;
+import org.eclipse.ditto.base.model.signals.events.EventJsonDeserializer;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
+import org.eclipse.ditto.json.JsonPointer;
+
+/**
+ * This event is emitted after a stream is established for items to be streamed in the back-end.
+ * Corresponds to the reactive-streams signal {@code Subscriber#onSubscribe(Subscription)}.
+ *
+ * @since 3.2.0
+ */
+@Immutable
+@JsonParsableEvent(name = StreamingSubscriptionCreated.NAME, typePrefix = StreamingSubscriptionEvent.TYPE_PREFIX)
+public final class StreamingSubscriptionCreated
+        extends AbstractStreamingSubscriptionEvent<StreamingSubscriptionCreated> {
+
+    /**
+     * Name of the event.
+     */
+    public static final String NAME = "created";
+
+    /**
+     * Type of this event.
+     */
+    public static final String TYPE = TYPE_PREFIX + NAME;
+
+    private StreamingSubscriptionCreated(final String subscriptionId,
+            final EntityId entityId,
+            final DittoHeaders dittoHeaders) {
+        super(TYPE, subscriptionId, entityId, dittoHeaders);
+    }
+
+    /**
+     * Constructs a new {@code StreamingSubscriptionCreated} event.
+     *
+     * @param subscriptionId the subscription ID.
+     * @param entityId the entity ID of this streaming subscription event.
+     * @param dittoHeaders the headers of the command which was the cause of this event.
+     * @return the event.
+     * @throws NullPointerException if either argument is null.
+     */
+    public static StreamingSubscriptionCreated of(final String subscriptionId,
+            final EntityId entityId,
+            final DittoHeaders dittoHeaders) {
+        return new StreamingSubscriptionCreated(subscriptionId, entityId, dittoHeaders);
+    }
+
+    /**
+     * Creates a new {@code StreamingSubscriptionCreated} from a JSON object.
+     *
+     * @param jsonObject the JSON object from which a new StreamingSubscriptionCreated instance is to be created.
+     * @param dittoHeaders the headers of the command which was the cause of this event.
+     * @return the {@code StreamingSubscriptionCreated} which was created from the given JSON object.
+     * @throws NullPointerException if {@code jsonObject} is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static StreamingSubscriptionCreated fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
+        return new EventJsonDeserializer<StreamingSubscriptionCreated>(TYPE, jsonObject)
+                .deserialize((revision, timestamp, metadata) -> {
+                    final String subscriptionId = jsonObject
+                            .getValueOrThrow(WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID);
+                    final EntityId entityId = deserializeEntityId(jsonObject);
+                    return new StreamingSubscriptionCreated(subscriptionId, entityId, dittoHeaders);
+                });
+    }
+
+    @Override
+    public JsonPointer getResourcePath() {
+        return JsonPointer.empty();
+    }
+
+    @Override
+    public StreamingSubscriptionCreated setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new StreamingSubscriptionCreated(getSubscriptionId(), getEntityId(), dittoHeaders);
+    }
+
+    @Override
+    protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder) {
+        // nothing to add
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + " [" + super.toString() + "]";
+    }
+
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionEvent.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionEvent.java
new file mode 100755
index 00000000000..a009d0fded2
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionEvent.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.events.streaming;
+
+import static org.eclipse.ditto.base.model.json.FieldType.REGULAR;
+import static org.eclipse.ditto.base.model.json.JsonSchemaVersion.V_2;
+
+import org.eclipse.ditto.base.model.entity.id.WithEntityId;
+import org.eclipse.ditto.base.model.entity.type.WithEntityType;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+
+/**
+ * Interface for all outgoing messages related to a subscription for streaming something.
+ *
+ * @param <T> the type of the implementing class.
+ * @since 3.2.0
+ */
+public interface StreamingSubscriptionEvent<T extends StreamingSubscriptionEvent<T>> extends Event<T>,
+        WithEntityId, WithEntityType {
+
+    /**
+     * Resource type of streaming subscription events.
+     */
+    String RESOURCE_TYPE = "streaming.subscription";
+
+    /**
+     * Type Prefix of Streaming events.
+     */
+    String TYPE_PREFIX = RESOURCE_TYPE + "." + TYPE_QUALIFIER + ":";
+
+    /**
+     * Returns the subscriptionId identifying the session of this streaming signal.
+     *
+     * @return the subscriptionId.
+     */
+    String getSubscriptionId();
+
+    @Override
+    T setDittoHeaders(DittoHeaders dittoHeaders);
+
+    @Override
+    default String getResourceType() {
+        return RESOURCE_TYPE;
+    }
+
+    /**
+     * This class contains definitions for all specific fields of this event's JSON representation.
+     */
+    final class JsonFields {
+
+        private JsonFields() {
+            throw new AssertionError();
+        }
+
+        public static final JsonFieldDefinition<String> JSON_ENTITY_ID =
+                JsonFactory.newStringFieldDefinition("entityId", REGULAR, V_2);
+
+        public static final JsonFieldDefinition<String> JSON_ENTITY_TYPE =
+                JsonFactory.newStringFieldDefinition("entityType", REGULAR, V_2);
+
+    }
+
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionFailed.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionFailed.java
new file mode 100755
index 00000000000..4e4f878e34d
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionFailed.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.events.streaming;
+
+import java.util.Objects;
+
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableEvent;
+import org.eclipse.ditto.base.model.signals.GlobalErrorRegistry;
+import org.eclipse.ditto.base.model.signals.WithStreamingSubscriptionId;
+import org.eclipse.ditto.base.model.signals.events.EventJsonDeserializer;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
+import org.eclipse.ditto.json.JsonPointer;
+
+/**
+ * This event is emitted after a stream failed.
+ * Corresponds to the reactive-streams signal {@code Subscriber#onError()}.
+ *
+ * @since 3.2.0
+ */
+@Immutable
+@JsonParsableEvent(name = StreamingSubscriptionFailed.NAME, typePrefix = StreamingSubscriptionEvent.TYPE_PREFIX)
+public final class StreamingSubscriptionFailed extends AbstractStreamingSubscriptionEvent<StreamingSubscriptionFailed> {
+
+    /**
+     * Name of the event.
+     */
+    public static final String NAME = "failed";
+
+    /**
+     * Type of this event.
+     */
+    public static final String TYPE = TYPE_PREFIX + NAME;
+
+    private final DittoRuntimeException error;
+
+    private StreamingSubscriptionFailed(final String subscriptionId,
+            final EntityId entityId,
+            final DittoRuntimeException error,
+            final DittoHeaders dittoHeaders) {
+        super(TYPE, subscriptionId, entityId, dittoHeaders);
+        this.error = error;
+    }
+
+    /**
+     * Constructs a new {@code StreamingSubscriptionFailed} object.
+     *
+     * @param subscriptionId the subscription ID.
+     * @param entityId the entity ID of this streaming subscription event.
+     * @param error the cause of the failure.
+     * @param dittoHeaders the headers of the command which was the cause of this event.
+     * @return the StreamingSubscriptionFailed created.
+     * @throws NullPointerException if either argument is null.
+     */
+    public static StreamingSubscriptionFailed of(final String subscriptionId,
+            final EntityId entityId,
+            final DittoRuntimeException error,
+            final DittoHeaders dittoHeaders) {
+        return new StreamingSubscriptionFailed(subscriptionId, entityId, error, dittoHeaders);
+    }
+
+    /**
+     * Creates a new {@code StreamingSubscriptionFailed} from a JSON object.
+     *
+     * @param jsonObject the JSON object from which a new StreamingSubscriptionFailed instance is to be created.
+     * @param dittoHeaders the headers of the command which was the cause of this event.
+     * @return the {@code StreamingSubscriptionFailed} which was created from the given JSON object.
+     * @throws NullPointerException if {@code jsonObject} is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static StreamingSubscriptionFailed fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
+        return new EventJsonDeserializer<StreamingSubscriptionFailed>(TYPE, jsonObject)
+                .deserialize((revision, timestamp, metadata) -> {
+                    final String subscriptionId =
+                            jsonObject.getValueOrThrow(WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID);
+                    final JsonObject errorJson = jsonObject.getValueOrThrow(JsonFields.ERROR);
+                    final EntityId entityId = deserializeEntityId(jsonObject);
+                    final DittoRuntimeException error =
+                            GlobalErrorRegistry.getInstance().parse(errorJson, dittoHeaders);
+                    return new StreamingSubscriptionFailed(subscriptionId, entityId, error, dittoHeaders);
+                });
+    }
+
+    /**
+     * Get the cause of the failure.
+     *
+     * @return the error in JSON format.
+     */
+    public DittoRuntimeException getError() {
+        return error;
+    }
+
+    /**
+     * Create a copy of this event with a new error.
+     *
+     * @param error the new error.
+     * @return the copied event with new error.
+     */
+    public StreamingSubscriptionFailed setError(final DittoRuntimeException error) {
+        return new StreamingSubscriptionFailed(getSubscriptionId(), getEntityId(), error, getDittoHeaders());
+    }
+
+    @Override
+    public JsonPointer getResourcePath() {
+        return JsonPointer.empty();
+    }
+
+    @Override
+    public StreamingSubscriptionFailed setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new StreamingSubscriptionFailed(getSubscriptionId(), getEntityId(), error, dittoHeaders);
+    }
+
+    @Override
+    protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder) {
+        jsonObjectBuilder.set(JsonFields.ERROR, error.toJson());
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        return super.equals(o) && Objects.equals(error, ((StreamingSubscriptionFailed) o).error);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), error);
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + " [" + super.toString() + ", error=" + error + "]";
+    }
+
+    /**
+     * Json fields of this event.
+     */
+    public static final class JsonFields {
+
+        /**
+         * Json fields for a JSON representation of the error.
+         */
+        public static final JsonFieldDefinition<JsonObject> ERROR =
+                JsonFactory.newJsonObjectFieldDefinition("error");
+
+        JsonFields() {
+            throw new AssertionError();
+        }
+    }
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionHasNext.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionHasNext.java
new file mode 100755
index 00000000000..c8539110fb9
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionHasNext.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.events.streaming;
+
+import java.util.Objects;
+
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableEvent;
+import org.eclipse.ditto.base.model.signals.WithStreamingSubscriptionId;
+import org.eclipse.ditto.base.model.signals.events.EventJsonDeserializer;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
+import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.json.JsonValue;
+
+/**
+ * This event is emitted after the next items to stream are ready.
+ * Corresponds to the reactive-streams signal {@code Subscriber#onNext(T)}.
+ *
+ * @since 3.2.0
+ */
+@Immutable
+@JsonParsableEvent(name = StreamingSubscriptionHasNext.NAME, typePrefix = StreamingSubscriptionEvent.TYPE_PREFIX)
+public final class StreamingSubscriptionHasNext
+        extends AbstractStreamingSubscriptionEvent<StreamingSubscriptionHasNext> {
+
+    /**
+     * Name of the event.
+     */
+    public static final String NAME = "next";
+
+    /**
+     * Type of this event.
+     */
+    public static final String TYPE = TYPE_PREFIX + NAME;
+
+    private final JsonValue item;
+
+    private StreamingSubscriptionHasNext(final String subscriptionId,
+            final EntityId entityId,
+            final JsonValue item,
+            final DittoHeaders dittoHeaders) {
+        super(TYPE, subscriptionId, entityId, dittoHeaders);
+        this.item = item;
+    }
+
+    /**
+     * Constructs a new {@code SubscriptionHasNext} object.
+     *
+     * @param subscriptionId the subscription ID.
+     * @param entityId the entity ID of this streaming subscription event.
+     * @param item the "next" item.
+     * @param dittoHeaders the headers of the command which was the cause of this event.
+     * @return the SubscriptionHasNext created.
+     * @throws NullPointerException if either argument is null.
+     */
+    public static StreamingSubscriptionHasNext of(final String subscriptionId,
+            final EntityId entityId,
+            final JsonValue item,
+            final DittoHeaders dittoHeaders) {
+        return new StreamingSubscriptionHasNext(subscriptionId, entityId, item, dittoHeaders);
+    }
+
+    /**
+     * Creates a new {@code SubscriptionHasNext} from a JSON object.
+     *
+     * @param jsonObject the JSON object from which a new SubscriptionHasNext instance is to be created.
+     * @param dittoHeaders the headers of the command which was the cause of this event.
+     * @return the {@code SubscriptionHasNext} which was created from the given JSON object.
+     * @throws NullPointerException if {@code jsonObject} is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static StreamingSubscriptionHasNext fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
+        return new EventJsonDeserializer<StreamingSubscriptionHasNext>(TYPE, jsonObject)
+                .deserialize((revision, timestamp, metadata) -> {
+                    final String subscriptionId =
+                            jsonObject.getValueOrThrow(WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID);
+                    final EntityId entityId = deserializeEntityId(jsonObject);
+                    final JsonValue item = jsonObject.getValueOrThrow(JsonFields.ITEM);
+                    return new StreamingSubscriptionHasNext(subscriptionId, entityId, item, dittoHeaders);
+                });
+    }
+
+    /**
+     * Get the "next" item.
+     *
+     * @return the next item.
+     */
+    public JsonValue getItem() {
+        return item;
+    }
+
+    /**
+     * Create a copy of this event with a new item.
+     *
+     * @param item the new item.
+     * @return the copied event with new item.
+     */
+    public StreamingSubscriptionHasNext setItem(final JsonValue item) {
+        return new StreamingSubscriptionHasNext(getSubscriptionId(), getEntityId(), item, getDittoHeaders());
+    }
+
+    @Override
+    public JsonPointer getResourcePath() {
+        return JsonPointer.empty();
+    }
+
+    @Override
+    public StreamingSubscriptionHasNext setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new StreamingSubscriptionHasNext(getSubscriptionId(), getEntityId(), item, dittoHeaders);
+    }
+
+    @Override
+    protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder) {
+        jsonObjectBuilder.set(JsonFields.ITEM, item);
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        // super.equals(o) guarantees getClass() == o.getClass()
+        return super.equals(o) && Objects.equals(item, ((StreamingSubscriptionHasNext) o).item);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), item);
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + " [" + super.toString() + ", item=" + item + "]";
+    }
+
+    /**
+     * Json fields of this event.
+     */
+    public static final class JsonFields {
+
+        /**
+         * Json field for "next" item.
+         */
+        public static final JsonFieldDefinition<JsonValue> ITEM =
+                JsonFactory.newJsonValueFieldDefinition("item");
+
+        JsonFields() {
+            throw new AssertionError();
+        }
+    }
+}
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/package-info.java b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/package-info.java
new file mode 100755
index 00000000000..7a13cf46a93
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/signals/events/streaming/package-info.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+@org.eclipse.ditto.utils.jsr305.annotations.AllValuesAreNonnullByDefault
+package org.eclipse.ditto.base.model.signals.events.streaming;
+
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java
index 5c53e597a8c..6685dd2873e 100755
--- a/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java
@@ -19,11 +19,13 @@
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -129,6 +131,12 @@ public final class ImmutableDittoHeadersTest {
                             .build())
                     .build())
             .build();
+    private static final Long KNOWN_AT_HISTORICAL_REVISION = 42L;
+    private static final Instant KNOWN_AT_HISTORICAL_TIMESTAMP = Instant.now();
+
+    private static final JsonObject KNOWN_HISTORICAL_HEADERS = JsonObject.newBuilder()
+            .set(DittoHeaderDefinition.ORIGINATOR.getKey(), "foo:bar")
+            .build();
 
 
     static {
@@ -199,6 +207,9 @@ public void settingAllKnownHeadersWorksAsExpected() {
                 .putHeader(DittoHeaderDefinition.GET_METADATA.getKey(), KNOWN_DITTO_GET_METADATA )
                 .putHeader(DittoHeaderDefinition.DELETE_METADATA.getKey(), KNOWN_DITTO_DELETE_METADATA )
                 .putHeader(DittoHeaderDefinition.DITTO_METADATA.getKey(), KNOWN_DITTO_METADATA.formatAsString())
+                .putHeader(DittoHeaderDefinition.AT_HISTORICAL_REVISION.getKey(), String.valueOf(KNOWN_AT_HISTORICAL_REVISION))
+                .putHeader(DittoHeaderDefinition.AT_HISTORICAL_TIMESTAMP.getKey(), String.valueOf(KNOWN_AT_HISTORICAL_TIMESTAMP))
+                .putHeader(DittoHeaderDefinition.HISTORICAL_HEADERS.getKey(), KNOWN_HISTORICAL_HEADERS.formatAsString())
                 .build();
 
         assertThat(underTest).isEqualTo(expectedHeaderMap);
@@ -526,6 +537,9 @@ public void toJsonReturnsExpected() {
                 .set(DittoHeaderDefinition.GET_METADATA.getKey(), KNOWN_DITTO_GET_METADATA)
                 .set(DittoHeaderDefinition.DELETE_METADATA.getKey(), KNOWN_DITTO_DELETE_METADATA)
                 .set(DittoHeaderDefinition.DITTO_METADATA.getKey(), KNOWN_DITTO_METADATA)
+                .set(DittoHeaderDefinition.AT_HISTORICAL_REVISION.getKey(), KNOWN_AT_HISTORICAL_REVISION)
+                .set(DittoHeaderDefinition.AT_HISTORICAL_TIMESTAMP.getKey(), KNOWN_AT_HISTORICAL_TIMESTAMP.toString())
+                .set(DittoHeaderDefinition.HISTORICAL_HEADERS.getKey(), KNOWN_HISTORICAL_HEADERS)
                 .build();
 
         final Map<String, String> allKnownHeaders = createMapContainingAllKnownHeaders();
@@ -710,7 +724,7 @@ public void preserveCapitalizationOfCorrelationId() {
     }
 
     private static Map<String, String> createMapContainingAllKnownHeaders() {
-        final Map<String, String> result = new HashMap<>();
+        final Map<String, String> result = new LinkedHashMap<>();
         result.put(DittoHeaderDefinition.AUTHORIZATION_CONTEXT.getKey(), AUTH_CONTEXT.toJsonString());
         result.put(DittoHeaderDefinition.CORRELATION_ID.getKey(), KNOWN_CORRELATION_ID);
         result.put(DittoHeaderDefinition.SCHEMA_VERSION.getKey(), KNOWN_SCHEMA_VERSION.toString());
@@ -762,6 +776,9 @@ private static Map<String, String> createMapContainingAllKnownHeaders() {
         result.put(DittoHeaderDefinition.GET_METADATA.getKey(), KNOWN_DITTO_GET_METADATA);
         result.put(DittoHeaderDefinition.DELETE_METADATA.getKey(), KNOWN_DITTO_DELETE_METADATA);
         result.put(DittoHeaderDefinition.DITTO_METADATA.getKey(), KNOWN_DITTO_METADATA.formatAsString());
+        result.put(DittoHeaderDefinition.AT_HISTORICAL_REVISION.getKey(), String.valueOf(KNOWN_AT_HISTORICAL_REVISION));
+        result.put(DittoHeaderDefinition.AT_HISTORICAL_TIMESTAMP.getKey(), String.valueOf(KNOWN_AT_HISTORICAL_TIMESTAMP));
+        result.put(DittoHeaderDefinition.HISTORICAL_HEADERS.getKey(), KNOWN_HISTORICAL_HEADERS.formatAsString());
 
         return result;
     }
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/signals/ShardedMessageEnvelopeTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/ShardedMessageEnvelopeTest.java
index ccc35d53b85..b1e2ad591f2 100644
--- a/base/model/src/test/java/org/eclipse/ditto/base/model/signals/ShardedMessageEnvelopeTest.java
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/ShardedMessageEnvelopeTest.java
@@ -14,11 +14,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
 import org.eclipse.ditto.base.model.entity.type.EntityType;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonObject;
 import org.junit.Test;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
@@ -31,7 +32,7 @@ public final class ShardedMessageEnvelopeTest {
     private static final DittoHeaders DITTO_HEADERS = DittoHeaders.empty();
 
     private static final EntityId MESSAGE_ID =
-            EntityId.of(EntityType.of("thing"), "org.eclipse.ditto.test:thingId");
+            NamespacedEntityId.of(EntityType.of("thing"), "org.eclipse.ditto.test:thingId");
     private static final String TYPE = "message-type";
     private static final JsonObject MESSAGE = JsonFactory.newObjectBuilder().set("hello", "world").build();
 
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/signals/commands/streaming/CancelStreamingSubscriptionTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/commands/streaming/CancelStreamingSubscriptionTest.java
new file mode 100755
index 00000000000..520e43134e2
--- /dev/null
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/commands/streaming/CancelStreamingSubscriptionTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.commands.streaming;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
+import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
+
+import java.util.UUID;
+
+import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
+import org.eclipse.ditto.base.model.entity.type.EntityType;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.json.JsonPointer;
+import org.junit.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Tests {@link CancelStreamingSubscription}.
+ */
+public final class CancelStreamingSubscriptionTest {
+
+    @Test
+    public void assertImmutability() {
+        assertInstancesOf(CancelStreamingSubscription.class, areImmutable());
+    }
+
+    @Test
+    public void testHashCodeAndEquals() {
+        EqualsVerifier.forClass(CancelStreamingSubscription.class)
+                .withRedefinedSuperclass()
+                .verify();
+    }
+
+    @Test
+    public void serialization() {
+        final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().randomCorrelationId().build();
+        final CancelStreamingSubscription underTest = CancelStreamingSubscription.of(
+                NamespacedEntityId.of(EntityType.of("thing"), "foo:bar"),
+                JsonPointer.of("/"),
+                UUID.randomUUID().toString(), dittoHeaders);
+        final CancelStreamingSubscription deserialized = CancelStreamingSubscription.fromJson(underTest.toJson(), dittoHeaders);
+        assertThat(deserialized).isEqualTo(underTest);
+    }
+
+}
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/signals/commands/streaming/RequestFromStreamingSubscriptionTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/commands/streaming/RequestFromStreamingSubscriptionTest.java
new file mode 100755
index 00000000000..1c0c8f31988
--- /dev/null
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/commands/streaming/RequestFromStreamingSubscriptionTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.commands.streaming;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
+import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
+
+import java.util.UUID;
+
+import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
+import org.eclipse.ditto.base.model.entity.type.EntityType;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.json.JsonPointer;
+import org.junit.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Tests {@link RequestFromStreamingSubscription}.
+ */
+public final class RequestFromStreamingSubscriptionTest {
+
+    @Test
+    public void assertImmutability() {
+        assertInstancesOf(RequestFromStreamingSubscription.class, areImmutable());
+    }
+
+    @Test
+    public void testHashCodeAndEquals() {
+        EqualsVerifier.forClass(RequestFromStreamingSubscription.class)
+                .withRedefinedSuperclass()
+                .verify();
+    }
+
+    @Test
+    public void serialization() {
+        final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().randomCorrelationId().build();
+        final RequestFromStreamingSubscription
+                underTest = RequestFromStreamingSubscription.of(NamespacedEntityId.of(EntityType.of("thing"), "foo:bar"),
+                JsonPointer.of("/"), UUID.randomUUID().toString(), 9L, dittoHeaders);
+        final RequestFromStreamingSubscription deserialized = RequestFromStreamingSubscription.fromJson(underTest.toJson(), dittoHeaders);
+        assertThat(deserialized).isEqualTo(underTest);
+    }
+
+}
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/signals/commands/streaming/SubscribeForPersistedEventsTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/commands/streaming/SubscribeForPersistedEventsTest.java
new file mode 100755
index 00000000000..c78c8dab609
--- /dev/null
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/commands/streaming/SubscribeForPersistedEventsTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.commands.streaming;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mutabilitydetector.unittesting.AllowedReason.provided;
+import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
+import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
+
+import java.time.Instant;
+
+import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
+import org.eclipse.ditto.base.model.entity.type.EntityType;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.commands.Command;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonPointer;
+import org.junit.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Tests {@link SubscribeForPersistedEvents}.
+ */
+public final class SubscribeForPersistedEventsTest {
+
+    private static final String KNOWN_ENTITY_ID_STR = "foo:bar";
+    private static final String KNOWN_ENTITY_TYPE_STR = "thing";
+    private static final String KNOWN_RESOURCE_PATH = "/";
+
+    private static final long KNOWN_FROM_REV = 23L;
+    private static final long KNOWN_TO_REV = 42L;
+    private static final String KNOWN_FROM_TS = "2022-10-25T14:00:00Z";
+    private static final String KNOWN_TO_TS = "2022-10-25T15:00:00Z";
+
+    private static final String JSON_ALL_FIELDS = JsonFactory.newObjectBuilder()
+            .set(Command.JsonFields.TYPE, SubscribeForPersistedEvents.TYPE)
+            .set(StreamingSubscriptionCommand.JsonFields.JSON_ENTITY_TYPE, KNOWN_ENTITY_TYPE_STR)
+            .set(StreamingSubscriptionCommand.JsonFields.JSON_ENTITY_ID, KNOWN_ENTITY_ID_STR)
+            .set(StreamingSubscriptionCommand.JsonFields.JSON_RESOURCE_PATH, KNOWN_RESOURCE_PATH)
+            .set(SubscribeForPersistedEvents.JsonFields.JSON_FROM_HISTORICAL_REVISION, KNOWN_FROM_REV)
+            .set(SubscribeForPersistedEvents.JsonFields.JSON_TO_HISTORICAL_REVISION, KNOWN_TO_REV)
+            .set(SubscribeForPersistedEvents.JsonFields.JSON_FROM_HISTORICAL_TIMESTAMP, KNOWN_FROM_TS)
+            .set(SubscribeForPersistedEvents.JsonFields.JSON_TO_HISTORICAL_TIMESTAMP, KNOWN_TO_TS)
+            .build()
+            .toString();
+
+    private static final String JSON_MINIMAL = JsonFactory.newObjectBuilder()
+            .set(Command.JsonFields.TYPE, SubscribeForPersistedEvents.TYPE)
+            .set(StreamingSubscriptionCommand.JsonFields.JSON_ENTITY_TYPE, KNOWN_ENTITY_TYPE_STR)
+            .set(StreamingSubscriptionCommand.JsonFields.JSON_ENTITY_ID, KNOWN_ENTITY_ID_STR)
+            .set(StreamingSubscriptionCommand.JsonFields.JSON_RESOURCE_PATH, KNOWN_RESOURCE_PATH)
+            .set(SubscribeForPersistedEvents.JsonFields.JSON_FROM_HISTORICAL_REVISION, KNOWN_FROM_REV)
+            .set(SubscribeForPersistedEvents.JsonFields.JSON_TO_HISTORICAL_REVISION, KNOWN_TO_REV)
+            .build().toString();
+
+    @Test
+    public void assertImmutability() {
+        assertInstancesOf(SubscribeForPersistedEvents.class,
+                areImmutable(),
+                provided(Instant.class).isAlsoImmutable());
+    }
+
+    @Test
+    public void testHashCodeAndEquals() {
+        EqualsVerifier.forClass(SubscribeForPersistedEvents.class)
+                .withRedefinedSuperclass()
+                .verify();
+    }
+
+    @Test
+    public void toJsonWithAllFieldsSet() {
+        final SubscribeForPersistedEvents command = SubscribeForPersistedEvents.of(
+                NamespacedEntityId.of(EntityType.of(KNOWN_ENTITY_TYPE_STR), KNOWN_ENTITY_ID_STR),
+                JsonPointer.of(KNOWN_RESOURCE_PATH),
+                KNOWN_FROM_REV,
+                KNOWN_TO_REV,
+                Instant.parse(KNOWN_FROM_TS),
+                Instant.parse(KNOWN_TO_TS),
+                DittoHeaders.empty()
+        );
+
+        final String json = command.toJsonString();
+        assertThat(json).isEqualTo(JSON_ALL_FIELDS);
+    }
+
+    @Test
+    public void toJsonWithOnlyRequiredFieldsSet() {
+        final SubscribeForPersistedEvents command = SubscribeForPersistedEvents.of(
+                NamespacedEntityId.of(EntityType.of(KNOWN_ENTITY_TYPE_STR), KNOWN_ENTITY_ID_STR),
+                JsonPointer.of(KNOWN_RESOURCE_PATH),
+                KNOWN_FROM_REV,
+                KNOWN_TO_REV,
+                DittoHeaders.empty());
+        final String json = command.toJsonString();
+        assertThat(json).isEqualTo(JSON_MINIMAL);
+    }
+
+    @Test
+    public void fromJsonWithAllFieldsSet() {
+        final SubscribeForPersistedEvents command = SubscribeForPersistedEvents.of(
+                NamespacedEntityId.of(EntityType.of(KNOWN_ENTITY_TYPE_STR), KNOWN_ENTITY_ID_STR),
+                JsonPointer.of(KNOWN_RESOURCE_PATH),
+                KNOWN_FROM_REV,
+                KNOWN_TO_REV,
+                Instant.parse(KNOWN_FROM_TS),
+                Instant.parse(KNOWN_TO_TS),
+                DittoHeaders.empty()
+        );
+        assertThat(SubscribeForPersistedEvents.fromJson(JsonObject.of(JSON_ALL_FIELDS), DittoHeaders.empty()))
+                .isEqualTo(command);
+    }
+
+    @Test
+    public void fromJsonWithOnlyRequiredFieldsSet() {
+        assertThat(SubscribeForPersistedEvents.fromJson(JsonObject.of(JSON_MINIMAL), DittoHeaders.empty()))
+                .isEqualTo(SubscribeForPersistedEvents.of(
+                        NamespacedEntityId.of(EntityType.of(KNOWN_ENTITY_TYPE_STR), KNOWN_ENTITY_ID_STR),
+                        JsonPointer.of(KNOWN_RESOURCE_PATH),
+                        KNOWN_FROM_REV,
+                        KNOWN_TO_REV,
+                        DittoHeaders.empty()));
+    }
+
+}
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionCompleteTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionCompleteTest.java
new file mode 100644
index 00000000000..1f628cf250f
--- /dev/null
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionCompleteTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.events.streaming;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
+import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
+
+import java.util.UUID;
+
+import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
+import org.eclipse.ditto.base.model.entity.type.EntityType;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.junit.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Tests {@link StreamingSubscriptionComplete}.
+ */
+public final class StreamingSubscriptionCompleteTest {
+
+    @Test
+    public void assertImmutability() {
+        assertInstancesOf(StreamingSubscriptionComplete.class, areImmutable());
+    }
+
+    @Test
+    public void testHashCodeAndEquals() {
+        EqualsVerifier.forClass(StreamingSubscriptionComplete.class).withRedefinedSuperclass().verify();
+    }
+
+    @Test
+    public void serialization() {
+        final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().randomCorrelationId().build();
+        final StreamingSubscriptionComplete underTest = StreamingSubscriptionComplete.of(UUID.randomUUID().toString(),
+                NamespacedEntityId.of(EntityType.of("thing"), "foo:bar"), dittoHeaders);
+        final StreamingSubscriptionComplete deserialized = StreamingSubscriptionComplete.fromJson(underTest.toJson(), dittoHeaders);
+        assertThat(deserialized).isEqualTo(underTest);
+    }
+}
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionCreatedTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionCreatedTest.java
new file mode 100644
index 00000000000..cc97fc9cee3
--- /dev/null
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionCreatedTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.events.streaming;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
+import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
+
+import java.util.UUID;
+
+import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
+import org.eclipse.ditto.base.model.entity.type.EntityType;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.junit.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Tests {@link StreamingSubscriptionCreated}.
+ */
+public final class StreamingSubscriptionCreatedTest {
+
+    @Test
+    public void assertImmutability() {
+        assertInstancesOf(StreamingSubscriptionCreated.class, areImmutable());
+    }
+
+    @Test
+    public void testHashCodeAndEquals() {
+        EqualsVerifier.forClass(StreamingSubscriptionCreated.class).withRedefinedSuperclass().verify();
+    }
+
+    @Test
+    public void serialization() {
+        final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().randomCorrelationId().build();
+        final StreamingSubscriptionCreated underTest = StreamingSubscriptionCreated.of(UUID.randomUUID().toString(),
+                NamespacedEntityId.of(EntityType.of("thing"), "foo:bar"), dittoHeaders);
+        final StreamingSubscriptionCreated deserialized = StreamingSubscriptionCreated.fromJson(underTest.toJson(), dittoHeaders);
+        assertThat(deserialized).isEqualTo(underTest);
+    }
+}
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionFailedTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionFailedTest.java
new file mode 100644
index 00000000000..03ccc64ab3b
--- /dev/null
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionFailedTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.events.streaming;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mutabilitydetector.unittesting.AllowedReason.provided;
+import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
+import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
+
+import java.util.UUID;
+
+import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
+import org.eclipse.ditto.base.model.entity.type.EntityType;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.exceptions.InvalidRqlExpressionException;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.GlobalErrorRegistry;
+import org.junit.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Tests {@link StreamingSubscriptionFailed}.
+ */
+public final class StreamingSubscriptionFailedTest {
+
+    @Test
+    public void assertImmutability() {
+        assertInstancesOf(StreamingSubscriptionFailed.class, areImmutable(),
+                provided(DittoRuntimeException.class).isAlsoImmutable());
+    }
+
+    @Test
+    public void testHashCodeAndEquals() {
+        EqualsVerifier.forClass(StreamingSubscriptionFailed.class).withRedefinedSuperclass().verify();
+    }
+
+    @Test
+    public void serialization() {
+        final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().randomCorrelationId().build();
+        final DittoRuntimeException error = GlobalErrorRegistry.getInstance()
+                .parse(InvalidRqlExpressionException.newBuilder().build().toJson(), dittoHeaders);
+        final StreamingSubscriptionFailed underTest = StreamingSubscriptionFailed.of(UUID.randomUUID().toString(),
+                NamespacedEntityId.of(EntityType.of("thing"), "foo:bar"), error, dittoHeaders);
+        final StreamingSubscriptionFailed deserialized = StreamingSubscriptionFailed.fromJson(underTest.toJson(), dittoHeaders);
+        assertThat(deserialized).isEqualTo(underTest);
+    }
+}
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionHasNextTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionHasNextTest.java
new file mode 100644
index 00000000000..15c371b4567
--- /dev/null
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/signals/events/streaming/StreamingSubscriptionHasNextTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.signals.events.streaming;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mutabilitydetector.unittesting.AllowedReason.provided;
+import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
+import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
+
+import java.util.UUID;
+
+import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
+import org.eclipse.ditto.base.model.entity.type.EntityType;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.json.JsonArray;
+import org.eclipse.ditto.json.JsonValue;
+import org.junit.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Tests {@link StreamingSubscriptionHasNext}.
+ */
+public final class StreamingSubscriptionHasNextTest {
+
+    @Test
+    public void assertImmutability() {
+        assertInstancesOf(StreamingSubscriptionHasNext.class, areImmutable(), provided(JsonValue.class).isAlsoImmutable());
+    }
+
+    @Test
+    public void testHashCodeAndEquals() {
+        EqualsVerifier.forClass(StreamingSubscriptionHasNext.class).withRedefinedSuperclass().verify();
+    }
+
+    @Test
+    public void serialization() {
+        final DittoHeaders dittoHeaders = DittoHeaders.newBuilder().randomCorrelationId().build();
+        final JsonArray items = JsonArray.of("[{\"x\":1},{\"x\":2}]");
+        final StreamingSubscriptionHasNext
+                underTest = StreamingSubscriptionHasNext.of(UUID.randomUUID().toString(),
+                NamespacedEntityId.of(EntityType.of("thing"), "foo:bar"), items, dittoHeaders);
+        final StreamingSubscriptionHasNext deserialized = StreamingSubscriptionHasNext.fromJson(underTest.toJson(), dittoHeaders);
+        assertThat(deserialized).isEqualTo(underTest);
+    }
+}
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionHistoryNotAccessibleException.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionHistoryNotAccessibleException.java
new file mode 100755
index 00000000000..e51a650b3ae
--- /dev/null
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionHistoryNotAccessibleException.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.connectivity.model.signals.commands.exceptions;
+
+import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
+
+import java.net.URI;
+import java.text.MessageFormat;
+import java.time.Instant;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+import javax.annotation.concurrent.NotThreadSafe;
+
+import org.eclipse.ditto.base.model.common.HttpStatus;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.connectivity.model.ConnectionId;
+import org.eclipse.ditto.connectivity.model.ConnectivityException;
+import org.eclipse.ditto.json.JsonObject;
+
+/**
+ * Thrown if historical data of the Connection was either not present in Ditto at all or if the requester had insufficient
+ * permissions to access it.
+ *
+ * @since 3.2.0
+ */
+@Immutable
+@JsonParsableException(errorCode = ConnectionHistoryNotAccessibleException.ERROR_CODE)
+public final class ConnectionHistoryNotAccessibleException extends DittoRuntimeException
+        implements ConnectivityException {
+
+    /**
+     * Error code of this exception.
+     */
+    public static final String ERROR_CODE = ERROR_CODE_PREFIX + "connection.history.notfound";
+
+    private static final String MESSAGE_TEMPLATE =
+            "The Connection with ID ''{0}'' at revision ''{1}'' could not be found or requester had insufficient " +
+                    "permissions to access it.";
+
+    private static final String MESSAGE_TEMPLATE_TS =
+            "The Connection with ID ''{0}'' at timestamp ''{1}'' could not be found or requester had insufficient " +
+                    "permissions to access it.";
+
+    private static final String DEFAULT_DESCRIPTION =
+            "Check if the ID of your requested Connection was correct, you have sufficient permissions and ensure that the " +
+                    "asked for revision/timestamp does not exceed the history-retention-duration.";
+
+    private static final long serialVersionUID = -998877665544332221L;
+
+    private ConnectionHistoryNotAccessibleException(final DittoHeaders dittoHeaders,
+            @Nullable final String message,
+            @Nullable final String description,
+            @Nullable final Throwable cause,
+            @Nullable final URI href) {
+        super(ERROR_CODE, HttpStatus.NOT_FOUND, dittoHeaders, message, description, cause, href);
+    }
+
+    private static String getMessage(final ConnectionId connectionId, final long revision) {
+        checkNotNull(connectionId, "connectionId");
+        return MessageFormat.format(MESSAGE_TEMPLATE, String.valueOf(connectionId), String.valueOf(revision));
+    }
+
+    private static String getMessage(final ConnectionId connectionId, final Instant timestamp) {
+        checkNotNull(connectionId, "connectionId");
+        checkNotNull(timestamp, "timestamp");
+        return MessageFormat.format(MESSAGE_TEMPLATE_TS, String.valueOf(connectionId), timestamp.toString());
+    }
+
+    /**
+     * A mutable builder for a {@code ConnectionHistoryNotAccessibleException}.
+     *
+     * @param connectionId the ID of the connection.
+     * @param revision the asked for revision of the connection.
+     * @return the builder.
+     * @throws NullPointerException if {@code connectionId} is {@code null}.
+     */
+    public static Builder newBuilder(final ConnectionId connectionId, final long revision) {
+        return new Builder(connectionId, revision);
+    }
+
+    /**
+     * A mutable builder for a {@code ConnectionHistoryNotAccessibleException}.
+     *
+     * @param connectionId the ID of the connection.
+     * @param timestamp the asked for timestamp of the connection.
+     * @return the builder.
+     * @throws NullPointerException if {@code connectionId} is {@code null}.
+     */
+    public static Builder newBuilder(final ConnectionId connectionId, final Instant timestamp) {
+        return new Builder(connectionId, timestamp);
+    }
+
+    /**
+     * Constructs a new {@code ConnectionHistoryNotAccessibleException} object with given message.
+     *
+     * @param message detail message. This message can be later retrieved by the {@link #getMessage()} method.
+     * @param dittoHeaders the headers of the command which resulted in this exception.
+     * @return the new ConnectionHistoryNotAccessibleException.
+     * @throws NullPointerException if {@code dittoHeaders} is {@code null}.
+     */
+    public static ConnectionHistoryNotAccessibleException fromMessage(@Nullable final String message,
+            final DittoHeaders dittoHeaders) {
+        return DittoRuntimeException.fromMessage(message, dittoHeaders, new Builder());
+    }
+
+    /**
+     * Constructs a new {@code ConnectionHistoryNotAccessibleException} object with the exception message extracted from the given
+     * JSON object.
+     *
+     * @param jsonObject the JSON to read the {@link org.eclipse.ditto.base.model.exceptions.DittoRuntimeException.JsonFields#MESSAGE} field from.
+     * @param dittoHeaders the headers of the command which resulted in this exception.
+     * @return the new ConnectionHistoryNotAccessibleException.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonMissingFieldException if this JsonObject did not contain an error message.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static ConnectionHistoryNotAccessibleException fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
+        return DittoRuntimeException.fromJson(jsonObject, dittoHeaders, new Builder());
+    }
+
+    @Override
+    public DittoRuntimeException setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new Builder()
+                .message(getMessage())
+                .description(getDescription().orElse(null))
+                .cause(getCause())
+                .href(getHref().orElse(null))
+                .dittoHeaders(dittoHeaders)
+                .build();
+    }
+
+    /**
+     * A mutable builder with a fluent API for a {@link ConnectionHistoryNotAccessibleException}.
+     */
+    @NotThreadSafe
+    public static final class Builder extends DittoRuntimeExceptionBuilder<ConnectionHistoryNotAccessibleException> {
+
+        private Builder() {
+            description(DEFAULT_DESCRIPTION);
+        }
+
+        private Builder(final ConnectionId connectionId, final long revision) {
+            this();
+            message(ConnectionHistoryNotAccessibleException.getMessage(connectionId, revision));
+        }
+
+        private Builder(final ConnectionId connectionId, final Instant timestamp) {
+            this();
+            message(ConnectionHistoryNotAccessibleException.getMessage(connectionId, timestamp));
+        }
+
+        @Override
+        protected ConnectionHistoryNotAccessibleException doBuild(final DittoHeaders dittoHeaders,
+                @Nullable final String message,
+                @Nullable final String description,
+                @Nullable final Throwable cause,
+                @Nullable final URI href) {
+            return new ConnectionHistoryNotAccessibleException(dittoHeaders, message, description, cause, href);
+        }
+
+    }
+
+}
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/ConnectivityRootActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/ConnectivityRootActor.java
index 899a587fd66..9a3357892a9 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/ConnectivityRootActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/ConnectivityRootActor.java
@@ -83,8 +83,6 @@ private ConnectivityRootActor(final ConnectivityConfig connectivityConfig,
         final var dittoExtensionsConfig = ScopedConfig.dittoExtension(actorSystem.settings().config());
         final var enforcerActorPropsFactory =
                 ConnectionEnforcerActorPropsFactory.get(actorSystem, dittoExtensionsConfig);
-        final var connectionSupervisorProps =
-                ConnectionSupervisorActor.props(commandForwarder, pubSubMediator, enforcerActorPropsFactory);
         // Create persistence streaming actor (with no cache) and make it known to pubSubMediator.
         final ActorRef persistenceStreamingActor =
                 startChildActor(ConnectionPersistenceStreamingActorCreator.ACTOR_NAME,
@@ -100,6 +98,10 @@ private ConnectivityRootActor(final ConnectivityConfig connectivityConfig,
         DittoProtocolSub.get(actorSystem);
 
         final MongoReadJournal mongoReadJournal = MongoReadJournal.newInstance(actorSystem);
+
+        final var connectionSupervisorProps =
+                ConnectionSupervisorActor.props(commandForwarder, pubSubMediator, enforcerActorPropsFactory,
+                        mongoReadJournal);
         startClusterSingletonActor(
                 PersistencePingActor.props(
                         startConnectionShardRegion(actorSystem, connectionSupervisorProps, clusterConfig),
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/config/ConnectionConfig.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/config/ConnectionConfig.java
index 04c61b58f74..b23934471b1 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/config/ConnectionConfig.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/config/ConnectionConfig.java
@@ -20,15 +20,18 @@
 import org.eclipse.ditto.base.service.config.supervision.WithSupervisorConfig;
 import org.eclipse.ditto.edge.service.acknowledgements.AcknowledgementConfig;
 import org.eclipse.ditto.internal.utils.config.KnownConfigValue;
+import org.eclipse.ditto.internal.utils.persistence.mongo.config.EventConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.SnapshotConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.WithActivityCheckConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.config.WithSnapshotConfig;
 import org.eclipse.ditto.internal.utils.persistentactors.cleanup.WithCleanupConfig;
 
 /**
  * Provides configuration settings for Connectivity service's connection behaviour.
  */
 @Immutable
-public interface ConnectionConfig extends WithSupervisorConfig, WithActivityCheckConfig, WithCleanupConfig {
+public interface ConnectionConfig extends WithSupervisorConfig, WithActivityCheckConfig, WithCleanupConfig,
+        WithSnapshotConfig {
 
     /**
      * Returns the amount of time for how long the connection actor waits for response from client actors.
@@ -75,6 +78,13 @@ public interface ConnectionConfig extends WithSupervisorConfig, WithActivityChec
      */
     SnapshotConfig getSnapshotConfig();
 
+    /**
+     * Returns the config of the connection event journal behaviour.
+     *
+     * @return the config.
+     */
+    EventConfig getEventConfig();
+
     /**
      * Returns the maximum number of Targets within a connection.
      *
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/config/DefaultConnectionConfig.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/config/DefaultConnectionConfig.java
index b30128e9885..f06c6971097 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/config/DefaultConnectionConfig.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/config/DefaultConnectionConfig.java
@@ -25,7 +25,9 @@
 import org.eclipse.ditto.internal.utils.config.ConfigWithFallback;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.ActivityCheckConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.DefaultActivityCheckConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.config.DefaultEventConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.DefaultSnapshotConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.config.EventConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.SnapshotConfig;
 import org.eclipse.ditto.internal.utils.persistentactors.cleanup.CleanupConfig;
 
@@ -47,6 +49,7 @@ public final class DefaultConnectionConfig implements ConnectionConfig {
     private final String blockedHostRegex;
     private final SupervisorConfig supervisorConfig;
     private final SnapshotConfig snapshotConfig;
+    private final EventConfig eventConfig;
     private final DefaultAcknowledgementConfig acknowledgementConfig;
     private final CleanupConfig cleanupConfig;
     private final Amqp10Config amqp10Config;
@@ -74,6 +77,7 @@ private DefaultConnectionConfig(final ConfigWithFallback config) {
         blockedHostRegex = config.getString(ConnectionConfigValue.BLOCKED_HOST_REGEX.getConfigPath());
         supervisorConfig = DefaultSupervisorConfig.of(config);
         snapshotConfig = DefaultSnapshotConfig.of(config);
+        eventConfig = DefaultEventConfig.of(config);
         acknowledgementConfig = DefaultAcknowledgementConfig.of(config);
         cleanupConfig = CleanupConfig.of(config);
         amqp10Config = DefaultAmqp10Config.of(config);
@@ -153,6 +157,11 @@ public SnapshotConfig getSnapshotConfig() {
         return snapshotConfig;
     }
 
+    @Override
+    public EventConfig getEventConfig() {
+        return eventConfig;
+    }
+
     @Override
     public Integer getMaxNumberOfTargets() {
         return maxNumberOfTargets;
@@ -246,6 +255,7 @@ public boolean equals(final Object o) {
                 Objects.equals(blockedHostRegex, that.blockedHostRegex) &&
                 Objects.equals(supervisorConfig, that.supervisorConfig) &&
                 Objects.equals(snapshotConfig, that.snapshotConfig) &&
+                Objects.equals(eventConfig, that.eventConfig) &&
                 Objects.equals(acknowledgementConfig, that.acknowledgementConfig) &&
                 Objects.equals(cleanupConfig, that.cleanupConfig) &&
                 Objects.equals(amqp10Config, that.amqp10Config) &&
@@ -266,7 +276,7 @@ public boolean equals(final Object o) {
     @Override
     public int hashCode() {
         return Objects.hash(clientActorAskTimeout, clientActorRestartsBeforeEscalation, allowedHostnames,
-                blockedHostnames, blockedSubnets, blockedHostRegex, supervisorConfig, snapshotConfig,
+                blockedHostnames, blockedSubnets, blockedHostRegex, supervisorConfig, snapshotConfig, eventConfig,
                 acknowledgementConfig, cleanupConfig, maxNumberOfTargets, maxNumberOfSources, activityCheckConfig,
                 fieldsEncryptionConfig, amqp10Config, amqp091Config, mqttConfig, kafkaConfig, httpPushConfig,
                 ackLabelDeclareInterval, priorityUpdateInterval, shutdownTimeout, allClientActorsOnOneNode);
@@ -283,6 +293,7 @@ public String toString() {
                 ", blockedHostRegex=" + blockedHostRegex +
                 ", supervisorConfig=" + supervisorConfig +
                 ", snapshotConfig=" + snapshotConfig +
+                ", eventConfig=" + eventConfig +
                 ", acknowledgementConfig=" + acknowledgementConfig +
                 ", cleanUpConfig=" + cleanupConfig +
                 ", amqp10Config=" + amqp10Config +
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java
index dddec5cbe04..ea9a47e3c2c 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java
@@ -61,7 +61,9 @@
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.base.model.signals.WithStreamingSubscriptionId;
 import org.eclipse.ditto.base.model.signals.WithType;
+import org.eclipse.ditto.base.model.signals.commands.streaming.StreamingSubscriptionCommand;
 import org.eclipse.ditto.connectivity.api.BaseClientState;
 import org.eclipse.ditto.connectivity.api.InboundSignal;
 import org.eclipse.ditto.connectivity.api.OutboundSignal;
@@ -114,6 +116,7 @@
 import org.eclipse.ditto.connectivity.service.util.ConnectionPubSub;
 import org.eclipse.ditto.connectivity.service.util.ConnectivityMdcEntryKey;
 import org.eclipse.ditto.edge.service.headers.DittoHeadersValidator;
+import org.eclipse.ditto.edge.service.streaming.StreamingSubscriptionManager;
 import org.eclipse.ditto.internal.models.signal.correlation.MatchingValidationResult;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
 import org.eclipse.ditto.internal.utils.akka.logging.ThreadSafeDittoLoggingAdapter;
@@ -178,8 +181,10 @@ public abstract class BaseClientActor extends AbstractFSMWithStash<BaseClientSta
     private static final String MESSAGE_MAPPING_PROCESSOR_DISPATCHER = "message-mapping-processor-dispatcher";
     private static final Pattern EXCLUDED_ADDRESS_REPORTING_CHILD_NAME_PATTERN = Pattern.compile(
             OutboundMappingProcessorActor.ACTOR_NAME + "|" + OutboundDispatchingActor.ACTOR_NAME + "|" +
-                    "ackr.*" + "|" + "StreamSupervisor-.*|subscriptionManager");
+                    "ackr.*" + "|" + "StreamSupervisor-.*|" +
+                    SubscriptionManager.ACTOR_NAME  + "|" + StreamingSubscriptionManager.ACTOR_NAME);
     private static final String DITTO_STATE_TIMEOUT_TIMER = "dittoStateTimeout";
+
     private static final int SOCKET_CHECK_TIMEOUT_MS = 2000;
     private static final String CLOSED_BECAUSE_OF_UNKNOWN_FAILURE_MISCONFIGURATION_STATUS_IN_CLIENT =
             "Closed because of unknown/failure/misconfiguration status in client.";
@@ -207,6 +212,7 @@ public abstract class BaseClientActor extends AbstractFSMWithStash<BaseClientSta
     private Sink<Object, NotUsed> inboundMappingSink;
     private ActorRef outboundDispatchingActor;
     private ActorRef subscriptionManager;
+    private ActorRef streamingSubscriptionManager;
     private ActorRef tunnelActor;
     private int ackregatorCount = 0;
     private boolean shuttingDown = false;
@@ -325,6 +331,7 @@ protected void init() {
         inboundMappingSink = getInboundMappingSink(protocolAdapter, inboundDispatchingSink);
         subscriptionManager =
                 startSubscriptionManager(commandForwarderActorSelection, connectivityConfig().getClientConfig());
+        streamingSubscriptionManager = startStreamingSubscriptionManager(commandForwarderActorSelection, connectivityConfig().getClientConfig());
 
         if (connection.getSshTunnel().map(SshTunnel::isEnabled).orElse(false)) {
             tunnelActor = childActorNanny.startChildActor(SshTunnelActor.ACTOR_NAME,
@@ -505,6 +512,7 @@ protected void cleanupFurtherResourcesOnConnectionTimeout(final BaseClientState
      */
     protected FSMStateFunctionBuilder<BaseClientState, BaseClientData> inAnyState() {
         return matchEvent(RetrieveConnectionMetrics.class, (command, data) -> retrieveConnectionMetrics(command))
+                .event(StreamingSubscriptionCommand.class, this::forwardStreamingSubscriptionCommand)
                 .event(ThingSearchCommand.class, this::forwardThingSearchCommand)
                 .event(RetrieveConnectionStatus.class, this::retrieveConnectionStatus)
                 .event(ResetConnectionMetrics.class, this::resetConnectionMetrics)
@@ -1716,6 +1724,8 @@ private FSM.State<BaseClientState, BaseClientData> handleInboundSignal(final Inb
         final Signal<?> signal = inboundSignal.getSignal();
         if (signal instanceof WithSubscriptionId<?>) {
             dispatchSearchCommand((WithSubscriptionId<?>) signal);
+        } else if (signal instanceof WithStreamingSubscriptionId<?>) {
+            dispatchStreamingSubscriptionCommand((WithStreamingSubscriptionId<?>) signal);
         } else {
             final var entityId = tryExtractEntityId(signal).orElseThrow();
             connectionPubSub.publishSignal(inboundSignal.asDispatched(), connectionId(), entityId, getSender());
@@ -1746,6 +1756,24 @@ private void dispatchSearchCommand(final WithSubscriptionId<?> searchCommand) {
         }
     }
 
+    private void dispatchStreamingSubscriptionCommand(
+            final WithStreamingSubscriptionId<?> streamingSubscriptionCommand) {
+
+        final String subscriptionId = streamingSubscriptionCommand.getSubscriptionId();
+        if (subscriptionId.length() > subscriptionIdPrefixLength) {
+            final var prefix = subscriptionId.substring(0, subscriptionIdPrefixLength);
+            connectionPubSub.publishSignal(streamingSubscriptionCommand, connectionId(), prefix, ActorRef.noSender());
+        } else {
+            // command is invalid or outdated, dropping.
+            logger.withCorrelationId(streamingSubscriptionCommand)
+                    .info("Dropping streaming subscription command with invalid subscription ID: <{}>",
+                            streamingSubscriptionCommand);
+            connectionLogger.failure(InfoProviderFactory.forSignal(streamingSubscriptionCommand),
+                    "Dropping streaming subscription command with invalid subscription ID: " +
+                            streamingSubscriptionCommand.getSubscriptionId());
+        }
+    }
+
     private Instant getInConnectionStatusSince() {
         return stateData().getInConnectionStatusSince();
     }
@@ -1891,6 +1919,19 @@ private ActorRef startSubscriptionManager(final ActorSelection proxyActor, final
         return getContext().actorOf(props, SubscriptionManager.ACTOR_NAME);
     }
 
+    /**
+     * Start the streaming subscription manager. Requires MessageMappingProcessorActor to be started to work.
+     * Creates an actor materializer.
+     *
+     * @return reference of the streaming subscription manager.
+     */
+    private ActorRef startStreamingSubscriptionManager(final ActorSelection proxyActor, final ClientConfig clientConfig) {
+        final var mat = Materializer.createMaterializer(this::getContext);
+        final var props = StreamingSubscriptionManager.props(clientConfig.getSubscriptionManagerTimeout(),
+                proxyActor, mat);
+        return getContext().actorOf(props, StreamingSubscriptionManager.ACTOR_NAME);
+    }
+
     private FSM.State<BaseClientState, BaseClientData> forwardThingSearchCommand(final WithDittoHeaders command,
             final BaseClientData data) {
         // Tell subscriptionManager to send search events to messageMappingProcessorActor.
@@ -1906,6 +1947,19 @@ private FSM.State<BaseClientState, BaseClientData> forwardThingSearchCommand(fin
         return stay();
     }
 
+    private FSM.State<BaseClientState, BaseClientData> forwardStreamingSubscriptionCommand(
+            final StreamingSubscriptionCommand<?> command,
+            final BaseClientData data) {
+        // Tell subscriptionManager to send streaming subscription events to messageMappingProcessorActor.
+        if (stateName() == CONNECTED) {
+            streamingSubscriptionManager.tell(command, outboundDispatchingActor);
+        } else {
+            logger.withCorrelationId(command)
+                    .debug("Client state <{}> is not CONNECTED; dropping <{}>", stateName(), command);
+        }
+        return stay();
+    }
+
     private FSM.State<BaseClientState, BaseClientData> resubscribe(final Control trigger, final BaseClientData data) {
         subscribeAndDeclareAcknowledgementLabels(dryRun, true);
         startSubscriptionRefreshTimer();
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BasePublisherActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BasePublisherActor.java
index 960583434c8..9583bd4e155 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BasePublisherActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BasePublisherActor.java
@@ -48,6 +48,7 @@
 import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
 import org.eclipse.ditto.base.model.signals.acks.Acknowledgements;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionEvent;
 import org.eclipse.ditto.connectivity.api.ExternalMessage;
 import org.eclipse.ditto.connectivity.api.OutboundSignal;
 import org.eclipse.ditto.connectivity.model.Connection;
@@ -356,7 +357,7 @@ private Stream<SendingOrDropped> sendMappedOutboundSignal(final OutboundSignal.M
 
     private Optional<SendingContext> getSendingContext(final OutboundSignal.Mapped mappedOutboundSignal) {
         final Optional<SendingContext> result;
-        if (isResponseOrErrorOrSearchEvent(mappedOutboundSignal)) {
+        if (isResponseOrErrorOrStreamingEvent(mappedOutboundSignal)) {
             final Signal<?> source = mappedOutboundSignal.getSource();
             final DittoHeaders dittoHeaders = source.getDittoHeaders();
             result = dittoHeaders.getReplyTarget()
@@ -369,17 +370,19 @@ private Optional<SendingContext> getSendingContext(final OutboundSignal.Mapped m
     }
 
     /**
-     * Checks whether the passed in {@code outboundSignal} is a response or an error or a search event.
+     * Checks whether the passed in {@code outboundSignal} is a response or an error or a streaming event
+     * (including search events).
      * Those messages are supposed to be published at the reply target of the source whence the original command came.
      *
      * @param outboundSignal the OutboundSignal to check.
      * @return {@code true} if the OutboundSignal is a response or an error, {@code false} otherwise
      */
-    private static boolean isResponseOrErrorOrSearchEvent(final OutboundSignal.Mapped outboundSignal) {
+    private static boolean isResponseOrErrorOrStreamingEvent(final OutboundSignal.Mapped outboundSignal) {
         final ExternalMessage externalMessage = outboundSignal.getExternalMessage();
         return externalMessage.isResponse() ||
                 externalMessage.isError() ||
-                outboundSignal.getSource() instanceof SubscriptionEvent;
+                outboundSignal.getSource() instanceof SubscriptionEvent ||
+                outboundSignal.getSource() instanceof StreamingSubscriptionEvent<?>;
     }
 
     private Optional<ReplyTarget> getReplyTargetByIndex(final int replyTargetIndex) {
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/InboundDispatchingSink.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/InboundDispatchingSink.java
index afe0da9db33..53d2ae0f277 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/InboundDispatchingSink.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/InboundDispatchingSink.java
@@ -44,11 +44,13 @@
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.headers.translator.HeaderTranslator;
 import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.base.model.signals.WithStreamingSubscriptionId;
 import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
 import org.eclipse.ditto.base.model.signals.acks.Acknowledgements;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
 import org.eclipse.ditto.base.model.signals.commands.ErrorResponse;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
 import org.eclipse.ditto.connectivity.api.ExternalMessage;
 import org.eclipse.ditto.connectivity.api.InboundSignal;
 import org.eclipse.ditto.connectivity.api.MappedInboundExternalMessage;
@@ -508,6 +510,8 @@ private PartialFunction<Signal<?>, Stream<IncomingSignal>> dispatchResponsesAndS
                         )
                         .match(CreateSubscription.class, cmd -> forwardToConnectionActor(cmd, sender))
                         .match(WithSubscriptionId.class, cmd -> forwardToClientActor(cmd, sender))
+                        .match(SubscribeForPersistedEvents.class, cmd -> forwardToConnectionActor(cmd, sender))
+                        .match(WithStreamingSubscriptionId.class, cmd -> forwardToClientActor(cmd, sender))
                         .matchAny(baseSignal -> ackregatorStarter.preprocess(baseSignal,
                                 (signal, isAckRequesting) -> Stream.of(new IncomingSignal(signal,
                                         getReturnAddress(sender, isAckRequesting, signal),
@@ -659,7 +663,7 @@ private <T> Stream<T> forwardToClientActor(final Signal<?> signal, @Nullable fin
         return Stream.empty();
     }
 
-    private <T> Stream<T> forwardToConnectionActor(final CreateSubscription command, @Nullable final ActorRef sender) {
+    private <T> Stream<T> forwardToConnectionActor(final Command<?> command, @Nullable final ActorRef sender) {
         connectionActor.tell(command, sender);
 
         return Stream.empty();
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/OutboundDispatchingActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/OutboundDispatchingActor.java
index 630147a10f0..3e63e41d785 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/OutboundDispatchingActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/OutboundDispatchingActor.java
@@ -31,6 +31,7 @@
 import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionEvent;
 import org.eclipse.ditto.connectivity.api.InboundSignal;
 import org.eclipse.ditto.connectivity.api.OutboundSignalFactory;
 import org.eclipse.ditto.connectivity.model.Target;
@@ -79,6 +80,7 @@ public Receive createReceive() {
                 .match(InboundSignal.class, this::inboundSignal)
                 .match(CommandResponse.class, this::forwardWithoutCheck)
                 .match(SubscriptionEvent.class, this::forwardWithoutCheck)
+                .match(StreamingSubscriptionEvent.class, this::forwardWithoutCheck)
                 .match(DittoRuntimeException.class, this::forwardWithoutCheck)
                 .match(Signal.class, this::handleSignal)
                 .matchAny(message -> logger.warning("Unknown message: <{}>", message))
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java
index ebed209c9ef..40411357804 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java
@@ -45,6 +45,7 @@
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
 import org.eclipse.ditto.base.model.signals.commands.Command;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
 import org.eclipse.ditto.connectivity.api.BaseClientState;
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectionId;
@@ -55,6 +56,7 @@
 import org.eclipse.ditto.connectivity.model.ConnectivityStatus;
 import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommandInterceptor;
 import org.eclipse.ditto.connectivity.model.signals.commands.exceptions.ConnectionFailedException;
+import org.eclipse.ditto.connectivity.model.signals.commands.exceptions.ConnectionHistoryNotAccessibleException;
 import org.eclipse.ditto.connectivity.model.signals.commands.exceptions.ConnectionNotAccessibleException;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.CheckConnectionLogsActive;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.CloseConnection;
@@ -198,12 +200,13 @@ public final class ConnectionPersistenceActor
     @Nullable private Instant recoveredAt;
 
     ConnectionPersistenceActor(final ConnectionId connectionId,
+            final MongoReadJournal mongoReadJournal,
             final ActorRef commandForwarderActor,
             final ActorRef pubSubMediator,
             final Trilean allClientActorsOnOneNode,
             final Config connectivityConfigOverwrites) {
 
-        super(connectionId);
+        super(connectionId, mongoReadJournal);
         this.actorSystem = context().system();
         cluster = Cluster.get(actorSystem);
         final Config dittoExtensionConfig = ScopedConfig.dittoExtension(actorSystem.settings().config());
@@ -263,18 +266,21 @@ protected DittoDiagnosticLoggingAdapter createLogger() {
      * Creates Akka configuration object for this actor.
      *
      * @param connectionId the connection ID.
-     * @param commandForwarderActor the actor used to send signals into the ditto cluster..
+     * @param mongoReadJournal the ReadJournal used for gaining access to historical values of the connection.
+     * @param commandForwarderActor the actor used to send signals into the ditto cluster.
+     * @param pubSubMediator pub-sub-mediator for the shutdown behavior.
      * @param pubSubMediator the pubSubMediator
      * @param connectivityConfigOverwrites the overwrites for the connectivity config for the given connection.
      * @return the Akka configuration Props object.
      */
     public static Props props(final ConnectionId connectionId,
+            final MongoReadJournal mongoReadJournal,
             final ActorRef commandForwarderActor,
             final ActorRef pubSubMediator,
             final Config connectivityConfigOverwrites
     ) {
-        return Props.create(ConnectionPersistenceActor.class, connectionId,
-                commandForwarderActor, pubSubMediator, Trilean.UNKNOWN, connectivityConfigOverwrites);
+        return Props.create(ConnectionPersistenceActor.class, connectionId, mongoReadJournal,
+                commandForwarderActor, pubSubMediator,Trilean.UNKNOWN, connectivityConfigOverwrites);
     }
 
     /**
@@ -350,6 +356,16 @@ protected DittoRuntimeExceptionBuilder<?> newNotAccessibleExceptionBuilder() {
         return ConnectionNotAccessibleException.newBuilder(entityId);
     }
 
+    @Override
+    protected DittoRuntimeExceptionBuilder<?> newHistoryNotAccessibleExceptionBuilder(final long revision) {
+        return ConnectionHistoryNotAccessibleException.newBuilder(entityId, revision);
+    }
+
+    @Override
+    protected DittoRuntimeExceptionBuilder<?> newHistoryNotAccessibleExceptionBuilder(final Instant timestamp) {
+        return ConnectionHistoryNotAccessibleException.newBuilder(entityId, timestamp);
+    }
+
     @Override
     protected void publishEvent(@Nullable final Connection previousEntity, final ConnectivityEvent<?> event) {
         if (event instanceof ConnectionDeleted) {
@@ -665,6 +681,9 @@ protected Receive matchAnyAfterInitialization() {
                 // CreateSubscription is a ThingSearchCommand, but it is created in InboundDispatchingSink from an
                 // adaptable and directly sent to this actor:
                 .match(CreateSubscription.class, this::startThingSearchSession)
+                // SubscribeForPersistedEvents is created in InboundDispatchingSink from an
+                // adaptable and directly sent to this actor:
+                .match(SubscribeForPersistedEvents.class, this::startStreamingSubscriptionSession)
                 .matchEquals(Control.CHECK_LOGGING_ACTIVE, this::checkLoggingEnabled)
                 .matchEquals(Control.TRIGGER_UPDATE_PRIORITY, this::triggerUpdatePriority)
                 .match(UpdatePriority.class, this::updatePriority)
@@ -725,6 +744,17 @@ private void startThingSearchSession(final CreateSubscription command) {
         augmentWithPrefixAndForward(command, entity.getClientCount());
     }
 
+    private void startStreamingSubscriptionSession(final SubscribeForPersistedEvents command) {
+        if (entity == null) {
+            logDroppedSignal(command, command.getType(), "No Connection configuration available.");
+            return;
+        }
+        log.debug("Forwarding <{}> to client actors.", command);
+        // compute the next prefix according to subscriptionCounter and the currently configured client actor count
+        // ignore any "prefix" field from the command
+        augmentWithPrefixAndForward(command, entity.getClientCount());
+    }
+
     private void augmentWithPrefixAndForward(final CreateSubscription createSubscription, final int clientCount) {
         subscriptionCounter = (subscriptionCounter + 1) % Math.max(1, clientCount);
         final var prefix = getPrefix(getSubscriptionPrefixLength(clientCount), subscriptionCounter);
@@ -732,6 +762,14 @@ private void augmentWithPrefixAndForward(final CreateSubscription createSubscrip
         connectionPubSub.publishSignal(commandWithPrefix, entityId, prefix, ActorRef.noSender());
     }
 
+    private void augmentWithPrefixAndForward(final SubscribeForPersistedEvents subscribeForPersistedEvents,
+            final int clientCount) {
+        subscriptionCounter = (subscriptionCounter + 1) % Math.max(1, clientCount);
+        final var prefix = getPrefix(getSubscriptionPrefixLength(clientCount), subscriptionCounter);
+        final var commandWithPrefix = subscribeForPersistedEvents.setPrefix(prefix);
+        connectionPubSub.publishSignal(commandWithPrefix, entityId, prefix, ActorRef.noSender());
+    }
+
     private static String getPrefix(final int prefixLength, final int subscriptionCounter) {
         final var prefixPattern = MessageFormat.format("%0{0,number}X", prefixLength);
         return String.format(prefixPattern, subscriptionCounter);
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionSupervisorActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionSupervisorActor.java
index 05d69b8560b..4e443542bc9 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionSupervisorActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionSupervisorActor.java
@@ -41,6 +41,7 @@
 import org.eclipse.ditto.connectivity.service.config.DittoConnectivityConfig;
 import org.eclipse.ditto.connectivity.service.enforcement.ConnectionEnforcerActorPropsFactory;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.persistentactors.AbstractPersistenceSupervisor;
 
 import com.typesafe.config.Config;
@@ -95,10 +96,12 @@ public final class ConnectionSupervisorActor
     private final ConnectionEnforcerActorPropsFactory enforcerActorPropsFactory;
 
     @SuppressWarnings("unused")
-    private ConnectionSupervisorActor(final ActorRef commandForwarderActor, final ActorRef pubSubMediator,
-            final ConnectionEnforcerActorPropsFactory enforcerActorPropsFactory) {
+    private ConnectionSupervisorActor(final ActorRef commandForwarderActor,
+            final ActorRef pubSubMediator,
+            final ConnectionEnforcerActorPropsFactory enforcerActorPropsFactory,
+            final MongoReadJournal mongoReadJournal) {
 
-        super(null, CONNECTIVITY_DEFAULT_LOCAL_ASK_TIMEOUT);
+        super(null, mongoReadJournal, CONNECTIVITY_DEFAULT_LOCAL_ASK_TIMEOUT);
         this.commandForwarderActor = commandForwarderActor;
         this.pubSubMediator = pubSubMediator;
         this.enforcerActorPropsFactory = enforcerActorPropsFactory;
@@ -114,14 +117,16 @@ private ConnectionSupervisorActor(final ActorRef commandForwarderActor, final Ac
      * @param commandForwarder the actor used to send signals into the ditto cluster.
      * @param pubSubMediator pub-sub-mediator for the shutdown behavior.
      * @param enforcerActorPropsFactory used to create the enforcer actor.
+     * @param mongoReadJournal the ReadJournal used for gaining access to historical values of the connection.
      * @return the {@link Props} to create this actor.
      */
     public static Props props(final ActorRef commandForwarder,
             final ActorRef pubSubMediator,
-            final ConnectionEnforcerActorPropsFactory enforcerActorPropsFactory) {
+            final ConnectionEnforcerActorPropsFactory enforcerActorPropsFactory,
+            final MongoReadJournal mongoReadJournal) {
 
         return Props.create(ConnectionSupervisorActor.class, commandForwarder, pubSubMediator,
-                enforcerActorPropsFactory);
+                enforcerActorPropsFactory, mongoReadJournal);
     }
 
     @Override
@@ -183,7 +188,7 @@ protected void handleMessagesDuringStartup(final Object message) {
 
     @Override
     protected Props getPersistenceActorProps(final ConnectionId entityId) {
-        return ConnectionPersistenceActor.props(entityId, commandForwarderActor, pubSubMediator,
+        return ConnectionPersistenceActor.props(entityId, mongoReadJournal, commandForwarderActor, pubSubMediator,
                 connectivityConfigOverwrites);
     }
 
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectivityMongoEventAdapter.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectivityMongoEventAdapter.java
index b9478f4fd4e..2d1f1465293 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectivityMongoEventAdapter.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectivityMongoEventAdapter.java
@@ -12,28 +12,31 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging.persistence;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import akka.actor.ExtendedActorSystem;
 import org.eclipse.ditto.base.model.signals.JsonParsable;
+import org.eclipse.ditto.base.model.signals.events.Event;
 import org.eclipse.ditto.base.model.signals.events.EventJsonDeserializer;
 import org.eclipse.ditto.base.model.signals.events.EventRegistry;
 import org.eclipse.ditto.base.model.signals.events.GlobalEventRegistry;
+import org.eclipse.ditto.base.service.config.DittoServiceConfig;
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectivityConstants;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionCreated;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionModified;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
-import org.eclipse.ditto.connectivity.service.config.DittoConnectivityConfig;
-import org.eclipse.ditto.connectivity.service.config.FieldsEncryptionConfig;
+import org.eclipse.ditto.connectivity.service.config.DefaultConnectionConfig;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.AbstractMongoEventAdapter;
+import org.eclipse.ditto.connectivity.service.config.DittoConnectivityConfig;
+import org.eclipse.ditto.connectivity.service.config.FieldsEncryptionConfig;
 import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * EventAdapter for {@link ConnectivityEvent}s persisted into
  * akka-persistence event-journal. Converts Events to MongoDB BSON objects and vice versa.
@@ -43,8 +46,10 @@ public final class ConnectivityMongoEventAdapter extends AbstractMongoEventAdapt
     private final FieldsEncryptionConfig encryptionConfig;
     private final Logger logger;
 
-    public ConnectivityMongoEventAdapter(@Nullable final ExtendedActorSystem system) {
-        super(system, createEventRegistry());
+    public ConnectivityMongoEventAdapter(final ExtendedActorSystem system) {
+        super(system, createEventRegistry(), DefaultConnectionConfig.of(
+                        DittoServiceConfig.of(DefaultScopedConfig.dittoScoped(system.settings().config()), "connectivity"))
+                .getEventConfig());
         logger = LoggerFactory.getLogger(ConnectivityMongoEventAdapter.class);
         final DittoConnectivityConfig connectivityConfig = DittoConnectivityConfig.of(
                 DefaultScopedConfig.dittoScoped(system.settings().config()));
@@ -56,11 +61,14 @@ public ConnectivityMongoEventAdapter(@Nullable final ExtendedActorSystem system)
     }
 
     @Override
-    protected JsonObject performToJournalMigration(final JsonObject jsonObject) {
+    protected JsonObjectBuilder performToJournalMigration(final Event<?> event, final JsonObject jsonObject) {
         if (encryptionConfig.isEncryptionEnabled()) {
-            return JsonFieldsEncryptor.encrypt(jsonObject, ConnectivityConstants.ENTITY_TYPE.toString(), encryptionConfig.getJsonPointers(), encryptionConfig.getSymmetricalKey());
+            final JsonObject superObject = super.performToJournalMigration(event, jsonObject).build();
+            return JsonFieldsEncryptor.encrypt(superObject, ConnectivityConstants.ENTITY_TYPE.toString(),
+                    encryptionConfig.getJsonPointers(), encryptionConfig.getSymmetricalKey())
+                    .toBuilder();
         }
-        return jsonObject;
+        return super.performToJournalMigration(event, jsonObject);
     }
 
     @Override
diff --git a/connectivity/service/src/main/resources/connectivity.conf b/connectivity/service/src/main/resources/connectivity.conf
index 6c58dc8e0ee..353972cdc5f 100644
--- a/connectivity/service/src/main/resources/connectivity.conf
+++ b/connectivity/service/src/main/resources/connectivity.conf
@@ -208,8 +208,23 @@ ditto {
       }
 
       snapshot {
-        threshold = 10
+        # the interval when to do snapshot for a Connection which had changes to it
         interval = 15m
+        interval = ${?CONNECTION_SNAPSHOT_INTERVAL} # may be overridden with this environment variable
+
+        # the threshold after how many changes to a Connection to do a snapshot
+        threshold = 10
+        threshold = ${?CONNECTION_SNAPSHOT_THRESHOLD} # may be overridden with this environment variable
+      }
+
+      event {
+        # define the DittoHeaders to persist when persisting events to the journal
+        # those can e.g. be retrieved as additional "audit log" information when accessing a historical connection revision
+        historical-headers-to-persist = [
+          #"ditto-originator"  # who (user-subject/connection-pre-auth-subject) issued the event
+          #"correlation-id"
+        ]
+        historical-headers-to-persist = ${?CONNECTION_EVENT_HISTORICAL_HEADERS_TO_PERSIST}
       }
 
       activity-check {
@@ -677,27 +692,62 @@ ditto {
       }
 
       cleanup {
+        # enabled configures whether background cleanup is enabled or not
+        # If enabled, stale "snapshot" and "journal" entries will be cleaned up from the MongoDB by a background process
         enabled = true
         enabled = ${?CLEANUP_ENABLED}
 
+        # history-retention-duration configures the duration of how long to "keep" events and snapshots before being
+        # allowed to remove them in scope of cleanup.
+        # If this e.g. is set to 30d - then effectively an event history of 30 days would be available via the read
+        # journal.
+        history-retention-duration = 0d
+        history-retention-duration = ${?CLEANUP_HISTORY_RETENTION_DURATION}
+
+        # quiet-period defines how long to stay in a state where the background cleanup is not yet started
+        # Applies after:
+        # - starting the service
+        # - each "completed" background cleanup run (all entities were cleaned up)
         quiet-period = 5m
         quiet-period = ${?CLEANUP_QUIET_PERIOD}
 
+        # interval configures how often a "credit decision" is made.
+        # The background cleanup works with a credit system and does only generate new "cleanup credits" if the MongoDB
+        # currently has capacity to do cleanups.
         interval = 60s
         interval = ${?CLEANUP_INTERVAL}
 
+        # timer-threshold configures the maximum database latency to give out credit for cleanup actions.
+        # If write operations to the MongoDB within the last `interval` had a `max` value greater to the configured
+        # threshold, no new cleanup credits will be issued for the next `interval`.
+        # Which throttles cleanup when MongoDB is currently under heavy (write) load.
         timer-threshold = 150ms
         timer-threshold = ${?CLEANUP_TIMER_THRESHOLD}
 
+        # credits-per-batch configures how many "cleanup credits" should be generated per `interval` as long as the
+        # write operations to the MongoDB are less than the configured `timer-threshold`.
+        # Limits the rate of cleanup actions to this many per credit decision interval.
+        # One credit means that the "journal" and "snapshot" entries of one entity are cleaned up each `interval`.
         credits-per-batch = 1
         credits-per-batch = ${?CLEANUP_CREDITS_PER_BATCH}
 
+        # reads-per-query configures the number of snapshots to scan per MongoDB query.
+        # Configuring this to high values will reduce the need to query MongoDB too often - it should however be aligned
+        # with the amount of "cleanup credits" issued per `interval` - in order to avoid long running queries.
         reads-per-query = 100
         reads-per-query = ${?CLEANUP_READS_PER_QUERY}
 
+        # writes-per-credit configures the number of documents to delete for each credit.
+        # If for example one entity would have 1000 journal entries to cleanup, a `writes-per-credit` of 100 would lead
+        # to 10 delete operations performed against MongoDB.
         writes-per-credit = 100
         writes-per-credit = ${?CLEANUP_WRITES_PER_CREDIT}
 
+        # delete-final-deleted-snapshot configures whether for a deleted entity, the final snapshot (containing the
+        # "deleted" information) should be deleted or not.
+        # If the final snapshot is not deleted, re-creating the entity will cause that the recreated entity starts with
+        # a revision number 1 higher than the previously deleted entity. If the final snapshot is deleted as well,
+        # recreation of an entity with the same ID will lead to revisionNumber=1 after its recreation.
         delete-final-deleted-snapshot = false
         delete-final-deleted-snapshot = ${?CLEANUP_DELETE_FINAL_DELETED_SNAPSHOT}
       }
@@ -1113,6 +1163,18 @@ akka-contrib-mongodb-persistence-connection-journal {
   }
 }
 
+akka-contrib-mongodb-persistence-connection-journal-read {
+  class = "akka.contrib.persistence.mongodb.MongoReadJournal"
+  plugin-dispatcher = "connection-persistence-dispatcher"
+
+  overrides {
+    journal-collection = "connection_journal"
+    journal-index = "connection_journal_index"
+    realtime-collection = "connection_realtime"
+    metadata-collection = "connection_metadata"
+  }
+}
+
 akka-contrib-mongodb-persistence-connection-snapshots {
   class = "akka.contrib.persistence.mongodb.MongoSnapshots"
   plugin-dispatcher = "connection-persistence-dispatcher"
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/ConnectivityServiceGlobalCommandRegistryTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/ConnectivityServiceGlobalCommandRegistryTest.java
index 8feb00887e4..827d15af927 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/ConnectivityServiceGlobalCommandRegistryTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/ConnectivityServiceGlobalCommandRegistryTest.java
@@ -17,6 +17,7 @@
 import org.eclipse.ditto.base.api.devops.signals.commands.ExecutePiggybackCommand;
 import org.eclipse.ditto.base.api.persistence.cleanup.CleanupPersistence;
 import org.eclipse.ditto.base.model.namespaces.signals.commands.PurgeNamespace;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
 import org.eclipse.ditto.base.service.cluster.ModifySplitBrainResolver;
 import org.eclipse.ditto.connectivity.api.commands.sudo.SudoAddConnectionLogEntry;
 import org.eclipse.ditto.connectivity.api.commands.sudo.SudoRetrieveConnectionIdsByTag;
@@ -66,7 +67,8 @@ public ConnectivityServiceGlobalCommandRegistryTest() {
                 PurgeEntities.class,
                 ModifySplitBrainResolver.class,
                 PublishSignal.class,
-                SudoAddConnectionLogEntry.class
+                SudoAddConnectionLogEntry.class,
+                SubscribeForPersistedEvents.class
         );
     }
 
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/ConnectivityServiceGlobalEventRegistryTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/ConnectivityServiceGlobalEventRegistryTest.java
index 4df61bcefb2..ae6b9142a42 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/ConnectivityServiceGlobalEventRegistryTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/ConnectivityServiceGlobalEventRegistryTest.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.ditto.connectivity.service;
 
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionComplete;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionCreated;
 import org.eclipse.ditto.internal.utils.persistentactors.EmptyEvent;
 import org.eclipse.ditto.internal.utils.test.GlobalEventRegistryTestCases;
@@ -31,7 +32,8 @@ public ConnectivityServiceGlobalEventRegistryTest() {
                 SubscriptionCreated.class,
                 ThingsOutOfSync.class,
                 ThingSnapshotTaken.class,
-                EmptyEvent.class
+                EmptyEvent.class,
+                StreamingSubscriptionComplete.class
         );
     }
 
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/TestConstants.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/TestConstants.java
index b0a787054d4..821780b6797 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/TestConstants.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/TestConstants.java
@@ -110,6 +110,7 @@
 import org.eclipse.ditto.internal.utils.cluster.DistPubSubAccess;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.internal.utils.config.ScopedConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.persistentactors.config.PingConfig;
 import org.eclipse.ditto.internal.utils.protocol.config.ProtocolConfig;
 import org.eclipse.ditto.internal.utils.pubsub.StreamingType;
@@ -924,7 +925,8 @@ public static ActorRef createConnectionSupervisorActor(final ConnectionId connec
         final var enforcerActorPropsFactory =
                 ConnectionEnforcerActorPropsFactory.get(actorSystem, dittoExtensionsConfig);
         final Props props =
-                ConnectionSupervisorActor.props(commandForwarderActor, pubSubMediator, enforcerActorPropsFactory);
+                ConnectionSupervisorActor.props(commandForwarderActor, pubSubMediator, enforcerActorPropsFactory,
+                        Mockito.mock(MongoReadJournal.class));
 
         final Props shardRegionMockProps = Props.create(ShardRegionMockActor.class, props, connectionId.toString());
 
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
index e268f81ff06..8362c2e16b5 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
@@ -82,6 +82,7 @@
 import org.eclipse.ditto.internal.utils.akka.ActorSystemResource;
 import org.eclipse.ditto.internal.utils.akka.PingCommand;
 import org.eclipse.ditto.internal.utils.akka.controlflow.WithSender;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.persistentactors.AbstractPersistenceSupervisor;
 import org.eclipse.ditto.internal.utils.test.Retry;
 import org.eclipse.ditto.internal.utils.tracing.DittoTracingInitResource;
@@ -91,6 +92,7 @@
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigValueFactory;
@@ -248,6 +250,7 @@ public TestActor.AutoPilot run(final ActorRef sender, final Object msg) {
 
         final var connectionActorProps = Props.create(ConnectionPersistenceActor.class,
                 () -> new ConnectionPersistenceActor(connectionId,
+                        Mockito.mock(MongoReadJournal.class),
                         commandForwarderActor,
                         pubSubMediatorProbe.ref(),
                         Trilean.TRUE,
@@ -893,14 +896,16 @@ public void recoverDeletedConnection() {
     @Test
     public void exceptionDuringClientActorPropsCreation() {
 
-        final var connectionActorProps = ConnectionPersistenceActor.props(
-                TestConstants.createRandomConnectionId(), commandForwarderActor, pubSubMediatorProbe.ref(),
-                ConfigFactory.empty()
-        );
-
         final var testProbe = actorSystemResource1.newTestProbe();
         final var supervisor = actorSystemResource1.newTestProbe();
-        final var connectionActorRef = supervisor.childActorOf(connectionActorProps);
+
+        final var connectionActorProps = ConnectionPersistenceActor.props(
+                TestConstants.createRandomConnectionId(),
+                Mockito.mock(MongoReadJournal.class),
+                commandForwarderActor,
+                pubSubMediatorProbe.ref(),
+                ConfigFactory.empty());
+        final var connectionActorRef = supervisor.childActorOf(connectionActorProps, "connection");
 
         // create connection
         final CreateConnection createConnection = createConnection();
@@ -921,6 +926,7 @@ public void exceptionDuringClientActorPropsCreation() {
     @Test
     public void exceptionDueToCustomValidator() {
         final var connectionActorProps = ConnectionPersistenceActor.props(TestConstants.createRandomConnectionId(),
+                Mockito.mock(MongoReadJournal.class),
                 commandForwarderActor,
                 pubSubMediatorProbe.ref(),
                 ConfigFactory.empty());
@@ -1155,6 +1161,7 @@ public TestActor.AutoPilot run(final ActorRef sender, final Object msg) {
         final var testProbe = actorSystemResource1.newTestProbe();
         final var connectionActorProps = Props.create(ConnectionPersistenceActor.class,
                 () -> new ConnectionPersistenceActor(connectionId,
+                        Mockito.mock(MongoReadJournal.class),
                         commandForwarderActor,
                         pubSubMediatorProbe.ref(),
                         Trilean.TRUE,
@@ -1217,6 +1224,7 @@ public void retriesStartingClientActor() {
                 Props.create(
                         ConnectionPersistenceActor.class,
                         () -> new ConnectionPersistenceActor(connectionId,
+                                Mockito.mock(MongoReadJournal.class),
                                 commandForwarderActor,
                                 pubSubMediatorProbe.ref(),
                                 Trilean.FALSE,
@@ -1244,6 +1252,7 @@ public void escalatesWhenClientActorFailsTooOften() {
                 Props.create(
                         ConnectionPersistenceActor.class,
                         () -> new ConnectionPersistenceActor(connectionId,
+                                Mockito.mock(MongoReadJournal.class),
                                 commandForwarderActor,
                                 pubSubMediatorProbe.ref(),
                                 Trilean.FALSE,
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceOperationsActorIT.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceOperationsActorIT.java
index 883749f2701..af6b7f9171e 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceOperationsActorIT.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceOperationsActorIT.java
@@ -34,10 +34,12 @@
 import org.eclipse.ditto.connectivity.service.enforcement.ConnectionEnforcerActorPropsFactory;
 import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.ops.eventsource.MongoEventSourceITAssertions;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.tracing.DittoTracingInitResource;
 import org.eclipse.ditto.utils.jsr305.annotations.AllValuesAreNonnullByDefault;
 import org.junit.ClassRule;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import com.typesafe.config.Config;
 
@@ -134,7 +136,8 @@ protected ActorRef startEntityActor(final ActorSystem system, final ActorRef pub
         final var dittoExtensionsConfig = ScopedConfig.dittoExtension(system.settings().config());
         final var enforcerActorPropsFactory = ConnectionEnforcerActorPropsFactory.get(system, dittoExtensionsConfig);
         final Props props =
-                ConnectionSupervisorActor.props(proxyActorProbe.ref(), pubSubMediator, enforcerActorPropsFactory);
+                ConnectionSupervisorActor.props(proxyActorProbe.ref(), pubSubMediator, enforcerActorPropsFactory,
+                        Mockito.mock(MongoReadJournal.class));
 
         return system.actorOf(props, String.valueOf(id));
     }
diff --git a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
index 4ac16530a28..e114dd11074 100644
--- a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
+++ b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
@@ -263,6 +263,9 @@ entries:
           - title: Search
             url: /basic-search.html
             output: web
+          - title: History capabilities
+            url: /basic-history.html
+            output: web
           - title: Acknowledgements / QoS
             url: /basic-acknowledgements.html
             output: web
@@ -492,6 +495,10 @@ entries:
                     url: /protocol-specification-connections-announcement.html
                     output: web
 
+          - title: Streaming subscriptions (history)
+            url: /protocol-specification-streaming-subscription.html
+            output: web
+
           - title: Bindings
             url: /protocol-bindings.html
             output: web
diff --git a/documentation/src/main/resources/_data/tags.yml b/documentation/src/main/resources/_data/tags.yml
index 84db28d555c..72d45c03e79 100644
--- a/documentation/src/main/resources/_data/tags.yml
+++ b/documentation/src/main/resources/_data/tags.yml
@@ -11,6 +11,7 @@ allowed-tags:
   - model
   - signal
   - http
+  - history
   - search
   - protocol
   - connectivity
diff --git a/documentation/src/main/resources/jsonschema/protocol-streaming-subscription-failed-payload.json b/documentation/src/main/resources/jsonschema/protocol-streaming-subscription-failed-payload.json
new file mode 100644
index 00000000000..db6bff8bc08
--- /dev/null
+++ b/documentation/src/main/resources/jsonschema/protocol-streaming-subscription-failed-payload.json
@@ -0,0 +1,35 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "description": "",
+  "title": "",
+  "properties": {
+    "subscriptionId": {
+      "type": "string",
+      "description": "Identifier of the streaming subscription delivered by a previous \"created\" event."
+    },
+    "error": {
+      "type": "object",
+      "description": "The _error_ field contains information about the error that occurred.",
+      "properties": {
+        "status": {
+          "type": "integer",
+          "description": "The status code that indicates the cause of the error. The semantics of the used status codes are based on the [HTTP status codes](https://tools.ietf.org/html/rfc7231#section-6)."
+        },
+        "error": {
+          "type": "string",
+          "description": "The error code that uniquely identifies the error."
+        },
+        "message": {
+          "type": "string",
+          "description": "A human readable message that explains in detail what went wrong."
+        },
+        "description": {
+          "type": "string",
+          "description": "Contains further information about the error e.g. a hint what caused the problem and how to solve it."
+        }
+      }
+    }
+  },
+  "required": ["subscriptionId", "error"]
+}
diff --git a/documentation/src/main/resources/jsonschema/protocol-streaming-subscription-next-payload.json b/documentation/src/main/resources/jsonschema/protocol-streaming-subscription-next-payload.json
new file mode 100644
index 00000000000..dfc01e22393
--- /dev/null
+++ b/documentation/src/main/resources/jsonschema/protocol-streaming-subscription-next-payload.json
@@ -0,0 +1,16 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "description": "",
+  "title": "",
+  "properties": {
+    "subscriptionId": {
+      "type": "string",
+      "description": "Identifier of the streaming subscription delivered by a previous \"created\" event."
+    },
+    "item": {
+      "description": "A JSON value containing JSON representations of the contained item."
+    }
+  },
+  "required": ["subscriptionId", "item"]
+}
diff --git a/documentation/src/main/resources/jsonschema/protocol-streaming-subscription-request-payload.json b/documentation/src/main/resources/jsonschema/protocol-streaming-subscription-request-payload.json
new file mode 100644
index 00000000000..bc61bdd94e4
--- /dev/null
+++ b/documentation/src/main/resources/jsonschema/protocol-streaming-subscription-request-payload.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "description": "",
+  "title": "",
+  "properties": {
+    "subscriptionId": {
+      "type": "string",
+      "description": "Identifier of the streaming subscription delivered by a previous \"created\" event."
+    },
+    "demand": {
+      "type": "number",
+      "description": "How many items to request. Must be a positive integer."
+    }
+  },
+  "required": ["subscriptionId", "demand"]
+}
diff --git a/documentation/src/main/resources/jsonschema/protocol-streaming-subscription-subscribe-for-persisted-events-payload.json b/documentation/src/main/resources/jsonschema/protocol-streaming-subscription-subscribe-for-persisted-events-payload.json
new file mode 100644
index 00000000000..bf525456c20
--- /dev/null
+++ b/documentation/src/main/resources/jsonschema/protocol-streaming-subscription-subscribe-for-persisted-events-payload.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "description": "",
+  "title": "",
+  "properties": {
+    "fromHistoricalRevision": {
+      "type": "integer",
+      "description": "The revision to start the streaming from."
+    },
+    "toHistoricalRevision": {
+      "type": "integer",
+      "description": "The revision to stop the streaming at."
+    },
+    "fromHistoricalTimestamp": {
+      "type": "string",
+      "format": "date-time",
+      "description": "The timestamp to start the streaming from."
+    },
+    "toHistoricalTimestamp": {
+      "type": "string",
+      "format": "date-time",
+      "description": "The timestamp to stop the streaming at."
+    }
+  }
+}
diff --git a/documentation/src/main/resources/jsonschema/protocol-streaming-subscriptionid.json b/documentation/src/main/resources/jsonschema/protocol-streaming-subscriptionid.json
new file mode 100644
index 00000000000..92758ecd8a7
--- /dev/null
+++ b/documentation/src/main/resources/jsonschema/protocol-streaming-subscriptionid.json
@@ -0,0 +1,13 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "description": "",
+  "title": "",
+  "properties": {
+    "subscriptionId": {
+      "type": "string",
+      "description": "Identifier of the streaming subscription delivered by a previous \"created\" event."
+    }
+  },
+  "required": ["subscriptionId"]
+}
diff --git a/documentation/src/main/resources/pages/ditto/basic-history.md b/documentation/src/main/resources/pages/ditto/basic-history.md
new file mode 100644
index 00000000000..89c9cec0e9b
--- /dev/null
+++ b/documentation/src/main/resources/pages/ditto/basic-history.md
@@ -0,0 +1,178 @@
+---
+title: History capabilities
+keywords: history, historic, historian
+tags: [history]
+permalink: basic-history.html
+---
+
+Starting with **Eclipse Ditto 3.2.0**, APIs for retrieving the history of the following entities is provided:
+* [things](basic-thing.html)
+* [policies](basic-policy.html)
+* [connections](basic-connections.html)
+
+The capabilities of these APIs are the following:
+
+| Entity     | Retrieving entity at a specific revision or timestamp | Streaming modification events of an entity specifying from/to revision/timestamp |
+|------------|-------------------------------------------------------|----------------------------------------------------------------------------------|
+| Thing      | ✓                                                     | ✓                                                                                |
+| Policy     | ✓                                                     | ✓                                                                                |
+| Connection | ✓                                                     | no                                                                               |
+
+{% include note.html content="Ditto's history API capabilities are not comparable with the features of a time series database.
+    E.g. no aggregations on or compactions of the historical data can be done." %}
+
+
+## Retrieving entity from history
+
+Provides:
+* Finding out the state of an entity (thing, policy, connection) at a given:
+  * revision number
+  * timestamp
+* Retrieving "historical headers" persisted together with a modification (see [configuring historical headers to persist](#configuring-historical-headers-to-persist))
+
+Target use cases:
+* Compare changes to entity (e.g. a connection) to a former state
+  * In order to solve potential errors in e.g. policy or connection configuration
+* **Audit log**: Find out who (which subject) did a change to an entity
+  * E.g. in order to find out who changed a policy/connection
+  * Configure [which headers to persist as historical headers](#configuring-historical-headers-to-persist) to e.g. include the subject which did a modification
+
+### Retrieve entity at specific revision
+
+Retrieving an entity at an (historical) revision, set the header `at-historical-revision` to a `long` number for all
+"retrieve" commands of persisted state.
+
+Example for the HTTP API:
+```bash
+# Access a thing:
+curl -u ditto:ditto 'http://localhost:8080/api/2/things/org.eclipse.ditto:thing-1' \
+  --header 'at-historical-revision: 1'
+  
+# Access a policy:
+curl -u ditto:ditto 'http://localhost:8080/api/2/policies/org.eclipse.ditto:policy-1' \
+  --header 'at-historical-revision: 1'
+  
+# Access a connection:
+curl -u ditto:ditto 'http://localhost:8080/api/2/connections/some-connection-1' \
+  --header 'at-historical-revision: 1'
+```
+
+The same functionality is available via a [header of a Ditto Protocol](protocol-specification.html#headers) message.
+
+If [historical headers](#configuring-historical-headers-to-persist) were configured to be persisted, they can be found
+in the response header named `historical-headers`.
+
+### Retrieve entity at specific timestamp
+
+Retrieving an entity at an (historical) timestamp, set the header `at-historical-timestamp` to an ISO-8601 formatted 
+`string`  for all "retrieve" commands of persisted state.
+
+Example for the HTTP API:
+```bash
+# Access a thing:
+curl -u ditto:ditto 'http://localhost:8080/api/2/things/org.eclipse.ditto:thing-1' \
+  --header 'at-historical-timestamp: 2022-10-24T03:11:15Z'
+  
+# Access a policy:
+curl -u ditto:ditto 'http://localhost:8080/api/2/policies/org.eclipse.ditto:policy-1' \
+  --header 'at-historical-timestamp: 2022-10-24T06:11:15Z'
+  
+# Access a connection:
+curl -u ditto:ditto 'http://localhost:8080/api/2/connections/some-connection-1' \
+  --header 'at-historical-timestamp: 2022-10-24T07:11Z'
+```
+
+The same functionality is available via a [header of a Ditto Protocol](protocol-specification.html#headers) message.
+
+If [historical headers](#configuring-historical-headers-to-persist) were configured to be persisted, they can be found
+in the response header named `historical-headers`.
+
+
+## Streaming historical events of entity
+
+Provides:
+* A stream of changes to a specific thing or policy, based on specified:
+  * entity ID
+  * start revision number (and optional stop revision number)
+  * start timestamp (and optional stop timestamp)
+* Retrieving "historical headers" persisted together with a modification (see [configuring historical headers to persist](#configuring-historical-headers-to-persist))
+
+Target use cases:
+* Inspect the changes of an entity over time
+  * E.g. displaying a value on a chart with that way
+
+### Streaming historical events via SSE
+
+The easiest way to stream historical events is the [SSE (Server Sent Event) API](httpapi-sse.html).  
+This API is however **only available for things** (not for policies).
+
+Use the following query parameters in order to specify the start/stop revision/timestamp.
+
+Either use the revision based parameters:
+* `from-historical-revision`: specifies the revision number to start streaming historical modification events from
+* `to-historical-revision`: optionally specifies the revision number to stop streaming at (if omitted, it streams events until the current state of the entity)
+
+Alternatively, use the timestamp based parameters:
+* `from-historical-timestamp`: specifies the timestamp to start streaming historical modification events from
+* `to-historical-timestamp`: optionally specifies the timestamp to stop streaming at (if omitted, it streams events until the current state of the entity)
+
+The messages sent over the SSE are the same as for the [SSE (Server Sent Event) API](httpapi-sse.html), each historical 
+modification event is "normalized" to the Thing JSON representation.
+
+Examples:
+```bash
+# stream complete history starting from earliest available revision of a thing:
+curl --http2 -u ditto:ditto -H 'Accept:text/event-stream' -N \
+  http://localhost:8080/api/2/things/org.eclipse.ditto:thing-2?from-historical-revision=0&fields=thingId,attributes,features,_revision,_modified
+
+# stream specific history range of a thing based on revisions:
+curl --http2 -u ditto:ditto -H 'Accept:text/event-stream' -N \
+  http://localhost:8080/api/2/things/org.eclipse.ditto:thing-2?from-historical-revision=23&to-historical-revision=42&fields=thingId,attributes,features,_revision,_modified
+
+# stream specific history range of a thing based on timestamps:
+curl --http2 -u ditto:ditto -H 'Accept:text/event-stream' -N \
+  http://localhost:8080/api/2/things/org.eclipse.ditto:thing-2?from-historical-timestamp=2022-10-24T11:44:36Z&to-historical-timestamp=2022-10-24T11:44:37Z&fields=thingId,attributes,features,_revision,_modified
+
+# stream specific history range, additionally selecting _context in "fields" which contains the historical headers:
+curl --http2 -u ditto:ditto -H 'Accept:text/event-stream' -N \
+  http://localhost:8080/api/2/things/org.eclipse.ditto:thing-2?from-historical-revision=0&fields=thingId,attributes,features,_revision,_modified,_context
+```
+
+### Streaming historical events via Ditto Protocol
+
+Please inspect the [protocol specification of DittoProtocol messages for streaming persisted events](protocol-specification-streaming-subscription.html)
+to find out how to stream historical (persisted) events via DittoProtocol.  
+Using the DittoProtocol, historical events can be streamed either via WebSocket or connections.
+
+
+## Configuring historical headers to persist
+
+In the configuration of the services (things, policies, connectivity) there is a section where to configure the historical
+headers to persist, for example this is the section for policies:
+
+```hocon
+event {
+  # define the DittoHeaders to persist when persisting events to the journal
+  # those can e.g. be retrieved as additional "audit log" information when accessing a historical policy revision
+  historical-headers-to-persist = [
+    #"ditto-originator"  # who (user-subject/connection-pre-auth-subject) issued the event
+    #"correlation-id"
+  ]
+  historical-headers-to-persist = ${?POLICY_EVENT_HISTORICAL_HEADERS_TO_PERSIST}
+}
+```
+
+By default, no headers are persisted as historical headers, but it could e.g. make sense to persist the `ditto-originator`
+in order to provide "audit log" functionality in order to find out who (which subject) changed a policy at which time.
+
+## Cleanup retention time configuration
+
+In order to be able to access the history of entities, their journal database entries must not be cleaned up too quickly.
+
+By default, Ditto enables the [background cleanup](installation-operating.html#managing-background-cleanup) in order to
+delete "stale" (when not using the history feature) data from the MongoDB.
+
+If Ditto shall be used with history capabilities, the cleanup has either
+* be disabled completely (which however could lead to a lot of used database storage)
+* or be configured with a `history-retention-duration` of a duration how long to keep "the history" before cleaning up
+  snapshots and events
diff --git a/documentation/src/main/resources/pages/ditto/installation-operating.md b/documentation/src/main/resources/pages/ditto/installation-operating.md
index 9634b5aea47..32e847b234d 100644
--- a/documentation/src/main/resources/pages/ditto/installation-operating.md
+++ b/documentation/src/main/resources/pages/ditto/installation-operating.md
@@ -788,9 +788,88 @@ However, [Manage connections via Piggyback commands](connectivity-manage-connect
 
 #### Managing background cleanup
 
-Ditto deletes unnecessary events and snapshots in the background according to database load. Each Things, Policies and
-Connectivity instance has an actor coordinating a portion of the background cleanup process. The actor responds to
-piggyback-commands to query its state and configuration, modify its configuration, and restart the background cleanup
+Ditto deletes unnecessary events and snapshots in the background according to database load.
+
+##### Configuration of background cleanup
+
+The background cleanup configuration is available for:
+* Policies: [policies.conf](https://github.com/eclipse/ditto/blob/master/policies/service/src/main/resources/policies.conf)
+* Things: [things.conf](https://github.com/eclipse/ditto/blob/master/things/service/src/main/resources/things.conf)
+* Connectivity: [connectivity.conf](https://github.com/eclipse/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf)
+
+And has the following config parameters:
+```hocon
+cleanup {
+  # enabled configures whether background cleanup is enabled or not
+  # If enabled, stale "snapshot" and "journal" entries will be cleaned up from the MongoDB by a background process
+  enabled = true
+  enabled = ${?CLEANUP_ENABLED}
+
+  # history-retention-duration configures the duration of how long to "keep" events and snapshots before being
+  # allowed to remove them in scope of cleanup.
+  # If this e.g. is set to 30d - then effectively an event history of 30 days would be available via the read
+  # journal.
+  history-retention-duration = 0d
+  history-retention-duration = ${?CLEANUP_HISTORY_RETENTION_DURATION}
+
+  # quiet-period defines how long to stay in a state where the background cleanup is not yet started
+  # Applies after:
+  # - starting the service
+  # - each "completed" background cleanup run (all entities were cleaned up)
+  quiet-period = 5m
+  quiet-period = ${?CLEANUP_QUIET_PERIOD}
+
+  # interval configures how often a "credit decision" is made.
+  # The background cleanup works with a credit system and does only generate new "cleanup credits" if the MongoDB
+  # currently has capacity to do cleanups.
+  interval = 3s
+  interval = ${?CLEANUP_INTERVAL}
+
+  # timer-threshold configures the maximum database latency to give out credit for cleanup actions.
+  # If write operations to the MongoDB within the last `interval` had a `max` value greater to the configured
+  # threshold, no new cleanup credits will be issued for the next `interval`.
+  # Which throttles cleanup when MongoDB is currently under heavy (write) load.
+  timer-threshold = 150ms
+  timer-threshold = ${?CLEANUP_TIMER_THRESHOLD}
+
+  # credits-per-batch configures how many "cleanup credits" should be generated per `interval` as long as the
+  # write operations to the MongoDB are less than the configured `timer-threshold`.
+  # Limits the rate of cleanup actions to this many per credit decision interval.
+  # One credit means that the "journal" and "snapshot" entries of one entity are cleaned up each `interval`.
+  credits-per-batch = 3
+  credits-per-batch = ${?CLEANUP_CREDITS_PER_BATCH}
+
+  # reads-per-query configures the number of snapshots to scan per MongoDB query.
+  # Configuring this to high values will reduce the need to query MongoDB too often - it should however be aligned
+  # with the amount of "cleanup credits" issued per `interval` - in order to avoid long running queries.
+  reads-per-query = 100
+  reads-per-query = ${?CLEANUP_READS_PER_QUERY}
+
+  # writes-per-credit configures the number of documents to delete for each credit.
+  # If for example one entity would have 1000 journal entries to cleanup, a `writes-per-credit` of 100 would lead
+  # to 10 delete operations performed against MongoDB.
+  writes-per-credit = 100
+  writes-per-credit = ${?CLEANUP_WRITES_PER_CREDIT}
+
+  # delete-final-deleted-snapshot configures whether for a deleted entity, the final snapshot (containing the
+  # "deleted" information) should be deleted or not.
+  # If the final snapshot is not deleted, re-creating the entity will cause that the recreated entity starts with
+  # a revision number 1 higher than the previously deleted entity. If the final snapshot is deleted as well,
+  # recreation of an entity with the same ID will lead to revisionNumber=1 after its recreation.
+  delete-final-deleted-snapshot = false
+  delete-final-deleted-snapshot = ${?CLEANUP_DELETE_FINAL_DELETED_SNAPSHOT}
+}
+```
+
+By default, background cleanup is enabled for all entities and the retention duration is configured to `0d` (0 days), 
+meaning that no history will be kept for a longer time.
+
+In order to use Ditto's [history capabilities](basic-history.html), the configuration has to be adjusted accordingly.
+
+##### Adjustment of background cleanup during runtime
+
+Each Things, Policies and Connectivity instance has an actor coordinating a portion of the background cleanup process. 
+The actor responds to piggyback-commands to query its state and configuration, modify its configuration, and restart the background cleanup
 process.
 
 Each command is sent to the actor selection `/user/<SERVICE_NAME>Root/persistenceCleanup`, where
diff --git a/documentation/src/main/resources/pages/ditto/protocol-specification-streaming-subscription.md b/documentation/src/main/resources/pages/ditto/protocol-specification-streaming-subscription.md
new file mode 100644
index 00000000000..714394eafc0
--- /dev/null
+++ b/documentation/src/main/resources/pages/ditto/protocol-specification-streaming-subscription.md
@@ -0,0 +1,168 @@
+---
+title: Streaming subscription protocol specification
+keywords: protocol, specification, thing, policy, stream, subscription, history, historical
+tags: [protocol, history]
+permalink: protocol-specification-streaming-subscription.html
+---
+
+The [history capabilities](basic-history.html) of the Ditto protocol consists of 3 commands and 4 events that together 
+implement the [reactive-streams](https://reactive-streams.org) protocol over any duplex transport layer.
+For each streaming subscription request, Ditto acts as the reactive-streams publisher of pages of historical events,
+and the client acts as the subscriber.
+By reactive-streams means, the client controls how fast pages are delivered to it and may cancel
+a request before all results are sent.
+
+While [connections](basic-connections.html) do not expose or require a duplex transport layer,
+the streaming subscription protocol is available for them as well: Send commands from client to Ditto via any
+[connection source](basic-connections.html#sources). For each command, 0 or more events from Ditto to client
+are published to the reply-target of the source.
+
+[ps]: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/concurrent/Flow.Publisher.html#subscribe(java.util.concurrent.Flow.Subscriber)
+[ss]: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/concurrent/Flow.Subscriber.html#onSubscribe(java.util.concurrent.Flow.Subscription)
+[sn]: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/concurrent/Flow.Subscriber.html#onNext(T)
+[sc]: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/concurrent/Flow.Subscriber.html#onComplete()
+[se]: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/concurrent/Flow.Subscriber.html#onError(java.lang.Throwable)
+[nr]: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/concurrent/Flow.Subscription.html#request(long)
+[nc]: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/concurrent/Flow.Subscription.html#cancel()
+[n]: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/concurrent/Flow.Subscription.html
+
+For reactive-streams on the JVM, a publisher-subscriber pair is identified by a [Subscription][n] object according
+to reference equality.
+Similarly, the streaming subscription protocol commands and events of one request are identified by a subscription ID.
+
+Each streaming subscription protocol command or event corresponds to a reactive-streams _signal_ and are bound
+by the same rules in the [reactive-streams specification](https://github.com/reactive-streams/reactive-streams-jvm/blob/v1.0.3/README.md).
+
+| Reactive-streams signal      | Streaming subscription protocol message topic                                                                         |Type   | Message direction |
+|------------------------------|-----------------------------------------------------------------------------------------------------------------------|-------|-------------------|
+| [Publisher#subscribe][ps]    | [`<namespace>/<entityName>/<group>/<channel>/streaming/subscribeForPersistedEvents`](#subscribe-for-persisted-events) |Command| Client to Ditto   |
+| [Subscription#request][nr]   | [`<namespace>/<entityName>/<group>/<channel>/streaming/request`](#request)                                            |Command| Client to Ditto   |
+| [Subscription#cancel][nc]    | [`<namespace>/<entityName>/<group>/<channel>/streaming/cancel`](#cancel)                                              |Command| Client to Ditto   |
+| [Subscriber#onSubscribe][ss] | [`<namespace>/<entityName>/<group>/<channel>/streaming/created`](#created)                                            |Event  | Ditto to Client   |
+| [Subscriber#onNext][sn]      | [`<namespace>/<entityName>/<group>/<channel>/streaming/next`](#next)                                                  |Event  | Ditto to Client   |
+| [Subscriber#onComplete][sc]  | [`<namespace>/<entityName>/<group>/<channel>/streaming/complete`](#complete)                                          |Event  | Ditto to Client   |
+| [Subscriber#onError][se]     | [`<namespace>/<entityName>/<group>/<channel>/streaming/failed`](#failed)                                              |Event  | Ditto to Client   |
+
+## Interaction pattern
+
+For one request, the commands from client to Ditto should follow this protocol:
+```
+subscribe request* cancel?
+```
+The client should send one ["subscribeForPersistedEvents"](#subscribe-for-persisted-events) command,
+followed by multiple ["request"](#request) commands and an optional ["cancel"](#cancel) command.
+
+In response to a ["subscribeForPersistedEvents"](#subscribe-for-persisted-events) command and after each ["request"](#request) command,
+Ditto will send 0 or more events to the client according to the following protocol:
+```
+created next* (complete | failed)?
+```
+A ["created"](#created) event bearing the subscription ID is always sent.
+0 or more ["next"](#next) events are sent according to the amount of results requested 
+by the client. A ["complete"](#complete) or ["failed"](#failed) event comes at the
+end unless the client sends a ["cancel"](#cancel) command before the results are exhausted.
+
+There is no special event in response to a ["cancel"](#cancel) command.
+The client may continue to receive buffered ["next"](#next),
+["complete"](#complete) or ["failed"](#failed) events after sending a ["cancel"](#cancel) command.
+
+In addition to the rules of reactive-streams, Ditto guarantees that no ["complete"](#complete) or
+["failed"](#failed) event will arrive
+before the client expresses its readiness by a first ["request"](#request) command. The reason is to facilitate
+concurrency at the client side. Without the extra guarantee, a multi-threaded client would have to process a
+["complete"](#complete) or ["failed"](#failed) event in parallel of the preceding ["created"](#created) event.
+It would put the burden of sequentialization at the client side and complicate the programming there.
+
+## Commands from Client to Ditto
+
+### Subscribe for persisted events
+
+Sent a ["subscribeForPersistedEvents"](#subscribe-for-persisted-events) command to Ditto to start receiving persisted events as results.
+Ditto will always respond with a ["created"](#created) event.
+
+| Field      | Value                                                                                                                                                                                                     |
+|------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic**  | `<namespace>/<entityName>/<group>/<channel>/streaming/subscribeForPersistedEvents`                                                                                                                        |
+| **path**   | `/`                                                                                                                                                                                                       |
+| **value**  | JSON object specifying the options how the persisted events should be selected. {% include docson.html schema="jsonschema/protocol-streaming-subscription-subscribe-for-persisted-events-payload.json" %} |
+
+The options where to start/stop historical persisted events from can be specified in the `value` field
+of a ["subscribeForPersistedEvents"](#subscribe-for-persisted-events) command.
+If no options are provided at all, the complete available history for the specified entity is streamed as a result.
+
+### Request
+
+After obtaining a subscription ID from a ["created"](#created) event,
+use ["request"](#request) commands to tell Ditto how many results you are prepared to receive.
+Ditto will send ["next"](#next) events until all requested results are fulfilled,
+the results are exhausted, or an error occurred.
+
+| Field      | Value                                                                                                                                            |
+|------------|--------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic**  | `<namespace>/<entityName>/<group>/<channel>/streaming/request`                                                                                   |
+| **path**   | `/`                                                                                                                                              |
+| **value**  | JSON object specifying the demand of results. {% include docson.html schema="jsonschema/protocol-streaming-subscription-request-payload.json" %} |
+
+### Cancel
+
+After obtaining a subscription ID from a ["created"](#created) event,
+use a ["cancel"](#cancel) command to stop Ditto from sending more items of the results.
+Pages in-flight may yet arrive, but the client will eventually stop receiving
+events of the same subscription ID.
+
+| Field      | Value                                                                                                                     |
+|------------|---------------------------------------------------------------------------------------------------------------------------|
+| **topic**  | `<namespace>/<entityName>/<group>/<channel>/streaming/cancel`                                                             |
+| **path**   | `/`                                                                                                                       |
+| **value**  | Identifies a streaming subscription. {% include docson.html schema="jsonschema/protocol-streaming-subscriptionid.json" %} |
+
+## Events from Ditto to Client
+
+### Created
+
+To any ["subscribeForPersistedEvents"](#subscribe-for-persisted-events) command, Ditto will always respond with 
+a ["created"](#created) event.
+
+| Field      | Value                                                                                                                                                                           |
+|------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic**  | `<namespace>/<entityName>/<group>/<channel>/streaming/created`                                                                                                                  |
+| **path**   | `/`                                                                                                                                                                             |
+| **value**  | Discloses the ID of a streaming subscription which all subsequent commands should include. {% include docson.html schema="jsonschema/protocol-streaming-subscriptionid.json" %} |
+
+### Next
+
+Each ["next"](#next) event contains one item of the results.
+Ditto will not send more ["next"](#next) events for a given subscription ID than the total number of items
+requested by previous ["request"](#request) commands.
+
+| Field      | Value                                                                                                                                           |
+|------------|-------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic**  | `<namespace>/<entityName>/<group>/<channel>/streaming/next`                                                                                     |
+| **path**   | `/`                                                                                                                                             |
+| **value**  | JSON object containing one item of the results. {% include docson.html schema="jsonschema/protocol-streaming-subscription-next-payload.json" %} |
+
+### Complete
+
+A streaming subscription ends with a ["complete"](#complete) or a ["failed"](#failed) event from Ditto,
+or with a ["cancel"](#cancel) command from the client.
+Ditto sends a ["complete"](#complete) event when all items of the results are delivered to the client.
+
+| Field      | Value                                                                                                                     |
+|------------|---------------------------------------------------------------------------------------------------------------------------|
+| **topic**  | `<namespace>/<entityName>/<group>/<channel>/streaming/complete`                                                           |
+| **path**   | `/`                                                                                                                       |
+| **value**  | Identifies a streaming subscription. {% include docson.html schema="jsonschema/protocol-streaming-subscriptionid.json" %} |
+
+### Failed
+
+A streaming subscription ends with a ["complete"](#complete) or a ["failed"](#failed) event from Ditto,
+or with an ["cancel"](#cancel) command from the client.
+Ditto sends a ["failed"](#failed) event when an internal error occurred,
+or when the client breaches the reactive-streams specification.
+It is not possible to ["request"](#request) more items of the streaming subscription results after a ["failed"](#failed) event.
+
+| Field      | Value                                                                                                                                                |
+|------------|------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic**  | `<namespace>/<entityName>/<group>/<channel>/streaming/failed`                                                                                        |
+| **path**   | `/`                                                                                                                                                  |
+| **value**  | JSON object containing the reason for the failure. {% include docson.html schema="jsonschema/protocol-streaming-subscription-failed-payload.json" %} |
diff --git a/documentation/src/main/resources/pages/ditto/protocol-specification.md b/documentation/src/main/resources/pages/ditto/protocol-specification.md
index 5876b07752b..28cc5266416 100644
--- a/documentation/src/main/resources/pages/ditto/protocol-specification.md
+++ b/documentation/src/main/resources/pages/ditto/protocol-specification.md
@@ -86,22 +86,25 @@ since they are themselves not case-sensitive.
 
 There are some pre-defined headers, which have a special meaning for Ditto:
 
-| Header Key                      | Description                                                                                                                        | Possible values                                                                                                           |
-|---------------------------------|------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|
-| `content-type`                  | The content-type which describes the [value](#value) of Ditto Protocol messages.                                                   | `String`                                                                                                                  |
-| `correlation-id`                | Used for correlating protocol messages (e.g. a **command** would have the same correlation-id as the sent back **response** message). | `String`                                                                                                                  |
-| `ditto-originator`              | Contains the first authorization subject of the command that caused the sending of this message. Set by Ditto.                     | `String`                                                                                                                  |
-| `if-match`                      | Has the same semantics as defined for the [HTTP API](httpapi-concepts.html#conditional-requests).                                  | `String`                                                                                                                  |
-| `if-none-match`                 | Has the same semantics as defined for the [HTTP API](httpapi-concepts.html#conditional-requests).                                  | `String`                                                                                                                  |
-| `response-required`             | Configures for a **command** whether or not a **response** should be sent back.                                                    | `Boolean` - default: `true`                                                                                               |
-| `requested-acks`                | Defines which [acknowledgements](basic-acknowledgements.html) are requested for a command processed by Ditto.                      | `JsonArray` of `String` - default: `["twin-persisted"]`                                                                   |
-| `ditto-weak-ack`                | Marks [weak acknowledgements](basic-acknowledgements.html) issued by Ditto.                                                        | `Boolean` - default: `false`                                                                                              |
-| `timeout`                       | Defines how long the Ditto server should wait, e.g. applied when waiting for requested acknowledgements.                           | `String` - e.g.: `42s` or `250ms` or `1m` - default: `60s`                                                                |
-| `version`                       | Determines in which schema version the `payload` should be interpreted.                                                            | `Number` - currently possible: \[2\] - default: `2`                                                                       |
-| `put-metadata`                  | Determines which Metadata information is stored in the thing.                                                                      | `JsonArray` of `JsonObject`s containing [metadata](basic-metadata.html) to apply.                                         |
-| `condition`                     | The condition to evaluate before applying the request.                                                                             | `String` containing [condition](basic-conditional-requests.html) to apply.                                                |
-| `live-channel-condition`        | The condition to evaluate before retrieving thing data from the device.                                                            | `String` containing [live channel condition](basic-conditional-requests.html#live-channel-condition) to apply.            |
-| `live-channel-timeout-strategy` | The strategy to apply when a [live](protocol-twinlive.html#live) command was not answered by the actual device within the defined `timeout`.                  | `fail`: let the request fail with a 408 timeout error - `use-twin`: fall back to the twin, retrieving the persisted data. |
+| Header Key                      | Description                                                                                                                                  | Possible values                                                                                                           |
+|---------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------|
+| `content-type`                  | The content-type which describes the [value](#value) of Ditto Protocol messages.                                                             | `String`                                                                                                                  |
+| `correlation-id`                | Used for correlating protocol messages (e.g. a **command** would have the same correlation-id as the sent back **response** message).        | `String`                                                                                                                  |
+| `ditto-originator`              | Contains the first authorization subject of the command that caused the sending of this message. Set by Ditto.                               | `String`                                                                                                                  |
+| `if-match`                      | Has the same semantics as defined for the [HTTP API](httpapi-concepts.html#conditional-requests).                                            | `String`                                                                                                                  |
+| `if-none-match`                 | Has the same semantics as defined for the [HTTP API](httpapi-concepts.html#conditional-requests).                                            | `String`                                                                                                                  |
+| `response-required`             | Configures for a **command** whether or not a **response** should be sent back.                                                              | `Boolean` - default: `true`                                                                                               |
+| `requested-acks`                | Defines which [acknowledgements](basic-acknowledgements.html) are requested for a command processed by Ditto.                                | `JsonArray` of `String` - default: `["twin-persisted"]`                                                                   |
+| `ditto-weak-ack`                | Marks [weak acknowledgements](basic-acknowledgements.html) issued by Ditto.                                                                  | `Boolean` - default: `false`                                                                                              |
+| `timeout`                       | Defines how long the Ditto server should wait, e.g. applied when waiting for requested acknowledgements.                                     | `String` - e.g.: `42s` or `250ms` or `1m` - default: `60s`                                                                |
+| `version`                       | Determines in which schema version the `payload` should be interpreted.                                                                      | `Number` - currently possible: \[2\] - default: `2`                                                                       |
+| `put-metadata`                  | Determines which Metadata information is stored in the thing.                                                                                | `JsonArray` of `JsonObject`s containing [metadata](basic-metadata.html) to apply.                                         |
+| `condition`                     | The condition to evaluate before applying the request.                                                                                       | `String` containing [condition](basic-conditional-requests.html) to apply.                                                |
+| `live-channel-condition`        | The condition to evaluate before retrieving thing data from the device.                                                                      | `String` containing [live channel condition](basic-conditional-requests.html#live-channel-condition) to apply.            |
+| `live-channel-timeout-strategy` | The strategy to apply when a [live](protocol-twinlive.html#live) command was not answered by the actual device within the defined `timeout`. | `fail`: let the request fail with a 408 timeout error - `use-twin`: fall back to the twin, retrieving the persisted data. |
+| `at-historical-revision`        | The historical revision to retrieve an entity at, using the [history capabilities](basic-history.html).                                      | `Number` - a long value of the revision to retrieve.                                                                      |
+| `at-historical-timestamp`       | The historical timestamp in ISO-8601 format to retrieve an entity at, using the [history capabilities](basic-history.html).                  | `String` containing an ISO-8601 formatted timestamp.                                                                      |
+| `historical-headers`            | Contains the historical header when using `at-historical-*` headers to retrieve an entity at a certain history point.                        | `JsonObject` of the headers which were configured to be persisted as historical headers.                                  |
 
 Custom headers of messages through the [live channel](protocol-twinlive.html#live) are delivered verbatim. When naming 
 custom headers, it is best to attach a prefix specific to your application, that does not conflict with Ditto or
diff --git a/documentation/src/main/resources/pages/tags/tag_history.md b/documentation/src/main/resources/pages/tags/tag_history.md
new file mode 100644
index 00000000000..2ead594845d
--- /dev/null
+++ b/documentation/src/main/resources/pages/tags/tag_history.md
@@ -0,0 +1,9 @@
+---
+title: "History topics"
+tagName: history
+search: exclude
+permalink: tag_history.html
+sidebar: ditto_sidebar
+folder: tags
+---
+{% include taglogic.html %}
diff --git a/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/EdgeCommandForwarderActor.java b/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/EdgeCommandForwarderActor.java
index 6db6073e0e1..8fc2786b364 100644
--- a/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/EdgeCommandForwarderActor.java
+++ b/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/EdgeCommandForwarderActor.java
@@ -22,11 +22,13 @@
 import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
+import org.eclipse.ditto.base.model.signals.commands.streaming.StreamingSubscriptionCommand;
 import org.eclipse.ditto.base.model.signals.events.Event;
 import org.eclipse.ditto.base.service.signaltransformer.SignalTransformer;
 import org.eclipse.ditto.base.service.signaltransformer.SignalTransformers;
 import org.eclipse.ditto.connectivity.api.ConnectivityMessagingConstants;
 import org.eclipse.ditto.connectivity.api.commands.sudo.ConnectivitySudoCommand;
+import org.eclipse.ditto.connectivity.model.ConnectivityConstants;
 import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand;
 import org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveAllConnectionIds;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoDiagnosticLoggingAdapter;
@@ -37,8 +39,10 @@
 import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.messages.model.signals.commands.MessageCommand;
 import org.eclipse.ditto.messages.model.signals.commands.MessageCommandResponse;
+import org.eclipse.ditto.policies.model.PolicyConstants;
 import org.eclipse.ditto.policies.model.signals.commands.PolicyCommand;
 import org.eclipse.ditto.things.api.commands.sudo.SudoRetrieveThings;
+import org.eclipse.ditto.things.model.ThingConstants;
 import org.eclipse.ditto.things.model.signals.commands.ThingCommand;
 import org.eclipse.ditto.things.model.signals.commands.ThingCommandResponse;
 import org.eclipse.ditto.things.model.signals.commands.query.RetrieveThings;
@@ -146,6 +150,18 @@ public Receive createReceive() {
                 .match(ConnectivitySudoCommand.class, this::forwardToConnectivity)
                 .match(ThingSearchCommand.class, this::forwardToThingSearch)
                 .match(ThingSearchSudoCommand.class, this::forwardToThingSearch)
+                .match(StreamingSubscriptionCommand.class,
+                        src -> src.getEntityType().equals(ThingConstants.ENTITY_TYPE),
+                        this::forwardToThings
+                )
+                .match(StreamingSubscriptionCommand.class,
+                        src -> src.getEntityType().equals(PolicyConstants.ENTITY_TYPE),
+                        this::forwardToPolicies
+                )
+                .match(StreamingSubscriptionCommand.class,
+                        src -> src.getEntityType().equals(ConnectivityConstants.ENTITY_TYPE),
+                        this::forwardToConnectivity
+                )
                 .match(Signal.class, this::handleUnknownSignal)
                 .matchAny(m -> log.warning("Got unknown message: {}", m))
                 .build();
@@ -220,22 +236,23 @@ private void forwardToThingsAggregatorProxy(final Command<?> command) {
                 () -> signalTransformationCs.thenAccept(transformed -> aggregatorProxyActor.tell(transformed, sender)));
     }
 
-    private void forwardToPolicies(final PolicyCommand<?> policyCommand) {
+    private void forwardToPolicies(final Signal<?> policySignal) {
         final ActorRef sender = getSender();
-        final CompletionStage<Signal<?>> signalTransformationCs = applySignalTransformation(policyCommand, sender);
-        scheduleTask(policyCommand, () -> signalTransformationCs
-                .thenAccept(transformed -> {
-                    final PolicyCommand<?> transformedPolicyCommand = (PolicyCommand<?>) transformed;
-                    log.withCorrelationId(transformedPolicyCommand)
+        final CompletionStage<Signal<?>> signalTransformationCs = applySignalTransformation(policySignal, sender);
+        scheduleTask(policySignal, () -> signalTransformationCs
+                .thenAccept(transformedSignal -> {
+                    log.withCorrelationId(transformedSignal)
                             .info("Forwarding policy command with ID <{}> and type <{}> to 'policies' shard region",
-                                    transformedPolicyCommand.getEntityId(), transformedPolicyCommand.getType());
+                                    transformedSignal instanceof WithEntityId withEntityId ? withEntityId.getEntityId() :
+                                            null,
+                                    transformedSignal.getType());
 
-                    if (isIdempotent(transformedPolicyCommand)) {
-                        askWithRetryCommandForwarder.forwardCommand(transformedPolicyCommand,
+                    if (transformedSignal instanceof Command<?> transformedCommand && isIdempotent(transformedCommand)) {
+                        askWithRetryCommandForwarder.forwardCommand(transformedCommand,
                                 shardRegions.policies(),
                                 sender);
                     } else {
-                        shardRegions.policies().tell(transformedPolicyCommand, sender);
+                        shardRegions.policies().tell(transformedSignal, sender);
                     }
                 }));
     }
diff --git a/edge/service/src/main/java/org/eclipse/ditto/edge/service/streaming/StreamingSubscriptionActor.java b/edge/service/src/main/java/org/eclipse/ditto/edge/service/streaming/StreamingSubscriptionActor.java
new file mode 100644
index 00000000000..5138fc8ae02
--- /dev/null
+++ b/edge/service/src/main/java/org/eclipse/ditto/edge/service/streaming/StreamingSubscriptionActor.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.edge.service.streaming;
+
+import java.time.Duration;
+
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.exceptions.DittoInternalErrorException;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.commands.exceptions.StreamingSubscriptionProtocolErrorException;
+import org.eclipse.ditto.base.model.signals.commands.exceptions.StreamingSubscriptionTimeoutException;
+import org.eclipse.ditto.base.model.signals.commands.streaming.CancelStreamingSubscription;
+import org.eclipse.ditto.base.model.signals.commands.streaming.RequestFromStreamingSubscription;
+import org.eclipse.ditto.base.model.signals.commands.streaming.StreamingSubscriptionCommand;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionComplete;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionCreated;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionFailed;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionHasNext;
+import org.eclipse.ditto.internal.utils.akka.actors.AbstractActorWithStashWithTimers;
+import org.eclipse.ditto.internal.utils.akka.logging.DittoDiagnosticLoggingAdapter;
+import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
+import org.eclipse.ditto.json.JsonValue;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+import akka.actor.ActorRef;
+import akka.actor.PoisonPill;
+import akka.actor.Props;
+import akka.actor.ReceiveTimeout;
+import akka.japi.pf.ReceiveBuilder;
+
+/**
+ * Actor that translates streaming subscription commands into stream operations and stream signals into streaming
+ * subscription events.
+ */
+public final class StreamingSubscriptionActor extends AbstractActorWithStashWithTimers {
+
+    /**
+     * Live on as zombie for a while to prevent timeout at client side
+     */
+    private static final Duration ZOMBIE_LIFETIME = Duration.ofSeconds(10L);
+
+    private final DittoDiagnosticLoggingAdapter log = DittoLoggerFactory.getDiagnosticLoggingAdapter(this);
+
+    private final EntityId entityId;
+    private Subscription subscription;
+    private ActorRef sender;
+    private DittoHeaders dittoHeaders;
+
+    StreamingSubscriptionActor(final Duration idleTimeout,
+            final EntityId entityId,
+            final ActorRef sender,
+            final DittoHeaders dittoHeaders) {
+        this.entityId = entityId;
+        this.sender = sender;
+        this.dittoHeaders = dittoHeaders;
+        getContext().setReceiveTimeout(idleTimeout);
+    }
+
+    /**
+     * Create Props object for the StreamingSubscriptionActor.
+     *
+     * @param idleTimeout maximum lifetime while idling
+     * @param entityId the entity ID for which the streaming subscription is created.
+     * @param sender sender of the command that created this actor.
+     * @param dittoHeaders headers of the command that created this actor.
+     * @return Props for this actor.
+     */
+    public static Props props(final Duration idleTimeout, final EntityId entityId, final ActorRef sender,
+            final DittoHeaders dittoHeaders) {
+        return Props.create(StreamingSubscriptionActor.class, idleTimeout, entityId, sender, dittoHeaders);
+    }
+
+    /**
+     * Wrap a subscription actor as a reactive stream subscriber.
+     *
+     * @param streamingSubscriptionActor reference to the subscription actor.
+     * @param entityId the entity ID for which the subscriber is created.
+     * @return the actor presented as a reactive stream subscriber.
+     */
+    public static Subscriber<JsonValue> asSubscriber(final ActorRef streamingSubscriptionActor,
+            final EntityId entityId) {
+        return new StreamingSubscriberOps(streamingSubscriptionActor, entityId);
+    }
+
+    @Override
+    public void postStop() {
+        if (subscription != null) {
+            subscription.cancel();
+        }
+    }
+
+    @Override
+    public Receive createReceive() {
+        return ReceiveBuilder.create()
+                .match(RequestFromStreamingSubscription.class, this::requestSubscription)
+                .match(CancelStreamingSubscription.class, this::cancelSubscription)
+                .match(StreamingSubscriptionHasNext.class, this::subscriptionHasNext)
+                .match(StreamingSubscriptionComplete.class, this::subscriptionComplete)
+                .match(StreamingSubscriptionFailed.class, this::subscriptionFailed)
+                .match(Subscription.class, this::onSubscribe)
+                .matchEquals(ReceiveTimeout.getInstance(), this::idleTimeout)
+                .matchAny(m -> log.warning("Unknown message: <{}>", m))
+                .build();
+    }
+
+    private Receive createZombieBehavior() {
+        return ReceiveBuilder.create()
+                .match(RequestFromStreamingSubscription.class, requestSubscription -> {
+                    log.withCorrelationId(requestSubscription)
+                            .info("Rejecting RequestSubscription[demand={}] as zombie",
+                                    requestSubscription.getDemand());
+                    final String errorMessage =
+                            "This subscription is considered cancelled. No more messages are processed.";
+                    final StreamingSubscriptionFailed subscriptionFailed = StreamingSubscriptionFailed.of(
+                            getSubscriptionId(),
+                            entityId,
+                            StreamingSubscriptionProtocolErrorException.newBuilder()
+                                    .message(errorMessage)
+                                    .build(),
+                            requestSubscription.getDittoHeaders()
+                    );
+                    getSender().tell(subscriptionFailed, ActorRef.noSender());
+                })
+                .matchAny(message -> log.debug("Ignoring as zombie: <{}>", message))
+                .build();
+    }
+
+    private void idleTimeout(final ReceiveTimeout receiveTimeout) {
+        // usually a user error
+        log.info("Stopping due to idle timeout");
+        getContext().cancelReceiveTimeout();
+        final String subscriptionId = getSubscriptionId();
+        final StreamingSubscriptionTimeoutException error = StreamingSubscriptionTimeoutException
+                .of(subscriptionId, dittoHeaders);
+        final StreamingSubscriptionFailed subscriptionFailed = StreamingSubscriptionFailed
+                .of(subscriptionId, entityId, error, dittoHeaders);
+        if (subscription == null) {
+            sender.tell(getSubscriptionCreated(), ActorRef.noSender());
+        }
+        sender.tell(subscriptionFailed, ActorRef.noSender());
+        becomeZombie();
+    }
+
+    private void onSubscribe(final Subscription subscription) {
+        if (this.subscription != null) {
+            subscription.cancel();
+        } else {
+            this.subscription = subscription;
+            sender.tell(getSubscriptionCreated(), ActorRef.noSender());
+            unstashAll();
+        }
+    }
+
+    private StreamingSubscriptionCreated getSubscriptionCreated() {
+        return StreamingSubscriptionCreated.of(getSubscriptionId(), entityId, dittoHeaders);
+    }
+
+    private void setSenderAndDittoHeaders(final StreamingSubscriptionCommand<?> command) {
+        sender = getSender();
+        dittoHeaders = command.getDittoHeaders();
+    }
+
+    private void requestSubscription(final RequestFromStreamingSubscription requestFromStreamingSubscription) {
+        if (subscription == null) {
+            log.withCorrelationId(requestFromStreamingSubscription).debug("Stashing <{}>", requestFromStreamingSubscription);
+            stash();
+        } else {
+            log.withCorrelationId(requestFromStreamingSubscription).debug("Processing <{}>", requestFromStreamingSubscription);
+            setSenderAndDittoHeaders(requestFromStreamingSubscription);
+            subscription.request(requestFromStreamingSubscription.getDemand());
+        }
+    }
+
+    private void cancelSubscription(final CancelStreamingSubscription cancelStreamingSubscription) {
+        if (subscription == null) {
+            log.withCorrelationId(cancelStreamingSubscription).info("Stashing <{}>", cancelStreamingSubscription);
+            stash();
+        } else {
+            log.withCorrelationId(cancelStreamingSubscription).info("Processing <{}>", cancelStreamingSubscription);
+            setSenderAndDittoHeaders(cancelStreamingSubscription);
+            subscription.cancel();
+            becomeZombie();
+        }
+    }
+
+    private void subscriptionHasNext(final StreamingSubscriptionHasNext event) {
+        log.debug("Forwarding {}", event);
+        sender.tell(event.setDittoHeaders(dittoHeaders), ActorRef.noSender());
+    }
+
+    private void subscriptionComplete(final StreamingSubscriptionComplete event) {
+        // just in case: if error overtakes subscription, then there *will* be a subscription.
+        if (subscription == null) {
+            log.withCorrelationId(event).debug("Stashing <{}>", event);
+            stash();
+        } else {
+            log.info("{}", event);
+            sender.tell(event.setDittoHeaders(dittoHeaders), ActorRef.noSender());
+            becomeZombie();
+        }
+    }
+
+    private void subscriptionFailed(final StreamingSubscriptionFailed event) {
+        // just in case: if error overtakes subscription, then there *will* be a subscription.
+        if (subscription == null) {
+            log.withCorrelationId(event).debug("Stashing <{}>", event);
+            stash();
+        } else {
+            // log at INFO level because user errors may cause subscription failure.
+            log.withCorrelationId(event).info("{}", event);
+            sender.tell(event.setDittoHeaders(dittoHeaders), ActorRef.noSender());
+            becomeZombie();
+        }
+    }
+
+    private void becomeZombie() {
+        getTimers().startSingleTimer(PoisonPill.getInstance(), PoisonPill.getInstance(), ZOMBIE_LIFETIME);
+        getContext().become(createZombieBehavior());
+    }
+
+    private String getSubscriptionId() {
+        return getSelf().path().name();
+    }
+
+    private static final class StreamingSubscriberOps implements Subscriber<JsonValue> {
+
+        private final ActorRef streamingSubscriptionActor;
+        private final String subscriptionId;
+        private final EntityId entityId;
+
+        private StreamingSubscriberOps(final ActorRef streamingSubscriptionActor, final EntityId entityId) {
+            this.streamingSubscriptionActor = streamingSubscriptionActor;
+            subscriptionId = streamingSubscriptionActor.path().name();
+            this.entityId = entityId;
+        }
+
+        @Override
+        public void onSubscribe(final Subscription subscription) {
+            streamingSubscriptionActor.tell(subscription, ActorRef.noSender());
+        }
+
+        @Override
+        public void onNext(final JsonValue item) {
+            final StreamingSubscriptionHasNext event = StreamingSubscriptionHasNext
+                    .of(subscriptionId, entityId, item, DittoHeaders.empty());
+            streamingSubscriptionActor.tell(event, ActorRef.noSender());
+        }
+
+        @Override
+        public void onError(final Throwable t) {
+            final StreamingSubscriptionFailed event =
+                    StreamingSubscriptionFailed.of(subscriptionId,
+                            entityId,
+                            DittoRuntimeException.asDittoRuntimeException(t, e -> {
+                                if (e instanceof IllegalArgumentException) {
+                                    // incorrect protocol from the client side
+                                    return StreamingSubscriptionProtocolErrorException.of(e, DittoHeaders.empty());
+                                } else {
+                                    return DittoInternalErrorException.newBuilder().cause(e).build();
+                                }
+                            }),
+                            DittoHeaders.empty());
+            streamingSubscriptionActor.tell(event, ActorRef.noSender());
+        }
+
+        @Override
+        public void onComplete() {
+            final StreamingSubscriptionComplete event = StreamingSubscriptionComplete.of(subscriptionId, entityId,
+                    DittoHeaders.empty());
+            streamingSubscriptionActor.tell(event, ActorRef.noSender());
+        }
+    }
+}
diff --git a/edge/service/src/main/java/org/eclipse/ditto/edge/service/streaming/StreamingSubscriptionManager.java b/edge/service/src/main/java/org/eclipse/ditto/edge/service/streaming/StreamingSubscriptionManager.java
new file mode 100644
index 00000000000..f21b6afdccb
--- /dev/null
+++ b/edge/service/src/main/java/org/eclipse/ditto/edge/service/streaming/StreamingSubscriptionManager.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.edge.service.streaming;
+
+import java.time.Duration;
+import java.util.Optional;
+
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.exceptions.DittoInternalErrorException;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.json.Jsonifiable;
+import org.eclipse.ditto.base.model.signals.FeatureToggle;
+import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.base.model.signals.commands.exceptions.StreamingSubscriptionNotFoundException;
+import org.eclipse.ditto.base.model.signals.commands.streaming.CancelStreamingSubscription;
+import org.eclipse.ditto.base.model.signals.commands.streaming.RequestFromStreamingSubscription;
+import org.eclipse.ditto.base.model.signals.commands.streaming.StreamingSubscriptionCommand;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionFailed;
+import org.eclipse.ditto.internal.utils.akka.logging.DittoDiagnosticLoggingAdapter;
+import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
+import org.eclipse.ditto.json.JsonValue;
+import org.eclipse.ditto.protocol.ProtocolFactory;
+import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
+import org.reactivestreams.Subscriber;
+
+import akka.actor.AbstractActor;
+import akka.actor.ActorRef;
+import akka.actor.ActorSelection;
+import akka.actor.Props;
+import akka.japi.pf.ReceiveBuilder;
+import akka.pattern.Patterns;
+import akka.stream.Materializer;
+import akka.stream.SourceRef;
+import akka.stream.javadsl.Sink;
+import akka.stream.javadsl.Source;
+
+/**
+ * Actor that manages streaming subscriptions for 1 websocket connection or 1 ConnectionPersistenceActor.
+ */
+public final class StreamingSubscriptionManager extends AbstractActor {
+
+    /**
+     * Name of this actor.
+     */
+    public static final String ACTOR_NAME = "streamingSubscriptionManager";
+
+    private static final DittoProtocolAdapter DITTO_PROTOCOL_ADAPTER = DittoProtocolAdapter.newInstance();
+    private static final Duration COMMAND_FORWARDER_LOCAL_ASK_TIMEOUT = Duration.ofSeconds(15);
+
+    private final DittoDiagnosticLoggingAdapter log = DittoLoggerFactory.getDiagnosticLoggingAdapter(this);
+
+    private final Duration idleTimeout;
+    private final ActorSelection commandForwarder;
+    private final Materializer materializer;
+
+    private int subscriptionIdCounter = 0;
+
+    @SuppressWarnings("unused")
+    private StreamingSubscriptionManager(final Duration idleTimeout,
+            final ActorSelection commandForwarder,
+            final Materializer materializer) {
+        this.idleTimeout = idleTimeout;
+        this.commandForwarder = commandForwarder;
+        this.materializer = materializer;
+    }
+
+    /**
+     * Create Props for a subscription manager.
+     *
+     * @param idleTimeout lifetime of an idle StreamingSubscriptionActor.
+     * @param commandForwarder recipient of streaming subscription commands.
+     * @param materializer materializer for the search streams.
+     * @return Props of the actor.
+     */
+    public static Props props(final Duration idleTimeout,
+            final ActorSelection commandForwarder,
+            final Materializer materializer) {
+
+        return Props.create(StreamingSubscriptionManager.class, idleTimeout, commandForwarder, materializer);
+    }
+
+    @Override
+    public Receive createReceive() {
+        return ReceiveBuilder.create()
+                .match(RequestFromStreamingSubscription.class, this::requestSubscription)
+                .match(SubscribeForPersistedEvents.class, this::subscribeForPersistedEvents)
+                .match(CancelStreamingSubscription.class, this::cancelSubscription)
+                .build();
+    }
+
+    private void requestSubscription(final RequestFromStreamingSubscription requestFromStreamingSubscription) {
+        forwardToChild(requestFromStreamingSubscription.getSubscriptionId(), requestFromStreamingSubscription);
+    }
+
+    private void cancelSubscription(final CancelStreamingSubscription cancelStreamingSubscription) {
+        forwardToChild(cancelStreamingSubscription.getSubscriptionId(), cancelStreamingSubscription);
+    }
+
+    private void forwardToChild(final String streamingSubscriptionId, final StreamingSubscriptionCommand<?> command) {
+        final Optional<ActorRef> subscriptionActor = getContext().findChild(streamingSubscriptionId);
+        if (subscriptionActor.isPresent()) {
+            log.withCorrelationId(command).debug("Forwarding to child: <{}>", command);
+            subscriptionActor.get().tell(command, getSender());
+        } else {
+            // most likely a user error
+            log.withCorrelationId(command)
+                    .info("StreamingSubscriptionID not found, responding with StreamingSubscriptionFailed: <{}>", command);
+            final StreamingSubscriptionNotFoundException error =
+                    StreamingSubscriptionNotFoundException.of(streamingSubscriptionId, command.getDittoHeaders());
+            final StreamingSubscriptionFailed streamingSubscriptionFailed =
+                    StreamingSubscriptionFailed.of(streamingSubscriptionId, command.getEntityId(), error, command.getDittoHeaders());
+            getSender().tell(streamingSubscriptionFailed, ActorRef.noSender());
+        }
+    }
+
+    private void subscribeForPersistedEvents(final SubscribeForPersistedEvents subscribeForPersistedEvents) {
+        FeatureToggle.checkHistoricalApiAccessFeatureEnabled(
+                subscribeForPersistedEvents.getType(), subscribeForPersistedEvents.getDittoHeaders());
+
+        log.withCorrelationId(subscribeForPersistedEvents)
+                .info("Processing <{}>", subscribeForPersistedEvents);
+        final EntityId entityId = subscribeForPersistedEvents.getEntityId();
+        final String subscriptionId = nextSubscriptionId(subscribeForPersistedEvents);
+        final Props props = StreamingSubscriptionActor.props(idleTimeout, entityId, getSender(),
+                subscribeForPersistedEvents.getDittoHeaders());
+        final ActorRef subscriptionActor = getContext().actorOf(props, subscriptionId);
+        final Source<JsonValue, ?> itemSource = getPersistedEventsSource(subscribeForPersistedEvents);
+        connect(subscriptionActor, itemSource, entityId);
+    }
+
+    private void connect(final ActorRef streamingSubscriptionActor,
+            final Source<JsonValue, ?> itemSource,
+            final EntityId entityId) {
+        final Subscriber<JsonValue> subscriber =
+                StreamingSubscriptionActor.asSubscriber(streamingSubscriptionActor, entityId);
+        lazify(itemSource).runWith(Sink.fromSubscriber(subscriber), materializer);
+    }
+
+    private Source<JsonValue, ?> getPersistedEventsSource(final SubscribeForPersistedEvents subscribe) {
+
+        return Source.completionStageSource(
+                Patterns.ask(commandForwarder, subscribe, subscribe.getDittoHeaders()
+                        .getTimeout()
+                        .orElse(COMMAND_FORWARDER_LOCAL_ASK_TIMEOUT)
+                )
+                .handle((response, throwable) -> {
+                    if (response instanceof SourceRef<?> sourceRef) {
+                        return sourceRef.getSource()
+                                .map(item -> {
+                                    if (item instanceof Signal<?> signal) {
+                                        return ProtocolFactory.wrapAsJsonifiableAdaptable(
+                                                DITTO_PROTOCOL_ADAPTER.toAdaptable(signal)
+                                        ).toJson();
+                                    } else if (item instanceof Jsonifiable<?> jsonifiable) {
+                                        return jsonifiable.toJson();
+                                    } else if (item instanceof JsonValue val) {
+                                        return val;
+                                    } else {
+                                        throw new IllegalStateException("Unexpected element!");
+                                    }
+                                });
+                    } else if (response instanceof DittoRuntimeException dittoRuntimeException) {
+                        return Source.failed(dittoRuntimeException);
+                    } else {
+                        final var dittoRuntimeException = DittoRuntimeException
+                                .asDittoRuntimeException(throwable,
+                                        cause -> DittoInternalErrorException.newBuilder()
+                                                .dittoHeaders(subscribe.getDittoHeaders())
+                                                .cause(cause)
+                                                .build()
+                                );
+                        return Source.failed(dittoRuntimeException);
+                    }
+                })
+        );
+    }
+
+    private String nextSubscriptionId(final SubscribeForPersistedEvents subscribeForPersistedEvents) {
+        final String prefix = subscribeForPersistedEvents.getPrefix().orElse("");
+        return prefix + subscriptionIdCounter++;
+    }
+
+    /**
+     * Make a source that never completes until downstream request.
+     *
+     * @param upstream the source to lazify.
+     * @param <T> the type of elements.
+     * @return the lazified source.
+     */
+    private static <T> Source<T, ?> lazify(final Source<T, ?> upstream) {
+        return Source.lazySource(() -> upstream);
+    }
+
+}
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/ThingsSseRouteBuilder.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/ThingsSseRouteBuilder.java
index 83141a79a5e..ea85d33eda3 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/ThingsSseRouteBuilder.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/ThingsSseRouteBuilder.java
@@ -18,6 +18,7 @@
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.time.Duration;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -41,7 +42,10 @@
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.SignalEnrichmentFailedException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.base.model.signals.FeatureToggle;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
 import org.eclipse.ditto.base.service.UriEncoding;
 import org.eclipse.ditto.gateway.service.endpoints.routes.AbstractRoute;
 import org.eclipse.ditto.gateway.service.endpoints.routes.things.ThingsParameter;
@@ -59,8 +63,13 @@
 import org.eclipse.ditto.internal.utils.metrics.instruments.counter.Counter;
 import org.eclipse.ditto.internal.utils.pubsub.StreamingType;
 import org.eclipse.ditto.internal.utils.search.SearchSource;
+import org.eclipse.ditto.json.JsonCollectors;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
 import org.eclipse.ditto.json.JsonFieldSelector;
+import org.eclipse.ditto.json.JsonKey;
 import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.messages.model.Message;
@@ -118,10 +127,19 @@ public final class ThingsSseRouteBuilder extends RouteDirectives implements SseR
     private static final String LAST_EVENT_ID_HEADER = "Last-Event-ID";
 
     private static final String PARAM_FILTER = "filter";
-    private static final String PARAM_FIELDS = "fields";
+    private static final String PARAM_FIELDS = ThingsParameter.FIELDS.toString();
     private static final String PARAM_OPTION = "option";
     private static final String PARAM_NAMESPACES = "namespaces";
     private static final String PARAM_EXTRA_FIELDS = "extraFields";
+
+    private static final String PARAM_FROM_HISTORICAL_REVISION = "from-historical-revision";
+    private static final String PARAM_TO_HISTORICAL_REVISION = "to-historical-revision";
+    private static final String PARAM_FROM_HISTORICAL_TIMESTAMP = "from-historical-timestamp";
+    private static final String PARAM_TO_HISTORICAL_TIMESTAMP = "to-historical-timestamp";
+
+    private static final JsonFieldDefinition<JsonObject> CONTEXT =
+            JsonFactory.newJsonObjectFieldDefinition("_context");
+
     private static final PartialFunction<HttpHeader, Accept> ACCEPT_HEADER_EXTRACTOR = newAcceptHeaderExtractor();
 
     private static final Counter THINGS_SSE_COUNTER = getCounterFor(PATH_THINGS);
@@ -268,8 +286,7 @@ private Route buildThingsSseRoute(final RequestContext ctx,
                                                         return createMessagesSseRoute(ctx, dhcs, thingId,
                                                                 jsonPointerString);
                                                     } else {
-                                                        params.put(ThingsParameter.FIELDS.toString(),
-                                                                jsonPointerString);
+                                                        params.put(PARAM_FIELDS, jsonPointerString);
                                                         return createSseRoute(ctx, dhcs,
                                                                 JsonPointer.of(jsonPointerString),
                                                                 params
@@ -318,13 +335,32 @@ private Route createSseRoute(final RequestContext ctx, final CompletionStage<Dit
         @Nullable final var filterString = parameters.get(PARAM_FILTER);
         final List<String> namespaces = getNamespaces(parameters.get(PARAM_NAMESPACES));
         final List<ThingId> targetThingIds = getThingIds(parameters.get(ThingsParameter.IDS.toString()));
-        @Nullable final ThingFieldSelector fields =
-                getFieldSelector(parameters.get(ThingsParameter.FIELDS.toString()));
+        @Nullable final ThingFieldSelector fields = getFieldSelector(parameters.get(PARAM_FIELDS));
         @Nullable final ThingFieldSelector extraFields = getFieldSelector(parameters.get(PARAM_EXTRA_FIELDS));
+
+        @Nullable final Long fromHistoricalRevision = Optional.ofNullable(
+                parameters.get(PARAM_FROM_HISTORICAL_REVISION))
+                .map(Long::parseLong)
+                .orElse(null);
+        @Nullable final Long toHistoricalRevision = Optional.ofNullable(
+                parameters.get(PARAM_TO_HISTORICAL_REVISION))
+                .map(Long::parseLong)
+                .orElse(null);
+
+        @Nullable final Instant fromHistoricalTimestamp = Optional.ofNullable(
+                parameters.get(PARAM_FROM_HISTORICAL_TIMESTAMP))
+                .map(Instant::parse)
+                .orElse(null);
+        @Nullable final Instant toHistoricalTimestamp = Optional.ofNullable(
+                parameters.get(PARAM_TO_HISTORICAL_TIMESTAMP))
+                .map(Instant::parse)
+                .orElse(null);
+
         final CompletionStage<SignalEnrichmentFacade> facadeStage = signalEnrichmentProvider == null
                 ? CompletableFuture.completedStage(null)
                 : signalEnrichmentProvider.getFacade(ctx.getRequest());
 
+
         final var sseSourceStage = facadeStage.thenCompose(facade -> dittoHeadersStage.thenCompose(
                 dittoHeaders -> sseAuthorizationEnforcer.checkAuthorization(ctx, dittoHeaders).thenApply(unused -> {
                     if (filterString != null) {
@@ -332,6 +368,37 @@ private Route createSseRoute(final RequestContext ctx, final CompletionStage<Dit
                         queryFilterCriteriaFactory.filterCriteria(filterString, dittoHeaders);
                     }
 
+                    final String connectionCorrelationId = dittoHeaders.getCorrelationId()
+                            .orElseThrow(() -> new IllegalStateException(
+                                    "Expected correlation-id in SSE DittoHeaders: " + dittoHeaders));
+                    final var authorizationContext = dittoHeaders.getAuthorizationContext();
+                    final Object startStreaming;
+                    if (null != fromHistoricalRevision) {
+                        FeatureToggle
+                                .checkHistoricalApiAccessFeatureEnabled(SubscribeForPersistedEvents.TYPE, dittoHeaders);
+                        startStreaming = SubscribeForPersistedEvents.of(targetThingIds.get(0),
+                                fieldPointer,
+                                fromHistoricalRevision,
+                                null != toHistoricalRevision ? toHistoricalRevision : Long.MAX_VALUE,
+                                dittoHeaders);
+                    } else if (null != fromHistoricalTimestamp) {
+                        FeatureToggle
+                                .checkHistoricalApiAccessFeatureEnabled(SubscribeForPersistedEvents.TYPE, dittoHeaders);
+                        startStreaming = SubscribeForPersistedEvents.of(targetThingIds.get(0),
+                                fieldPointer,
+                                fromHistoricalTimestamp,
+                                toHistoricalTimestamp,
+                                dittoHeaders);
+                    } else {
+                        startStreaming =
+                                StartStreaming.getBuilder(StreamingType.EVENTS, connectionCorrelationId,
+                                                authorizationContext)
+                                        .withNamespaces(namespaces)
+                                        .withFilter(filterString)
+                                        .withExtraFields(extraFields)
+                                        .build();
+                    }
+
                     final Source<SessionedJsonifiable, SupervisedStream.WithQueue> publisherSource =
                             SupervisedStream.sourceQueue(10);
 
@@ -339,25 +406,14 @@ private Route createSseRoute(final RequestContext ctx, final CompletionStage<Dit
                             .mapMaterializedValue(pair -> {
                                 final SupervisedStream.WithQueue withQueue = pair.first();
                                 final KillSwitch killSwitch = pair.second();
-                                final String connectionCorrelationId = dittoHeaders.getCorrelationId()
-                                        .orElseThrow(() -> new IllegalStateException(
-                                                "Expected correlation-id in SSE DittoHeaders: " + dittoHeaders));
 
                                 final var jsonSchemaVersion = dittoHeaders.getSchemaVersion()
                                         .orElse(JsonSchemaVersion.LATEST);
                                 sseConnectionSupervisor.supervise(withQueue.getSupervisedStream(),
                                         connectionCorrelationId, dittoHeaders);
-                                final var authorizationContext = dittoHeaders.getAuthorizationContext();
                                 final var connect = new Connect(withQueue.getSourceQueue(), connectionCorrelationId,
                                         STREAMING_TYPE_SSE, jsonSchemaVersion, null, Set.of(),
                                         authorizationContext, null);
-                                final var startStreaming =
-                                        StartStreaming.getBuilder(StreamingType.EVENTS, connectionCorrelationId,
-                                                        authorizationContext)
-                                                .withNamespaces(namespaces)
-                                                .withFilter(filterString)
-                                                .withExtraFields(extraFields)
-                                                .build();
                                 Patterns.ask(streamingActor, connect, LOCAL_ASK_TIMEOUT)
                                         .thenApply(ActorRef.class::cast)
                                         .thenAccept(streamingSessionActor ->
@@ -369,8 +425,7 @@ private Route createSseRoute(final RequestContext ctx, final CompletionStage<Dit
                                 return NotUsed.getInstance();
                             })
                             .mapAsync(streamingConfig.getParallelism(), jsonifiable ->
-                                    postprocess(jsonifiable, facade, targetThingIds, namespaces, fieldPointer,
-                                            fields))
+                                    postprocess(jsonifiable, facade, targetThingIds, namespaces, fieldPointer, fields))
                             .mapConcat(jsonValues -> jsonValues)
                             .map(jsonValue -> {
                                 THINGS_SSE_COUNTER.increment();
@@ -546,8 +601,7 @@ private CompletionStage<Collection<JsonValue>> postprocess(final SessionedJsonif
         final Supplier<CompletableFuture<Collection<JsonValue>>> emptySupplier =
                 () -> CompletableFuture.completedFuture(Collections.emptyList());
 
-        if (jsonifiable.getJsonifiable() instanceof ThingEvent) {
-            final ThingEvent<?> event = (ThingEvent<?>) jsonifiable.getJsonifiable();
+        if (jsonifiable.getJsonifiable() instanceof ThingEvent<?> event) {
             final boolean isLiveEvent = StreamingType.isLiveSignal(event);
             if (!isLiveEvent && namespaceMatches(event, namespaces) &&
                     targetThingIdMatches(event, targetThingIds)) {
@@ -640,11 +694,21 @@ private static Collection<JsonValue> toNonemptyValue(final Thing thing, final Th
         final JsonObject thingJson = null != fields
                 ? thing.toJson(jsonSchemaVersion, fields)
                 : thing.toJson(jsonSchemaVersion);
+
         @Nullable final JsonValue returnValue;
         if (!fieldPointer.isEmpty()) {
             returnValue = thingJson.getValue(fieldPointer).orElse(null);
         } else {
-            returnValue = thingJson;
+            final boolean includeContext = Optional.ofNullable(fields)
+                    .filter(field -> field.getPointers().stream()
+                            .map(JsonPointer::getRoot)
+                            .anyMatch(p -> p.equals(CONTEXT.getPointer().getRoot()))
+                    ).isPresent();
+            if (includeContext) {
+                returnValue = addContext(thingJson.toBuilder(), event).get(fields);
+            } else {
+                returnValue = thingJson;
+            }
         }
         return (thingJson.isEmpty() || null == returnValue) ? Collections.emptyList() :
                 Collections.singletonList(returnValue);
@@ -694,4 +758,29 @@ private static Counter getCounterFor(final String path) {
                 .tag("path", path);
     }
 
+    /**
+     * Add a JSON object at {@code _context} key containing e.g. the {@code headers} of the passed
+     * {@code withDittoHeaders}.
+     *
+     * @param objectBuilder the JsonObject build to add the {@code _context} to.
+     * @param withDittoHeaders the object to extract the {@code DittoHeaders} from.
+     * @return the built JsonObject including the {@code _context}.
+     */
+    private static JsonObject addContext(final JsonObjectBuilder objectBuilder,
+            final WithDittoHeaders withDittoHeaders) {
+
+        objectBuilder.set(CONTEXT, JsonObject.newBuilder()
+                .set("headers", dittoHeadersToJson(withDittoHeaders.getDittoHeaders()))
+                .build()
+        );
+        return objectBuilder.build();
+    }
+
+    private static JsonObject dittoHeadersToJson(final DittoHeaders dittoHeaders) {
+        return dittoHeaders.entrySet()
+                .stream()
+                .map(entry -> JsonFactory.newField(JsonKey.of(entry.getKey()), JsonFactory.newValue(entry.getValue())))
+                .collect(JsonCollectors.fieldsToObject());
+    }
+
 }
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/SessionedJsonifiable.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/SessionedJsonifiable.java
index 111735f579d..a21ca920ab4 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/SessionedJsonifiable.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/SessionedJsonifiable.java
@@ -22,6 +22,7 @@
 import org.eclipse.ditto.base.model.json.Jsonifiable;
 import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionEvent;
 import org.eclipse.ditto.gateway.service.streaming.signals.StreamingAck;
 import org.eclipse.ditto.internal.models.signalenrichment.SignalEnrichmentFacade;
 import org.eclipse.ditto.internal.utils.pubsub.StreamingType;
@@ -141,16 +142,27 @@ static SessionedJsonifiable response(final CommandResponse<?> response) {
     }
 
     /**
-     * Create a sessioned Jsonifiable for a {@link org.eclipse.ditto.thingsearch.model.signals.events.SubscriptionEvent}
+     * Create a sessioned Jsonifiable for a {@link SubscriptionEvent}
      * as response.
      *
-     * @param subscriptionEvent the {@link org.eclipse.ditto.thingsearch.model.signals.events.SubscriptionEvent} as response.
+     * @param subscriptionEvent the {@link SubscriptionEvent} as response.
      * @return the sessioned Jsonifiable.
      */
     static SessionedJsonifiable subscription(final SubscriptionEvent<?> subscriptionEvent) {
         return new SessionedResponseErrorOrAck(subscriptionEvent, subscriptionEvent.getDittoHeaders(), null);
     }
 
+    /**
+     * Create a sessioned Jsonifiable for a {@link StreamingSubscriptionEvent}
+     * as response.
+     *
+     * @param streamingSubscriptionEvent the {@link StreamingSubscriptionEvent} as response.
+     * @return the sessioned Jsonifiable.
+     */
+    static SessionedJsonifiable streamingSubscription(final StreamingSubscriptionEvent<?> streamingSubscriptionEvent) {
+        return new SessionedResponseErrorOrAck(streamingSubscriptionEvent, streamingSubscriptionEvent.getDittoHeaders(), null);
+    }
+
     /**
      * Create a sessioned Jsonifiable for a stream acknowledgement.
      *
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingActor.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingActor.java
index 09a96f16998..b86130cdf43 100755
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingActor.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingActor.java
@@ -17,6 +17,7 @@
 import java.util.stream.StreamSupport;
 
 import org.eclipse.ditto.base.model.headers.translator.HeaderTranslator;
+import org.eclipse.ditto.edge.service.streaming.StreamingSubscriptionManager;
 import org.eclipse.ditto.gateway.service.security.authentication.jwt.JwtAuthenticationResultProvider;
 import org.eclipse.ditto.gateway.service.security.authentication.jwt.JwtValidator;
 import org.eclipse.ditto.gateway.service.streaming.signals.Connect;
@@ -61,6 +62,7 @@ public final class StreamingActor extends AbstractActorWithTimers implements Ret
     private final JwtValidator jwtValidator;
     private final JwtAuthenticationResultProvider jwtAuthenticationResultProvider;
     private final Props subscriptionManagerProps;
+    private final Props streamingSubscriptionManagerProps;
     private final DittoDiagnosticLoggingAdapter logger = DittoLoggerFactory.getDiagnosticLoggingAdapter(this);
     private final HeaderTranslator headerTranslator;
     private int childCounter = -1;
@@ -94,9 +96,13 @@ private StreamingActor(final DittoProtocolSub dittoProtocolSub,
         this.headerTranslator = headerTranslator;
         streamingSessionsCounter = DittoMetrics.gauge("streaming_sessions_count");
         final ActorSelection commandForwarderSelection = ActorSelection.apply(commandForwarder, "");
+        final Materializer materializer = Materializer.createMaterializer(getContext());
         subscriptionManagerProps =
                 SubscriptionManager.props(streamingConfig.getSearchIdleTimeout(), pubSubMediator,
-                        commandForwarderSelection, Materializer.createMaterializer(getContext()));
+                        commandForwarderSelection, materializer);
+        streamingSubscriptionManagerProps =
+                StreamingSubscriptionManager.props(streamingConfig.getSearchIdleTimeout(),
+                        commandForwarderSelection, materializer);
         scheduleScrapeStreamSessionsCounter();
     }
 
@@ -148,7 +154,8 @@ private Receive createConnectAndMetricsBehavior() {
                     final ActorRef streamingSessionActor = getContext().actorOf(
                             StreamingSessionActor.props(connect, dittoProtocolSub,
                                     commandRouter, streamingConfig, headerTranslator,
-                                    subscriptionManagerProps, jwtValidator, jwtAuthenticationResultProvider),
+                                    subscriptionManagerProps, streamingSubscriptionManagerProps,
+                                    jwtValidator, jwtAuthenticationResultProvider),
                             sessionActorName);
                     getSender().tell(streamingSessionActor, ActorRef.noSender());
                 })
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActor.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActor.java
index 48f5b64d661..cd5597f415b 100755
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActor.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActor.java
@@ -29,6 +29,7 @@
 import org.eclipse.ditto.base.model.acks.AcknowledgementLabelNotUniqueException;
 import org.eclipse.ditto.base.model.acks.FatalPubSubException;
 import org.eclipse.ditto.base.model.auth.AuthorizationContext;
+import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
 import org.eclipse.ditto.base.model.entity.id.WithEntityId;
 import org.eclipse.ditto.base.model.exceptions.DittoHeaderInvalidException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
@@ -41,7 +42,10 @@
 import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
+import org.eclipse.ditto.base.model.signals.commands.streaming.StreamingSubscriptionCommand;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
 import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionEvent;
 import org.eclipse.ditto.edge.service.acknowledgements.AcknowledgementAggregatorActorStarter;
 import org.eclipse.ditto.edge.service.acknowledgements.AcknowledgementForwarderActor;
 import org.eclipse.ditto.edge.service.acknowledgements.message.MessageCommandAckRequestSetter;
@@ -50,6 +54,7 @@
 import org.eclipse.ditto.edge.service.acknowledgements.things.ThingLiveCommandAckRequestSetter;
 import org.eclipse.ditto.edge.service.acknowledgements.things.ThingModifyCommandAckRequestSetter;
 import org.eclipse.ditto.edge.service.placeholders.EntityIdPlaceholder;
+import org.eclipse.ditto.edge.service.streaming.StreamingSubscriptionManager;
 import org.eclipse.ditto.gateway.api.GatewayInternalErrorException;
 import org.eclipse.ditto.gateway.api.GatewayWebsocketSessionAbortedException;
 import org.eclipse.ditto.gateway.api.GatewayWebsocketSessionClosedException;
@@ -92,6 +97,9 @@
 import akka.japi.pf.ReceiveBuilder;
 import akka.pattern.Patterns;
 import akka.stream.KillSwitch;
+import akka.stream.SourceRef;
+import akka.stream.javadsl.Keep;
+import akka.stream.javadsl.Sink;
 import akka.stream.javadsl.SourceQueueWithComplete;
 import scala.PartialFunction;
 
@@ -120,6 +128,7 @@ final class StreamingSessionActor extends AbstractActorWithTimers {
     private final ActorRef commandForwarder;
     private final StreamingConfig streamingConfig;
     private final ActorRef subscriptionManager;
+    private final ActorRef streamingSubscriptionManager;
     private final Set<StreamingType> outstandingSubscriptionAcks;
     private final Map<StreamingType, StreamingSession> streamingSessions;
     private final JwtValidator jwtValidator;
@@ -139,6 +148,7 @@ private StreamingSessionActor(final Connect connect,
             final StreamingConfig streamingConfig,
             final HeaderTranslator headerTranslator,
             final Props subscriptionManagerProps,
+            final Props streamingSubscriptionManagerProps,
             final JwtValidator jwtValidator,
             final JwtAuthenticationResultProvider jwtAuthenticationResultProvider) {
 
@@ -172,6 +182,8 @@ private StreamingSessionActor(final Connect connect,
                 .withCorrelationId(connectionCorrelationId);
         connect.getSessionExpirationTime().ifPresent(this::startSessionTimeout);
         subscriptionManager = getContext().actorOf(subscriptionManagerProps, SubscriptionManager.ACTOR_NAME);
+        streamingSubscriptionManager = getContext().actorOf(streamingSubscriptionManagerProps,
+                StreamingSubscriptionManager.ACTOR_NAME);
         declaredAcks = connect.getDeclaredAcknowledgementLabels();
         startSubscriptionRefreshTimer();
     }
@@ -185,6 +197,7 @@ private StreamingSessionActor(final Connect connect,
      * @param streamingConfig the config to apply for the streaming session.
      * @param headerTranslator translates headers from external sources or to external sources.
      * @param subscriptionManagerProps Props of the subscription manager for search protocol.
+     * @param streamingSubscriptionManagerProps Props of the subscription manager for streaming subscription commands.
      * @param jwtValidator validator of JWT tokens.
      * @param jwtAuthenticationResultProvider provider of JWT authentication results.
      * @return the Akka configuration Props object.
@@ -195,6 +208,7 @@ static Props props(final Connect connect,
             final StreamingConfig streamingConfig,
             final HeaderTranslator headerTranslator,
             final Props subscriptionManagerProps,
+            final Props streamingSubscriptionManagerProps,
             final JwtValidator jwtValidator,
             final JwtAuthenticationResultProvider jwtAuthenticationResultProvider) {
 
@@ -205,6 +219,7 @@ static Props props(final Connect connect,
                 streamingConfig,
                 headerTranslator,
                 subscriptionManagerProps,
+                streamingSubscriptionManagerProps,
                 jwtValidator,
                 jwtAuthenticationResultProvider);
     }
@@ -259,6 +274,7 @@ private Receive createIncomingSignalBehavior() {
                         commandForwarder.forward(liveCommandResponse, getContext()))
                 .match(CommandResponse.class, this::forwardAcknowledgementOrLiveCommandResponse)
                 .match(ThingSearchCommand.class, this::forwardSearchCommand)
+                .match(StreamingSubscriptionCommand.class, this::forwardStreamingSubscriptionCommand)
                 .match(Signal.class, signal ->
                         // forward signals for which no reply is expected with self return address for downstream errors
                         commandForwarder.tell(signal, getReturnAddress(signal)))
@@ -279,6 +295,10 @@ private Receive createOutgoingSignalBehavior() {
                     logger.debug("Got SubscriptionEvent in <{}> session, publishing: {}", type, signal);
                     eventAndResponsePublisher.offer(SessionedJsonifiable.subscription(signal));
                 })
+                .match(StreamingSubscriptionEvent.class, signal -> {
+                    logger.debug("Got StreamingSubscriptionEvent in <{}> session, publishing: {}", type, signal);
+                    eventAndResponsePublisher.offer(SessionedJsonifiable.streamingSubscription(signal));
+                })
                 .match(CommandResponse.class, this::publishResponseOrError)
                 .match(DittoRuntimeException.class, this::publishResponseOrError)
                 .match(Signal.class, this::isSameOrigin, signal ->
@@ -312,6 +332,44 @@ private Receive createOutgoingSignalBehavior() {
 
     private Receive createPubSubBehavior() {
         return ReceiveBuilder.create()
+                .match(SubscribeForPersistedEvents.class, streamPersistedEvents -> {
+                    authorizationContext = streamPersistedEvents.getDittoHeaders().getAuthorizationContext();
+                    final var session = StreamingSession.of(
+                            streamPersistedEvents.getEntityId() instanceof NamespacedEntityId nsEid ?
+                                    List.of(nsEid.getNamespace()) : List.of(),
+                            null,
+                            null,
+                            getSelf(),
+                            logger);
+                    streamingSessions.put(StreamingType.EVENTS, session);
+
+                    Patterns.ask(commandForwarder, streamPersistedEvents, streamPersistedEvents.getDittoHeaders()
+                                    .getTimeout()
+                                    .orElse(Duration.ofSeconds(5))
+                            )
+                            .thenApply(response -> (SourceRef<?>) response)
+                            .whenComplete((sourceRef, throwable) -> {
+                                    if (null != sourceRef) {
+                                        sourceRef.getSource()
+                                                .toMat(Sink.actorRef(getSelf(), Control.TERMINATED), Keep.left())
+                                                .run(getContext().getSystem());
+                                    } else if (null != throwable) {
+                                        final var dittoRuntimeException = DittoRuntimeException
+                                                .asDittoRuntimeException(throwable,
+                                                        cause -> GatewayInternalErrorException.newBuilder()
+                                                                .dittoHeaders(DittoHeaders.newBuilder()
+                                                                        .correlationId(connectionCorrelationId)
+                                                                        .build())
+                                                                .cause(cause)
+                                                                .build()
+                                                );
+                                        eventAndResponsePublisher.offer(SessionedJsonifiable.error(dittoRuntimeException));
+                                        terminateWebsocketStream();
+                                    } else {
+                                        terminateWebsocketStream();
+                                    }
+                            });
+                })
                 .match(StartStreaming.class, startStreaming -> {
                     authorizationContext = startStreaming.getAuthorizationContext();
                     Criteria criteria;
@@ -555,6 +613,11 @@ private void forwardSearchCommand(final ThingSearchCommand<?> searchCommand) {
         subscriptionManager.tell(searchCommand, getSelf());
     }
 
+    private void forwardStreamingSubscriptionCommand(
+            final StreamingSubscriptionCommand<?> streamingSubscriptionCommand) {
+        streamingSubscriptionManager.tell(streamingSubscriptionCommand, getSelf());
+    }
+
     private boolean isSessionAllowedToReceiveSignal(final Signal<?> signal,
             final StreamingSession session,
             final StreamingType streamingType) {
diff --git a/gateway/service/src/main/resources/gateway.conf b/gateway/service/src/main/resources/gateway.conf
index 00cb2f3971d..e056311f1d1 100755
--- a/gateway/service/src/main/resources/gateway.conf
+++ b/gateway/service/src/main/resources/gateway.conf
@@ -112,7 +112,9 @@ ditto {
         "live-channel-timeout-strategy",
         "allow-policy-lockout",
         "condition",
-        "live-channel-condition"
+        "live-channel-condition",
+        "at-historical-revision",
+        "at-historical-timestamp"
       ]
     }
 
diff --git a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/starter/GatewayServiceGlobalCommandRegistryTest.java b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/starter/GatewayServiceGlobalCommandRegistryTest.java
index 4d192f59369..df3a1b3353b 100644
--- a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/starter/GatewayServiceGlobalCommandRegistryTest.java
+++ b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/starter/GatewayServiceGlobalCommandRegistryTest.java
@@ -17,6 +17,7 @@
 import org.eclipse.ditto.base.api.devops.signals.commands.ExecutePiggybackCommand;
 import org.eclipse.ditto.base.api.persistence.cleanup.CleanupPersistence;
 import org.eclipse.ditto.base.model.namespaces.signals.commands.PurgeNamespace;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
 import org.eclipse.ditto.base.service.cluster.ModifySplitBrainResolver;
 import org.eclipse.ditto.connectivity.api.commands.sudo.SudoAddConnectionLogEntry;
 import org.eclipse.ditto.connectivity.api.commands.sudo.SudoRetrieveConnectionIdsByTag;
@@ -67,7 +68,8 @@ public GatewayServiceGlobalCommandRegistryTest() {
                 PublishSignal.class,
                 ModifySplitBrainResolver.class,
                 CleanupPersistence.class,
-                SudoAddConnectionLogEntry.class
+                SudoAddConnectionLogEntry.class,
+                SubscribeForPersistedEvents.class
         );
     }
 
diff --git a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/starter/GatewayServiceGlobalEventRegistryTest.java b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/starter/GatewayServiceGlobalEventRegistryTest.java
index e7b03a4ae76..d658562e4aa 100644
--- a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/starter/GatewayServiceGlobalEventRegistryTest.java
+++ b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/starter/GatewayServiceGlobalEventRegistryTest.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.ditto.gateway.service.starter;
 
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionComplete;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionCreated;
 import org.eclipse.ditto.internal.utils.test.GlobalEventRegistryTestCases;
 import org.eclipse.ditto.policies.model.signals.events.ResourceDeleted;
@@ -29,7 +30,8 @@ public GatewayServiceGlobalEventRegistryTest() {
                 FeatureDeleted.class,
                 ThingsOutOfSync.class,
                 SubscriptionCreated.class,
-                ThingSnapshotTaken.class
+                ThingSnapshotTaken.class,
+                StreamingSubscriptionComplete.class
         );
     }
 
diff --git a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActorHeaderInteractionTest.java b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActorHeaderInteractionTest.java
index d891436f2c8..b3f11decf00 100644
--- a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActorHeaderInteractionTest.java
+++ b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActorHeaderInteractionTest.java
@@ -116,6 +116,7 @@ public static Collection<Object[]> getParameters() {
     private final TestProbe eventResponsePublisherProbe = TestProbe.apply("eventAndResponsePublisher", actorSystem);
     private final TestProbe commandRouterProbe = TestProbe.apply("commandRouter", actorSystem);
     private final TestProbe subscriptionManagerProbe = TestProbe.apply("subscriptionManager", actorSystem);
+    private final TestProbe streamingSubscriptionManagerProbe = TestProbe.apply("streamingSubscriptionManager", actorSystem);
     private final DittoProtocolSub dittoProtocolSub = Mockito.mock(DittoProtocolSub.class);
 
     private final SourceQueueWithComplete<SessionedJsonifiable> sourceQueue;
@@ -198,7 +199,9 @@ private ActorRef createStreamingSessionActor() {
                         null);
         final Props props = StreamingSessionActor.props(connect, dittoProtocolSub, commandRouterProbe.ref(),
                 DefaultStreamingConfig.of(ConfigFactory.empty()), HeaderTranslator.empty(),
-                Props.create(TestProbeForwarder.class, subscriptionManagerProbe), Mockito.mock(JwtValidator.class),
+                Props.create(TestProbeForwarder.class, subscriptionManagerProbe),
+                Props.create(TestProbeForwarder.class, streamingSubscriptionManagerProbe),
+                Mockito.mock(JwtValidator.class),
                 Mockito.mock(JwtAuthenticationResultProvider.class));
         final ActorRef createdActor = actorSystem.actorOf(props);
         createdActors.add(createdActor);
diff --git a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActorTest.java b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActorTest.java
index 4ae7337b51f..fd498c2dc4a 100644
--- a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActorTest.java
+++ b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActorTest.java
@@ -397,6 +397,7 @@ private Props getProps(final String... declaredAcks) {
                 DefaultStreamingConfig.of(ConfigFactory.empty()),
                 HeaderTranslator.empty(),
                 Props.create(Actor.class, () -> new TestActor(new LinkedBlockingDeque<>())),
+                Props.create(Actor.class, () -> new TestActor(new LinkedBlockingDeque<>())),
                 mockValidator,
                 mockAuthenticationResultProvider);
     }
diff --git a/internal/utils/config/src/main/resources/ditto-devops.conf b/internal/utils/config/src/main/resources/ditto-devops.conf
index 7679e1cb28d..d0fd0e1bac5 100644
--- a/internal/utils/config/src/main/resources/ditto-devops.conf
+++ b/internal/utils/config/src/main/resources/ditto-devops.conf
@@ -16,5 +16,9 @@ ditto.devops {
     // enables/disables the WoT (Web of Things) integration feature
     wot-integration-enabled = true
     wot-integration-enabled = ${?DITTO_DEVOPS_FEATURE_WOT_INTEGRATION_ENABLED}
+
+    // enables/disables the historical API access feature
+    historical-apis-enabled = true
+    historical-apis-enabled = ${?DITTO_DEVOPS_FEATURE_HISTORICAL_APIS_ENABLED}
   }
 }
diff --git a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractMongoEventAdapter.java b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractMongoEventAdapter.java
index 75ea8d043c6..41e34a8462b 100644
--- a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractMongoEventAdapter.java
+++ b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/AbstractMongoEventAdapter.java
@@ -12,20 +12,23 @@
  */
 package org.eclipse.ditto.internal.utils.persistence.mongo;
 
+import java.util.Optional;
 import java.util.Set;
 
-import javax.annotation.Nullable;
-
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.headers.DittoHeadersBuilder;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.base.model.signals.events.Event;
 import org.eclipse.ditto.base.model.signals.events.EventRegistry;
 import org.eclipse.ditto.base.model.signals.events.EventsourcedEvent;
+import org.eclipse.ditto.internal.utils.persistence.mongo.config.EventConfig;
+import org.eclipse.ditto.json.JsonFieldDefinition;
 import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.eclipse.ditto.json.JsonParseException;
 import org.eclipse.ditto.json.JsonValue;
 import org.slf4j.Logger;
@@ -43,13 +46,21 @@ public abstract class AbstractMongoEventAdapter<T extends Event<?>> implements E
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMongoEventAdapter.class);
 
-    @Nullable protected final ExtendedActorSystem system;
+    /**
+     * Internal header for persisting the historical headers for events.
+     */
+    public static final JsonFieldDefinition<JsonObject> HISTORICAL_EVENT_HEADERS = JsonFieldDefinition.ofJsonObject(
+            "__hh");
+
+    protected final ExtendedActorSystem system;
     protected final EventRegistry<T> eventRegistry;
+    private final EventConfig eventConfig;
 
-    protected AbstractMongoEventAdapter(@Nullable final ExtendedActorSystem system,
-            final EventRegistry<T> eventRegistry) {
+    protected AbstractMongoEventAdapter(final ExtendedActorSystem system,
+            final EventRegistry<T> eventRegistry, final EventConfig eventConfig) {
         this.system = system;
         this.eventRegistry = eventRegistry;
+        this.eventConfig = eventConfig;
     }
 
     @Override
@@ -66,9 +77,9 @@ public String manifest(final Object event) {
     public Object toJournal(final Object event) {
         if (event instanceof Event<?> theEvent) {
             final JsonSchemaVersion schemaVersion = theEvent.getImplementedSchemaVersion();
-            final JsonObject jsonObject = performToJournalMigration(
+            final JsonObject jsonObject = performToJournalMigration(theEvent,
                     theEvent.toJson(schemaVersion, FieldType.regularOrSpecial())
-            );
+            ).build();
             final BsonDocument bson = DittoBsonJson.getInstance().parse(jsonObject);
             final Set<String> tags = theEvent.getDittoHeaders().getJournalTags();
             return new Tagged(bson, tags);
@@ -84,8 +95,12 @@ public EventSeq fromJournal(final Object event, final String manifest) {
             try {
                 final JsonObject jsonObject = jsonValue.asObject()
                         .setValue(EventsourcedEvent.JsonFields.REVISION.getPointer(), Event.DEFAULT_REVISION);
+                final DittoHeaders dittoHeaders = jsonObject.getValue(HISTORICAL_EVENT_HEADERS)
+                        .map(obj -> DittoHeaders.newBuilder(obj).build())
+                        .orElse(DittoHeaders.empty());
+
                 final T result =
-                        eventRegistry.parse(performFromJournalMigration(jsonObject), DittoHeaders.empty());
+                        eventRegistry.parse(performFromJournalMigration(jsonObject), dittoHeaders);
                 return EventSeq.single(result);
             } catch (final JsonParseException | DittoRuntimeException e) {
                 if (system != null) {
@@ -105,11 +120,22 @@ public EventSeq fromJournal(final Object event, final String manifest) {
      * Performs an optional migration of the passed in {@code jsonObject} (which is the JSON representation of the
      * {@link Event} to persist) just before it is transformed to Mongo BSON and inserted into the "journal" collection.
      *
-     * @param jsonObject the JsonObject representation of the {@link Event} to persist.
+     * @param event the event to apply journal migration for.
+     * @param jsonObject the JsonObject representation of the {@link org.eclipse.ditto.base.model.signals.events.Event} to persist.
      * @return the adjusted/migrated JsonObject to store.
      */
-    protected JsonObject performToJournalMigration(final JsonObject jsonObject) {
-        return jsonObject;
+    protected JsonObjectBuilder performToJournalMigration(final Event<?> event, final JsonObject jsonObject) {
+        return jsonObject.toBuilder()
+                .set(HISTORICAL_EVENT_HEADERS, calculateHistoricalHeaders(event.getDittoHeaders()).toJson());
+    }
+
+    private DittoHeaders calculateHistoricalHeaders(final DittoHeaders dittoHeaders) {
+        final DittoHeadersBuilder<?, ?> historicalHeadersBuilder = DittoHeaders.newBuilder();
+        eventConfig.getHistoricalHeadersToPersist().forEach(headerKeyToPersist ->
+                Optional.ofNullable(dittoHeaders.get(headerKeyToPersist))
+                        .ifPresent(value -> historicalHeadersBuilder.putHeader(headerKeyToPersist, value))
+        );
+        return historicalHeadersBuilder.build();
     }
 
     /**
diff --git a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultEventConfig.java b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultEventConfig.java
new file mode 100644
index 00000000000..0f053e50b96
--- /dev/null
+++ b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultEventConfig.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.internal.utils.persistence.mongo.config;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.internal.utils.config.ConfigWithFallback;
+import org.eclipse.ditto.internal.utils.config.ScopedConfig;
+
+import com.typesafe.config.Config;
+
+/**
+ * This class implements the config for the handling of event journal entries.
+ */
+@Immutable
+public final class DefaultEventConfig implements EventConfig {
+
+    private static final String CONFIG_PATH = "event";
+
+    private final List<String> historicalHeadersToPersist;
+
+    private DefaultEventConfig(final ScopedConfig config) {
+        historicalHeadersToPersist = Collections.unmodifiableList(new ArrayList<>(
+                config.getStringList(EventConfigValue.HISTORICAL_HEADERS_TO_PERSIST.getConfigPath())
+        ));
+    }
+
+    /**
+     * Returns an instance of the default event journal config based on the settings of the specified Config.
+     *
+     * @param config is supposed to provide the settings of the event journal config at {@value #CONFIG_PATH}.
+     * @return instance
+     * @throws org.eclipse.ditto.internal.utils.config.DittoConfigError if {@code config} is invalid.
+     */
+    public static DefaultEventConfig of(final Config config) {
+        return new DefaultEventConfig(
+                ConfigWithFallback.newInstance(config, CONFIG_PATH, EventConfigValue.values()));
+    }
+
+    @Override
+    public List<String> getHistoricalHeadersToPersist() {
+        return historicalHeadersToPersist;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final DefaultEventConfig that = (DefaultEventConfig) o;
+        return Objects.equals(historicalHeadersToPersist, that.historicalHeadersToPersist);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(historicalHeadersToPersist);
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + " [" +
+                "historicalHeadersToPersist=" + historicalHeadersToPersist +
+                "]";
+    }
+
+}
diff --git a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultSnapshotConfig.java b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultSnapshotConfig.java
index 40c25fd03af..e85967e7d93 100644
--- a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultSnapshotConfig.java
+++ b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultSnapshotConfig.java
@@ -23,7 +23,7 @@
 import com.typesafe.config.Config;
 
 /**
- * This class implements the config for the handling of snapshots of policy entities.
+ * This class implements the config for the handling of snapshots of entities.
  */
 @Immutable
 public final class DefaultSnapshotConfig implements SnapshotConfig {
diff --git a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/EventConfig.java b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/EventConfig.java
new file mode 100644
index 00000000000..436fdcc2286
--- /dev/null
+++ b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/EventConfig.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.internal.utils.persistence.mongo.config;
+
+import java.util.List;
+
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
+import org.eclipse.ditto.internal.utils.config.KnownConfigValue;
+
+/**
+ * Provides configuration settings for the handling entity journal events.
+ */
+@Immutable
+public interface EventConfig {
+
+    /**
+     * Returns the DittoHeader keys to additionally persist for events in the event journal, e.g. in order
+     * to enable additional context/information for an audit log.
+     *
+     * @return the historical headers to persist into the event journal.
+     */
+    List<String> getHistoricalHeadersToPersist();
+
+
+    /**
+     * An enumeration of the known config path expressions and their associated default values for
+     * {@code SnapshotConfig}.
+     */
+    enum EventConfigValue implements KnownConfigValue {
+
+        /**
+         * The DittoHeaders to persist when persisting events to the journal.
+         */
+        HISTORICAL_HEADERS_TO_PERSIST("historical-headers-to-persist", List.of(
+                DittoHeaderDefinition.ORIGINATOR.getKey(),
+                DittoHeaderDefinition.CORRELATION_ID.getKey()
+        ));
+
+        private final String path;
+        private final Object defaultValue;
+
+        EventConfigValue(final String thePath, final Object theDefaultValue) {
+            path = thePath;
+            defaultValue = theDefaultValue;
+        }
+
+        @Override
+        public Object getDefaultValue() {
+            return defaultValue;
+        }
+
+        @Override
+        public String getConfigPath() {
+            return path;
+        }
+
+        }
+
+}
diff --git a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/streaming/MongoReadJournal.java b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/streaming/MongoReadJournal.java
index 2e122addce1..d163d83ceab 100644
--- a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/streaming/MongoReadJournal.java
+++ b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/streaming/MongoReadJournal.java
@@ -13,6 +13,7 @@
 package org.eclipse.ditto.internal.utils.persistence.mongo.streaming;
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -55,9 +56,19 @@
 import akka.Done;
 import akka.NotUsed;
 import akka.actor.ActorSystem;
+import akka.contrib.persistence.mongodb.JavaDslMongoReadJournal;
 import akka.contrib.persistence.mongodb.JournallingFieldNames$;
 import akka.contrib.persistence.mongodb.SnapshottingFieldNames$;
 import akka.japi.Pair;
+import akka.persistence.query.EventEnvelope;
+import akka.persistence.query.Offset;
+import akka.persistence.query.PersistenceQuery;
+import akka.persistence.query.javadsl.CurrentEventsByPersistenceIdQuery;
+import akka.persistence.query.javadsl.CurrentEventsByTagQuery;
+import akka.persistence.query.javadsl.CurrentPersistenceIdsQuery;
+import akka.persistence.query.javadsl.EventsByPersistenceIdQuery;
+import akka.persistence.query.javadsl.EventsByTagQuery;
+import akka.persistence.query.javadsl.PersistenceIdsQuery;
 import akka.stream.Attributes;
 import akka.stream.Materializer;
 import akka.stream.RestartSettings;
@@ -67,7 +78,7 @@
 import akka.stream.javadsl.Source;
 
 /**
- * Reads the event journal of com.github.scullxbones.akka-persistence-mongo plugin.
+ * Reads the event journal of {@code com.github.scullxbones.akka-persistence-mongo} plugin.
  * In the Akka system configuration,
  * <ul>
  * <li>
@@ -81,12 +92,18 @@
  * </ul>
  */
 @AllValuesAreNonnullByDefault
-public final class MongoReadJournal {
+public final class MongoReadJournal implements CurrentEventsByPersistenceIdQuery,
+        CurrentEventsByTagQuery, CurrentPersistenceIdsQuery, EventsByPersistenceIdQuery, EventsByTagQuery,
+        PersistenceIdsQuery {
 
     /**
-     * ID field of documents delivered by the read journal.
+     * ID field of documents delivered by the journal collection.
+     */
+    public static final String J_ID = JournallingFieldNames$.MODULE$.ID();
+
+    /**
+     * ID field of documents delivered by the snaps collection.
      */
-    private static final String J_ID = JournallingFieldNames$.MODULE$.ID();
     public static final String S_ID = J_ID;
 
     /**
@@ -125,6 +142,11 @@ public final class MongoReadJournal {
      */
     public static final String S_SN = SnapshottingFieldNames$.MODULE$.SEQUENCE_NUMBER();
 
+    /**
+     * Document field of the timestamp of snapshots.
+     */
+    public static final String S_TS = SnapshottingFieldNames$.MODULE$.TIMESTAMP();
+
     private static final String S_SERIALIZED_SNAPSHOT = "s2";
 
     /**
@@ -147,8 +169,11 @@ public final class MongoReadJournal {
     private final DittoMongoClient mongoClient;
     private final IndexInitializer indexInitializer;
 
+    private final JavaDslMongoReadJournal akkaReadJournal;
+
     private MongoReadJournal(final String journalCollection,
             final String snapsCollection,
+            final String readJournalConfigurationKey,
             final DittoMongoClient mongoClient,
             final ActorSystem actorSystem) {
 
@@ -157,6 +182,8 @@ private MongoReadJournal(final String journalCollection,
         this.mongoClient = mongoClient;
         final var materializer = SystemMaterializer.get(actorSystem).materializer();
         indexInitializer = IndexInitializer.of(mongoClient.getDefaultDatabase(), materializer);
+        akkaReadJournal = PersistenceQuery.get(actorSystem)
+                .getReadJournalFor(JavaDslMongoReadJournal.class, readJournalConfigurationKey);
     }
 
     /**
@@ -188,7 +215,12 @@ public static MongoReadJournal newInstance(final Config config, final DittoMongo
                 getOverrideCollectionName(config.getConfig(autoStartJournalKey), JOURNAL_COLLECTION_NAME_KEY);
         final String snapshotCollection =
                 getOverrideCollectionName(config.getConfig(autoStartSnapsKey), SNAPS_COLLECTION_NAME_KEY);
-        return new MongoReadJournal(journalCollection, snapshotCollection, mongoClient, actorSystem);
+        return new MongoReadJournal(journalCollection,
+                snapshotCollection,
+                autoStartJournalKey + "-read",
+                mongoClient,
+                actorSystem
+        );
     }
 
     /**
@@ -397,6 +429,29 @@ public Source<String, NotUsed> getJournalPidsAboveWithTag(final String lowerBoun
                 .mapConcat(pids -> pids);
     }
 
+    /**
+     * A Source retrieving a single revision/sequence number of type {@code long} for the last snapshot sequence number
+     * available for the passed {@code pid} and before the passed {@code timestamp}.
+     *
+     * @param pid the persistenceId to find out the last snapshot sequence number for.
+     * @param timestamp the timestamp to use as selection criteria for the snapshot sequence number to find out.
+     * @return a Source of a single element with the determined snapshot sequence number.
+     */
+    public Source<Long, NotUsed> getLastSnapshotSequenceNumberBeforeTimestamp(final String pid,
+            final Instant timestamp) {
+
+        final Bson filter = Filters.and(
+                Filters.eq(S_PROCESSOR_ID, pid),
+                Filters.lte(S_TS, timestamp.toEpochMilli())
+        );
+        return getSnapshotStore().flatMapConcat(snaps -> Source.fromPublisher(snaps
+                .find(filter)
+                .projection(Projections.include(S_SN))
+                .sort(Sorts.descending(S_SN))
+                .first()
+        )).map(document -> document.getLong(S_SN));
+    }
+
     /**
      * Retrieve all latest snapshots with unique PIDs in snapshot store above a lower bound.
      * Does not limit database access in any way.
@@ -412,7 +467,7 @@ public Source<Document, NotUsed> getNewestSnapshotsAbove(final String lowerBound
             final Materializer mat,
             final String... snapshotFields) {
 
-        return getNewestSnapshotsAbove(lowerBoundPid, batchSize, false, mat, snapshotFields);
+        return getNewestSnapshotsAbove(lowerBoundPid, batchSize, false, Duration.ZERO, mat, snapshotFields);
     }
 
     /**
@@ -422,6 +477,8 @@ public Source<Document, NotUsed> getNewestSnapshotsAbove(final String lowerBound
      * @param lowerBoundPid the lower-bound PID.
      * @param batchSize how many snapshots to read in 1 query.
      * @param includeDeleted whether to include deleted snapshots.
+     * @param minAgeFromNow the minimum age (based on {@code Instant.now()}) the snapshot must have in order to get
+     * selected.
      * @param mat the materializer.
      * @param snapshotFields snapshot fields to project out.
      * @return source of newest snapshots with unique PIDs.
@@ -429,14 +486,20 @@ public Source<Document, NotUsed> getNewestSnapshotsAbove(final String lowerBound
     public Source<Document, NotUsed> getNewestSnapshotsAbove(final String lowerBoundPid,
             final int batchSize,
             final boolean includeDeleted,
+            final Duration minAgeFromNow,
             final Materializer mat,
             final String... snapshotFields) {
 
         return getSnapshotStore()
                 .withAttributes(Attributes.inputBuffer(1, 1))
                 .flatMapConcat(snapshotStore ->
-                        listNewestSnapshots(snapshotStore, SnapshotFilter.of(lowerBoundPid), batchSize, includeDeleted, mat,
-                                snapshotFields)
+                        listNewestSnapshots(snapshotStore,
+                                SnapshotFilter.of(lowerBoundPid, minAgeFromNow),
+                                batchSize,
+                                includeDeleted,
+                                mat,
+                                snapshotFields
+                        )
                 )
                 .mapConcat(pids -> pids);
     }
@@ -460,8 +523,7 @@ public Source<Document, NotUsed> getNewestSnapshotsAbove(
         return getSnapshotStore()
                 .withAttributes(Attributes.inputBuffer(1, 1))
                 .flatMapConcat(snapshotStore ->
-                        listNewestSnapshots(snapshotStore, snapshotFilter, batchSize, false, mat,
-                                snapshotFields)
+                        listNewestSnapshots(snapshotStore, snapshotFilter, batchSize, false, mat, snapshotFields)
                 )
                 .mapConcat(pids -> pids);
     }
@@ -509,12 +571,12 @@ public Source<Optional<Long>, NotUsed> getSmallestSnapshotSeqNo(final String pid
      * @return source of the delete result.
      */
     public Source<DeleteResult, NotUsed> deleteEvents(final String pid, final long minSeqNr, final long maxSeqNr) {
+
+        final Bson filter = Filters.and(Filters.eq(J_PROCESSOR_ID, pid),
+                Filters.gte(J_TO, minSeqNr),
+                Filters.lte(J_TO, maxSeqNr));
         return getJournal()
-                .flatMapConcat(journal -> Source.fromPublisher(
-                        journal.deleteMany(Filters.and(Filters.eq(J_PROCESSOR_ID, pid),
-                                Filters.gte(J_TO, minSeqNr),
-                                Filters.lte(J_TO, maxSeqNr)))
-                ));
+                .flatMapConcat(journal -> Source.fromPublisher(journal.deleteMany(filter)));
     }
 
     /**
@@ -526,12 +588,46 @@ public Source<DeleteResult, NotUsed> deleteEvents(final String pid, final long m
      * @return source of the delete result.
      */
     public Source<DeleteResult, NotUsed> deleteSnapshots(final String pid, final long minSeqNr, final long maxSeqNr) {
+
+        final Bson filter = Filters.and(Filters.eq(S_PROCESSOR_ID, pid),
+                Filters.gte(S_SN, minSeqNr),
+                Filters.lte(S_SN, maxSeqNr));
         return getSnapshotStore()
-                .flatMapConcat(snaps -> Source.fromPublisher(
-                        snaps.deleteMany(Filters.and(Filters.eq(S_PROCESSOR_ID, pid),
-                                Filters.gte(S_SN, minSeqNr),
-                                Filters.lte(S_SN, maxSeqNr)))
-                ));
+                .flatMapConcat(snaps -> Source.fromPublisher(snaps.deleteMany(filter)));
+    }
+
+
+    @Override
+    public Source<EventEnvelope, NotUsed> currentEventsByPersistenceId(final String persistenceId,
+            final long fromSequenceNr,
+            final long toSequenceNr) {
+        return akkaReadJournal.currentEventsByPersistenceId(persistenceId, fromSequenceNr, toSequenceNr);
+    }
+
+    @Override
+    public Source<EventEnvelope, NotUsed> currentEventsByTag(final String tag, final Offset offset) {
+        return akkaReadJournal.currentEventsByTag(tag, offset);
+    }
+
+    @Override
+    public Source<String, NotUsed> currentPersistenceIds() {
+        return akkaReadJournal.currentPersistenceIds();
+    }
+
+    @Override
+    public Source<EventEnvelope, NotUsed> eventsByPersistenceId(final String persistenceId, final long fromSequenceNr,
+            final long toSequenceNr) {
+        return akkaReadJournal.eventsByPersistenceId(persistenceId, fromSequenceNr, toSequenceNr);
+    }
+
+    @Override
+    public Source<EventEnvelope, NotUsed> eventsByTag(final String tag, final Offset offset) {
+        return akkaReadJournal.eventsByTag(tag, offset);
+    }
+
+    @Override
+    public Source<String, NotUsed> persistenceIds() {
+        return akkaReadJournal.persistenceIds();
     }
 
     private Source<List<String>, NotUsed> listPidsInJournal(final MongoCollection<Document> journal,
@@ -570,11 +666,16 @@ private Source<List<Document>, NotUsed> listNewestSnapshots(final MongoCollectio
             final Materializer mat,
             final String... snapshotFields) {
 
-        return unfoldBatchedSource(filter.getLowerBoundPid(),
+        return unfoldBatchedSource(filter.lowerBoundPid(),
                 mat,
                 SnapshotBatch::maxPid,
-                actualStartPid -> listNewestActiveSnapshotsByBatch(snapshotStore, filter.withLowerBound(actualStartPid), batchSize,
-                        includeDeleted, snapshotFields))
+                actualStartPid -> listNewestActiveSnapshotsByBatch(snapshotStore,
+                        filter.withLowerBound(actualStartPid),
+                        batchSize,
+                        includeDeleted,
+                        snapshotFields
+                )
+        )
                 .mapConcat(x -> x)
                 .map(SnapshotBatch::items);
     }
@@ -729,8 +830,8 @@ private static Source<SnapshotBatch, NotUsed> listNewestActiveSnapshotsByBatch(
             final String... snapshotFields) {
 
         final List<Bson> pipeline = new ArrayList<>(5);
-        // optional match stage
-        snapshotFilter.toMongoFilter().ifPresent(bson -> pipeline.add(Aggregates.match(bson)));
+        // match stage
+        pipeline.add(Aggregates.match(snapshotFilter.toMongoFilter()));
 
         // sort stage
         pipeline.add(Aggregates.sort(Sorts.orderBy(Sorts.ascending(S_PROCESSOR_ID), Sorts.descending(S_SN))));
@@ -778,7 +879,9 @@ private static Source<SnapshotBatch, NotUsed> listNewestActiveSnapshotsByBatch(
                     if (theMaxPid == null) {
                         return Source.empty();
                     } else {
-                        return Source.single(new SnapshotBatch(theMaxPid, document.getList(items, Document.class)));
+                        final SnapshotBatch snapshotBatch =
+                                new SnapshotBatch(theMaxPid, document.getList(items, Document.class));
+                        return Source.single(snapshotBatch);
                     }
                 });
     }
diff --git a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/streaming/SnapshotFilter.java b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/streaming/SnapshotFilter.java
index b5519c0c157..d1cc891adb7 100644
--- a/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/streaming/SnapshotFilter.java
+++ b/internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/streaming/SnapshotFilter.java
@@ -13,9 +13,12 @@
 
 package org.eclipse.ditto.internal.utils.persistence.mongo.streaming;
 
-import java.util.Optional;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Date;
 
 import org.bson.conversions.Bson;
+import org.bson.types.ObjectId;
 
 import com.mongodb.client.model.Filters;
 
@@ -23,16 +26,27 @@
 
 /**
  * A record that hold optional filters for retrieving snapshots from persistence.
+ *
+ * @param lowerBoundPid the lower-bound pid from which to start reading the snapshots
+ * @param pidFilter the regex applied to the pid to filter the snapshots
+ * @param minAgeFromNow the minimum age (based on {@code Instant.now()}) the snapshot must have in order to get
+ * selected
  */
-public record SnapshotFilter(String lowerBoundPid, String pidFilter) {
+public record SnapshotFilter(String lowerBoundPid, String pidFilter, Duration minAgeFromNow) {
 
     /**
      * Document field of PID in snapshot stores.
      */
     private static final String S_PROCESSOR_ID = SnapshottingFieldNames$.MODULE$.PROCESSOR_ID();
 
-    static SnapshotFilter of(final String lowerBoundPid) {
-        return new SnapshotFilter(lowerBoundPid, "");
+    /**
+     * @param lowerBoundPid the lower-bound pid from which to start reading the snapshots
+     * @param minAgeFromNow the minimum age (based on {@code Instant.now()}) the snapshot must have in order to get
+     * selected.
+     * @return new instance of SnapshotFilter
+     */
+    static SnapshotFilter of(final String lowerBoundPid, final Duration minAgeFromNow) {
+        return of(lowerBoundPid, "", minAgeFromNow);
     }
 
     /**
@@ -41,14 +55,19 @@ static SnapshotFilter of(final String lowerBoundPid) {
      * @return new instance of SnapshotFilter
      */
     public static SnapshotFilter of(final String lowerBoundPid, final String pidFilter) {
-        return new SnapshotFilter(lowerBoundPid, pidFilter);
+        return of(lowerBoundPid, pidFilter, Duration.ZERO);
     }
 
     /**
-     * @return the lower-bound pid
+     * @param lowerBoundPid the lower-bound pid from which to start reading the snapshots
+     * @param pidFilter the regex applied to the pid to filter the snapshots
+     * @param minAgeFromNow the minimum age (based on {@code Instant.now()}) the snapshot must have in order to get
+     * selected.
+     * @return new instance of SnapshotFilter
      */
-    String getLowerBoundPid() {
-        return lowerBoundPid;
+    public static SnapshotFilter of(final String lowerBoundPid, final String pidFilter,
+            final Duration minAgeFromNow) {
+        return new SnapshotFilter(lowerBoundPid, pidFilter, minAgeFromNow);
     }
 
     /**
@@ -56,21 +75,32 @@ String getLowerBoundPid() {
      * @return a new instance of SnapshotFilter with the new lower-bound pid set
      */
     SnapshotFilter withLowerBound(final String newLowerBoundPid) {
-        return new SnapshotFilter(newLowerBoundPid, pidFilter);
+        return new SnapshotFilter(newLowerBoundPid, pidFilter, minAgeFromNow);
     }
 
     /**
      * @return a Bson filter that can be used in a mongo query to filter the snapshots or an empty Optional if no filter was set
      */
-    Optional<Bson> toMongoFilter() {
+    Bson toMongoFilter() {
+        final Bson filter;
         if (!lowerBoundPid.isEmpty() && !pidFilter.isEmpty()) {
-            return Optional.of(Filters.and(getLowerBoundFilter(), getNamespacesFilter()));
+            filter = Filters.and(getLowerBoundFilter(), getNamespacesFilter());
         } else if (!lowerBoundPid.isEmpty()) {
-            return Optional.of(getLowerBoundFilter());
+            filter = getLowerBoundFilter();
         } else if (!pidFilter.isEmpty()) {
-            return Optional.of(getNamespacesFilter());
+            filter = getNamespacesFilter();
+        } else {
+            filter = Filters.empty();
+        }
+
+        if (minAgeFromNow.isZero()) {
+            return filter;
         } else {
-            return Optional.empty();
+            final Date nowMinusMinAgeFromNow = Date.from(Instant.now().minus(minAgeFromNow));
+            final Bson eventRetentionFilter = Filters.lt("_id",
+                    ObjectId.getSmallestWithDate(nowMinusMinAgeFromNow)
+            );
+            return Filters.and(filter, eventRetentionFilter);
         }
     }
 
diff --git a/internal/utils/persistence/src/test/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultEventConfigTest.java b/internal/utils/persistence/src/test/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultEventConfigTest.java
new file mode 100644
index 00000000000..97618879b77
--- /dev/null
+++ b/internal/utils/persistence/src/test/java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultEventConfigTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.internal.utils.persistence.mongo.config;
+
+import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
+import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
+
+import java.util.List;
+
+import org.assertj.core.api.JUnitSoftAssertions;
+import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Unit test for {@link DefaultEventConfig}.
+ */
+public final class DefaultEventConfigTest {
+
+    private static Config snapshotTestConf;
+
+    @Rule
+    public final JUnitSoftAssertions softly = new JUnitSoftAssertions();
+
+    @BeforeClass
+    public static void initTestFixture() {
+        snapshotTestConf = ConfigFactory.load("event-test");
+    }
+
+    @Test
+    public void assertImmutability() {
+        assertInstancesOf(DefaultEventConfig.class, areImmutable());
+    }
+
+    @Test
+    public void testHashCodeAndEquals() {
+        EqualsVerifier.forClass(DefaultEventConfig.class)
+                .usingGetClass()
+                .verify();
+    }
+
+    @Test
+    public void underTestReturnsDefaultValuesIfBaseConfigWasEmpty() {
+        final DefaultEventConfig underTest = DefaultEventConfig.of(ConfigFactory.empty());
+
+        softly.assertThat(underTest.getHistoricalHeadersToPersist())
+                .as(EventConfig.EventConfigValue.HISTORICAL_HEADERS_TO_PERSIST.getConfigPath())
+                .isEqualTo(EventConfig.EventConfigValue.HISTORICAL_HEADERS_TO_PERSIST.getDefaultValue());
+    }
+
+    @Test
+    public void underTestReturnsValuesOfConfigFile() {
+        final DefaultEventConfig underTest = DefaultEventConfig.of(snapshotTestConf);
+
+        softly.assertThat(underTest.getHistoricalHeadersToPersist())
+                .as(EventConfig.EventConfigValue.HISTORICAL_HEADERS_TO_PERSIST.getConfigPath())
+                .isEqualTo(List.of(DittoHeaderDefinition.ORIGINATOR.getKey(), "foo"));
+    }
+}
diff --git a/internal/utils/persistence/src/test/resources/event-test.conf b/internal/utils/persistence/src/test/resources/event-test.conf
new file mode 100644
index 00000000000..3b84b50ef7a
--- /dev/null
+++ b/internal/utils/persistence/src/test/resources/event-test.conf
@@ -0,0 +1,6 @@
+event {
+  historical-headers-to-persist = [
+    "ditto-originator"
+    "foo"
+  ]
+}
diff --git a/internal/utils/persistence/src/test/resources/mongo-read-journal-test.conf b/internal/utils/persistence/src/test/resources/mongo-read-journal-test.conf
index c1a2b8663ca..1905bbf9f7e 100644
--- a/internal/utils/persistence/src/test/resources/mongo-read-journal-test.conf
+++ b/internal/utils/persistence/src/test/resources/mongo-read-journal-test.conf
@@ -32,6 +32,17 @@ akka-contrib-mongodb-persistence-test-journal {
   }
 }
 
+akka-contrib-mongodb-persistence-test-journal-read {
+  class = "akka.contrib.persistence.mongodb.MongoReadJournal"
+
+  overrides {
+    journal-collection = "test_journal"
+    journal-index = "test_journal_index"
+    realtime-collection = "test_realtime"
+    metadata-collection = "test_metadata"
+  }
+}
+
 akka-contrib-mongodb-persistence-test-snapshots {
   class = "akka.contrib.persistence.mongodb.MongoSnapshots"
 
diff --git a/internal/utils/persistence/src/test/resources/test.conf b/internal/utils/persistence/src/test/resources/test.conf
index a975197c7fa..cd714bab1ac 100644
--- a/internal/utils/persistence/src/test/resources/test.conf
+++ b/internal/utils/persistence/src/test/resources/test.conf
@@ -132,6 +132,17 @@ akka-contrib-mongodb-persistence-test-journal {
   }
 }
 
+akka-contrib-mongodb-persistence-test-journal-read {
+  class = "akka.contrib.persistence.mongodb.MongoReadJournal"
+
+  overrides {
+    journal-collection = "test_journal"
+    journal-index = "test_journal_index"
+    realtime-collection = "test_realtime"
+    metadata-collection = "test_metadata"
+  }
+}
+
 akka-contrib-mongodb-persistence-test-snapshots {
   class = "akka.persistence.inmemory.snapshot.InMemorySnapshotStore"
 
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
index 5e0746b82cd..27e9d9178de 100755
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
@@ -13,30 +13,40 @@
 package org.eclipse.ditto.internal.utils.persistentactors;
 
 import java.time.Duration;
+import java.time.Instant;
+import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.bson.BsonDocument;
 import org.eclipse.ditto.base.api.commands.sudo.SudoCommand;
 import org.eclipse.ditto.base.model.entity.id.EntityId;
 import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
+import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.headers.DittoHeadersSettable;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.base.model.json.Jsonifiable;
+import org.eclipse.ditto.base.model.signals.FeatureToggle;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.base.model.signals.events.EventsourcedEvent;
+import org.eclipse.ditto.base.model.signals.events.GlobalEventRegistry;
 import org.eclipse.ditto.internal.utils.akka.PingCommand;
 import org.eclipse.ditto.internal.utils.akka.PingCommandResponse;
 import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.internal.utils.namespaces.BlockedNamespaces;
 import org.eclipse.ditto.internal.utils.persistence.SnapshotAdapter;
+import org.eclipse.ditto.internal.utils.persistence.mongo.AbstractMongoEventAdapter;
+import org.eclipse.ditto.internal.utils.persistence.mongo.DittoBsonJson;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.ActivityCheckConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.SnapshotConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.persistentactors.commands.CommandStrategy;
 import org.eclipse.ditto.internal.utils.persistentactors.events.EventStrategy;
 import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
@@ -46,15 +56,21 @@
 import org.eclipse.ditto.internal.utils.tracing.span.SpanOperationName;
 import org.eclipse.ditto.internal.utils.tracing.span.SpanTagKey;
 import org.eclipse.ditto.json.JsonField;
+import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonValue;
 
 import akka.actor.ActorRef;
+import akka.actor.Cancellable;
 import akka.japi.pf.ReceiveBuilder;
 import akka.persistence.RecoveryCompleted;
 import akka.persistence.RecoveryTimedOut;
 import akka.persistence.SaveSnapshotFailure;
 import akka.persistence.SaveSnapshotSuccess;
 import akka.persistence.SnapshotOffer;
+import akka.persistence.SnapshotProtocol;
+import akka.persistence.SnapshotSelectionCriteria;
+import akka.persistence.query.EventEnvelope;
+import akka.stream.javadsl.Sink;
 import scala.Option;
 
 /**
@@ -72,7 +88,8 @@ public abstract class AbstractPersistenceActor<
         S extends Jsonifiable.WithFieldSelectorAndPredicate<JsonField>,
         I extends EntityId,
         K,
-        E extends Event<? extends E>> extends AbstractPersistentActorWithTimersAndCleanup implements ResultVisitor<E> {
+        E extends EventsourcedEvent<? extends E>>
+        extends AbstractPersistentActorWithTimersAndCleanup implements ResultVisitor<E> {
 
     /**
      * An event journal {@code Tag} used to tag journal entries managed by a PersistenceActor as "always alive" meaning
@@ -83,6 +100,7 @@ public abstract class AbstractPersistenceActor<
     private final SnapshotAdapter<S> snapshotAdapter;
     private final Receive handleEvents;
     private final Receive handleCleanups;
+    private final MongoReadJournal mongoReadJournal;
     private long lastSnapshotRevision;
     private long confirmedSnapshotRevision;
 
@@ -104,10 +122,12 @@ public abstract class AbstractPersistenceActor<
      * Instantiate the actor.
      *
      * @param entityId the entity ID.
+     * @param mongoReadJournal the ReadJournal used for gaining access to historical values of the entity.
      */
     @SuppressWarnings("unchecked")
-    protected AbstractPersistenceActor(final I entityId) {
+    protected AbstractPersistenceActor(final I entityId, final MongoReadJournal mongoReadJournal) {
         this.entityId = entityId;
+        this.mongoReadJournal = mongoReadJournal;
         final var actorSystem = context().system();
         final var dittoExtensionsConfig = ScopedConfig.dittoExtension(actorSystem.settings().config());
         this.snapshotAdapter = SnapshotAdapter.get(actorSystem, dittoExtensionsConfig);
@@ -190,6 +210,20 @@ protected void onEntityModified() {
      */
     protected abstract DittoRuntimeExceptionBuilder<?> newNotAccessibleExceptionBuilder();
 
+    /**
+     * @param revision the revision which could not be resolved in the entity history.
+     * @return An exception builder to respond to unexpected commands addressed to a nonexistent historical entity at a
+     * given {@code revision}.
+     */
+    protected abstract DittoRuntimeExceptionBuilder<?> newHistoryNotAccessibleExceptionBuilder(long revision);
+
+    /**
+     * @param timestamp the timestamp which could not be resolved in the entity history.
+     * @return An exception builder to respond to unexpected commands addressed to a nonexistent historical entity at a
+     * given {@code timestamp}.
+     */
+    protected abstract DittoRuntimeExceptionBuilder<?> newHistoryNotAccessibleExceptionBuilder(Instant timestamp);
+
     /**
      * Publish an event.
      *
@@ -292,6 +326,8 @@ protected void becomeCreatedHandler() {
         final CommandStrategy<C, S, K, E> commandStrategy = getCreatedStrategy();
 
         final Receive receive = handleCleanups.orElse(ReceiveBuilder.create()
+                        .match(commandStrategy.getMatchingClass(), this::isHistoricalRetrieveCommand,
+                                this::handleHistoricalRetrieveCommand)
                         .match(commandStrategy.getMatchingClass(), commandStrategy::isDefined, this::handleByCommandStrategy)
                         .match(PersistEmptyEvent.class, this::handlePersistEmptyEvent)
                         .match(CheckForActivity.class, this::checkForActivity)
@@ -308,6 +344,145 @@ protected void becomeCreatedHandler() {
         scheduleSnapshot();
     }
 
+    private boolean isHistoricalRetrieveCommand(final C command) {
+        final DittoHeaders headers = command.getDittoHeaders();
+        return command.getCategory().equals(Command.Category.QUERY) && (
+                headers.containsKey(DittoHeaderDefinition.AT_HISTORICAL_REVISION.getKey()) ||
+                        headers.containsKey(DittoHeaderDefinition.AT_HISTORICAL_TIMESTAMP.getKey())
+        );
+    }
+
+    private void handleHistoricalRetrieveCommand(final C command) {
+
+        try {
+            FeatureToggle.checkHistoricalApiAccessFeatureEnabled(command.getType(), command.getDittoHeaders());
+        } catch (final DittoRuntimeException dre) {
+            getSender().tell(dre, getSelf());
+            return;
+        }
+
+        final CommandStrategy<C, S, K, E> commandStrategy = getCreatedStrategy();
+        final EventStrategy<E, S> eventStrategy = getEventStrategy();
+        final ActorRef sender = getSender();
+        final ActorRef self = getSelf();
+        final long atHistoricalRevision = Optional
+                .ofNullable(command.getDittoHeaders().get(DittoHeaderDefinition.AT_HISTORICAL_REVISION.getKey()))
+                .map(Long::parseLong)
+                .orElseGet(this::lastSequenceNr);
+        final Instant atHistoricalTimestamp = Optional
+                .ofNullable(command.getDittoHeaders().get(DittoHeaderDefinition.AT_HISTORICAL_TIMESTAMP.getKey()))
+                .map(Instant::parse)
+                .orElse(Instant.EPOCH);
+
+        loadSnapshot(persistenceId(), SnapshotSelectionCriteria.create(
+                atHistoricalRevision,
+                atHistoricalTimestamp.equals(Instant.EPOCH) ? Long.MAX_VALUE : atHistoricalTimestamp.toEpochMilli(),
+                0L,
+                0L
+        ), getLatestSnapshotSequenceNumber());
+
+        final Duration waitTimeout = Duration.ofSeconds(5);
+        final Cancellable cancellableSnapshotLoadTimeout =
+                getContext().getSystem().getScheduler().scheduleOnce(waitTimeout, getSelf(), waitTimeout,
+                        getContext().getDispatcher(), getSelf());
+        getContext().become(ReceiveBuilder.create()
+                .match(SnapshotProtocol.LoadSnapshotResult.class, loadSnapshotResult ->
+                        historicalRetrieveHandleLoadSnapshotResult(command,
+                                commandStrategy,
+                                eventStrategy,
+                                sender,
+                                self,
+                                atHistoricalRevision,
+                                atHistoricalTimestamp,
+                                cancellableSnapshotLoadTimeout,
+                                loadSnapshotResult
+                        )
+                )
+                .match(SnapshotProtocol.LoadSnapshotFailed.class, loadSnapshotFailed ->
+                        log.warning(loadSnapshotFailed.cause(), "Loading snapshot failed")
+                )
+                .matchEquals(waitTimeout, wt -> {
+                    log.withCorrelationId(command)
+                            .warning("Timed out waiting for receiving snapshot result!");
+                    becomeCreatedOrDeletedHandler();
+                    unstashAll();
+                })
+                .matchAny(any -> stash())
+                .build());
+    }
+
+    private void historicalRetrieveHandleLoadSnapshotResult(final C command,
+            final CommandStrategy<C, S, K, E> commandStrategy,
+            final EventStrategy<E, S> eventStrategy,
+            final ActorRef sender,
+            final ActorRef self,
+            final long atHistoricalRevision,
+            final Instant atHistoricalTimestamp,
+            final Cancellable cancellableSnapshotLoadTimeout,
+            final SnapshotProtocol.LoadSnapshotResult loadSnapshotResult) {
+
+        final Option<S> snapshotEntity = loadSnapshotResult.snapshot()
+                .map(snapshotAdapter::fromSnapshotStore);
+        final boolean snapshotIsPresent = snapshotEntity.isDefined();
+
+        if (snapshotIsPresent || getLatestSnapshotSequenceNumber() == 0) {
+            final long snapshotEntityRevision = snapshotIsPresent ?
+                    loadSnapshotResult.snapshot().get().metadata().sequenceNr() : 0L;
+
+            final long fromSequenceNr;
+            if (atHistoricalRevision == snapshotEntityRevision) {
+                fromSequenceNr = snapshotEntityRevision;
+            } else {
+                fromSequenceNr = snapshotEntityRevision + 1;
+            }
+
+            @Nullable final S entityFromSnapshot = snapshotIsPresent ? snapshotEntity.get() : null;
+            mongoReadJournal.currentEventsByPersistenceId(persistenceId(),
+                            fromSequenceNr,
+                            atHistoricalRevision
+                    )
+                    .map(AbstractPersistenceActor::mapJournalEntryToEvent)
+                    .map(journalEntryEvent -> new EntityWithEvent(
+                            eventStrategy.handle((E) journalEntryEvent, entityFromSnapshot, journalEntryEvent.getRevision()),
+                            (E) journalEntryEvent
+                    ))
+                    .takeWhile(entityWithEvent -> {
+                        if (atHistoricalTimestamp.equals(Instant.EPOCH)) {
+                            // no at-historical-timestamp was specified, so take all up to "at-historical-revision":
+                            return true;
+                        } else {
+                            // take while the timestamps of the events are before the specified "at-historical-timestamp":
+                            return entityWithEvent.event.getTimestamp()
+                                    .filter(ts -> ts.isBefore(atHistoricalTimestamp))
+                                    .isPresent();
+                        }
+                    })
+                    .reduce((ewe1, ewe2) -> new EntityWithEvent(
+                            eventStrategy.handle(ewe2.event, ewe2.entity, ewe2.revision),
+                            ewe2.event
+                    ))
+                    .runWith(Sink.foreach(entityWithEvent ->
+                                    commandStrategy.apply(getStrategyContext(),
+                                            entityWithEvent.entity,
+                                            entityWithEvent.revision,
+                                            command
+                                    ).accept(new HistoricalResultListener(sender,
+                                            entityWithEvent.event.getDittoHeaders()))
+                            ),
+                            getContext().getSystem());
+        } else {
+            if (!atHistoricalTimestamp.equals(Instant.EPOCH)) {
+                sender.tell(newHistoryNotAccessibleExceptionBuilder(atHistoricalTimestamp).build(), self);
+            } else {
+                sender.tell(newHistoryNotAccessibleExceptionBuilder(atHistoricalRevision).build(), self);
+            }
+        }
+
+        cancellableSnapshotLoadTimeout.cancel();
+        becomeCreatedOrDeletedHandler();
+        unstashAll();
+    }
+
     /**
      * Processes a received {@link PingCommand}.
      * May be overwritten in order to hook into processing ping commands with additional functionality.
@@ -358,7 +533,7 @@ protected void persistAndApplyEvent(final E event, final BiConsumer<E, S> handle
     }
 
     /**
-     * Allows to modify the passed in {@code event} before {@link #persistEvent(Event, Consumer)} is invoked.
+     * Allows to modify the passed in {@code event} before {@link #persistEvent(EventsourcedEvent, Consumer)} is invoked.
      * Overwrite this method and call the super method in order to additionally modify the event before persisting it.
      *
      * @param event the event to potentially modify.
@@ -452,7 +627,7 @@ private void cancelSnapshot() {
     }
 
     protected void handleByCommandStrategy(final C command) {
-        handleByStrategy(command, getCreatedStrategy());
+        handleByStrategy(command, entity, getCreatedStrategy());
     }
 
     @SuppressWarnings("unchecked")
@@ -462,11 +637,12 @@ private ReceiveBuilder handleByDeletedStrategyReceiveBuilder() {
                 .match(deletedStrategy.getMatchingClass(), deletedStrategy::isDefined,
                         // get the current deletedStrategy during "matching time" to allow implementing classes
                         // to update the strategy during runtime
-                        command -> handleByStrategy(command, (CommandStrategy<C, S, K, E>) getDeletedStrategy()));
+                        command -> handleByStrategy(command, entity, (CommandStrategy<C, S, K, E>) getDeletedStrategy()));
     }
 
     @SuppressWarnings("unchecked")
-    private <T extends Command<?>> void handleByStrategy(final T command, final CommandStrategy<T, S, K, E> strategy) {
+    private <T extends Command<?>> void handleByStrategy(final T command, @Nullable final S workEntity,
+            final CommandStrategy<T, S, K, E> strategy) {
         log.debug("Handling by strategy: <{}>", command);
 
         final var startedSpan = DittoTracing.newPreparedSpan(
@@ -481,7 +657,7 @@ private <T extends Command<?>> void handleByStrategy(final T command, final Comm
         accessCounter++;
         Result<E> result;
         try {
-            result = strategy.apply(getStrategyContext(), entity, getNextRevisionNumber(), (T) tracedCommand);
+            result = strategy.apply(getStrategyContext(), workEntity, getNextRevisionNumber(), (T) tracedCommand);
             result.accept(this);
         } catch (final DittoRuntimeException e) {
             startedSpan.tagAsFailed(e);
@@ -713,6 +889,18 @@ public static Object checkForActivity(final long accessCounter) {
         return new CheckForActivity(accessCounter);
     }
 
+    private static EventsourcedEvent<?> mapJournalEntryToEvent(final EventEnvelope eventEnvelope) {
+
+        final BsonDocument event = (BsonDocument) eventEnvelope.event();
+        final JsonObject eventAsJsonObject = DittoBsonJson.getInstance()
+                .serialize(event);
+
+        final DittoHeaders dittoHeaders = eventAsJsonObject.getValue(AbstractMongoEventAdapter.HISTORICAL_EVENT_HEADERS)
+                .map(obj -> DittoHeaders.newBuilder(obj).build())
+                .orElseGet(DittoHeaders::empty);
+        return (EventsourcedEvent<?>) GlobalEventRegistry.getInstance().parse(eventAsJsonObject, dittoHeaders);
+    }
+
     /**
      * Check if any command is processed.
      */
@@ -757,4 +945,71 @@ public String toString() {
 
     }
 
+    @Immutable
+    private final class EntityWithEvent {
+        @Nullable private final S entity;
+        private final long revision;
+        private final E event;
+
+        private EntityWithEvent(@Nullable final S entity, final E event) {
+            this.entity = entity;
+            this.revision = event.getRevision();
+            this.event = event;
+        }
+
+        @Override
+        public String toString() {
+            return getClass().getSimpleName() + " [" +
+                    "entity=" + entity +
+                    ", revision=" + revision +
+                    ", event=" + event +
+                    ']';
+        }
+    }
+
+    private final class HistoricalResultListener implements ResultVisitor<E> {
+
+        private final ActorRef sender;
+        private final DittoHeaders historicalDittoHeaders;
+
+        private HistoricalResultListener(final ActorRef sender, final DittoHeaders historicalDittoHeaders) {
+            this.sender = sender;
+            this.historicalDittoHeaders = historicalDittoHeaders.toBuilder()
+                    .removeHeader(DittoHeaderDefinition.RESPONSE_REQUIRED.getKey())
+                    .build();
+        }
+
+        @Override
+        public void onMutation(final Command<?> command, final E event,
+                final WithDittoHeaders response,
+                final boolean becomeCreated, final boolean becomeDeleted) {
+            throw new UnsupportedOperationException("Mutating historical entity not supported.");
+        }
+
+        @Override
+        public void onQuery(final Command<?> command, final WithDittoHeaders response) {
+            if (command.getDittoHeaders().isResponseRequired()) {
+                final WithDittoHeaders theResponseToSend;
+                if (response instanceof DittoHeadersSettable<?> dittoHeadersSettable) {
+                    final DittoHeaders queryCommandHeaders = response.getDittoHeaders();
+                    final DittoHeaders adjustedHeaders = queryCommandHeaders.toBuilder()
+                            .putHeader(DittoHeaderDefinition.HISTORICAL_HEADERS.getKey(),
+                                    historicalDittoHeaders.toJson().toString())
+                            .build();
+                    theResponseToSend = dittoHeadersSettable.setDittoHeaders(adjustedHeaders);
+                } else {
+                    theResponseToSend = response;
+                }
+                notifySender(sender, theResponseToSend);
+            }
+        }
+
+        @Override
+        public void onError(final DittoRuntimeException error,
+                final Command<?> errorCausingCommand) {
+            if (shouldSendResponse(errorCausingCommand.getDittoHeaders())) {
+                notifySender(sender, error);
+            }
+        }
+    }
 }
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
index 906df54340a..081e81121bb 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
@@ -14,6 +14,8 @@
 
 import java.text.MessageFormat;
 import java.time.Duration;
+import java.time.Instant;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ThreadLocalRandom;
@@ -22,18 +24,24 @@
 
 import javax.annotation.Nullable;
 
+import org.bson.BsonDocument;
 import org.eclipse.ditto.base.api.commands.sudo.SudoCommand;
 import org.eclipse.ditto.base.model.entity.id.EntityId;
 import org.eclipse.ditto.base.model.exceptions.DittoInternalErrorException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
+import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.headers.DittoHeadersBuilder;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.base.model.signals.WithResource;
 import org.eclipse.ditto.base.model.signals.WithType;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
+import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.base.model.signals.events.GlobalEventRegistry;
 import org.eclipse.ditto.base.service.actors.ShutdownBehaviour;
 import org.eclipse.ditto.base.service.config.supervision.ExponentialBackOff;
 import org.eclipse.ditto.base.service.config.supervision.ExponentialBackOffConfig;
@@ -49,11 +57,16 @@
 import org.eclipse.ditto.internal.utils.metrics.instruments.timer.PreparedTimer;
 import org.eclipse.ditto.internal.utils.metrics.instruments.timer.StartedTimer;
 import org.eclipse.ditto.internal.utils.namespaces.BlockedNamespaces;
+import org.eclipse.ditto.internal.utils.persistence.mongo.AbstractMongoEventAdapter;
+import org.eclipse.ditto.internal.utils.persistence.mongo.DittoBsonJson;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.tracing.DittoTracing;
 import org.eclipse.ditto.internal.utils.tracing.span.SpanOperationName;
+import org.eclipse.ditto.json.JsonObject;
 
 import com.typesafe.config.Config;
 
+import akka.NotUsed;
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
 import akka.actor.OneForOneStrategy;
@@ -69,6 +82,9 @@
 import akka.japi.pf.ReceiveBuilder;
 import akka.pattern.AskTimeoutException;
 import akka.pattern.Patterns;
+import akka.persistence.query.EventEnvelope;
+import akka.stream.javadsl.Source;
+import akka.stream.javadsl.StreamRefs;
 
 /**
  * Sharded Supervisor of persistent actors. It:
@@ -110,10 +126,12 @@ public abstract class AbstractPersistenceSupervisor<E extends EntityId, S extend
 
     private final SupervisorStrategy supervisorStrategy;
 
+    protected final MongoReadJournal mongoReadJournal;
+
     @Nullable protected final BlockedNamespaces blockedNamespaces;
+
     @Nullable protected E entityId;
     @Nullable protected ActorRef persistenceActorChild;
-
     @Nullable protected ActorRef enforcerChild;
 
     private final Duration defaultLocalAskTimeout;
@@ -127,13 +145,15 @@ public abstract class AbstractPersistenceSupervisor<E extends EntityId, S extend
     private int sudoOpCounter = 0;
 
     protected AbstractPersistenceSupervisor(@Nullable final BlockedNamespaces blockedNamespaces,
+            final MongoReadJournal mongoReadJournal,
             final Duration defaultLocalAskTimeout) {
-        this(null, null, blockedNamespaces, defaultLocalAskTimeout);
+        this(null, null, blockedNamespaces, mongoReadJournal, defaultLocalAskTimeout);
     }
 
     protected AbstractPersistenceSupervisor(@Nullable final ActorRef persistenceActorChild,
             @Nullable final ActorRef enforcerChild,
             @Nullable final BlockedNamespaces blockedNamespaces,
+            final MongoReadJournal mongoReadJournal,
             final Duration defaultLocalAskTimeout) {
 
         final ActorSystem system = context().system();
@@ -142,6 +162,7 @@ protected AbstractPersistenceSupervisor(@Nullable final ActorRef persistenceActo
         this.persistenceActorChild = persistenceActorChild;
         this.enforcerChild = enforcerChild;
         this.blockedNamespaces = blockedNamespaces;
+        this.mongoReadJournal = mongoReadJournal;
         this.defaultLocalAskTimeout = defaultLocalAskTimeout;
         exponentialBackOffConfig = getExponentialBackOffConfig();
         backOff = ExponentialBackOff.initial(exponentialBackOffConfig);
@@ -217,10 +238,84 @@ protected Receive activeBehaviour(final Runnable matchProcessNextTwinMessageBeha
                 .match(SudoCommand.class, this::forwardSudoCommandToChildIfAvailable)
                 .match(WithDittoHeaders.class, w -> w.getDittoHeaders().isSudo(),
                         this::forwardDittoSudoToChildIfAvailable)
+                .match(SubscribeForPersistedEvents.class, this::handleStreamPersistedEvents)
                 .matchAny(matchAnyBehavior)
                 .build();
     }
 
+    private void handleStreamPersistedEvents(final SubscribeForPersistedEvents subscribeForPersistedEvents) {
+
+        final EntityId commandEntityId = subscribeForPersistedEvents.getEntityId();
+        final String persistenceId = commandEntityId.getEntityType() + ":" + commandEntityId;
+        log.info("Starting to stream persisted events for pid <{}>: {}", persistenceId, subscribeForPersistedEvents);
+
+        final Optional<Instant> fromHistoricalTimestamp = subscribeForPersistedEvents.getFromHistoricalTimestamp();
+        final Optional<Instant> toHistoricalTimestamp = subscribeForPersistedEvents.getToHistoricalTimestamp();
+        final Source<Long, NotUsed> startRevisionSource = fromHistoricalTimestamp
+                .map(fromTs -> mongoReadJournal.getLastSnapshotSequenceNumberBeforeTimestamp(persistenceId, fromTs)
+                        .mergePrioritized(
+                                Source.single(subscribeForPersistedEvents.getFromHistoricalRevision()),
+                                2,
+                                1,
+                                false
+                        )
+                )
+                .orElseGet(() -> Source.single(subscribeForPersistedEvents.getFromHistoricalRevision()));
+
+        final ActorRef sender = getSender();
+        askEnforcerChild(subscribeForPersistedEvents)
+                .whenComplete((enforcedStreamPersistedEvents, throwable) -> {
+                    if (enforcedStreamPersistedEvents instanceof DittoRuntimeException dre) {
+                        log.withCorrelationId(subscribeForPersistedEvents)
+                                .info("Got DittoRuntimeException handling SubscribeForPersistedEvents: " +
+                                                "<{}: {}>", dre.getClass().getSimpleName(), dre.getMessage());
+                        sender.tell(dre, getSelf());
+                    } else if (null != enforcedStreamPersistedEvents) {
+                        final var sourceRef = startRevisionSource
+                                .flatMapConcat(startRevision -> mongoReadJournal.currentEventsByPersistenceId(
+                                        persistenceId,
+                                        startRevision,
+                                        subscribeForPersistedEvents.getToHistoricalRevision()
+                                ))
+                                .map(eventEnvelope ->
+                                        mapJournalEntryToEvent(
+                                                (SubscribeForPersistedEvents) enforcedStreamPersistedEvents, eventEnvelope))
+                                .filter(event ->
+                                        fromHistoricalTimestamp.flatMap(instant ->
+                                                event.getTimestamp().map(eventTs -> eventTs.isAfter(instant))
+                                        ).orElse(true)
+                                )
+                                .takeWhile(event ->
+                                        toHistoricalTimestamp.flatMap(instant ->
+                                                event.getTimestamp().map(eventTs -> eventTs.isBefore(instant))
+                                        ).orElse(true)
+                                )
+                                .runWith(StreamRefs.sourceRef(), getContext().getSystem());
+                        sender.tell(sourceRef, getSelf());
+                    } else if (null != throwable) {
+                        log.withCorrelationId(subscribeForPersistedEvents)
+                                .warning(throwable, "Got throwable: <{}: {}>", throwable.getClass().getSimpleName(),
+                                            throwable.getMessage());
+                    }
+                });
+    }
+
+    private Event<?> mapJournalEntryToEvent(final SubscribeForPersistedEvents enforcedSubscribeForPersistedEvents,
+            final EventEnvelope eventEnvelope) {
+
+        final BsonDocument event = (BsonDocument) eventEnvelope.event();
+        final JsonObject eventAsJsonObject = DittoBsonJson.getInstance()
+                .serialize(event);
+
+        final DittoHeadersBuilder<?, ?> dittoHeadersBuilder = enforcedSubscribeForPersistedEvents.getDittoHeaders()
+                .toBuilder();
+        eventAsJsonObject.getValue(AbstractMongoEventAdapter.HISTORICAL_EVENT_HEADERS)
+                .ifPresent(obj -> dittoHeadersBuilder.putHeader(
+                        DittoHeaderDefinition.HISTORICAL_HEADERS.getKey(), obj.toString())
+                );
+        return GlobalEventRegistry.getInstance().parse(eventAsJsonObject, dittoHeadersBuilder.build());
+    }
+
     /**
      * Create a builder for an exception to report unavailability of the entity.
      *
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/Cleanup.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/Cleanup.java
index 461447f692e..08ba16a5357 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/Cleanup.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/Cleanup.java
@@ -16,6 +16,7 @@
 import static org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal.S_ID;
 import static org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal.S_SN;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.LongStream;
@@ -35,6 +36,7 @@ final class Cleanup {
     private final MongoReadJournal readJournal;
     private final Materializer materializer;
     private final Supplier<Pair<Integer, Integer>> responsibilitySupplier;
+    private final Duration historyRetentionDuration;
     private final int readBatchSize;
     private final int deleteBatchSize;
     private final boolean deleteFinalDeletedSnapshot;
@@ -42,6 +44,7 @@ final class Cleanup {
     Cleanup(final MongoReadJournal readJournal,
             final Materializer materializer,
             final Supplier<Pair<Integer, Integer>> responsibilitySupplier,
+            final Duration historyRetentionDuration,
             final int readBatchSize,
             final int deleteBatchSize,
             final boolean deleteFinalDeletedSnapshot) {
@@ -49,6 +52,7 @@ final class Cleanup {
         this.readJournal = readJournal;
         this.materializer = materializer;
         this.responsibilitySupplier = responsibilitySupplier;
+        this.historyRetentionDuration = historyRetentionDuration;
         this.readBatchSize = readBatchSize;
         this.deleteBatchSize = deleteBatchSize;
         this.deleteFinalDeletedSnapshot = deleteFinalDeletedSnapshot;
@@ -59,8 +63,12 @@ static Cleanup of(final CleanupConfig config,
             final Materializer materializer,
             final Supplier<Pair<Integer, Integer>> responsibilitySupplier) {
 
-        return new Cleanup(readJournal, materializer, responsibilitySupplier, config.getReadsPerQuery(),
-                config.getWritesPerCredit(), config.shouldDeleteFinalDeletedSnapshot());
+        return new Cleanup(readJournal, materializer, responsibilitySupplier,
+                config.getHistoryRetentionDuration(),
+                config.getReadsPerQuery(),
+                config.getWritesPerCredit(),
+                config.shouldDeleteFinalDeletedSnapshot()
+        );
     }
 
     Source<Source<CleanupResult, NotUsed>, NotUsed> getCleanupStream(final String lowerBound) {
@@ -68,7 +76,7 @@ Source<Source<CleanupResult, NotUsed>, NotUsed> getCleanupStream(final String lo
     }
 
     private Source<SnapshotRevision, NotUsed> getSnapshotRevisions(final String lowerBound) {
-        return readJournal.getNewestSnapshotsAbove(lowerBound, readBatchSize, true, materializer)
+        return readJournal.getNewestSnapshotsAbove(lowerBound, readBatchSize, true, historyRetentionDuration, materializer)
                 .map(document -> new SnapshotRevision(document.getString(S_ID),
                         document.getLong(S_SN),
                         "DELETED".equals(document.getString(LIFECYCLE))))
@@ -92,7 +100,8 @@ private Source<Source<CleanupResult, NotUsed>, NotUsed> cleanUpEvents(final Snap
             } else {
                 final List<Long> upperBounds = getSnUpperBoundsPerBatch(minSnOpt.orElseThrow(), sr.sn);
                 return Source.from(upperBounds).map(upperBound -> Source.lazySource(() ->
-                        readJournal.deleteEvents(sr.pid, upperBound - deleteBatchSize + 1, upperBound)
+                        readJournal
+                                .deleteEvents(sr.pid, upperBound - deleteBatchSize + 1, upperBound)
                                 .map(result -> new CleanupResult(CleanupResult.Type.EVENTS, sr, result))
                 ).mapMaterializedValue(ignored -> NotUsed.getInstance()));
             }
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/CleanupConfig.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/CleanupConfig.java
index ece8620f307..a84469ab36c 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/CleanupConfig.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/CleanupConfig.java
@@ -41,7 +41,7 @@ static CleanupConfig of(final Config config) {
      * @param config the config values to set.
      * @return the new cleanup config object.
      */
-    CleanupConfig setAll(final Config config);
+    CleanupConfig setAll(Config config);
 
     /**
      * Return whether background cleanup is enabled.
@@ -50,6 +50,16 @@ static CleanupConfig of(final Config config) {
      */
     boolean isEnabled();
 
+    /**
+     * Returns the duration of how long to "keep" events and snapshots before being allowed to remove them in scope
+     * of cleanup.
+     * If this e.g. is set to 30 days - then effectively an event history of 30 days would be available via the read
+     * journal.
+     *
+     * @return the history retention duration.
+     */
+    Duration getHistoryRetentionDuration();
+
     /**
      * Returns quiet period between cleanup streams.
      *
@@ -118,6 +128,12 @@ enum ConfigValue implements KnownConfigValue {
          */
         ENABLED("enabled", true),
 
+        /**
+         * History retention duration.
+         * Events and snapshots are kept at least that long before cleaning them up from the persistence.
+         */
+        HISTORY_RETENTION_DURATION("history-retention-duration", Duration.ofDays(0L)),
+
         /**
          * Quiet period.
          */
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/DefaultCleanupConfig.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/DefaultCleanupConfig.java
index 79b03f78e0a..b2146a62abe 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/DefaultCleanupConfig.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/DefaultCleanupConfig.java
@@ -29,6 +29,7 @@ final class DefaultCleanupConfig implements CleanupConfig {
     static final String CONFIG_PATH = "cleanup";
 
     private final boolean enabled;
+    private final Duration historyRetentionDuration;
     private final Duration quietPeriod;
     private final Duration interval;
     private final Duration timerThreshold;
@@ -38,6 +39,7 @@ final class DefaultCleanupConfig implements CleanupConfig {
     private final boolean deleteFinalDeletedSnapshot;
 
     DefaultCleanupConfig(final boolean enabled,
+            final Duration historyRetentionDuration,
             final Duration quietPeriod,
             final Duration interval,
             final Duration timerThreshold,
@@ -46,6 +48,7 @@ final class DefaultCleanupConfig implements CleanupConfig {
             final int writesPerCredit,
             final boolean deleteFinalDeletedSnapshot) {
         this.enabled = enabled;
+        this.historyRetentionDuration = historyRetentionDuration;
         this.quietPeriod = quietPeriod;
         this.interval = interval;
         this.timerThreshold = timerThreshold;
@@ -57,6 +60,7 @@ final class DefaultCleanupConfig implements CleanupConfig {
 
     DefaultCleanupConfig(final ScopedConfig conf) {
         this.enabled = conf.getBoolean(ConfigValue.ENABLED.getConfigPath());
+        this.historyRetentionDuration = conf.getNonNegativeDurationOrThrow(ConfigValue.HISTORY_RETENTION_DURATION);
         this.quietPeriod = conf.getNonNegativeAndNonZeroDurationOrThrow(ConfigValue.QUIET_PERIOD);
         this.interval = conf.getNonNegativeAndNonZeroDurationOrThrow(ConfigValue.INTERVAL);
         this.timerThreshold = conf.getNonNegativeAndNonZeroDurationOrThrow(ConfigValue.TIMER_THRESHOLD);
@@ -70,6 +74,7 @@ final class DefaultCleanupConfig implements CleanupConfig {
     public Config render() {
         final Map<String, Object> configMap = Map.of(
                 ConfigValue.ENABLED.getConfigPath(), enabled,
+                ConfigValue.HISTORY_RETENTION_DURATION.getConfigPath(), historyRetentionDuration,
                 ConfigValue.QUIET_PERIOD.getConfigPath(), quietPeriod,
                 ConfigValue.INTERVAL.getConfigPath(), interval,
                 ConfigValue.TIMER_THRESHOLD.getConfigPath(), timerThreshold,
@@ -91,6 +96,11 @@ public boolean isEnabled() {
         return enabled;
     }
 
+    @Override
+    public Duration getHistoryRetentionDuration() {
+        return historyRetentionDuration;
+    }
+
     @Override
     public Duration getQuietPeriod() {
         return quietPeriod;
@@ -128,9 +138,9 @@ public boolean shouldDeleteFinalDeletedSnapshot() {
 
     @Override
     public boolean equals(final Object o) {
-        if (o instanceof DefaultCleanupConfig) {
-            final DefaultCleanupConfig that = (DefaultCleanupConfig) o;
+        if (o instanceof DefaultCleanupConfig that) {
             return enabled == that.enabled &&
+                    Objects.equals(historyRetentionDuration, that.historyRetentionDuration) &&
                     Objects.equals(quietPeriod, that.quietPeriod) &&
                     Objects.equals(interval, that.interval) &&
                     Objects.equals(timerThreshold, that.timerThreshold) &&
@@ -145,21 +155,22 @@ public boolean equals(final Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(enabled, quietPeriod, interval, timerThreshold, creditsPerBatch, readsPerQuery,
-                writesPerCredit, deleteFinalDeletedSnapshot);
+        return Objects.hash(enabled, historyRetentionDuration, quietPeriod, interval, timerThreshold, creditsPerBatch,
+                readsPerQuery, writesPerCredit, deleteFinalDeletedSnapshot);
     }
 
     @Override
     public String toString() {
-        return getClass().getSimpleName() +
-                "[enabled=" + enabled +
-                ",quietPeriod=" + quietPeriod +
-                ",interval=" + interval +
-                ",timerThreshold=" + timerThreshold +
-                ",creditPerBatch=" + creditsPerBatch +
-                ",readsPerQuery=" + readsPerQuery +
-                ",writesPerCredit=" + writesPerCredit +
-                ",deleteFinalDeletedSnapshot=" + deleteFinalDeletedSnapshot +
+        return getClass().getSimpleName() + "[" +
+                "enabled=" + enabled +
+                ", minAgeFromNow=" + historyRetentionDuration +
+                ", quietPeriod=" + quietPeriod +
+                ", interval=" + interval +
+                ", timerThreshold=" + timerThreshold +
+                ", creditPerBatch=" + creditsPerBatch +
+                ", readsPerQuery=" + readsPerQuery +
+                ", writesPerCredit=" + writesPerCredit +
+                ", deleteFinalDeletedSnapshot=" + deleteFinalDeletedSnapshot +
                 "]";
     }
 
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/events/AbstractEventStrategies.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/events/AbstractEventStrategies.java
index a9d9439a40d..db2a147718f 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/events/AbstractEventStrategies.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/events/AbstractEventStrategies.java
@@ -20,7 +20,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
-import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.base.model.signals.events.EventsourcedEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,7 +31,7 @@
  * @param <S> the type of the entity
  */
 @Immutable
-public abstract class AbstractEventStrategies<E extends Event<?>, S> implements EventStrategy<E, S> {
+public abstract class AbstractEventStrategies<E extends EventsourcedEvent<?>, S> implements EventStrategy<E, S> {
 
     protected final Logger log = LoggerFactory.getLogger(getClass());
 
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/events/EventStrategy.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/events/EventStrategy.java
index d9a2f7735ac..cebb7a29b10 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/events/EventStrategy.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/events/EventStrategy.java
@@ -14,7 +14,7 @@
 
 import javax.annotation.Nullable;
 
-import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.base.model.signals.events.EventsourcedEvent;
 
 /**
  * This interface represents a strategy for handling events in a persistent actor.
@@ -23,7 +23,7 @@
  * @param <S> the type of the entity
  */
 @FunctionalInterface
-public interface EventStrategy<E extends Event<?>, S> {
+public interface EventStrategy<E extends EventsourcedEvent<?>, S> {
 
     /**
      * Applies an event to an entity.
diff --git a/internal/utils/persistent-actors/src/test/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/CleanupTest.java b/internal/utils/persistent-actors/src/test/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/CleanupTest.java
index c9ac8417f59..3f74f0ac52a 100644
--- a/internal/utils/persistent-actors/src/test/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/CleanupTest.java
+++ b/internal/utils/persistent-actors/src/test/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/CleanupTest.java
@@ -21,6 +21,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -67,7 +68,8 @@ public void emptyStream() {
         when(mongoReadJournal.getNewestSnapshotsAbove(any(), anyInt(), eq(true), any(), any()))
                 .thenReturn(Source.empty());
 
-        final var underTest = new Cleanup(mongoReadJournal, materializer, () -> Pair.create(0, 1), 1, 1, true);
+        final var underTest = new Cleanup(mongoReadJournal, materializer, () -> Pair.create(0, 1),
+                Duration.ZERO, 1, 1, true);
         final var result = underTest.getCleanupStream("")
                 .flatMapConcat(x -> x)
                 .runWith(Sink.seq(), materializer)
@@ -94,7 +96,8 @@ public void deleteFinalDeletedSnapshot() {
                 invocation.<Long>getArgument(1) * 1000L + invocation.<Long>getArgument(2) * 10L)))
                 .when(mongoReadJournal).deleteSnapshots(any(), anyLong(), anyLong());
 
-        final var underTest = new Cleanup(mongoReadJournal, materializer, () -> Pair.create(0, 1), 1, 4, true);
+        final var underTest = new Cleanup(mongoReadJournal, materializer, () -> Pair.create(0, 1),
+                Duration.ZERO, 1, 4, true);
 
         final var result = underTest.getCleanupStream("")
                 .flatMapConcat(x -> x)
@@ -127,7 +130,8 @@ public void excludeFinalDeletedSnapshot() {
                 invocation.<Long>getArgument(1) * 1000L + invocation.<Long>getArgument(2) * 10L)))
                 .when(mongoReadJournal).deleteSnapshots(any(), anyLong(), anyLong());
 
-        final var underTest = new Cleanup(mongoReadJournal, materializer, () -> Pair.create(0, 1), 1, 4, false);
+        final var underTest = new Cleanup(mongoReadJournal, materializer, () -> Pair.create(0, 1),
+                Duration.ZERO, 1, 4, false);
 
         final var result = underTest.getCleanupStream("")
                 .flatMapConcat(x -> x)
@@ -168,7 +172,8 @@ public void ignorePidsNotResponsibleFor() {
                 .when(mongoReadJournal).deleteSnapshots(any(), anyLong(), anyLong());
 
         // WHEN: the instance is responsible for 1/3 of the 3 PIDs
-        final var underTest = new Cleanup(mongoReadJournal, materializer, () -> Pair.create(2, 3), 1, 4, false);
+        final var underTest = new Cleanup(mongoReadJournal, materializer, () -> Pair.create(2, 3),
+                Duration.ZERO, 1, 4, false);
 
         final var result = underTest.getCleanupStream("")
                 .flatMapConcat(x -> x)
diff --git a/internal/utils/persistent-actors/src/test/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/CreditsTest.java b/internal/utils/persistent-actors/src/test/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/CreditsTest.java
index e72be46a6db..e64b21507bf 100644
--- a/internal/utils/persistent-actors/src/test/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/CreditsTest.java
+++ b/internal/utils/persistent-actors/src/test/java/org/eclipse/ditto/internal/utils/persistentactors/cleanup/CreditsTest.java
@@ -134,7 +134,8 @@ public void onePersistenceWriteAllowedPerCredit() {
         // mock timer permits 1 batch of credit, after which no credit is given out
         final var mockTimerResult = new AtomicLong(0L);
         doAnswer(inv -> mockTimerResult.getAndSet(1001L)).when(mockTimer).getThenReset();
-        final var cleanup = new Cleanup(mongoReadJournal, materializer, () -> Pair.create(0, 1), 1, 4, true);
+        final var cleanup = new Cleanup(mongoReadJournal, materializer, () -> Pair.create(0, 1),
+                Duration.ZERO, 1, 4, true);
         final var underTest = new Credits(getFastCreditConfig(4), mockTimer);
 
         final var log = Logging.getLogger(actorSystem, this);
@@ -164,7 +165,7 @@ private Pair<TestPublisher.Probe<Object>, TestSubscriber.Probe<Object>> material
     }
 
     private static CleanupConfig getFastCreditConfig(final int creditPerBatch) {
-        return new DefaultCleanupConfig(true, Duration.ZERO, Duration.ofMillis(100), Duration.ofNanos(1000),
+        return new DefaultCleanupConfig(true, Duration.ZERO, Duration.ZERO, Duration.ofMillis(100), Duration.ofNanos(1000),
                 creditPerBatch, 100, 100, false);
     }
 }
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/WithPolicyId.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/WithPolicyId.java
new file mode 100644
index 00000000000..904115a7e43
--- /dev/null
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/WithPolicyId.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.policies.model;
+
+import org.eclipse.ditto.base.model.entity.id.WithEntityId;
+
+/**
+ * Implementations of this interface are associated to a {@code Policy} identified by the value
+ * returned from {@link #getEntityId()}.
+ *
+ * @since 3.2.0
+ */
+public interface WithPolicyId extends WithEntityId {
+
+    @Override
+    PolicyId getEntityId();
+
+}
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/PolicyCommand.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/PolicyCommand.java
index 1ed450b33d4..c571ffdd52b 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/PolicyCommand.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/PolicyCommand.java
@@ -12,24 +12,26 @@
  */
 package org.eclipse.ditto.policies.model.signals.commands;
 
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonFieldDefinition;
 import org.eclipse.ditto.base.model.entity.type.EntityType;
 import org.eclipse.ditto.base.model.entity.type.WithEntityType;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
-import org.eclipse.ditto.policies.model.PolicyConstants;
-import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
 import org.eclipse.ditto.base.model.signals.commands.Command;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.policies.model.PolicyConstants;
+import org.eclipse.ditto.policies.model.PolicyId;
+import org.eclipse.ditto.policies.model.WithPolicyId;
 
 /**
  * Aggregates all {@link Command}s which are related to a {@link org.eclipse.ditto.policies.model.Policy}.
  *
  * @param <T> the type of the implementing class.
  */
-public interface PolicyCommand<T extends PolicyCommand<T>> extends Command<T>, WithEntityType, SignalWithEntityId<T> {
+public interface PolicyCommand<T extends PolicyCommand<T>> extends Command<T>, WithEntityType, WithPolicyId,
+        SignalWithEntityId<T> {
 
     /**
      * Type Prefix of Policy commands.
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/PolicyCommandResponse.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/PolicyCommandResponse.java
index 2933242fc64..16d6d489d46 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/PolicyCommandResponse.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/PolicyCommandResponse.java
@@ -12,14 +12,15 @@
  */
 package org.eclipse.ditto.policies.model.signals.commands;
 
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonFieldDefinition;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
-import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.policies.model.PolicyId;
+import org.eclipse.ditto.policies.model.WithPolicyId;
 
 /**
  * Aggregates all possible responses relating to a given {@link PolicyCommand}.
@@ -27,7 +28,7 @@
  * @param <T> the type of the implementing class.
  */
 public interface PolicyCommandResponse<T extends PolicyCommandResponse<T>> extends CommandResponse<T>,
-        SignalWithEntityId<T> {
+        WithPolicyId, SignalWithEntityId<T> {
 
     /**
      * Type Prefix of Policy command responses.
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/exceptions/PolicyHistoryNotAccessibleException.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/exceptions/PolicyHistoryNotAccessibleException.java
new file mode 100755
index 00000000000..51401af3718
--- /dev/null
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/exceptions/PolicyHistoryNotAccessibleException.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.policies.model.signals.commands.exceptions;
+
+import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
+
+import java.net.URI;
+import java.text.MessageFormat;
+import java.time.Instant;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+import javax.annotation.concurrent.NotThreadSafe;
+
+import org.eclipse.ditto.base.model.common.HttpStatus;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.policies.model.PolicyException;
+import org.eclipse.ditto.policies.model.PolicyId;
+
+/**
+ * Thrown if historical data of the Policy was either not present in Ditto at all or if the requester had insufficient
+ * permissions to access it.
+ *
+ * @since 3.2.0
+ */
+@Immutable
+@JsonParsableException(errorCode = PolicyHistoryNotAccessibleException.ERROR_CODE)
+public final class PolicyHistoryNotAccessibleException extends DittoRuntimeException implements PolicyException {
+
+    /**
+     * Error code of this exception.
+     */
+    public static final String ERROR_CODE = ERROR_CODE_PREFIX + "policy.history.notfound";
+
+    private static final String MESSAGE_TEMPLATE =
+            "The Policy with ID ''{0}'' at revision ''{1}'' could not be found or requester had insufficient " +
+                    "permissions to access it.";
+
+    private static final String MESSAGE_TEMPLATE_TS =
+            "The Policy with ID ''{0}'' at timestamp ''{1}'' could not be found or requester had insufficient " +
+                    "permissions to access it.";
+
+    private static final String DEFAULT_DESCRIPTION =
+            "Check if the ID of your requested Policy was correct, you have sufficient permissions and ensure that the " +
+                    "asked for revision/timestamp does not exceed the history-retention-duration.";
+
+    private static final long serialVersionUID = 4242422323239998882L;
+
+    private PolicyHistoryNotAccessibleException(final DittoHeaders dittoHeaders,
+            @Nullable final String message,
+            @Nullable final String description,
+            @Nullable final Throwable cause,
+            @Nullable final URI href) {
+        super(ERROR_CODE, HttpStatus.NOT_FOUND, dittoHeaders, message, description, cause, href);
+    }
+
+    private static String getMessage(final PolicyId policyId, final long revision) {
+        checkNotNull(policyId, "policyId");
+        return MessageFormat.format(MESSAGE_TEMPLATE, String.valueOf(policyId), String.valueOf(revision));
+    }
+
+    private static String getMessage(final PolicyId policyId, final Instant timestamp) {
+        checkNotNull(policyId, "policyId");
+        checkNotNull(timestamp, "timestamp");
+        return MessageFormat.format(MESSAGE_TEMPLATE_TS, String.valueOf(policyId), timestamp.toString());
+    }
+
+    /**
+     * A mutable builder for a {@code PolicyHistoryNotAccessibleException}.
+     *
+     * @param policyId the ID of the policy.
+     * @param revision the asked for revision of the policy.
+     * @return the builder.
+     * @throws NullPointerException if {@code policyId} is {@code null}.
+     */
+    public static Builder newBuilder(final PolicyId policyId, final long revision) {
+        return new Builder(policyId, revision);
+    }
+
+    /**
+     * A mutable builder for a {@code PolicyHistoryNotAccessibleException}.
+     *
+     * @param policyId the ID of the policy.
+     * @param timestamp the asked for timestamp of the policy.
+     * @return the builder.
+     * @throws NullPointerException if {@code policyId} is {@code null}.
+     */
+    public static Builder newBuilder(final PolicyId policyId, final Instant timestamp) {
+        return new Builder(policyId, timestamp);
+    }
+
+    /**
+     * Constructs a new {@code PolicyHistoryNotAccessibleException} object with given message.
+     *
+     * @param message detail message. This message can be later retrieved by the {@link #getMessage()} method.
+     * @param dittoHeaders the headers of the command which resulted in this exception.
+     * @return the new PolicyHistoryNotAccessibleException.
+     * @throws NullPointerException if {@code dittoHeaders} is {@code null}.
+     */
+    public static PolicyHistoryNotAccessibleException fromMessage(@Nullable final String message,
+            final DittoHeaders dittoHeaders) {
+        return DittoRuntimeException.fromMessage(message, dittoHeaders, new Builder());
+    }
+
+    /**
+     * Constructs a new {@code PolicyHistoryNotAccessibleException} object with the exception message extracted from the given
+     * JSON object.
+     *
+     * @param jsonObject the JSON to read the {@link org.eclipse.ditto.base.model.exceptions.DittoRuntimeException.JsonFields#MESSAGE} field from.
+     * @param dittoHeaders the headers of the command which resulted in this exception.
+     * @return the new PolicyHistoryNotAccessibleException.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonMissingFieldException if this JsonObject did not contain an error message.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static PolicyHistoryNotAccessibleException fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
+        return DittoRuntimeException.fromJson(jsonObject, dittoHeaders, new Builder());
+    }
+
+    @Override
+    public DittoRuntimeException setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new Builder()
+                .message(getMessage())
+                .description(getDescription().orElse(null))
+                .cause(getCause())
+                .href(getHref().orElse(null))
+                .dittoHeaders(dittoHeaders)
+                .build();
+    }
+
+    /**
+     * A mutable builder with a fluent API for a {@link org.eclipse.ditto.policies.model.signals.commands.exceptions.PolicyHistoryNotAccessibleException}.
+     */
+    @NotThreadSafe
+    public static final class Builder extends DittoRuntimeExceptionBuilder<PolicyHistoryNotAccessibleException> {
+
+        private Builder() {
+            description(DEFAULT_DESCRIPTION);
+        }
+
+        private Builder(final PolicyId policyId, final long revision) {
+            this();
+            message(PolicyHistoryNotAccessibleException.getMessage(policyId, revision));
+        }
+
+        private Builder(final PolicyId policyId, final Instant timestamp) {
+            this();
+            message(PolicyHistoryNotAccessibleException.getMessage(policyId, timestamp));
+        }
+
+        @Override
+        protected PolicyHistoryNotAccessibleException doBuild(final DittoHeaders dittoHeaders,
+                @Nullable final String message,
+                @Nullable final String description,
+                @Nullable final Throwable cause,
+                @Nullable final URI href) {
+            return new PolicyHistoryNotAccessibleException(dittoHeaders, message, description, cause, href);
+        }
+
+    }
+
+}
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/AbstractPolicyEvent.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/AbstractPolicyEvent.java
index 3e8cae99661..b94a0103f36 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/AbstractPolicyEvent.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/AbstractPolicyEvent.java
@@ -20,8 +20,8 @@
 
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.base.model.signals.events.AbstractEventsourcedEvent;
+import org.eclipse.ditto.policies.model.PolicyId;
 
 /**
  * Abstract base class of a {@link PolicyEvent}.
@@ -57,6 +57,11 @@ protected AbstractPolicyEvent(final String type,
         this.policyId = policyId;
     }
 
+    @Override
+    public PolicyId getEntityId() {
+        return getPolicyEntityId();
+    }
+
     @Override
     public PolicyId getPolicyEntityId() {
         return policyId;
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyEvent.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyEvent.java
index c818ad61113..9e5c5a50132 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyEvent.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyEvent.java
@@ -14,21 +14,23 @@
 
 import javax.annotation.concurrent.Immutable;
 
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonFieldDefinition;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
-import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
 import org.eclipse.ditto.base.model.signals.events.EventsourcedEvent;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.policies.model.PolicyId;
+import org.eclipse.ditto.policies.model.WithPolicyId;
 
 /**
  * Interface for all policy-related events.
  *
  * @param <T> the type of the implementing class.
  */
-public interface PolicyEvent<T extends PolicyEvent<T>> extends EventsourcedEvent<T>, SignalWithEntityId<T> {
+public interface PolicyEvent<T extends PolicyEvent<T>> extends EventsourcedEvent<T>, WithPolicyId,
+        SignalWithEntityId<T> {
 
     /**
      * Type Prefix of Policy events.
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsDeletedPartially.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsDeletedPartially.java
index 190c8c10e5a..755acbe4696 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsDeletedPartially.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsDeletedPartially.java
@@ -66,7 +66,7 @@ public final class SubjectsDeletedPartially extends AbstractPolicyActionEvent<Su
      */
     public static final String TYPE = TYPE_PREFIX + NAME;
 
-    static final JsonFieldDefinition<JsonObject> JSON_DELETED_SUBJECT_IDS =
+    public static final JsonFieldDefinition<JsonObject> JSON_DELETED_SUBJECT_IDS =
             JsonFactory.newJsonObjectFieldDefinition("deletedSubjectIds", FieldType.REGULAR,
                     JsonSchemaVersion.V_2);
 
@@ -228,7 +228,13 @@ private static JsonObject deletedSubjectsToJson(final Map<Label, Collection<Subj
                 .collect(JsonCollectors.fieldsToObject());
     }
 
-    private static Map<Label, Collection<SubjectId>> deletedSubjectsFromJson(final JsonObject jsonObject) {
+    /**
+     * Transform the passed {@code jsonObject} to a map of deleted subjectIds as expected in the payload of this event.
+     *
+     * @param jsonObject the json object to read the modified subjects from.
+     * @return the map.
+     */
+    public static Map<Label, Collection<SubjectId>> deletedSubjectsFromJson(final JsonObject jsonObject) {
         final Map<Label, Collection<SubjectId>> map = jsonObject.stream()
                 .collect(Collectors.toMap(field -> Label.of(field.getKeyName()),
                         field -> field.getValue().asArray().stream()
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsModifiedPartially.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsModifiedPartially.java
index 3588333a549..a1c85153421 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsModifiedPartially.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsModifiedPartially.java
@@ -67,7 +67,7 @@ public final class SubjectsModifiedPartially extends AbstractPolicyActionEvent<S
      */
     public static final String TYPE = TYPE_PREFIX + NAME;
 
-    static final JsonFieldDefinition<JsonObject> JSON_MODIFIED_SUBJECTS =
+    public static final JsonFieldDefinition<JsonObject> JSON_MODIFIED_SUBJECTS =
             JsonFactory.newJsonObjectFieldDefinition("modifiedSubjects", FieldType.REGULAR, JsonSchemaVersion.V_2);
 
     private final Map<Label, Collection<Subject>> modifiedSubjects;
@@ -242,7 +242,13 @@ private static JsonObject modifiedSubjectsToJson(final Map<Label, Collection<Sub
                 .collect(JsonCollectors.fieldsToObject());
     }
 
-    private static Map<Label, Collection<Subject>> modifiedSubjectsFromJson(final JsonObject jsonObject) {
+    /**
+     * Transform the passed {@code jsonObject} to a map of modified subjects as expected in the payload of this event.
+     *
+     * @param jsonObject the json object to read the modified subjects from.
+     * @return the map.
+     */
+    public static Map<Label, Collection<Subject>> modifiedSubjectsFromJson(final JsonObject jsonObject) {
         final Map<Label, Collection<Subject>> map = jsonObject.stream()
                 .collect(Collectors.toMap(field -> Label.of(field.getKeyName()),
                         field -> subjectsFromJsonWithId(field.getValue().asObject()),
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/common/config/DefaultPolicyConfig.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/common/config/DefaultPolicyConfig.java
index fe125d9d2df..243773d0815 100644
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/common/config/DefaultPolicyConfig.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/common/config/DefaultPolicyConfig.java
@@ -23,7 +23,9 @@
 import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.ActivityCheckConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.DefaultActivityCheckConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.config.DefaultEventConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.DefaultSnapshotConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.config.EventConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.SnapshotConfig;
 import org.eclipse.ditto.internal.utils.persistentactors.cleanup.CleanupConfig;
 
@@ -40,6 +42,7 @@ public final class DefaultPolicyConfig implements PolicyConfig {
     private final SupervisorConfig supervisorConfig;
     private final ActivityCheckConfig activityCheckConfig;
     private final SnapshotConfig snapshotConfig;
+    private final EventConfig eventConfig;
     private final Duration policySubjectExpiryGranularity;
     private final Duration policySubjectDeletionAnnouncementGranularity;
     private final String subjectIdResolver;
@@ -50,6 +53,7 @@ private DefaultPolicyConfig(final ScopedConfig scopedConfig) {
         supervisorConfig = DefaultSupervisorConfig.of(scopedConfig);
         activityCheckConfig = DefaultActivityCheckConfig.of(scopedConfig);
         snapshotConfig = DefaultSnapshotConfig.of(scopedConfig);
+        eventConfig = DefaultEventConfig.of(scopedConfig);
         policySubjectExpiryGranularity =
                 scopedConfig.getNonNegativeDurationOrThrow(PolicyConfigValue.SUBJECT_EXPIRY_GRANULARITY);
         policySubjectDeletionAnnouncementGranularity =
@@ -89,6 +93,11 @@ public SnapshotConfig getSnapshotConfig() {
         return snapshotConfig;
     }
 
+    @Override
+    public EventConfig getEventConfig() {
+        return eventConfig;
+    }
+
     @Override
     public Duration getSubjectExpiryGranularity() {
         return policySubjectExpiryGranularity;
@@ -126,6 +135,7 @@ public boolean equals(final Object o) {
         return Objects.equals(supervisorConfig, that.supervisorConfig) &&
                 Objects.equals(activityCheckConfig, that.activityCheckConfig) &&
                 Objects.equals(snapshotConfig, that.snapshotConfig) &&
+                Objects.equals(eventConfig, that.eventConfig) &&
                 Objects.equals(policySubjectExpiryGranularity, that.policySubjectExpiryGranularity) &&
                 Objects.equals(policySubjectDeletionAnnouncementGranularity,
                         that.policySubjectDeletionAnnouncementGranularity) &&
@@ -136,9 +146,9 @@ public boolean equals(final Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(supervisorConfig, activityCheckConfig, snapshotConfig, policySubjectExpiryGranularity,
-                policySubjectDeletionAnnouncementGranularity, subjectIdResolver, policyAnnouncementConfig,
-                cleanupConfig);
+        return Objects.hash(supervisorConfig, activityCheckConfig, snapshotConfig, eventConfig,
+                policySubjectExpiryGranularity, policySubjectDeletionAnnouncementGranularity, subjectIdResolver,
+                policyAnnouncementConfig, cleanupConfig);
     }
 
     @Override
@@ -147,6 +157,7 @@ public String toString() {
                 " supervisorConfig=" + supervisorConfig +
                 ", activityCheckConfig=" + activityCheckConfig +
                 ", snapshotConfig=" + snapshotConfig +
+                ", eventConfig=" + eventConfig +
                 ", policySubjectExpiryGranularity=" + policySubjectExpiryGranularity +
                 ", policySubjectDeletionAnnouncementGranularity=" + policySubjectDeletionAnnouncementGranularity +
                 ", subjectIdResolver=" + subjectIdResolver +
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/common/config/PolicyConfig.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/common/config/PolicyConfig.java
index 83bc6fb910a..7c1c5755d26 100644
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/common/config/PolicyConfig.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/common/config/PolicyConfig.java
@@ -18,6 +18,7 @@
 
 import org.eclipse.ditto.base.service.config.supervision.WithSupervisorConfig;
 import org.eclipse.ditto.internal.utils.config.KnownConfigValue;
+import org.eclipse.ditto.internal.utils.persistence.mongo.config.EventConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.WithActivityCheckConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.WithSnapshotConfig;
 import org.eclipse.ditto.internal.utils.persistentactors.cleanup.WithCleanupConfig;
@@ -29,6 +30,13 @@
 public interface PolicyConfig extends WithSupervisorConfig, WithActivityCheckConfig, WithSnapshotConfig,
         WithCleanupConfig {
 
+    /**
+     * Returns the config of the policy event journal behaviour.
+     *
+     * @return the config.
+     */
+    EventConfig getEventConfig();
+
     /**
      * Returns the configuration to which duration the {@code expiry} of a {@code Policy Subject} should be rounded up
      * to.
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcement.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcement.java
index 4a92b139c3e..488d41efa20 100644
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcement.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcement.java
@@ -18,7 +18,10 @@
 import java.util.concurrent.CompletionStage;
 
 import org.eclipse.ditto.base.model.auth.AuthorizationContext;
+import org.eclipse.ditto.base.model.entity.id.WithEntityId;
+import org.eclipse.ditto.base.model.exceptions.DittoInternalErrorException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.commands.CommandToExceptionRegistry;
 import org.eclipse.ditto.json.JsonFactory;
@@ -34,6 +37,7 @@
 import org.eclipse.ditto.policies.model.PoliciesResourceType;
 import org.eclipse.ditto.policies.model.Policy;
 import org.eclipse.ditto.policies.model.PolicyEntry;
+import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.policies.model.ResourceKey;
 import org.eclipse.ditto.policies.model.enforcers.Enforcer;
 import org.eclipse.ditto.policies.model.signals.commands.PolicyCommand;
@@ -52,7 +56,7 @@
  * Authorizes {@link PolicyCommand}s and filters {@link PolicyCommandResponse}s.
  */
 public final class PolicyCommandEnforcement
-        extends AbstractEnforcementReloaded<PolicyCommand<?>, PolicyCommandResponse<?>> {
+        extends AbstractEnforcementReloaded<Signal<?>, PolicyCommandResponse<?>> {
 
     /**
      * Json fields that are always shown regardless of authorization.
@@ -61,37 +65,38 @@ public final class PolicyCommandEnforcement
             JsonFactory.newFieldSelector(Policy.JsonFields.ID);
 
     @Override
-    public CompletionStage<PolicyCommand<?>> authorizeSignal(final PolicyCommand<?> command,
+    public CompletionStage<Signal<?>> authorizeSignal(final Signal<?> signal,
             final PolicyEnforcer policyEnforcer) {
 
-        if (command.getCategory() == Command.Category.QUERY && !command.getDittoHeaders().isResponseRequired()) {
+        if (signal instanceof Command<?> command &&
+                command.getCategory() == Command.Category.QUERY && !command.getDittoHeaders().isResponseRequired()) {
             // ignore query command with response-required=false
             return CompletableFuture.completedStage(null);
         }
 
         final Enforcer enforcer = policyEnforcer.getEnforcer();
-        final var policyResourceKey = PoliciesResourceType.policyResource(command.getResourcePath());
-        final var authorizationContext = command.getDittoHeaders().getAuthorizationContext();
-        final PolicyCommand<?> authorizedCommand;
-        if (command instanceof CreatePolicy createPolicy) {
+        final var policyResourceKey = PoliciesResourceType.policyResource(signal.getResourcePath());
+        final var authorizationContext = signal.getDittoHeaders().getAuthorizationContext();
+        final Signal<?> authorizedCommand;
+        if (signal instanceof CreatePolicy createPolicy) {
             authorizedCommand = authorizeCreatePolicy(enforcer, createPolicy, policyResourceKey, authorizationContext);
-        } else if (command instanceof PolicyActionCommand) {
-            authorizedCommand = authorizeActionCommand(policyEnforcer, command, policyResourceKey,
-                    authorizationContext).orElseThrow(() -> errorForPolicyCommand(command));
-        } else if (command instanceof PolicyModifyCommand) {
+        } else if (signal instanceof PolicyActionCommand) {
+            authorizedCommand = authorizeActionCommand(policyEnforcer, signal, policyResourceKey,
+                    authorizationContext).orElseThrow(() -> errorForPolicyCommand(signal));
+        } else if (signal instanceof PolicyModifyCommand) {
             if (hasUnrestrictedWritePermission(enforcer, policyResourceKey, authorizationContext)) {
-                authorizedCommand = command;
+                authorizedCommand = signal;
             } else {
-                throw errorForPolicyCommand(command);
+                throw errorForPolicyCommand(signal);
             }
         } else {
             final String permission = Permission.READ;
             if (enforcer.hasPartialPermissions(policyResourceKey,
                     authorizationContext,
                     permission)) {
-                authorizedCommand = command;
+                authorizedCommand = signal;
             } else {
-                throw errorForPolicyCommand(command);
+                throw errorForPolicyCommand(signal);
             }
         }
 
@@ -112,8 +117,17 @@ private PolicyCommand<?> authorizeCreatePolicy(final Enforcer enforcer,
     }
 
     @Override
-    public CompletionStage<PolicyCommand<?>> authorizeSignalWithMissingEnforcer(final PolicyCommand<?> command) {
-        throw PolicyNotAccessibleException.newBuilder(command.getEntityId())
+    public CompletionStage<Signal<?>> authorizeSignalWithMissingEnforcer(final Signal<?> command) {
+        final PolicyId policyId;
+        if (command instanceof WithEntityId withEntityId) {
+            policyId = PolicyId.of(withEntityId.getEntityId());
+        } else {
+            LOGGER.warn("Processed signal which does not have an entityId: {}", command);
+            throw DittoInternalErrorException.newBuilder()
+                    .dittoHeaders(command.getDittoHeaders())
+                    .build();
+        }
+        throw PolicyNotAccessibleException.newBuilder(policyId)
                 .dittoHeaders(command.getDittoHeaders())
                 .build();
     }
@@ -143,7 +157,7 @@ public CompletionStage<PolicyCommandResponse<?>> filterResponse(final PolicyComm
     }
 
     @SuppressWarnings("unchecked")
-    private <T extends PolicyCommand<?>> Optional<T> authorizeActionCommand(
+    private <T extends Signal<?>> Optional<T> authorizeActionCommand(
             final PolicyEnforcer enforcer,
             final T command, final ResourceKey resourceKey, final AuthorizationContext authorizationContext) {
 
@@ -154,7 +168,7 @@ private <T extends PolicyCommand<?>> Optional<T> authorizeActionCommand(
         }
     }
 
-    private <T extends PolicyCommand<?>> Optional<T> authorizeEntryLevelAction(final Enforcer enforcer,
+    private <T extends Signal<?>> Optional<T> authorizeEntryLevelAction(final Enforcer enforcer,
             final T command, final ResourceKey resourceKey, final AuthorizationContext authorizationContext) {
         return enforcer.hasUnrestrictedPermissions(resourceKey, authorizationContext, Permission.EXECUTE) ?
                 Optional.of(command) : Optional.empty();
@@ -232,19 +246,32 @@ private JsonObject getJsonViewForPolicyQueryCommandResponse(final JsonObject res
     /**
      * Create error due to failing to execute a policy-command in the expected way.
      *
-     * @param policyCommand the command.
+     * @param policySignal the signal.
      * @return the error.
      */
-    private static DittoRuntimeException errorForPolicyCommand(final PolicyCommand<?> policyCommand) {
-        final CommandToExceptionRegistry<PolicyCommand<?>, DittoRuntimeException> registry;
-        if (policyCommand instanceof PolicyActionCommand) {
-            registry = PolicyCommandToActionsExceptionRegistry.getInstance();
-        } else if (policyCommand instanceof PolicyModifyCommand) {
-            registry = PolicyCommandToModifyExceptionRegistry.getInstance();
+    private static DittoRuntimeException errorForPolicyCommand(final Signal<?> policySignal) {
+
+        if (policySignal instanceof PolicyCommand<?> policyCommand) {
+            final CommandToExceptionRegistry<PolicyCommand<?>, DittoRuntimeException> registry;
+            if (policyCommand instanceof PolicyActionCommand) {
+                registry = PolicyCommandToActionsExceptionRegistry.getInstance();
+            } else if (policyCommand instanceof PolicyModifyCommand) {
+                registry = PolicyCommandToModifyExceptionRegistry.getInstance();
+            } else {
+                registry = PolicyCommandToAccessExceptionRegistry.getInstance();
+            }
+            return registry.exceptionFrom(policyCommand);
+        } else if (policySignal instanceof WithEntityId withEntityId) {
+            return PolicyNotAccessibleException.newBuilder(PolicyId.of(withEntityId.getEntityId()))
+                    .dittoHeaders(policySignal.getDittoHeaders())
+                    .build();
         } else {
-            registry = PolicyCommandToAccessExceptionRegistry.getInstance();
+            LOGGER.error("Received signal for which no DittoRuntimeException due to lack of access " +
+                    "could be determined: {}", policySignal);
+            return DittoInternalErrorException.newBuilder()
+                    .dittoHeaders(policySignal.getDittoHeaders())
+                    .build();
         }
-        return registry.exceptionFrom(policyCommand);
     }
 
     /**
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyEnforcerActor.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyEnforcerActor.java
index 4b96dd1a42c..8830ec46251 100644
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyEnforcerActor.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyEnforcerActor.java
@@ -37,7 +37,7 @@
  * {@link PolicyCommandEnforcement}.
  */
 public final class PolicyEnforcerActor extends
-        AbstractPolicyLoadingEnforcerActor<PolicyId, PolicyCommand<?>, PolicyCommandResponse<?>, PolicyCommandEnforcement> {
+        AbstractPolicyLoadingEnforcerActor<PolicyId, Signal<?>, PolicyCommandResponse<?>, PolicyCommandEnforcement> {
 
     private static final String ENFORCEMENT_DISPATCHER = "enforcement-dispatcher";
 
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
index a64f0c3bb52..51d580dfc28 100755
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.ditto.policies.service.persistence.actors;
 
+import java.time.Instant;
 import java.util.Set;
 import java.util.stream.StreamSupport;
 
@@ -26,6 +27,7 @@
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.ActivityCheckConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.SnapshotConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.persistentactors.AbstractPersistenceActor;
 import org.eclipse.ditto.internal.utils.persistentactors.commands.CommandStrategy;
 import org.eclipse.ditto.internal.utils.persistentactors.commands.DefaultContext;
@@ -36,6 +38,7 @@
 import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.policies.model.PolicyLifecycle;
 import org.eclipse.ditto.policies.model.Subjects;
+import org.eclipse.ditto.policies.model.signals.commands.exceptions.PolicyHistoryNotAccessibleException;
 import org.eclipse.ditto.policies.model.signals.commands.exceptions.PolicyNotAccessibleException;
 import org.eclipse.ditto.policies.model.signals.events.PolicyEvent;
 import org.eclipse.ditto.policies.service.common.config.DittoPoliciesConfig;
@@ -76,11 +79,12 @@ public final class PolicyPersistenceActor
 
     @SuppressWarnings("unused")
     private PolicyPersistenceActor(final PolicyId policyId,
+            final MongoReadJournal mongoReadJournal,
             final ActorRef pubSubMediator,
             final ActorRef announcementManager,
             final PolicyConfig policyConfig) {
 
-        super(policyId);
+        super(policyId, mongoReadJournal);
         this.pubSubMediator = pubSubMediator;
         this.announcementManager = announcementManager;
         this.policyConfig = policyConfig;
@@ -88,12 +92,13 @@ private PolicyPersistenceActor(final PolicyId policyId,
     }
 
     private PolicyPersistenceActor(final PolicyId policyId,
+            final MongoReadJournal mongoReadJournal,
             final ActorRef pubSubMediator,
             final ActorRef announcementManager,
             final ActorRef supervisor) {
 
         // not possible to call other constructor because "getContext()" is not available as argument of "this()"
-        super(policyId);
+        super(policyId, mongoReadJournal);
         this.pubSubMediator = pubSubMediator;
         this.announcementManager = announcementManager;
         this.supervisor = supervisor;
@@ -107,25 +112,30 @@ private PolicyPersistenceActor(final PolicyId policyId,
      * Creates Akka configuration object {@link Props} for this PolicyPersistenceActor.
      *
      * @param policyId the ID of the Policy this Actor manages.
+     * @param mongoReadJournal the ReadJournal used for gaining access to historical values of the policy.
      * @param pubSubMediator the PubSub mediator actor.
      * @param announcementManager manager of policy announcements.
      * @param policyConfig the policy config.
      * @return the Akka configuration Props object
      */
     public static Props props(final PolicyId policyId,
+            final MongoReadJournal mongoReadJournal,
             final ActorRef pubSubMediator,
             final ActorRef announcementManager,
             final PolicyConfig policyConfig) {
 
-        return Props.create(PolicyPersistenceActor.class, policyId, pubSubMediator, announcementManager, policyConfig);
+        return Props.create(PolicyPersistenceActor.class, policyId, mongoReadJournal, pubSubMediator,
+                announcementManager, policyConfig);
     }
 
     static Props propsForTests(final PolicyId policyId,
+            final MongoReadJournal mongoReadJournal,
             final ActorRef pubSubMediator,
             final ActorRef announcementManager,
             final ActorSystem actorSystem) {
 
-        return Props.create(PolicyPersistenceActor.class, policyId, pubSubMediator, announcementManager,
+        return Props.create(PolicyPersistenceActor.class, policyId, mongoReadJournal, pubSubMediator,
+                announcementManager,
                 actorSystem.deadLetters());
     }
 
@@ -189,6 +199,16 @@ protected DittoRuntimeExceptionBuilder<?> newNotAccessibleExceptionBuilder() {
         return PolicyNotAccessibleException.newBuilder(entityId);
     }
 
+    @Override
+    protected DittoRuntimeExceptionBuilder<?> newHistoryNotAccessibleExceptionBuilder(final long revision) {
+        return PolicyHistoryNotAccessibleException.newBuilder(entityId, revision);
+    }
+
+    @Override
+    protected DittoRuntimeExceptionBuilder<?> newHistoryNotAccessibleExceptionBuilder(final Instant timestamp) {
+        return PolicyHistoryNotAccessibleException.newBuilder(entityId, timestamp);
+    }
+
     @Override
     protected void publishEvent(@Nullable final Policy previousEntity, final PolicyEvent<?> event) {
 
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicySupervisorActor.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicySupervisorActor.java
index bf5869071e2..b089a5ff9f5 100755
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicySupervisorActor.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicySupervisorActor.java
@@ -22,6 +22,7 @@
 import org.eclipse.ditto.base.service.config.supervision.ExponentialBackOffConfig;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.internal.utils.namespaces.BlockedNamespaces;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.persistentactors.AbstractPersistenceSupervisor;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedPub;
 import org.eclipse.ditto.policies.enforcement.PolicyEnforcerProvider;
@@ -58,9 +59,10 @@ public final class PolicySupervisorActor extends AbstractPersistenceSupervisor<P
     private PolicySupervisorActor(final ActorRef pubSubMediator,
             final DistributedPub<PolicyAnnouncement<?>> policyAnnouncementPub,
             @Nullable final BlockedNamespaces blockedNamespaces,
-            final PolicyEnforcerProvider policyEnforcerProvider) {
+            final PolicyEnforcerProvider policyEnforcerProvider,
+            final MongoReadJournal mongoReadJournal) {
 
-        super(blockedNamespaces, DEFAULT_LOCAL_ASK_TIMEOUT);
+        super(blockedNamespaces, mongoReadJournal, DEFAULT_LOCAL_ASK_TIMEOUT);
         this.policyEnforcerProvider = policyEnforcerProvider;
         this.pubSubMediator = pubSubMediator;
         final DittoPoliciesConfig policiesConfig = DittoPoliciesConfig.of(
@@ -88,15 +90,17 @@ private PolicySupervisorActor(final ActorRef pubSubMediator,
      * @param policyAnnouncementPub publisher interface of policy announcements.
      * @param blockedNamespaces the blocked namespaces functionality to retrieve/subscribe for blocked namespaces.
      * @param policyEnforcerProvider used to load the policy enforcer to authorize commands.
+     * @param mongoReadJournal the ReadJournal used for gaining access to historical values of the policy.
      * @return the {@link Props} to create this actor.
      */
     public static Props props(final ActorRef pubSubMediator,
             final DistributedPub<PolicyAnnouncement<?>> policyAnnouncementPub,
             @Nullable final BlockedNamespaces blockedNamespaces,
-            final PolicyEnforcerProvider policyEnforcerProvider) {
+            final PolicyEnforcerProvider policyEnforcerProvider,
+            final MongoReadJournal mongoReadJournal) {
 
-        return Props.create(PolicySupervisorActor.class, () -> new PolicySupervisorActor(pubSubMediator,
-                policyAnnouncementPub, blockedNamespaces, policyEnforcerProvider));
+        return Props.create(PolicySupervisorActor.class, pubSubMediator,
+                policyAnnouncementPub, blockedNamespaces, policyEnforcerProvider, mongoReadJournal);
     }
 
     @Override
@@ -106,7 +110,8 @@ protected PolicyId getEntityId() throws Exception {
 
     @Override
     protected Props getPersistenceActorProps(final PolicyId entityId) {
-        return PolicyPersistenceActor.props(entityId, pubSubMediator, announcementManager, policyConfig);
+        return PolicyPersistenceActor.props(entityId, mongoReadJournal, pubSubMediator, announcementManager,
+                policyConfig);
     }
 
     @Override
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/events/PolicyEventStrategies.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/events/PolicyEventStrategies.java
index 10afaeddbec..18fae3502a5 100755
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/events/PolicyEventStrategies.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/events/PolicyEventStrategies.java
@@ -38,7 +38,7 @@
 import org.eclipse.ditto.policies.model.signals.events.SubjectsModifiedPartially;
 
 /**
- * Holds all {@link org.eclipse.ditto.policies.model.signals.events.PolicyEvent} strategies.
+ * Holds all {@link PolicyEvent} strategies.
  */
 public final class PolicyEventStrategies extends AbstractEventStrategies<PolicyEvent<?>, Policy> {
 
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/serializer/AbstractPolicyMongoEventAdapter.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/serializer/AbstractPolicyMongoEventAdapter.java
index 822b0926561..b296cdb1a62 100644
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/serializer/AbstractPolicyMongoEventAdapter.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/serializer/AbstractPolicyMongoEventAdapter.java
@@ -13,16 +13,17 @@
 
 package org.eclipse.ditto.policies.service.persistence.serializer;
 
-import javax.annotation.Nullable;
-
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonFieldDefinition;
-import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
-import org.eclipse.ditto.internal.utils.persistence.mongo.AbstractMongoEventAdapter;
 import org.eclipse.ditto.base.model.signals.events.GlobalEventRegistry;
+import org.eclipse.ditto.base.service.config.DittoServiceConfig;
+import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.AbstractMongoEventAdapter;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.policies.model.signals.events.PolicyEvent;
+import org.eclipse.ditto.policies.service.common.config.DefaultPolicyConfig;
 
 import akka.actor.ExtendedActorSystem;
 
@@ -36,8 +37,10 @@ public abstract class AbstractPolicyMongoEventAdapter extends AbstractMongoEvent
             JsonFactory.newJsonObjectFieldDefinition("policy/entries", FieldType.SPECIAL,
                     JsonSchemaVersion.V_2);
 
-    protected AbstractPolicyMongoEventAdapter(@Nullable final ExtendedActorSystem system) {
-        super(system, GlobalEventRegistry.getInstance());
+    protected AbstractPolicyMongoEventAdapter(final ExtendedActorSystem system) {
+        super(system, GlobalEventRegistry.getInstance(), DefaultPolicyConfig.of(
+                        DittoServiceConfig.of(DefaultScopedConfig.dittoScoped(system.settings().config()), "policies"))
+                .getEventConfig());
     }
 
 }
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/serializer/DefaultPolicyMongoEventAdapter.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/serializer/DefaultPolicyMongoEventAdapter.java
index 59a0c3a1b19..ec5fec64cd5 100644
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/serializer/DefaultPolicyMongoEventAdapter.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/serializer/DefaultPolicyMongoEventAdapter.java
@@ -12,8 +12,6 @@
  */
 package org.eclipse.ditto.policies.service.persistence.serializer;
 
-import javax.annotation.Nullable;
-
 import org.eclipse.ditto.policies.model.signals.events.PolicyEvent;
 
 import akka.actor.ExtendedActorSystem;
@@ -24,7 +22,7 @@
  */
 public final class DefaultPolicyMongoEventAdapter extends AbstractPolicyMongoEventAdapter {
 
-    public DefaultPolicyMongoEventAdapter(@Nullable final ExtendedActorSystem system) {
+    public DefaultPolicyMongoEventAdapter(final ExtendedActorSystem system) {
         super(system);
     }
 
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/starter/PoliciesRootActor.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/starter/PoliciesRootActor.java
index 5db4b1f3105..f1ea2413c21 100755
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/starter/PoliciesRootActor.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/starter/PoliciesRootActor.java
@@ -88,15 +88,16 @@ private PoliciesRootActor(final PoliciesConfig policiesConfig, final ActorRef pu
                 BlockedNamespacesUpdater.ACTOR_NAME, blockedNamespacesUpdaterProps);
 
         final PolicyEnforcerProvider policyEnforcerProvider = PolicyEnforcerProviderExtension.get(actorSystem).getPolicyEnforcerProvider();
+        final var mongoReadJournal = MongoReadJournal.newInstance(actorSystem);
+
         final var policySupervisorProps =
                 getPolicySupervisorActorProps(pubSubMediator, policyAnnouncementPub, blockedNamespaces,
-                        policyEnforcerProvider);
+                        policyEnforcerProvider, mongoReadJournal);
 
         final ActorRef policiesShardRegion =
                 ShardRegionCreator.start(actorSystem, PoliciesMessagingConstants.SHARD_REGION, policySupervisorProps,
                         policiesConfig.getClusterConfig().getNumberOfShards(), CLUSTER_ROLE);
 
-        final var mongoReadJournal = MongoReadJournal.newInstance(actorSystem);
         startClusterSingletonActor(
                 PersistencePingActor.props(policiesShardRegion, policiesConfig.getPingConfig(), mongoReadJournal),
                 PersistencePingActor.ACTOR_NAME);
@@ -133,10 +134,11 @@ private PoliciesRootActor(final PoliciesConfig policiesConfig, final ActorRef pu
     private static Props getPolicySupervisorActorProps(final ActorRef pubSubMediator,
             final DistributedPub<PolicyAnnouncement<?>> policyAnnouncementPub,
             final BlockedNamespaces blockedNamespaces,
-            final PolicyEnforcerProvider policyEnforcerProvider) {
+            final PolicyEnforcerProvider policyEnforcerProvider,
+            final MongoReadJournal mongoReadJournal) {
 
         return PolicySupervisorActor.props(pubSubMediator, policyAnnouncementPub, blockedNamespaces,
-                policyEnforcerProvider);
+                policyEnforcerProvider, mongoReadJournal);
     }
 
     /**
diff --git a/policies/service/src/main/resources/policies.conf b/policies/service/src/main/resources/policies.conf
index 0023efa356b..0f1a79e8065 100755
--- a/policies/service/src/main/resources/policies.conf
+++ b/policies/service/src/main/resources/policies.conf
@@ -65,6 +65,16 @@ ditto {
         threshold = ${?POLICY_SNAPSHOT_THRESHOLD} # may be overridden with this environment variable
       }
 
+      event {
+        # define the DittoHeaders to persist when persisting events to the journal
+        # those can e.g. be retrieved as additional "audit log" information when accessing a historical policy revision
+        historical-headers-to-persist = [
+          #"ditto-originator"  # who (user-subject/connection-pre-auth-subject) issued the event
+          #"correlation-id"
+        ]
+        historical-headers-to-persist = ${?POLICY_EVENT_HISTORICAL_HEADERS_TO_PERSIST}
+      }
+
       supervisor {
         exponential-backoff {
           min = 1s
@@ -102,27 +112,62 @@ ditto {
       }
 
       cleanup {
+        # enabled configures whether background cleanup is enabled or not
+        # If enabled, stale "snapshot" and "journal" entries will be cleaned up from the MongoDB by a background process
         enabled = true
         enabled = ${?CLEANUP_ENABLED}
 
+        # history-retention-duration configures the duration of how long to "keep" events and snapshots before being
+        # allowed to remove them in scope of cleanup.
+        # If this e.g. is set to 30d - then effectively an event history of 30 days would be available via the read
+        # journal.
+        history-retention-duration = 0d
+        history-retention-duration = ${?CLEANUP_HISTORY_RETENTION_DURATION}
+
+        # quiet-period defines how long to stay in a state where the background cleanup is not yet started
+        # Applies after:
+        # - starting the service
+        # - each "completed" background cleanup run (all entities were cleaned up)
         quiet-period = 5m
         quiet-period = ${?CLEANUP_QUIET_PERIOD}
 
+        # interval configures how often a "credit decision" is made.
+        # The background cleanup works with a credit system and does only generate new "cleanup credits" if the MongoDB
+        # currently has capacity to do cleanups.
         interval = 10s
         interval = ${?CLEANUP_INTERVAL}
 
+        # timer-threshold configures the maximum database latency to give out credit for cleanup actions.
+        # If write operations to the MongoDB within the last `interval` had a `max` value greater to the configured
+        # threshold, no new cleanup credits will be issued for the next `interval`.
+        # Which throttles cleanup when MongoDB is currently under heavy (write) load.
         timer-threshold = 150ms
         timer-threshold = ${?CLEANUP_TIMER_THRESHOLD}
 
+        # credits-per-batch configures how many "cleanup credits" should be generated per `interval` as long as the
+        # write operations to the MongoDB are less than the configured `timer-threshold`.
+        # Limits the rate of cleanup actions to this many per credit decision interval.
+        # One credit means that the "journal" and "snapshot" entries of one entity are cleaned up each `interval`.
         credits-per-batch = 3
         credits-per-batch = ${?CLEANUP_CREDITS_PER_BATCH}
 
+        # reads-per-query configures the number of snapshots to scan per MongoDB query.
+        # Configuring this to high values will reduce the need to query MongoDB too often - it should however be aligned
+        # with the amount of "cleanup credits" issued per `interval` - in order to avoid long running queries.
         reads-per-query = 100
         reads-per-query = ${?CLEANUP_READS_PER_QUERY}
 
+        # writes-per-credit configures the number of documents to delete for each credit.
+        # If for example one entity would have 1000 journal entries to cleanup, a `writes-per-credit` of 100 would lead
+        # to 10 delete operations performed against MongoDB.
         writes-per-credit = 100
         writes-per-credit = ${?CLEANUP_WRITES_PER_CREDIT}
 
+        # delete-final-deleted-snapshot configures whether for a deleted entity, the final snapshot (containing the
+        # "deleted" information) should be deleted or not.
+        # If the final snapshot is not deleted, re-creating the entity will cause that the recreated entity starts with
+        # a revision number 1 higher than the previously deleted entity. If the final snapshot is deleted as well,
+        # recreation of an entity with the same ID will lead to revisionNumber=1 after its recreation.
         delete-final-deleted-snapshot = false
         delete-final-deleted-snapshot = ${?CLEANUP_DELETE_FINAL_DELETED_SNAPSHOT}
       }
@@ -219,6 +264,18 @@ akka-contrib-mongodb-persistence-policies-journal {
   }
 }
 
+akka-contrib-mongodb-persistence-policies-journal-read {
+  class = "akka.contrib.persistence.mongodb.MongoReadJournal"
+  plugin-dispatcher = "policy-journal-persistence-dispatcher"
+
+  overrides {
+    journal-collection = "policies_journal"
+    journal-index = "policies_journal_index"
+    realtime-collection = "policies_realtime"
+    metadata-collection = "policies_metadata"
+  }
+}
+
 akka-contrib-mongodb-persistence-policies-snapshots {
   class = "akka.contrib.persistence.mongodb.MongoSnapshots"
   plugin-dispatcher = "policy-snaps-persistence-dispatcher"
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcementTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcementTest.java
index 2f367ad8b55..a3a48efb88b 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcementTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcementTest.java
@@ -42,6 +42,7 @@
 import org.eclipse.ditto.base.service.actors.ShutdownBehaviour;
 import org.eclipse.ditto.base.service.config.supervision.ExponentialBackOffConfig;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.persistentactors.AbstractPersistenceSupervisor;
 import org.eclipse.ditto.internal.utils.tracing.DittoTracingInitResource;
 import org.eclipse.ditto.json.JsonObject;
@@ -785,7 +786,7 @@ private class MockPolicyPersistenceSupervisor
 
         private MockPolicyPersistenceSupervisor(final ActorRef pubSubMediator, final ActorRef policyPersistenceActor,
                 final PolicyEnforcerProvider policyEnforcerProvider) {
-            super(policyPersistenceActor, null, null, Duration.ofSeconds(5));
+            super(policyPersistenceActor, null, null, Mockito.mock(MongoReadJournal.class), Duration.ofSeconds(5));
             this.pubSubMediator = pubSubMediator;
             this.policyEnforcerProvider = policyEnforcerProvider;
         }
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActorSnapshottingTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActorSnapshottingTest.java
index dc0369b511f..10ccdd21ee3 100755
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActorSnapshottingTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActorSnapshottingTest.java
@@ -32,6 +32,7 @@
 import org.eclipse.ditto.base.model.signals.events.AbstractEventsourcedEvent;
 import org.eclipse.ditto.base.model.signals.events.EventsourcedEvent;
 import org.eclipse.ditto.internal.utils.persistence.mongo.DittoBsonJson;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedPub;
 import org.eclipse.ditto.internal.utils.test.Retry;
 import org.eclipse.ditto.internal.utils.tracing.DittoTracingInitResource;
@@ -415,7 +416,8 @@ private static void assertPolicyInJournal(final Policy actualPolicy, final Polic
     }
 
     private ActorRef createPersistenceActorFor(final PolicyId policyId) {
-        final Props props = PolicyPersistenceActor.propsForTests(policyId, pubSubMediator, actorSystem.deadLetters(),
+        final Props props = PolicyPersistenceActor.propsForTests(policyId, Mockito.mock(MongoReadJournal.class),
+                pubSubMediator, actorSystem.deadLetters(),
                 actorSystem);
         return actorSystem.actorOf(props);
     }
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActorTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActorTest.java
index 655ef28f243..01a541a78f8 100755
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActorTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActorTest.java
@@ -48,6 +48,7 @@
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.internal.utils.cluster.ShardRegionExtractor;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.persistentactors.AbstractPersistenceActor;
 import org.eclipse.ditto.internal.utils.persistentactors.AbstractPersistenceSupervisor;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedPub;
@@ -1389,7 +1390,8 @@ public void ensureExpiredSubjectIsRemovedDuringRecovery() throws InterruptedExce
                         ClusterShardingSettings.apply(actorSystem).withRole("policies");
                 final var box = new AtomicReference<ActorRef>();
                 final ActorRef announcementManager = createAnnouncementManager(policyId, box::get);
-                final Props props = PolicyPersistenceActor.propsForTests(policyId, pubSubMediator, announcementManager,
+                final Props props = PolicyPersistenceActor.propsForTests(policyId, Mockito.mock(MongoReadJournal.class),
+                        pubSubMediator, announcementManager,
                         actorSystem);
                 final Cluster cluster = Cluster.get(actorSystem);
                 cluster.join(cluster.selfAddress());
@@ -1640,7 +1642,8 @@ public void checkForActivityOfNonexistentPolicy() {
                 final var box = new AtomicReference<ActorRef>();
                 final ActorRef announcementManager = createAnnouncementManager(policyId, box::get);
                 final Props persistentActorProps =
-                        PolicyPersistenceActor.propsForTests(policyId, pubSubMediator, announcementManager, actorSystem);
+                        PolicyPersistenceActor.propsForTests(policyId, Mockito.mock(MongoReadJournal.class),
+                                pubSubMediator, announcementManager, actorSystem);
 
                 final TestProbe errorsProbe = TestProbe.apply(actorSystem);
 
@@ -1755,7 +1758,8 @@ private ActorRef createPersistenceActorFor(final TestKit testKit, final Policy p
     private ActorRef createPersistenceActorFor(final TestKit testKit, final PolicyId policyId) {
         final var box = new AtomicReference<ActorRef>();
         final ActorRef announcementManager = createAnnouncementManager(policyId, box::get);
-        final Props props = PolicyPersistenceActor.propsForTests(policyId, pubSubMediator, announcementManager,
+        final Props props = PolicyPersistenceActor.propsForTests(policyId, Mockito.mock(MongoReadJournal.class),
+                pubSubMediator, announcementManager,
                 actorSystem);
         final var persistenceActor = testKit.watch(testKit.childActorOf(props));
         box.set(persistenceActor);
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceOperationsActorIT.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceOperationsActorIT.java
index 542a6ab07ea..8ee2759eec5 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceOperationsActorIT.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceOperationsActorIT.java
@@ -28,6 +28,7 @@
 import org.eclipse.ditto.base.model.namespaces.signals.commands.PurgeNamespace;
 import org.eclipse.ditto.internal.utils.persistence.mongo.MongoClientWrapper;
 import org.eclipse.ditto.internal.utils.persistence.mongo.ops.eventsource.MongoEventSourceITAssertions;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.persistence.operations.EntityPersistenceOperations;
 import org.eclipse.ditto.internal.utils.persistence.operations.NamespacePersistenceOperations;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedPub;
@@ -236,9 +237,8 @@ private ActorRef startActorUnderTest(final ActorSystem actorSystem, final ActorR
     @Override
     protected ActorRef startEntityActor(final ActorSystem system, final ActorRef pubSubMediator, final PolicyId id) {
         final Props props =
-                PolicySupervisorActor.props(pubSubMediator, Mockito.mock(DistributedPub.class), null, Mockito.mock(
-                        PolicyEnforcerProvider.class));
-
+                PolicySupervisorActor.props(pubSubMediator, Mockito.mock(DistributedPub.class), null,
+                        Mockito.mock(PolicyEnforcerProvider.class), Mockito.mock(MongoReadJournal.class));
         return system.actorOf(props, id.toString());
     }
 
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicySupervisorActorTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicySupervisorActorTest.java
index 252bf13c47c..12f659dcd31 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicySupervisorActorTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/PolicySupervisorActorTest.java
@@ -20,6 +20,7 @@
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.internal.utils.cluster.StopShardedActor;
 import org.eclipse.ditto.internal.utils.namespaces.BlockedNamespaces;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedPub;
 import org.eclipse.ditto.internal.utils.tracing.DittoTracingInitResource;
 import org.eclipse.ditto.policies.enforcement.PolicyEnforcer;
@@ -35,6 +36,7 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 
 import akka.stream.Attributes;
 import akka.testkit.TestProbe;
@@ -80,7 +82,8 @@ public void setup() {
     public void stopNonexistentPolicy() {
         new TestKit(actorSystem) {{
             final PolicyId policyId = PolicyId.of("test.ns", "stopNonexistentPolicy");
-            final var props = PolicySupervisorActor.props(pubSubMediator, pub, blockedNamespaces, policyEnforcerProvider);
+            final var props = PolicySupervisorActor.props(pubSubMediator, pub, blockedNamespaces,
+                    policyEnforcerProvider, Mockito.mock(MongoReadJournal.class));
             final var underTest = watch(childActorOf(props, policyId.toString()));
             underTest.tell(new StopShardedActor(), getRef());
             expectTerminated(underTest);
@@ -91,7 +94,8 @@ public void stopNonexistentPolicy() {
     public void stopAfterRetrievingNonexistentPolicy() {
         new TestKit(actorSystem) {{
             final PolicyId policyId = PolicyId.of("test.ns", "retrieveNonexistentPolicy");
-            final var props = PolicySupervisorActor.props(pubSubMediator, pub, blockedNamespaces, policyEnforcerProvider);
+            final var props = PolicySupervisorActor.props(pubSubMediator, pub, blockedNamespaces,
+                    policyEnforcerProvider, Mockito.mock(MongoReadJournal.class));
             final var underTest = watch(childActorOf(props, policyId.toString()));
             final var probe = TestProbe.apply(actorSystem);
             final var retrievePolicy = RetrievePolicy.of(policyId, DittoHeaders.empty());
@@ -111,7 +115,8 @@ public void stopAfterRetrievingExistingPolicy() {
             {
                 final var policy = createPolicyWithRandomId();
                 final var policyId = policy.getEntityId().orElseThrow();
-                final var props = PolicySupervisorActor.props(pubSubMediator, pub, blockedNamespaces, policyEnforcerProvider);
+                final var props = PolicySupervisorActor.props(pubSubMediator, pub, blockedNamespaces,
+                        policyEnforcerProvider, Mockito.mock(MongoReadJournal.class));
                 final var underTest = watch(childActorOf(props, policyId.toString()));
                 final var probe = TestProbe.apply(actorSystem);
 
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/starter/PoliciesServiceGlobalCommandRegistryTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/starter/PoliciesServiceGlobalCommandRegistryTest.java
index 3360e4699d1..e2c9f1beb87 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/starter/PoliciesServiceGlobalCommandRegistryTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/starter/PoliciesServiceGlobalCommandRegistryTest.java
@@ -17,6 +17,7 @@
 import org.eclipse.ditto.base.api.devops.signals.commands.ExecutePiggybackCommand;
 import org.eclipse.ditto.base.api.persistence.cleanup.CleanupPersistence;
 import org.eclipse.ditto.base.model.namespaces.signals.commands.PurgeNamespace;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
 import org.eclipse.ditto.base.service.cluster.ModifySplitBrainResolver;
 import org.eclipse.ditto.internal.models.streaming.SudoStreamPids;
 import org.eclipse.ditto.internal.utils.health.RetrieveHealth;
@@ -47,7 +48,8 @@ public PoliciesServiceGlobalCommandRegistryTest() {
                 PurgeEntities.class,
                 PublishSignal.class,
                 ModifyPolicyImports.class,
-                ModifySplitBrainResolver.class
+                ModifySplitBrainResolver.class,
+                SubscribeForPersistedEvents.class
         );
     }
 }
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/starter/PoliciesServiceGlobalEventRegistryTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/starter/PoliciesServiceGlobalEventRegistryTest.java
index a1bcd6a5385..2d73db04b1d 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/starter/PoliciesServiceGlobalEventRegistryTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/starter/PoliciesServiceGlobalEventRegistryTest.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.ditto.policies.service.starter;
 
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionComplete;
 import org.eclipse.ditto.internal.utils.persistentactors.EmptyEvent;
 import org.eclipse.ditto.internal.utils.test.GlobalEventRegistryTestCases;
 import org.eclipse.ditto.policies.model.signals.events.ResourceDeleted;
@@ -21,7 +22,8 @@ public final class PoliciesServiceGlobalEventRegistryTest extends GlobalEventReg
     public PoliciesServiceGlobalEventRegistryTest() {
         super(
                 ResourceDeleted.class,
-                EmptyEvent.class
+                EmptyEvent.class,
+                StreamingSubscriptionComplete.class
         );
     }
 
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/ImmutablePayload.java b/protocol/src/main/java/org/eclipse/ditto/protocol/ImmutablePayload.java
index 291c49ca3e3..fa41e6de4f7 100755
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/ImmutablePayload.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/ImmutablePayload.java
@@ -244,7 +244,7 @@ public PayloadBuilder withPath(@Nullable final JsonPointer path) {
         }
 
         @Override
-        public ImmutablePayloadBuilder withValue(final JsonValue value) {
+        public ImmutablePayloadBuilder withValue(@Nullable final JsonValue value) {
             this.value = value;
             return this;
         }
@@ -280,14 +280,14 @@ public ImmutablePayloadBuilder withMetadata(@Nullable final Metadata metadata) {
         }
 
         @Override
-        public ImmutablePayloadBuilder withFields(final JsonFieldSelector fields) {
+        public ImmutablePayloadBuilder withFields(@Nullable final JsonFieldSelector fields) {
             this.fields = fields;
             return this;
         }
 
         @Override
-        public ImmutablePayloadBuilder withFields(final String fields) {
-            this.fields = JsonFieldSelector.newInstance(fields);
+        public ImmutablePayloadBuilder withFields(@Nullable final String fields) {
+            this.fields = null != fields ? JsonFieldSelector.newInstance(fields) : null;
             return this;
         }
 
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/ImmutableTopicPath.java b/protocol/src/main/java/org/eclipse/ditto/protocol/ImmutableTopicPath.java
index 65b193e07e6..8bcc89c638d 100755
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/ImmutableTopicPath.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/ImmutableTopicPath.java
@@ -30,6 +30,7 @@
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.NotThreadSafe;
 
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonKey;
 import org.eclipse.ditto.json.JsonPointer;
@@ -48,6 +49,7 @@ final class ImmutableTopicPath implements TopicPath {
     private final Criterion criterion;
     @Nullable private final Action action;
     @Nullable private final SearchAction searchAction;
+    @Nullable private final StreamingAction streamingAction;
     @Nullable private final String subject;
 
     private ImmutableTopicPath(final Builder builder) {
@@ -58,6 +60,7 @@ private ImmutableTopicPath(final Builder builder) {
         criterion = builder.criterion;
         action = builder.action;
         searchAction = builder.searchAction;
+        streamingAction = builder.streamingAction;
         subject = builder.subject;
     }
 
@@ -139,6 +142,11 @@ public Optional<SearchAction> getSearchAction() {
         return Optional.ofNullable(searchAction);
     }
 
+    @Override
+    public Optional<StreamingAction> getStreamingAction() {
+        return Optional.ofNullable(streamingAction);
+    }
+
     @Override
     public Optional<String> getSubject() {
         return Optional.ofNullable(subject);
@@ -159,6 +167,7 @@ public String getPath() {
                 .add(criterion.getName())
                 .add(getStringOrNull(action))
                 .add(getStringOrNull(searchAction))
+                .add(getStringOrNull(streamingAction))
                 .add(getStringOrNull(subject))
                 .build();
         return pathPartStream.filter(Objects::nonNull).collect(Collectors.joining(PATH_DELIMITER));
@@ -212,12 +221,14 @@ public boolean equals(final Object o) {
                 criterion == that.criterion &&
                 Objects.equals(action, that.action) &&
                 Objects.equals(searchAction, that.searchAction) &&
+                Objects.equals(streamingAction, that.streamingAction) &&
                 Objects.equals(subject, that.subject);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(namespace, name, group, channel, criterion, action, searchAction, subject);
+        return Objects.hash(namespace, name, group, channel, criterion, action, searchAction, streamingAction,
+                subject);
     }
 
     @Override
@@ -230,6 +241,7 @@ public String toString() {
                 ", criterion=" + criterion +
                 ", action=" + action +
                 ", searchAction=" + searchAction +
+                ", streamingAction=" + streamingAction +
                 ", subject=" + subject +
                 ", path=" + getPath() +
                 "]";
@@ -241,7 +253,8 @@ public String toString() {
     @NotThreadSafe
     private static final class Builder
             implements TopicPathBuilder, MessagesTopicPathBuilder, EventsTopicPathBuilder, CommandsTopicPathBuilder,
-            AcknowledgementTopicPathBuilder, SearchTopicPathBuilder, AnnouncementsTopicPathBuilder {
+            AcknowledgementTopicPathBuilder, SearchTopicPathBuilder, AnnouncementsTopicPathBuilder,
+            StreamingTopicPathBuilder {
 
         private final String namespace;
         private final String name;
@@ -251,6 +264,7 @@ private static final class Builder
         private Criterion criterion;
         @Nullable private Action action;
         @Nullable private SearchAction searchAction;
+        @Nullable private StreamingAction streamingAction;
         @Nullable private String subject;
 
         private Builder(final String namespace, final String name) {
@@ -261,6 +275,7 @@ private Builder(final String namespace, final String name) {
             criterion = null;
             action = null;
             searchAction = null;
+            streamingAction = null;
             subject = null;
         }
 
@@ -318,6 +333,12 @@ public AnnouncementsTopicPathBuilder announcements() {
             return this;
         }
 
+        @Override
+        public StreamingTopicPathBuilder streaming() {
+            criterion = Criterion.STREAMING;
+            return this;
+        }
+
         @Override
         public EventsTopicPathBuilder events() {
             criterion = Criterion.EVENTS;
@@ -378,45 +399,83 @@ public TopicPathBuildable subscribe() {
             return this;
         }
 
+        @Override
+        public TopicPathBuildable subscribe(final String subscribingCommandName) {
+            if (subscribingCommandName.equals(SubscribeForPersistedEvents.NAME)) {
+                streamingAction = StreamingAction.SUBSCRIBE_FOR_PERSISTED_EVENTS;
+            } else {
+                throw UnknownCommandException.newBuilder(subscribingCommandName).build();
+            }
+            return this;
+        }
+
         @Override
         public TopicPathBuildable cancel() {
-            searchAction = SearchAction.CANCEL;
+            if (criterion == Criterion.SEARCH) {
+                searchAction = SearchAction.CANCEL;
+            } else if (criterion == Criterion.STREAMING) {
+                streamingAction = StreamingAction.CANCEL;
+            }
             return this;
         }
 
         @Override
         public TopicPathBuildable request() {
-            searchAction = SearchAction.REQUEST;
+            if (criterion == Criterion.SEARCH) {
+                searchAction = SearchAction.REQUEST;
+            } else if (criterion == Criterion.STREAMING) {
+                streamingAction = StreamingAction.REQUEST;
+            }
             return this;
         }
 
         @Override
         public TopicPathBuildable complete() {
-            searchAction = SearchAction.COMPLETE;
+            if (criterion == Criterion.SEARCH) {
+                searchAction = SearchAction.COMPLETE;
+            } else if (criterion == Criterion.STREAMING) {
+                streamingAction = StreamingAction.COMPLETE;
+            }
             return this;
         }
 
         @Override
         public TopicPathBuildable failed() {
-            searchAction = SearchAction.FAILED;
+            if (criterion == Criterion.SEARCH) {
+                searchAction = SearchAction.FAILED;
+            } else if (criterion == Criterion.STREAMING) {
+                streamingAction = StreamingAction.FAILED;
+            }
             return this;
         }
 
         @Override
         public TopicPathBuildable hasNext() {
-            searchAction = SearchAction.NEXT;
+            if (criterion == Criterion.SEARCH) {
+                searchAction = SearchAction.NEXT;
+            } else if (criterion == Criterion.STREAMING) {
+                streamingAction = StreamingAction.NEXT;
+            }
             return this;
         }
 
         @Override
         public EventsTopicPathBuilder generated() {
-            searchAction = SearchAction.GENERATED;
+            if (criterion == Criterion.SEARCH) {
+                searchAction = SearchAction.GENERATED;
+            } else if (criterion == Criterion.STREAMING) {
+                streamingAction = StreamingAction.GENERATED;
+            }
             return this;
         }
 
         @Override
         public TopicPathBuildable error() {
-            searchAction = SearchAction.ERROR;
+            if (criterion == Criterion.SEARCH) {
+                searchAction = SearchAction.ERROR;
+            } else if (criterion == Criterion.STREAMING) {
+                streamingAction = StreamingAction.ERROR;
+            }
             return this;
         }
 
@@ -521,6 +580,9 @@ public ImmutableTopicPath get() {
                 case SEARCH:
                     topicPathBuilder.searchAction = tryToGetSearchActionForName(tryToGetSearchActionName());
                     break;
+                case STREAMING:
+                    topicPathBuilder.streamingAction = tryToGetStreamingActionForName(tryToGetSearchActionName());
+                    break;
                 case ERRORS:
                     break;
                 case MESSAGES:
@@ -656,6 +718,13 @@ private SearchAction tryToGetSearchActionForName(final String searchActionName)
                             .build());
         }
 
+        private StreamingAction tryToGetStreamingActionForName(final String streamingActionName) {
+            return StreamingAction.forName(streamingActionName)
+                    .orElseThrow(() -> UnknownTopicPathException.newBuilder(topicPathString)
+                            .description(MessageFormat.format("Streaming action name <{0}> is unknown.", streamingActionName))
+                            .build());
+        }
+
         @Nullable
         private String getSubjectOrNull() {
             final String subject = String.join(TopicPath.PATH_DELIMITER, topicPathParts);
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/ProtocolFactory.java b/protocol/src/main/java/org/eclipse/ditto/protocol/ProtocolFactory.java
index 3e4244a46be..021c0a0c142 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/ProtocolFactory.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/ProtocolFactory.java
@@ -19,9 +19,11 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.ditto.base.model.common.DittoConstants;
+import org.eclipse.ditto.base.model.entity.id.EntityId;
 import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.contenttype.ContentType;
+import org.eclipse.ditto.connectivity.model.ConnectivityConstants;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonPointer;
@@ -126,6 +128,38 @@ public static TopicPathBuilder newTopicPathBuilder(final NamespacedEntityId enti
         return result;
     }
 
+    /**
+     * Returns a new {@code TopicPathBuilder} for the specified {@link EntityId}.
+     * The namespace and name part of the {@code TopicPath} will pe parsed from the entity ID and set in the builder.
+     *
+     * @param entityId the ID.
+     * @return the builder.
+     * @throws NullPointerException if {@code entityId} is {@code null}.
+     * @throws org.eclipse.ditto.things.model.ThingIdInvalidException if {@code entityId} is not in the expected
+     * format.
+     * @since 3.2.0
+     */
+    public static TopicPathBuilder newTopicPathBuilder(final EntityId entityId) {
+        checkNotNull(entityId, "entityId");
+        final TopicPathBuilder result;
+        if (entityId instanceof NamespacedEntityId) {
+            final String namespace = ((NamespacedEntityId) entityId).getNamespace();
+            final String name = ((NamespacedEntityId) entityId).getName();
+            result = ImmutableTopicPath.newBuilder(namespace, name);
+        } else {
+            result = ProtocolFactory.newTopicPathBuilderFromName(entityId.toString());
+        }
+
+        if (entityId.getEntityType().equals(ThingConstants.ENTITY_TYPE)) {
+            return result.things();
+        } else if (entityId.getEntityType().equals(PolicyConstants.ENTITY_TYPE)) {
+            return result.policies();
+        } else if (entityId.getEntityType().equals(ConnectivityConstants.ENTITY_TYPE)) {
+            return result.connections();
+        }
+        return result;
+    }
+
     /**
      * Returns a new {@code TopicPathBuilder} for the specified {@link PolicyId}.
      * The namespace and name part of the {@code TopicPath} will pe parsed from the {@code PolicyId} and set in the
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/StreamingTopicPathBuilder.java b/protocol/src/main/java/org/eclipse/ditto/protocol/StreamingTopicPathBuilder.java
new file mode 100644
index 00000000000..5c1af097bbd
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/StreamingTopicPathBuilder.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.protocol;
+
+/**
+ * Builder to create a topic path for streaming commands.
+ *
+ * @since 3.2.0
+ */
+public interface StreamingTopicPathBuilder extends TopicPathBuildable {
+
+    /**
+     * Sets the {@code Action} of this builder to the passed {@code subscribingCommandName}. A previously set action is replaced.
+     *
+     * @return this builder to allow method chaining.
+     */
+    TopicPathBuildable subscribe(String subscribingCommandName);
+
+    /**
+     * Sets the {@code Action} of this builder to {@link TopicPath.StreamingAction#CANCEL}. A previously set action is replaced.
+     *
+     * @return this builder to allow method chaining.
+     */
+    TopicPathBuildable cancel();
+
+    /**
+     * Sets the {@code Action} of this builder to {@link TopicPath.StreamingAction#REQUEST}. A previously set action is replaced.
+     *
+     * @return this builder to allow method chaining.
+     */
+    TopicPathBuildable request();
+
+    /**
+     * Sets the {@code Action} of this builder to {@link TopicPath.StreamingAction#COMPLETE}. A previously set action is replaced.
+     *
+     * @return this builder to allow method chaining.
+     */
+    TopicPathBuildable complete();
+
+    /**
+     * Sets the {@code Action} of this builder to {@link TopicPath.StreamingAction#FAILED}. A previously set action is replaced.
+     *
+     * @return this builder to allow method chaining.
+     */
+    TopicPathBuildable failed();
+
+    /**
+     * Sets the {@code Action} of this builder to {@link TopicPath.StreamingAction#NEXT}. A previously set action is replaced.
+     *
+     * @return this builder to allow method chaining.
+     */
+    TopicPathBuildable hasNext();
+
+    /**
+     * Sets the {@code Action} of this builder to {@link TopicPath.StreamingAction#GENERATED}. A previously set action is replaced.
+     *
+     * @return this builder to allow method chaining.
+     */
+    TopicPathBuildable generated();
+
+    /**
+     * Sets the {@code Action} of this builder to {@link TopicPath.StreamingAction#ERROR}. A previously set action is replaced.
+     *
+     * @return this builder to allow method chaining.
+     */
+    TopicPathBuildable error();
+
+}
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/TopicPath.java b/protocol/src/main/java/org/eclipse/ditto/protocol/TopicPath.java
index 3af44dd32af..6fa1c1f0906 100755
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/TopicPath.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/TopicPath.java
@@ -19,6 +19,14 @@
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.entity.type.EntityType;
+import org.eclipse.ditto.base.model.signals.commands.streaming.CancelStreamingSubscription;
+import org.eclipse.ditto.base.model.signals.commands.streaming.RequestFromStreamingSubscription;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionComplete;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionCreated;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionFailed;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionHasNext;
+import org.eclipse.ditto.connectivity.model.ConnectionId;
 import org.eclipse.ditto.connectivity.model.ConnectivityConstants;
 import org.eclipse.ditto.policies.model.PolicyConstants;
 import org.eclipse.ditto.policies.model.PolicyId;
@@ -68,6 +76,18 @@ static TopicPathBuilder newBuilder(final PolicyId policyId) {
         return ProtocolFactory.newTopicPathBuilder(policyId);
     }
 
+    /**
+     * Returns a mutable builder to create immutable {@code TopicPath} instances for a given {@code connectionId}.
+     *
+     * @param connectionId the identifier of the {@code Connection}.
+     * @return the builder.
+     * @throws NullPointerException if {@code connectionId} is {@code null}.
+     * @since 3.1.0
+     */
+    static TopicPathBuilder newBuilder(final ConnectionId connectionId) {
+        return ProtocolFactory.newTopicPathBuilder(connectionId);
+    }
+
     /**
      * Returns a mutable builder to create immutable {@code TopicPath} instances for a given {@code namespace}.
      *
@@ -122,12 +142,20 @@ static TopicPathBuilder fromNamespace(final String namespace) {
     Optional<Action> getAction();
 
     /**
-     * Returns an {@link Optional} for an search action part of this {@code TopicPath}.
+     * Returns an {@link Optional} for a search action part of this {@code TopicPath}.
      *
      * @return the search action.
      */
     Optional<SearchAction> getSearchAction();
 
+    /**
+     * Returns an {@link Optional} for a streaming action part of this {@code TopicPath}.
+     *
+     * @return the streaming action.
+     * @since 3.2.0
+     */
+    Optional<StreamingAction> getStreamingAction();
+
     /**
      * Returns an {@link Optional} for a subject part of this {@code TopicPath}.
      *
@@ -268,7 +296,14 @@ enum Criterion {
          *
          * @since 2.0.0
          */
-        ANNOUNCEMENTS("announcements");
+        ANNOUNCEMENTS("announcements"),
+
+        /**
+         * Criterion for streaming commands.
+         *
+         * @since 3.2.0
+         */
+        STREAMING("streaming");
 
         private final String name;
 
@@ -482,4 +517,65 @@ public String toString() {
 
     }
 
+    /**
+     * An enumeration of topic path streaming actions.
+     *
+     * @since 3.2.0
+     */
+    enum StreamingAction {
+
+        SUBSCRIBE_FOR_PERSISTED_EVENTS(SubscribeForPersistedEvents.NAME),
+
+        CANCEL(CancelStreamingSubscription.NAME),
+
+        REQUEST(RequestFromStreamingSubscription.NAME),
+
+        COMPLETE(StreamingSubscriptionComplete.NAME),
+
+        GENERATED(StreamingSubscriptionCreated.NAME),
+
+        FAILED(StreamingSubscriptionFailed.NAME),
+
+        NEXT(StreamingSubscriptionHasNext.NAME),
+
+        ERROR("error");
+
+        private final String name;
+
+        StreamingAction(final String name) {
+            this.name = name;
+        }
+
+        /**
+         * Creates a StreamingAction from the passed StreamingAction {@code name} if such an enum value exists,
+         * otherwise an empty Optional.
+         *
+         * @param name the StreamingAction name to create the StreamingAction enum value of.
+         * @return the optional StreamingAction.
+         */
+        public static Optional<StreamingAction> forName(final String name) {
+            return Stream.of(values())
+                    .filter(a -> Objects.equals(a.getName(), name))
+                    .findFirst();
+        }
+
+        /**
+         * Returns the StreamingAction name as String.
+         *
+         * @return the StreamingAction name as String.
+         */
+        public String getName() {
+            return name;
+        }
+
+        /**
+         * @return the same as {@link #getName()}.
+         */
+        @Override
+        public String toString() {
+            return getName();
+        }
+
+    }
+
 }
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/TopicPathBuilder.java b/protocol/src/main/java/org/eclipse/ditto/protocol/TopicPathBuilder.java
index 6c4f9db8e5e..31532183d0a 100755
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/TopicPathBuilder.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/TopicPathBuilder.java
@@ -64,6 +64,15 @@ public interface TopicPathBuilder {
      */
     AnnouncementsTopicPathBuilder announcements();
 
+    /**
+     * Sets the {@code Group} of this builder to {@link TopicPath.Criterion#STREAMING}. A previously set group is
+     * replaced.
+     *
+     * @return this builder.
+     * @since 3.2.0
+     */
+    StreamingTopicPathBuilder streaming();
+
     /**
      * Sets the {@code Channel} of this builder to {@link TopicPath.Channel#TWIN}. A previously set channel is
      * replaced.
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/AbstractStreamingMessageAdapter.java b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/AbstractStreamingMessageAdapter.java
new file mode 100644
index 00000000000..161eb40311d
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/AbstractStreamingMessageAdapter.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.protocol.adapter;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.eclipse.ditto.base.model.headers.translator.HeaderTranslator;
+import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.protocol.Adaptable;
+import org.eclipse.ditto.protocol.TopicPath;
+import org.eclipse.ditto.protocol.mapper.SignalMapper;
+import org.eclipse.ditto.protocol.mappingstrategies.MappingStrategies;
+
+/**
+ * Adapter for mapping a "streaming" {@link Signal} to and from an {@link Adaptable}.
+ *
+ * @param <T> the type of the signals mapped by this adapter.
+ */
+abstract class AbstractStreamingMessageAdapter<T extends Signal<?>> extends AbstractAdapter<T>
+        implements Adapter<T> {
+
+    private final SignalMapper<T> signalMapper;
+
+    AbstractStreamingMessageAdapter(
+            final MappingStrategies<T> mappingStrategies,
+            final SignalMapper<T> signalMapper,
+            final HeaderTranslator headerTranslator) {
+
+        super(mappingStrategies, headerTranslator, EmptyPathMatcher.getInstance());
+        this.signalMapper = signalMapper;
+    }
+
+    @Override
+    protected Adaptable mapSignalToAdaptable(final T signal, final TopicPath.Channel channel) {
+        return signalMapper.mapSignalToAdaptable(signal, channel);
+    }
+
+    @Override
+    public Adaptable toAdaptable(final T t) {
+        return toAdaptable(t, TopicPath.Channel.LIVE);
+    }
+
+    @Override
+    public TopicPath toTopicPath(final T signal, final TopicPath.Channel channel) {
+        return signalMapper.mapSignalToTopicPath(signal, channel);
+    }
+
+    @Override
+    public Set<TopicPath.Group> getGroups() {
+        return EnumSet.of(TopicPath.Group.POLICIES, TopicPath.Group.THINGS, TopicPath.Group.CONNECTIONS);
+    }
+
+    @Override
+    public Set<TopicPath.Channel> getChannels() {
+        return EnumSet.of(TopicPath.Channel.NONE, TopicPath.Channel.TWIN);
+    }
+
+}
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/Adapter.java b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/Adapter.java
index 8a8ec6b22b8..4bd0a3a024e 100755
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/Adapter.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/Adapter.java
@@ -113,6 +113,17 @@ default Set<TopicPath.SearchAction> getSearchActions() {
         return Collections.emptySet();
     }
 
+    /**
+     * Return the set of streaming actions supported by this adapter.
+     * It is the empty set by default.
+     *
+     * @return the collection of supported streaming actions.
+     * @since 3.2.0
+     */
+    default Set<TopicPath.StreamingAction> getStreamingActions() {
+        return Collections.emptySet();
+    }
+
     /**
      * Retrieve whether this adapter is for responses.
      *
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/AdapterResolverBySignal.java b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/AdapterResolverBySignal.java
index ed3bdfdb389..6e8ca806a45 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/AdapterResolverBySignal.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/AdapterResolverBySignal.java
@@ -23,7 +23,9 @@
 import org.eclipse.ditto.base.model.signals.acks.Acknowledgements;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
+import org.eclipse.ditto.base.model.signals.commands.streaming.StreamingSubscriptionCommand;
 import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionEvent;
 import org.eclipse.ditto.connectivity.model.signals.announcements.ConnectivityAnnouncement;
 import org.eclipse.ditto.messages.model.signals.commands.MessageCommand;
 import org.eclipse.ditto.messages.model.signals.commands.MessageCommandResponse;
@@ -33,6 +35,7 @@
 import org.eclipse.ditto.policies.model.signals.commands.modify.PolicyModifyCommandResponse;
 import org.eclipse.ditto.policies.model.signals.commands.query.PolicyQueryCommand;
 import org.eclipse.ditto.policies.model.signals.commands.query.PolicyQueryCommandResponse;
+import org.eclipse.ditto.policies.model.signals.events.PolicyEvent;
 import org.eclipse.ditto.protocol.TopicPath;
 import org.eclipse.ditto.protocol.UnknownChannelException;
 import org.eclipse.ditto.protocol.UnknownSignalException;
@@ -61,16 +64,22 @@ final class AdapterResolverBySignal {
     private final PolicyCommandAdapterProvider policiesAdapters;
     private final ConnectivityCommandAdapterProvider connectivityAdapters;
     private final AcknowledgementAdapterProvider acknowledgementAdapters;
+    private final StreamingSubscriptionCommandAdapter streamingSubscriptionCommandAdapter;
+    private final StreamingSubscriptionEventAdapter streamingSubscriptionEventAdapter;
 
     AdapterResolverBySignal(final ThingCommandAdapterProvider thingsAdapters,
             final PolicyCommandAdapterProvider policiesAdapters,
             final ConnectivityCommandAdapterProvider connectivityAdapters,
-            final AcknowledgementAdapterProvider acknowledgementAdapters) {
+            final AcknowledgementAdapterProvider acknowledgementAdapters,
+            final StreamingSubscriptionCommandAdapter streamingSubscriptionCommandAdapter,
+            final StreamingSubscriptionEventAdapter streamingSubscriptionEventAdapter) {
 
         this.thingsAdapters = thingsAdapters;
         this.policiesAdapters = policiesAdapters;
         this.connectivityAdapters = connectivityAdapters;
         this.acknowledgementAdapters = acknowledgementAdapters;
+        this.streamingSubscriptionCommandAdapter = streamingSubscriptionCommandAdapter;
+        this.streamingSubscriptionEventAdapter = streamingSubscriptionEventAdapter;
     }
 
     @SuppressWarnings("unchecked")
@@ -110,10 +119,19 @@ private <T extends Signal<?>> Adapter<T> resolveEvent(final Event<?> event, fina
             validateChannel(channel, event, LIVE, TWIN);
             return (Adapter<T>) thingsAdapters.getEventAdapter();
         }
+        if (event instanceof PolicyEvent) {
+            validateChannel(channel, event, NONE);
+            return (Adapter<T>) policiesAdapters.getEventAdapter();
+        }
+
         if (event instanceof SubscriptionEvent) {
             validateNotLive(event);
             return (Adapter<T>) thingsAdapters.getSubscriptionEventAdapter();
         }
+        if (event instanceof StreamingSubscriptionEvent) {
+            validateNotLive(event);
+            return (Adapter<T>) streamingSubscriptionEventAdapter;
+        }
 
         throw UnknownSignalException.newBuilder(event.getName())
                 .dittoHeaders(event.getDittoHeaders())
@@ -212,6 +230,10 @@ private <T extends Signal<?>> Adapter<T> resolveCommand(final Command<?> command
             validateNotLive(command);
             return (Adapter<T>) thingsAdapters.getSearchCommandAdapter();
         }
+        if (command instanceof StreamingSubscriptionCommand) {
+            validateNotLive(command);
+            return (Adapter<T>) streamingSubscriptionCommandAdapter;
+        }
 
         if (command instanceof PolicyModifyCommand) {
             validateChannel(channel, command, NONE);
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/DefaultAdapterResolver.java b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/DefaultAdapterResolver.java
index fd7b522b4d0..44717e7fcfb 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/DefaultAdapterResolver.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/DefaultAdapterResolver.java
@@ -43,15 +43,19 @@ final class DefaultAdapterResolver implements AdapterResolver {
     DefaultAdapterResolver(final ThingCommandAdapterProvider thingsAdapters,
             final PolicyCommandAdapterProvider policiesAdapters,
             final ConnectivityCommandAdapterProvider connectivityAdapters,
-            final AcknowledgementAdapterProvider acknowledgementAdapters) {
+            final AcknowledgementAdapterProvider acknowledgementAdapters,
+            final StreamingSubscriptionCommandAdapter streamingSubscriptionCommandAdapter,
+            final StreamingSubscriptionEventAdapter streamingSubscriptionEventAdapter) {
         final List<Adapter<?>> adapters = new ArrayList<>();
         adapters.addAll(thingsAdapters.getAdapters());
         adapters.addAll(policiesAdapters.getAdapters());
         adapters.addAll(connectivityAdapters.getAdapters());
         adapters.addAll(acknowledgementAdapters.getAdapters());
+        adapters.add(streamingSubscriptionCommandAdapter);
+        adapters.add(streamingSubscriptionEventAdapter);
         resolver = computeResolver(adapters);
         resolverBySignal = new AdapterResolverBySignal(thingsAdapters, policiesAdapters, connectivityAdapters,
-                acknowledgementAdapters);
+                acknowledgementAdapters, streamingSubscriptionCommandAdapter, streamingSubscriptionEventAdapter);
     }
 
     @Override
@@ -236,6 +240,8 @@ private static Function<Adaptable, Adapter<?>> computeResolver(final List<Adapte
                                 forTopicPath(TopicPath::getAction)),
                         new ForEnumOptional<>(TopicPath.SearchAction.class, TopicPath.SearchAction.values(),
                                 Adapter::getSearchActions, forTopicPath(TopicPath::getSearchAction)),
+                        new ForEnumOptional<>(TopicPath.StreamingAction.class, TopicPath.StreamingAction.values(),
+                                Adapter::getStreamingActions, forTopicPath(TopicPath::getStreamingAction)),
                         new ForEnum<>(Bool.class, Bool.values(), Bool.composeAsSet(Adapter::isForResponses),
                                 Bool.compose(DefaultAdapterResolver::isResponse)),
                         new ForEnum<>(Bool.class, Bool.values(), Bool.composeAsSet(Adapter::requiresSubject),
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/DittoProtocolAdapter.java b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/DittoProtocolAdapter.java
index 3a22c9f4b1f..4f2fa4993bb 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/DittoProtocolAdapter.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/DittoProtocolAdapter.java
@@ -43,6 +43,9 @@ public final class DittoProtocolAdapter implements ProtocolAdapter {
     private final PolicyCommandAdapterProvider policiesAdapters;
     private final ConnectivityCommandAdapterProvider connectivityAdapters;
     private final AcknowledgementAdapterProvider acknowledgementAdapters;
+
+    private final StreamingSubscriptionCommandAdapter streamingSubscriptionCommandAdapter;
+    private final StreamingSubscriptionEventAdapter streamingSubscriptionEventAdapter;
     private final AdapterResolver adapterResolver;
 
     private DittoProtocolAdapter(final ErrorRegistry<DittoRuntimeException> errorRegistry,
@@ -52,8 +55,10 @@ private DittoProtocolAdapter(final ErrorRegistry<DittoRuntimeException> errorReg
         this.policiesAdapters = new DefaultPolicyCommandAdapterProvider(errorRegistry, headerTranslator);
         this.connectivityAdapters = new DefaultConnectivityCommandAdapterProvider(headerTranslator);
         this.acknowledgementAdapters = new DefaultAcknowledgementsAdapterProvider(errorRegistry, headerTranslator);
+        streamingSubscriptionCommandAdapter = StreamingSubscriptionCommandAdapter.of(headerTranslator);
+        streamingSubscriptionEventAdapter = StreamingSubscriptionEventAdapter.of(headerTranslator, errorRegistry);
         this.adapterResolver = new DefaultAdapterResolver(thingsAdapters, policiesAdapters, connectivityAdapters,
-                acknowledgementAdapters);
+                acknowledgementAdapters, streamingSubscriptionCommandAdapter, streamingSubscriptionEventAdapter);
     }
 
     private DittoProtocolAdapter(final HeaderTranslator headerTranslator,
@@ -61,12 +66,18 @@ private DittoProtocolAdapter(final HeaderTranslator headerTranslator,
             final PolicyCommandAdapterProvider policiesAdapters,
             final ConnectivityCommandAdapterProvider connectivityAdapters,
             final AcknowledgementAdapterProvider acknowledgementAdapters,
+            final StreamingSubscriptionCommandAdapter streamingSubscriptionCommandAdapter,
+            final StreamingSubscriptionEventAdapter streamingSubscriptionEventAdapter,
             final AdapterResolver adapterResolver) {
         this.headerTranslator = checkNotNull(headerTranslator, "headerTranslator");
         this.thingsAdapters = checkNotNull(thingsAdapters, "thingsAdapters");
         this.policiesAdapters = checkNotNull(policiesAdapters, "policiesAdapters");
         this.connectivityAdapters = checkNotNull(connectivityAdapters, "connectivityAdapters");
         this.acknowledgementAdapters = checkNotNull(acknowledgementAdapters, "acknowledgementAdapters");
+        this.streamingSubscriptionCommandAdapter = checkNotNull(streamingSubscriptionCommandAdapter,
+                "streamingSubscriptionCommandAdapter");
+        this.streamingSubscriptionEventAdapter = checkNotNull(streamingSubscriptionEventAdapter,
+                "streamingSubscriptionEventAdapter");
         this.adapterResolver = checkNotNull(adapterResolver, "adapterResolver");
     }
 
@@ -106,6 +117,8 @@ public static HeaderTranslator getHeaderTranslator() {
      * @param policyCommandAdapterProvider command adapters for policy commands
      * @param connectivityAdapters adapters for connectivity commands.
      * @param acknowledgementAdapters adapters for acknowledgements.
+     * @param streamingSubscriptionCommandAdapter adapters for streaming subscription commands.
+     * @param streamingSubscriptionEventAdapter adapters for streaming subscription events.
      * @param adapterResolver resolves the correct adapter from a command
      * @return new instance of {@link DittoProtocolAdapter}
      */
@@ -114,9 +127,12 @@ static DittoProtocolAdapter newInstance(final HeaderTranslator headerTranslator,
             final PolicyCommandAdapterProvider policyCommandAdapterProvider,
             final ConnectivityCommandAdapterProvider connectivityAdapters,
             final AcknowledgementAdapterProvider acknowledgementAdapters,
+            final StreamingSubscriptionCommandAdapter streamingSubscriptionCommandAdapter,
+            final StreamingSubscriptionEventAdapter streamingSubscriptionEventAdapter,
             final AdapterResolver adapterResolver) {
         return new DittoProtocolAdapter(headerTranslator, thingCommandAdapterProvider, policyCommandAdapterProvider,
-                connectivityAdapters, acknowledgementAdapters, adapterResolver
+                connectivityAdapters, acknowledgementAdapters,
+                streamingSubscriptionCommandAdapter, streamingSubscriptionEventAdapter, adapterResolver
         );
     }
 
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/ProtocolAdapter.java b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/ProtocolAdapter.java
index 05cd69b599f..ebd67556eab 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/ProtocolAdapter.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/ProtocolAdapter.java
@@ -19,10 +19,14 @@
 import org.eclipse.ditto.base.model.headers.translator.HeaderTranslator;
 import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.base.model.signals.announcements.Announcement;
+import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand;
+import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommandResponse;
+import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
 import org.eclipse.ditto.messages.model.signals.commands.MessageCommand;
 import org.eclipse.ditto.messages.model.signals.commands.MessageCommandResponse;
 import org.eclipse.ditto.policies.model.signals.commands.PolicyCommand;
 import org.eclipse.ditto.policies.model.signals.commands.PolicyCommandResponse;
+import org.eclipse.ditto.policies.model.signals.events.PolicyEvent;
 import org.eclipse.ditto.protocol.Adaptable;
 import org.eclipse.ditto.protocol.TopicPath;
 
@@ -112,7 +116,11 @@ static TopicPath.Channel determineChannel(final Signal<?> signal) {
      * @return the default channel determined from the signal
      */
     static TopicPath.Channel determineDefaultChannel(final Signal<?> signal) {
-        if (signal instanceof PolicyCommand || signal instanceof PolicyCommandResponse) {
+        if (signal instanceof PolicyCommand || signal instanceof PolicyCommandResponse ||
+                signal instanceof PolicyEvent) {
+            return NONE;
+        } else if (signal instanceof ConnectivityCommand || signal instanceof ConnectivityCommandResponse ||
+                signal instanceof ConnectivityEvent) {
             return NONE;
         } else if (signal instanceof Announcement) {
             return NONE;
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/StreamingSubscriptionCommandAdapter.java b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/StreamingSubscriptionCommandAdapter.java
new file mode 100644
index 00000000000..a7a626a6e71
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/StreamingSubscriptionCommandAdapter.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.protocol.adapter;
+
+import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.eclipse.ditto.base.model.headers.translator.HeaderTranslator;
+import org.eclipse.ditto.base.model.signals.commands.streaming.StreamingSubscriptionCommand;
+import org.eclipse.ditto.protocol.Adaptable;
+import org.eclipse.ditto.protocol.TopicPath;
+import org.eclipse.ditto.protocol.mapper.SignalMapperFactory;
+import org.eclipse.ditto.protocol.mappingstrategies.MappingStrategiesFactory;
+
+/**
+ * Adapter for mapping a {@link StreamingSubscriptionCommand} to and from an {@link Adaptable}.
+ *
+ * @since 3.2.0
+ */
+public final class StreamingSubscriptionCommandAdapter
+        extends AbstractStreamingMessageAdapter<StreamingSubscriptionCommand<?>> {
+
+    private StreamingSubscriptionCommandAdapter(final HeaderTranslator headerTranslator) {
+        super(MappingStrategiesFactory.getStreamingSubscriptionCommandMappingStrategies(),
+                SignalMapperFactory.newStreamingSubscriptionCommandSignalMapper(),
+                headerTranslator
+        );
+    }
+
+    /**
+     * Returns a new StreamingSubscriptionCommandAdapter.
+     *
+     * @param headerTranslator translator between external and Ditto headers.
+     * @return the adapter.
+     */
+    public static StreamingSubscriptionCommandAdapter of(final HeaderTranslator headerTranslator) {
+        return new StreamingSubscriptionCommandAdapter(checkNotNull(headerTranslator, "headerTranslator"));
+    }
+
+    @Override
+    protected String getType(final Adaptable adaptable) {
+        return StreamingSubscriptionCommand.TYPE_PREFIX + adaptable.getTopicPath().getStreamingAction().orElse(null);
+    }
+
+    @Override
+    public Set<TopicPath.Criterion> getCriteria() {
+        return EnumSet.of(TopicPath.Criterion.STREAMING);
+    }
+
+    @Override
+    public Set<TopicPath.Action> getActions() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public boolean isForResponses() {
+        return false;
+    }
+
+    @Override
+    public Set<TopicPath.StreamingAction> getStreamingActions() {
+        return EnumSet.of(TopicPath.StreamingAction.SUBSCRIBE_FOR_PERSISTED_EVENTS, TopicPath.StreamingAction.REQUEST,
+                TopicPath.StreamingAction.CANCEL);
+    }
+}
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/StreamingSubscriptionEventAdapter.java b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/StreamingSubscriptionEventAdapter.java
new file mode 100644
index 00000000000..f6f22735793
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/StreamingSubscriptionEventAdapter.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.protocol.adapter;
+
+import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.eclipse.ditto.base.model.headers.translator.HeaderTranslator;
+import org.eclipse.ditto.base.model.signals.ErrorRegistry;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionEvent;
+import org.eclipse.ditto.protocol.Adaptable;
+import org.eclipse.ditto.protocol.TopicPath;
+import org.eclipse.ditto.protocol.mapper.SignalMapperFactory;
+import org.eclipse.ditto.protocol.mappingstrategies.MappingStrategiesFactory;
+
+/**
+ * Adapter for mapping a {@link StreamingSubscriptionEvent} to and from an {@link Adaptable}.
+ *
+ * @since 3.2.0
+ */
+public final class StreamingSubscriptionEventAdapter
+        extends AbstractStreamingMessageAdapter<StreamingSubscriptionEvent<?>> {
+
+    private StreamingSubscriptionEventAdapter(final HeaderTranslator headerTranslator,
+            final ErrorRegistry<?> errorRegistry) {
+        super(MappingStrategiesFactory.getStreamingSubscriptionEventMappingStrategies(errorRegistry),
+                SignalMapperFactory.newStreamingSubscriptionEventSignalMapper(),
+                headerTranslator
+        );
+    }
+
+    /**
+     * Returns a new StreamingSubscriptionEventAdapter.
+     *
+     * @param headerTranslator translator between external and Ditto headers.
+     * @param errorRegistry the error registry for {@code SubscriptionFailed} events.
+     * @return the adapter.
+     */
+    public static StreamingSubscriptionEventAdapter of(final HeaderTranslator headerTranslator,
+            final ErrorRegistry<?> errorRegistry) {
+        return new StreamingSubscriptionEventAdapter(checkNotNull(headerTranslator, "headerTranslator"),
+                checkNotNull(errorRegistry, "errorRegistry"));
+    }
+
+    @Override
+    protected String getType(final Adaptable adaptable) {
+        return StreamingSubscriptionEvent.TYPE_PREFIX + adaptable.getTopicPath().getStreamingAction().orElse(null);
+    }
+
+    @Override
+    public Set<TopicPath.Criterion> getCriteria() {
+        return EnumSet.of(TopicPath.Criterion.STREAMING);
+    }
+
+    @Override
+    public Set<TopicPath.Action> getActions() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public boolean isForResponses() {
+        return false;
+    }
+
+    @Override
+    public Set<TopicPath.StreamingAction> getStreamingActions() {
+        return EnumSet.of(TopicPath.StreamingAction.COMPLETE, TopicPath.StreamingAction.NEXT,
+                TopicPath.StreamingAction.FAILED, TopicPath.StreamingAction.GENERATED);
+    }
+
+    @Override
+    public boolean supportsWildcardTopics() {
+        return false;
+    }
+}
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/connectivity/package-info.java b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/connectivity/package-info.java
new file mode 100755
index 00000000000..51b170fb9b5
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/connectivity/package-info.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+@org.eclipse.ditto.utils.jsr305.annotations.AllValuesAreNonnullByDefault
+package org.eclipse.ditto.protocol.adapter.connectivity;
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/policies/DefaultPolicyCommandAdapterProvider.java b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/policies/DefaultPolicyCommandAdapterProvider.java
index 37425b6bd07..1fe1bbfd221 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/policies/DefaultPolicyCommandAdapterProvider.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/policies/DefaultPolicyCommandAdapterProvider.java
@@ -24,6 +24,7 @@
 import org.eclipse.ditto.policies.model.signals.commands.modify.PolicyModifyCommandResponse;
 import org.eclipse.ditto.policies.model.signals.commands.query.PolicyQueryCommand;
 import org.eclipse.ditto.policies.model.signals.commands.query.PolicyQueryCommandResponse;
+import org.eclipse.ditto.policies.model.signals.events.PolicyEvent;
 import org.eclipse.ditto.protocol.adapter.Adapter;
 import org.eclipse.ditto.protocol.adapter.provider.PolicyCommandAdapterProvider;
 
@@ -40,6 +41,7 @@ public final class DefaultPolicyCommandAdapterProvider implements PolicyCommandA
     private final PolicyModifyCommandResponseAdapter policyModifyCommandResponseAdapter;
     private final PolicyQueryCommandResponseAdapter policyQueryCommandResponseAdapter;
     private final PolicyAnnouncementAdapter policyAnnouncementAdapter;
+    private final PolicyEventAdapter policyEventAdapter;
 
     public DefaultPolicyCommandAdapterProvider(final ErrorRegistry<DittoRuntimeException> errorRegistry,
             final HeaderTranslator headerTranslator) {
@@ -49,6 +51,7 @@ public DefaultPolicyCommandAdapterProvider(final ErrorRegistry<DittoRuntimeExcep
         policyModifyCommandResponseAdapter = PolicyModifyCommandResponseAdapter.of(headerTranslator);
         policyQueryCommandResponseAdapter = PolicyQueryCommandResponseAdapter.of(headerTranslator);
         policyAnnouncementAdapter = PolicyAnnouncementAdapter.of(headerTranslator);
+        policyEventAdapter = PolicyEventAdapter.of(headerTranslator);
     }
 
     public Adapter<PolicyErrorResponse> getErrorResponseAdapter() {
@@ -75,6 +78,11 @@ public Adapter<PolicyAnnouncement<?>> getAnnouncementAdapter() {
         return policyAnnouncementAdapter;
     }
 
+    @Override
+    public Adapter<PolicyEvent<?>> getEventAdapter() {
+        return policyEventAdapter;
+    }
+
     @Override
     public List<Adapter<?>> getAdapters() {
         return Arrays.asList(
@@ -83,7 +91,8 @@ public List<Adapter<?>> getAdapters() {
                 policyQueryCommandAdapter,
                 policyModifyCommandResponseAdapter,
                 policyQueryCommandResponseAdapter,
-                policyAnnouncementAdapter
+                policyAnnouncementAdapter,
+                policyEventAdapter
         );
     }
 }
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/policies/PolicyEventAdapter.java b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/policies/PolicyEventAdapter.java
new file mode 100644
index 00000000000..589a9a1899c
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/policies/PolicyEventAdapter.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.protocol.adapter.policies;
+
+import static java.util.Objects.requireNonNull;
+
+import org.eclipse.ditto.base.model.headers.translator.HeaderTranslator;
+import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.policies.model.signals.events.PolicyEvent;
+import org.eclipse.ditto.protocol.Adaptable;
+import org.eclipse.ditto.protocol.TopicPath;
+import org.eclipse.ditto.protocol.adapter.AbstractAdapter;
+import org.eclipse.ditto.protocol.adapter.EventAdapter;
+import org.eclipse.ditto.protocol.mapper.SignalMapperFactory;
+import org.eclipse.ditto.protocol.mappingstrategies.MappingStrategiesFactory;
+
+/**
+ * Adapter for mapping a {@link PolicyEvent} to and from an {@link org.eclipse.ditto.protocol.Adaptable}.
+ */
+final class PolicyEventAdapter extends AbstractPolicyAdapter<PolicyEvent<?>> implements EventAdapter<PolicyEvent<?>> {
+
+    private PolicyEventAdapter(final HeaderTranslator headerTranslator) {
+        super(MappingStrategiesFactory.getPolicyEventMappingStrategies(),
+                SignalMapperFactory.newPolicyEventSignalMapper(),
+                headerTranslator);
+    }
+
+    /**
+     * Returns a new PolicyEventAdapter.
+     *
+     * @param headerTranslator translator between external and Ditto headers.
+     * @return the adapter.
+     */
+    public static PolicyEventAdapter of(final HeaderTranslator headerTranslator) {
+        return new PolicyEventAdapter(requireNonNull(headerTranslator));
+    }
+
+    private static String getActionNameWithFirstLetterUpperCase(final TopicPath topicPath) {
+        return topicPath.getAction()
+                .map(TopicPath.Action::toString)
+                .map(AbstractAdapter::upperCaseFirst)
+                .orElseThrow(() -> new NullPointerException("TopicPath did not contain an Action!"));
+    }
+
+    @Override
+    protected String getType(final Adaptable adaptable) {
+        final TopicPath topicPath = adaptable.getTopicPath();
+        final JsonPointer path = adaptable.getPayload().getPath();
+        final String eventName = payloadPathMatcher.match(path) + getActionNameWithFirstLetterUpperCase(topicPath);
+        return topicPath.getGroup() + "." + topicPath.getCriterion() + ":" + eventName;
+    }
+
+}
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/provider/PolicyCommandAdapterProvider.java b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/provider/PolicyCommandAdapterProvider.java
index 080b6910fa3..09daf183b45 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/provider/PolicyCommandAdapterProvider.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/adapter/provider/PolicyCommandAdapterProvider.java
@@ -12,13 +12,14 @@
  */
 package org.eclipse.ditto.protocol.adapter.provider;
 
-import org.eclipse.ditto.protocol.adapter.Adapter;
 import org.eclipse.ditto.policies.model.signals.announcements.PolicyAnnouncement;
 import org.eclipse.ditto.policies.model.signals.commands.PolicyErrorResponse;
 import org.eclipse.ditto.policies.model.signals.commands.modify.PolicyModifyCommand;
 import org.eclipse.ditto.policies.model.signals.commands.modify.PolicyModifyCommandResponse;
 import org.eclipse.ditto.policies.model.signals.commands.query.PolicyQueryCommand;
 import org.eclipse.ditto.policies.model.signals.commands.query.PolicyQueryCommandResponse;
+import org.eclipse.ditto.policies.model.signals.events.PolicyEvent;
+import org.eclipse.ditto.protocol.adapter.Adapter;
 
 /**
  * Provider for all policy command adapters. This interface mainly defines the generic type arguments and adds
@@ -30,6 +31,7 @@ public interface PolicyCommandAdapterProvider
         extends QueryCommandAdapterProvider<PolicyQueryCommand<?>, PolicyQueryCommandResponse<?>>,
         ModifyCommandAdapterProvider<PolicyModifyCommand<?>, PolicyModifyCommandResponse<?>>,
         ErrorResponseAdapterProvider<PolicyErrorResponse>,
+        EventAdapterProvider<PolicyEvent<?>>,
         AdapterProvider {
 
     /**
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/AbstractCommandSignalMapper.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/AbstractCommandSignalMapper.java
index a6fce7e9d97..10182d5902e 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/AbstractCommandSignalMapper.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/AbstractCommandSignalMapper.java
@@ -15,12 +15,12 @@
 import java.util.stream.Stream;
 
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.protocol.CommandsTopicPathBuilder;
 import org.eclipse.ditto.protocol.TopicPath;
 import org.eclipse.ditto.protocol.TopicPathBuilder;
 import org.eclipse.ditto.protocol.UnknownCommandException;
 import org.eclipse.ditto.protocol.UnknownCommandResponseException;
-import org.eclipse.ditto.base.model.signals.Signal;
 
 /**
  * Base class of {@link SignalMapper}s for commands (e.g. query, modify commands).
@@ -45,7 +45,7 @@ TopicPath getTopicPath(final T command, final TopicPath.Channel channel) {
     abstract TopicPathBuilder getTopicPathBuilder(final T command);
 
     /**
-     * @return array of {@link org.eclipse.ditto.protocol.TopicPath.Action}s the implementation supports.
+     * @return array of {@link TopicPath.Action}s the implementation supports.
      */
     abstract TopicPath.Action[] getSupportedActions();
 
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/PolicyEventSignalMapper.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/PolicyEventSignalMapper.java
new file mode 100644
index 00000000000..343d730dd52
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/PolicyEventSignalMapper.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.protocol.mapper;
+
+import java.util.Locale;
+import java.util.Optional;
+
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.json.JsonValue;
+import org.eclipse.ditto.policies.model.signals.events.PolicyEvent;
+import org.eclipse.ditto.protocol.EventsTopicPathBuilder;
+import org.eclipse.ditto.protocol.PayloadBuilder;
+import org.eclipse.ditto.protocol.ProtocolFactory;
+import org.eclipse.ditto.protocol.TopicPath;
+import org.eclipse.ditto.protocol.TopicPathBuilder;
+import org.eclipse.ditto.protocol.UnknownChannelException;
+import org.eclipse.ditto.protocol.UnknownEventException;
+
+final class PolicyEventSignalMapper extends AbstractSignalMapper<PolicyEvent<?>> {
+
+    @Override
+    void enhancePayloadBuilder(final PolicyEvent<?> signal, final PayloadBuilder payloadBuilder) {
+        payloadBuilder.withRevision(signal.getRevision())
+                .withTimestamp(signal.getTimestamp().orElse(null));
+        final Optional<JsonValue> value =
+                signal.getEntity(signal.getDittoHeaders().getSchemaVersion().orElse(signal.getLatestSchemaVersion()));
+        value.ifPresent(payloadBuilder::withValue);
+    }
+
+    @Override
+    DittoHeaders enhanceHeaders(final PolicyEvent<?> signal) {
+        final Optional<JsonValue> value =
+                signal.getEntity(signal.getDittoHeaders().getSchemaVersion().orElse(signal.getLatestSchemaVersion()));
+        if (value.isPresent()) {
+            return ProtocolFactory.newHeadersWithJsonContentType(signal.getDittoHeaders());
+        } else {
+            return signal.getDittoHeaders();
+        }
+    }
+
+    @Override
+    TopicPath getTopicPath(final PolicyEvent<?> signal, final TopicPath.Channel channel) {
+        final EventsTopicPathBuilder topicPathBuilder = getEventsTopicPathBuilderOrThrow(signal, channel);
+        final String eventName = getLowerCaseEventName(signal);
+        if (isAction(eventName, TopicPath.Action.CREATED)) {
+            topicPathBuilder.created();
+        } else if (isAction(eventName, TopicPath.Action.MODIFIED)) {
+            topicPathBuilder.modified();
+        } else if (isAction(eventName, TopicPath.Action.DELETED)) {
+            topicPathBuilder.deleted();
+        } else if (isAction(eventName, TopicPath.Action.MERGED)) {
+            topicPathBuilder.merged();
+        } else {
+            throw UnknownEventException.newBuilder(eventName).build();
+        }
+        return topicPathBuilder.build();
+    }
+
+    private static EventsTopicPathBuilder getEventsTopicPathBuilderOrThrow(final PolicyEvent<?> event,
+            final TopicPath.Channel channel) {
+
+        TopicPathBuilder topicPathBuilder = ProtocolFactory.newTopicPathBuilder(event.getEntityId());
+        if (TopicPath.Channel.NONE == channel) {
+            topicPathBuilder = topicPathBuilder.none();
+        } else {
+            throw UnknownChannelException.newBuilder(channel, event.getType())
+                    .dittoHeaders(event.getDittoHeaders())
+                    .build();
+        }
+        return topicPathBuilder.events();
+    }
+
+    private static String getLowerCaseEventName(final PolicyEvent<?> thingEvent) {
+        final Class<?> thingEventClass = thingEvent.getClass();
+        final String eventClassSimpleName = thingEventClass.getSimpleName();
+        return eventClassSimpleName.toLowerCase(Locale.ENGLISH);
+    }
+
+    private static boolean isAction(final String eventName, final TopicPath.Action expectedAction) {
+        return eventName.contains(expectedAction.getName());
+    }
+}
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/SignalMapperFactory.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/SignalMapperFactory.java
index 81ad891cd9e..40f25b25f2c 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/SignalMapperFactory.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/SignalMapperFactory.java
@@ -12,6 +12,8 @@
  */
 package org.eclipse.ditto.protocol.mapper;
 
+import org.eclipse.ditto.base.model.signals.commands.streaming.StreamingSubscriptionCommand;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionEvent;
 import org.eclipse.ditto.connectivity.model.signals.announcements.ConnectivityAnnouncement;
 import org.eclipse.ditto.messages.model.signals.commands.MessageCommand;
 import org.eclipse.ditto.messages.model.signals.commands.MessageCommandResponse;
@@ -20,6 +22,7 @@
 import org.eclipse.ditto.policies.model.signals.commands.modify.PolicyModifyCommandResponse;
 import org.eclipse.ditto.policies.model.signals.commands.query.PolicyQueryCommand;
 import org.eclipse.ditto.policies.model.signals.commands.query.PolicyQueryCommandResponse;
+import org.eclipse.ditto.policies.model.signals.events.PolicyEvent;
 import org.eclipse.ditto.things.model.signals.commands.modify.MergeThing;
 import org.eclipse.ditto.things.model.signals.commands.modify.MergeThingResponse;
 import org.eclipse.ditto.things.model.signals.commands.modify.ThingModifyCommand;
@@ -80,6 +83,14 @@ public static SignalMapper<SubscriptionEvent<?>> newSubscriptionEventSignalMappe
         return new SubscriptionEventSignalMapper();
     }
 
+    public static SignalMapper<StreamingSubscriptionCommand<?>> newStreamingSubscriptionCommandSignalMapper() {
+        return new StreamingSubscriptionCommandSignalMapper<>();
+    }
+
+    public static SignalMapper<StreamingSubscriptionEvent<?>> newStreamingSubscriptionEventSignalMapper() {
+        return new StreamingSubscriptionEventSignalMapper();
+    }
+
     public static SignalMapper<RetrieveThings> newRetrieveThingsSignalMapper() {
         return new RetrieveThingsSignalMapper();
     }
@@ -112,6 +123,10 @@ public static SignalMapper<PolicyAnnouncement<?>> newPolicyAnnouncementSignalMap
         return new PolicyAnnouncementSignalMapper();
     }
 
+    public static SignalMapper<PolicyEvent<?>> newPolicyEventSignalMapper() {
+        return new PolicyEventSignalMapper();
+    }
+
     public static SignalMapper<MessageCommand<?, ?>> newMessageCommandSignalMapper() {
         return MessageSignalMapper.getInstance();
     }
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/StreamingSubscriptionCommandSignalMapper.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/StreamingSubscriptionCommandSignalMapper.java
new file mode 100644
index 00000000000..49e1e1b6e57
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/StreamingSubscriptionCommandSignalMapper.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.protocol.mapper;
+
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.signals.WithStreamingSubscriptionId;
+import org.eclipse.ditto.base.model.signals.commands.streaming.CancelStreamingSubscription;
+import org.eclipse.ditto.base.model.signals.commands.streaming.RequestFromStreamingSubscription;
+import org.eclipse.ditto.base.model.signals.commands.streaming.StreamingSubscriptionCommand;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonObjectBuilder;
+import org.eclipse.ditto.protocol.PayloadBuilder;
+import org.eclipse.ditto.protocol.ProtocolFactory;
+import org.eclipse.ditto.protocol.StreamingTopicPathBuilder;
+import org.eclipse.ditto.protocol.TopicPath;
+import org.eclipse.ditto.protocol.TopicPathBuilder;
+import org.eclipse.ditto.protocol.UnknownCommandException;
+
+/**
+ *  Signal mapper implementation for {@link StreamingSubscriptionCommand}s.
+ *
+ * @param <T> the type of the command
+ */
+final class StreamingSubscriptionCommandSignalMapper<T extends StreamingSubscriptionCommand<?>>
+        extends AbstractSignalMapper<T> {
+
+    @Override
+    TopicPath getTopicPath(final T command, final TopicPath.Channel channel) {
+        final TopicPathBuilder topicPathBuilder = getTopicPathBuilder(command);
+        final StreamingTopicPathBuilder streamingTopicPathBuilder =
+                fromTopicPathBuilderWithChannel(topicPathBuilder, channel);
+        setTopicPathAction(streamingTopicPathBuilder, command, getSupportedActions());
+        return streamingTopicPathBuilder.build();
+    }
+
+    /**
+     * @return array of {@link org.eclipse.ditto.protocol.TopicPath.Action}s the implementation supports.
+     */
+    public TopicPath.StreamingAction[] getSupportedActions() {
+        return new TopicPath.StreamingAction[]{
+                TopicPath.StreamingAction.REQUEST,
+                TopicPath.StreamingAction.CANCEL,
+                TopicPath.StreamingAction.SUBSCRIBE_FOR_PERSISTED_EVENTS
+        };
+    }
+
+    @Override
+    void enhancePayloadBuilder(final T command, final PayloadBuilder payloadBuilder) {
+
+        final JsonObjectBuilder payloadContentBuilder = JsonFactory.newObjectBuilder();
+        if (command instanceof SubscribeForPersistedEvents) {
+            final SubscribeForPersistedEvents subscribeCommand = (SubscribeForPersistedEvents) command;
+            payloadContentBuilder
+                    .set(SubscribeForPersistedEvents.JsonFields.JSON_FROM_HISTORICAL_REVISION,
+                            subscribeCommand.getFromHistoricalRevision())
+                    .set(SubscribeForPersistedEvents.JsonFields.JSON_TO_HISTORICAL_REVISION,
+                            subscribeCommand.getToHistoricalRevision());
+            subscribeCommand.getFromHistoricalTimestamp().ifPresent(fromTs ->
+                    payloadContentBuilder.set(SubscribeForPersistedEvents.JsonFields.JSON_FROM_HISTORICAL_TIMESTAMP,
+                            fromTs.toString()));
+            subscribeCommand.getToHistoricalTimestamp().ifPresent(toTs ->
+                    payloadContentBuilder.set(SubscribeForPersistedEvents.JsonFields.JSON_TO_HISTORICAL_TIMESTAMP,
+                            toTs.toString()));
+        } else if (command instanceof CancelStreamingSubscription) {
+            final CancelStreamingSubscription cancelCommand = (CancelStreamingSubscription) command;
+            payloadContentBuilder
+                    .set(WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID, cancelCommand.getSubscriptionId());
+        } else if (command instanceof RequestFromStreamingSubscription) {
+            final RequestFromStreamingSubscription requestCommand = (RequestFromStreamingSubscription) command;
+            payloadContentBuilder
+                    .set(WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID, requestCommand.getSubscriptionId())
+                    .set(RequestFromStreamingSubscription.JsonFields.DEMAND, requestCommand.getDemand());
+        } else {
+            throw UnknownCommandException.newBuilder(command.getClass().toString()).build();
+        }
+        payloadBuilder.withValue(payloadContentBuilder.build());
+    }
+
+    private static StreamingTopicPathBuilder fromTopicPathBuilderWithChannel(final TopicPathBuilder topicPathBuilder,
+            final TopicPath.Channel channel) {
+
+        if (channel == TopicPath.Channel.TWIN) {
+            return topicPathBuilder.twin().streaming();
+        } else if (channel == TopicPath.Channel.NONE) {
+            return topicPathBuilder.none().streaming();
+        } else {
+            throw new IllegalArgumentException("Unknown or unsupported Channel '" + channel + "'");
+        }
+    }
+
+    private TopicPathBuilder getTopicPathBuilder(final StreamingSubscriptionCommand<?> command) {
+        return ProtocolFactory.newTopicPathBuilder(command.getEntityId());
+    }
+
+    private void setTopicPathAction(final StreamingTopicPathBuilder builder, final T command,
+            final TopicPath.StreamingAction... supportedActions) {
+
+        if (supportedActions.length > 0) {
+            final String streamingCommandName = command.getName();
+            final TopicPath.StreamingAction streamingAction =
+                    TopicPath.StreamingAction.forName(streamingCommandName)
+                            .orElseThrow(() -> unknownCommandException(streamingCommandName));
+            setAction(builder, streamingAction);
+        }
+    }
+
+    DittoRuntimeException unknownCommandException(final String commandName) {
+        return UnknownCommandException.newBuilder(commandName).build();
+    }
+
+    private void setAction(final StreamingTopicPathBuilder builder, final TopicPath.StreamingAction streamingAction) {
+        switch (streamingAction) {
+            case SUBSCRIBE_FOR_PERSISTED_EVENTS:
+                builder.subscribe(SubscribeForPersistedEvents.NAME);
+                break;
+            case REQUEST:
+                builder.request();
+                break;
+            case CANCEL:
+                builder.cancel();
+                break;
+            default:
+                throw unknownCommandException(streamingAction.getName());
+        }
+    }
+}
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/StreamingSubscriptionEventSignalMapper.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/StreamingSubscriptionEventSignalMapper.java
new file mode 100644
index 00000000000..65755188cdf
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/StreamingSubscriptionEventSignalMapper.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.protocol.mapper;
+
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.WithStreamingSubscriptionId;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionComplete;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionCreated;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionEvent;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionFailed;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionHasNext;
+import org.eclipse.ditto.connectivity.model.ConnectionId;
+import org.eclipse.ditto.connectivity.model.ConnectivityConstants;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonObjectBuilder;
+import org.eclipse.ditto.policies.model.PolicyConstants;
+import org.eclipse.ditto.policies.model.PolicyId;
+import org.eclipse.ditto.protocol.PayloadBuilder;
+import org.eclipse.ditto.protocol.ProtocolFactory;
+import org.eclipse.ditto.protocol.TopicPath;
+import org.eclipse.ditto.protocol.TopicPathBuilder;
+import org.eclipse.ditto.protocol.UnknownEventException;
+import org.eclipse.ditto.things.model.ThingConstants;
+import org.eclipse.ditto.things.model.ThingId;
+
+/**
+ *  Signal mapper implementation for {@link StreamingSubscriptionEvent}s.
+ */
+final class StreamingSubscriptionEventSignalMapper extends AbstractSignalMapper<StreamingSubscriptionEvent<?>> {
+
+    private static final JsonFieldDefinition<String> SUBSCRIPTION_ID =
+            WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID;
+
+    @Override
+    void enhancePayloadBuilder(final StreamingSubscriptionEvent<?> signal, final PayloadBuilder payloadBuilder) {
+        final JsonObjectBuilder payloadContentBuilder = JsonFactory.newObjectBuilder();
+        if (signal instanceof StreamingSubscriptionCreated) {
+            final StreamingSubscriptionCreated createdEvent = (StreamingSubscriptionCreated) signal;
+            payloadContentBuilder.set(SUBSCRIPTION_ID, createdEvent.getSubscriptionId());
+
+        } else if (signal instanceof StreamingSubscriptionComplete) {
+            final StreamingSubscriptionComplete completedEvent = (StreamingSubscriptionComplete) signal;
+            payloadContentBuilder.set(SUBSCRIPTION_ID, completedEvent.getSubscriptionId());
+
+        } else if (signal instanceof StreamingSubscriptionFailed) {
+            final StreamingSubscriptionFailed failedEvent = (StreamingSubscriptionFailed) signal;
+            payloadContentBuilder
+                    .set(SUBSCRIPTION_ID, failedEvent.getSubscriptionId())
+                    .set(StreamingSubscriptionFailed.JsonFields.ERROR, failedEvent.getError().toJson());
+
+        } else if (signal instanceof StreamingSubscriptionHasNext) {
+            final StreamingSubscriptionHasNext hasNext = (StreamingSubscriptionHasNext) signal;
+            payloadContentBuilder
+                    .set(SUBSCRIPTION_ID, hasNext.getSubscriptionId())
+                    .set(StreamingSubscriptionHasNext.JsonFields.ITEM, hasNext.getItem());
+
+        } else {
+            throw UnknownEventException.newBuilder(signal.getClass().getCanonicalName()).build();
+        }
+        payloadBuilder.withValue(payloadContentBuilder.build());
+    }
+
+    @Override
+    DittoHeaders enhanceHeaders(final StreamingSubscriptionEvent<?> signal) {
+        return ProtocolFactory.newHeadersWithJsonContentType(signal.getDittoHeaders());
+    }
+
+    @Override
+    TopicPath getTopicPath(final StreamingSubscriptionEvent<?> signal, final TopicPath.Channel channel) {
+
+        final TopicPathBuilder topicPathBuilder;
+        if (signal.getEntityType().equals(ThingConstants.ENTITY_TYPE)) {
+            topicPathBuilder = TopicPath.newBuilder(ThingId.of(signal.getEntityId())).things().twin();
+        } else if (signal.getEntityType().equals(PolicyConstants.ENTITY_TYPE)) {
+            topicPathBuilder = TopicPath.newBuilder(PolicyId.of(signal.getEntityId())).policies().none();
+        } else if (signal.getEntityType().equals(ConnectivityConstants.ENTITY_TYPE)) {
+            topicPathBuilder = TopicPath.newBuilder(ConnectionId.of(signal.getEntityId())).connections().none();
+        } else {
+            throw UnknownEventException.newBuilder(signal.getClass().getCanonicalName()).build();
+        }
+
+        final TopicPath topicPath;
+        if (signal instanceof StreamingSubscriptionCreated) {
+            topicPath = topicPathBuilder.streaming().generated().build();
+        } else if (signal instanceof StreamingSubscriptionComplete) {
+            topicPath = topicPathBuilder.streaming().complete().build();
+        } else if (signal instanceof StreamingSubscriptionFailed) {
+            topicPath = topicPathBuilder.streaming().failed().build();
+        } else if (signal instanceof StreamingSubscriptionHasNext) {
+            topicPath = topicPathBuilder.streaming().hasNext().build();
+        } else {
+            throw UnknownEventException.newBuilder(signal.getClass().getCanonicalName()).build();
+        }
+        return topicPath;
+    }
+
+}
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/AbstractPolicyMappingStrategies.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/AbstractPolicyMappingStrategies.java
index d0081a7f708..17ff8f195c3 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/AbstractPolicyMappingStrategies.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/AbstractPolicyMappingStrategies.java
@@ -14,6 +14,7 @@
 
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
+import java.util.Collection;
 import java.util.Map;
 
 import org.eclipse.ditto.base.model.json.Jsonifiable;
@@ -36,6 +37,8 @@
 import org.eclipse.ditto.policies.model.Subject;
 import org.eclipse.ditto.policies.model.SubjectId;
 import org.eclipse.ditto.policies.model.Subjects;
+import org.eclipse.ditto.policies.model.signals.events.SubjectsDeletedPartially;
+import org.eclipse.ditto.policies.model.signals.events.SubjectsModifiedPartially;
 import org.eclipse.ditto.protocol.Adaptable;
 import org.eclipse.ditto.protocol.JsonifiableMapper;
 import org.eclipse.ditto.protocol.MessagePath;
@@ -68,6 +71,11 @@ protected static PolicyId policyIdFromTopicPath(final TopicPath topicPath) {
         return PolicyId.of(topicPath.getNamespace(), topicPath.getEntityName());
     }
 
+    protected static PolicyId policyIdFrom(final Adaptable adaptable) {
+        final TopicPath topicPath = adaptable.getTopicPath();
+        return PolicyId.of(topicPath.getNamespace(), topicPath.getEntityName());
+    }
+
     /**
      * Policy from policy.
      *
@@ -248,6 +256,32 @@ protected static Subjects subjectsFrom(final Adaptable adaptable) {
         return PoliciesModelFactory.newSubjects(value);
     }
 
+    /**
+     * Subjects that are modified indexed by their policy entry labels.
+     *
+     * @param adaptable the adaptable
+     * @return the subjects
+     */
+    protected static Map<Label, Collection<Subject>> activatedSubjectsFrom(final Adaptable adaptable) {
+        final JsonObject value = getValueFromPayload(adaptable);
+        return SubjectsModifiedPartially.modifiedSubjectsFromJson(
+                value.getValueOrThrow(SubjectsModifiedPartially.JSON_MODIFIED_SUBJECTS)
+        );
+    }
+
+    /**
+     * Subjects that are modified indexed by their policy entry labels.
+     *
+     * @param adaptable the adaptable
+     * @return the subjects
+     */
+    protected static Map<Label, Collection<SubjectId>> deletedSubjectIdsFrom(final Adaptable adaptable) {
+        final JsonObject value = getValueFromPayload(adaptable);
+        return SubjectsDeletedPartially.deletedSubjectsFromJson(
+                value.getValueOrThrow(SubjectsDeletedPartially.JSON_DELETED_SUBJECT_IDS)
+        );
+    }
+
     /**
      * @throws NullPointerException if the value is null.
      */
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/AbstractStreamingSubscriptionMappingStrategies.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/AbstractStreamingSubscriptionMappingStrategies.java
new file mode 100644
index 00000000000..554cbf946d2
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/AbstractStreamingSubscriptionMappingStrategies.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.protocol.mappingstrategies;
+
+import java.util.Map;
+import java.util.Optional;
+
+import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
+import org.eclipse.ditto.base.model.entity.type.EntityType;
+import org.eclipse.ditto.base.model.json.Jsonifiable;
+import org.eclipse.ditto.base.model.signals.WithStreamingSubscriptionId;
+import org.eclipse.ditto.json.JsonField;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonMissingFieldException;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.protocol.Adaptable;
+import org.eclipse.ditto.protocol.JsonifiableMapper;
+import org.eclipse.ditto.protocol.Payload;
+import org.eclipse.ditto.protocol.TopicPath;
+
+/**
+ * Provides helper methods to map from {@link Adaptable}s to streaming subscription commands and events.
+ *
+ * @param <T> the type of the mapped signals
+ */
+abstract class AbstractStreamingSubscriptionMappingStrategies<T extends Jsonifiable.WithPredicate<JsonObject, JsonField>>
+        extends AbstractMappingStrategies<T> {
+
+    protected AbstractStreamingSubscriptionMappingStrategies(final Map<String, JsonifiableMapper<T>> mappingStrategies) {
+        super(mappingStrategies);
+    }
+
+    protected static NamespacedEntityId entityIdFrom(final Adaptable adaptable) {
+        final TopicPath topicPath = adaptable.getTopicPath();
+        return NamespacedEntityId.of(topicPath.getGroup().getEntityType(),
+                topicPath.getNamespace() + ":" + topicPath.getEntityName());
+    }
+
+    protected static EntityType entityTypeFrom(final Adaptable adaptable) {
+        final TopicPath topicPath = adaptable.getTopicPath();
+        return topicPath.getGroup().getEntityType();
+    }
+
+    protected static JsonPointer resourcePathFrom(final Adaptable adaptable) {
+        return adaptable.getPayload().getPath();
+    }
+
+    protected static String subscriptionIdFrom(final Adaptable adaptable) {
+        return adaptable.getPayload().getValue()
+                .map(value -> value.asObject().getValueOrThrow(WithStreamingSubscriptionId.JsonFields.SUBSCRIPTION_ID))
+                .orElseThrow(() -> JsonMissingFieldException.newBuilder()
+                        .fieldName(Payload.JsonFields.VALUE.getPointer())
+                        .build()
+                );
+    }
+
+    static <T> Optional<T> getFromValue(final Adaptable adaptable, final JsonFieldDefinition<T> jsonFieldDefinition) {
+        return adaptable.getPayload().getValue().flatMap(value -> value.asObject().getValue(jsonFieldDefinition));
+    }
+
+}
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/MappingStrategiesFactory.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/MappingStrategiesFactory.java
index 90da18949cf..22b7abf4fda 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/MappingStrategiesFactory.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/MappingStrategiesFactory.java
@@ -43,6 +43,10 @@ public static PolicyAnnouncementMappingStrategies getPolicyAnnouncementMappingSt
         return PolicyAnnouncementMappingStrategies.getInstance();
     }
 
+    public static PolicyEventMappingStrategies getPolicyEventMappingStrategies() {
+        return PolicyEventMappingStrategies.getInstance();
+    }
+
     public static ThingMergeCommandMappingStrategies getThingMergeCommandMappingStrategies() {
         return ThingMergeCommandMappingStrategies.getInstance();
     }
@@ -110,4 +114,13 @@ public static ConnectivityAnnouncementMappingStrategies getConnectivityAnnouncem
         return ConnectivityAnnouncementMappingStrategies.getInstance();
     }
 
+    public static StreamingSubscriptionCommandMappingStrategies getStreamingSubscriptionCommandMappingStrategies() {
+        return StreamingSubscriptionCommandMappingStrategies.getInstance();
+    }
+
+    public static StreamingSubscriptionEventMappingStrategies getStreamingSubscriptionEventMappingStrategies(
+            final ErrorRegistry<?> errorRegistry) {
+        return StreamingSubscriptionEventMappingStrategies.getInstance(errorRegistry);
+    }
+
 }
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/PolicyEventMappingStrategies.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/PolicyEventMappingStrategies.java
new file mode 100644
index 00000000000..0dee6ad0aab
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/PolicyEventMappingStrategies.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.protocol.mappingstrategies;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.ditto.base.model.entity.metadata.Metadata;
+import org.eclipse.ditto.json.JsonMissingFieldException;
+import org.eclipse.ditto.policies.model.signals.events.PolicyCreated;
+import org.eclipse.ditto.policies.model.signals.events.PolicyDeleted;
+import org.eclipse.ditto.policies.model.signals.events.PolicyEntriesModified;
+import org.eclipse.ditto.policies.model.signals.events.PolicyEntryCreated;
+import org.eclipse.ditto.policies.model.signals.events.PolicyEntryDeleted;
+import org.eclipse.ditto.policies.model.signals.events.PolicyEntryModified;
+import org.eclipse.ditto.policies.model.signals.events.PolicyEvent;
+import org.eclipse.ditto.policies.model.signals.events.PolicyModified;
+import org.eclipse.ditto.policies.model.signals.events.ResourceCreated;
+import org.eclipse.ditto.policies.model.signals.events.ResourceDeleted;
+import org.eclipse.ditto.policies.model.signals.events.ResourceModified;
+import org.eclipse.ditto.policies.model.signals.events.ResourcesModified;
+import org.eclipse.ditto.policies.model.signals.events.SubjectCreated;
+import org.eclipse.ditto.policies.model.signals.events.SubjectDeleted;
+import org.eclipse.ditto.policies.model.signals.events.SubjectModified;
+import org.eclipse.ditto.policies.model.signals.events.SubjectsDeletedPartially;
+import org.eclipse.ditto.policies.model.signals.events.SubjectsModified;
+import org.eclipse.ditto.policies.model.signals.events.SubjectsModifiedPartially;
+import org.eclipse.ditto.protocol.Adaptable;
+import org.eclipse.ditto.protocol.JsonifiableMapper;
+import org.eclipse.ditto.protocol.Payload;
+
+/**
+ * Defines mapping strategies (map from signal type to JsonifiableMapper) for policy events.
+ */
+final class PolicyEventMappingStrategies extends AbstractPolicyMappingStrategies<PolicyEvent<?>> {
+
+    private static final PolicyEventMappingStrategies INSTANCE = new PolicyEventMappingStrategies();
+
+    private PolicyEventMappingStrategies() {
+        super(initMappingStrategies());
+    }
+
+    static PolicyEventMappingStrategies getInstance() {
+        return INSTANCE;
+    }
+
+    private static Map<String, JsonifiableMapper<PolicyEvent<?>>> initMappingStrategies() {
+        final Map<String, JsonifiableMapper<PolicyEvent<?>>> mappingStrategies = new HashMap<>();
+        addTopLevelEvents(mappingStrategies);
+        addPolicyEntriesEvents(mappingStrategies);
+        addPolicyEntryEvents(mappingStrategies);
+        addResourcesEvents(mappingStrategies);
+        addResourceEvents(mappingStrategies);
+        addSubjectsEvents(mappingStrategies);
+        addSubjectEvents(mappingStrategies);
+        return mappingStrategies;
+    }
+
+    private static void addTopLevelEvents(
+            final Map<String, JsonifiableMapper<PolicyEvent<?>>> mappingStrategies) {
+        mappingStrategies.put(PolicyCreated.TYPE,
+                adaptable -> PolicyCreated.of(policyFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+        mappingStrategies.put(PolicyModified.TYPE,
+                adaptable -> PolicyModified.of(policyFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+        mappingStrategies.put(PolicyDeleted.TYPE,
+                adaptable -> PolicyDeleted.of(policyIdFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+    }
+
+    private static void addPolicyEntriesEvents(
+            final Map<String, JsonifiableMapper<PolicyEvent<?>>> mappingStrategies) {
+        mappingStrategies.put(PolicyEntriesModified.TYPE,
+                adaptable -> PolicyEntriesModified.of(policyIdFrom(adaptable),
+                        policyEntriesFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+    }
+
+    private static void addPolicyEntryEvents(
+            final Map<String, JsonifiableMapper<PolicyEvent<?>>> mappingStrategies) {
+        mappingStrategies.put(PolicyEntryCreated.TYPE,
+                adaptable -> PolicyEntryCreated.of(policyIdFrom(adaptable),
+                        policyEntryFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+        mappingStrategies.put(PolicyEntryModified.TYPE,
+                adaptable -> PolicyEntryModified.of(policyIdFrom(adaptable),
+                        policyEntryFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+        mappingStrategies.put(PolicyEntryDeleted.TYPE,
+                adaptable -> PolicyEntryDeleted.of(policyIdFrom(adaptable),
+                        labelFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+    }
+
+    private static void addResourcesEvents(
+            final Map<String, JsonifiableMapper<PolicyEvent<?>>> mappingStrategies) {
+        mappingStrategies.put(ResourcesModified.TYPE,
+                adaptable -> ResourcesModified.of(policyIdFrom(adaptable),
+                        labelFrom(adaptable),
+                        resourcesFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+    }
+
+    private static void addResourceEvents(
+            final Map<String, JsonifiableMapper<PolicyEvent<?>>> mappingStrategies) {
+        mappingStrategies.put(ResourceCreated.TYPE,
+                adaptable -> ResourceCreated.of(policyIdFrom(adaptable),
+                        labelFrom(adaptable),
+                        resourceFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+        mappingStrategies.put(ResourceModified.TYPE,
+                adaptable -> ResourceModified.of(policyIdFrom(adaptable),
+                        labelFrom(adaptable),
+                        resourceFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+        mappingStrategies.put(ResourceDeleted.TYPE,
+                adaptable -> ResourceDeleted.of(policyIdFrom(adaptable),
+                        labelFrom(adaptable),
+                        entryResourceKeyFromPath(adaptable.getPayload().getPath()),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+    }
+
+    private static void addSubjectsEvents(
+            final Map<String, JsonifiableMapper<PolicyEvent<?>>> mappingStrategies) {
+        mappingStrategies.put(SubjectsModified.TYPE,
+                adaptable -> SubjectsModified.of(policyIdFrom(adaptable),
+                        labelFrom(adaptable),
+                        subjectsFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+        mappingStrategies.put(SubjectsModifiedPartially.TYPE,
+                adaptable -> SubjectsModifiedPartially.of(policyIdFrom(adaptable),
+                        activatedSubjectsFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+        mappingStrategies.put(SubjectsDeletedPartially.TYPE,
+                adaptable -> SubjectsDeletedPartially.of(policyIdFrom(adaptable),
+                        deletedSubjectIdsFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+    }
+
+    private static void addSubjectEvents(
+            final Map<String, JsonifiableMapper<PolicyEvent<?>>> mappingStrategies) {
+        mappingStrategies.put(SubjectCreated.TYPE,
+                adaptable -> SubjectCreated.of(policyIdFrom(adaptable),
+                        labelFrom(adaptable),
+                        subjectFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+        mappingStrategies.put(SubjectModified.TYPE,
+                adaptable -> SubjectModified.of(policyIdFrom(adaptable),
+                        labelFrom(adaptable),
+                        subjectFrom(adaptable),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+        mappingStrategies.put(SubjectDeleted.TYPE,
+                adaptable -> SubjectDeleted.of(policyIdFrom(adaptable),
+                        labelFrom(adaptable),
+                        entrySubjectIdFromPath(adaptable.getPayload().getPath()),
+                        revisionFrom(adaptable),
+                        timestampFrom(adaptable),
+                        dittoHeadersFrom(adaptable),
+                        metadataFrom(adaptable)));
+    }
+
+    private static long revisionFrom(final Adaptable adaptable) {
+        return adaptable.getPayload().getRevision().orElseThrow(() -> JsonMissingFieldException.newBuilder()
+                .fieldName(Payload.JsonFields.REVISION.getPointer().toString()).build());
+    }
+
+    @Nullable
+    private static Instant timestampFrom(final Adaptable adaptable) {
+        return adaptable.getPayload().getTimestamp().orElse(null);
+    }
+
+    @Nullable
+    private static Metadata metadataFrom(final Adaptable adaptable) {
+        return adaptable.getPayload().getMetadata().orElse(null);
+    }
+
+}
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/StreamingSubscriptionCommandMappingStrategies.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/StreamingSubscriptionCommandMappingStrategies.java
new file mode 100644
index 00000000000..fb8881e7eb3
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/StreamingSubscriptionCommandMappingStrategies.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.protocol.mappingstrategies;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.ditto.base.model.signals.commands.streaming.CancelStreamingSubscription;
+import org.eclipse.ditto.base.model.signals.commands.streaming.RequestFromStreamingSubscription;
+import org.eclipse.ditto.base.model.signals.commands.streaming.StreamingSubscriptionCommand;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
+import org.eclipse.ditto.protocol.Adaptable;
+import org.eclipse.ditto.protocol.JsonifiableMapper;
+
+/**
+ * Defines mapping strategies (map from signal type to JsonifiableMapper) for streaming subscription commands.
+ */
+final class StreamingSubscriptionCommandMappingStrategies
+        extends AbstractStreamingSubscriptionMappingStrategies<StreamingSubscriptionCommand<?>> {
+
+    private static final StreamingSubscriptionCommandMappingStrategies INSTANCE =
+            new StreamingSubscriptionCommandMappingStrategies();
+
+    private StreamingSubscriptionCommandMappingStrategies() {
+        super(initMappingStrategies());
+    }
+
+    static StreamingSubscriptionCommandMappingStrategies getInstance() {
+        return INSTANCE;
+    }
+
+    private static Map<String, JsonifiableMapper<StreamingSubscriptionCommand<?>>> initMappingStrategies() {
+
+        final Map<String, JsonifiableMapper<StreamingSubscriptionCommand<?>>> mappingStrategies = new HashMap<>();
+
+        mappingStrategies.put(SubscribeForPersistedEvents.TYPE,
+                adaptable -> SubscribeForPersistedEvents.of(entityIdFrom(adaptable),
+                        resourcePathFrom(adaptable),
+                        fromHistoricalRevision(adaptable),
+                        toHistoricalRevision(adaptable),
+                        fromHistoricalTimestamp(adaptable),
+                        toHistoricalTimestamp(adaptable),
+                        dittoHeadersFrom(adaptable)));
+        mappingStrategies.put(CancelStreamingSubscription.TYPE,
+                adaptable -> CancelStreamingSubscription.of(entityIdFrom(adaptable),
+                        resourcePathFrom(adaptable),
+                        Objects.requireNonNull(subscriptionIdFrom(adaptable)),
+                        dittoHeadersFrom(adaptable)));
+        mappingStrategies.put(RequestFromStreamingSubscription.TYPE,
+                adaptable -> RequestFromStreamingSubscription.of(entityIdFrom(adaptable),
+                        resourcePathFrom(adaptable),
+                        Objects.requireNonNull(subscriptionIdFrom(adaptable)),
+                        demandFrom(adaptable),
+                        dittoHeadersFrom(adaptable)));
+
+        return mappingStrategies;
+    }
+
+    @Nullable
+    private static Long fromHistoricalRevision(final Adaptable adaptable) {
+        return getFromValue(adaptable, SubscribeForPersistedEvents.JsonFields.JSON_FROM_HISTORICAL_REVISION)
+                .orElse(null);
+    }
+
+    @Nullable
+    private static Long toHistoricalRevision(final Adaptable adaptable) {
+        return getFromValue(adaptable, SubscribeForPersistedEvents.JsonFields.JSON_TO_HISTORICAL_REVISION)
+                .orElse(null);
+    }
+
+    @Nullable
+    private static Instant fromHistoricalTimestamp(final Adaptable adaptable) {
+        return getFromValue(adaptable, SubscribeForPersistedEvents.JsonFields.JSON_FROM_HISTORICAL_TIMESTAMP)
+                .map(Instant::parse)
+                .orElse(null);
+    }
+
+    @Nullable
+    private static Instant toHistoricalTimestamp(final Adaptable adaptable) {
+        return getFromValue(adaptable, SubscribeForPersistedEvents.JsonFields.JSON_TO_HISTORICAL_TIMESTAMP)
+                .map(Instant::parse)
+                .orElse(null);
+    }
+
+    private static long demandFrom(final Adaptable adaptable) {
+        return getFromValue(adaptable, RequestFromStreamingSubscription.JsonFields.DEMAND).orElse(0L);
+    }
+
+}
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/StreamingSubscriptionEventMappingStrategies.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/StreamingSubscriptionEventMappingStrategies.java
new file mode 100644
index 00000000000..07bfa9abe56
--- /dev/null
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/StreamingSubscriptionEventMappingStrategies.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.protocol.mappingstrategies;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.ErrorRegistry;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionComplete;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionCreated;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionEvent;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionFailed;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionHasNext;
+import org.eclipse.ditto.json.JsonParseException;
+import org.eclipse.ditto.json.JsonValue;
+import org.eclipse.ditto.protocol.Adaptable;
+import org.eclipse.ditto.protocol.JsonifiableMapper;
+import org.eclipse.ditto.protocol.adapter.AbstractErrorResponseAdapter;
+
+/**
+ * Defines mapping strategies (map from signal type to JsonifiableMapper) for streaming subscription events.
+ */
+final class StreamingSubscriptionEventMappingStrategies
+        extends AbstractStreamingSubscriptionMappingStrategies<StreamingSubscriptionEvent<?>> {
+
+    private StreamingSubscriptionEventMappingStrategies(final ErrorRegistry<?> errorRegistry) {
+        super(initMappingStrategies(errorRegistry));
+    }
+
+    static StreamingSubscriptionEventMappingStrategies getInstance(final ErrorRegistry<?> errorRegistry) {
+        return new StreamingSubscriptionEventMappingStrategies(errorRegistry);
+    }
+
+    private static Map<String, JsonifiableMapper<StreamingSubscriptionEvent<?>>> initMappingStrategies(
+            final ErrorRegistry<?> errorRegistry) {
+
+        final Map<String, JsonifiableMapper<StreamingSubscriptionEvent<?>>> mappingStrategies = new HashMap<>();
+
+        mappingStrategies.put(StreamingSubscriptionCreated.TYPE,
+                adaptable -> StreamingSubscriptionCreated.of(Objects.requireNonNull(subscriptionIdFrom(adaptable)),
+                        entityIdFrom(adaptable), dittoHeadersFrom(adaptable)));
+        mappingStrategies.put(StreamingSubscriptionComplete.TYPE,
+                adaptable -> StreamingSubscriptionComplete.of(Objects.requireNonNull(subscriptionIdFrom(adaptable)),
+                        entityIdFrom(adaptable), dittoHeadersFrom(adaptable)));
+        mappingStrategies.put(StreamingSubscriptionFailed.TYPE,
+                adaptable -> StreamingSubscriptionFailed.of(Objects.requireNonNull(subscriptionIdFrom(adaptable)),
+                        entityIdFrom(adaptable), errorFrom(adaptable, errorRegistry), dittoHeadersFrom(adaptable)));
+        mappingStrategies.put(StreamingSubscriptionHasNext.TYPE,
+                adaptable -> StreamingSubscriptionHasNext.of(Objects.requireNonNull(subscriptionIdFrom(adaptable)),
+                        entityIdFrom(adaptable),itemFrom(adaptable), dittoHeadersFrom(adaptable)));
+
+        return mappingStrategies;
+    }
+
+    private static JsonValue itemFrom(final Adaptable adaptable) {
+        return getFromValue(adaptable, StreamingSubscriptionHasNext.JsonFields.ITEM).orElseGet(JsonValue::nullLiteral);
+    }
+
+    private static DittoRuntimeException errorFrom(final Adaptable adaptable, final ErrorRegistry<?> errorRegistry) {
+        return getFromValue(adaptable, StreamingSubscriptionFailed.JsonFields.ERROR)
+                .map(error ->
+                        AbstractErrorResponseAdapter.parseWithErrorRegistry(error, DittoHeaders.empty(), errorRegistry))
+                .orElseThrow(() -> JsonParseException.newBuilder().build());
+    }
+
+}
diff --git a/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/DittoProtocolAdapterParameterizedTest.java b/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/DittoProtocolAdapterParameterizedTest.java
index cae6597b5fa..c99d8507e33 100644
--- a/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/DittoProtocolAdapterParameterizedTest.java
+++ b/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/DittoProtocolAdapterParameterizedTest.java
@@ -212,6 +212,11 @@ public void setUp() {
         final ConnectivityCommandAdapterProvider connectivityCommandAdapterProvider =
                 mock(ConnectivityCommandAdapterProvider.class);
 
+        final StreamingSubscriptionCommandAdapter streamingSubscriptionCommandAdapter =
+                mock(StreamingSubscriptionCommandAdapter.class);
+        final StreamingSubscriptionEventAdapter streamingSubscriptionEventAdapter =
+                mock(StreamingSubscriptionEventAdapter.class);
+
         when(thingCommandAdapterProvider.getQueryCommandAdapter())
                 .thenReturn(thingQueryCommandAdapter);
         when(thingCommandAdapterProvider.getQueryCommandResponseAdapter())
@@ -247,9 +252,11 @@ public void setUp() {
                 .thenReturn(policyErrorResponseAdapter);
 
         final AdapterResolver adapterResolver = new DefaultAdapterResolver(thingCommandAdapterProvider,
-                policyCommandAdapterProvider, connectivityCommandAdapterProvider, acknowledgementAdapterProvider);
+                policyCommandAdapterProvider, connectivityCommandAdapterProvider, acknowledgementAdapterProvider,
+                streamingSubscriptionCommandAdapter, streamingSubscriptionEventAdapter);
         underTest = DittoProtocolAdapter.newInstance(HeaderTranslator.empty(), thingCommandAdapterProvider,
                 policyCommandAdapterProvider, connectivityCommandAdapterProvider, acknowledgementAdapterProvider,
+                streamingSubscriptionCommandAdapter, streamingSubscriptionEventAdapter,
                 adapterResolver);
 
         reset(thingQueryCommandAdapter);
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/InvalidThingFieldSelectionException.java b/things/model/src/main/java/org/eclipse/ditto/things/model/InvalidThingFieldSelectionException.java
index 6b32b00180d..efcbd64f6c4 100644
--- a/things/model/src/main/java/org/eclipse/ditto/things/model/InvalidThingFieldSelectionException.java
+++ b/things/model/src/main/java/org/eclipse/ditto/things/model/InvalidThingFieldSelectionException.java
@@ -18,12 +18,12 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 
-import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.json.JsonObject;
 
 /**
  * Thrown when a {@link ThingFieldSelector} was not valid.
@@ -34,9 +34,9 @@
 public final class InvalidThingFieldSelectionException extends DittoRuntimeException implements ThingException {
 
     private static final String DEFAULT_MESSAGE_TEMPLATE = "Thing field selection <{0}> was not valid.";
-    private static final String DEFAULT_DESCRIPTION = "Please provide a comma separated List of valid Thing fields." +
+    private static final String DEFAULT_DESCRIPTION = "Please provide a comma separated List of valid Thing fields. " +
             "Make sure that you did not use a space after a comma. Valid Fields are: " +
-            ThingFieldSelector.SELECTABLE_FIELDS.toString();
+            ThingFieldSelector.SELECTABLE_FIELDS;
 
     static final String ERROR_CODE = ERROR_CODE_PREFIX + "field.selection.invalid";
 
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/ThingFieldSelector.java b/things/model/src/main/java/org/eclipse/ditto/things/model/ThingFieldSelector.java
index 835d8efd904..81c3e55e8a5 100644
--- a/things/model/src/main/java/org/eclipse/ditto/things/model/ThingFieldSelector.java
+++ b/things/model/src/main/java/org/eclipse/ditto/things/model/ThingFieldSelector.java
@@ -38,7 +38,7 @@ public final class ThingFieldSelector implements JsonFieldSelector {
             .withoutUrlDecoding()
             .build();
     static final List<String> SELECTABLE_FIELDS = Arrays.asList("thingId", "policyId", "definition",
-            "_namespace", "_revision", "_created", "_modified", "_metadata", "_policy",
+            "_namespace", "_revision", "_created", "_modified", "_metadata", "_policy", "_context", "_context(/[^,]+)?",
             "features(/[^,]+)?", "attributes(/[^,]+)?");
     private static final String KNOWN_FIELDS_REGEX = "/?(" + String.join("|", SELECTABLE_FIELDS) + ")";
     private static final String FIELD_SELECTION_REGEX = "^" + KNOWN_FIELDS_REGEX + "(," + KNOWN_FIELDS_REGEX + ")*$";
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/WithThingId.java b/things/model/src/main/java/org/eclipse/ditto/things/model/WithThingId.java
index 67c1ce14736..3b156c9d299 100644
--- a/things/model/src/main/java/org/eclipse/ditto/things/model/WithThingId.java
+++ b/things/model/src/main/java/org/eclipse/ditto/things/model/WithThingId.java
@@ -16,7 +16,7 @@
 
 /**
  * Implementations of this interface are associated to a {@code Thing} identified by the value
- * returned from {@link #getEntityId()} ()}.
+ * returned from {@link #getEntityId()}.
  */
 public interface WithThingId extends WithEntityId {
 
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/exceptions/ThingHistoryNotAccessibleException.java b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/exceptions/ThingHistoryNotAccessibleException.java
new file mode 100755
index 00000000000..e06eb9e1a1e
--- /dev/null
+++ b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/exceptions/ThingHistoryNotAccessibleException.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.things.model.signals.commands.exceptions;
+
+import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
+
+import java.net.URI;
+import java.text.MessageFormat;
+import java.time.Instant;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+import javax.annotation.concurrent.NotThreadSafe;
+
+import org.eclipse.ditto.base.model.common.HttpStatus;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.things.model.ThingException;
+import org.eclipse.ditto.things.model.ThingId;
+
+/**
+ * Thrown if historical data of the Thing was either not present in Ditto at all or if the requester had insufficient
+ * permissions to access it.
+ *
+ * @since 3.2.0
+ */
+@Immutable
+@JsonParsableException(errorCode = ThingHistoryNotAccessibleException.ERROR_CODE)
+public final class ThingHistoryNotAccessibleException extends DittoRuntimeException implements ThingException {
+
+    /**
+     * Error code of this exception.
+     */
+    public static final String ERROR_CODE = ERROR_CODE_PREFIX + "thing.history.notfound";
+
+    private static final String MESSAGE_TEMPLATE =
+            "The Thing with ID ''{0}'' at revision ''{1}'' could not be found or requester had insufficient " +
+                    "permissions to access it.";
+
+    private static final String MESSAGE_TEMPLATE_TS =
+            "The Thing with ID ''{0}'' at timestamp ''{1}'' could not be found or requester had insufficient " +
+                    "permissions to access it.";
+
+    private static final String DEFAULT_DESCRIPTION =
+            "Check if the ID of your requested Thing was correct, you have sufficient permissions and ensure that the " +
+                    "asked for revision/timestamp does not exceed the history-retention-duration.";
+
+    private static final long serialVersionUID = 8883736111094383234L;
+
+    private ThingHistoryNotAccessibleException(final DittoHeaders dittoHeaders,
+            @Nullable final String message,
+            @Nullable final String description,
+            @Nullable final Throwable cause,
+            @Nullable final URI href) {
+        super(ERROR_CODE, HttpStatus.NOT_FOUND, dittoHeaders, message, description, cause, href);
+    }
+
+    private static String getMessage(final ThingId thingId, final long revision) {
+        checkNotNull(thingId, "thingId");
+        return MessageFormat.format(MESSAGE_TEMPLATE, String.valueOf(thingId), String.valueOf(revision));
+    }
+
+    private static String getMessage(final ThingId thingId, final Instant timestamp) {
+        checkNotNull(thingId, "thingId");
+        checkNotNull(timestamp, "timestamp");
+        return MessageFormat.format(MESSAGE_TEMPLATE_TS, String.valueOf(thingId), timestamp.toString());
+    }
+
+    /**
+     * A mutable builder for a {@code ThingHistoryNotAccessibleException}.
+     *
+     * @param thingId the ID of the thing.
+     * @param revision the asked for revision of the thing.
+     * @return the builder.
+     * @throws NullPointerException if {@code thingId} is {@code null}.
+     */
+    public static Builder newBuilder(final ThingId thingId, final long revision) {
+        return new Builder(thingId, revision);
+    }
+
+    /**
+     * A mutable builder for a {@code ThingHistoryNotAccessibleException}.
+     *
+     * @param thingId the ID of the thing.
+     * @param timestamp the asked for timestamp of the thing.
+     * @return the builder.
+     * @throws NullPointerException if {@code thingId} is {@code null}.
+     */
+    public static Builder newBuilder(final ThingId thingId, final Instant timestamp) {
+        return new Builder(thingId, timestamp);
+    }
+
+    /**
+     * Constructs a new {@code ThingHistoryNotAccessibleException} object with given message.
+     *
+     * @param message detail message. This message can be later retrieved by the {@link #getMessage()} method.
+     * @param dittoHeaders the headers of the command which resulted in this exception.
+     * @return the new ThingHistoryNotAccessibleException.
+     * @throws NullPointerException if {@code dittoHeaders} is {@code null}.
+     */
+    public static ThingHistoryNotAccessibleException fromMessage(@Nullable final String message,
+            final DittoHeaders dittoHeaders) {
+        return DittoRuntimeException.fromMessage(message, dittoHeaders, new Builder());
+    }
+
+    /**
+     * Constructs a new {@code ThingHistoryNotAccessibleException} object with the exception message extracted from the given
+     * JSON object.
+     *
+     * @param jsonObject the JSON to read the {@link org.eclipse.ditto.base.model.exceptions.DittoRuntimeException.JsonFields#MESSAGE} field from.
+     * @param dittoHeaders the headers of the command which resulted in this exception.
+     * @return the new ThingHistoryNotAccessibleException.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonMissingFieldException if this JsonObject did not contain an error message.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static ThingHistoryNotAccessibleException fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
+        return DittoRuntimeException.fromJson(jsonObject, dittoHeaders, new Builder());
+    }
+
+    @Override
+    public DittoRuntimeException setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new Builder()
+                .message(getMessage())
+                .description(getDescription().orElse(null))
+                .cause(getCause())
+                .href(getHref().orElse(null))
+                .dittoHeaders(dittoHeaders)
+                .build();
+    }
+
+    /**
+     * A mutable builder with a fluent API for a {@link org.eclipse.ditto.things.model.signals.commands.exceptions.ThingHistoryNotAccessibleException}.
+     */
+    @NotThreadSafe
+    public static final class Builder extends DittoRuntimeExceptionBuilder<ThingHistoryNotAccessibleException> {
+
+        private Builder() {
+            description(DEFAULT_DESCRIPTION);
+        }
+
+        private Builder(final ThingId thingId, final long revision) {
+            this();
+            message(ThingHistoryNotAccessibleException.getMessage(thingId, revision));
+        }
+
+        private Builder(final ThingId thingId, final Instant timestamp) {
+            this();
+            message(ThingHistoryNotAccessibleException.getMessage(thingId, timestamp));
+        }
+
+        @Override
+        protected ThingHistoryNotAccessibleException doBuild(final DittoHeaders dittoHeaders,
+                @Nullable final String message,
+                @Nullable final String description,
+                @Nullable final Throwable cause,
+                @Nullable final URI href) {
+            return new ThingHistoryNotAccessibleException(dittoHeaders, message, description, cause, href);
+        }
+
+    }
+
+}
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/common/config/DefaultThingConfig.java b/things/service/src/main/java/org/eclipse/ditto/things/service/common/config/DefaultThingConfig.java
index 00c0774e8f0..649e08d1ca1 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/common/config/DefaultThingConfig.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/common/config/DefaultThingConfig.java
@@ -23,7 +23,9 @@
 import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.ActivityCheckConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.DefaultActivityCheckConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.config.DefaultEventConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.DefaultSnapshotConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.config.EventConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.SnapshotConfig;
 import org.eclipse.ditto.internal.utils.persistentactors.cleanup.CleanupConfig;
 
@@ -41,6 +43,7 @@ public final class DefaultThingConfig implements ThingConfig {
     private final SupervisorConfig supervisorConfig;
     private final ActivityCheckConfig activityCheckConfig;
     private final SnapshotConfig snapshotConfig;
+    private final EventConfig eventConfig;
     private final CleanupConfig cleanupConfig;
 
     private DefaultThingConfig(final ScopedConfig scopedConfig) {
@@ -48,6 +51,7 @@ private DefaultThingConfig(final ScopedConfig scopedConfig) {
         supervisorConfig = DefaultSupervisorConfig.of(scopedConfig);
         activityCheckConfig = DefaultActivityCheckConfig.of(scopedConfig);
         snapshotConfig = DefaultSnapshotConfig.of(scopedConfig);
+        eventConfig = DefaultEventConfig.of(scopedConfig);
         cleanupConfig = CleanupConfig.of(scopedConfig);
     }
 
@@ -82,6 +86,11 @@ public CleanupConfig getCleanupConfig() {
         return cleanupConfig;
     }
 
+    @Override
+    public EventConfig getEventConfig() {
+        return eventConfig;
+    }
+
     @Override
     public Duration getShutdownTimeout() {
         return shutdownTimeout;
@@ -99,13 +108,15 @@ public boolean equals(final Object o) {
         return Objects.equals(supervisorConfig, that.supervisorConfig) &&
                 Objects.equals(activityCheckConfig, that.activityCheckConfig) &&
                 Objects.equals(snapshotConfig, that.snapshotConfig) &&
+                Objects.equals(eventConfig, that.eventConfig) &&
                 Objects.equals(cleanupConfig, that.cleanupConfig) &&
                 Objects.equals(shutdownTimeout, that.shutdownTimeout);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(supervisorConfig, activityCheckConfig, snapshotConfig, cleanupConfig, shutdownTimeout);
+        return Objects.hash(supervisorConfig, activityCheckConfig, snapshotConfig, eventConfig, cleanupConfig,
+                shutdownTimeout);
     }
 
     @Override
@@ -114,6 +125,7 @@ public String toString() {
                 "supervisorConfig=" + supervisorConfig +
                 ", activityCheckConfig=" + activityCheckConfig +
                 ", snapshotConfig=" + snapshotConfig +
+                ", eventConfig=" + eventConfig +
                 ", cleanupConfig=" + cleanupConfig +
                 ", shutdownTimeout=" + shutdownTimeout +
                 "]";
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/common/config/ThingConfig.java b/things/service/src/main/java/org/eclipse/ditto/things/service/common/config/ThingConfig.java
index 544dd82a3cd..d9dc9936518 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/common/config/ThingConfig.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/common/config/ThingConfig.java
@@ -18,6 +18,7 @@
 
 import org.eclipse.ditto.base.service.config.supervision.WithSupervisorConfig;
 import org.eclipse.ditto.internal.utils.config.KnownConfigValue;
+import org.eclipse.ditto.internal.utils.persistence.mongo.config.EventConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.WithActivityCheckConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.WithSnapshotConfig;
 import org.eclipse.ditto.internal.utils.persistentactors.cleanup.WithCleanupConfig;
@@ -29,6 +30,13 @@
 public interface ThingConfig extends WithSupervisorConfig, WithActivityCheckConfig, WithSnapshotConfig,
         WithCleanupConfig {
 
+    /**
+     * Returns the config of the thing event journal behaviour.
+     *
+     * @return the config.
+     */
+    EventConfig getEventConfig();
+
     /**
      * Get the timeout waiting for responses and acknowledgements during coordinated shutdown.
      *
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/StreamRequestingCommandEnforcement.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/StreamRequestingCommandEnforcement.java
new file mode 100644
index 00000000000..d837476ffee
--- /dev/null
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/StreamRequestingCommandEnforcement.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.things.service.enforcement;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
+import org.eclipse.ditto.base.model.signals.commands.streaming.StreamingSubscriptionCommand;
+import org.eclipse.ditto.policies.api.Permission;
+import org.eclipse.ditto.policies.enforcement.AbstractEnforcementReloaded;
+import org.eclipse.ditto.policies.enforcement.EnforcementReloaded;
+import org.eclipse.ditto.policies.enforcement.PolicyEnforcer;
+import org.eclipse.ditto.policies.model.Permissions;
+import org.eclipse.ditto.policies.model.ResourceKey;
+import org.eclipse.ditto.things.model.ThingId;
+import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingNotAccessibleException;
+
+/**
+ * Authorizes {@link StreamingSubscriptionCommand}s and filters {@link CommandResponse}s.
+ */
+final class StreamRequestingCommandEnforcement
+        extends AbstractEnforcementReloaded<StreamingSubscriptionCommand<?>, CommandResponse<?>>
+        implements ThingEnforcementStrategy {
+
+    @Override
+    public boolean isApplicable(final Signal<?> signal) {
+        return signal instanceof StreamingSubscriptionCommand;
+    }
+
+    @Override
+    public boolean responseIsApplicable(final CommandResponse<?> commandResponse) {
+        return false;
+    }
+
+    @Override
+    public <S extends Signal<?>, R extends CommandResponse<?>> EnforcementReloaded<S, R> getEnforcement() {
+        return (EnforcementReloaded<S, R>) this;
+    }
+
+    @Override
+    public CompletionStage<StreamingSubscriptionCommand<?>> authorizeSignal(final StreamingSubscriptionCommand<?> signal,
+            final PolicyEnforcer policyEnforcer) {
+
+        final ResourceKey resourceKey = ResourceKey.newInstance(signal.getResourceType(), signal.getResourcePath());
+        if (policyEnforcer.getEnforcer().hasUnrestrictedPermissions(resourceKey,
+                signal.getDittoHeaders().getAuthorizationContext(), Permissions.newInstance(Permission.READ))) {
+            return CompletableFuture.completedStage(
+                    ThingCommandEnforcement.addEffectedReadSubjectsToThingSignal(signal, policyEnforcer.getEnforcer())
+            );
+        } else {
+            return CompletableFuture.failedStage(
+                    ThingNotAccessibleException.newBuilder(ThingId.of(signal.getEntityId()))
+                            .dittoHeaders(signal.getDittoHeaders())
+                            .build());
+        }
+    }
+
+    @Override
+    public CompletionStage<StreamingSubscriptionCommand<?>> authorizeSignalWithMissingEnforcer(
+            final StreamingSubscriptionCommand<?> signal) {
+
+        return CompletableFuture.failedStage(ThingNotAccessibleException.newBuilder(ThingId.of(signal.getEntityId()))
+                .dittoHeaders(signal.getDittoHeaders())
+                .build());
+    }
+
+    @Override
+    public boolean shouldFilterCommandResponse(final CommandResponse<?> commandResponse) {
+        return false;
+    }
+
+    @Override
+    public CompletionStage<CommandResponse<?>> filterResponse(final CommandResponse<?> commandResponse,
+            final PolicyEnforcer policyEnforcer) {
+        return CompletableFuture.completedStage(commandResponse);
+    }
+}
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcement.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcement.java
index a2462c528fe..ff969d271e7 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcement.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcement.java
@@ -40,7 +40,8 @@ public ThingEnforcement(final ActorRef policiesShardRegion, final ActorSystem ac
 
         enforcementStrategies = List.of(
                 new LiveSignalEnforcement(),
-                new ThingCommandEnforcement(actorSystem, policiesShardRegion, enforcementConfig)
+                new ThingCommandEnforcement(actorSystem, policiesShardRegion, enforcementConfig),
+                new StreamRequestingCommandEnforcement()
         );
     }
 
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java
index 9e682bc0b88..5245df33416 100755
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java
@@ -12,6 +12,8 @@
  */
 package org.eclipse.ditto.things.service.persistence.actors;
 
+import java.time.Instant;
+
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.acks.DittoAcknowledgementLabel;
@@ -24,6 +26,7 @@
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.ActivityCheckConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.SnapshotConfig;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.persistentactors.AbstractPersistenceActor;
 import org.eclipse.ditto.internal.utils.persistentactors.commands.CommandStrategy;
 import org.eclipse.ditto.internal.utils.persistentactors.commands.DefaultContext;
@@ -38,6 +41,7 @@
 import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.ThingLifecycle;
 import org.eclipse.ditto.things.model.ThingsModelFactory;
+import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingHistoryNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingNotAccessibleException;
 import org.eclipse.ditto.things.model.signals.commands.modify.CreateThing;
 import org.eclipse.ditto.things.model.signals.commands.query.RetrieveThing;
@@ -83,10 +87,11 @@ public final class ThingPersistenceActor
 
     @SuppressWarnings("unused")
     private ThingPersistenceActor(final ThingId thingId,
+            final MongoReadJournal mongoReadJournal,
             final DistributedPub<ThingEvent<?>> distributedPub,
             @Nullable final ActorRef searchShardRegionProxy) {
 
-        super(thingId);
+        super(thingId, mongoReadJournal);
         final DittoThingsConfig thingsConfig = DittoThingsConfig.of(
                 DefaultScopedConfig.dittoScoped(getContext().getSystem().settings().config())
         );
@@ -99,14 +104,17 @@ private ThingPersistenceActor(final ThingId thingId,
      * Creates Akka configuration object {@link Props} for this ThingPersistenceActor.
      *
      * @param thingId the Thing ID this Actor manages.
+     * @param mongoReadJournal the ReadJournal used for gaining access to historical values of the thing.
      * @param distributedPub the distributed-pub access to publish thing events.
      * @return the Akka configuration Props object
      */
     public static Props props(final ThingId thingId,
+            final MongoReadJournal mongoReadJournal,
             final DistributedPub<ThingEvent<?>> distributedPub,
             @Nullable final ActorRef searchShardRegionProxy) {
 
-        return Props.create(ThingPersistenceActor.class, thingId, distributedPub, searchShardRegionProxy);
+        return Props.create(ThingPersistenceActor.class, thingId, mongoReadJournal, distributedPub,
+                searchShardRegionProxy);
     }
 
     @Override
@@ -193,6 +201,16 @@ protected DittoRuntimeExceptionBuilder<?> newNotAccessibleExceptionBuilder() {
         return ThingNotAccessibleException.newBuilder(entityId);
     }
 
+    @Override
+    protected DittoRuntimeExceptionBuilder<?> newHistoryNotAccessibleExceptionBuilder(final long revision) {
+        return ThingHistoryNotAccessibleException.newBuilder(entityId, revision);
+    }
+
+    @Override
+    protected DittoRuntimeExceptionBuilder<?> newHistoryNotAccessibleExceptionBuilder(final Instant timestamp) {
+        return ThingHistoryNotAccessibleException.newBuilder(entityId, timestamp);
+    }
+
     @Override
     protected void recoveryCompleted(final RecoveryCompleted event) {
         if (entity != null) {
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorPropsFactory.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorPropsFactory.java
index 7845e202f82..a5d5777896d 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorPropsFactory.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorPropsFactory.java
@@ -14,8 +14,9 @@
 
 import javax.annotation.Nullable;
 
-import org.eclipse.ditto.things.model.ThingId;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedPub;
+import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.signals.events.ThingEvent;
 
 import akka.actor.ActorRef;
@@ -31,10 +32,11 @@ public interface ThingPersistenceActorPropsFactory {
      * Create Props of thing-persistence-actor from thing ID and distributed-pub access for event publishing.
      *
      * @param thingId the thing ID.
+     * @param mongoReadJournal the ReadJournal used for gaining access to historical values of the thing.
      * @param distributedPub the distributed-pub access.
      * @param searchShardRegionProxy the proxy of the shard region of search updaters.
      * @return Props of the thing-persistence-actor.
      */
-    Props props(ThingId thingId, DistributedPub<ThingEvent<?>> distributedPub,
-            @Nullable final ActorRef searchShardRegionProxy);
+    Props props(ThingId thingId, MongoReadJournal mongoReadJournal, DistributedPub<ThingEvent<?>> distributedPub,
+            @Nullable ActorRef searchShardRegionProxy);
 }
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
index d7c732b1c71..6e93323c2ea 100755
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
@@ -34,6 +34,7 @@
 import org.eclipse.ditto.internal.utils.cluster.StopShardedActor;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.internal.utils.namespaces.BlockedNamespaces;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.persistentactors.AbstractPersistenceSupervisor;
 import org.eclipse.ditto.internal.utils.persistentactors.TargetActorWithMessage;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedPub;
@@ -102,9 +103,10 @@ private ThingSupervisorActor(final ActorRef pubSubMediator,
             @Nullable final ThingPersistenceActorPropsFactory thingPersistenceActorPropsFactory,
             @Nullable final ActorRef thingPersistenceActorRef,
             @Nullable final BlockedNamespaces blockedNamespaces,
-            final PolicyEnforcerProvider policyEnforcerProvider) {
+            final PolicyEnforcerProvider policyEnforcerProvider,
+            final MongoReadJournal mongoReadJournal) {
 
-        super(blockedNamespaces, DEFAULT_LOCAL_ASK_TIMEOUT);
+        super(blockedNamespaces, mongoReadJournal, DEFAULT_LOCAL_ASK_TIMEOUT);
 
         this.policyEnforcerProvider = policyEnforcerProvider;
         this.pubSubMediator = pubSubMediator;
@@ -174,6 +176,7 @@ private ThingSupervisorActor(final ActorRef pubSubMediator,
      * @param propsFactory factory for creating Props to be used for creating
      * @param blockedNamespaces the blocked namespaces functionality to retrieve/subscribe for blocked namespaces.
      * @param policyEnforcerProvider used to load the policy enforcer.
+     * @param mongoReadJournal the ReadJournal used for gaining access to historical values of the thing.
      * @return the {@link Props} to create this actor.
      */
     public static Props props(final ActorRef pubSubMediator,
@@ -181,11 +184,12 @@ public static Props props(final ActorRef pubSubMediator,
             final LiveSignalPub liveSignalPub,
             final ThingPersistenceActorPropsFactory propsFactory,
             @Nullable final BlockedNamespaces blockedNamespaces,
-            final PolicyEnforcerProvider policyEnforcerProvider) {
+            final PolicyEnforcerProvider policyEnforcerProvider,
+            final MongoReadJournal mongoReadJournal) {
 
         return Props.create(ThingSupervisorActor.class, pubSubMediator, null,
                 distributedPubThingEventsForTwin, liveSignalPub, propsFactory, null, blockedNamespaces,
-                policyEnforcerProvider);
+                policyEnforcerProvider, mongoReadJournal);
     }
 
     /**
@@ -197,11 +201,12 @@ public static Props props(final ActorRef pubSubMediator,
             final LiveSignalPub liveSignalPub,
             final ThingPersistenceActorPropsFactory propsFactory,
             @Nullable final BlockedNamespaces blockedNamespaces,
-            final PolicyEnforcerProvider policyEnforcerProvider) {
+            final PolicyEnforcerProvider policyEnforcerProvider,
+            final MongoReadJournal mongoReadJournal) {
 
         return Props.create(ThingSupervisorActor.class, pubSubMediator, policiesShardRegion,
                 distributedPubThingEventsForTwin, liveSignalPub, propsFactory, null, blockedNamespaces,
-                policyEnforcerProvider);
+                policyEnforcerProvider, mongoReadJournal);
     }
 
     /**
@@ -213,11 +218,12 @@ public static Props props(final ActorRef pubSubMediator,
             final LiveSignalPub liveSignalPub,
             final ActorRef thingsPersistenceActor,
             @Nullable final BlockedNamespaces blockedNamespaces,
-            final PolicyEnforcerProvider policyEnforcerProvider) {
+            final PolicyEnforcerProvider policyEnforcerProvider,
+            final MongoReadJournal mongoReadJournal) {
 
         return Props.create(ThingSupervisorActor.class, pubSubMediator, policiesShardRegion,
                 distributedPubThingEventsForTwin, liveSignalPub, null, thingsPersistenceActor, blockedNamespaces,
-                policyEnforcerProvider);
+                policyEnforcerProvider, mongoReadJournal);
     }
 
     @Override
@@ -317,7 +323,7 @@ protected ThingId getEntityId() throws Exception {
     @Override
     protected Props getPersistenceActorProps(final ThingId entityId) {
         assert thingPersistenceActorPropsFactory != null;
-        return thingPersistenceActorPropsFactory.props(entityId, distributedPubThingEventsForTwin,
+        return thingPersistenceActorPropsFactory.props(entityId, mongoReadJournal, distributedPubThingEventsForTwin,
                 searchShardRegionProxy);
     }
 
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingsPersistenceStreamingActorCreator.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingsPersistenceStreamingActorCreator.java
index bef308fc3e1..bae2ae9d751 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingsPersistenceStreamingActorCreator.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingsPersistenceStreamingActorCreator.java
@@ -31,9 +31,9 @@
 public final class ThingsPersistenceStreamingActorCreator {
 
     /**
-     * The name of the snapshot streaming actor.
+     * The name of the streaming actor.
      */
-    public static final String SNAPSHOT_STREAMING_ACTOR_NAME = THINGS_PERSISTENCE_STREAMING_ACTOR_NAME;
+    public static final String STREAMING_ACTOR_NAME = THINGS_PERSISTENCE_STREAMING_ACTOR_NAME;
 
     private static final Pattern PERSISTENCE_ID_PATTERN = Pattern.compile(ThingPersistenceActor.PERSISTENCE_ID_PREFIX);
 
@@ -42,16 +42,16 @@ private ThingsPersistenceStreamingActorCreator() {
     }
 
     /**
-     * Create an actor that streams from the snapshot store.
+     * Create an actor that streams from the snapshot store and the event journal.
      *
      * @param actorCreator function to create a named actor with.
      * @return a reference of the created actor.
      */
-    public static ActorRef startSnapshotStreamingActor(final BiFunction<String, Props, ActorRef> actorCreator) {
+    public static ActorRef startPersistenceStreamingActor(final BiFunction<String, Props, ActorRef> actorCreator) {
         final var props = SnapshotStreamingActor.props(ThingsPersistenceStreamingActorCreator::pid2EntityId,
                 ThingsPersistenceStreamingActorCreator::entityId2Pid);
 
-        return actorCreator.apply(SNAPSHOT_STREAMING_ACTOR_NAME, props);
+        return actorCreator.apply(STREAMING_ACTOR_NAME, props);
     }
 
     private static ThingId pid2EntityId(final String pid) {
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/events/ThingEventStrategies.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/events/ThingEventStrategies.java
index 3cf0d4e8e41..42e6ca22799 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/events/ThingEventStrategies.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/events/ThingEventStrategies.java
@@ -14,8 +14,8 @@
 
 import javax.annotation.concurrent.Immutable;
 
-import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.internal.utils.persistentactors.events.AbstractEventStrategies;
+import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.things.model.signals.events.AttributeCreated;
 import org.eclipse.ditto.things.model.signals.events.AttributeDeleted;
 import org.eclipse.ditto.things.model.signals.events.AttributeModified;
@@ -54,7 +54,7 @@
 import org.eclipse.ditto.things.model.signals.events.ThingModified;
 
 /**
- * This Singleton strategy handles all {@link org.eclipse.ditto.things.model.signals.events.ThingEvent}s.
+ * This Singleton strategy handles all {@link ThingEvent}s.
  */
 @Immutable
 public final class ThingEventStrategies extends AbstractEventStrategies<ThingEvent<?>, Thing> {
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/serializer/ThingMongoEventAdapter.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/serializer/ThingMongoEventAdapter.java
index 0f3e367ddfd..ba7d45a8ece 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/serializer/ThingMongoEventAdapter.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/serializer/ThingMongoEventAdapter.java
@@ -12,18 +12,17 @@
  */
 package org.eclipse.ditto.things.service.persistence.serializer;
 
-import javax.annotation.Nullable;
-
-import org.eclipse.ditto.base.model.json.FieldType;
-import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.base.model.signals.events.Event;
 import org.eclipse.ditto.base.model.signals.events.GlobalEventRegistry;
+import org.eclipse.ditto.base.service.config.DittoServiceConfig;
+import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.AbstractMongoEventAdapter;
-import org.eclipse.ditto.internal.utils.persistence.mongo.DittoBsonJson;
 import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.policies.model.Policy;
 import org.eclipse.ditto.things.model.signals.events.ThingEvent;
+import org.eclipse.ditto.things.service.common.config.DefaultThingConfig;
 
 import akka.actor.ExtendedActorSystem;
 
@@ -36,29 +35,16 @@ public final class ThingMongoEventAdapter extends AbstractMongoEventAdapter<Thin
     private static final JsonPointer POLICY_IN_THING_EVENT_PAYLOAD = ThingEvent.JsonFields.THING.getPointer()
             .append(JsonPointer.of(Policy.INLINED_FIELD_NAME));
 
-    public ThingMongoEventAdapter(@Nullable final ExtendedActorSystem system) {
-        super(system, GlobalEventRegistry.getInstance());
+    public ThingMongoEventAdapter(final ExtendedActorSystem system) {
+        super(system, GlobalEventRegistry.getInstance(), DefaultThingConfig.of(
+                DittoServiceConfig.of(DefaultScopedConfig.dittoScoped(system.settings().config()), "things")
+        ).getEventConfig());
     }
 
     @Override
-    protected JsonObject performToJournalMigration(final JsonObject jsonObject) {
-        return jsonObject
+    protected JsonObjectBuilder performToJournalMigration(final Event<?> event, final JsonObject jsonObject) {
+        return super.performToJournalMigration(event, jsonObject)
                 .remove(POLICY_IN_THING_EVENT_PAYLOAD); // remove the policy entries from thing event payload
     }
 
-    @Override
-    public Object toJournal(final Object event) {
-        if (event instanceof Event<?> theEvent) {
-            final JsonSchemaVersion schemaVersion = theEvent.getImplementedSchemaVersion();
-            final JsonObject jsonObject =
-                    theEvent.toJson(schemaVersion, FieldType.regularOrSpecial())
-                            // remove the policy entries from thing event payload
-                            .remove(POLICY_IN_THING_EVENT_PAYLOAD);
-            final DittoBsonJson dittoBsonJson = DittoBsonJson.getInstance();
-            return dittoBsonJson.parse(jsonObject);
-        } else {
-            throw new IllegalArgumentException("Unable to toJournal a non-'Event' object! Was: " + event.getClass());
-        }
-    }
-
 }
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/starter/DefaultThingPersistenceActorPropsFactory.java b/things/service/src/main/java/org/eclipse/ditto/things/service/starter/DefaultThingPersistenceActorPropsFactory.java
index 91570851eda..abca24f39fc 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/starter/DefaultThingPersistenceActorPropsFactory.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/starter/DefaultThingPersistenceActorPropsFactory.java
@@ -17,6 +17,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedPub;
 import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.signals.events.ThingEvent;
@@ -51,9 +52,10 @@ static DefaultThingPersistenceActorPropsFactory of(final ActorSystem actorSystem
     }
 
     @Override
-    public Props props(final ThingId thingId, final DistributedPub<ThingEvent<?>> distributedPub,
+    public Props props(final ThingId thingId, final MongoReadJournal mongoReadJournal,
+            final DistributedPub<ThingEvent<?>> distributedPub,
             @Nullable final ActorRef searchShardRegionProxy) {
         argumentNotEmpty(thingId);
-        return ThingPersistenceActor.props(thingId, distributedPub, searchShardRegionProxy);
+        return ThingPersistenceActor.props(thingId, mongoReadJournal, distributedPub, searchShardRegionProxy);
     }
 }
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/starter/ThingsRootActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/starter/ThingsRootActor.java
index 3c6fe00e7c4..83dbd50e29a 100755
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/starter/ThingsRootActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/starter/ThingsRootActor.java
@@ -88,12 +88,14 @@ private ThingsRootActor(final ThingsConfig thingsConfig,
 
         final BlockedNamespaces blockedNamespaces = BlockedNamespaces.of(actorSystem);
         final PolicyEnforcerProvider policyEnforcerProvider = PolicyEnforcerProviderExtension.get(actorSystem).getPolicyEnforcerProvider();
+        final var mongoReadJournal = newMongoReadJournal(thingsConfig.getMongoDbConfig(), actorSystem);
         final Props thingSupervisorActorProps = getThingSupervisorActorProps(pubSubMediator,
                 distributedPubThingEventsForTwin,
                 liveSignalPub,
                 propsFactory,
                 blockedNamespaces,
-                policyEnforcerProvider
+                policyEnforcerProvider,
+                mongoReadJournal
         );
 
         final ActorRef thingsShardRegion =
@@ -128,10 +130,9 @@ private ThingsRootActor(final ThingsConfig thingsConfig,
                 DefaultHealthCheckingActorFactory.props(healthCheckingActorOptions, MongoHealthChecker.props()));
 
         final ActorRef snapshotStreamingActor =
-                ThingsPersistenceStreamingActorCreator.startSnapshotStreamingActor(this::startChildActor);
+                ThingsPersistenceStreamingActorCreator.startPersistenceStreamingActor(this::startChildActor);
 
         final var cleanupConfig = thingsConfig.getThingConfig().getCleanupConfig();
-        final var mongoReadJournal = newMongoReadJournal(thingsConfig.getMongoDbConfig(), actorSystem);
         final Props cleanupActorProps = PersistenceCleanupActor.props(cleanupConfig, mongoReadJournal, CLUSTER_ROLE);
         startChildActor(PersistenceCleanupActor.ACTOR_NAME, cleanupActorProps);
 
@@ -174,9 +175,10 @@ private static Props getThingSupervisorActorProps(final ActorRef pubSubMediator,
             final LiveSignalPub liveSignalPub,
             final ThingPersistenceActorPropsFactory propsFactory,
             final BlockedNamespaces blockedNamespaces,
-            final PolicyEnforcerProvider policyEnforcerProvider) {
+            final PolicyEnforcerProvider policyEnforcerProvider,
+            final MongoReadJournal mongoReadJournal) {
         return ThingSupervisorActor.props(pubSubMediator, distributedPubThingEventsForTwin,
-                liveSignalPub, propsFactory, blockedNamespaces, policyEnforcerProvider);
+                liveSignalPub, propsFactory, blockedNamespaces, policyEnforcerProvider, mongoReadJournal);
     }
 
     private static MongoReadJournal newMongoReadJournal(final MongoDbConfig mongoDbConfig,
diff --git a/things/service/src/main/resources/things.conf b/things/service/src/main/resources/things.conf
index dd6dcf944d7..e0741e2ae6c 100755
--- a/things/service/src/main/resources/things.conf
+++ b/things/service/src/main/resources/things.conf
@@ -54,6 +54,19 @@ ditto {
         threshold = ${?THING_SNAPSHOT_THRESHOLD} # may be overridden with this environment variable
       }
 
+      event {
+        # define the DittoHeaders to persist when persisting events to the journal
+        # those can e.g. be retrieved as additional "audit log" information when accessing a historical thing revision
+        historical-headers-to-persist = [
+          #"ditto-originator"  # who (user-subject/connection-pre-auth-subject) issued the event
+          #"correlation-id"
+          #"ditto-origin"      # which WS session or connection issued the event
+          #"origin"            # the HTTP origin header
+          #"user-agent"        # the HTTP user-agent header
+        ]
+        historical-headers-to-persist = ${?THING_EVENT_HISTORICAL_HEADERS_TO_PERSIST}
+      }
+
       supervisor {
         exponential-backoff {
           min = 1s
@@ -64,27 +77,62 @@ ditto {
       }
 
       cleanup {
+        # enabled configures whether background cleanup is enabled or not
+        # If enabled, stale "snapshot" and "journal" entries will be cleaned up from the MongoDB by a background process
         enabled = true
         enabled = ${?CLEANUP_ENABLED}
 
+        # history-retention-duration configures the duration of how long to "keep" events and snapshots before being
+        # allowed to remove them in scope of cleanup.
+        # If this e.g. is set to 30d - then effectively an event history of 30 days would be available via the read
+        # journal.
+        history-retention-duration = 0d
+        history-retention-duration = ${?CLEANUP_HISTORY_RETENTION_DURATION}
+
+        # quiet-period defines how long to stay in a state where the background cleanup is not yet started
+        # Applies after:
+        # - starting the service
+        # - each "completed" background cleanup run (all entities were cleaned up)
         quiet-period = 5m
         quiet-period = ${?CLEANUP_QUIET_PERIOD}
 
+        # interval configures how often a "credit decision" is made.
+        # The background cleanup works with a credit system and does only generate new "cleanup credits" if the MongoDB
+        # currently has capacity to do cleanups.
         interval = 3s
         interval = ${?CLEANUP_INTERVAL}
 
+        # timer-threshold configures the maximum database latency to give out credit for cleanup actions.
+        # If write operations to the MongoDB within the last `interval` had a `max` value greater to the configured
+        # threshold, no new cleanup credits will be issued for the next `interval`.
+        # Which throttles cleanup when MongoDB is currently under heavy (write) load.
         timer-threshold = 150ms
         timer-threshold = ${?CLEANUP_TIMER_THRESHOLD}
 
+        # credits-per-batch configures how many "cleanup credits" should be generated per `interval` as long as the
+        # write operations to the MongoDB are less than the configured `timer-threshold`.
+        # Limits the rate of cleanup actions to this many per credit decision interval.
+        # One credit means that the "journal" and "snapshot" entries of one entity are cleaned up each `interval`.
         credits-per-batch = 3
         credits-per-batch = ${?CLEANUP_CREDITS_PER_BATCH}
 
+        # reads-per-query configures the number of snapshots to scan per MongoDB query.
+        # Configuring this to high values will reduce the need to query MongoDB too often - it should however be aligned
+        # with the amount of "cleanup credits" issued per `interval` - in order to avoid long running queries.
         reads-per-query = 100
         reads-per-query = ${?CLEANUP_READS_PER_QUERY}
 
+        # writes-per-credit configures the number of documents to delete for each credit.
+        # If for example one entity would have 1000 journal entries to cleanup, a `writes-per-credit` of 100 would lead
+        # to 10 delete operations performed against MongoDB.
         writes-per-credit = 100
         writes-per-credit = ${?CLEANUP_WRITES_PER_CREDIT}
 
+        # delete-final-deleted-snapshot configures whether for a deleted entity, the final snapshot (containing the
+        # "deleted" information) should be deleted or not.
+        # If the final snapshot is not deleted, re-creating the entity will cause that the recreated entity starts with
+        # a revision number 1 higher than the previously deleted entity. If the final snapshot is deleted as well,
+        # recreation of an entity with the same ID will lead to revisionNumber=1 after its recreation.
         delete-final-deleted-snapshot = false
         delete-final-deleted-snapshot = ${?CLEANUP_DELETE_FINAL_DELETED_SNAPSHOT}
       }
@@ -229,6 +277,18 @@ akka-contrib-mongodb-persistence-things-journal {
   }
 }
 
+akka-contrib-mongodb-persistence-things-journal-read {
+  class = "akka.contrib.persistence.mongodb.MongoReadJournal"
+  plugin-dispatcher = "thing-journal-persistence-dispatcher"
+
+  overrides {
+    journal-collection = "things_journal"
+    journal-index = "things_journal_index"
+    realtime-collection = "things_realtime"
+    metadata-collection = "things_metadata"
+  }
+}
+
 akka-contrib-mongodb-persistence-things-snapshots {
   class = "akka.contrib.persistence.mongodb.MongoSnapshots"
   plugin-dispatcher = "thing-snaps-persistence-dispatcher"
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/AbstractThingEnforcementTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/AbstractThingEnforcementTest.java
index 5558cc9308a..b658894c2b6 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/AbstractThingEnforcementTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/AbstractThingEnforcementTest.java
@@ -24,6 +24,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.ditto.base.model.auth.AuthorizationSubject;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedPub;
 import org.eclipse.ditto.internal.utils.pubsub.extractors.AckExtractor;
 import org.eclipse.ditto.policies.enforcement.PolicyEnforcerProvider;
@@ -127,7 +128,8 @@ public <S extends ThingEvent<?>> Object wrapForPublicationWithAcks(final S messa
                 new TestSetup.DummyLiveSignalPub(pubSubMediatorProbe.ref()),
                 thingPersistenceActorProbe.ref(),
                 null,
-                policyEnforcerProvider
+                policyEnforcerProvider,
+                Mockito.mock(MongoReadJournal.class)
         ).withDispatcher("akka.actor.default-dispatcher"), system.guardian(),
                 URLEncoder.encode(THING_ID.toString(), Charset.defaultCharset()));
         // Actors using "stash()" require the above dispatcher to be configured, otherwise stash() and unstashAll() won't
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/PersistenceActorTestBase.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/PersistenceActorTestBase.java
index 7068f4f7eef..fc1473de9a6 100755
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/PersistenceActorTestBase.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/PersistenceActorTestBase.java
@@ -28,6 +28,7 @@
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedPub;
 import org.eclipse.ditto.internal.utils.pubsub.extractors.AckExtractor;
 import org.eclipse.ditto.internal.utils.pubsubthings.LiveSignalPub;
@@ -226,11 +227,13 @@ protected ActorRef createPersistenceActorFor(final ThingId thingId) {
 
     protected ActorRef createPersistenceActorWithPubSubFor(final ThingId thingId) {
 
-        return actorSystem.actorOf(getPropsOfThingPersistenceActor(thingId, getDistributedPub()));
+        return actorSystem.actorOf(getPropsOfThingPersistenceActor(thingId, Mockito.mock(MongoReadJournal.class),
+                getDistributedPub()));
     }
 
-    private Props getPropsOfThingPersistenceActor(final ThingId thingId, final DistributedPub<ThingEvent<?>> pub) {
-        return ThingPersistenceActor.props(thingId, pub, null);
+    private Props getPropsOfThingPersistenceActor(final ThingId thingId, final MongoReadJournal mongoReadJournal,
+            final DistributedPub<ThingEvent<?>> pub) {
+        return ThingPersistenceActor.props(thingId, mongoReadJournal, pub, null);
     }
 
     protected ActorRef createSupervisorActorFor(final ThingId thingId) {
@@ -258,9 +261,11 @@ public <S extends ThingEvent<?>> Object wrapForPublicationWithAcks(final S messa
                             }
                         },
                         liveSignalPub,
-                        (thingId1, pub, searchShardRegionProxy) -> getPropsOfThingPersistenceActor(thingId1, pub),
+                        (thingId1, mongoReadJournal, pub, searchShardRegionProxy) -> getPropsOfThingPersistenceActor(
+                                thingId1, mongoReadJournal, pub),
                         null,
-                        policyEnforcerProvider);
+                        policyEnforcerProvider,
+                        Mockito.mock(MongoReadJournal.class));
 
         return actorSystem.actorOf(props, thingId.toString());
     }
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorSnapshottingTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorSnapshottingTest.java
index 0f4d64fed6c..69751dab4c1 100755
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorSnapshottingTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorSnapshottingTest.java
@@ -16,8 +16,10 @@
 import java.util.Arrays;
 import java.util.Collections;
 
+import org.assertj.core.api.Assertions;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.signals.events.EventsourcedEvent;
+import org.eclipse.ditto.internal.utils.config.DittoConfigError;
 import org.eclipse.ditto.internal.utils.test.Retry;
 import org.eclipse.ditto.internal.utils.tracing.DittoTracingInitResource;
 import org.eclipse.ditto.json.JsonFactory;
@@ -233,13 +235,7 @@ public void thingInArbitraryStateIsSnapshotCorrectly() {
     public void actorCannotBeStartedWithNegativeSnapshotThreshold() {
         final Config customConfig = createNewDefaultTestConfig().withValue(SNAPSHOT_THRESHOLD,
                 ConfigValueFactory.fromAnyRef(-1));
-        setup(customConfig);
-
-        disableLogging();
-        new TestKit(actorSystem) {{
-            final ActorRef underTest = createPersistenceActorFor(ThingId.of("fail:fail"));
-            watch(underTest);
-            expectTerminated(underTest);
-        }};
+        Assertions.assertThatExceptionOfType(DittoConfigError.class)
+                        .isThrownBy(() -> setup(customConfig));
     }
 }
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorTest.java
index 533a758568d..e87263621fb 100755
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorTest.java
@@ -44,6 +44,7 @@
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.base.model.signals.events.Event;
 import org.eclipse.ditto.internal.utils.cluster.DistPubSubAccess;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.test.Retry;
 import org.eclipse.ditto.internal.utils.tracing.DittoTracingInitResource;
 import org.eclipse.ditto.json.JsonFactory;
@@ -116,6 +117,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestWatcher;
+import org.mockito.Mockito;
 import org.slf4j.LoggerFactory;
 
 import com.typesafe.config.Config;
@@ -304,7 +306,8 @@ public void tryToCreateThingWithDifferentThingId() {
         final Thing thing = createThingV2WithRandomId();
         final CreateThing createThing = CreateThing.of(thing, null, dittoHeadersV2);
 
-        final Props props = ThingPersistenceActor.props(thingIdOfActor, getDistributedPub(), null);
+        final Props props = ThingPersistenceActor.props(thingIdOfActor, Mockito.mock(MongoReadJournal.class),
+                getDistributedPub(), null);
         final TestActorRef<ThingPersistenceActor> underTest = TestActorRef.create(actorSystem, props);
         final ThingPersistenceActor thingPersistenceActor = underTest.underlyingActor();
         final PartialFunction<Object, BoxedUnit> receiveCommand = thingPersistenceActor.receiveCommand();
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceOperationsActorIT.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceOperationsActorIT.java
index f414733180a..5316bb94124 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceOperationsActorIT.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceOperationsActorIT.java
@@ -15,6 +15,7 @@
 import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.internal.utils.persistence.mongo.ops.eventsource.MongoEventSourceITAssertions;
+import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedPub;
 import org.eclipse.ditto.internal.utils.pubsub.extractors.AckExtractor;
 import org.eclipse.ditto.internal.utils.pubsubthings.LiveSignalPub;
@@ -149,10 +150,15 @@ public <S extends ThingEvent<?>> Object wrapForPublicationWithAcks(final S messa
                     }
                 },
                 liveSignalPub,
-                (thingId, distributedPub, searchShardRegionProxy) -> ThingPersistenceActor.props(thingId,
-                        distributedPub, null),
+                (thingId, mongoReadJournal, distributedPub, searchShardRegionProxy) -> ThingPersistenceActor.props(
+                        thingId,
+                        mongoReadJournal,
+                        distributedPub,
+                        null
+                ),
                 null,
-                policyEnforcerProvider);
+                policyEnforcerProvider,
+                Mockito.mock(MongoReadJournal.class));
 
         return system.actorOf(props, id.toString());
     }
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/serializer/ThingMongoEventAdapterTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/serializer/ThingMongoEventAdapterTest.java
index a6b097f5de1..062f530f58f 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/serializer/ThingMongoEventAdapterTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/serializer/ThingMongoEventAdapterTest.java
@@ -17,6 +17,7 @@
 
 import java.time.Instant;
 import java.util.List;
+import java.util.Set;
 
 import org.bson.BsonDocument;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
@@ -30,7 +31,12 @@
 import org.eclipse.ditto.things.model.signals.events.ThingDeleted;
 import org.junit.Test;
 
+import com.typesafe.config.ConfigFactory;
+
+import akka.actor.ActorSystem;
+import akka.actor.ExtendedActorSystem;
 import akka.persistence.journal.EventSeq;
+import akka.persistence.journal.Tagged;
 import scala.jdk.javaapi.CollectionConverters;
 
 /**
@@ -41,7 +47,8 @@ public final class ThingMongoEventAdapterTest {
     private final ThingMongoEventAdapter underTest;
 
     public ThingMongoEventAdapterTest() {
-        underTest = new ThingMongoEventAdapter(null);
+        underTest = new ThingMongoEventAdapter(
+                (ExtendedActorSystem) ActorSystem.create("test", ConfigFactory.load("test")));
     }
 
     @Test
@@ -93,11 +100,13 @@ public void toJournalReturnsBsonDocument() {
                 "                    \"attributes\" : {\n" +
                 "                        \"hello\" : \"cloud\"\n" +
                 "                    }\n" +
-                "                }\n" +
+                "                },\n" +
+                "                \"__hh\": {}\n" +
                 "            }";
         final BsonDocument bsonEvent = BsonDocument.parse(journalEntry);
+        final Tagged tagged = new Tagged(bsonEvent, Set.of());
 
-        assertThat(underTest.toJournal(thingCreated)).isEqualTo(bsonEvent);
+        assertThat(underTest.toJournal(thingCreated)).isEqualTo(tagged);
     }
 
     @Test
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/starter/ThingsServiceGlobalCommandRegistryTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/starter/ThingsServiceGlobalCommandRegistryTest.java
index 8aea6bf6ce3..0941014ce8a 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/starter/ThingsServiceGlobalCommandRegistryTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/starter/ThingsServiceGlobalCommandRegistryTest.java
@@ -17,6 +17,7 @@
 import org.eclipse.ditto.base.api.devops.signals.commands.ExecutePiggybackCommand;
 import org.eclipse.ditto.base.api.persistence.cleanup.CleanupPersistence;
 import org.eclipse.ditto.base.model.namespaces.signals.commands.PurgeNamespace;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
 import org.eclipse.ditto.base.service.cluster.ModifySplitBrainResolver;
 import org.eclipse.ditto.internal.models.streaming.SudoStreamPids;
 import org.eclipse.ditto.internal.utils.health.RetrieveHealth;
@@ -55,6 +56,8 @@ public ThingsServiceGlobalCommandRegistryTest() {
                 PurgeEntities.class,
                 ModifySplitBrainResolver.class,
                 PublishSignal.class,
+                SubscribeForPersistedEvents.class,
+                PublishSignal.class,
                 CreateSubscription.class,
                 QueryThings.class,
                 SudoCountThings.class
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/starter/ThingsServiceGlobalEventRegistryTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/starter/ThingsServiceGlobalEventRegistryTest.java
index f466d1b1c06..91c529610b0 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/starter/ThingsServiceGlobalEventRegistryTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/starter/ThingsServiceGlobalEventRegistryTest.java
@@ -12,10 +12,11 @@
  */
 package org.eclipse.ditto.things.service.starter;
 
-import org.eclipse.ditto.policies.model.signals.events.PolicyModified;
-import org.eclipse.ditto.things.api.ThingSnapshotTaken;
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionComplete;
 import org.eclipse.ditto.internal.utils.persistentactors.EmptyEvent;
 import org.eclipse.ditto.internal.utils.test.GlobalEventRegistryTestCases;
+import org.eclipse.ditto.policies.model.signals.events.PolicyModified;
+import org.eclipse.ditto.things.api.ThingSnapshotTaken;
 import org.eclipse.ditto.things.model.signals.events.FeatureDeleted;
 import org.eclipse.ditto.thingsearch.api.events.ThingsOutOfSync;
 import org.eclipse.ditto.thingsearch.model.signals.events.SubscriptionCreated;
@@ -28,6 +29,8 @@ public ThingsServiceGlobalEventRegistryTest() {
                 ThingSnapshotTaken.class,
                 EmptyEvent.class,
                 PolicyModified.class,
+                StreamingSubscriptionComplete.class,
+                PolicyModified.class,
                 SubscriptionCreated.class,
                 ThingsOutOfSync.class
         );
diff --git a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/starter/ThingsSearchServiceGlobalCommandRegistryTest.java b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/starter/ThingsSearchServiceGlobalCommandRegistryTest.java
index ff8cdc81f97..512235581bc 100644
--- a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/starter/ThingsSearchServiceGlobalCommandRegistryTest.java
+++ b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/starter/ThingsSearchServiceGlobalCommandRegistryTest.java
@@ -17,6 +17,7 @@
 import org.eclipse.ditto.base.api.devops.signals.commands.ExecutePiggybackCommand;
 import org.eclipse.ditto.base.api.persistence.cleanup.CleanupPersistence;
 import org.eclipse.ditto.base.model.namespaces.signals.commands.PurgeNamespace;
+import org.eclipse.ditto.base.model.signals.commands.streaming.SubscribeForPersistedEvents;
 import org.eclipse.ditto.base.service.cluster.ModifySplitBrainResolver;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.ModifyConnection;
 import org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnection;
@@ -60,7 +61,8 @@ public ThingsSearchServiceGlobalCommandRegistryTest() {
                 CleanupPersistence.class,
                 ModifyConnection.class,
                 ModifySplitBrainResolver.class,
-                RetrieveConnection.class
+                RetrieveConnection.class,
+                SubscribeForPersistedEvents.class
         );
     }
 
diff --git a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/starter/ThingsSearchServiceGlobalEventRegistryTest.java b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/starter/ThingsSearchServiceGlobalEventRegistryTest.java
index 1c89950ff16..b0913cf70dc 100644
--- a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/starter/ThingsSearchServiceGlobalEventRegistryTest.java
+++ b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/starter/ThingsSearchServiceGlobalEventRegistryTest.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.ditto.thingsearch.service.starter;
 
+import org.eclipse.ditto.base.model.signals.events.streaming.StreamingSubscriptionComplete;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionModified;
 import org.eclipse.ditto.internal.utils.test.GlobalEventRegistryTestCases;
 import org.eclipse.ditto.policies.model.signals.events.ResourceDeleted;
@@ -29,7 +30,8 @@ public ThingsSearchServiceGlobalEventRegistryTest() {
                 SubscriptionCreated.class,
                 ThingsOutOfSync.class,
                 ThingSnapshotTaken.class,
-                ConnectionModified.class
+                ConnectionModified.class,
+                StreamingSubscriptionComplete.class
         );
     }
 

From a4c0634319c3e6ed030ac23f89a169cd2b61228f Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Fri, 6 Jan 2023 14:44:39 +0100
Subject: [PATCH 006/173] Explorer UI - SSE and optimistic locking - custom web
 component for CRUD toolbar - API allows to return headers if needed - adapt
 editors with new toolbar and ETag handling - fixed modified date and revision
 from SSE - avoid feature editors jumping because of badge in header - fixes
 some static type checks in utils

---
 ui/index.css                         |   5 +
 ui/index.html                        |  39 ++++-
 ui/modules/api.js                    |   9 +-
 ui/modules/things/attributes.js      | 140 +++++++++++-----
 ui/modules/things/featureMessages.js |  16 +-
 ui/modules/things/features.html      |  25 +--
 ui/modules/things/features.js        | 230 +++++++++++++++++----------
 ui/modules/things/searchFilter.js    |   2 +-
 ui/modules/things/things.html        |  52 ++----
 ui/modules/things/thingsCRUD.js      | 115 +++++++-------
 ui/modules/things/thingsSSE.js       |   3 +-
 ui/modules/things/thingsSearch.js    |   2 +-
 ui/modules/utils.js                  |  23 +--
 ui/modules/utils/crudToolbar.js      |  95 +++++++++++
 14 files changed, 488 insertions(+), 268 deletions(-)
 create mode 100644 ui/modules/utils/crudToolbar.js

diff --git a/ui/index.css b/ui/index.css
index 8fae4bf6f84..401a2c5ab0c 100644
--- a/ui/index.css
+++ b/ui/index.css
@@ -175,3 +175,8 @@ hr {
     max-height: 80vh;
     overflow-y: auto;
 }
+
+h5>.badge {
+    vertical-align: top;
+    font-size: 0.6em;
+}
\ No newline at end of file
diff --git a/ui/index.html b/ui/index.html
index cc3d1f59465..83ba6a5a44b 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -45,6 +45,7 @@
         integrity="sha512-GZ1RIgZaSc8rnco/8CXfRdCpDxRCphenIiZ2ztLy3XQfCbQUSCuk8IudvNHxkRA3oUg6q0qejgN/qqyG1duv5Q=="
         crossorigin="anonymous" type="text/javascript" charset="utf-8"></script>
     <script src="https://cdn.jsdelivr.net/npm/jsonpath-plus@5.0.3/dist/index-browser-esm.min.js" type="module"></script>
+    <script src="modules/utils/crudToolbar.js" type="module"></script>
     <script src="main.js" type="module"></script>
 </head>
 
@@ -107,7 +108,7 @@
         </div>
     </div>
     <!-- Notifications to user ----------------------------------------------------------------->
-    <div class="toast-container position-fixed bottom-0 end-0 p-3" style="z-index: 5; right: 0; bottom: 0" id="toastContainer">      
+    <div class="toast-container position-fixed bottom-0 end-0 p-3" style="z-index: 1205; right: 0; bottom: 0" id="toastContainer">      
         <div class="toast hide bg-success" data-bs-delay="2000" id="successToast">
             <div class="toast-header" id="successHeader">
             </div>
@@ -128,8 +129,42 @@
             </div>
         </div>
     </div>
-    <div id="modalThingsEdit"></div>
+    <div id="modalCrudEdit"></div>
 
 </body>
+<template id="templateCrudToolbar">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
+        integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.3/font/bootstrap-icons.min.css"
+        rel="stylesheet"
+        integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow=="
+        crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link href="index.css" rel="stylesheet" />
 
+    <div class="resizable_flex_column px-1" id="divRoot">
+        <div class="input-group input-group-sm mb-1 mt-1 has-validation">
+            <label class="input-group-text" id="label">Default</label>
+            <input type="text" class="form-control" disabled id="inputIdValue">
+            <button class="btn btn-secondary btn-sm" id="buttonCrudEdit"
+                data-bs-toggle="tooltip" title="Edit">
+                <i id="iEdit" class="bi bi-pencil-square"></i>
+            </button>
+            <button class="btn btn-secondary btn-sm" disabled id="buttonCreate"
+                data-bs-toggle="tooltip" title="Create">
+                <i class="bi bi-plus-circle"></i>
+            </button>
+            <button class="btn btn-secondary btn-sm" disabled id="buttonUpdate"
+                data-bs-toggle="tooltip" title="Update">
+                <i class="bi bi-save"></i>
+            </button>
+            <button class="btn btn-secondary btn-sm" disabled id="buttonDelete"
+                data-bs-toggle="tooltip" title="Delete">
+                <i class="bi bi-trash3"></i>
+            </button>
+            <div class="invalid-feedback"></div>
+        </div>
+        <slot></slot>
+    </div>
+  </template>
+  
 </html>
\ No newline at end of file
diff --git a/ui/modules/api.js b/ui/modules/api.js
index a512d2c746e..bc639d0f08f 100644
--- a/ui/modules/api.js
+++ b/ui/modules/api.js
@@ -298,9 +298,10 @@ export function setAuthHeader(forDevOps) {
  * @param {String} path of the Ditto call (e.g. '/things')
  * @param {Object} body payload for the api call
  * @param {Object} additionalHeaders object with additional header fields
+ * @param {boolean} returnHeaders request full response instead of json content
  * @return {Object} result as json object
  */
-export async function callDittoREST(method, path, body, additionalHeaders) {
+export async function callDittoREST(method, path, body, additionalHeaders, returnHeaders = false) {
   let response;
   try {
     response = await fetch(Environments.current().api_uri + '/api/2' + path, {
@@ -327,7 +328,11 @@ export async function callDittoREST(method, path, body, additionalHeaders) {
     throw new Error('An error occurred: ' + response.status);
   }
   if (response.status !== 204) {
-    return response.json();
+    if (returnHeaders) {
+      return response;
+    } else {
+      return response.json();
+    }
   } else {
     return null;
   }
diff --git a/ui/modules/things/attributes.js b/ui/modules/things/attributes.js
index 13f81087960..1495193623f 100644
--- a/ui/modules/things/attributes.js
+++ b/ui/modules/things/attributes.js
@@ -1,3 +1,4 @@
+/* eslint-disable require-jsdoc */
 /*
  * Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
@@ -16,74 +17,115 @@ import * as Utils from '../utils.js';
 import * as Things from './things.js';
 
 const dom = {
-  attributesTable: null,
-  attributePath: null,
-  attributeValue: null,
-  attributeCount: null,
-  putAttribute: null,
-  deleteAttribute: null,
+  tbodyAttributes: null,
+  crudAttribute: null,
+  inputAttributeValue: null,
+  badgeAttributeCount: null,
 };
 
+let eTag;
+
 /**
  * Initializes components. Should be called after DOMContentLoaded event
  */
 export function ready() {
+  Things.addChangeListener(onThingChanged);
+
   Utils.getAllElementsById(dom);
 
-  dom.attributesTable.onclick = (event) => {
-    if (event.target && event.target.nodeName === 'TD') {
-      const path = event.target.parentNode.children[0].innerText;
-      dom.attributePath.value = path;
-      dom.attributeValue.value = attributeToString(Things.theThing.attributes[path]);
-    }
-  };
+  dom.tbodyAttributes.onclick = onAttributeTableClick;
+
+  dom.crudAttribute.addEventListener('onCreateClick', onCreateAttributeClick);
+  dom.crudAttribute.addEventListener('onUpdateClick', onUpdateAttributeClick);
+  dom.crudAttribute.addEventListener('onDeleteClick', onDeleteAttributeClick);
+  dom.crudAttribute.addEventListener('onEditToggle', onEditToggle);
+}
+
+function onCreateAttributeClick() {
+  Utils.assert(dom.crudAttribute.idValue, 'Attribute path must not be empty', dom.crudAttribute.validationElement);
+  Utils.assert(!Things.theThing['attributes'] || !Object.keys(Things.theThing.attributes).includes(dom.crudAttribute.idValue),
+      `Attribute path ${dom.crudAttribute.idValue} already exists in Thing`,
+      dom.crudAttribute.validationElement);
+  Utils.assert(dom.inputAttributeValue.value, 'Attribute value must not be empty', dom.inputAttributeValue);
 
-  dom.putAttribute.onclick = clickAttribute('PUT');
-  dom.deleteAttribute.onclick = clickAttribute('DELETE');
+  updateAttribute('PUT');
+}
+function onUpdateAttributeClick() {
+  Utils.assert(dom.inputAttributeValue.value, 'Attribute value must not be empty');
+  updateAttribute('PUT');
+}
+
+function onDeleteAttributeClick() {
+  Utils.confirm(`Are you sure you want to delete attribute<br>'${dom.crudAttribute.idValue}'?`, 'Delete', () => {
+    updateAttribute('DELETE');
+  });
+}
 
-  Things.addChangeListener(updateAttributesTable);
+function onAttributeTableClick(event) {
+  if (event.target && event.target.nodeName === 'TD') {
+    const path = event.target.parentNode.children[0].innerText;
+    if (dom.crudAttribute.idValue === path) {
+      refreshAttribute(null);
+    } else {
+      refreshAttribute(Things.theThing, path);
+    }
+  }
 }
 
 /**
  * Creates a onclick handler function
  * @param {String} method PUT or DELETE
- * @return {function} Click handler function to PUT or DELETE Ditto attribute
  */
-function clickAttribute(method) {
-  return function() {
-    Utils.assert(Things.theThing, 'No Thing selected');
-    Utils.assert(dom.attributePath.value, 'Attribute path is empty');
-    Utils.assert(method !== 'PUT' || dom.attributeValue.value, 'Attribute value is empty');
-    API.callDittoREST(
-        method,
-        `/things/${Things.theThing.thingId}/attributes/${dom.attributePath.value}`,
-        method === 'PUT' ? attributeFromString(dom.attributeValue.value) : null,
-    ).then(() => Things.refreshThing(Things.theThing.thingId));
-  };
+function updateAttribute(method) {
+  API.callDittoREST(
+      method,
+      `/things/${Things.theThing.thingId}/attributes/${dom.crudAttribute.idValue}`,
+      method === 'PUT' ? attributeFromString(dom.inputAttributeValue.value) : null,
+      {
+        'if-match': method === 'PUT' ? eTag : '*',
+      },
+  ).then(() => {
+    if (method === 'PUT') {
+      dom.crudAttribute.toggleEdit();
+    }
+    Things.refreshThing(Things.theThing.thingId);
+  });
 }
 
-/**
- * Updates UI compoents for attributes
- */
-function updateAttributesTable() {
-  dom.attributesTable.innerHTML = '';
+function refreshAttribute(thing, attributePath) {
+  if (dom.crudAttribute.isEditing) {
+    return;
+  }
+
+  if (thing) {
+    dom.crudAttribute.idValue = attributePath;
+    dom.inputAttributeValue.value = attributeToString(thing.attributes[attributePath]);
+  } else {
+    dom.crudAttribute.idValue = null;
+    dom.inputAttributeValue.value = null;
+  }
+}
+
+function onThingChanged(thing) {
+  dom.crudAttribute.editDisabled = (thing === null);
+
+  dom.tbodyAttributes.innerHTML = '';
   let count = 0;
   let thingHasAttribute = false;
-  if (Things.theThing && Things.theThing.attributes) {
+  if (thing && thing.attributes) {
     Object.keys(Things.theThing.attributes).forEach((path) => {
-      if (path === dom.attributePath.value) {
-        dom.attributeValue.value = attributeToString(Things.theThing.attributes[path]);
+      if (path === dom.crudAttribute.idValue) {
+        refreshAttribute(Things.theThing, path);
         thingHasAttribute = true;
       }
-      Utils.addTableRow(dom.attributesTable, path, path === dom.attributePath.value, false,
+      Utils.addTableRow(dom.tbodyAttributes, path, path === dom.crudAttribute.idValue, false,
           attributeToString(Things.theThing.attributes[path]));
       count++;
     });
   }
-  dom.attributeCount.innerText = count > 0 ? count : '';
+  dom.badgeAttributeCount.innerText = count > 0 ? count : '';
   if (!thingHasAttribute) {
-    dom.attributePath.value = null;
-    dom.attributeValue.value = null;
+    refreshAttribute(null);
   }
 }
 
@@ -110,3 +152,21 @@ function attributeFromString(attribute) {
     return attribute;
   }
 }
+
+function onEditToggle(event) {
+  if (event.detail) {
+    API.callDittoREST('GET', `/things/${Things.theThing.thingId}/attributes/${dom.crudAttribute.idValue}`,
+        null, null, true)
+        .then((response) => {
+          eTag = response.headers.get('ETag');
+          return response.json();
+        })
+        .then((attributeValue) => {
+          dom.inputAttributeValue.disabled = false;
+          dom.inputAttributeValue.value = attributeToString(attributeValue);
+        });
+  } else {
+    dom.inputAttributeValue.disabled = true;
+    dom.inputAttributeValue.value = attributeToString(Things.theThing.attributes[dom.crudAttribute.idValue]);
+  }
+}
diff --git a/ui/modules/things/featureMessages.js b/ui/modules/things/featureMessages.js
index 52172bfe717..69f1cdd24f0 100644
--- a/ui/modules/things/featureMessages.js
+++ b/ui/modules/things/featureMessages.js
@@ -18,6 +18,8 @@ import * as Utils from '../utils.js';
 import * as Things from './things.js';
 import * as Features from './features.js';
 
+let theFeatureId;
+
 const dom = {
   inputMessageSubject: null,
   inputMessageTimeout: null,
@@ -26,7 +28,6 @@ const dom = {
   buttonMessageFavourite: null,
   ulMessageTemplates: null,
   favIconMessage: null,
-  theFeatureId: null,
   tableValidationFeature: null,
 };
 
@@ -54,7 +55,7 @@ export async function ready() {
 
 
   dom.buttonMessageSend.onclick = () => {
-    Utils.assert(dom.theFeatureId.value, 'Please select a Feature', dom.tableValidationFeature);
+    Utils.assert(theFeatureId, 'Please select a Feature', dom.tableValidationFeature);
     Utils.assert(dom.inputMessageSubject.value, 'Please give a Subject', dom.inputMessageSubject);
     Utils.assert(dom.inputMessageTimeout.value, 'Please give a timeout', dom.inputMessageTimeout);
     messageFeature();
@@ -62,7 +63,7 @@ export async function ready() {
 
   dom.buttonMessageFavourite.onclick = () => {
     const templateName = dom.inputMessageTemplate.value;
-    const featureId = dom.theFeatureId.value;
+    const featureId = theFeatureId;
     Utils.assert(featureId, 'Please select a Feature', dom.tableValidationFeature);
     Utils.assert(templateName, 'Please give a name for the template', dom.inputMessageTemplate);
     Environments.current().messageTemplates[featureId] = Environments.current().messageTemplates[featureId] || {};
@@ -85,7 +86,7 @@ export async function ready() {
   dom.ulMessageTemplates.addEventListener('click', (event) => {
     if (event.target && event.target.classList.contains('dropdown-item')) {
       dom.favIconMessage.classList.replace('bi-star', 'bi-star-fill');
-      const template = Environments.current().messageTemplates[dom.theFeatureId.value][event.target.textContent];
+      const template = Environments.current().messageTemplates[theFeatureId][event.target.textContent];
       dom.inputMessageTemplate.value = event.target.textContent;
       dom.inputMessageSubject.value = template.subject;
       dom.inputMessageTimeout.value = template.timeout;
@@ -114,7 +115,7 @@ function messageFeature() {
   const payload = JSON.parse(acePayload.getValue());
   aceResponse.setValue('');
   API.callDittoREST('POST', '/things/' + Things.theThing.thingId +
-      '/features/' + dom.theFeatureId.value +
+      '/features/' + theFeatureId +
       '/inbox/messages/' + dom.inputMessageSubject.value +
       '?timeout=' + dom.inputMessageTimeout.value,
   payload,
@@ -151,15 +152,16 @@ function clearAllFields() {
 function refillTemplates() {
   dom.ulMessageTemplates.innerHTML = '';
   Utils.addDropDownEntries(dom.ulMessageTemplates, ['Saved message templates'], true);
-  if (dom.theFeatureId.value && Environments.current().messageTemplates[dom.theFeatureId.value]) {
+  if (theFeatureId && Environments.current().messageTemplates[theFeatureId]) {
     Utils.addDropDownEntries(
         dom.ulMessageTemplates,
-        Object.keys(Environments.current().messageTemplates[dom.theFeatureId.value]),
+        Object.keys(Environments.current().messageTemplates[theFeatureId]),
     );
   }
 }
 
 function onFeatureChanged(featureId) {
+  theFeatureId = featureId;
   clearAllFields();
   refillTemplates();
 }
diff --git a/ui/modules/things/features.html b/ui/modules/things/features.html
index 57938353c40..2278dff74b1 100644
--- a/ui/modules/things/features.html
+++ b/ui/modules/things/features.html
@@ -11,7 +11,7 @@
   ~ SPDX-License-Identifier: EPL-2.0
   -->
 <h5 data-bs-toggle="collapse" data-bs-target="#collapseFeatures">
-    Features <span class="badge badge-info" id="featureCount"></span></h5>
+    Features <span class="badge rounded-pill bg-info" id="badgeFeatureCount"></span></h5>
 <hr />
 <div class="collapse show" id="collapseFeatures">
     <div class="row resizable_pane" style="height: 45vh;">
@@ -22,7 +22,7 @@ <h5 data-bs-toggle="collapse" data-bs-target="#collapseFeatures">
             </div>
             <div class="table-wrap">
                 <table class="table table-striped table-hover table-sm">
-                    <tbody id="featuresTable"></tbody>
+                    <tbody id="tbodyFeatures"></tbody>
                 </table>
             </div>
         </div>
@@ -34,25 +34,12 @@ <h5 data-bs-toggle="collapse" data-bs-target="#collapseFeatures">
             </ul>
             <div class="tab-content" style="flex-grow: 1;" id="tabContentFeatures">
                 <div class="tab-pane container active no-margin" id="tabCrudFeature">
-                    <div class="resizable_flex_column">
-                        <div class="input-group input-group-sm mb-1 mt-1">
-                            <label class="input-group-text">Feature ID</label>
-                            <input type="text" class="form-control" id="theFeatureId">
-                            <button class="btn btn-outline-secondary btn-sm" id="createFeature">
-                                <i class="bi bi-plus-circle"></i>
-                            </button>
-                            <button class="btn btn-outline-secondary btn-sm" id="putFeature">
-                                <i class="bi bi-save"></i>
-                            </button>
-                            <button class="btn btn-outline-secondary btn-sm" id="deleteFeature">
-                                <i class="bi bi-trash3"></i>
-                            </button>
-                        </div>
+                    <crud-toolbar id="crudFeature" label="Feature ID">
                         <div class="input-group input-group-sm mb-1">
                             <label class="input-group-text">Definition</label>
-                            <input type="text" class="form-control" id="featureDefinition"></input>
+                            <input type="text" class="form-control" id="inputFeatureDefinition" disabled></input>
                         </div>
-                        <div class="input-group input-group-sm" style="flex-grow: 1; display: flex;">
+                        <div class="input-group input-group-sm mb-1" style="flex-grow: 1; display: flex;">
                             <label class="input-group-text">Properties<br>and<br>Desired<br>Properties</label>
                             <div class="ace_container" style="flex-grow: 1;">
                                 <div class="script_editor" id="featurePropertiesEditor"></div>
@@ -61,7 +48,7 @@ <h5 data-bs-toggle="collapse" data-bs-target="#collapseFeatures">
                                 <div class="script_editor" id="featureDesiredPropertiesEditor"></div>
                             </div>
                         </div>
-                    </div>
+                    </crud-toolbar>
                 </div>
             </div>
         </div>
diff --git a/ui/modules/things/features.js b/ui/modules/things/features.js
index f4c304d9560..e67fcf282f2 100644
--- a/ui/modules/things/features.js
+++ b/ui/modules/things/features.js
@@ -27,17 +27,19 @@ export function addChangeListener(observer) {
 }
 
 function notifyAll() {
-  observers.forEach((observer) => observer.call(null, dom.theFeatureId.value));
+  observers.forEach((observer) => observer.call(null, dom.crudFeature.idValue));
 }
 
 let featurePropertiesEditor;
 let featureDesiredPropertiesEditor;
 
+let eTag;
+
 const dom = {
-  theFeatureId: null,
-  featureDefinition: null,
-  featureCount: null,
-  featuresTable: null,
+  crudFeature: null,
+  inputFeatureDefinition: null,
+  badgeFeatureCount: null,
+  tbodyFeatures: null,
   tableValidationFeature: null,
 };
 
@@ -45,77 +47,76 @@ const dom = {
  * Initializes components. Should be called after DOMContentLoaded event
  */
 export function ready() {
-  Utils.getAllElementsById(dom);
-
-  Utils.addValidatorToTable(dom.featuresTable, dom.tableValidationFeature);
-
-
-  dom.featuresTable.onclick = (event) => {
-    if (event.target && event.target.nodeName === 'TD') {
-      dom.theFeatureId.value = event.target.textContent;
-      refreshFeature(Things.theThing, dom.theFeatureId.value);
-    }
-  };
+  Things.addChangeListener(onThingChanged);
 
-  document.getElementById('createFeature').onclick = () => {
-    if (!dom.theFeatureId.value) {
-      dom.theFeatureId.value = 'new-feature';
-    }
-    createFeature(dom.theFeatureId.value);
-  };
+  Utils.getAllElementsById(dom);
 
-  document.getElementById('putFeature').onclick = () => updateFeature('PUT');
-  document.getElementById('deleteFeature').onclick = () => updateFeature('DELETE');
+  Utils.addValidatorToTable(dom.tbodyFeatures, dom.tableValidationFeature);
 
-  featurePropertiesEditor = ace.edit('featurePropertiesEditor');
-  featureDesiredPropertiesEditor = ace.edit('featureDesiredPropertiesEditor');
+  dom.tbodyFeatures.onclick = onFeaturesTableClick;
 
-  featurePropertiesEditor.session.setMode('ace/mode/json');
-  featureDesiredPropertiesEditor.session.setMode('ace/mode/json');
+  dom.crudFeature.editDisabled = true;
+  dom.crudFeature.addEventListener('onCreateClick', onCreateFeatureClick);
+  dom.crudFeature.addEventListener('onUpdateClick', onUpdateFeatureClick);
+  dom.crudFeature.addEventListener('onDeleteClick', onDeleteFeatureClick);
+  dom.crudFeature.addEventListener('onEditToggle', onEditToggle);
 
-  featurePropertiesEditor.on('dblclick', (event) => {
-    if (!event.domEvent.shiftKey) {
-      return;
-    }
+  featurePropertiesEditor = Utils.createAceEditor('featurePropertiesEditor', 'ace/mode/json', true);
+  featureDesiredPropertiesEditor = Utils.createAceEditor('featureDesiredPropertiesEditor', 'ace/mode/json', true);
 
-    setTimeout(() => {
-      const token = featurePropertiesEditor.getSelectedText();
-      if (token) {
-        const path = '$..' + token.replace(/['"]+/g, '').trim();
-        const res = JSONPath({
-          json: JSON.parse(featurePropertiesEditor.getValue()),
-          path: path,
-          resultType: 'pointer',
-        });
-        Fields.proposeNewField('features/' + dom.theFeatureId.value + '/properties' + res);
-      }
-    }, 10);
-  });
+  featurePropertiesEditor.on('dblclick', onFeaturePropertiesDblClick);
 
   document.querySelector('a[data-bs-target="#tabCrudFeature"]').addEventListener('shown.bs.tab', (event) => {
     featurePropertiesEditor.renderer.updateFull();
     featureDesiredPropertiesEditor.renderer.updateFull();
   });
+}
 
-  Things.addChangeListener(onThingChanged);
+function onUpdateFeatureClick() {
+  updateFeature('PUT');
 }
 
-/**
- * Creates a new empty feature for the given thing in Ditto
- * @param {String} newFeatureId Name of the new feature.
- */
-function createFeature(newFeatureId) {
-  console.assert(newFeatureId && newFeatureId != '', 'newFeatureId expected');
-  Utils.assert(Things.theThing, 'No Thing selected');
-  if (Things.theThing['features']) {
-    Utils.assert(!Object.keys(Things.theThing.features).includes(newFeatureId),
-        `Feature ID ${newFeatureId} already exists in Thing`);
+function onDeleteFeatureClick() {
+  Utils.confirm(`Are you sure you want to delete feature<br>'${dom.crudFeature.idValue}'?`, 'Delete', () => {
+    updateFeature('DELETE');
+  });
+}
+
+function onFeaturePropertiesDblClick(event) {
+  if (!event.domEvent.shiftKey) {
+    return;
   }
 
-  API.callDittoREST('PUT',
-      '/things/' + Things.theThing.thingId + '/features/' + newFeatureId,
-      {},
-  ).then(() => Things.refreshThing(Things.theThing.thingId));
+  setTimeout(() => {
+    const token = featurePropertiesEditor.getSelectedText();
+    if (token) {
+      const path = '$..' + token.replace(/['"]+/g, '').trim();
+      const res = JSONPath({
+        json: JSON.parse(featurePropertiesEditor.getValue()),
+        path: path,
+        resultType: 'pointer',
+      });
+      Fields.proposeNewField('features/' + dom.crudFeature.idValue + '/properties' + res);
+    }
+  }, 10);
+}
+
+function onCreateFeatureClick() {
+  Utils.assert(dom.crudFeature.idValue, 'Feature ID must not be empty', dom.crudFeature.validationElement);
+  Utils.assert(!Things.theThing['features'] || !Object.keys(Things.theThing.features).includes(dom.crudFeature.idValue),
+      `Feature ID ${dom.crudFeature.idValue} already exists in Thing`,
+      dom.crudFeature.validationElement);
+  updateFeature('PUT');
+}
+
+function onFeaturesTableClick(event) {
+  if (event.target && event.target.nodeName === 'TD') {
+    if (dom.crudFeature.idValue === event.target.textContent) {
+      refreshFeature(null);
+    } else {
+      refreshFeature(Things.theThing, event.target.textContent);
+    }
+  }
 }
 
 /**
@@ -124,13 +125,13 @@ function createFeature(newFeatureId) {
  */
 function updateFeature(method) {
   Utils.assert(Things.theThing, 'No Thing selected');
-  Utils.assert(dom.theFeatureId.value, 'No Feature selected');
+  Utils.assert(dom.crudFeature.idValue, 'No Feature selected');
 
   const featureObject = {};
   const featureProperties = featurePropertiesEditor.getValue();
   const featureDesiredProperties = featureDesiredPropertiesEditor.getValue();
-  if (dom.featureDefinition.value) {
-    featureObject.definition = dom.featureDefinition.value.split(',');
+  if (dom.inputFeatureDefinition.value) {
+    featureObject.definition = dom.inputFeatureDefinition.value.split(',');
   }
   if (featureProperties) {
     featureObject.properties = JSON.parse(featureProperties);
@@ -141,40 +142,57 @@ function updateFeature(method) {
 
   API.callDittoREST(
       method,
-      '/things/' + Things.theThing.thingId + '/features/' + dom.theFeatureId.value,
+      '/things/' + Things.theThing.thingId + '/features/' + dom.crudFeature.idValue,
       method === 'PUT' ? featureObject : null,
-  ).then(() => Things.refreshThing(Things.theThing.thingId)
-  ).catch(
+      {
+        'if-match': method === 'PUT' ? eTag : '*'
+      }
+  ).then(() => {
+    if (method === 'PUT') {
+      dom.crudFeature.toggleEdit();
+    }
+    Things.refreshThing(Things.theThing.thingId);
+  }).catch(
       // nothing to clean-up if featureUpdate failed
   );
 }
 
-/**
- * Initializes all UI components for the given single feature of the given thing, if no thing is given the UI is cleared
- * @param {Object} thing thing the feature values are taken from
- * @param {String} feature FeatureId to be refreshed
- */
-function refreshFeature(thing, feature) {
-  if (thing) {
-    dom.theFeatureId.value = feature;
-    dom.featureDefinition.value = thing.features[feature]['definition'] ? thing.features[feature].definition : null;
-    if (thing.features[feature]['properties']) {
-      featurePropertiesEditor.setValue(JSON.stringify(thing.features[feature].properties, null, 4), -1);
+function updateFeatureEditors(featureJson) {
+  if (featureJson) {
+    dom.inputFeatureDefinition.value = featureJson['definition'] ? featureJson.definition : null;
+    if (featureJson['properties']) {
+      featurePropertiesEditor.setValue(JSON.stringify(featureJson.properties, null, 4), -1);
     } else {
       featurePropertiesEditor.setValue('');
     }
-    if (thing.features[feature]['desiredProperties']) {
-      featureDesiredPropertiesEditor.setValue(JSON.stringify(thing.features[feature].desiredProperties, null, 4), -1);
+    if (featureJson['desiredProperties']) {
+      featureDesiredPropertiesEditor.setValue(JSON.stringify(featureJson.desiredProperties, null, 4), -1);
     } else {
       featureDesiredPropertiesEditor.setValue('');
     }
   } else {
-    dom.theFeatureId.value = null;
-    dom.featureDefinition.value = null;
+    dom.inputFeatureDefinition.value = null;
     featurePropertiesEditor.setValue('');
     featureDesiredPropertiesEditor.setValue('');
   }
-  notifyAll();
+}
+
+/**
+ * Initializes all UI components for the given single feature of the given thing, if no thing is given the UI is cleared
+ * @param {Object} thing thing the feature values are taken from
+ * @param {String} featureId FeatureId to be refreshed
+ */
+function refreshFeature(thing, featureId) {
+  if (!dom.crudFeature.isEditing) {
+    if (thing) {
+      dom.crudFeature.idValue = featureId;
+      updateFeatureEditors(thing.features[featureId]);
+    } else {
+      dom.crudFeature.idValue = null;
+      updateFeatureEditors(null);
+    }
+    notifyAll();
+  }
 }
 
 /**
@@ -182,23 +200,59 @@ function refreshFeature(thing, feature) {
  * @param {Object} thing UI is initialized for the features of the given thing
  */
 function onThingChanged(thing) {
+  dom.crudFeature.editDisabled = (thing === null);
   // Update features table
-  dom.featuresTable.innerHTML = '';
+  dom.tbodyFeatures.innerHTML = '';
   let count = 0;
   let thingHasFeature = false;
   if (thing && thing.features) {
     for (const key of Object.keys(thing.features)) {
-      if (key === dom.theFeatureId.value) {
+      if (key === dom.crudFeature.idValue) {
         refreshFeature(thing, key);
         thingHasFeature = true;
       }
-      Utils.addTableRow(dom.featuresTable, key, key === dom.theFeatureId.value);
+      Utils.addTableRow(dom.tbodyFeatures, key, key === dom.crudFeature.idValue);
       count++;
     }
   }
-  dom.featureCount.textContent = count > 0 ? count : '';
+  dom.badgeFeatureCount.textContent = count > 0 ? count : '';
   if (!thingHasFeature) {
-    dom.theFeatureId.value = null;
-    refreshFeature();
+    dom.crudFeature.idValue = null;
+    updateFeatureEditors(null);
+  }
+}
+
+function onEditToggle(event) {
+  if (event.detail) {
+    API.callDittoREST('GET', `/things/${Things.theThing.thingId}/features/${dom.crudFeature.idValue}`, null, null, true)
+        .then((response) => {
+          eTag = response.headers.get('ETag');
+          return response.json();
+        })
+        .then((featureJson) => {
+          enableDisableEditors();
+          updateFeatureEditors(featureJson);
+        });
+  } else {
+    enableDisableEditors();
+    clearEditorsAfterCancel();
+    dom.crudFeature.validationElement.classList.remove('is-invalid');
+  }
+
+  function enableDisableEditors() {
+    dom.inputFeatureDefinition.disabled = !event.detail;
+    featurePropertiesEditor.setReadOnly(!event.detail);
+    featurePropertiesEditor.renderer.setShowGutter(event.detail);
+    featureDesiredPropertiesEditor.setReadOnly(!event.detail);
+    featureDesiredPropertiesEditor.renderer.setShowGutter(event.detail);
+  }
+
+  function clearEditorsAfterCancel() {
+    if (dom.crudFeature.idValue) {
+      refreshFeature(Things.theThing, dom.crudFeature.idValue);
+    } else {
+      refreshFeature(null);
+    }
   }
 }
+
diff --git a/ui/modules/things/searchFilter.js b/ui/modules/things/searchFilter.js
index c0a97d54e6b..fbbbe2f72ef 100644
--- a/ui/modules/things/searchFilter.js
+++ b/ui/modules/things/searchFilter.js
@@ -60,7 +60,7 @@ export async function ready() {
       checkIfFavourite();
       const filterEditNeeded = checkAndMarkParameter();
       if (!filterEditNeeded) {
-        ThingsSearch.searchThings(event.target.textContent);
+        ThingsSearch.searchTriggered(event.target.textContent);
       }
     }
   });
diff --git a/ui/modules/things/things.html b/ui/modules/things/things.html
index 67a85438ee4..718866f7761 100644
--- a/ui/modules/things/things.html
+++ b/ui/modules/things/things.html
@@ -67,33 +67,14 @@ <h5>Things</h5>
                         <div class="tab-pane fade show active container no-margin" id="tabThingDetails">
                             <div class="table-wrap">
                                 <table class="table table-striped table-hover table-sm">
-                                    <tbody id="thingDetails"></tbody>
+                                    <tbody id="tbodyThingDetails"></tbody>
                                 </table>
                             </div>
                     </div>
                     <div class="tab-pane fade container no-margin" style="height:100%;" id="tabModifyThing">
-                        <div id="divThingsCRUD" class="resizable_flex_column px-1">
-                            <div class="input-group input-group-sm mb-1 mt-1 has-validation">
-                                <label class="input-group-text">Thing ID</label>
-                                <input type="text" class="form-control" disabled id="thingId">
-                                <button class="btn btn-secondary btn-sm" id="buttonEditThing"
-                                    data-bs-toggle="tooltip" title="Enable fields for editing">
-                                    <i id="iThingsEdit" class="bi bi-pencil-square"></i>
-                                </button>
-                                <button class="btn btn-secondary btn-sm" disabled id="buttonCreateThing"
-                                    data-bs-toggle="tooltip" title="Create an empty thing with a default policy">
-                                    <i class="bi bi-plus-circle"></i>
-                                </button>
-                                <button class="btn btn-secondary btn-sm" disabled id="buttonSaveThing">
-                                    <i class="bi bi-save"></i>
-                                </button>
-                                <button class="btn btn-secondary btn-sm" disabled id="buttonDeleteThing">
-                                    <i class="bi bi-trash3"></i>
-                                </button>
-                                <div class="invalid-feedback"></div>
-                            </div>
+                        <crud-toolbar id="crudThings" label="Thing ID">
                             <div class="input-group input-group-sm mb-1">
-                                <label class="input-group-text">Definition</label>
+                                <label class="input-group-text" id="labelX">Definition</label>
                                 <div class="btn-group dropend">
                                     <button class="btn btn-outline-secondary btn-sm dropdown-toggle"
                                     data-bs-toggle="dropdown" disabled id="buttonThingDefinitions"></button>
@@ -104,41 +85,38 @@ <h5>Things</h5>
                             <div class="ace_container mb-1" style="flex-grow: 1;">
                                 <div class="script_editor" id="thingJsonEditor"></div>
                             </div>
-                        </div>
+                        </crud-toolbar>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
-<h5 data-bs-toggle="collapse" data-bs-target="#collapseAttributes">Attributes <span class="badge badge-info"
-        id="attributeCount"></span></h5>
+<h5 data-bs-toggle="collapse" data-bs-target="#collapseAttributes">Attributes <span class="badge rounded-pill bg-info"
+        id="badgeAttributeCount"></span></h5>
 <hr />
 <div class="collapse" id="collapseAttributes">
     <div class="row">
         <div class="col-md-4" style="overflow-y:scroll;">
             <table class="table table-striped table-hover table-sm">
-                <tbody id="attributesTable"></tbody>
+                <tbody id="tbodyAttributes"></tbody>
             </table>
         </div>
         <div class="col-md-8">
             <ul class="nav nav-tabs">
                 <li class="nav-item">
-                    <a class="nav-link active">Attribute Details</a>
+                    <a class="nav-link active">CRUD Attribute</a>
                 </li>
             </ul>
             <div class="tab-content">
                 <div class="tab-pane container active no-margin">
-                    <div class="input-group input-group-sm mb-1 mt-1">
-                        <label class="input-group-text">Path</label>
-                        <input type="text" class="form-control" id="attributePath"></input>
-                        <button class="btn btn-outline-secondary btn-sm" id="putAttribute">create/update</button>
-                        <button class="btn btn-outline-secondary btn-sm" id="deleteAttribute">delete</button>
-                    </div>
-                    <div class="input-group input-group-sm mb-1">
-                        <label class="input-group-text">Value</label>
-                        <input type="text" class="form-control form-control-sm" id="attributeValue"></input>
-                    </div>
+                    <crud-toolbar id="crudAttribute" label="Path">
+                        <div class="input-group input-group-sm has-validation mb-1">
+                            <label class="input-group-text">Value</label>
+                            <input type="text" class="form-control form-control-sm" id="inputAttributeValue" disabled></input>
+                            <div class="invalid-feedback"></div>
+                        </div>
+                    </crud-toolbar>
                 </div>
             </div>
         </div>
diff --git a/ui/modules/things/thingsCRUD.js b/ui/modules/things/thingsCRUD.js
index 90e613ef323..115ca1294d2 100644
--- a/ui/modules/things/thingsCRUD.js
+++ b/ui/modules/things/thingsCRUD.js
@@ -20,20 +20,13 @@ import * as Things from './things.js';
 
 let thingJsonEditor;
 
-let isEditing = false;
-
 let thingTemplates;
 
+let eTag;
+
 const dom = {
-  thingDetails: null,
-  thingId: null,
-  modalThingsEdit: null,
-  iThingsEdit: null,
-  divThingsCRUD: null,
-  buttonEditThing: null,
-  buttonCreateThing: null,
-  buttonSaveThing: null,
-  buttonDeleteThing: null,
+  tbodyThingDetails: null,
+  crudThings: null,
   buttonThingDefinitions: null,
   inputThingDefinition: null,
   ulThingDefinitions: null,
@@ -52,10 +45,10 @@ export async function ready() {
   loadThingTemplates();
 
   dom.ulThingDefinitions.addEventListener('click', onThingDefinitionsClick);
-  dom.buttonCreateThing.onclick = onCreateThingClick;
-  dom.buttonSaveThing.onclick = onSaveThingClick;
-  dom.buttonDeleteThing.onclick = onDeleteThingClick;
-  dom.buttonEditThing.onclick = toggleEdit;
+  dom.crudThings.addEventListener('onCreateClick', onCreateThingClick);
+  dom.crudThings.addEventListener('onUpdateClick', onUpdateThingClick);
+  dom.crudThings.addEventListener('onDeleteClick', onDeleteThingClick);
+  dom.crudThings.addEventListener('onEditToggle', onEditToggle);
 
   document.querySelector('a[data-bs-target="#tabModifyThing"]').addEventListener('shown.bs.tab', (event) => {
     thingJsonEditor.renderer.updateFull();
@@ -63,9 +56,8 @@ export async function ready() {
 }
 
 function onDeleteThingClick() {
-  Utils.assert(dom.thingId.value, 'Thing ID is empty', dom.thingId);
-  Utils.confirm(`Are you sure you want to delete thing<br>'${dom.thingId.value}'?`, 'Delete', () => {
-    API.callDittoREST('DELETE', `/things/${dom.thingId.value}`, null,
+  Utils.confirm(`Are you sure you want to delete thing<br>'${dom.crudThings.idValue}'?`, 'Delete', () => {
+    API.callDittoREST('DELETE', `/things/${dom.crudThings.idValue}`, null,
         {
           'if-match': '*',
         },
@@ -75,29 +67,28 @@ function onDeleteThingClick() {
   });
 }
 
-function onSaveThingClick() {
-  Utils.assert(dom.thingId.value, 'Thing ID is empty', dom.thingId);
-  API.callDittoREST('PUT', `/things/${dom.thingId.value}`, JSON.parse(thingJsonEditor.getValue()),
+function onUpdateThingClick() {
+  API.callDittoREST('PUT', `/things/${dom.crudThings.idValue}`, JSON.parse(thingJsonEditor.getValue()),
       {
-        'if-match': '*',
+        'if-match': eTag,
       },
   ).then(() => {
-    toggleEdit();
-    Things.refreshThing(dom.thingId.value, null);
+    dom.crudThings.toggleEdit();
+    Things.refreshThing(dom.crudThings.idValue, null);
   });
 }
 
 async function onCreateThingClick() {
   const editorValue = thingJsonEditor.getValue();
-  if (dom.thingId.value !== undefined && dom.thingId.value !== '') {
+  if (dom.crudThings.idValue !== undefined && dom.crudThings.idValue !== '') {
     API.callDittoREST('PUT',
-        '/things/' + dom.thingId.value,
+        '/things/' + dom.crudThings.idValue,
         editorValue === '' ? {} : JSON.parse(editorValue),
         {
           'if-none-match': '*',
         },
     ).then((data) => {
-      toggleEdit();
+      dom.crudThings.toggleEdit();
       Things.refreshThing(data.thingId, () => {
         ThingsSearch.getThings([data.thingId]);
       });
@@ -105,7 +96,7 @@ async function onCreateThingClick() {
   } else {
     API.callDittoREST('POST', '/things', editorValue === '' ? {} : JSON.parse(editorValue))
         .then((data) => {
-          toggleEdit();
+          dom.crudThings.toggleEdit();
           Things.refreshThing(data.thingId, () => {
             ThingsSearch.getThings([data.thingId]);
           });
@@ -115,7 +106,7 @@ async function onCreateThingClick() {
 
 function onThingDefinitionsClick(event) {
   Things.setTheThing(null);
-  isEditing = true;
+  // isEditing = true;
   dom.inputThingDefinition.value = event.target.textContent;
   thingJsonEditor.setValue(JSON.stringify(thingTemplates[event.target.textContent], null, 2), -1);
 }
@@ -135,7 +126,7 @@ function loadThingTemplates() {
  * @param {Object} thingJson Thing json
  */
 function onThingChanged(thingJson) {
-  if (isEditing) {
+  if (dom.crudThings.isEditing) {
     return;
   }
 
@@ -143,21 +134,20 @@ function onThingChanged(thingJson) {
   updateThingJsonEditor();
 
   function updateThingDetailsTable() {
-    dom.thingDetails.innerHTML = '';
+    dom.tbodyThingDetails.innerHTML = '';
     if (thingJson) {
-      Utils.addTableRow(dom.thingDetails, 'thingId', false, true, thingJson.thingId);
-      Utils.addTableRow(dom.thingDetails, 'policyId', false, true, thingJson.policyId);
-      Utils.addTableRow(dom.thingDetails, 'definition', false, true, thingJson.definition ?? '');
-      Utils.addTableRow(dom.thingDetails, 'revision', false, true, thingJson._revision);
-      Utils.addTableRow(dom.thingDetails, 'created', false, true, thingJson._created);
-      Utils.addTableRow(dom.thingDetails, 'modified', false, true, thingJson._modified);
+      Utils.addTableRow(dom.tbodyThingDetails, 'thingId', false, true, thingJson.thingId);
+      Utils.addTableRow(dom.tbodyThingDetails, 'policyId', false, true, thingJson.policyId);
+      Utils.addTableRow(dom.tbodyThingDetails, 'definition', false, true, thingJson.definition ?? '');
+      Utils.addTableRow(dom.tbodyThingDetails, 'revision', false, true, thingJson._revision);
+      Utils.addTableRow(dom.tbodyThingDetails, 'created', false, true, thingJson._created);
+      Utils.addTableRow(dom.tbodyThingDetails, 'modified', false, true, thingJson._modified);
     }
   }
 
   function updateThingJsonEditor() {
     if (thingJson) {
-      dom.thingId.value = thingJson.thingId;
-      dom.buttonDeleteThing.disabled = false;
+      dom.crudThings.idValue = thingJson.thingId;
       dom.inputThingDefinition.value = thingJson.definition ?? '';
       const thingCopy = JSON.parse(JSON.stringify(thingJson));
       delete thingCopy['_revision'];
@@ -165,37 +155,44 @@ function onThingChanged(thingJson) {
       delete thingCopy['_modified'];
       thingJsonEditor.setValue(JSON.stringify(thingCopy, null, 2), -1);
     } else {
-      dom.thingId.value = null;
-      dom.buttonDeleteThing.disabled = true;
+      dom.crudThings.idValue = null;
       dom.inputThingDefinition.value = null;
       thingJsonEditor.setValue('');
     }
   }
 }
 
-function toggleEdit() {
-  isEditing = !isEditing;
-  dom.modalThingsEdit.classList.toggle('editBackground');
-  dom.divThingsCRUD.classList.toggle('editForground');
-  dom.iThingsEdit.classList.toggle('bi-pencil-square');
-  dom.iThingsEdit.classList.toggle('bi-x-square');
-  dom.buttonThingDefinitions.disabled = !dom.buttonThingDefinitions.disabled;
-  dom.inputThingDefinition.disabled = !dom.inputThingDefinition.disabled;
-  thingJsonEditor.setReadOnly(!isEditing);
-  thingJsonEditor.renderer.setShowGutter(isEditing);
-  if (dom.thingId.value) {
-    dom.buttonSaveThing.disabled = !dom.buttonSaveThing.disabled;
+function onEditToggle(event) {
+  if (event.detail) {
+    API.callDittoREST('GET', `/things/${Things.theThing.thingId}`, null, null, true)
+        .then((response) => {
+          eTag = response.headers.get('ETag');
+          return response.json();
+        })
+        .then((thingJson) => {
+          enableDisableEditors();
+          updateEditorsBeforeEdit(thingJson);
+        });
   } else {
-    dom.buttonCreateThing.disabled = !dom.buttonCreateThing.disabled;
-    dom.thingId.disabled = !dom.thingId.disabled;
-  }
-  if (!isEditing) {
+    enableDisableEditors();
     clearEditorsAfterCancel();
   }
 
+  function enableDisableEditors() {
+    dom.buttonThingDefinitions.disabled = !event.detail;
+    dom.inputThingDefinition.disabled = !event.detail;
+  }
+
+  function updateEditorsBeforeEdit(thingJson) {
+    dom.inputThingDefinition.value = thingJson.definition ?? '';
+    thingJsonEditor.setReadOnly(!event.detail);
+    thingJsonEditor.renderer.setShowGutter(event.detail);
+    thingJsonEditor.setValue(JSON.stringify(thingJson, null, 2), -1);
+  }
+
   function clearEditorsAfterCancel() {
-    if (dom.thingId.value && dom.thingId.value !== '') {
-      Things.refreshThing(dom.thingId.value, null);
+    if (dom.crudThings.idValue && dom.crudThings.idValue !== '') {
+      Things.refreshThing(dom.crudThings.idValue, null);
     } else {
       dom.inputThingDefinition.value = null;
       thingJsonEditor.setValue('');
diff --git a/ui/modules/things/thingsSSE.js b/ui/modules/things/thingsSSE.js
index f87eb7a7039..817bc9f0c94 100644
--- a/ui/modules/things/thingsSSE.js
+++ b/ui/modules/things/thingsSSE.js
@@ -33,7 +33,8 @@ function onThingChanged(newThingJson, isNewThingId) {
   } else if (isNewThingId) {
     thingEventSource && thingEventSource.close();
     console.log('Start SSE: ' + newThingJson.thingId);
-    thingEventSource = API.getEventSource(newThingJson.thingId, '&extraFields=_revision,_modified');
+    thingEventSource = API.getEventSource(newThingJson.thingId,
+        '&fields=thingId,attributes,features,_revision,_modified');
     thingEventSource.onmessage = onMessage;
   }
 }
diff --git a/ui/modules/things/thingsSearch.js b/ui/modules/things/thingsSearch.js
index 1eb7674bf6f..3aa3c7d87c7 100644
--- a/ui/modules/things/thingsSearch.js
+++ b/ui/modules/things/thingsSearch.js
@@ -117,7 +117,7 @@ export function getThings(thingIds) {
  * @param {String} filter Ditto search filter (rql)
  * @param {boolean} isMore (optional) use cursor from previous search for additional pages
  */
-export function searchThings(filter, isMore = false) {
+function searchThings(filter, isMore = false) {
   document.body.style.cursor = 'progress';
 
   const namespaces = Environments.current().searchNamespaces;
diff --git a/ui/modules/utils.js b/ui/modules/utils.js
index 9f5d7808540..2cbb98424ab 100644
--- a/ui/modules/utils.js
+++ b/ui/modules/utils.js
@@ -28,7 +28,7 @@ export function ready() {
 
 /**
  * Adds a table to a table element
- * @param {HTMLElement} table tbody element the row is added to
+ * @param {HTMLTableElement} table tbody element the row is added to
  * @param {String} key first column text of the row. Acts as id of the row
  * @param {boolean} selected if true, the new row will be marked as selected
  * @param {boolean} withClipBoardCopy add a clipboard button at the last column of the row
@@ -69,13 +69,13 @@ export function addCheckboxToRow(row, id, checked, onToggle) {
 
 /**
  * Adds a cell to the row including a tooltip
- * @param {HTMRTableRowElement} row target row
+ * @param {HTMLTableRowElement} row target row
  * @param {String} cellContent content of new cell
  * @param {String} cellTooltip tooltip for new cell
- * @param {integer} position optional, default -1 (add to the end)
+ * @param {Number} position optional, default -1 (add to the end)
  */
-export function addCellToRow(row, cellContent, cellTooltip, position) {
-  const cell = row.insertCell(position ?? -1);
+export function addCellToRow(row, cellContent, cellTooltip = null, position = -1) {
+  const cell = row.insertCell(position);
   cell.innerHTML = cellContent;
   cell.setAttribute('data-bs-toggle', 'tooltip');
   cell.title = cellTooltip ?? cellContent;
@@ -149,7 +149,7 @@ export function setOptions(target, options) {
  * @param {array} items array of items for the drop down
  * @param {boolean} isHeader (optional) true to add a header line
  */
-export function addDropDownEntries(target, items, isHeader) {
+export function addDropDownEntries(target, items, isHeader = false) {
   items.forEach((value) => {
     const li = document.createElement('li');
     li.innerHTML = isHeader ?
@@ -191,10 +191,11 @@ export function addTab(tabItemsNode, tabContentsNode, title, contentHTML, toolTi
 /**
  * Get the HTMLElements of all the given ids. The HTMLElements will be returned in the original object
  * @param {Object} domObjects object with empty keys that are used as ids of the dom elements
+ * @param {Element} searchRoot optional root to search in (optional for shadow dom)
  */
-export function getAllElementsById(domObjects) {
+export function getAllElementsById(domObjects, searchRoot = document) {
   Object.keys(domObjects).forEach((id) => {
-    domObjects[id] = document.getElementById(id);
+    domObjects[id] = searchRoot.getElementById(id);
     if (!domObjects[id]) {
       throw new Error(`Element ${id} not found.`);
     }
@@ -207,13 +208,13 @@ export function getAllElementsById(domObjects) {
  * @param {String} header Header for toast
  * @param {String} status Status text for toas
  */
-export function showError(message, header, status) {
+export function showError(message, header, status = '') {
   const domToast = document.createElement('div');
   domToast.classList.add('toast');
   domToast.innerHTML = `<div class="toast-header alert-danger">
   <i class="bi me-2 bi-exclamation-triangle-fill"></i>
   <strong class="me-auto">${header ?? 'Error'}</strong>
-  <small>${status ?? ''}</small>
+  <small>${status}</small>
   <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
   </div>
   <div class="toast-body">${message}</div>`;
@@ -319,7 +320,7 @@ export function addValidatorToTable(tableElement, inputElement) {
 
 /**
  * Adjust selection of a table
- * @param {HTMLElement} tbody table with the data
+ * @param {HTMLTableElement} tbody table with the data
  * @param {function} condition evaluate if table row should be selected or not
  */
 export function tableAdjustSelection(tbody, condition) {
diff --git a/ui/modules/utils/crudToolbar.js b/ui/modules/utils/crudToolbar.js
new file mode 100644
index 00000000000..64cd580c658
--- /dev/null
+++ b/ui/modules/utils/crudToolbar.js
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+/* eslint-disable require-jsdoc */
+import * as Utils from '../utils.js';
+
+class CrudToolbar extends HTMLElement {
+  isEditing = false;
+  dom = {
+    label: null,
+    inputIdValue: null,
+    buttonCrudEdit: null,
+    buttonCreate: null,
+    buttonUpdate: null,
+    buttonDelete: null,
+    iEdit: null,
+    divRoot: null,
+  };
+
+  get idValue() {
+    return this.dom.inputIdValue.value;
+  }
+
+  set idValue(newValue) {
+    this.dom.inputIdValue.value = newValue;
+    this.dom.buttonDelete.disabled = (newValue === null);
+  }
+
+  get editDisabled() {
+    return this.dom.buttonCrudEdit.disabled;
+  }
+
+  set editDisabled(newValue) {
+    this.dom.buttonCrudEdit.disabled = newValue;
+  }
+
+  get validationElement() {
+    return this.dom.inputIdValue;
+  }
+
+  constructor() {
+    super();
+    this.attachShadow({mode: 'open'});
+  }
+
+  connectedCallback() {
+    this.shadowRoot.append(document.getElementById('templateCrudToolbar').content.cloneNode(true));
+    setTimeout(() => {
+      Utils.getAllElementsById(this.dom, this.shadowRoot);
+      this.dom.buttonCrudEdit.onclick = () => this.toggleEdit();
+      this.dom.label.innerText = this.getAttribute('label') || 'Label';
+      this.dom.buttonCreate.onclick = this.eventDispatcher('onCreateClick');
+      this.dom.buttonUpdate.onclick = this.eventDispatcher('onUpdateClick');
+      this.dom.buttonDelete.onclick = this.eventDispatcher('onDeleteClick');
+    });
+  };
+
+  eventDispatcher(eventName) {
+    return () => {
+      this.dispatchEvent(new CustomEvent(eventName, {
+        composed: true,
+      }));
+    };
+  }
+
+  toggleEdit() {
+    this.isEditing = !this.isEditing;
+    document.getElementById('modalCrudEdit').classList.toggle('editBackground');
+    this.dom.divRoot.classList.toggle('editForground');
+    this.dom.iEdit.classList.toggle('bi-pencil-square');
+    this.dom.iEdit.classList.toggle('bi-x-square');
+    this.dom.buttonCrudEdit.title = this.isEditing ? 'Cancel' : 'Edit';
+    this.dom.buttonCreate.disabled = !(this.isEditing && !this.dom.inputIdValue.value);
+    this.dom.buttonUpdate.disabled = !(this.isEditing && this.dom.inputIdValue.value);
+    if (this.isEditing || !this.dom.inputIdValue.value) {
+      this.dom.buttonDelete.disabled = true;
+    }
+    this.dom.inputIdValue.disabled = !(this.isEditing && !this.dom.inputIdValue.value);
+    this.dispatchEvent(new CustomEvent('onEditToggle', {
+      composed: true,
+      detail: this.isEditing,
+    }));
+  }
+}
+
+customElements.define('crud-toolbar', CrudToolbar);

From 4d93fb77de35aad1ecdf43b37dc8e50e263d5e68 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Fri, 6 Jan 2023 19:05:28 +0100
Subject: [PATCH 007/173] Explorer UI - Apply new edit style to environments

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/modules/environments/environments.html |  63 +++------
 ui/modules/environments/environments.js   | 162 +++++++++++++---------
 ui/modules/utils/crudToolbar.js           |   3 +-
 3 files changed, 122 insertions(+), 106 deletions(-)

diff --git a/ui/modules/environments/environments.html b/ui/modules/environments/environments.html
index 51d7858ec17..907151ff786 100644
--- a/ui/modules/environments/environments.html
+++ b/ui/modules/environments/environments.html
@@ -35,55 +35,34 @@ <h5>Environments</h5>
         </ul>
         <div class="tab-content" style="flex-grow: 1; overflow: hidden;">
             <div class="tab-pane container active no-margin" id="tabEnvDetails">
-                <div class="input-group input-group-sm mb-1 mt-1">
-                    <label class="input-group-text">Name</label>
-                    <input type="text" class="form-control" id="inputEnvironmentName" spellcheck="false">
-                    <button class="btn btn-outline-secondary btn-sm" id="buttonCreateEnvironment">
-                        <i class="bi bi-plus-circle"></i>
-                    </button>
-                    <button class="btn btn-outline-secondary btn-sm" id="buttonUpdateFields"
-                        data-bs-toggle="tooltip" title="Save selected field details">
-                        <i class="bi bi-save"></i>
-                    </button>
-                    <button class="btn btn-outline-secondary btn-sm" id="buttonDeleteEnvironment">
-                        <i class="bi bi-trash3"></i>
-                    </button>
-                    <div class="invalid-feedback"></div>
-                </div>
-                <div class="input-group input-group-sm mt-1">
-                    <label class="input-group-text" data-bs-toggle="tooltip"
-                        title="URI including protocol, host and port (e.g. http://localhost:8080)">API URI</label>
-                    <input type="text" class="form-control form-control-sm" id="inputApiUri"></input>
-                </div>
-                <div class="input-group input-group-sm mt-1">
-                    <label class="input-group-text" data-bs-toggle="tooltip"
-                        title="A comma-separated list of namespaces (e.g. com.example.namespace). The given namespaces are used as a parameter for the Things search">Search Namespaces</label>
-                    <input type="text" class="form-control form-control-sm" spellcheck="false" id="inputSearchNamespaces"></input>
-                </div>
-                <div class="input-group input-group-sm mt-1">
-                    <label class="input-group-text">Ditto Version</label>
-                    <select class="form-select form-select-sm" id="selectDittoVersion">
-                        <option selecte value="3">3</option>
-                        <option value="2">2</option>
-                    </select>
-                </div>
+                <crud-toolbar label="Name" id="crudEnvironmentFields" allowIdChange>
+                    <div class="input-group input-group-sm mt-1">
+                        <label class="input-group-text" data-bs-toggle="tooltip"
+                            title="URI including protocol, host and port (e.g. http://localhost:8080)">API URI</label>
+                        <input type="text" class="form-control form-control-sm" id="inputApiUri" disabled></input>
+                    </div>
+                    <div class="input-group input-group-sm mt-1">
+                        <label class="input-group-text" data-bs-toggle="tooltip"
+                            title="A comma-separated list of namespaces (e.g. com.example.namespace). The given namespaces are used as a parameter for the Things search">Search Namespaces</label>
+                        <input type="text" class="form-control form-control-sm" spellcheck="false" id="inputSearchNamespaces" disabled></input>
+                    </div>
+                    <div class="input-group input-group-sm mt-1">
+                        <label class="input-group-text">Ditto Version</label>
+                        <select class="form-select form-select-sm" id="selectDittoVersion" disabled>
+                            <option selecte value="3">3</option>
+                            <option value="2">2</option>
+                        </select>
+                    </div>    
+                </crud-toolbar>
             </div>
             <div class="tab-pane container no-margin" id="tabEnvJson">
-                <div class="resizable_flex_column">
-                    <div class="input-group input-group-sm mb-1">
-                        <div class="form-control-sm" style="flex-grow: 1;"></div>
-                        <button class="btn btn-outline-secondary btn-sm button_round_both" id="buttonUpdateJson"
-                            data-bs-toggle="tooltip" title="Save selected environment json">
-                            <i class="bi bi-save"></i>
-                            Save
-                        </button>
-                    </div>
+                <crud-toolbar label="Name" id="crudEnvironmentJson" allowIdChange>
                     <div class="ace_container" style="flex-grow: 1;">
                         <div>
                             <div class="script_editor" id="settingsEditor"></div>
                         </div>
                     </div>
-                </div>
+                </crud-toolbar>
             </div>
         </div>
     </div>
diff --git a/ui/modules/environments/environments.js b/ui/modules/environments/environments.js
index e9c7faf15dc..ee51906b0d3 100644
--- a/ui/modules/environments/environments.js
+++ b/ui/modules/environments/environments.js
@@ -29,16 +29,13 @@ let settingsEditor;
 
 let dom = {
   environmentSelector: null,
-  buttonCreateEnvironment: null,
-  buttonDeleteEnvironment: null,
-  buttonUpdateFields: null,
-  buttonUpdateJson: null,
-  inputEnvironmentName: null,
+  tbodyEnvironments: null,
+  tableValidationEnvironments: null,
+  crudEnvironmentFields: null,
+  crudEnvironmentJson: null,
   inputApiUri: null,
   inputSearchNamespaces: null,
   selectDittoVersion: null,
-  tbodyEnvironments: null,
-  tableValidationEnvironments: null,
 };
 
 let observers = [];
@@ -91,73 +88,101 @@ export async function ready() {
   urlSearchParams = new URLSearchParams(window.location.search);
   environments = await loadEnvironmentTemplates();
 
-  settingsEditor = ace.edit('settingsEditor');
-  settingsEditor.session.setMode('ace/mode/json');
-
-  dom.buttonUpdateJson.onclick = () => {
-    Utils.assert(selectedEnvName, 'No environment selected', dom.tableValidationEnvironments);
-    environments[selectedEnvName] = JSON.parse(settingsEditor.getValue());
-    environmentsJsonChanged();
-  };
+  settingsEditor = Utils.createAceEditor('settingsEditor', 'ace/mode/json', true);
 
-  dom.buttonUpdateFields.onclick = () => {
-    Utils.assert(selectedEnvName, 'No environment selected', dom.tableValidationEnvironments);
-    if (selectedEnvName !== dom.inputEnvironmentName.value) {
-      environments[dom.inputEnvironmentName.value] = environments[selectedEnvName];
-      delete environments[selectedEnvName];
-      selectedEnvName = dom.inputEnvironmentName.value;
-    }
-    environments[selectedEnvName].api_uri = dom.inputApiUri.value;
-    environments[selectedEnvName].searchNamespaces = dom.inputSearchNamespaces.value;
-    environments[selectedEnvName].ditto_version = dom.selectDittoVersion.value;
-    environmentsJsonChanged();
-  };
+  dom.tbodyEnvironments.addEventListener('click', onEnvironmentsTableClick);
 
-  dom.tbodyEnvironments.addEventListener('click', (event) => {
-    if (event.target && event.target.tagName === 'TD') {
-      if (selectedEnvName && selectedEnvName === event.target.parentNode.id) {
-        selectedEnvName = null;
-      } else {
-        selectedEnvName = event.target.parentNode.id;
-      }
-      updateEnvEditors();
-    }
-  });
+  dom.crudEnvironmentJson.addEventListener('onCreateClick', onCreateEnvironmentClick);
+  dom.crudEnvironmentJson.addEventListener('onUpdateClick', onUpdateEnvironmentClick);
+  dom.crudEnvironmentJson.addEventListener('onDeleteClick', onDeleteEnvironmentClick);
+  dom.crudEnvironmentJson.addEventListener('onEditToggle', onEditToggle);
 
-  dom.buttonCreateEnvironment.onclick = () => {
-    Utils.assert(dom.inputEnvironmentName.value, 'Please provide an environment name', dom.inputEnvironmentName);
-    Utils.assert(!environments[dom.inputEnvironmentName.value], 'Name already used', dom.inputEnvironmentName);
-    environments[dom.inputEnvironmentName.value] = new Environment({
-      api_uri: dom.inputApiUri.value ? dom.inputApiUri.value : '',
-      ditto_version: dom.selectDittoVersion.value ? dom.selectDittoVersion.value : '3',
-    });
-    selectedEnvName = dom.inputEnvironmentName.value;
-    environmentsJsonChanged();
-  };
+  dom.crudEnvironmentFields.addEventListener('onCreateClick', onCreateEnvironmentClick);
+  dom.crudEnvironmentFields.addEventListener('onUpdateClick', onUpdateEnvironmentClick);
+  dom.crudEnvironmentFields.addEventListener('onDeleteClick', onDeleteEnvironmentClick);
+  dom.crudEnvironmentFields.addEventListener('onEditToggle', onEditToggle);
 
-  dom.buttonDeleteEnvironment.onclick = () => {
-    Utils.assert(selectedEnvName, 'No environment selected', dom.tableValidationEnvironments);
-    Utils.assert(Object.keys(environments).length >= 2, 'At least one environment is required',
-        dom.tableValidationEnvironments);
-    delete environments[selectedEnvName];
-    selectedEnvName = null;
-    environmentsJsonChanged();
-  };
+  dom.environmentSelector.onchange = onEnvironmentSelectorChange;
 
   // Ensure that ace editor to refresh when updated while hidden
   document.querySelector('a[data-bs-target="#tabEnvJson"]').addEventListener('shown.bs.tab', () => {
     settingsEditor.renderer.updateFull();
   });
 
-  dom.environmentSelector.onchange = () => {
-    urlSearchParams.set(URL_PRIMARY_ENVIRONMENT_NAME, dom.environmentSelector.value);
-    window.history.replaceState({}, '', `${window.location.pathname}?${urlSearchParams}`);
-    notifyAll();
-  };
 
   environmentsJsonChanged();
 }
 
+function onEnvironmentSelectorChange() {
+  urlSearchParams.set(URL_PRIMARY_ENVIRONMENT_NAME, dom.environmentSelector.value);
+  window.history.replaceState({}, '', `${window.location.pathname}?${urlSearchParams}`);
+  notifyAll();
+}
+
+function onDeleteEnvironmentClick() {
+  Utils.assert(selectedEnvName, 'No environment selected', dom.tableValidationEnvironments);
+  Utils.assert(Object.keys(environments).length >= 2, 'At least one environment is required',
+      dom.tableValidationEnvironments);
+  delete environments[selectedEnvName];
+  selectedEnvName = null;
+  environmentsJsonChanged();
+}
+
+function onCreateEnvironmentClick(event) {
+  Utils.assert(event.target.idValue,
+      'Environment name must not be empty',
+      event.target.validationElement);
+  Utils.assert(!environments[event.target.idValue],
+      'Environment name already used',
+      event.target.validationElement);
+
+  if (event.target === dom.crudEnvironmentFields) {
+    environments[event.target.idValue] = new Environment({
+      api_uri: dom.inputApiUri.value ?? '',
+      searchNamespaces: dom.inputSearchNamespaces.value ?? '',
+      ditto_version: dom.selectDittoVersion.value ? dom.selectDittoVersion.value : '3',
+    });
+  } else {
+    environments[event.target.idValue] = new Environment(JSON.parse(settingsEditor.getValue()));
+  }
+
+  selectedEnvName = event.target.idValue;
+  event.target.toggleEdit();
+  environmentsJsonChanged();
+}
+
+function onEnvironmentsTableClick(event) {
+  if (event.target && event.target.tagName === 'TD') {
+    if (selectedEnvName && selectedEnvName === event.target.parentNode.id) {
+      selectedEnvName = null;
+    } else {
+      selectedEnvName = event.target.parentNode.id;
+    }
+    updateEnvEditors();
+  }
+}
+
+function onUpdateEnvironmentClick(event) {
+  if (selectedEnvName !== event.target.idValue) {
+    changeEnvironmentName();
+  }
+  if (event.target === dom.crudEnvironmentFields) {
+    environments[selectedEnvName].api_uri = dom.inputApiUri.value;
+    environments[selectedEnvName].searchNamespaces = dom.inputSearchNamespaces.value;
+    environments[selectedEnvName].ditto_version = dom.selectDittoVersion.value;
+  } else {
+    environments[selectedEnvName] = JSON.parse(settingsEditor.getValue());
+  }
+  event.target.toggleEdit();
+  environmentsJsonChanged();
+
+  function changeEnvironmentName() {
+    environments[event.target.idValue] = environments[selectedEnvName];
+    delete environments[selectedEnvName];
+    selectedEnvName = event.target.idValue;
+  }
+}
+
 export function environmentsJsonChanged(modifiedField) {
   localStorage.setItem(STORAGE_KEY, JSON.stringify(environments));
 
@@ -192,13 +217,15 @@ export function environmentsJsonChanged(modifiedField) {
 function updateEnvEditors() {
   if (selectedEnvName) {
     const selectedEnvironment = environments[selectedEnvName];
-    dom.inputEnvironmentName.value = selectedEnvName;
+    dom.crudEnvironmentFields.idValue = selectedEnvName;
+    dom.crudEnvironmentJson.idValue = selectedEnvName;
     settingsEditor.setValue(JSON.stringify(selectedEnvironment, null, 2), -1);
     dom.inputApiUri.value = selectedEnvironment.api_uri;
     dom.inputSearchNamespaces.value = selectedEnvironment.searchNamespaces ?? '';
     dom.selectDittoVersion.value = selectedEnvironment.ditto_version ? selectedEnvironment.ditto_version : '3';
   } else {
-    dom.inputEnvironmentName.value = null;
+    dom.crudEnvironmentFields.idValue = null;
+    dom.crudEnvironmentJson.idValue = null;
     settingsEditor.setValue('');
     dom.inputApiUri.value = null;
     dom.inputSearchNamespaces.value = null;
@@ -276,4 +303,13 @@ async function loadEnvironmentTemplates() {
   }
 }
 
-
+function onEditToggle(event) {
+  dom.inputApiUri.disabled = !event.detail;
+  dom.inputSearchNamespaces.disabled = !event.detail;
+  dom.selectDittoVersion.disabled = !event.detail;
+  settingsEditor.setReadOnly(!event.detail);
+  settingsEditor.renderer.setShowGutter(event.detail);
+  if (!event.detail) {
+    updateEnvEditors();
+  }
+}
diff --git a/ui/modules/utils/crudToolbar.js b/ui/modules/utils/crudToolbar.js
index 64cd580c658..48cfda086cd 100644
--- a/ui/modules/utils/crudToolbar.js
+++ b/ui/modules/utils/crudToolbar.js
@@ -84,7 +84,8 @@ class CrudToolbar extends HTMLElement {
     if (this.isEditing || !this.dom.inputIdValue.value) {
       this.dom.buttonDelete.disabled = true;
     }
-    this.dom.inputIdValue.disabled = !(this.isEditing && !this.dom.inputIdValue.value);
+    const allowIdChange = this.isEditing && (!this.dom.inputIdValue.value || this.hasAttribute('allowIdChange'));
+    this.dom.inputIdValue.disabled = !allowIdChange;
     this.dispatchEvent(new CustomEvent('onEditToggle', {
       composed: true,
       detail: this.isEditing,

From ad71d59b6f1d841e05a57de70b9f52dfe5acdecd Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Sun, 8 Jan 2023 09:35:17 +0100
Subject: [PATCH 008/173] Explorer UI - Add new edit style to connections

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/main.js                                   |   4 +
 ui/modules/api.js                            |  80 +++---
 ui/modules/connections/connections.html      |  77 +++---
 ui/modules/connections/connections.js        | 270 +++----------------
 ui/modules/connections/connectionsCRUD.js    | 204 ++++++++++++++
 ui/modules/connections/connectionsMonitor.js | 145 ++++++++++
 ui/modules/things/attributes.js              |   3 +-
 ui/modules/things/features.js                |  13 +-
 ui/modules/things/thingsCRUD.js              |  11 +-
 9 files changed, 472 insertions(+), 335 deletions(-)
 create mode 100644 ui/modules/connections/connectionsCRUD.js
 create mode 100644 ui/modules/connections/connectionsMonitor.js

diff --git a/ui/main.js b/ui/main.js
index cddd2a77f83..598b9983bd3 100644
--- a/ui/main.js
+++ b/ui/main.js
@@ -24,6 +24,8 @@ import * as ThingsSearch from './modules/things/thingsSearch.js';
 import * as ThingsCRUD from './modules/things/thingsCRUD.js';
 import * as ThingsSSE from './modules/things/thingsSSE.js';
 import * as Connections from './modules/connections/connections.js';
+import * as ConnectionsCRUD from './modules/connections/connectionsCRUD.js';
+import * as ConnectionsMonitor from './modules/connections/connectionsMonitor.js';
 import * as Policies from './modules/policies/policies.js';
 import * as API from './modules/api.js';
 import * as Utils from './modules/utils.js';
@@ -57,6 +59,8 @@ document.addEventListener('DOMContentLoaded', async function() {
   await FeatureMessages.ready();
   Policies.ready();
   Connections.ready();
+  ConnectionsCRUD.ready();
+  ConnectionsMonitor.ready();
   Authorization.ready();
   await Environments.ready();
 
diff --git a/ui/modules/api.js b/ui/modules/api.js
index bc639d0f08f..95b3853aa9f 100644
--- a/ui/modules/api.js
+++ b/ui/modules/api.js
@@ -360,11 +360,9 @@ export function getEventSource(thingId, urlParams) {
 export async function callConnectionsAPI(operation, successCallback, connectionId, connectionJson, command) {
   Utils.assert((env() !== 'things' || Environments.current().solutionId), 'No solutionId configured in environment');
   const params = config[env()][operation];
-  // if (param && param.charAt(0) === '"' && param.charAt(str.length -1) === '"') {
-  //   param = param.substr(1, param.length -2);
-  // };
+  let response;
   try {
-    const response = await fetch(Environments.current().api_uri + params.path.replace('{{solutionId}}',
+    response = await fetch(Environments.current().api_uri + params.path.replace('{{solutionId}}',
         Environments.current().solutionId).replace('{{connectionId}}', connectionId), {
       method: params.method,
       headers: {
@@ -378,46 +376,48 @@ export async function callConnectionsAPI(operation, successCallback, connectionI
               .replace('{{command}}', command) :
           connectionJson ? JSON.stringify(connectionJson) : command,
     });
-    if (!response.ok) {
-      response.json()
-          .then((dittoErr) => {
-            Utils.showError(dittoErr.description, dittoErr.message, dittoErr.status);
-          })
-          .catch((err) => {
-            Utils.showError('No error details from Ditto', response.statusText, response.status);
-          });
-      throw new Error('An error occured: ' + response.status);
-    }
-    if (operation !== 'connectionCommand' && response.status !== 204) {
-      document.body.style.cursor = 'progress';
-      response.json().then((data) => {
-        if (data && data['?'] && data['?']['?'].status >= 400) {
-          const dittoErr = data['?']['?'].payload;
-          Utils.showError(dittoErr.description, dittoErr.message, dittoErr.status);
-        } else {
-          if (params.unwrapJsonPath) {
-            params.unwrapJsonPath.split('.').forEach(function(node) {
-              if (node === '?') {
-                node = Object.keys(data)[0];
-              }
-              data = data[node];
-            });
-          }
-          successCallback(data);
-        }
-      }).catch((error) => {
-        Utils.showError('Error calling connections API', error);
-        throw error;
-      }).finally(() => {
-        document.body.style.cursor = 'default';
-      });
-    } else {
-      successCallback && successCallback();
-    }
   } catch (err) {
     Utils.showError(err);
     throw err;
   }
+
+  if (!response.ok) {
+    response.json()
+        .then((dittoErr) => {
+          Utils.showError(dittoErr.description, dittoErr.message, dittoErr.status);
+        })
+        .catch((err) => {
+          Utils.showError('No error details from Ditto', response.statusText, response.status);
+        });
+    throw new Error('An error occured: ' + response.status);
+  }
+  if (operation !== 'connectionCommand' && response.status !== 204) {
+    document.body.style.cursor = 'progress';
+    response.json()
+        .then((data) => {
+          if (data && data['?'] && data['?']['?'].status >= 400) {
+            const dittoErr = data['?']['?'].payload;
+            Utils.showError(dittoErr.description, dittoErr.message, dittoErr.status);
+          } else {
+            if (params.unwrapJsonPath) {
+              params.unwrapJsonPath.split('.').forEach(function(node) {
+                if (node === '?') {
+                  node = Object.keys(data)[0];
+                }
+                data = data[node];
+              });
+            }
+            successCallback(data);
+          }
+        }).catch((error) => {
+          Utils.showError('Error calling connections API', error);
+          throw error;
+        }).finally(() => {
+          document.body.style.cursor = 'default';
+        });
+  } else {
+    successCallback && successCallback();
+  }
 }
 
 export function env() {
diff --git a/ui/modules/connections/connections.html b/ui/modules/connections/connections.html
index c7baa890f6f..a191afa1ff4 100644
--- a/ui/modules/connections/connections.html
+++ b/ui/modules/connections/connections.html
@@ -28,7 +28,7 @@ <h5 data-bs-toggle="collapse" data-bs-target="#connectionsEdit">
                 <input class="form-control" id="tableValidationConnections" hidden="true"></input>
                 <div class="invalid-feedback"></div>
             </div>
-            <div class="table-wrap">
+            <div class="table-wrap mb-1">
                 <table class="table table-striped table-hover table-sm">
                     <thead>
                         <tr>
@@ -41,49 +41,40 @@ <h5 data-bs-toggle="collapse" data-bs-target="#connectionsEdit">
                 </table>
             </div>
         </div>
-        <div class="col-md-4 resizable_flex_column">
-            <h6>Connection</h6>
-            <div class="input-group input-group-sm mb-1">
-                <label class="input-group-text">Id</label>
-                <input type="text" class="form-control form-control-sm" disabled="true" id="inputConnectionId"></input>
-                <button class="btn btn-outline-secondary btn-sm" id="buttonCreateConnection">
-                    <i class="bi bi-plus-circle"></i>
-                </button>
-                <button class="btn btn-outline-secondary btn-sm" id="buttonSaveConnection" data-bs-toggle="tooltip"
-                    title="Save connection with the given connection configuration json. If there is no id given, a new connection will be created">
-                    <i class="bi bi-save"></i>
-                </button>
-                <button class="btn btn-outline-secondary btn-sm button_round_right" id="buttonDeleteConnection"
-                    data-bs-toggle="tooltip" title="Delete connection with the given id">
-                    <i class="bi bi-trash3"></i>
-                </button>
-            </div>
-            <div class="input-group input-group-sm mb-1">
-                <label class="input-group-text">Template</label>
-                <div class="btn-group dropend">
-                    <button class="btn btn-outline-secondary btn-sm dropdown-toggle"
-                    data-bs-toggle="dropdown"></button>
-                    <ul id="ulConnectionTemplates" class="dropdown-menu" style="position: fixed; top: auto;"></ul>                                    
+        <div class="col-md-8 resizable_flex_column">
+            <h6>CRUD Connection</h6>
+            <crud-toolbar label="Connection Id" id="crudConnection" style="flex-grow: 1;">
+                <div class="input-group input-group-sm mb-1">
+                    <label class="input-group-text">Template</label>
+                    <div class="btn-group dropend">
+                        <button class="btn btn-outline-secondary btn-sm dropdown-toggle"
+                        data-bs-toggle="dropdown" id="buttonConnectionTemplates" disabled></button>
+                        <ul id="ulConnectionTemplates" class="dropdown-menu" style="position: fixed; top: auto;"></ul>                                    
+                    </div>
+                    <input type="text" class="form-control form-control-sm" id="inputConnectionTemplate" disabled></input>
                 </div>
-                <input type="text" class="form-control form-control-sm" id="inputConnectionTemplate" disabled="true"></input>
-            </div>
-            <div class="input-group has-validation">
-                <input class="form-control" id="editorValidationConnection" hidden="true"></input>
-                <div class="invalid-feedback"></div>
-            </div>
-            <div class="ace_container" style="flex-grow: 1;">
-                <div class="script_editor" id="connectionEditor"></div>
-            </div>
-        </div>
-        <div class="col-md-4 resizable_flex_column">
-            <h6>Incoming JavaScript Mapping</h6>
-            <div class="ace_container mb-3" style="flex-grow: 1;">
-                <div class="script_editor" id="connectionIncomingScript"></div>
-            </div>
-            <h6>Outgoing JavaScript Mapping</h6>
-            <div class="ace_container" style="flex-grow: 1;">
-                <div class="script_editor" id="connectionOutgoingScript"></div>
-            </div>
+                <div class="input-group has-validation">
+                    <input class="form-control" id="editorValidationConnection" hidden="true"></input>
+                    <div class="invalid-feedback"></div>
+                </div>
+                <div class="row mb-1" style="flex-grow: 1;">
+                    <div class="col-md-6 resizable_flex_column">
+                        <div class="ace_container" style="flex-grow: 1;">
+                            <div class="script_editor" id="connectionEditor"></div>
+                        </div>        
+                    </div>
+                    <div class="col-md-6 resizable_flex_column">
+                        <h6>Incoming JavaScript Mapping</h6>
+                        <div class="ace_container mb-3" style="flex-grow: 1;">
+                            <div class="script_editor" id="connectionIncomingScript"></div>
+                        </div>
+                        <h6>Outgoing JavaScript Mapping</h6>
+                        <div class="ace_container" style="flex-grow: 1;">
+                            <div class="script_editor" id="connectionOutgoingScript"></div>
+                        </div>        
+                    </div>
+                </div>
+            </crud-toolbar>
         </div>
     </div>
 </div>
diff --git a/ui/modules/connections/connections.js b/ui/modules/connections/connections.js
index d84810e3e0a..4e00cb4bd23 100644
--- a/ui/modules/connections/connections.js
+++ b/ui/modules/connections/connections.js
@@ -10,251 +10,52 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-
-import * as API from '../api.js';
-import * as Environments from '../environments/environments.js';
 /* eslint-disable prefer-const */
 /* eslint-disable max-len */
 /* eslint-disable no-invalid-this */
 /* eslint-disable require-jsdoc */
+import * as API from '../api.js';
+import * as Environments from '../environments/environments.js';
 import * as Utils from '../utils.js';
 
+const observers = [];
+
+export function addChangeListener(observer) {
+  observers.push(observer);
+}
+
+function notifyAll(connection, isNewConnection) {
+  observers.forEach((observer) => observer.call(null, connection, isNewConnection));
+}
+
 let dom = {
-  ulConnectionTemplates: null,
-  inputConnectionTemplate: null,
-  inputConnectionId: null,
   tbodyConnections: null,
-  tbodyConnectionLogs: null,
-  tbodyConnectionMetrics: null,
   buttonLoadConnections: null,
-  buttonCreateConnection: null,
-  buttonSaveConnection: null,
-  buttonDeleteConnection: null,
-  buttonRetrieveConnectionStatus: null,
-  buttonRetrieveConnectionLogs: null,
-  buttonEnableConnectionLogs: null,
-  buttonResetConnectionLogs: null,
-  buttonRetrieveConnectionMetrics: null,
-  buttonResetConnectionMetrics: null,
   tabConnections: null,
   collapseConnections: null,
-  editorValidationConnection: null,
   tableValidationConnections: null,
 };
 
-let connectionEditor;
-let incomingEditor;
-let outgoingEditor;
-let connectionLogDetail;
-let connectionStatusDetail;
-
-let theConnection;
 let selectedConnectionId;
-let connectionLogs;
-
-let connectionTemplates;
 
 export function ready() {
   Environments.addChangeListener(onEnvironmentChanged);
 
   Utils.getAllElementsById(dom);
 
-  connectionEditor = Utils.createAceEditor('connectionEditor', 'ace/mode/json');
-  incomingEditor = Utils.createAceEditor('connectionIncomingScript', 'ace/mode/javascript');
-  outgoingEditor = Utils.createAceEditor('connectionOutgoingScript', 'ace/mode/javascript');
-  connectionLogDetail = Utils.createAceEditor('connectionLogDetail', 'ace/mode/json', true);
-  connectionStatusDetail = Utils.createAceEditor('connectionStatusDetail', 'ace/mode/json', true);
-
   Utils.addValidatorToTable(dom.tbodyConnections, dom.tableValidationConnections);
 
-  loadConnectionTemplates();
-
-  dom.buttonLoadConnections.onclick = loadConnections;
   dom.tabConnections.onclick = onTabActivated;
-
-  dom.tbodyConnections.addEventListener('click', (event) => {
-    if (event.target && event.target.tagName === 'TD') {
-      if (selectedConnectionId === event.target.parentNode.id) {
-        selectedConnectionId = null;
-        setConnection(null);
-      } else {
-        selectedConnectionId = event.target.parentNode.id;
-        API.callConnectionsAPI('retrieveConnection', setConnection, selectedConnectionId);
-      }
-    }
-  });
-
-  dom.ulConnectionTemplates.addEventListener('click', (event) => {
-    dom.inputConnectionTemplate.value = event.target.textContent;
-    const templateConnection = {};
-    if (API.env() !== 'things') {
-      templateConnection.id = Math.random().toString(36).replace('0.', '');
-    }
-    const newConnection = JSON.parse(JSON.stringify(
-        connectionTemplates[dom.inputConnectionTemplate.value]));
-
-    const mergedConnection = {...templateConnection, ...newConnection};
-    setConnection(mergedConnection, true);
-    dom.editorValidationConnection.classList.remove('is-invalid');
-    connectionEditor.session.getUndoManager().markClean();
-  });
-
-  incomingEditor.on('blur', function() {
-    initializeMappings(theConnection);
-    theConnection.mappingDefinitions.javascript.options.incomingScript = incomingEditor.getValue();
-    connectionEditor.setValue(JSON.stringify(theConnection, null, 2), -1);
-  });
-  outgoingEditor.on('blur', function() {
-    initializeMappings(theConnection);
-    theConnection.mappingDefinitions.javascript.options.outgoingScript = outgoingEditor.getValue();
-    connectionEditor.setValue(JSON.stringify(theConnection, null, 2), -1);
-  });
-  connectionEditor.on('blur', function() {
-    theConnection = JSON.parse(connectionEditor.getValue());
-  });
-
-  connectionEditor.on('input', () => {
-    if (!connectionEditor.session.getUndoManager().isClean()) {
-      dom.inputConnectionTemplate.value = null;
-      dom.editorValidationConnection.classList.remove('is-invalid');
-    }
-  });
-
-  dom.buttonCreateConnection.onclick = () => {
-    Utils.assert(theConnection, 'Please enter a connection configuration (select a template as a basis)', dom.editorValidationConnection);
-    if (API.env() === 'ditto_2') {
-      selectedConnectionId = theConnection.id;
-    } else {
-      delete theConnection.id;
-    }
-    API.callConnectionsAPI('createConnection', loadConnections, null, theConnection);
-  };
-
-  dom.buttonSaveConnection.onclick = () => {
-    Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
-    API.callConnectionsAPI('modifyConnection', loadConnections, selectedConnectionId, theConnection);
-  };
-
-  dom.buttonDeleteConnection.onclick = () => {
-    Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
-    Utils.confirm(`Are you sure you want to delete connection<br>'${theConnection.name}'?`, 'Delete', () => {
-      API.callConnectionsAPI('deleteConnection', () => {
-        setConnection(null);
-        loadConnections();
-      },
-      selectedConnectionId);
-    });
-  };
-
-  // Status --------------
-
-  dom.buttonRetrieveConnectionStatus.onclick = retrieveConnectionStatus;
-  document.querySelector('a[data-bs-target="#tabConnectionStatus"]').onclick = retrieveConnectionStatus;
-
-  // Logs --------------
-
-  dom.buttonEnableConnectionLogs.onclick = () => {
-    Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
-    API.callConnectionsAPI('connectionCommand', retrieveConnectionLogs, dom.inputConnectionId.value, null, 'connectivity.commands:enableConnectionLogs');
-  };
-
-  dom.buttonResetConnectionLogs.onclick = () => {
-    Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
-    API.callConnectionsAPI('connectionCommand', retrieveConnectionLogs, dom.inputConnectionId.value, null, 'connectivity.commands:resetConnectionLogs');
-  };
-
-  dom.buttonRetrieveConnectionLogs.onclick = retrieveConnectionLogs;
-
-  dom.tbodyConnectionLogs.addEventListener('click', (event) => {
-    connectionLogDetail.setValue(JSON.stringify(connectionLogs[event.target.parentNode.rowIndex - 1], null, 2), -1);
-  });
-
-  // Metrics ---------------
-
-  dom.buttonRetrieveConnectionMetrics.onclick = retrieveConnectionMetrics;
-  document.querySelector('a[data-bs-target="#tabConnectionMetrics"]').onclick = retrieveConnectionMetrics;
-
-  dom.buttonResetConnectionMetrics.onclick = () => {
-    Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
-    API.callConnectionsAPI('connectionCommand', null, dom.inputConnectionId.value, null, 'connectivity.commands:resetConnectionMetrics');
-  };
-}
-
-function retrieveConnectionMetrics() {
-  Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
-  dom.tbodyConnectionMetrics.innerHTML = '';
-  API.callConnectionsAPI('retrieveConnectionMetrics', (response) => {
-    if (response.connectionMetrics) {
-      Object.keys(response.connectionMetrics).forEach((direction) => {
-        Object.keys(response.connectionMetrics[direction]).forEach((type) => {
-          let entry = response.connectionMetrics[direction][type];
-          Utils.addTableRow(dom.tbodyConnectionMetrics, direction, false, false, type, 'success', entry.success.PT1M, entry.success.PT1H, entry.success.PT24H);
-          Utils.addTableRow(dom.tbodyConnectionMetrics, direction, false, false, type, 'failure', entry.failure.PT1M, entry.failure.PT1H, entry.failure.PT24H);
-        });
-      });
-    }
-  },
-  dom.inputConnectionId.value);
-}
-
-function retrieveConnectionStatus() {
-  Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
-  API.callConnectionsAPI('retrieveStatus', (connectionStatus) => {
-    connectionStatusDetail.setValue(JSON.stringify(connectionStatus, null, 2), -1);
-  },
-  dom.inputConnectionId.value);
-}
-
-function retrieveConnectionLogs() {
-  Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
-  dom.tbodyConnectionLogs.innerHTML = '';
-  connectionLogDetail.setValue('');
-  API.callConnectionsAPI('retrieveConnectionLogs', (response) => {
-    connectionLogs = response.connectionLogs;
-    adjustEnableButton(response);
-    response.connectionLogs.forEach((entry) => {
-      Utils.addTableRow(dom.tbodyConnectionLogs, Utils.formatDate(entry.timestamp, true), false, false, entry.type, entry.level);
-    });
-    dom.tbodyConnectionLogs.scrollTop = dom.tbodyConnectionLogs.scrollHeight - dom.tbodyConnectionLogs.clientHeight;
-  },
-  dom.inputConnectionId.value);
-
-  function adjustEnableButton(response) {
-    if (response.enabledUntil) {
-      dom.buttonEnableConnectionLogs.querySelector('i').classList.replace('bi-toggle-off', 'bi-toggle-on');
-      dom.buttonEnableConnectionLogs.setAttribute('title', `Enabled until ${Utils.formatDate(response.enabledUntil)}`);
-    } else {
-      dom.buttonEnableConnectionLogs.querySelector('i').classList.replace('bi-toggle-on', 'bi-toggle-off');
-      dom.buttonEnableConnectionLogs.setAttribute('title', 'Click to enable connection logs for the selected connection');
-    }
-  }
+  dom.buttonLoadConnections.onclick = loadConnections;
+  dom.tbodyConnections.addEventListener('click', onConnectionsTableClick);
 }
 
-function setConnection(connection, isNewConnection) {
-  theConnection = connection;
-  incomingEditor.setValue('');
-  outgoingEditor.setValue('');
-  if (theConnection) {
-    dom.inputConnectionId.value = theConnection.id ? theConnection.id : null;
-    connectionEditor.setValue(JSON.stringify(theConnection, null, 2), -1);
-    if (theConnection.mappingDefinitions && theConnection.mappingDefinitions.javascript) {
-      incomingEditor.setValue(theConnection.mappingDefinitions.javascript.options.incomingScript, -1);
-      outgoingEditor.setValue(theConnection.mappingDefinitions.javascript.options.outgoingScript, -1);
-    }
-  } else {
-    dom.inputConnectionId.value = null;
-    connectionEditor.setValue('');
-  }
-  connectionStatusDetail.setValue('');
-  connectionLogDetail.setValue('');
-  dom.tbodyConnectionMetrics.innerHTML = '';
-  dom.tbodyConnectionLogs.innerHTML = '';
-  if (!isNewConnection && theConnection && theConnection.id) {
-    retrieveConnectionLogs();
-  }
+export function setConnection(connection, isNewConnection) {
+  selectedConnectionId = connection ? connection.id : null;
+  notifyAll(connection, isNewConnection);
 }
 
-function loadConnections() {
+export function loadConnections() {
   dom.tbodyConnections.innerHTML = '';
   let connectionSelected = false;
   API.callConnectionsAPI('listConnections', (connections) => {
@@ -287,14 +88,16 @@ function loadConnections() {
   });
 }
 
-function loadConnectionTemplates() {
-  fetch('templates/connectionTemplates.json')
-      .then((response) => {
-        response.json().then((loadedTemplates) => {
-          connectionTemplates = loadedTemplates;
-          Utils.addDropDownEntries(dom.ulConnectionTemplates, Object.keys(connectionTemplates));
-        });
-      });
+function onConnectionsTableClick(event) {
+  if (event.target && event.target.tagName === 'TD') {
+    if (selectedConnectionId === event.target.parentNode.id) {
+      selectedConnectionId = null;
+      setConnection(null);
+    } else {
+      selectedConnectionId = event.target.parentNode.id;
+      API.callConnectionsAPI('retrieveConnection', setConnection, selectedConnectionId);
+    }
+  }
 }
 
 let viewDirty = false;
@@ -308,23 +111,10 @@ function onTabActivated() {
 
 function onEnvironmentChanged() {
   if (dom.collapseConnections.classList.contains('show')) {
+    selectedConnectionId = null;
+    setConnection(null);
     loadConnections();
   } else {
     viewDirty = true;
   }
 }
-
-function initializeMappings(connection) {
-  if (!connection['mappingDefinitions']) {
-    connection.mappingDefinitions = {
-      javascript: {
-        mappingEngine: 'JavaScript',
-        options: {
-          incomingScript: '',
-          outgoingScript: '',
-        },
-      },
-    };
-  }
-}
-
diff --git a/ui/modules/connections/connectionsCRUD.js b/ui/modules/connections/connectionsCRUD.js
new file mode 100644
index 00000000000..731808e90f5
--- /dev/null
+++ b/ui/modules/connections/connectionsCRUD.js
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import * as API from '../api.js';
+import * as Utils from '../utils.js';
+import * as Connections from './connections.js';
+/* eslint-disable prefer-const */
+/* eslint-disable max-len */
+/* eslint-disable no-invalid-this */
+/* eslint-disable require-jsdoc */
+
+let dom = {
+  buttonConnectionTemplates: null,
+  ulConnectionTemplates: null,
+  inputConnectionTemplate: null,
+  crudConnection: null,
+  editorValidationConnection: null,
+};
+
+let connectionEditor;
+let incomingEditor;
+let outgoingEditor;
+
+let theConnection;
+let hasErrors;
+
+let connectionTemplates;
+
+export function ready() {
+  Connections.addChangeListener(setConnection);
+
+  Utils.getAllElementsById(dom);
+
+  loadConnectionTemplates();
+
+  connectionEditor = Utils.createAceEditor('connectionEditor', 'ace/mode/json', true);
+  incomingEditor = Utils.createAceEditor('connectionIncomingScript', 'ace/mode/javascript', true);
+  outgoingEditor = Utils.createAceEditor('connectionOutgoingScript', 'ace/mode/javascript', true);
+
+  dom.ulConnectionTemplates.addEventListener('click', onConnectionTemplatesClick);
+
+  incomingEditor.on('blur', onScriptEditorBlur(incomingEditor, 'incomingScript'));
+  outgoingEditor.on('blur', onScriptEditorBlur(outgoingEditor, 'outgoingScript'));
+
+  connectionEditor.on('input', onConnectionEditorInput);
+  connectionEditor.getSession().on('changeAnnotation', onConnectionEditorChangeAnnotation);
+
+  dom.crudConnection.addEventListener('onEditToggle', onEditToggle);
+  dom.crudConnection.addEventListener('onCreateClick', onCreateConnectionClick);
+  dom.crudConnection.addEventListener('onUpdateClick', onUpdateConnectionClick);
+  dom.crudConnection.addEventListener('onDeleteClick', onDeleteConnectionClick);
+}
+
+function onScriptEditorBlur(scriptEditor, fieldName) {
+  return () => {
+    if (!crudConnection.isEditing || hasErrors) {
+      return;
+    }
+    const editConnection = JSON.parse(connectionEditor.getValue());
+    initializeMappings(editConnection);
+    editConnection.mappingDefinitions.javascript.options[fieldName] = scriptEditor.getValue();
+    connectionEditor.setValue(JSON.stringify(editConnection, null, 2), -1);
+  };
+
+  function initializeMappings(connection) {
+    if (!connection['mappingDefinitions']) {
+      connection.mappingDefinitions = {
+        javascript: {
+          mappingEngine: 'JavaScript',
+          options: {
+            incomingScript: '',
+            outgoingScript: '',
+          },
+        },
+      };
+    }
+  }
+}
+
+function onConnectionEditorInput() {
+  if (!connectionEditor.session.getUndoManager().isClean()) {
+    dom.inputConnectionTemplate.value = null;
+    dom.editorValidationConnection.classList.remove('is-invalid');
+  }
+}
+
+function onConnectionEditorChangeAnnotation() {
+  hasErrors = connectionEditor.getSession().getAnnotations().filter((a) => a.type === 'error').length > 0;
+  incomingEditor.setReadOnly(hasErrors);
+  outgoingEditor.setReadOnly(hasErrors);
+}
+
+function onUpdateConnectionClick() {
+  Utils.assert(!hasErrors, 'Errors in connection json', dom.editorValidationConnection);
+  theConnection = JSON.parse(connectionEditor.getValue());
+  API.callConnectionsAPI(
+      'modifyConnection',
+      () => {
+        Connections.loadConnections(),
+        dom.crudConnection.toggleEdit();
+      },
+      dom.crudConnection.idValue,
+      theConnection,
+  );
+}
+
+function onDeleteConnectionClick() {
+  Utils.confirm(`Are you sure you want to delete connection<br>'${theConnection.name}'?`, 'Delete', () => {
+    API.callConnectionsAPI(
+        'deleteConnection',
+        () => {
+          Connections.setConnection(null);
+          Connections.loadConnections();
+        },
+        dom.crudConnection.idValue,
+    );
+  });
+}
+
+function onCreateConnectionClick() {
+  Utils.assert(connectionEditor.getValue() !== '', 'Please enter a connection configuration (select a template as a basis)', dom.editorValidationConnection);
+  Utils.assert(!hasErrors, 'Errors in connection json', dom.editorValidationConnection);
+  const newConnection = JSON.parse(connectionEditor.getValue());
+  if (API.env() === 'ditto_2') {
+    newConnection.id = Math.random().toString(36).replace('0.', '');
+  } else {
+    delete newConnection.id;
+  };
+  API.callConnectionsAPI(
+      'createConnection',
+      (connection) => {
+        Connections.setConnection(connection, true);
+        Connections.loadConnections();
+        dom.crudConnection.toggleEdit();
+      },
+      null,
+      newConnection,
+  );
+}
+
+function onConnectionTemplatesClick(event) {
+  dom.inputConnectionTemplate.value = event.target.textContent;
+  const newConnection = JSON.parse(JSON.stringify(connectionTemplates[dom.inputConnectionTemplate.value]));
+  setConnection(newConnection);
+  dom.editorValidationConnection.classList.remove('is-invalid');
+  connectionEditor.session.getUndoManager().markClean();
+}
+
+function loadConnectionTemplates() {
+  fetch('templates/connectionTemplates.json')
+      .then((response) => {
+        response.json().then((loadedTemplates) => {
+          connectionTemplates = loadedTemplates;
+          Utils.addDropDownEntries(dom.ulConnectionTemplates, Object.keys(connectionTemplates));
+        });
+      });
+}
+
+function setConnection(connection) {
+  theConnection = connection;
+  incomingEditor.setValue('');
+  outgoingEditor.setValue('');
+  if (theConnection) {
+    dom.crudConnection.idValue = theConnection.id ? theConnection.id : null;
+    connectionEditor.setValue(JSON.stringify(theConnection, null, 2), -1);
+    if (theConnection.mappingDefinitions && theConnection.mappingDefinitions.javascript) {
+      incomingEditor.setValue(theConnection.mappingDefinitions.javascript.options.incomingScript, -1);
+      outgoingEditor.setValue(theConnection.mappingDefinitions.javascript.options.outgoingScript, -1);
+    }
+  } else {
+    dom.crudConnection.idValue = null;
+    connectionEditor.setValue('');
+  }
+}
+
+function onEditToggle(event) {
+  const isEditing = event.detail;
+  dom.buttonConnectionTemplates.disabled = !isEditing;
+  connectionEditor.setReadOnly(!isEditing);
+  connectionEditor.renderer.setShowGutter(isEditing);
+  incomingEditor.setReadOnly(!isEditing);
+  incomingEditor.renderer.setShowGutter(isEditing);
+  outgoingEditor.setReadOnly(!isEditing);
+  outgoingEditor.renderer.setShowGutter(isEditing);
+  if (!isEditing) {
+    if (dom.crudConnection.idValue && dom.crudConnection.idValue !== '') {
+      setConnection(theConnection);
+    } else {
+      setConnection(null);
+    }
+  }
+}
+
+
diff --git a/ui/modules/connections/connectionsMonitor.js b/ui/modules/connections/connectionsMonitor.js
new file mode 100644
index 00000000000..862daf4b59d
--- /dev/null
+++ b/ui/modules/connections/connectionsMonitor.js
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import * as API from '../api.js';
+import * as Utils from '../utils.js';
+import * as Connections from './connections.js';
+/* eslint-disable prefer-const */
+/* eslint-disable max-len */
+/* eslint-disable no-invalid-this */
+/* eslint-disable require-jsdoc */
+
+let dom = {
+  tbodyConnectionLogs: null,
+  tbodyConnectionMetrics: null,
+  buttonRetrieveConnectionStatus: null,
+  buttonRetrieveConnectionLogs: null,
+  buttonEnableConnectionLogs: null,
+  buttonResetConnectionLogs: null,
+  buttonRetrieveConnectionMetrics: null,
+  buttonResetConnectionMetrics: null,
+  tableValidationConnections: null,
+};
+
+let connectionLogs;
+let connectionLogDetail;
+
+let connectionStatusDetail;
+
+let selectedConnectionId;
+
+export function ready() {
+  Connections.addChangeListener(onConnectionChange);
+
+  Utils.getAllElementsById(dom);
+
+  connectionLogDetail = Utils.createAceEditor('connectionLogDetail', 'ace/mode/json', true);
+  connectionStatusDetail = Utils.createAceEditor('connectionStatusDetail', 'ace/mode/json', true);
+
+  // Status --------------
+  dom.buttonRetrieveConnectionStatus.onclick = retrieveConnectionStatus;
+  document.querySelector('a[data-bs-target="#tabConnectionStatus"]').onclick = retrieveConnectionStatus;
+
+  // Logs --------------
+  dom.buttonEnableConnectionLogs.onclick = onEnableConnectionLogsClick;
+  dom.buttonResetConnectionLogs.onclick = onResetConnectionLogsClick;
+  dom.buttonRetrieveConnectionLogs.onclick = retrieveConnectionLogs;
+  dom.tbodyConnectionLogs.addEventListener('click', onConnectionLogTableClick);
+
+  // Metrics ---------------
+  dom.buttonRetrieveConnectionMetrics.onclick = retrieveConnectionMetrics;
+  document.querySelector('a[data-bs-target="#tabConnectionMetrics"]').onclick = retrieveConnectionMetrics;
+  dom.buttonResetConnectionMetrics.onclick = onResetConnectionMetricsClick;
+}
+
+function onResetConnectionMetricsClick() {
+  Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
+  API.callConnectionsAPI('connectionCommand', retrieveConnectionMetrics, selectedConnectionId, null, 'connectivity.commands:resetConnectionMetrics');
+}
+
+function onConnectionLogTableClick(event) {
+  connectionLogDetail.setValue(JSON.stringify(connectionLogs[event.target.parentNode.rowIndex - 1], null, 2), -1);
+}
+
+function onResetConnectionLogsClick() {
+  Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
+  API.callConnectionsAPI('connectionCommand', retrieveConnectionLogs, selectedConnectionId, null, 'connectivity.commands:resetConnectionLogs');
+}
+
+function onEnableConnectionLogsClick() {
+  Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
+  API.callConnectionsAPI('connectionCommand', retrieveConnectionLogs, selectedConnectionId, null, 'connectivity.commands:enableConnectionLogs');
+}
+
+function retrieveConnectionMetrics() {
+  Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
+  dom.tbodyConnectionMetrics.innerHTML = '';
+  API.callConnectionsAPI('retrieveConnectionMetrics', (response) => {
+    if (response.connectionMetrics) {
+      Object.keys(response.connectionMetrics).forEach((direction) => {
+        if (response.connectionMetrics[direction]) {
+          Object.keys(response.connectionMetrics[direction]).forEach((type) => {
+            let entry = response.connectionMetrics[direction][type];
+            Utils.addTableRow(dom.tbodyConnectionMetrics, direction, false, false, type, 'success', entry.success.PT1M, entry.success.PT1H, entry.success.PT24H);
+            Utils.addTableRow(dom.tbodyConnectionMetrics, direction, false, false, type, 'failure', entry.failure.PT1M, entry.failure.PT1H, entry.failure.PT24H);
+          });
+        };
+      });
+    }
+  },
+  selectedConnectionId);
+}
+
+function retrieveConnectionStatus() {
+  Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
+  API.callConnectionsAPI('retrieveStatus', (connectionStatus) => {
+    connectionStatusDetail.setValue(JSON.stringify(connectionStatus, null, 2), -1);
+  },
+  selectedConnectionId);
+}
+
+function retrieveConnectionLogs() {
+  Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
+  dom.tbodyConnectionLogs.innerHTML = '';
+  connectionLogDetail.setValue('');
+  API.callConnectionsAPI('retrieveConnectionLogs', (response) => {
+    connectionLogs = response.connectionLogs;
+    adjustEnableButton(response);
+    response.connectionLogs.forEach((entry) => {
+      Utils.addTableRow(dom.tbodyConnectionLogs, Utils.formatDate(entry.timestamp, true), false, false, entry.type, entry.level);
+    });
+    dom.tbodyConnectionLogs.scrollTop = dom.tbodyConnectionLogs.scrollHeight - dom.tbodyConnectionLogs.clientHeight;
+  },
+  selectedConnectionId);
+}
+
+function adjustEnableButton(response) {
+  if (response.enabledUntil) {
+    dom.buttonEnableConnectionLogs.querySelector('i').classList.replace('bi-toggle-off', 'bi-toggle-on');
+    dom.buttonEnableConnectionLogs.setAttribute('title', `Enabled until ${Utils.formatDate(response.enabledUntil)}`);
+  } else {
+    dom.buttonEnableConnectionLogs.querySelector('i').classList.replace('bi-toggle-on', 'bi-toggle-off');
+    dom.buttonEnableConnectionLogs.setAttribute('title', 'Click to enable connection logs for the selected connection');
+  }
+}
+
+function onConnectionChange(connection, isNewConnection = true) {
+  selectedConnectionId = connection ? connection.id : null;
+  connectionStatusDetail.setValue('');
+  connectionLogDetail.setValue('');
+  dom.tbodyConnectionMetrics.innerHTML = '';
+  dom.tbodyConnectionLogs.innerHTML = '';
+  if (!isNewConnection && connection && connection.id) {
+    retrieveConnectionLogs();
+  }
+}
diff --git a/ui/modules/things/attributes.js b/ui/modules/things/attributes.js
index 1495193623f..ac2a0a085fa 100644
--- a/ui/modules/things/attributes.js
+++ b/ui/modules/things/attributes.js
@@ -154,7 +154,8 @@ function attributeFromString(attribute) {
 }
 
 function onEditToggle(event) {
-  if (event.detail) {
+  const isEditing = event.detail;
+  if (isEditing && dom.crudAttribute.idValue && dom.crudAttribute.idValue !== '') {
     API.callDittoREST('GET', `/things/${Things.theThing.thingId}/attributes/${dom.crudAttribute.idValue}`,
         null, null, true)
         .then((response) => {
diff --git a/ui/modules/things/features.js b/ui/modules/things/features.js
index e67fcf282f2..02350446e88 100644
--- a/ui/modules/things/features.js
+++ b/ui/modules/things/features.js
@@ -223,7 +223,8 @@ function onThingChanged(thing) {
 }
 
 function onEditToggle(event) {
-  if (event.detail) {
+  const isEditing = event.detail;
+  if (isEditing && dom.crudFeature.idValue && dom.crudFeature.idValue !== '') {
     API.callDittoREST('GET', `/things/${Things.theThing.thingId}/features/${dom.crudFeature.idValue}`, null, null, true)
         .then((response) => {
           eTag = response.headers.get('ETag');
@@ -240,11 +241,11 @@ function onEditToggle(event) {
   }
 
   function enableDisableEditors() {
-    dom.inputFeatureDefinition.disabled = !event.detail;
-    featurePropertiesEditor.setReadOnly(!event.detail);
-    featurePropertiesEditor.renderer.setShowGutter(event.detail);
-    featureDesiredPropertiesEditor.setReadOnly(!event.detail);
-    featureDesiredPropertiesEditor.renderer.setShowGutter(event.detail);
+    dom.inputFeatureDefinition.disabled = !isEditing;
+    featurePropertiesEditor.setReadOnly(!isEditing);
+    featurePropertiesEditor.renderer.setShowGutter(isEditing);
+    featureDesiredPropertiesEditor.setReadOnly(!isEditing);
+    featureDesiredPropertiesEditor.renderer.setShowGutter(isEditing);
   }
 
   function clearEditorsAfterCancel() {
diff --git a/ui/modules/things/thingsCRUD.js b/ui/modules/things/thingsCRUD.js
index 115ca1294d2..1cc1e7d8d64 100644
--- a/ui/modules/things/thingsCRUD.js
+++ b/ui/modules/things/thingsCRUD.js
@@ -163,7 +163,8 @@ function onThingChanged(thingJson) {
 }
 
 function onEditToggle(event) {
-  if (event.detail) {
+  const isEditing = event.detail;
+  if (isEditing && Things.theThing) {
     API.callDittoREST('GET', `/things/${Things.theThing.thingId}`, null, null, true)
         .then((response) => {
           eTag = response.headers.get('ETag');
@@ -179,14 +180,14 @@ function onEditToggle(event) {
   }
 
   function enableDisableEditors() {
-    dom.buttonThingDefinitions.disabled = !event.detail;
-    dom.inputThingDefinition.disabled = !event.detail;
+    dom.buttonThingDefinitions.disabled = !isEditing;
+    dom.inputThingDefinition.disabled = !isEditing;
   }
 
   function updateEditorsBeforeEdit(thingJson) {
     dom.inputThingDefinition.value = thingJson.definition ?? '';
-    thingJsonEditor.setReadOnly(!event.detail);
-    thingJsonEditor.renderer.setShowGutter(event.detail);
+    thingJsonEditor.setReadOnly(!isEditing);
+    thingJsonEditor.renderer.setShowGutter(isEditing);
     thingJsonEditor.setValue(JSON.stringify(thingJson, null, 2), -1);
   }
 

From 580c28077dd5f0f572ee4e6d159f13360f0f68af Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Fri, 13 Jan 2023 16:31:59 +0100
Subject: [PATCH 009/173] add additional status-secured configuration to enable
 disabling securing the status endpoint while still securing the devops
 endpoint

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 deployment/docker/sandbox/docker-compose.yml  |  2 +-
 .../DevopsAuthenticationDirectiveFactory.java |  2 +-
 .../config/security/DefaultDevOpsConfig.java  | 23 +++++++++++++------
 .../util/config/security/DevOpsConfig.java    | 14 ++++++++++-
 .../service/src/main/resources/gateway.conf   |  5 ++--
 .../security/DefaultDevOpsConfigTest.java     |  2 ++
 .../src/test/resources/devops-test.conf       |  1 +
 7 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/deployment/docker/sandbox/docker-compose.yml b/deployment/docker/sandbox/docker-compose.yml
index 11cc23f7103..684823b7352 100644
--- a/deployment/docker/sandbox/docker-compose.yml
+++ b/deployment/docker/sandbox/docker-compose.yml
@@ -135,7 +135,7 @@ services:
       - TZ=Europe/Berlin
       - BIND_HOSTNAME=0.0.0.0
       - ENABLE_PRE_AUTHENTICATION=true
-      - DEVOPS_SECURE_STATUS=false
+      - DEVOPS_STATUS_SECURED=false
       - DITTO_DEVOPS_FEATURE_WOT_INTEGRATION_ENABLED=true
       - |
         JAVA_TOOL_OPTIONS=
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/auth/DevopsAuthenticationDirectiveFactory.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/auth/DevopsAuthenticationDirectiveFactory.java
index 5a487b95537..19e0ec35f62 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/auth/DevopsAuthenticationDirectiveFactory.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/directives/auth/DevopsAuthenticationDirectiveFactory.java
@@ -40,7 +40,7 @@ public static DevopsAuthenticationDirectiveFactory newInstance(
     }
 
     public DevopsAuthenticationDirective status() {
-        if (!devOpsConfig.isSecured()) {
+        if (!devOpsConfig.isSecured() || !devOpsConfig.isStatusSecured()) {
             return DevOpsInsecureAuthenticationDirective.getInstance();
         }
         switch (devOpsConfig.getStatusAuthenticationMethod()) {
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/util/config/security/DefaultDevOpsConfig.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/util/config/security/DefaultDevOpsConfig.java
index e974d5a7a93..5e94e545a09 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/util/config/security/DefaultDevOpsConfig.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/util/config/security/DefaultDevOpsConfig.java
@@ -33,23 +33,25 @@ public final class DefaultDevOpsConfig implements DevOpsConfig {
 
     private static final String CONFIG_PATH = "devops";
 
-    private final boolean secureStatus;
+    private final boolean secured;
     private final DevopsAuthenticationMethod devopsAuthenticationMethod;
     private final String password;
     private final Collection<String> devopsOAuth2Subjects;
+    private final boolean statusSecured;
     private final DevopsAuthenticationMethod statusAuthenticationMethod;
     private final String statusPassword;
     private final Collection<String> statusOAuth2Subjects;
     private final OAuthConfig oAuthConfig;
 
     private DefaultDevOpsConfig(final ConfigWithFallback configWithFallback) {
-        secureStatus = configWithFallback.getBoolean(DevOpsConfigValue.SECURED.getConfigPath());
+        secured = configWithFallback.getBoolean(DevOpsConfigValue.SECURED.getConfigPath());
         devopsAuthenticationMethod =
                 getDevopsAuthenticationMethod(configWithFallback, DevOpsConfigValue.DEVOPS_AUTHENTICATION_METHOD);
         password = configWithFallback.getString(DevOpsConfigValue.PASSWORD.getConfigPath());
         devopsOAuth2Subjects =
                 Collections.unmodifiableList(new ArrayList<>(
                         configWithFallback.getStringList(DevOpsConfigValue.DEVOPS_OAUTH2_SUBJECTS.getConfigPath())));
+        statusSecured = configWithFallback.getBoolean(DevOpsConfigValue.STATUS_SECURED.getConfigPath());
         statusAuthenticationMethod =
                 getDevopsAuthenticationMethod(configWithFallback, DevOpsConfigValue.STATUS_AUTHENTICATION_METHOD);
         statusPassword = configWithFallback.getString(DevOpsConfigValue.STATUS_PASSWORD.getConfigPath());
@@ -84,7 +86,7 @@ public static DefaultDevOpsConfig of(final Config config) {
 
     @Override
     public boolean isSecured() {
-        return secureStatus;
+        return secured;
     }
 
     @Override
@@ -102,6 +104,11 @@ public Collection<String> getDevopsOAuth2Subjects() {
         return devopsOAuth2Subjects;
     }
 
+    @Override
+    public boolean isStatusSecured() {
+        return statusSecured;
+    }
+
     @Override
     public DevopsAuthenticationMethod getStatusAuthenticationMethod() {
         return statusAuthenticationMethod;
@@ -131,10 +138,11 @@ public boolean equals(@Nullable final Object o) {
             return false;
         }
         final DefaultDevOpsConfig that = (DefaultDevOpsConfig) o;
-        return Objects.equals(secureStatus, that.secureStatus) &&
+        return Objects.equals(secured, that.secured) &&
                 Objects.equals(devopsAuthenticationMethod, that.devopsAuthenticationMethod) &&
                 Objects.equals(password, that.password) &&
                 Objects.equals(devopsOAuth2Subjects, that.devopsOAuth2Subjects) &&
+                Objects.equals(statusSecured, that.statusSecured) &&
                 Objects.equals(statusAuthenticationMethod, that.statusAuthenticationMethod) &&
                 Objects.equals(statusOAuth2Subjects, that.statusOAuth2Subjects) &&
                 Objects.equals(statusPassword, that.statusPassword) &&
@@ -143,17 +151,18 @@ public boolean equals(@Nullable final Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(secureStatus, devopsAuthenticationMethod, password, devopsOAuth2Subjects,
-                statusAuthenticationMethod, statusPassword, statusOAuth2Subjects, oAuthConfig);
+        return Objects.hash(secured, devopsAuthenticationMethod, password, devopsOAuth2Subjects,
+                statusSecured, statusAuthenticationMethod, statusPassword, statusOAuth2Subjects, oAuthConfig);
     }
 
     @Override
     public String toString() {
         return getClass().getSimpleName() + " [" +
-                "secureStatus=" + secureStatus +
+                "secured=" + secured +
                 ", devopsAuthenticationMethod=" + devopsAuthenticationMethod +
                 ", password=*****" +
                 ", devopsOAuth2Subject=" + devopsOAuth2Subjects +
+                ", statusSecured=" + statusSecured +
                 ", statusAuthenticationMethod=" + statusAuthenticationMethod +
                 ", statusPassword=*****" +
                 ", statusOAuth2Subject=" + statusOAuth2Subjects +
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/util/config/security/DevOpsConfig.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/util/config/security/DevOpsConfig.java
index 0c23be7a711..59931d28192 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/util/config/security/DevOpsConfig.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/util/config/security/DevOpsConfig.java
@@ -53,6 +53,13 @@ public interface DevOpsConfig {
      */
     Collection<String> getDevopsOAuth2Subjects();
 
+    /**
+     * Indicates whether the DevOps resource {@code /status} should be secured or not.
+     *
+     * @return {@code true} if {@code /status} should be secured, {@code false} else;
+     */
+    boolean isStatusSecured();
+
     /**
      * Returns the authentication method for status resources.
      *
@@ -107,6 +114,11 @@ enum DevOpsConfigValue implements KnownConfigValue {
          */
         DEVOPS_OAUTH2_SUBJECTS("devops-oauth2-subjects", List.of()),
 
+        /**
+         * Determines whether DevOps resource {@code /status} should be secured or not.
+         */
+        STATUS_SECURED("status-secured", true),
+
         /**
          * The authentication method for status resources.
          */
@@ -125,7 +137,7 @@ enum DevOpsConfigValue implements KnownConfigValue {
         private final String path;
         private final Object defaultValue;
 
-        private DevOpsConfigValue(final String thePath, final Object theDefaultValue) {
+        DevOpsConfigValue(final String thePath, final Object theDefaultValue) {
             path = thePath;
             defaultValue = theDefaultValue;
         }
diff --git a/gateway/service/src/main/resources/gateway.conf b/gateway/service/src/main/resources/gateway.conf
index e056311f1d1..f6e741fec8c 100755
--- a/gateway/service/src/main/resources/gateway.conf
+++ b/gateway/service/src/main/resources/gateway.conf
@@ -275,8 +275,6 @@ ditto {
         secured = true
         # Backwardcompatibility fallback
         secured = ${?ditto.gateway.authentication.devops.securestatus}
-        # Backwardcompatibility fallback
-        secured = ${?DEVOPS_SECURE_STATUS}
         secured = ${?DEVOPS_SECURED}
 
         # default authentiation method for the devops route
@@ -296,6 +294,9 @@ ditto {
         # oauth2 auth
         devops-oauth2-subjects = ${?DEVOPS_OAUTH2_SUBJECTS}
 
+        status-secured = true
+        status-secured = ${?DEVOPS_STATUS_SECURED}
+
         # default authentiation method for the status route
         # can be set to "basic" or "oauth"
         status-authentication-method = "basic"
diff --git a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/util/config/security/DefaultDevOpsConfigTest.java b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/util/config/security/DefaultDevOpsConfigTest.java
index 625a1be8054..ab867d08fd5 100644
--- a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/util/config/security/DefaultDevOpsConfigTest.java
+++ b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/util/config/security/DefaultDevOpsConfigTest.java
@@ -65,6 +65,7 @@ public void underTestReturnsDefaultValuesIfBaseConfigWasEmpty() {
                 DevOpsConfig.DevOpsConfigValue.DEVOPS_AUTHENTICATION_METHOD);
         assertDefaultValueFor(underTest.getPassword(), DevOpsConfig.DevOpsConfigValue.PASSWORD);
         assertDefaultValueFor(underTest.getDevopsOAuth2Subjects(), DevOpsConfig.DevOpsConfigValue.DEVOPS_OAUTH2_SUBJECTS);
+        assertDefaultValueFor(underTest.isStatusSecured(), DevOpsConfig.DevOpsConfigValue.STATUS_SECURED);
         assertDefaultValueFor(underTest.getStatusAuthenticationMethod().getMethodName(),
                 DevOpsConfig.DevOpsConfigValue.STATUS_AUTHENTICATION_METHOD);
         assertDefaultValueFor(underTest.getStatusPassword(), DevOpsConfig.DevOpsConfigValue.STATUS_PASSWORD);
@@ -87,6 +88,7 @@ public void underTestReturnsValuesOfConfigFile() {
         assertConfiguredValueFor(underTest.getPassword(), DevOpsConfig.DevOpsConfigValue.PASSWORD, "bumlux");
         assertConfiguredValueFor(underTest.getDevopsOAuth2Subjects(),
                 DevOpsConfig.DevOpsConfigValue.DEVOPS_OAUTH2_SUBJECTS, List.of("someissuer:a", "someissuer:b"));
+        assertConfiguredValueFor(underTest.isStatusSecured(), DevOpsConfig.DevOpsConfigValue.SECURED, false);
         assertConfiguredValueFor(underTest.getStatusAuthenticationMethod().getMethodName(),
                 DevOpsConfig.DevOpsConfigValue.STATUS_AUTHENTICATION_METHOD, "oauth2");
         assertConfiguredValueFor(underTest.getStatusPassword(), DevOpsConfig.DevOpsConfigValue.STATUS_PASSWORD,
diff --git a/gateway/service/src/test/resources/devops-test.conf b/gateway/service/src/test/resources/devops-test.conf
index 99edaf1b31e..d99ae282b42 100644
--- a/gateway/service/src/test/resources/devops-test.conf
+++ b/gateway/service/src/test/resources/devops-test.conf
@@ -3,6 +3,7 @@ devops {
   devops-authentication-method = "basic"
   password = "bumlux"
   devops-oauth2-subjects = ["someissuer:a","someissuer:b"]
+  status-secured = false
   status-authentication-method = "oauth2"
   statusPassword = "1234"
   status-oauth2-subjects = ["someissuer:c"]

From 362390e5f561243cc6300c91e630a96e3364dc4c Mon Sep 17 00:00:00 2001
From: JeffreyThijs <jeffrey.thijs@aloxy.io>
Date: Fri, 13 Jan 2023 17:01:20 +0100
Subject: [PATCH 010/173] external message to mqtt publish transform should not
 fail on blank header values

---
 ...ternalMessageToMqttPublishTransformer.java |  1 +
 ...alMessageToMqttPublishTransformerTest.java | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/publishing/ExternalMessageToMqttPublishTransformer.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/publishing/ExternalMessageToMqttPublishTransformer.java
index ebc5ee326ea..65f84b46b3b 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/publishing/ExternalMessageToMqttPublishTransformer.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/publishing/ExternalMessageToMqttPublishTransformer.java
@@ -236,6 +236,7 @@ private static Set<UserProperty> getUserPropertiesOrEmptySet(
     ) {
         return externalMessageHeaders.stream()
                 .filter(header -> !KNOWN_MQTT_HEADER_NAMES.contains(header.getKey()))
+                .filter(header -> header.getValue() != null && !header.getValue().isBlank())
                 .map(header -> {
                     final var headerKey = header.getKey();
                     final String headerValue;
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/publishing/ExternalMessageToMqttPublishTransformerTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/publishing/ExternalMessageToMqttPublishTransformerTest.java
index 7b10149aef7..b6c4ff97a77 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/publishing/ExternalMessageToMqttPublishTransformerTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/publishing/ExternalMessageToMqttPublishTransformerTest.java
@@ -276,4 +276,32 @@ public void transformExternalMessageWithInvalidRetainValueYieldsTransformationFa
                 .hasCauseInstanceOf(InvalidHeaderValueException.class);
     }
 
+    @Test
+    public void transformFullyFledgedExternalMessageWithBlankHeaderReturnsExpectedTransformationSuccessResult() {
+        final var correlationId = testNameCorrelationId.getCorrelationId();
+        final var genericMqttPublish = GenericMqttPublish.builder(MQTT_TOPIC, MQTT_QOS)
+                .retain(RETAIN)
+                .payload(PAYLOAD)
+                .correlationData(ByteBufferUtils.fromUtf8String(correlationId.toString()))
+                .contentType(CONTENT_TYPE.getValue())
+                .responseTopic(REPLY_TO_TOPIC)
+                .userProperties(USER_PROPERTIES)
+                .build();
+        Mockito.when(externalMessage.getHeaders())
+                .thenReturn(DittoHeaders.newBuilder()
+                        .putHeader(MqttHeader.MQTT_TOPIC.getName(), MQTT_TOPIC.toString())
+                        .putHeader(MqttHeader.MQTT_QOS.getName(), String.valueOf(MQTT_QOS.getCode()))
+                        .putHeader(MqttHeader.MQTT_RETAIN.getName(), String.valueOf(genericMqttPublish.isRetain()))
+                        .putHeader("ablankheader", "")
+                        .correlationId(correlationId)
+                        .putHeader(ExternalMessage.REPLY_TO_HEADER, REPLY_TO_TOPIC.toString())
+                        .contentType(CONTENT_TYPE)
+                        .putHeaders(USER_PROPERTIES.stream()
+                                .collect(Collectors.toMap(UserProperty::name, UserProperty::value)))
+                        .build());
+        Mockito.when(externalMessage.getBytePayload()).thenReturn(genericMqttPublish.getPayload());
+
+        assertThat(ExternalMessageToMqttPublishTransformer.transform(externalMessage, mqttPublishTarget))
+                .isEqualTo(TransformationSuccess.of(externalMessage, genericMqttPublish));
+    }
 }
\ No newline at end of file

From ab4f22e6fd58fb2b628037c16a325e801b7259a4 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Sat, 14 Jan 2023 17:05:37 +0100
Subject: [PATCH 011/173] Explorere UI - SSE support - Added new view to see
 incoming updates for the selected thing - Utils format date had wrong
 interface description

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/index.html                           |  1 +
 ui/main.js                              |  3 ++
 ui/modules/things/messagesIncoming.html | 46 ++++++++++++++++
 ui/modules/things/messagesIncoming.js   | 72 +++++++++++++++++++++++++
 ui/modules/things/thingsSSE.js          |  6 +++
 ui/modules/utils.js                     | 10 ++--
 6 files changed, 133 insertions(+), 5 deletions(-)
 create mode 100644 ui/modules/things/messagesIncoming.html
 create mode 100644 ui/modules/things/messagesIncoming.js

diff --git a/ui/index.html b/ui/index.html
index 83ba6a5a44b..38798e1dad0 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -96,6 +96,7 @@
         <div class="collapse show" id="collapseThings" data-bs-parent="#page-content">
             <div id="thingsHTML"></div>
             <div id="featuresHTML"></div>
+            <div id="messagesIncomingHTML"></div>
         </div>
         <div class="collapse" id=collapsePolicies data-bs-parent="#page-content">
             <div id="policyHTML"></div>
diff --git a/ui/main.js b/ui/main.js
index 598b9983bd3..779b9eb4c51 100644
--- a/ui/main.js
+++ b/ui/main.js
@@ -23,6 +23,7 @@ import * as Things from './modules/things/things.js';
 import * as ThingsSearch from './modules/things/thingsSearch.js';
 import * as ThingsCRUD from './modules/things/thingsCRUD.js';
 import * as ThingsSSE from './modules/things/thingsSSE.js';
+import * as MessagesIncoming from './modules/things/messagesIncoming.js';
 import * as Connections from './modules/connections/connections.js';
 import * as ConnectionsCRUD from './modules/connections/connectionsCRUD.js';
 import * as ConnectionsMonitor from './modules/connections/connectionsMonitor.js';
@@ -39,6 +40,7 @@ document.addEventListener('DOMContentLoaded', async function() {
   document.getElementById('thingsHTML').innerHTML = await (await fetch('modules/things/things.html')).text();
   document.getElementById('fieldsHTML').innerHTML = await (await fetch('modules/things/fields.html')).text();
   document.getElementById('featuresHTML').innerHTML = await (await fetch('modules/things/features.html')).text();
+  document.getElementById('messagesIncomingHTML').innerHTML = await (await fetch('modules/things/messagesIncoming.html')).text();
   document.getElementById('policyHTML').innerHTML = await (await fetch('modules/policies/policies.html')).text();
   document.getElementById('connectionsHTML').innerHTML =
       await (await fetch('modules/connections/connections.html')).text();
@@ -52,6 +54,7 @@ document.addEventListener('DOMContentLoaded', async function() {
   ThingsSearch.ready();
   ThingsCRUD.ready();
   ThingsSSE.ready();
+  MessagesIncoming.ready();
   Attributes.ready();
   await Fields.ready();
   await SearchFilter.ready();
diff --git a/ui/modules/things/messagesIncoming.html b/ui/modules/things/messagesIncoming.html
new file mode 100644
index 00000000000..998d716ccb8
--- /dev/null
+++ b/ui/modules/things/messagesIncoming.html
@@ -0,0 +1,46 @@
+<!--
+  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
+  ~
+  ~ See the NOTICE file(s) distributed with this work for additional
+  ~ information regarding copyright ownership.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License 2.0 which is available at
+  ~ http://www.eclipse.org/legal/epl-2.0
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
+<h5 data-bs-toggle="collapse" data-bs-target="#collapseMessages">
+    Incoming Thing Updates <span class="badge rounded-pill bg-info" id="badgeMessageIncomingCount"></span></h5>
+<hr />
+<div class="collapse" id="collapseMessages">
+    <div class="row resizable_pane" style="height: 45vh;">
+        <div class="col-md-6 resizable_flex_column">
+            <div class="input-group input-group-sm mb-1">
+                <button class="btn btn-outline-secondary btn-sm button_round_right" id="buttonResetMessagesIncoming"
+                    data-bs-toggle="tooltip" title="Reset connection logs for the selected connection">
+                    <i class="bi bi-x-circle"></i>
+                    Reset
+                </button>
+            </div>
+            <div class="table-wrap">
+                <table class="table table-striped table-hover table-sm">
+                    <thead>
+                        <tr>
+                            <th>Revision</th>
+                            <th>FeatureId</th>
+                            <th>Modified</th>
+                        </tr>
+                    </thead>
+                    <tbody id="tbodyMessagesIncoming"></tbody>
+                </table>
+            </div>
+        </div>
+        <div class="col-md-6 resizable_flex_column">
+            <h6>Thing Update Detail</h6>
+            <div class="ace_container" style="flex-grow: 1;">
+                <div class="script_editor" id="messageIncomingDetail"></div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/ui/modules/things/messagesIncoming.js b/ui/modules/things/messagesIncoming.js
new file mode 100644
index 00000000000..b1033b80591
--- /dev/null
+++ b/ui/modules/things/messagesIncoming.js
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import * as Utils from '../utils.js';
+import * as Things from './things.js';
+import * as ThingsSSE from './thingsSSE.js';
+/* eslint-disable prefer-const */
+/* eslint-disable max-len */
+/* eslint-disable no-invalid-this */
+/* eslint-disable require-jsdoc */
+
+let dom = {
+  badgeMessageIncomingCount: null,
+  buttonResetMessagesIncoming: null,
+  tbodyMessagesIncoming: null,
+};
+
+let messages = [];
+let messageDetail;
+let currentThingId;
+
+export function ready() {
+  ThingsSSE.setObserver(onMessage);
+  Things.addChangeListener(onThingChanged);
+
+  Utils.getAllElementsById(dom);
+
+  messageDetail = Utils.createAceEditor('messageIncomingDetail', 'ace/mode/json', true);
+
+  dom.buttonResetMessagesIncoming.onclick = onResetMessagesClick;
+  dom.tbodyMessagesIncoming.addEventListener('click', onMessageTableClick);
+}
+
+function onMessageTableClick(event) {
+  messageDetail.setValue(JSON.stringify(messages[event.target.parentNode.rowIndex - 1], null, 2), -1);
+}
+
+function onResetMessagesClick() {
+  messages = [];
+  dom.badgeMessageIncomingCount.textContent = '';
+  dom.tbodyMessagesIncoming.innerHTML = '';
+  messageDetail.setValue('');
+}
+
+function onMessage(messageData) {
+  messages.push(messageData);
+  dom.badgeMessageIncomingCount.textContent = messages.length;
+
+  Utils.addTableRow(
+      dom.tbodyMessagesIncoming,
+      messageData._revision, false, false,
+      messageData['features'] ? Object.keys(messageData.features) : '',
+      Utils.formatDate(messageData._modified, true),
+  );
+}
+
+function onThingChanged(thing) {
+  if (!thing || thing.thingId !== currentThingId) {
+    currentThingId = thing ? thing.thingId : null;
+    onResetMessagesClick();
+  }
+}
diff --git a/ui/modules/things/thingsSSE.js b/ui/modules/things/thingsSSE.js
index 817bc9f0c94..0448be1207a 100644
--- a/ui/modules/things/thingsSSE.js
+++ b/ui/modules/things/thingsSSE.js
@@ -26,6 +26,11 @@ export async function ready() {
   Things.addChangeListener(onThingChanged);
 }
 
+let observer;
+export function setObserver(newObserver) {
+  observer = newObserver;
+}
+
 function onThingChanged(newThingJson, isNewThingId) {
   if (!newThingJson) {
     thingEventSource && thingEventSource.close();
@@ -44,6 +49,7 @@ function onMessage(event) {
     console.log(event);
     const merged = _.merge(Things.theThing, JSON.parse(event.data));
     Things.setTheThing(merged);
+    observer && observer.call(null, JSON.parse(event.data));
   }
 }
 
diff --git a/ui/modules/utils.js b/ui/modules/utils.js
index 2cbb98424ab..8ed6f86505b 100644
--- a/ui/modules/utils.js
+++ b/ui/modules/utils.js
@@ -259,16 +259,16 @@ export function assert(condition, message, validatedElement) {
 }
 
 /**
- * Simple Date format that makes UTC string more readable and cuts off the milliseconds
- * @param {Date} date to format
+ * Simple Date format that makes ISO string more readable and cuts off the milliseconds
+ * @param {String} dateISOString to format
  * @param {boolean} withMilliseconds don t cut off milliseconds if true
  * @return {String} formatted date
  */
-export function formatDate(date, withMilliseconds) {
+export function formatDate(dateISOString, withMilliseconds) {
   if (withMilliseconds) {
-    return date.replace('T', ' ').replace('Z', '').replace('.', ' ');
+    return dateISOString.replace('T', ' ').replace('Z', '').replace('.', ' ');
   } else {
-    return date.split('.')[0].replace('T', ' ');
+    return dateISOString.split('.')[0].replace('T', ' ');
   }
 }
 

From 9cd1539319445e4d72e1bb13d5081f74fa617ffb Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Sun, 15 Jan 2023 07:36:25 +0100
Subject: [PATCH 012/173] Explorer UI - SSE support - On feature update also
 weak ETags are allowed - Improved cleaning up on environment change

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/modules/things/features.js       |  2 +-
 ui/modules/things/thingsSSE.js      | 17 +++++++++++++++--
 ui/modules/things/thingsSearch.js   | 23 +++++++++++++++++------
 ui/modules/things/wotDescription.js |  2 +-
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/ui/modules/things/features.js b/ui/modules/things/features.js
index 02350446e88..84646bab70a 100644
--- a/ui/modules/things/features.js
+++ b/ui/modules/things/features.js
@@ -227,7 +227,7 @@ function onEditToggle(event) {
   if (isEditing && dom.crudFeature.idValue && dom.crudFeature.idValue !== '') {
     API.callDittoREST('GET', `/things/${Things.theThing.thingId}/features/${dom.crudFeature.idValue}`, null, null, true)
         .then((response) => {
-          eTag = response.headers.get('ETag');
+          eTag = response.headers.get('ETag').replace('W/', '');
           return response.json();
         })
         .then((featureJson) => {
diff --git a/ui/modules/things/thingsSSE.js b/ui/modules/things/thingsSSE.js
index 0448be1207a..a6cf897e70e 100644
--- a/ui/modules/things/thingsSSE.js
+++ b/ui/modules/things/thingsSSE.js
@@ -13,6 +13,7 @@
 /* eslint-disable require-jsdoc */
 // @ts-check
 import * as API from '../api.js';
+import * as Environments from '../environments/environments.js';
 
 import * as Things from './things.js';
 
@@ -24,6 +25,7 @@ let thingEventSource;
  */
 export async function ready() {
   Things.addChangeListener(onThingChanged);
+  Environments.addChangeListener(onEnvironmentChanged);
 }
 
 let observer;
@@ -33,8 +35,7 @@ export function setObserver(newObserver) {
 
 function onThingChanged(newThingJson, isNewThingId) {
   if (!newThingJson) {
-    thingEventSource && thingEventSource.close();
-    thingEventSource = null;
+    stopSSE();
   } else if (isNewThingId) {
     thingEventSource && thingEventSource.close();
     console.log('Start SSE: ' + newThingJson.thingId);
@@ -44,6 +45,18 @@ function onThingChanged(newThingJson, isNewThingId) {
   }
 }
 
+function stopSSE() {
+  thingEventSource && thingEventSource.close();
+  thingEventSource = null;
+  console.log('SSE Stopped');
+}
+
+function onEnvironmentChanged(modifiedField) {
+  if (!['pinnedThings', 'filterList', 'messageTemplates'].includes(modifiedField)) {
+    stopSSE();
+  }
+}
+
 function onMessage(event) {
   if (event.data && event.data !== '') {
     console.log(event);
diff --git a/ui/modules/things/thingsSearch.js b/ui/modules/things/thingsSearch.js
index 3aa3c7d87c7..5d02708891c 100644
--- a/ui/modules/things/thingsSearch.js
+++ b/ui/modules/things/thingsSearch.js
@@ -107,8 +107,21 @@ export function getThings(thingIds) {
   dom.thingsTableBody.innerHTML = '';
   if (thingIds.length > 0) {
     API.callDittoREST('GET',
-        `/things?${Fields.getQueryParameter()}&ids=${thingIds}&option=sort(%2BthingId)`,
-    ).then(fillThingsTable);
+        `/things?${Fields.getQueryParameter()}&ids=${thingIds}&option=sort(%2BthingId)`)
+        .then(fillThingsTable)
+        .catch((error) => {
+          resetAndClearViews();
+        });
+  } else {
+    resetAndClearViews();
+  }
+}
+
+function resetAndClearViews(retainThing = false) {
+  theSearchCursor = null;
+  dom.thingsTableBody.innerHTML = '';
+  if (!retainThing) {
+    Things.setTheThing(null);
   }
 }
 
@@ -133,14 +146,12 @@ function searchThings(filter, isMore = false) {
     if (isMore) {
       removeMoreFromThingList();
     } else {
-      theSearchCursor = null;
-      dom.thingsTableBody.innerHTML = '';
+      resetAndClearViews(true);
     }
     fillThingsTable(searchResult.items);
     checkMorePages(searchResult);
   }).catch((error) => {
-    theSearchCursor = null;
-    dom.thingsTableBody.innerHTML = '';
+    resetAndClearViews();
   }).finally(() => {
     document.body.style.cursor = 'default';
   });
diff --git a/ui/modules/things/wotDescription.js b/ui/modules/things/wotDescription.js
index 7e099772b75..77032d652b0 100644
--- a/ui/modules/things/wotDescription.js
+++ b/ui/modules/things/wotDescription.js
@@ -44,7 +44,7 @@ export function WoTDescription(targetTab, forFeature) {
   };
 
   const onReferenceChanged = () => {
-    if (tabLink.classList.contains('active')) {
+    if (tabLink && tabLink.classList.contains('active')) {
       refreshDescription();
     } else {
       viewDirty = true;

From 4b37709f8efd5b58379fb4c71b9432bdeb86b987 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Sun, 15 Jan 2023 21:40:02 +0100
Subject: [PATCH 013/173] Explorer UI - SSE support - Changed CRUD buttons to
 text and showing dynamically - wrong ETag header on feature/attribute
 creation - incoming changes now also show attributes

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/index.html                           | 20 ++++++-----
 ui/modules/things/attributes.js         | 43 +++++++++++++----------
 ui/modules/things/features.js           | 15 +++++---
 ui/modules/things/messagesIncoming.html |  2 +-
 ui/modules/things/messagesIncoming.js   |  3 +-
 ui/modules/utils/crudToolbar.js         | 46 +++++++++++++++++++------
 6 files changed, 86 insertions(+), 43 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index 38798e1dad0..d9d9935f995 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -146,21 +146,25 @@
         <div class="input-group input-group-sm mb-1 mt-1 has-validation">
             <label class="input-group-text" id="label">Default</label>
             <input type="text" class="form-control" disabled id="inputIdValue">
-            <button class="btn btn-secondary btn-sm" id="buttonCrudEdit"
+            <button class="btn btn-outline-primary btn-sm" id="buttonCrudEdit"
                 data-bs-toggle="tooltip" title="Edit">
-                <i id="iEdit" class="bi bi-pencil-square"></i>
+                Edit
             </button>
-            <button class="btn btn-secondary btn-sm" disabled id="buttonCreate"
+            <button class="btn btn-outline-primary btn-sm" hidden id="buttonCreate"
                 data-bs-toggle="tooltip" title="Create">
-                <i class="bi bi-plus-circle"></i>
+                Create
             </button>
-            <button class="btn btn-secondary btn-sm" disabled id="buttonUpdate"
+            <button class="btn btn-outline-primary btn-sm" hidden id="buttonUpdate"
                 data-bs-toggle="tooltip" title="Update">
-                <i class="bi bi-save"></i>
+                Update
             </button>
-            <button class="btn btn-secondary btn-sm" disabled id="buttonDelete"
+            <button class="btn btn-outline-secondary btn-sm" hidden id="buttonDelete"
                 data-bs-toggle="tooltip" title="Delete">
-                <i class="bi bi-trash3"></i>
+                Delete
+            </button>
+            <button class="btn btn-outline-secondary btn-sm" hidden id="buttonCancel"
+                data-bs-toggle="tooltip" title="Cancel" >
+                Cancel
             </button>
             <div class="invalid-feedback"></div>
         </div>
diff --git a/ui/modules/things/attributes.js b/ui/modules/things/attributes.js
index ac2a0a085fa..d851e73a56a 100644
--- a/ui/modules/things/attributes.js
+++ b/ui/modules/things/attributes.js
@@ -1,16 +1,17 @@
-/* eslint-disable require-jsdoc */
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
+* Copyright (c) 2022 Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Eclipse Public License 2.0 which is available at
+* http://www.eclipse.org/legal/epl-2.0
+*
+* SPDX-License-Identifier: EPL-2.0
+*/
+/* eslint-disable require-jsdoc */
+/* eslint-disable comma-dangle */
 
 import * as API from '../api.js';
 import * as Utils from '../utils.js';
@@ -48,7 +49,7 @@ function onCreateAttributeClick() {
       dom.crudAttribute.validationElement);
   Utils.assert(dom.inputAttributeValue.value, 'Attribute value must not be empty', dom.inputAttributeValue);
 
-  updateAttribute('PUT');
+  updateAttribute('PUT', true);
 }
 function onUpdateAttributeClick() {
   Utils.assert(dom.inputAttributeValue.value, 'Attribute value must not be empty');
@@ -75,14 +76,19 @@ function onAttributeTableClick(event) {
 /**
  * Creates a onclick handler function
  * @param {String} method PUT or DELETE
+ * @param {boolean} isNewAttribute if a new attribute is created. default = false
  */
-function updateAttribute(method) {
+function updateAttribute(method, isNewAttribute) {
   API.callDittoREST(
       method,
       `/things/${Things.theThing.thingId}/attributes/${dom.crudAttribute.idValue}`,
       method === 'PUT' ? attributeFromString(dom.inputAttributeValue.value) : null,
+      isNewAttribute ?
+      {
+        'If-None-Match': '*'
+      } :
       {
-        'if-match': method === 'PUT' ? eTag : '*',
+        'If-Match': method === 'PUT' ? eTag : '*'
       },
   ).then(() => {
     if (method === 'PUT') {
@@ -155,6 +161,7 @@ function attributeFromString(attribute) {
 
 function onEditToggle(event) {
   const isEditing = event.detail;
+  dom.inputAttributeValue.disabled = !isEditing;
   if (isEditing && dom.crudAttribute.idValue && dom.crudAttribute.idValue !== '') {
     API.callDittoREST('GET', `/things/${Things.theThing.thingId}/attributes/${dom.crudAttribute.idValue}`,
         null, null, true)
@@ -163,11 +170,11 @@ function onEditToggle(event) {
           return response.json();
         })
         .then((attributeValue) => {
-          dom.inputAttributeValue.disabled = false;
           dom.inputAttributeValue.value = attributeToString(attributeValue);
         });
   } else {
-    dom.inputAttributeValue.disabled = true;
-    dom.inputAttributeValue.value = attributeToString(Things.theThing.attributes[dom.crudAttribute.idValue]);
+    dom.inputAttributeValue.value = dom.crudAttribute.idValue ?
+      attributeToString(Things.theThing.attributes[dom.crudAttribute.idValue]) :
+      null;
   }
 }
diff --git a/ui/modules/things/features.js b/ui/modules/things/features.js
index 84646bab70a..5d5d813965d 100644
--- a/ui/modules/things/features.js
+++ b/ui/modules/things/features.js
@@ -106,7 +106,7 @@ function onCreateFeatureClick() {
   Utils.assert(!Things.theThing['features'] || !Object.keys(Things.theThing.features).includes(dom.crudFeature.idValue),
       `Feature ID ${dom.crudFeature.idValue} already exists in Thing`,
       dom.crudFeature.validationElement);
-  updateFeature('PUT');
+  updateFeature('PUT', true);
 }
 
 function onFeaturesTableClick(event) {
@@ -122,8 +122,9 @@ function onFeaturesTableClick(event) {
 /**
  * Triggers a feature update in Ditto according to UI contents
  * @param {String} method Either PUT to update the feature or DELETE to delete the feature
+ * @param {boolean} isNewFeature indicates if a new feature should be created. (default: false)
  */
-function updateFeature(method) {
+function updateFeature(method, isNewFeature = false) {
   Utils.assert(Things.theThing, 'No Thing selected');
   Utils.assert(dom.crudFeature.idValue, 'No Feature selected');
 
@@ -144,8 +145,12 @@ function updateFeature(method) {
       method,
       '/things/' + Things.theThing.thingId + '/features/' + dom.crudFeature.idValue,
       method === 'PUT' ? featureObject : null,
+      isNewFeature ?
+      {
+        'If-None-Match': '*'
+      } :
       {
-        'if-match': method === 'PUT' ? eTag : '*'
+        'If-Match': method === 'PUT' ? eTag : '*'
       }
   ).then(() => {
     if (method === 'PUT') {
@@ -236,7 +241,7 @@ function onEditToggle(event) {
         });
   } else {
     enableDisableEditors();
-    clearEditorsAfterCancel();
+    resetEditors();
     dom.crudFeature.validationElement.classList.remove('is-invalid');
   }
 
@@ -248,7 +253,7 @@ function onEditToggle(event) {
     featureDesiredPropertiesEditor.renderer.setShowGutter(isEditing);
   }
 
-  function clearEditorsAfterCancel() {
+  function resetEditors() {
     if (dom.crudFeature.idValue) {
       refreshFeature(Things.theThing, dom.crudFeature.idValue);
     } else {
diff --git a/ui/modules/things/messagesIncoming.html b/ui/modules/things/messagesIncoming.html
index 998d716ccb8..5dd3a86b673 100644
--- a/ui/modules/things/messagesIncoming.html
+++ b/ui/modules/things/messagesIncoming.html
@@ -28,7 +28,7 @@ <h5 data-bs-toggle="collapse" data-bs-target="#collapseMessages">
                     <thead>
                         <tr>
                             <th>Revision</th>
-                            <th>FeatureId</th>
+                            <th>Field</th>
                             <th>Modified</th>
                         </tr>
                     </thead>
diff --git a/ui/modules/things/messagesIncoming.js b/ui/modules/things/messagesIncoming.js
index b1033b80591..dd369515433 100644
--- a/ui/modules/things/messagesIncoming.js
+++ b/ui/modules/things/messagesIncoming.js
@@ -59,7 +59,8 @@ function onMessage(messageData) {
   Utils.addTableRow(
       dom.tbodyMessagesIncoming,
       messageData._revision, false, false,
-      messageData['features'] ? Object.keys(messageData.features) : '',
+      [...messageData['features'] ? Object.keys(messageData.features) : [],
+        ...messageData['attributes'] ? Object.keys(messageData.attributes) : []],
       Utils.formatDate(messageData._modified, true),
   );
 }
diff --git a/ui/modules/utils/crudToolbar.js b/ui/modules/utils/crudToolbar.js
index 48cfda086cd..8ac04543bdd 100644
--- a/ui/modules/utils/crudToolbar.js
+++ b/ui/modules/utils/crudToolbar.js
@@ -15,6 +15,7 @@ import * as Utils from '../utils.js';
 
 class CrudToolbar extends HTMLElement {
   isEditing = false;
+  isEditDisabled = false;
   dom = {
     label: null,
     inputIdValue: null,
@@ -22,7 +23,7 @@ class CrudToolbar extends HTMLElement {
     buttonCreate: null,
     buttonUpdate: null,
     buttonDelete: null,
-    iEdit: null,
+    buttonCancel: null,
     divRoot: null,
   };
 
@@ -32,15 +33,26 @@ class CrudToolbar extends HTMLElement {
 
   set idValue(newValue) {
     this.dom.inputIdValue.value = newValue;
-    this.dom.buttonDelete.disabled = (newValue === null);
+    if (newValue && newValue !== '') {
+      this.dom.buttonDelete.removeAttribute('hidden');
+    } else {
+      this.dom.buttonDelete.setAttribute('hidden', '');
+    }
   }
 
   get editDisabled() {
-    return this.dom.buttonCrudEdit.disabled;
+    return this.isEditDisabled;
   }
 
   set editDisabled(newValue) {
-    this.dom.buttonCrudEdit.disabled = newValue;
+    this.isEditDisabled = newValue;
+    if (!this.isEditing) {
+      if (this.isEditDisabled) {
+        this.dom.buttonCrudEdit.setAttribute('hidden', '');
+      } else {
+        this.dom.buttonCrudEdit.removeAttribute('hidden');
+      }
+    }
   }
 
   get validationElement() {
@@ -57,6 +69,7 @@ class CrudToolbar extends HTMLElement {
     setTimeout(() => {
       Utils.getAllElementsById(this.dom, this.shadowRoot);
       this.dom.buttonCrudEdit.onclick = () => this.toggleEdit();
+      this.dom.buttonCancel.onclick = () => this.toggleEdit();
       this.dom.label.innerText = this.getAttribute('label') || 'Label';
       this.dom.buttonCreate.onclick = this.eventDispatcher('onCreateClick');
       this.dom.buttonUpdate.onclick = this.eventDispatcher('onUpdateClick');
@@ -76,13 +89,26 @@ class CrudToolbar extends HTMLElement {
     this.isEditing = !this.isEditing;
     document.getElementById('modalCrudEdit').classList.toggle('editBackground');
     this.dom.divRoot.classList.toggle('editForground');
-    this.dom.iEdit.classList.toggle('bi-pencil-square');
-    this.dom.iEdit.classList.toggle('bi-x-square');
-    this.dom.buttonCrudEdit.title = this.isEditing ? 'Cancel' : 'Edit';
-    this.dom.buttonCreate.disabled = !(this.isEditing && !this.dom.inputIdValue.value);
-    this.dom.buttonUpdate.disabled = !(this.isEditing && this.dom.inputIdValue.value);
+
+    if (this.isEditing || this.isEditDisabled) {
+      this.dom.buttonCrudEdit.setAttribute('hidden', '');
+    } else {
+      this.dom.buttonCrudEdit.removeAttribute('hidden');
+    }
+    this.dom.buttonCancel.toggleAttribute('hidden');
+
+    if (this.isEditing) {
+      if (this.dom.inputIdValue.value) {
+        this.dom.buttonUpdate.toggleAttribute('hidden');
+      } else {
+        this.dom.buttonCreate.toggleAttribute('hidden');
+      }
+    } else {
+      this.dom.buttonCreate.setAttribute('hidden', '');
+      this.dom.buttonUpdate.setAttribute('hidden', '');
+    }
     if (this.isEditing || !this.dom.inputIdValue.value) {
-      this.dom.buttonDelete.disabled = true;
+      this.dom.buttonDelete.setAttribute('hidden', '');
     }
     const allowIdChange = this.isEditing && (!this.dom.inputIdValue.value || this.hasAttribute('allowIdChange'));
     this.dom.inputIdValue.disabled = !allowIdChange;

From 0c7f7494d4af446fbd38825c23c65f7b091c1d42 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Mon, 16 Jan 2023 12:44:19 +0100
Subject: [PATCH 014/173] Explorer UI - SSE bugfix

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/modules/things/thingsCRUD.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/modules/things/thingsCRUD.js b/ui/modules/things/thingsCRUD.js
index 1cc1e7d8d64..93319eed8b8 100644
--- a/ui/modules/things/thingsCRUD.js
+++ b/ui/modules/things/thingsCRUD.js
@@ -172,26 +172,26 @@ function onEditToggle(event) {
         })
         .then((thingJson) => {
           enableDisableEditors();
-          updateEditorsBeforeEdit(thingJson);
+          initializeEditors(thingJson);
         });
   } else {
     enableDisableEditors();
-    clearEditorsAfterCancel();
+    resetEditors();
   }
 
   function enableDisableEditors() {
     dom.buttonThingDefinitions.disabled = !isEditing;
     dom.inputThingDefinition.disabled = !isEditing;
+    thingJsonEditor.setReadOnly(!isEditing);
+    thingJsonEditor.renderer.setShowGutter(isEditing);
   }
 
-  function updateEditorsBeforeEdit(thingJson) {
+  function initializeEditors(thingJson) {
     dom.inputThingDefinition.value = thingJson.definition ?? '';
-    thingJsonEditor.setReadOnly(!isEditing);
-    thingJsonEditor.renderer.setShowGutter(isEditing);
     thingJsonEditor.setValue(JSON.stringify(thingJson, null, 2), -1);
   }
 
-  function clearEditorsAfterCancel() {
+  function resetEditors() {
     if (dom.crudThings.idValue && dom.crudThings.idValue !== '') {
       Things.refreshThing(dom.crudThings.idValue, null);
     } else {

From d7f78c295f73aa0a41cd0b44735fecf9a203d619 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Tue, 17 Jan 2023 10:13:05 +0100
Subject: [PATCH 015/173] added documentation about enhancing the JS payload
 mapping with custom libraries

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../pages/ditto/connectivity-mapping.md       | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/documentation/src/main/resources/pages/ditto/connectivity-mapping.md b/documentation/src/main/resources/pages/ditto/connectivity-mapping.md
index ae108d3435f..d03d3af5c7b 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-mapping.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-mapping.md
@@ -546,6 +546,29 @@ In order to work more conveniently with binary payloads, the following libraries
 * [long.js](https://github.com/dcodeIO/long.js) for representing a 64-bit two's-complement integer value
 
 
+### Adding additional JS libraries
+
+The used [Rhino JS engine](https://github.com/mozilla/rhino) allows making use of "CommonJS" in order to load JS
+modules via `require('')` into the engine.  
+This feature is exposed to Ditto, configuring the configuration key `commonJsModulePath` or environment variable 
+`CONNECTIVITY_MESSAGE_MAPPING_JS_COMMON_JS_MODULE_PATH` of the connectivity service to a path in the
+connectivity Docker container where to load additional CommonJS modules from - e.g. use a volume mount in order to get
+additional JS modules into the container.
+
+For example, configure this variable to a folder to which you add (our mount) JavaScript libraries:
+```
+CONNECTIVITY_MESSAGE_MAPPING_JS_COMMON_JS_MODULE_PATH=/opt/commonjs-modules/
+```
+
+Then, for example, put [`pbf.js`](https://www.npmjs.com/package/pbf) (or any other JS library you want to use) 
+into that folder.
+
+Afterwards, the library can be used in your JS snippet using:
+```javascript
+var Pbf = require('pbf');
+```
+
+
 ### Helper functions
 
 Ditto comes with a few helper functions, which makes writing the mapping scripts easier. They are available under the
@@ -1214,7 +1237,8 @@ public final class FooMapper extends AbstractMessageMapper {
     }
 
     @Override
-    protected void doConfigure(Connection connection, MappingConfig mappingConfig, MessageMapperConfiguration configuration) {
+    private void doConfigure(Connection connection, MappingConfig mappingConfig,
+            MessageMapperConfiguration configuration) {
         // extract configuration if needed
     }
 }

From 569e76cc2a0347880f8da376e3676746a85e8fc0 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Thu, 19 Jan 2023 07:35:53 +0100
Subject: [PATCH 016/173] UI - SSE support: - Update selected thing in search
 result table

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/modules/things/messagesIncoming.js |  2 +-
 ui/modules/things/thingsSSE.js        | 12 ++++++++----
 ui/modules/things/thingsSearch.js     | 20 +++++++++++++++++++-
 ui/modules/utils.js                   |  2 ++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/ui/modules/things/messagesIncoming.js b/ui/modules/things/messagesIncoming.js
index dd369515433..f9b0341aba9 100644
--- a/ui/modules/things/messagesIncoming.js
+++ b/ui/modules/things/messagesIncoming.js
@@ -30,7 +30,7 @@ let messageDetail;
 let currentThingId;
 
 export function ready() {
-  ThingsSSE.setObserver(onMessage);
+  ThingsSSE.addChangeListener(onMessage);
   Things.addChangeListener(onThingChanged);
 
   Utils.getAllElementsById(dom);
diff --git a/ui/modules/things/thingsSSE.js b/ui/modules/things/thingsSSE.js
index a6cf897e70e..ed46ac5c6c0 100644
--- a/ui/modules/things/thingsSSE.js
+++ b/ui/modules/things/thingsSSE.js
@@ -11,6 +11,7 @@
 * SPDX-License-Identifier: EPL-2.0
 */
 /* eslint-disable require-jsdoc */
+/* eslint-disable arrow-parens */
 // @ts-check
 import * as API from '../api.js';
 import * as Environments from '../environments/environments.js';
@@ -28,9 +29,12 @@ export async function ready() {
   Environments.addChangeListener(onEnvironmentChanged);
 }
 
-let observer;
-export function setObserver(newObserver) {
-  observer = newObserver;
+const observers = [];
+export function addChangeListener(observer) {
+  observers.push(observer);
+}
+function notifyAll(thingJson) {
+  observers.forEach(observer => observer.call(null, thingJson));
 }
 
 function onThingChanged(newThingJson, isNewThingId) {
@@ -62,7 +66,7 @@ function onMessage(event) {
     console.log(event);
     const merged = _.merge(Things.theThing, JSON.parse(event.data));
     Things.setTheThing(merged);
-    observer && observer.call(null, JSON.parse(event.data));
+    notifyAll(JSON.parse(event.data));
   }
 }
 
diff --git a/ui/modules/things/thingsSearch.js b/ui/modules/things/thingsSearch.js
index 5d02708891c..7ca6f0b8787 100644
--- a/ui/modules/things/thingsSearch.js
+++ b/ui/modules/things/thingsSearch.js
@@ -25,6 +25,7 @@ import * as API from '../api.js';
 import * as Utils from '../utils.js';
 import * as Fields from './fields.js';
 import * as Things from './things.js';
+import * as ThingsSSE from './thingsSSE.js';
 import * as Environments from '../environments/environments.js';
 
 let lastSearch = '';
@@ -39,6 +40,7 @@ const dom = {
 
 export async function ready() {
   Things.addChangeListener(onThingChanged);
+  ThingsSSE.addChangeListener(onSelectedThingUpdate);
 
   Utils.getAllElementsById(dom);
 
@@ -236,7 +238,7 @@ function fillThingsTable(thingsList) {
         json: item,
         path: path,
       });
-      Utils.addCellToRow(row, elem.length !== 0 ? elem[0] : '');
+      Utils.addCellToRow(row, elem.length !== 0 ? elem[0] : '').setAttribute('jsonPath', path);
     });
   }
 
@@ -270,3 +272,19 @@ function onThingChanged(thingJson) {
     Utils.tableAdjustSelection(dom.thingsTableBody, () => false);
   }
 }
+
+function onSelectedThingUpdate(thingUpdateJson) {
+  const row = document.getElementById(thingUpdateJson.thingId);
+  Array.from(row.cells).forEach((cell) => {
+    const path = cell.getAttribute('jsonPath');
+    if (path) {
+      const elem = JSONPath({
+        json: thingUpdateJson,
+        path: path,
+      });
+      if (elem.length !== 0) {
+        cell.innerHTML = elem[0];
+      }
+    }
+  });
+}
diff --git a/ui/modules/utils.js b/ui/modules/utils.js
index 8ed6f86505b..af9e595832a 100644
--- a/ui/modules/utils.js
+++ b/ui/modules/utils.js
@@ -73,12 +73,14 @@ export function addCheckboxToRow(row, id, checked, onToggle) {
  * @param {String} cellContent content of new cell
  * @param {String} cellTooltip tooltip for new cell
  * @param {Number} position optional, default -1 (add to the end)
+ * @return {HTMLElement} created cell element 
  */
 export function addCellToRow(row, cellContent, cellTooltip = null, position = -1) {
   const cell = row.insertCell(position);
   cell.innerHTML = cellContent;
   cell.setAttribute('data-bs-toggle', 'tooltip');
   cell.title = cellTooltip ?? cellContent;
+  return cell;
 }
 
 /**

From 298bf2da4aaf0a9c151f1aa170c24c792effbc93 Mon Sep 17 00:00:00 2001
From: Stanchev Aleksandar <aleksandar.stanchev@bosch.io>
Date: Thu, 19 Jan 2023 17:08:12 +0200
Subject: [PATCH 017/173] extracts rawUserInfo to prevent unwanted url decoding

Signed-off-by: Stanchev Aleksandar <aleksandar.stanchev@bosch.io>
---
 .../service/messaging/persistence/JsonFieldsEncryptor.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/JsonFieldsEncryptor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/JsonFieldsEncryptor.java
index a1d8a9ac4f6..fc617f226e8 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/JsonFieldsEncryptor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/JsonFieldsEncryptor.java
@@ -87,7 +87,7 @@ public static JsonObject decrypt(final JsonObject jsonObject, final String point
     }
 
     static String replaceUriPassword(final String uriStringRepresentation, final String patchedPassword) {
-        final String userInfo = URI.create(uriStringRepresentation).getUserInfo();
+        final String userInfo = URI.create(uriStringRepresentation).getRawUserInfo();
         final String newUserInfo = userInfo.substring(0, userInfo.indexOf(":") + 1) + patchedPassword;
         final int startOfPwd = uriStringRepresentation.indexOf(userInfo);
         final int endOfPassword = uriStringRepresentation.indexOf("@");
@@ -159,7 +159,7 @@ private static Optional<String> getUriPassword(final String uriStringRepresentat
                     .message("Not a valid connection URI")
                     .build();
         }
-        final String userInfo = uri.getUserInfo();
+        final String userInfo = uri.getRawUserInfo();
         if (userInfo == null) {
             return Optional.empty();
         }

From 694b22b1f86cc126f57a42661a7d09ab7b0694a0 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Fri, 20 Jan 2023 10:31:22 +0100
Subject: [PATCH 018/173] Update SECURITY.md

---
 SECURITY.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SECURITY.md b/SECURITY.md
index db6acad65fa..4992edf5be1 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,7 +1,10 @@
 # Security Policy
 
+Eclipse Ditto follows the [Eclipse Vulnerability Reporting Policy](https://www.eclipse.org/security/policy.php). Vulnerabilities are tracked by the Eclipse security team, in cooperation with the Ditto project leads. Fixing vulnerabilities is taken care of by the Ditto project committers, with assistance and guidance of the security team.
+
 ## Supported Versions
 
+Eclipse Ditto provides security updates for the two most recent minor versions.  
 These versions of Eclipse Ditto are currently being supported with security updates.
 
 | Version | Supported          |

From 54dc02359b4cca0bce3497101b010f2c754ed63c Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Sat, 21 Jan 2023 22:08:34 +0100
Subject: [PATCH 019/173] UI - SSE Support: - create a second SSE that listens
 to all things of the search result - avoid ace editors from creating endless
 undo histories

---
 ui/modules/api.js                            |  4 +-
 ui/modules/connections/connectionsMonitor.js |  2 +
 ui/modules/things/features.js                |  2 +
 ui/modules/things/messagesIncoming.js        |  1 +
 ui/modules/things/thingsCRUD.js              |  2 +
 ui/modules/things/thingsSSE.js               | 51 ++++++++++++++------
 ui/modules/things/thingsSearch.js            | 31 +++++++++---
 7 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/ui/modules/api.js b/ui/modules/api.js
index 95b3853aa9f..cdadd62a39e 100644
--- a/ui/modules/api.js
+++ b/ui/modules/api.js
@@ -338,9 +338,9 @@ export async function callDittoREST(method, path, body, additionalHeaders, retur
   }
 }
 
-export function getEventSource(thingId, urlParams) {
+export function getEventSource(thingIds, urlParams) {
   return new EventSourcePolyfill(
-      `${Environments.current().api_uri}/api/2/things?ids=${thingId}${urlParams ?? ''}`, {
+      `${Environments.current().api_uri}/api/2/things?ids=${thingIds}${urlParams ? '&' + urlParams : ''}`, {
         headers: {
           [authHeaderKey]: authHeaderValue,
         },
diff --git a/ui/modules/connections/connectionsMonitor.js b/ui/modules/connections/connectionsMonitor.js
index 862daf4b59d..1d313c389f2 100644
--- a/ui/modules/connections/connectionsMonitor.js
+++ b/ui/modules/connections/connectionsMonitor.js
@@ -69,6 +69,7 @@ function onResetConnectionMetricsClick() {
 
 function onConnectionLogTableClick(event) {
   connectionLogDetail.setValue(JSON.stringify(connectionLogs[event.target.parentNode.rowIndex - 1], null, 2), -1);
+  connectionLogDetail.session.getUndoManager().reset();
 }
 
 function onResetConnectionLogsClick() {
@@ -104,6 +105,7 @@ function retrieveConnectionStatus() {
   Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
   API.callConnectionsAPI('retrieveStatus', (connectionStatus) => {
     connectionStatusDetail.setValue(JSON.stringify(connectionStatus, null, 2), -1);
+    connectionStatusDetail.session.getUndoManager().reset();
   },
   selectedConnectionId);
 }
diff --git a/ui/modules/things/features.js b/ui/modules/things/features.js
index 5d5d813965d..b81c845c1c0 100644
--- a/ui/modules/things/features.js
+++ b/ui/modules/things/features.js
@@ -180,6 +180,8 @@ function updateFeatureEditors(featureJson) {
     featurePropertiesEditor.setValue('');
     featureDesiredPropertiesEditor.setValue('');
   }
+  featurePropertiesEditor.session.getUndoManager().reset();
+  featureDesiredPropertiesEditor.session.getUndoManager().reset();
 }
 
 /**
diff --git a/ui/modules/things/messagesIncoming.js b/ui/modules/things/messagesIncoming.js
index f9b0341aba9..86dbfd0c0cd 100644
--- a/ui/modules/things/messagesIncoming.js
+++ b/ui/modules/things/messagesIncoming.js
@@ -43,6 +43,7 @@ export function ready() {
 
 function onMessageTableClick(event) {
   messageDetail.setValue(JSON.stringify(messages[event.target.parentNode.rowIndex - 1], null, 2), -1);
+  messageDetail.session.getUndoManager().reset();
 }
 
 function onResetMessagesClick() {
diff --git a/ui/modules/things/thingsCRUD.js b/ui/modules/things/thingsCRUD.js
index 93319eed8b8..4be416be9d9 100644
--- a/ui/modules/things/thingsCRUD.js
+++ b/ui/modules/things/thingsCRUD.js
@@ -154,10 +154,12 @@ function onThingChanged(thingJson) {
       delete thingCopy['_created'];
       delete thingCopy['_modified'];
       thingJsonEditor.setValue(JSON.stringify(thingCopy, null, 2), -1);
+      thingJsonEditor.session.getUndoManager().reset();
     } else {
       dom.crudThings.idValue = null;
       dom.inputThingDefinition.value = null;
       thingJsonEditor.setValue('');
+      thingJsonEditor.session.getUndoManager().reset();
     }
   }
 }
diff --git a/ui/modules/things/thingsSSE.js b/ui/modules/things/thingsSSE.js
index ed46ac5c6c0..cafc3a99eb2 100644
--- a/ui/modules/things/thingsSSE.js
+++ b/ui/modules/things/thingsSSE.js
@@ -17,15 +17,18 @@ import * as API from '../api.js';
 import * as Environments from '../environments/environments.js';
 
 import * as Things from './things.js';
+import * as ThingsSearch from './thingsSearch.js';
 
-let thingEventSource;
+let selectedThingEventSource;
+let thingsTableEventSource;
 
 
 /**
  * Initializes components. Should be called after DOMContentLoaded event
  */
 export async function ready() {
-  Things.addChangeListener(onThingChanged);
+  Things.addChangeListener(onSelectedThingChanged);
+  ThingsSearch.addChangeListener(onThingsTableChanged);
   Environments.addChangeListener(onEnvironmentChanged);
 }
 
@@ -37,36 +40,52 @@ function notifyAll(thingJson) {
   observers.forEach(observer => observer.call(null, thingJson));
 }
 
-function onThingChanged(newThingJson, isNewThingId) {
+function onThingsTableChanged(thingIds, fieldsQueryParameter) {
+  stopSSE(thingsTableEventSource);
+  if (thingIds) {
+    console.log('SSE Start: THINGS TABLE');
+    thingsTableEventSource = API.getEventSource(thingIds, fieldsQueryParameter);
+    thingsTableEventSource.onmessage = onMessageThingsTable;
+  }
+}
+
+function onSelectedThingChanged(newThingJson, isNewThingId) {
   if (!newThingJson) {
-    stopSSE();
+    stopSSE(selectedThingEventSource);
   } else if (isNewThingId) {
-    thingEventSource && thingEventSource.close();
-    console.log('Start SSE: ' + newThingJson.thingId);
-    thingEventSource = API.getEventSource(newThingJson.thingId,
-        '&fields=thingId,attributes,features,_revision,_modified');
-    thingEventSource.onmessage = onMessage;
+    selectedThingEventSource && selectedThingEventSource.close();
+    console.log('SSE Start: SELECTED THING : ' + newThingJson.thingId);
+    selectedThingEventSource = API.getEventSource(newThingJson.thingId,
+        'fields=thingId,attributes,features,_revision,_modified');
+    selectedThingEventSource.onmessage = onMessageSelectedThing;
   }
 }
 
-function stopSSE() {
-  thingEventSource && thingEventSource.close();
-  thingEventSource = null;
-  console.log('SSE Stopped');
+function stopSSE(eventSource) {
+  if (eventSource) {
+    eventSource.close();
+    console.log('SSE Stopped: ' + (eventSource === selectedThingEventSource ? 'SELECTED THING' : 'THINGS TABLE'));
+  }
 }
 
 function onEnvironmentChanged(modifiedField) {
   if (!['pinnedThings', 'filterList', 'messageTemplates'].includes(modifiedField)) {
-    stopSSE();
+    stopSSE(selectedThingEventSource);
+    stopSSE(thingsTableEventSource);
   }
 }
 
-function onMessage(event) {
+function onMessageSelectedThing(event) {
   if (event.data && event.data !== '') {
-    console.log(event);
     const merged = _.merge(Things.theThing, JSON.parse(event.data));
     Things.setTheThing(merged);
     notifyAll(JSON.parse(event.data));
   }
 }
 
+function onMessageThingsTable(event) {
+  if (event.data && event.data !== '') {
+    ThingsSearch.updateTableRow(JSON.parse(event.data));
+  }
+}
+
diff --git a/ui/modules/things/thingsSearch.js b/ui/modules/things/thingsSearch.js
index 7ca6f0b8787..5b9cf1b6c4d 100644
--- a/ui/modules/things/thingsSearch.js
+++ b/ui/modules/things/thingsSearch.js
@@ -14,6 +14,7 @@
 /* eslint-disable require-jsdoc */
 /* eslint-disable new-cap */
 /* eslint-disable no-invalid-this */
+/* eslint-disable arrow-parens */
 
 // @ts-check
 
@@ -38,9 +39,18 @@ const dom = {
   favIcon: null,
 };
 
+const observers = [];
+export function addChangeListener(observer) {
+  observers.push(observer);
+}
+function notifyAll(thingIds, fields) {
+  observers.forEach(observer => observer.call(null, thingIds, fields));
+}
+
+
 export async function ready() {
   Things.addChangeListener(onThingChanged);
-  ThingsSSE.addChangeListener(onSelectedThingUpdate);
+  ThingsSSE.addChangeListener(updateTableRow);
 
   Utils.getAllElementsById(dom);
 
@@ -107,20 +117,27 @@ export function performLastSearch() {
  */
 export function getThings(thingIds) {
   dom.thingsTableBody.innerHTML = '';
+  const fieldsQueryParameter = Fields.getQueryParameter();
   if (thingIds.length > 0) {
     API.callDittoREST('GET',
-        `/things?${Fields.getQueryParameter()}&ids=${thingIds}&option=sort(%2BthingId)`)
-        .then(fillThingsTable)
+        `/things?${fieldsQueryParameter}&ids=${thingIds}&option=sort(%2BthingId)`)
+        .then((thingJsonArray) => {
+          fillThingsTable(thingJsonArray);
+          notifyAll(thingIds, fieldsQueryParameter);
+        })
         .catch((error) => {
           resetAndClearViews();
+          notifyAll(null);
         });
   } else {
     resetAndClearViews();
+    notifyAll(null);
   }
 }
 
 function resetAndClearViews(retainThing = false) {
   theSearchCursor = null;
+  dom.thingsTableHead.innerHTML = '';
   dom.thingsTableBody.innerHTML = '';
   if (!retainThing) {
     Things.setTheThing(null);
@@ -136,9 +153,9 @@ function searchThings(filter, isMore = false) {
   document.body.style.cursor = 'progress';
 
   const namespaces = Environments.current().searchNamespaces;
-
+  const fieldsQueryParameter = Fields.getQueryParameter();
   API.callDittoREST('GET',
-      '/search/things?' + Fields.getQueryParameter() +
+      '/search/things?' + fieldsQueryParameter +
       ((filter && filter !== '') ? '&filter=' + encodeURIComponent(filter) : '') +
       ((namespaces && namespaces !== '') ? '&namespaces=' + namespaces : '') +
       '&option=sort(%2BthingId)' +
@@ -152,8 +169,10 @@ function searchThings(filter, isMore = false) {
     }
     fillThingsTable(searchResult.items);
     checkMorePages(searchResult);
+    notifyAll(searchResult.items.map(thingJson => thingJson.thingId), fieldsQueryParameter);
   }).catch((error) => {
     resetAndClearViews();
+    notifyAll(null);
   }).finally(() => {
     document.body.style.cursor = 'default';
   });
@@ -273,7 +292,7 @@ function onThingChanged(thingJson) {
   }
 }
 
-function onSelectedThingUpdate(thingUpdateJson) {
+export function updateTableRow(thingUpdateJson) {
   const row = document.getElementById(thingUpdateJson.thingId);
   Array.from(row.cells).forEach((cell) => {
     const path = cell.getAttribute('jsonPath');

From 6cdc07e5b53ff63e03473f7a8586437f93039baa Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Sun, 22 Jan 2023 16:25:13 +0100
Subject: [PATCH 020/173] UI - SSE support - testing and bugfixing - WoT
 description for feature was referencing old dom field - thing search more
 button changed SSE to new page and lost 1st page

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/modules/things/thingsSearch.js   |  5 ++++-
 ui/modules/things/wotDescription.js | 15 ++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ui/modules/things/thingsSearch.js b/ui/modules/things/thingsSearch.js
index 5b9cf1b6c4d..0acc59f0eab 100644
--- a/ui/modules/things/thingsSearch.js
+++ b/ui/modules/things/thingsSearch.js
@@ -169,7 +169,9 @@ function searchThings(filter, isMore = false) {
     }
     fillThingsTable(searchResult.items);
     checkMorePages(searchResult);
-    notifyAll(searchResult.items.map(thingJson => thingJson.thingId), fieldsQueryParameter);
+    if (!isMore) {
+      notifyAll(searchResult.items.map(thingJson => thingJson.thingId), fieldsQueryParameter);
+    }
   }).catch((error) => {
     resetAndClearViews();
     notifyAll(null);
@@ -294,6 +296,7 @@ function onThingChanged(thingJson) {
 
 export function updateTableRow(thingUpdateJson) {
   const row = document.getElementById(thingUpdateJson.thingId);
+  console.assert(row !== null, 'Unexpected thingId for table update. thingId was not loaded before');
   Array.from(row.cells).forEach((cell) => {
     const path = cell.getAttribute('jsonPath');
     if (path) {
diff --git a/ui/modules/things/wotDescription.js b/ui/modules/things/wotDescription.js
index 77032d652b0..f483c68dda9 100644
--- a/ui/modules/things/wotDescription.js
+++ b/ui/modules/things/wotDescription.js
@@ -21,7 +21,7 @@ export function WoTDescription(targetTab, forFeature) {
   let aceWoTDescription;
   let viewDirty = false;
   const _forFeature = forFeature;
-  const domTheFeatureId = document.getElementById('theFeatureId');
+  let theFeatureId;
 
   const ready = async () => {
     const tabId = Utils.addTab(
@@ -43,7 +43,10 @@ export function WoTDescription(targetTab, forFeature) {
     aceWoTDescription = Utils.createAceEditor(aceId, 'ace/mode/json', true);
   };
 
-  const onReferenceChanged = () => {
+  const onReferenceChanged = (ref) => {
+    if (_forFeature) {
+      theFeatureId = ref;
+    }
     if (tabLink && tabLink.classList.contains('active')) {
       refreshDescription();
     } else {
@@ -64,12 +67,10 @@ export function WoTDescription(targetTab, forFeature) {
   }
 
   function refreshDescription() {
-    let featurePath = '';
-    if (_forFeature) {
-      featurePath = '/features/' + domTheFeatureId.value;
-    }
+    const featurePath = _forFeature ? '/features/' + theFeatureId : '';
+
     aceWoTDescription.setValue('');
-    if (Things.theThing && (!_forFeature || domTheFeatureId.value)) {
+    if (Things.theThing && (!_forFeature || theFeatureId)) {
       API.callDittoREST(
           'GET',
           '/things/' + Things.theThing.thingId + featurePath,

From 948b85dc2049713ae28d382097732e57749f836d Mon Sep 17 00:00:00 2001
From: Andrey Balarev <andrey.balarev@bosch.io>
Date: Mon, 23 Jan 2023 21:51:28 +0200
Subject: [PATCH 021/173] Connections API doc fixes Ditto

Signed-off-by: Andrey Balarev <andrey.balarev@bosch.io>
---
 .../service/messaging/hono/HonoConnectionFactory.java       | 5 ++++-
 .../messaging/hono/DefaultHonoConnectionFactoryTest.java    | 6 ++++--
 .../src/test/resources/hono-connection-custom-expected.json | 2 +-
 connectivity/service/src/test/resources/test.conf           | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/hono/HonoConnectionFactory.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/hono/HonoConnectionFactory.java
index 3057a0ea4d9..8552aee4b5a 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/hono/HonoConnectionFactory.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/hono/HonoConnectionFactory.java
@@ -16,6 +16,8 @@
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
 import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.LinkedHashMap;
@@ -150,7 +152,8 @@ protected void preConversion(final Connection honoConnection) {
 
     private String combineUriWithCredentials(final String uri, final UserPasswordCredentials credentials) {
         return uri.replaceFirst("(\\S+://)(\\S+)",
-                "$1" + credentials.getUsername() + ":" + credentials.getPassword() + "@$2");
+                "$1" + URLEncoder.encode(credentials.getUsername(), StandardCharsets.UTF_8) + ":" +
+                        URLEncoder.encode(credentials.getPassword(), StandardCharsets.UTF_8) + "@$2");
     }
 
     private Map<String, String> makeupSpecificConfig(final Connection connection) {
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/hono/DefaultHonoConnectionFactoryTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/hono/DefaultHonoConnectionFactoryTest.java
index 6a72dd50171..86a6bd2443e 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/hono/DefaultHonoConnectionFactoryTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/hono/DefaultHonoConnectionFactoryTest.java
@@ -19,6 +19,8 @@
 
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -120,8 +122,8 @@ private Connection getExpectedHonoConnection(final Connection originalConnection
         );
         return ConnectivityModelFactory.newConnectionBuilder(originalConnection)
                 .uri(honoConfig.getBaseUri().toString().replaceFirst("(\\S+://)(\\S+)",
-                        "$1" + honoConfig.getUserPasswordCredentials().getUsername()
-                                + ":" + honoConfig.getUserPasswordCredentials().getPassword()
+                        "$1" + URLEncoder.encode(honoConfig.getUserPasswordCredentials().getUsername(), StandardCharsets.UTF_8)
+                                + ":" + URLEncoder.encode(honoConfig.getUserPasswordCredentials().getPassword(), StandardCharsets.UTF_8)
                                 + "@$2"))
                 .validateCertificate(honoConfig.isValidateCertificates())
                 .specificConfig(Map.of(
diff --git a/connectivity/service/src/test/resources/hono-connection-custom-expected.json b/connectivity/service/src/test/resources/hono-connection-custom-expected.json
index c55d5c52168..649861792bb 100644
--- a/connectivity/service/src/test/resources/hono-connection-custom-expected.json
+++ b/connectivity/service/src/test/resources/hono-connection-custom-expected.json
@@ -3,7 +3,7 @@
   "name": "Things-Hono Test 1",
   "connectionType": "hono",
   "connectionStatus": "open",
-  "uri": "tcp://test_username:test_password@localhost:9922",
+  "uri": "tcp://test_username:test_password_w%2Fspecial_char@localhost:9922",
   "sources": [
     {
       "addresses": [
diff --git a/connectivity/service/src/test/resources/test.conf b/connectivity/service/src/test/resources/test.conf
index b4ec24e9b1c..a4676ce04ff 100644
--- a/connectivity/service/src/test/resources/test.conf
+++ b/connectivity/service/src/test/resources/test.conf
@@ -103,7 +103,7 @@ ditto {
         sasl-mechanism = PLAIN
         bootstrap-servers = "tcp://server1:port1,tcp://server2:port2,tcp://server3:port3"
         username = test_username
-        password = test_password
+        password = test_password_w/special_char
     }
 
     connection {

From e76bc2d48fc64c7fca9d4cd8454c69766545b928 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Wed, 25 Jan 2023 10:09:42 +0100
Subject: [PATCH 022/173] fixed Grafana dashboard datasource configurations

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../operations/grafana-dashboards/Akka.json   |  20 +--
 .../Akka_Dispatcher_Metrics.json              | 115 +++----------
 .../grafana-dashboards/Cache_Metrics.json     |   2 +-
 .../grafana-dashboards/Cluster_traffic.json   |  37 +---
 .../grafana-dashboards/Connectivity_ACKS.json |   2 +-
 .../Connectivity_Metrics.json                 | 160 ++++--------------
 .../Connectivity_live_status.json             |   2 +-
 .../grafana-dashboards/Container_Metrics.json |   2 +-
 .../grafana-dashboards/External_Metrics.json  |   2 +-
 .../grafana-dashboards/Gateway_Traces.json    |   2 +-
 .../grafana-dashboards/JVM_Metrics.json       |   2 +-
 .../Kafka_Consumer_Metrics.json               |   2 +-
 .../Kubernetes_Metrics.json                   |   2 +-
 .../grafana-dashboards/Load_Test.json         |  50 ++----
 .../Persistence_Entities.json                 |   2 +-
 .../grafana-dashboards/Pub_Sub.json           |  50 ++----
 .../grafana-dashboards/Signal_processing.json | 140 +++------------
 .../Sudo_command_count.json                   |  45 +----
 ...s-Wildcard-Search_Performance_Metrics.json |  75 ++------
 pom.xml                                       |   6 +-
 20 files changed, 152 insertions(+), 566 deletions(-)

diff --git a/deployment/operations/grafana-dashboards/Akka.json b/deployment/operations/grafana-dashboards/Akka.json
index 75d5b19244b..32d6e089eda 100644
--- a/deployment/operations/grafana-dashboards/Akka.json
+++ b/deployment/operations/grafana-dashboards/Akka.json
@@ -3,10 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": {
-          "type": "datasource",
-          "uid": "grafana"
-        },
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -29,10 +26,7 @@
   "liveNow": false,
   "panels": [
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -130,10 +124,7 @@
           "text": "None",
           "value": ""
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values(actor_mailbox_size, service)",
         "hide": 0,
         "includeAll": false,
@@ -159,10 +150,7 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values(actor_mailbox_size{service=~\"$service\"}, instance)",
         "hide": 0,
         "includeAll": true,
diff --git a/deployment/operations/grafana-dashboards/Akka_Dispatcher_Metrics.json b/deployment/operations/grafana-dashboards/Akka_Dispatcher_Metrics.json
index f2dff2f4b2e..9b36113fb79 100644
--- a/deployment/operations/grafana-dashboards/Akka_Dispatcher_Metrics.json
+++ b/deployment/operations/grafana-dashboards/Akka_Dispatcher_Metrics.json
@@ -3,10 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -34,10 +31,7 @@
     {
       "collapse": false,
       "collapsed": false,
-      "datasource": {
-        "type": "datasource",
-        "uid": "grafana"
-      },
+      "datasource": "grafana",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -52,10 +46,7 @@
       "type": "row"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "Tracks the number of threads in use.",
       "fieldConfig": {
         "defaults": {
@@ -131,10 +122,7 @@
       "pluginVersion": "8.5.6",
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "rate(executor_threads_total_sum{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}[$Interval])\n/\nrate(executor_threads_total_count{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}[$Interval])",
           "format": "time_series",
@@ -144,10 +132,7 @@
           "refId": "A"
         },
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "rate(executor_threads_active_sum{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}[$Interval])\n/\nrate(executor_threads_active_count{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}[$Interval])",
           "format": "time_series",
@@ -166,10 +151,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -211,10 +193,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "rate(executor_tasks_submitted_total{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}[$Interval])",
           "format": "time_series",
@@ -225,10 +204,7 @@
           "refId": "A"
         },
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "rate(executor_tasks_completed_total{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}[$Interval])",
           "format": "time_series",
@@ -239,10 +215,7 @@
           "refId": "B"
         },
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "max_over_time( ( rate( executor_tasks_completed_total{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}[$Interval] ) )[$__interval:30s] )",
           "format": "time_series",
@@ -284,10 +257,7 @@
       }
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -366,10 +336,7 @@
       "pluginVersion": "8.5.6",
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "expr": "rate(executor_queue_size_sum{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}[$Interval])\n/\nrate(executor_queue_size_count{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}[$Interval])",
           "format": "time_series",
           "hide": false,
@@ -378,10 +345,7 @@
           "refId": "A"
         },
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "histogram_quantile(0.95, sum(rate(executor_queue_size_bucket{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\",le=\"+Inf\"}[$Interval])) by (job,instance,name,le))",
           "format": "time_series",
@@ -396,10 +360,7 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "Tracks minimum/maximum number of Threads of the executors.",
       "fieldConfig": {
         "defaults": {
@@ -479,10 +440,7 @@
       "pluginVersion": "8.5.6",
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "executor_threads_min{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}",
           "format": "time_series",
@@ -492,10 +450,7 @@
           "refId": "A"
         },
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "executor_threads_max{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}",
           "format": "time_series",
@@ -514,10 +469,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "Tracks executor parallelism.",
       "fill": 1,
       "fillGradient": 0,
@@ -560,10 +512,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "executor_parallelism{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}",
           "format": "time_series",
@@ -604,10 +553,7 @@
       }
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "Tracks the time that tasks spend on the executor service's queue",
       "fieldConfig": {
         "defaults": {
@@ -687,10 +633,7 @@
       "pluginVersion": "8.5.6",
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "rate(executor_time_in_queue_seconds_sum{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}[$Interval])\n/\nrate(executor_time_in_queue_seconds_count{job=~\"$Application\",instance=~\"$Instance\",name=~\"$Dispatcher\",type=~\"$Type\"}[$Interval])",
           "format": "time_series",
@@ -723,10 +666,7 @@
             "$__all"
           ]
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values({__name__=~\"jvm.*\"}, job)",
         "hide": 0,
         "includeAll": true,
@@ -757,10 +697,7 @@
             "$__all"
           ]
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values(executor_threads_min{job=~\"$Application\"},instance)",
         "hide": 0,
         "includeAll": true,
@@ -791,10 +728,7 @@
             "$__all"
           ]
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values(executor_threads_min{job=~\"$Application\",instance=~\"$Instance\"},name)",
         "hide": 0,
         "includeAll": true,
@@ -880,10 +814,7 @@
             "$__all"
           ]
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values(executor_threads_min{job=~\"$Application\",instance=~\"$Instance\"},type)",
         "hide": 0,
         "includeAll": true,
diff --git a/deployment/operations/grafana-dashboards/Cache_Metrics.json b/deployment/operations/grafana-dashboards/Cache_Metrics.json
index 4cae8324023..5eb25da45df 100644
--- a/deployment/operations/grafana-dashboards/Cache_Metrics.json
+++ b/deployment/operations/grafana-dashboards/Cache_Metrics.json
@@ -3,7 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
diff --git a/deployment/operations/grafana-dashboards/Cluster_traffic.json b/deployment/operations/grafana-dashboards/Cluster_traffic.json
index a837a2ad0b1..8723f3e16b0 100644
--- a/deployment/operations/grafana-dashboards/Cluster_traffic.json
+++ b/deployment/operations/grafana-dashboards/Cluster_traffic.json
@@ -3,7 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -680,10 +680,7 @@
     },
     {
       "collapsed": false,
-      "datasource": {
-        "type": "datasource",
-        "uid": "grafana"
-      },
+      "datasource": "grafana",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -696,10 +693,7 @@
       "type": "row"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -779,10 +773,7 @@
       "pluginVersion": "8.5.6",
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "sum(irate(enforcement_seconds_count{segment=\"overall\",channel!=\"live\"}[5m]) > 0) by (category, resource, outcome)",
           "format": "time_series",
@@ -792,10 +783,7 @@
           "refId": "A"
         },
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "sum(irate(enforcement_seconds_count{segment=\"overall\",channel=\"live\"}[5m]) > 0) by (category, resource, outcome)",
           "format": "time_series",
@@ -810,10 +798,7 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -890,10 +875,7 @@
       "pluginVersion": "8.5.6",
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "avg((idelta(enforcement_seconds_sum{segment=\"overall\",channel!=\"live\"}[5m]) / idelta(enforcement_seconds_count{segment=\"overall\",channel!=\"live\"}[5m])) > 0) by (category, resource, outcome)",
           "format": "time_series",
@@ -903,10 +885,7 @@
           "refId": "A"
         },
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "avg((idelta(enforcement_seconds_sum{segment=\"overall\",channel=\"live\"}[5m]) / idelta(enforcement_seconds_count{segment=\"overall\",channel=\"live\"}[5m])) > 0) by (category, resource, outcome)",
           "format": "time_series",
diff --git a/deployment/operations/grafana-dashboards/Connectivity_ACKS.json b/deployment/operations/grafana-dashboards/Connectivity_ACKS.json
index b47c75f32a2..8ac2860b141 100644
--- a/deployment/operations/grafana-dashboards/Connectivity_ACKS.json
+++ b/deployment/operations/grafana-dashboards/Connectivity_ACKS.json
@@ -3,7 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
diff --git a/deployment/operations/grafana-dashboards/Connectivity_Metrics.json b/deployment/operations/grafana-dashboards/Connectivity_Metrics.json
index 33822617a26..2a769a70426 100644
--- a/deployment/operations/grafana-dashboards/Connectivity_Metrics.json
+++ b/deployment/operations/grafana-dashboards/Connectivity_Metrics.json
@@ -3,10 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": {
-          "type": "datasource",
-          "uid": "grafana"
-        },
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -30,10 +27,7 @@
   "panels": [
     {
       "collapsed": false,
-      "datasource": {
-        "type": "datasource",
-        "uid": "grafana"
-      },
+      "datasource": "grafana",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -50,10 +44,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": [],
@@ -102,10 +93,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "expr": "sum(connection_client{instance=~\"$Host\", type=~\"$ConnectionType\", id=~\"$Connection\"}) by (type)",
           "format": "time_series",
           "instant": false,
@@ -149,10 +137,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": [],
@@ -201,10 +186,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "expr": "sum(connection_client{instance=~\"$Host\", type=~\"$ConnectionType\", id=~\"$Connection\"}) by (instance, type)",
           "format": "time_series",
           "instant": false,
@@ -248,10 +230,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "Connections which delivered metrics in the last 7 days",
       "fieldConfig": {
         "defaults": {
@@ -301,10 +280,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "expr": "count by (ditto_connection_type) (count by (instance, ditto_connection_id, ditto_connection_type) (increase(connectivity_message_mapping_seconds_count{instance=~\"$Host\", ditto_connection_type=~\"$ConnectionType\", ditto_connection_id=~\"$Connection\"}[5m]) > 0))",
           "format": "time_series",
           "hide": false,
@@ -349,10 +325,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "Connections which delivered metrics in the last 7 days",
       "fieldConfig": {
         "defaults": {
@@ -402,10 +375,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "expr": "count by (instance, ditto_connection_type) (count by (instance, ditto_connection_id, ditto_connection_type) (increase (connectivity_message_mapping_seconds_count{instance=~\"$Host\", ditto_connection_type=~\"$ConnectionType\", ditto_connection_id=~\"$Connection\"}[5m]) > 0))",
           "format": "time_series",
           "hide": false,
@@ -447,10 +417,7 @@
     },
     {
       "collapsed": false,
-      "datasource": {
-        "type": "datasource",
-        "uid": "grafana"
-      },
+      "datasource": "grafana",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -467,10 +434,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": [],
@@ -566,10 +530,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "This number reflects the number of messages that resulted out of payload mappings per second.",
       "fieldConfig": {
         "defaults": {
@@ -666,10 +627,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -766,10 +724,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -871,10 +826,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -1006,10 +958,7 @@
       "bars": true,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -1056,10 +1005,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "exemplar": true,
           "expr": "count(rate(connection_messages_total{instance=~\"$Host\", id=~\"$Connection\", type=~\"$ConnectionType\", category=\"throttled\", direction=\"inbound\"}[5m])>0) by (type, id)",
@@ -1071,10 +1017,7 @@
           "refId": "B"
         },
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "exemplar": true,
           "expr": "count(rate(connection_messages_total{category=\"throttled\", direction=\"inbound\"}[5m]) > 0) by (id)",
           "hide": true,
@@ -1131,10 +1074,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -1228,10 +1168,7 @@
     },
     {
       "collapsed": false,
-      "datasource": {
-        "type": "datasource",
-        "uid": "grafana"
-      },
+      "datasource": "grafana",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -1248,10 +1185,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": [],
@@ -1348,10 +1282,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": [],
@@ -1447,10 +1378,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "This number reflects the number of messages that resulted out of payload mappings per second.",
       "fieldConfig": {
         "defaults": {
@@ -1547,10 +1475,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": [],
@@ -1646,10 +1571,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": [],
@@ -1745,10 +1667,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": [],
@@ -1844,10 +1763,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": []
@@ -1962,10 +1878,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": []
@@ -2074,10 +1987,7 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "",
         "hide": 0,
         "includeAll": true,
@@ -2108,10 +2018,7 @@
             "$__all"
           ]
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values(connectivity_message_mapping_seconds_count,ditto_connection_id)",
         "hide": 0,
         "includeAll": true,
@@ -2138,10 +2045,7 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values(connectivity_message_mapping_seconds_count,ditto_connection_type)",
         "hide": 0,
         "includeAll": true,
diff --git a/deployment/operations/grafana-dashboards/Connectivity_live_status.json b/deployment/operations/grafana-dashboards/Connectivity_live_status.json
index 52796004638..3b3f266c3d9 100644
--- a/deployment/operations/grafana-dashboards/Connectivity_live_status.json
+++ b/deployment/operations/grafana-dashboards/Connectivity_live_status.json
@@ -3,7 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
diff --git a/deployment/operations/grafana-dashboards/Container_Metrics.json b/deployment/operations/grafana-dashboards/Container_Metrics.json
index a3949c79f01..832cd2d6a82 100644
--- a/deployment/operations/grafana-dashboards/Container_Metrics.json
+++ b/deployment/operations/grafana-dashboards/Container_Metrics.json
@@ -3,7 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
diff --git a/deployment/operations/grafana-dashboards/External_Metrics.json b/deployment/operations/grafana-dashboards/External_Metrics.json
index a21553f3643..67b79c3f72d 100644
--- a/deployment/operations/grafana-dashboards/External_Metrics.json
+++ b/deployment/operations/grafana-dashboards/External_Metrics.json
@@ -3,7 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
diff --git a/deployment/operations/grafana-dashboards/Gateway_Traces.json b/deployment/operations/grafana-dashboards/Gateway_Traces.json
index 3de7a4cb297..a9350acf75d 100644
--- a/deployment/operations/grafana-dashboards/Gateway_Traces.json
+++ b/deployment/operations/grafana-dashboards/Gateway_Traces.json
@@ -3,7 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
diff --git a/deployment/operations/grafana-dashboards/JVM_Metrics.json b/deployment/operations/grafana-dashboards/JVM_Metrics.json
index 2c7fdfe5920..21a526f700e 100644
--- a/deployment/operations/grafana-dashboards/JVM_Metrics.json
+++ b/deployment/operations/grafana-dashboards/JVM_Metrics.json
@@ -3,7 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
diff --git a/deployment/operations/grafana-dashboards/Kafka_Consumer_Metrics.json b/deployment/operations/grafana-dashboards/Kafka_Consumer_Metrics.json
index ef6a63d89da..2d468fbf34d 100644
--- a/deployment/operations/grafana-dashboards/Kafka_Consumer_Metrics.json
+++ b/deployment/operations/grafana-dashboards/Kafka_Consumer_Metrics.json
@@ -3,7 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
diff --git a/deployment/operations/grafana-dashboards/Kubernetes_Metrics.json b/deployment/operations/grafana-dashboards/Kubernetes_Metrics.json
index 72c17b5d1af..ddecf3ff22d 100644
--- a/deployment/operations/grafana-dashboards/Kubernetes_Metrics.json
+++ b/deployment/operations/grafana-dashboards/Kubernetes_Metrics.json
@@ -3,7 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
diff --git a/deployment/operations/grafana-dashboards/Load_Test.json b/deployment/operations/grafana-dashboards/Load_Test.json
index 514a65c2095..6c0544e7301 100644
--- a/deployment/operations/grafana-dashboards/Load_Test.json
+++ b/deployment/operations/grafana-dashboards/Load_Test.json
@@ -3,10 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": {
-          "type": "datasource",
-          "uid": "grafana"
-        },
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -29,10 +26,7 @@
   "panels": [
     {
       "collapsed": false,
-      "datasource": {
-        "type": "datasource",
-        "uid": "grafana"
-      },
+      "datasource": "grafana",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -45,10 +39,7 @@
       "type": "row"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -132,10 +123,7 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -210,10 +198,7 @@
       "pluginVersion": "8.5.6",
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "sum(irate(enforcement_seconds_count{segment=\"overall\",channel!=\"live\"}[5m]) > 0) by (category, resource, outcome)",
           "format": "time_series",
@@ -223,10 +208,7 @@
           "refId": "A"
         },
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "sum(irate(enforcement_seconds_count{segment=\"overall\",channel=\"live\"}[5m]) > 0) by (category, resource, outcome)",
           "format": "time_series",
@@ -242,10 +224,7 @@
     },
     {
       "collapsed": false,
-      "datasource": {
-        "type": "datasource",
-        "uid": "grafana"
-      },
+      "datasource": "grafana",
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -258,10 +237,7 @@
       "type": "row"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -354,10 +330,7 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -444,10 +417,7 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "Positive: inbound messages\nNegative: outbound messages",
       "fieldConfig": {
         "defaults": {
diff --git a/deployment/operations/grafana-dashboards/Persistence_Entities.json b/deployment/operations/grafana-dashboards/Persistence_Entities.json
index a89f0319c5f..f69715730da 100644
--- a/deployment/operations/grafana-dashboards/Persistence_Entities.json
+++ b/deployment/operations/grafana-dashboards/Persistence_Entities.json
@@ -3,7 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
diff --git a/deployment/operations/grafana-dashboards/Pub_Sub.json b/deployment/operations/grafana-dashboards/Pub_Sub.json
index 49135cb536c..a88ae765a2e 100644
--- a/deployment/operations/grafana-dashboards/Pub_Sub.json
+++ b/deployment/operations/grafana-dashboards/Pub_Sub.json
@@ -3,10 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": {
-          "type": "datasource",
-          "uid": "grafana"
-        },
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -33,10 +30,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -120,10 +114,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -222,10 +213,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -305,10 +293,7 @@
       }
     },
     {
-      "datasource": {
-        "type": "elasticsearch",
-        "uid": "PAE1B8C8635429669"
-      },
+      "datasource": "elasticsearch",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -555,10 +540,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -645,10 +627,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "",
       "fill": 1,
       "fillGradient": 0,
@@ -770,10 +749,7 @@
         "noDataState": "no_data",
         "notifications": []
       },
-      "datasource": {
-        "type": "elasticsearch",
-        "uid": "PAE1B8C8635429669"
-      },
+      "datasource": "elasticsearch",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -882,10 +858,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -981,10 +954,7 @@
   "templating": {
     "list": [
       {
-        "datasource": {
-          "type": "elasticsearch",
-          "uid": "PAE1B8C8635429669"
-        },
+        "datasource": "elasticsearch",
         "filters": [],
         "hide": 0,
         "name": "Filters",
diff --git a/deployment/operations/grafana-dashboards/Signal_processing.json b/deployment/operations/grafana-dashboards/Signal_processing.json
index 3a4e8f9ae20..d02ef2c1fe2 100644
--- a/deployment/operations/grafana-dashboards/Signal_processing.json
+++ b/deployment/operations/grafana-dashboards/Signal_processing.json
@@ -3,10 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -42,10 +39,7 @@
       "type": "row"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -135,10 +129,7 @@
       },
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "exemplar": false,
           "expr": "sum(irate(enforcement_seconds_count{job=~\"$Application\",instance=~\"$Instance\",segment=\"overall\",outcome=~\"$Outcome\",channel!=\"live\"}[$__rate_interval])) by (resource, category, outcome)",
@@ -152,10 +143,7 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -248,10 +236,7 @@
       },
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "exemplar": false,
           "expr": "sum(irate(enforcement_seconds_count{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",segment=\"overall\",channel=\"live\"}[$__rate_interval])) by (resource, category, outcome)",
@@ -266,10 +251,7 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -341,10 +323,7 @@
       },
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "exemplar": false,
           "expr": "avg((idelta(enforcement_seconds_sum{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",segment=\"overall\",channel!=\"live\"}[$__rate_interval]) / idelta(enforcement_seconds_count{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",segment=\"overall\",channel!=\"live\"}[$__rate_interval])) > 0) by (resource, category, outcome)",
@@ -358,10 +337,7 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -433,10 +409,7 @@
       },
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "exemplar": false,
           "expr": "avg((idelta(enforcement_seconds_sum{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",segment=\"overall\",channel=\"live\"}[$__rate_interval]) / idelta(enforcement_seconds_count{job=~\"$Application\",instance=~\"$Instance\",segment=\"overall\",channel=\"live\"}[$__rate_interval])) > 0) by (resource, category, outcome)",
@@ -464,10 +437,7 @@
       "type": "row"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -539,10 +509,7 @@
       },
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "exemplar": false,
           "expr": "avg((idelta(pre_enforcement_seconds_sum{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",channel!=\"live\"}[$__rate_interval]) / idelta(pre_enforcement_seconds_count{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",channel!=\"live\"}[$__rate_interval])) > 0) by (resource, category, outcome)",
@@ -556,10 +523,7 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -631,10 +595,7 @@
       },
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "exemplar": false,
           "expr": "avg((idelta(pre_enforcement_seconds_sum{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",channel=\"live\"}[$__rate_interval]) / idelta(pre_enforcement_seconds_count{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",channel=\"live\"}[$__rate_interval])) > 0) by (resource, category, outcome)",
@@ -662,10 +623,7 @@
       "type": "row"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -737,10 +695,7 @@
       },
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "exemplar": false,
           "expr": "avg((idelta(enforcement_seconds_sum{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",segment=\"enf\",channel!=\"live\"}[$__rate_interval]) / idelta(enforcement_seconds_count{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",segment=\"enf\",channel!=\"live\"}[$__rate_interval])) > 0) by (resource, category, outcome)",
@@ -754,10 +709,7 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -829,10 +781,7 @@
       },
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "exemplar": false,
           "expr": "avg((idelta(enforcement_seconds_sum{job=~\"$Application\",instance=~\"$Instance\",segment=\"enf\",channel=\"live\"}[$__rate_interval]) / idelta(enforcement_seconds_count{job=~\"$Application\",instance=~\"$Instance\",segment=\"enf\",channel=\"live\"}[$__rate_interval])) > 0) by (resource, category, outcome)",
@@ -857,10 +806,7 @@
       "id": 17,
       "panels": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "description": "",
           "fieldConfig": {
             "defaults": {
@@ -971,10 +917,7 @@
           },
           "targets": [
             {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "P1809F7CD0C75ACF3"
-              },
+              "datasource": "prometheus",
               "editorMode": "code",
               "exemplar": false,
               "expr": "avg((idelta(enforcement_seconds_sum{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",segment=\"process\",channel!=\"live\"}[$__rate_interval]) / idelta(enforcement_seconds_count{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",segment=\"process\",channel!=\"live\"}[$__rate_interval])) > 0) by (resource, category, outcome)",
@@ -988,10 +931,7 @@
           "type": "timeseries"
         },
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "description": "",
           "fieldConfig": {
             "defaults": {
@@ -1063,10 +1003,7 @@
           },
           "targets": [
             {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "P1809F7CD0C75ACF3"
-              },
+              "datasource": "prometheus",
               "editorMode": "code",
               "exemplar": false,
               "expr": "avg((idelta(enforcement_seconds_sum{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",segment=\"process\",channel=\"live\"}[$__rate_interval]) / idelta(enforcement_seconds_count{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",segment=\"process\",channel=\"live\"}[$__rate_interval])) > 0) by (resource, category, outcome)",
@@ -1095,10 +1032,7 @@
       "id": 21,
       "panels": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "description": "",
           "fieldConfig": {
             "defaults": {
@@ -1170,10 +1104,7 @@
           },
           "targets": [
             {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "P1809F7CD0C75ACF3"
-              },
+              "datasource": "prometheus",
               "editorMode": "code",
               "exemplar": false,
               "expr": "avg((idelta(enforcement_seconds_sum{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",segment=\"resp_filter\",channel!=\"live\"}[$__rate_interval]) / idelta(enforcement_seconds_count{job=~\"$Application\",instance=~\"$Instance\",segment=\"resp_filter\",channel!=\"live\"}[$__rate_interval])) > 0) by (resource, category, outcome)",
@@ -1187,10 +1118,7 @@
           "type": "timeseries"
         },
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "description": "",
           "fieldConfig": {
             "defaults": {
@@ -1262,10 +1190,7 @@
           },
           "targets": [
             {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "P1809F7CD0C75ACF3"
-              },
+              "datasource": "prometheus",
               "editorMode": "code",
               "exemplar": false,
               "expr": "avg((idelta(enforcement_seconds_sum{job=~\"$Application\",instance=~\"$Instance\",outcome=~\"$Outcome\",segment=\"resp_filter\",channel=\"live\"}[$__rate_interval]) / idelta(enforcement_seconds_count{job=~\"$Application\",instance=~\"$Instance\",segment=\"resp_filter\",channel=\"live\"}[$__rate_interval])) > 0) by (resource, category, outcome)",
@@ -1297,10 +1222,7 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values(enforcement_seconds_count, job)",
         "hide": 0,
         "includeAll": true,
@@ -1324,10 +1246,7 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values(enforcement_seconds_count{job=\"$Application\"}, instance)",
         "hide": 0,
         "includeAll": true,
@@ -1351,10 +1270,7 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values(enforcement_seconds_count, outcome)",
         "hide": 0,
         "includeAll": true,
diff --git a/deployment/operations/grafana-dashboards/Sudo_command_count.json b/deployment/operations/grafana-dashboards/Sudo_command_count.json
index a25d5992242..587476ea225 100644
--- a/deployment/operations/grafana-dashboards/Sudo_command_count.json
+++ b/deployment/operations/grafana-dashboards/Sudo_command_count.json
@@ -3,10 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -29,10 +26,7 @@
   "liveNow": false,
   "panels": [
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -105,10 +99,7 @@
       },
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "expr": "sum(irate(sudo_commands_total{job=~\"$Application\",instance=~\"$Instance\"}[5m])) by (type)",
           "legendFormat": "{{type}}",
@@ -120,10 +111,7 @@
       "type": "timeseries"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -189,10 +177,7 @@
       "pluginVersion": "8.5.6",
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "exemplar": false,
           "expr": "sum(sudo_commands_total{job=~\"$Application\",instance=~\"$Instance\"}) by (type)",
@@ -241,10 +226,7 @@
       "type": "table"
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -290,10 +272,7 @@
       },
       "targets": [
         {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "P1809F7CD0C75ACF3"
-          },
+          "datasource": "prometheus",
           "editorMode": "code",
           "exemplar": false,
           "expr": "sum(sudo_commands_total{job=~\"$Application\",instance=~\"$Instance\"}) by (type)",
@@ -334,10 +313,7 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values(sudo_commands_total, job)",
         "hide": 0,
         "includeAll": true,
@@ -361,10 +337,7 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "label_values(sudo_commands_total, instance)",
         "hide": 0,
         "includeAll": true,
diff --git a/deployment/operations/grafana-dashboards/Things-Wildcard-Search_Performance_Metrics.json b/deployment/operations/grafana-dashboards/Things-Wildcard-Search_Performance_Metrics.json
index 29353fd8d7a..6637c5084a0 100644
--- a/deployment/operations/grafana-dashboards/Things-Wildcard-Search_Performance_Metrics.json
+++ b/deployment/operations/grafana-dashboards/Things-Wildcard-Search_Performance_Metrics.json
@@ -3,10 +3,7 @@
     "list": [
       {
         "builtIn": 1,
-        "datasource": {
-          "type": "datasource",
-          "uid": "grafana"
-        },
+        "datasource": "grafana",
         "enable": true,
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
@@ -35,10 +32,7 @@
       "cacheTimeout": "0",
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "Positive Y axis: stacked search queries\nNegative Y axis: stacked search counts",
       "editable": true,
       "error": false,
@@ -143,10 +137,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -242,10 +233,7 @@
       "cacheTimeout": "0",
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "editable": true,
       "error": false,
       "fieldConfig": {
@@ -343,10 +331,7 @@
       "cacheTimeout": "0",
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "description": "Percentiles are capped to max. 10s",
       "editable": true,
       "error": false,
@@ -475,10 +460,7 @@
       "bars": true,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": []
@@ -568,10 +550,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": []
@@ -675,10 +654,7 @@
       "bars": true,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -764,10 +740,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": []
@@ -857,10 +830,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": []
@@ -990,10 +960,7 @@
       }
     },
     {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1087,10 +1054,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": []
@@ -1180,10 +1144,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": []
@@ -1273,10 +1234,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": {
-        "type": "prometheus",
-        "uid": "P1809F7CD0C75ACF3"
-      },
+      "datasource": "prometheus",
       "fieldConfig": {
         "defaults": {
           "links": []
@@ -1383,10 +1341,7 @@
           "text": "All",
           "value": "$__all"
         },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "P1809F7CD0C75ACF3"
-        },
+        "datasource": "prometheus",
         "definition": "",
         "hide": 0,
         "includeAll": true,
diff --git a/pom.xml b/pom.xml
index 03e36f5c9cb..b8c9190c220 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,9 +233,9 @@
         <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
         <timestamp>${maven.build.timestamp}</timestamp>
 
-        <release.scm.connection>scm:git:git@github.com:eclipse/ditto.git</release.scm.connection>
-        <release.scm.developerConnection>scm:git:https://github.com/eclipse/ditto.git</release.scm.developerConnection>
-        <release.scm.url>https://github.com/eclipse/ditto.git</release.scm.url>
+        <release.scm.connection>scm:git:git@github.com:eclipse-ditto/ditto.git</release.scm.connection>
+        <release.scm.developerConnection>scm:git:https://github.com/eclipse-ditto/ditto.git</release.scm.developerConnection>
+        <release.scm.url>https://github.com/eclipse-ditto/ditto.git</release.scm.url>
 
         <argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
 

From d8f97cdba746fb4dc9f33e785a3f83345c66be0f Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Wed, 25 Jan 2023 17:22:05 +0100
Subject: [PATCH 023/173] added example prometheus.yml config for a Ditto
 deployment

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../operations/prometheus/prometheus.yml      | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 deployment/operations/prometheus/prometheus.yml

diff --git a/deployment/operations/prometheus/prometheus.yml b/deployment/operations/prometheus/prometheus.yml
new file mode 100644
index 00000000000..a5a50a5676f
--- /dev/null
+++ b/deployment/operations/prometheus/prometheus.yml
@@ -0,0 +1,42 @@
+global:
+  scrape_interval:     30s
+  scrape_timeout:      10s
+  evaluation_interval: 30s
+
+scrape_configs:
+  # Scrape prometheus itself.
+  - job_name: 'prometheus'
+    static_configs:
+      - targets: ['localhost:9090']
+
+  # Scrape grafana.
+  - job_name: 'grafana'
+    static_configs:
+      - targets: ['grafana:3000']
+
+  # Scrape Ditto.
+  - job_name: 'ditto'
+    kubernetes_sd_configs:
+    - role: pod
+
+    relabel_configs:
+    - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
+      action: keep
+      regex: true
+    - source_labels: [ __meta_kubernetes_pod_annotation_prometheus_io_path ]
+      action: replace
+      target_label: __metrics_path__
+      regex: (.+)
+    - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
+      action: replace
+      regex: ([^:]+)(?::\d+)?;(\d+)
+      replacement: ${1}:${2}
+      target_label: __address__
+    - action: labelmap
+      regex: __meta_kubernetes_pod_label_(.+)
+    - source_labels: [__meta_kubernetes_pod_name]
+      action: replace
+      target_label: instance
+    - source_labels: [__meta_kubernetes_pod_container_name]
+      action: replace
+      target_label: job

From 987f94ecde1745b767218d65a838db60baba0fc0 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Thu, 26 Jan 2023 14:44:13 +0100
Subject: [PATCH 024/173] added 30 minutes overview of Eclipse Ditto slides

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../resources/pages/ditto/presentations.md    |   7 +
 .../slides/2023_01_ditto-in-30-min/index.html | 581 ++++++++++++++++++
 2 files changed, 588 insertions(+)
 create mode 100644 documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html

diff --git a/documentation/src/main/resources/pages/ditto/presentations.md b/documentation/src/main/resources/pages/ditto/presentations.md
index 1b1b4ec6fb2..7d6b106c737 100644
--- a/documentation/src/main/resources/pages/ditto/presentations.md
+++ b/documentation/src/main/resources/pages/ditto/presentations.md
@@ -7,6 +7,13 @@ topnav: topnav
 
 This page contains a collection of presentations, videos and workshops about Eclipse Ditto, sorted from most recent ones downwards.
 
+## 26.01.2023 Eclipse Ditto in 30 minutes
+
+Topic: Short 30 minutes overview of Eclipse Ditto
+
+The slides can be found here: [2023_01_ditto-in-30-min](slides/2023_01_ditto-in-30-min/index.html).
+
+
 ## 24.10.2022 EclipseCon Europe 2022 Community Day
 
 Topic: Project status update of Eclipse Ditto
diff --git a/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html b/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html
new file mode 100644
index 00000000000..825e4784080
--- /dev/null
+++ b/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html
@@ -0,0 +1,581 @@
+<!--
+  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
+  ~
+  ~ See the NOTICE file(s) distributed with this work for additional
+  ~ information regarding copyright ownership.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License 2.0 which is available at
+  ~ http://www.eclipse.org/legal/epl-2.0
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
+<!doctype html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+
+  <title>Eclipse Ditto™: An introduction</title>
+
+  <meta name="description" content="Eclipse Ditto intro">
+  <meta name="author" content="Thomas Jäckle">
+  <meta name="date" content="2023-01-26">
+  <meta http-equiv="content-language" content="en">
+
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+
+  <link rel="icon" type="image/png" href="../../images/favicon-16x16.png" sizes="16x16">
+  <link rel="icon" type="image/png" href="../../images/favicon-32x32.png" sizes="32x32">
+  <link rel="icon" type="image/png" href="../../images/favicon-96x96.png" sizes="96x96">
+
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=News+Cycle">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css">
+
+
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/4.3.1/reveal.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/4.3.1/theme/simple.min.css"
+        id="theme">
+
+  <!-- Theme used for syntax highlighting of code -->
+<!--  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/4.3.1/plugin/highlight/zenburn.min.css">-->
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/4.3.1/plugin/highlight/monokai.min.css">
+
+  <style>
+    @font-face {
+      font-family: "News Cycle";
+    }
+
+    #header-left {
+      position: absolute;
+      top: 0;
+      left: 0;
+      opacity: 1 !important;
+    }
+    #header-left img {
+        width: 80px;
+        padding-top: 0;
+        padding-left: 20px
+    }
+
+    #header-right {
+      position: absolute;
+      top: 0;
+      right: 0;
+      opacity: 1 !important;
+    }
+    #header-right img {
+        width: 120px;
+        padding-top: 0;
+        padding-right: 20px
+    }
+
+    .reveal section img {
+      background: none;
+      border: none;
+      box-shadow: none;
+    }
+
+    .dim-background .slide-background {
+      opacity: 0.3 !important;
+    }
+
+    .chapter-background .slide-background .slide-background-content {
+      opacity: 0.4 !important;
+    }
+
+    .pdf-page .reveal .slide-background .slide-background-content {
+      opacity: 0.7 !important;
+    }
+
+    .pdf-page #header-left img {
+        width: 50%;
+        padding-left: 0;
+    }
+    .pdf-page #header-right img {
+        width: 50%;
+        padding-right: 0;
+    }
+    .pdf-page .dim-background .slide-background {
+        background: none !important;
+    }
+    .pdf-page .slide-background .slide-background-content {
+        background: none !important;
+    }
+
+    .dim-background .slide-background.past {
+      display: none !important;
+    }
+
+    .dim-background .slide-background.future {
+      display: none !important;
+    }
+
+    .chapter-background .slide-background.past {
+      display: none !important;
+    }
+
+    .chapter-background .slide-background.future {
+      display: none !important;
+    }
+
+    /*.new-chapter h3 { color: #586e75; }*/
+    .introlink a:link {
+      font-weight: bold;
+      color: #000000
+    }
+
+    /* unvisited links */
+    .introlink a:visited {
+      font-weight: bold;
+      color: #000000
+    }
+
+    /* visited links   */
+    .introlink a:hover {
+      font-weight: bold;
+      color: #000000
+    }
+
+    /* user hovers     */
+    .introlink a:active {
+      font-weight: bold;
+      color: #000000
+    }
+
+    ul {
+      list-style: none !important;
+    }
+
+    ul li {
+      padding-left: 1.3em;
+    }
+
+    ul li:before {
+      list-style: none;
+      content: "→";
+      display: inline-block;
+      margin-left: -1.3em; /* same as padding-left set on li */
+      width: 1.3em; /* same as padding-left set on li */
+    }
+
+    .footer {
+      font-size: 12px !Important;
+      font-family: "News Cycle", Impact, sans-serif;
+      color: #687175;
+      position: absolute;
+      bottom: 15px;
+      left: 15px;
+      margin-bottom: 10px
+    }
+
+    .footer a {
+      color: #003b6a;
+      text-decoration: none;
+    }
+
+    /* active links    */
+  </style>
+
+</head>
+
+<body>
+
+<div class="reveal">
+
+    <!-- 2. Create hidden header/footer <div> -->
+    <div id="hidden" style="display:none;">
+        <div id="header">
+            <div id="header-left"><img src="../../images/ditto.svg" alt="Ditto logo"></div>
+            <div id="header-right"><img src="../../images/iot_logo.svg" alt="Eclipse IoT logo"></div>
+        </div>
+    </div>
+
+    <!-- Any section element inside of this container is displayed as a slide -->
+    <div class="slides">
+        <!-- Section: Intro -->
+        <section>
+            <section id="title" class="new-chapter" data-background="../bg-images/background-twin-small.jpg" data-state="chapter-background">
+                <!-- background source: https://unsplash.com/collections/425779/iot -->
+              <h1 style="line-height: 1em">
+                <img src="../../images/iot_logo.svg" style="width: 15%;vertical-align: top; padding-right: 20px" alt="Eclipse IoT">
+                <img src="../../images/ditto.svg" style="width: 15%;vertical-align: middle" alt="Eclipse Ditto">
+              </h1>
+              <h1 style="margin-top: 0.6em; font-size: 2em;">Eclipse Ditto™<br/>-<br/>an introduction</h1>
+              <h2 style="margin-top: 1.5em; font-size: 0.8em">01/2023</h2>
+            </section>
+        </section>
+
+        <!-- Section: Digital Twins -->
+        <section style="clear: both;">
+            <section id="twin" class="new-chapter" data-background="../bg-images/juan-davila-P8PlK2nGwqA-unsplash.jpg"
+                     data-state="chapter-background">
+                <!-- background source: https://unsplash.com/photos/P8PlK2nGwqA -->
+                <h1>Digital Twins</h1>
+                <br/>
+                <ul>
+                    <li>digital representation of physical devices</li>
+                    <li style="margin-top: 1em;">twin as broker for communicating with assets</li>
+                    <li style="margin-top: 1em;">applicable for both industrial and consumer-centric IoT scenarios</li>
+                </ul>
+            </section>
+            <section id="twin-1" style="clear: both;">
+                <h2>Twins in scope of Ditto</h2>
+              <br/>
+                <ul>
+                  <li class="fragment">a pattern for working with <b>things</b> in the IoT</li>
+                  <li class="fragment" style="margin-top: 0.8em;">provide state <b>persistence</b> and <b>search</b> capabilities</li>
+                  <li class="fragment" style="margin-top: 0.8em;">access twins always in an <b>authorized</b> way</li>
+                  <li class="fragment" style="margin-top: 0.8em;">provide APIs - <b>Device as a Service</b></li>
+                  <li class="fragment" style="margin-top: 0.8em;">optionally <b>normalize</b> device payloads</li>
+                </ul>
+            </section>
+        </section>
+
+        <!-- Section: Ditto -->
+        <section style="clear: both;">
+            <section id="ditto-1" style="clear: both;">
+                <h2>Eclipse Ditto in context</h2>
+              <div style="text-align: left; float: left; width: 65%">
+                <img src="../images/ditto-in-action-2020.png" style="width: 90%;padding-top:0.5em" alt="Ditto in action"/>
+              </div>
+              <div style="text-align: left; float: right; width: 35%">
+                <p style="padding-top:3.5em">Ditto as <br/>Digital Twin<br/> "middleware"</p>
+              </div>
+            </section>
+            <section id="ditto-2" style="clear: both;">
+                <h2>turn device data into APIs</h2>
+                <div style="text-align: left; float: left; width: 35%">
+                <pre style="width: 100%; font-size: 0.45em;"><code class="hljs json">{
+  "thingId": "io.foo:car1",
+  "policyId": "io.foo:car1",
+  "attributes": {
+    "manufacturer": "Foo",
+    "data": {
+      "serialNo": 4711
+    }
+  },
+  "features": {
+    "temp": {
+      "properties": {
+        "value": 23.42
+      }
+    }
+  }
+}</code></pre>
+                  <p style="text-align: center">JSON repr. of a Thing</p>
+                </div>
+                <div style="text-align: left; float: right; width: 64%" class="fragment">
+                    <pre style="width: 105%; font-size: 0.45em;"><code class="hljs json">GET/PUT/DELETE /api/2/things/io.foo:car1
+ /api/2/things/io.foo:car1/thingId
+ /api/2/things/io.foo:car1/policyId
+ /api/2/things/io.foo:car1/attributes
+ /api/2/things/io.foo:car1/attributes/manufacturer
+ /api/2/things/io.foo:car1/attributes/data
+ /api/2/things/io.foo:car1/attributes/data/serialNo
+
+
+ /api/2/things/io.foo:car1/features
+ /api/2/things/io.foo:car1/features/temp
+ /api/2/things/io.foo:car1/features/temp/properties
+ /api/2/things/io.foo:car1/features/temp/properties/value
+
+
+
+
+</code></pre>
+                  <p style="text-align: center">HTTP API of the Thing</p>
+                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
+                </div>
+            </section>
+          <section id="ditto-3" style="clear: both;">
+            <h2>modeling thing capabilities</h2>
+            <div style="text-align: left; float: left; width: 40%">
+              <ul style="margin-left: 0.0em; margin-right: 0.3em">
+                <li style="margin-top: 0.8em; font-size: 0.8em">by default, thing attributes and feature properties are "schemaless"</li>
+                <li class="fragment" data-fragment-index="1" style="margin-top: 0.8em; font-size: 0.8em">a thing may be aware of one "definition"
+                </li>
+                <li class="fragment" data-fragment-index="2" style="margin-top: 0.8em; font-size: 0.8em">a feature may be aware of several "definitions"</li>
+              </ul>
+            </div>
+            <div style="text-align: left; float: right; width: 60%" class="fragment" data-fragment-index="3">
+                    <pre style="width: 105%; font-size: 0.40em;"><code class="hljs json" data-line-numbers="|4|11-15" style="max-height: inherit">{
+  "thingId": "io.foo:lamp-1",
+  "policyId": "io.foo:lamp-1",
+  "definition": "https://some.domain/floor-lamp-1.0.0.tm.jsonld",
+  "attributes": {
+    "Manufacturer": "Foo corp",
+    "serialNo": "4711"
+  },
+  "features": {
+    "Spot1": {
+      "definition": [
+        "https://some.domain/dimmable-colored-lamp-1.0.0.tm.jsonld",
+        "https://some.domain/colored-lamp-1.0.0.tm.jsonld",
+        "https://some.domain/switchable-1.0.0.tm.jsonld"
+      ],
+      "properties": {
+        "on": true,
+        "color": {...
+        }
+      }
+    }
+  }
+}</code></pre>
+              <a href="https://www.eclipse.org/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
+            </div>
+          </section>
+          <section id="ditto-3b" style="clear: both;">
+            <h2>modeling thing capabilities</h2>
+            <img src="../images/wot.png" alt="W3C Web of Things logo" style="width: 10%"/>
+            <ul style="margin-left: 0.0em; margin-right: 0.3em">
+              <li style="margin-top: 0.8em; font-size: 0.8em">integration of W3C Web of Things (WoT) standard</li>
+              <li class="fragment" data-fragment-index="1" style="margin-top: 0.8em; font-size: 0.8em">
+                <b>reference</b> in "definition" <b>to WoT TMs</b> (Thing Models)
+              </li>
+              <li class="fragment" data-fragment-index="2" style="margin-top: 0.8em; font-size: 0.8em">
+                let Ditto <b>automatically generate WoT TDs</b> (Thing Descriptions) containing API endpoints and data formats +
+                semantic annotations
+              </li>
+            </ul>
+          </section>
+            <section id="ditto-4" style="clear: both;">
+                <h2>persistence of device state</h2>
+              <div style="text-align: left; float: left; width: 48%">
+                <ul>
+                  <li>devices are not always connected to the net</li>
+                  <li class="fragment" data-fragment-index="1" style="margin-top: 1em;">applications always need to be able to access their data</li>
+                  <li class="fragment" data-fragment-index="2" style="margin-top: 1em;"><b>twin</b> vs. <b>live</b> access on API level</li>
+                </ul>
+              </div>
+              <div class="fragment" data-fragment-index="2" style="text-align: left; float: right; width: 50%">
+                <img src="../../images/pages/protocol/ditto-twin-channel.png" style="width: 110%" alt="Ditto twin channel">
+                <img src="../../images/pages/protocol/ditto-live-channel.png" style="width: 80%;padding-left: 1em" alt="Ditto live channel">
+              </div>
+            </section>
+          <section id="ditto-5" style="clear: both">
+            <h2>authorization</h2>
+            <br/>
+            <div style="text-align: left; float: left; width: 58%">
+              <br/>
+              <ul>
+                <li>Ditto contains a built-in authorization mechanism (<b>Policies</b>)</li>
+                <li class="fragment" style="margin-top: 1em;">every API call is authorized</li>
+              </ul>
+            </div>
+            <div style="text-align: left; float: right; width: 40%">
+              <pre style="width: 110%; font-size: 0.3em;"><code class="hljs">{
+    "policyId": "io.foo:car1-policy",
+    "entries": {
+      "owner": {
+        "subjects": {
+          "oidc:userid": {
+            "type": "OpenID connect extracted userid"
+          },
+          "oidc:/claim": {
+            "type": "OpenID connect extracted claim"
+          }
+        },
+        "resources": {
+          "thing:/": {
+            "grant": ["READ","WRITE"],
+            "revoke": []
+          },
+          "thing:/features/firmware": {
+            "grant": [],
+            "revoke": ["WRITE"]
+          },
+          "policy:/": {
+            "grant": ["READ","WRITE"],
+            "revoke": []
+          }
+        }
+      }
+    }
+  }</code></pre>
+              <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
+            </div>
+          </section>
+          <section id="ditto-6" style="clear: both;">
+            <h2>search</h2>
+            <br/>
+            <div style="text-align: left; float: left; width: 30%">
+              <img src="../images/meme-dino.jpg" style="width: 80%;" alt="Meme Dino" />
+              <ul style="font-size: 0.6em; margin-left: 0">
+                <li>you must not</li>
+                <li>Ditto has you covered</li>
+              </ul>
+            </div>
+            <div style="text-align: left; float: right; width: 70%" class="fragment" data-fragment-index="1">
+                    <pre style="width: 100%; font-size: 0.4em;"><code class="hljs bash">GET /api/2/search/things
+  ?filter=like(attributes/manufacturer,"Foo*")</code></pre>
+              <pre style="width: 100%; font-size: 0.4em;" class="fragment" data-fragment-index="2"><code class="hljs bash">GET /api/2/search/things
+  ?filter=and(
+    eq(features/*/definition,"https://some.domain/switchable-1.0.0.tm.jsonld"),
+    like(attributes/manufacturer,"Foo*"),
+    not(gt(attributes/counter,42))
+  )
+  &fields=thingId,attributes/manufacturer,features/*/properties/on</code></pre>
+            </div>
+            <div class="fragment" data-fragment-index="2">
+              <ul style="font-size: 0.65em">
+                <li>search for arbitrary data with RQL query</li>
+                <li>Ditto again ensures authorization</li>
+                <li>apply field projection over the results</li>
+                <li>don't worry about indexing</li>
+              </ul>
+              <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
+            </div>
+          </section>
+          <section id="ditto-7" style="clear: both;">
+            <h2>get notified about changes</h2>
+            <br/>
+            <ul>
+              <li>notification via various channels: WebSocket, SSE, MQTT (3.1.1 | 5), AMQP (0.9.1 | 1.0), Apache Kafka, HTTP hook</li>
+              <li class="fragment" data-fragment-index="1" style="margin-top: 1em;">server side filtering via RQL (same as in search)</li>
+            </ul>
+            <div class="fragment" data-fragment-index="1">
+              <a href="https://www.eclipse.org/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
+            </div>
+          </section>
+          <section id="ditto-8" style="clear: both;">
+            <h2>payload normalization</h2>
+            <br/>
+            <div style="text-align: left; float: left; width: 70%">
+              <ul>
+                <li>devices send data in various formats</li>
+                <li class="fragment" style="margin-top: 0.8em;">Ditto provides structured APIs of <b>things</b> (attributes, features)</li>
+                <li class="fragment" style="margin-top: 0.8em;">devices don't need to be aware of Ditto</li>
+              </ul>
+            </div>
+            <div class="fragment">
+              <div style="text-align: left; float: right; width: 30%">
+                <img src="../images/Javascript_badge.svg" style="width: 100%; padding-top: 1em" alt="JavaScript logo">
+                <!-- img source: https://commons.wikimedia.org/wiki/File:Javascript_badge.svg -->
+              </div>
+              <ul style="clear: both; width: 100%">
+                <li style="margin-top: 1em;">incoming and outgoing data can be transformed</li>
+              </ul>
+            </div>
+          </section>
+          <section id="ditto-9" style="clear: both;">
+            <h2>nonfunctional</h2>
+            <br/>
+            <div style="text-align: left; float: left; width: 40%">
+              <img src="../../images/pages/architecture/ditto-architecture-overview-2022.png" alt="Ditto context overview" />
+            </div>
+            <div style="text-align: left; float: right; width: 60%">
+              <ul style="font-size: 0.8em">
+                <li >modular architecture of Ditto services</li>
+                <li style="margin-top: 0.8em;">horizontal scalability of each Ditto service</li>
+                <li style="margin-top: 0.8em;">runtime dependency to MongoDB</li>
+                <li style="margin-top: 0.8em;">included monitoring (JVM metrics, roundtrips, MongoDB)</li>
+                <li style="margin-top: 0.8em;">codebase written in: Java</li>
+              </ul>
+            </div>
+          </section>
+        </section>
+
+        <!-- Section: Demo -->
+        <section id="demo" style="clear: both;" class="new-chapter" data-background="../bg-images/background-demo-small.jpg" data-state="chapter-background">
+            <h2>Demo</h2>
+            <a href="https://eclipse-ditto.github.io/ditto/?primaryEnvironmentName=ditto_sandbox">
+              <img src="../images/ditto-ui-screenshot.png" alt="Ditto UI Screenshot" style="width: 80%"/>
+            </a>
+        </section>
+
+        <!-- Section: Questions and Answers -->
+        <section style="clear: both;">
+            <section id="q-a" class="new-chapter" data-background="../bg-images/background-conclusion-small.jpg"
+                     data-state="chapter-background">
+                <br/>
+              <h2>Links</h2>
+              <br/>
+              <ul>
+                <li><a target="_blank" href="https://www.eclipse.org/ditto/2022-03-03-wot-integration.html">Ditto Blogpost about WoT integration</a></li>
+                <li><a target="_blank" href="https://www.eclipse.org/ditto/basic-wot-integration.html">Ditto docs about WoT integration</a></li>
+                <li><a target="_blank" href="https://github.com/eclipse/ditto">GitHub</a> - please give us a star ;)</li>
+                <li><a target="_blank" href="https://gitter.im/eclipse/ditto">Chatroom to ask more questions</a></li>
+              </ul>
+            </section>
+        </section>
+    </div>
+
+</div>
+
+<div class="footer">
+    Copyright ©2023
+    <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
+    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+    <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
+</div>
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/4.3.1/reveal.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/4.3.1/plugin/markdown/markdown.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/4.3.1/plugin/notes/notes.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/4.3.1/plugin/highlight/highlight.min.js"></script>
+
+<script>
+  function getParameterByName(name, url) {
+    if (!url) {
+      url = window.location.href;
+    }
+    name = name.replace(/[\[\]]/g, "\\$&");
+    var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+      results = regex.exec(url);
+    if (!results) {
+      return null;
+    }
+    if (!results[2]) {
+      return '';
+    }
+    return decodeURIComponent(results[2].replace(/\+/g, " "));
+  }
+
+  // More info https://github.com/hakimel/reveal.js#configuration
+  Reveal.initialize({
+                      controls: true,
+                      progress: true,
+                      history: true,
+                      center: true,
+                      fragments: getParameterByName('fragments') === '', // only use "fragments" feature if queryParam 'fragments' is present
+                      slideNumber: 'h.v',
+                      // slideNumber: false, /* for printing */
+
+                      transition: 'convex', // none/fade/cube/slide/convex/concave/zoom
+
+                      // IMPORTANT: The order matters!
+                      // So, RevealHightlight must be the LAST to load
+                      plugins: [RevealMarkdown, RevealNotes, RevealHighlight],
+                      keyboard: { // for hama remote presenter:
+                      //  38: 'next',
+                      //  40: 'prev'
+                      }
+                    });
+
+  /* for printing */
+  Reveal.configure({ pdfSeparateFragments: false });
+
+
+</script>
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
+<script type="text/javascript">
+  // 3. On Reveal.js ready event, copy header/footer <div> into each `.slide-background` <div>
+  var header = $('#header').html();
+  if (window.location.search.match(/print-pdf/gi)) {
+    Reveal.addEventListener('ready', function (event) {
+      $('.slide-background').append(header);
+    });
+  }
+  else {
+    $('div.reveal').append(header);
+  }
+</script>
+
+</body>
+</html>

From 3f846a5b3df1d4a51452f982ad766a51c0722ef6 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Fri, 27 Jan 2023 09:05:05 +0100
Subject: [PATCH 025/173] improved documentation on token handling with e.g.
 "oauth2-proxy"

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../main/resources/pages/ditto/installation-operating.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/documentation/src/main/resources/pages/ditto/installation-operating.md b/documentation/src/main/resources/pages/ditto/installation-operating.md
index 9634b5aea47..aa90da3fbaf 100644
--- a/documentation/src/main/resources/pages/ditto/installation-operating.md
+++ b/documentation/src/main/resources/pages/ditto/installation-operating.md
@@ -157,9 +157,12 @@ The configured subject-issuer will be used to prefix the value of each individua
 As of the OAuth2.0 and OpenID Connect standards Ditto expects the headers `Authorization: Bearer <JWT>` and
 `Content-Type: application/json`, containing the issued token of the provider.
 
-**The token has to be issued beforehand. The required logic is not provided by Ditto.** When using
-the OIDC provider [keycloak](https://www.keycloak.org/), a project like [keycloak-gatekeeper](https://github.com/keycloak/keycloak-gatekeeper)
-may be put in front of Ditto to handle the token-logic.
+**The token has to be issued beforehand. The required logic is not provided by Ditto.** 
+
+This can e.g. be done by an OIDC provider like [Keycloak](https://www.keycloak.org/).  
+A project like [oauth2-proxy](https://github.com/oauth2-proxy/oauth2-proxy)
+may be put in front of Ditto to handle the token-logic like e.g. loading/saving the token from/to a Cookie and passing
+it to Ditto as `Authorization` header.
 
 **If the chosen OIDC provider uses a self-signed certificate**, the certificate has to be retrieved and configured for 
 the akka-http ssl configuration.

From bedaaee80d093b1b577a84bce4511ce9bb096a17 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Fri, 27 Jan 2023 16:51:49 +0100
Subject: [PATCH 026/173] enhanced Connections with their "_revision",
 "_created" and "_modified" information * and made those queryable with
 "fields" selector same as for things+policies * made connection a full
 "Entity"

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 connectivity/model/pom.xml                    |   2 +-
 .../model/AbstractConnection.java             |  79 ++++++++++-
 .../model/AbstractConnectionBuilder.java      |  22 +++
 .../ditto/connectivity/model/Connection.java  |  38 ++++--
 .../connectivity/model/ConnectionBuilder.java |  39 ++++++
 .../model/ConnectionRevision.java             |  32 +++++
 .../model/ConnectivityModelFactory.java       |  11 ++
 .../model/ImmutableConnectionRevision.java    | 101 ++++++++++++++
 .../signals/commands/ConnectivityCommand.java |  24 +++-
 ...ConnectionPreconditionFailedException.java | 126 ++++++++++++++++++
 ...ctionPreconditionNotModifiedException.java | 125 +++++++++++++++++
 .../commands/query/RetrieveConnection.java    |  72 ++++++++--
 .../commands/query/RetrieveConnections.java   |  55 +++++++-
 .../query/RetrieveResolvedHonoConnection.java |  58 +++++++-
 .../query/RetrieveConnectionTest.java         |   3 +-
 .../query/RetrieveConnectionsTest.java        |   5 +-
 .../RetrieveResolvedHonoConnectionTest.java   |   3 +-
 .../pre/ConnectionExistenceChecker.java       |  74 ++++++++++
 .../ModifyToCreateConnectionTransformer.java  |  62 +++++++++
 ...PreEnforcementConnectionIdCacheLoader.java |  79 +++++++++++
 .../service/enforcement/pre/package-info.java |  14 ++
 .../persistence/stages/StagedCommand.java     |  17 ++-
 .../AbstractConnectivityCommandStrategy.java  |  15 ++-
 .../commands/CloseConnectionStrategy.java     |  21 ++-
 .../commands/ConnectionConflictStrategy.java  |  18 ++-
 .../ConnectionUninitializedStrategies.java    |  85 ------------
 ...nsConditionalHeadersValidatorProvider.java |  83 ++++++++++++
 .../commands/CreateConnectionStrategy.java    |  44 +++++-
 .../commands/DeleteConnectionStrategy.java    |  22 ++-
 .../EnableConnectionLogsStrategy.java         |  22 ++-
 .../commands/LoggingExpiredStrategy.java      |  21 ++-
 .../commands/ModifyConnectionStrategy.java    |  29 +++-
 .../commands/OpenConnectionStrategy.java      |  20 ++-
 .../commands/ResetConnectionLogsStrategy.java |  20 ++-
 .../ResetConnectionMetricsStrategy.java       |  23 +++-
 .../RetrieveConnectionLogsStrategy.java       |  22 ++-
 .../RetrieveConnectionMetricsStrategy.java    |  22 ++-
 .../RetrieveConnectionStatusStrategy.java     |  22 ++-
 .../commands/RetrieveConnectionStrategy.java  |  48 ++++++-
 ...etrieveResolvedHonoConnectionStrategy.java |  47 ++++++-
 .../commands/StagedCommandStrategy.java       |  15 ++-
 .../SudoAddConnectionLogEntryStrategy.java    |  15 +++
 .../SudoRetrieveConnectionTagsStrategy.java   |  15 +++
 .../TestConnectionConflictStrategy.java       |  18 ++-
 .../commands/TestConnectionStrategy.java      |  35 ++++-
 .../events/ConnectionClosedStrategy.java      |   4 +-
 .../events/ConnectionCreatedStrategy.java     |   4 +-
 .../events/ConnectionDeletedStrategy.java     |   8 +-
 .../events/ConnectionModifiedStrategy.java    |   4 +-
 .../events/ConnectionOpenedStrategy.java      |   9 +-
 .../resources/connectivity-extension.conf     |   5 +
 .../messaging/ErrorHandlingActorTest.java     |  26 +++-
 .../ConnectionPersistenceActorTest.java       | 101 ++++++++------
 .../main/resources/jsonschema/connection.json |  14 ++
 .../src/main/resources/jsonschema/policy.json |  76 +++++++----
 .../main/resources/jsonschema/thing_v2.json   |  22 +--
 .../main/resources/openapi/ditto-api-2.yml    |  83 +++++++++---
 .../resources/openapi/sources/api-2-index.yml |   6 +-
 .../parameters/connectionFieldsQueryParam.yml |  54 ++++++++
 .../sources/paths/connections/command.yml     |   2 +-
 .../paths/connections/connectionId.yml        |   7 +-
 .../sources/paths/connections/connections.yml |   5 +-
 .../sources/paths/connections/logs.yml        |   2 +-
 .../sources/paths/connections/metrics.yml     |   2 +-
 .../sources/paths/connections/status.yml      |   2 +-
 .../AbstractConnectionsRetrievalActor.java    |  14 +-
 .../connections/ConnectionsParameter.java     |   8 +-
 .../routes/connections/ConnectionsRoute.java  |  36 +++--
 .../commands/query/RetrievePolicy.java        |   2 +-
 things/service/src/main/resources/things.conf |   2 +-
 70 files changed, 1885 insertions(+), 336 deletions(-)
 create mode 100755 connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ConnectionRevision.java
 create mode 100755 connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableConnectionRevision.java
 create mode 100644 connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionPreconditionFailedException.java
 create mode 100644 connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionPreconditionNotModifiedException.java
 create mode 100644 connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/ConnectionExistenceChecker.java
 create mode 100644 connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/ModifyToCreateConnectionTransformer.java
 create mode 100644 connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/PreEnforcementConnectionIdCacheLoader.java
 create mode 100644 connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/package-info.java
 delete mode 100644 connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionUninitializedStrategies.java
 create mode 100644 connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionsConditionalHeadersValidatorProvider.java
 create mode 100644 documentation/src/main/resources/openapi/sources/parameters/connectionFieldsQueryParam.yml

diff --git a/connectivity/model/pom.xml b/connectivity/model/pom.xml
index 9ac624708b7..01801773765 100644
--- a/connectivity/model/pom.xml
+++ b/connectivity/model/pom.xml
@@ -124,7 +124,7 @@
                     <parameter>
                         <excludes>
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
-                            <!--<exclude></exclude>-->
+                            <exclude>org.eclipse.ditto.connectivity.model.Connection#toJson(org.eclipse.ditto.base.model.json.JsonSchemaVersion,org.eclipse.ditto.json.JsonFieldSelector)</exclude>
                         </excludes>
                     </parameter>
                 </configuration>
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/AbstractConnection.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/AbstractConnection.java
index eea09317d52..5a7a284bbfe 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/AbstractConnection.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/AbstractConnection.java
@@ -15,6 +15,8 @@
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
 import java.text.MessageFormat;
+import java.time.Instant;
+import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -31,6 +33,8 @@
 
 import javax.annotation.Nullable;
 
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.json.JsonArray;
 import org.eclipse.ditto.json.JsonCollectors;
@@ -56,6 +60,9 @@ abstract class AbstractConnection implements Connection {
     @Nullable private final Credentials credentials;
     @Nullable private final String trustedCertificates;
     @Nullable private final ConnectionLifecycle lifecycle;
+    @Nullable private final ConnectionRevision revision;
+    @Nullable private final Instant modified;
+    @Nullable private final Instant created;
     private final List<Source> sources;
     private final List<Target> targets;
     private final int clientCount;
@@ -85,12 +92,15 @@ abstract class AbstractConnection implements Connection {
         payloadMappingDefinition = builder.payloadMappingDefinition;
         tags = Collections.unmodifiableSet(new LinkedHashSet<>(builder.tags));
         lifecycle = builder.lifecycle;
+        revision = builder.revision;
+        modified = builder.modified;
+        created = builder.created;
         sshTunnel = builder.sshTunnel;
     }
 
     abstract ConnectionUri getConnectionUri(@Nullable String builderConnectionUri);
 
-    static void buildFromJson (final JsonObject jsonObject, final AbstractConnectionBuilder builder) {
+    static void buildFromJson(final JsonObject jsonObject, final AbstractConnectionBuilder builder) {
         final MappingContext mappingContext = jsonObject.getValue(JsonFields.MAPPING_CONTEXT)
                 .map(ConnectivityModelFactory::mappingContextFromJson)
                 .orElse(null);
@@ -112,6 +122,12 @@ static void buildFromJson (final JsonObject jsonObject, final AbstractConnection
 
         jsonObject.getValue(JsonFields.LIFECYCLE)
                 .flatMap(ConnectionLifecycle::forName).ifPresent(builder::lifecycle);
+        jsonObject.getValue(JsonFields.REVISION)
+                .map(ConnectionRevision::newInstance).ifPresent(builder::revision);
+        jsonObject.getValue(JsonFields.MODIFIED)
+                .map(AbstractConnection::tryToParseInstant).ifPresent(builder::modified);
+        jsonObject.getValue(JsonFields.CREATED)
+                .map(AbstractConnection::tryToParseInstant).ifPresent(builder::created);
         jsonObject.getValue(JsonFields.CREDENTIALS).ifPresent(builder::credentialsFromJson);
         jsonObject.getValue(JsonFields.CLIENT_COUNT).ifPresent(builder::clientCount);
         jsonObject.getValue(JsonFields.FAILOVER_ENABLED).ifPresent(builder::failoverEnabled);
@@ -296,6 +312,36 @@ public Optional<ConnectionLifecycle> getLifecycle() {
         return Optional.ofNullable(lifecycle);
     }
 
+    @Override
+    public Optional<? extends EntityId> getEntityId() {
+        return Optional.of(id);
+    }
+
+    @Override
+    public Optional<ConnectionRevision> getRevision() {
+        return Optional.ofNullable(revision);
+    }
+
+    @Override
+    public Optional<Instant> getModified() {
+        return Optional.ofNullable(modified);
+    }
+
+    @Override
+    public Optional<Instant> getCreated() {
+        return Optional.ofNullable(created);
+    }
+
+    @Override
+    public Optional<Metadata> getMetadata() {
+        return Optional.empty(); // currently not metadata support for connections
+    }
+
+    @Override
+    public boolean isDeleted() {
+        return ConnectionLifecycle.DELETED.equals(lifecycle);
+    }
+
     static ConnectionBuilder fromConnection(final Connection connection, final AbstractConnectionBuilder builder) {
         checkNotNull(connection, "Connection");
 
@@ -316,7 +362,10 @@ static ConnectionBuilder fromConnection(final Connection connection, final Abstr
                 .name(connection.getName().orElse(null))
                 .sshTunnel(connection.getSshTunnel().orElse(null))
                 .tags(connection.getTags())
-                .lifecycle(connection.getLifecycle().orElse(null));
+                .lifecycle(connection.getLifecycle().orElse(null))
+                .revision(connection.getRevision().orElse(null))
+                .modified(connection.getModified().orElse(null))
+                .created(connection.getCreated().orElse(null));
     }
 
     @Override
@@ -329,6 +378,15 @@ public JsonObject toJson(final JsonSchemaVersion schemaVersion, final Predicate<
         }
         jsonObjectBuilder.set(JsonFields.ID, String.valueOf(id), predicate);
         jsonObjectBuilder.set(JsonFields.NAME, name, predicate);
+        if (null != revision) {
+            jsonObjectBuilder.set(JsonFields.REVISION, revision.toLong(), predicate);
+        }
+        if (null != modified) {
+            jsonObjectBuilder.set(JsonFields.MODIFIED, modified.toString(), predicate);
+        }
+        if (null != created) {
+            jsonObjectBuilder.set(JsonFields.CREATED, created.toString(), predicate);
+        }
         jsonObjectBuilder.set(JsonFields.CONNECTION_TYPE, connectionType.getName(), predicate);
         jsonObjectBuilder.set(JsonFields.CONNECTION_STATUS, connectionStatus.getName(), predicate);
         jsonObjectBuilder.set(JsonFields.URI, uri.toString(), predicate);
@@ -368,6 +426,15 @@ public JsonObject toJson(final JsonSchemaVersion schemaVersion, final Predicate<
         return jsonObjectBuilder.build();
     }
 
+    private static Instant tryToParseInstant(final CharSequence dateTime) {
+        try {
+            return Instant.parse(dateTime);
+        } catch (final DateTimeParseException e) {
+            throw new JsonParseException("The JSON object's field '" + Connection.JsonFields.MODIFIED.getPointer() + "' " +
+                    "is not in ISO-8601 format as expected");
+        }
+    }
+
     @SuppressWarnings("OverlyComplexMethod")
     @Override
     public boolean equals(@Nullable final Object o) {
@@ -394,6 +461,9 @@ public boolean equals(@Nullable final Object o) {
                 Objects.equals(specificConfig, that.specificConfig) &&
                 Objects.equals(payloadMappingDefinition, that.payloadMappingDefinition) &&
                 Objects.equals(lifecycle, that.lifecycle) &&
+                Objects.equals(revision, that.revision) &&
+                Objects.equals(modified, that.modified) &&
+                Objects.equals(created, that.created) &&
                 Objects.equals(sshTunnel, that.sshTunnel) &&
                 Objects.equals(tags, that.tags);
     }
@@ -402,7 +472,7 @@ public boolean equals(@Nullable final Object o) {
     public int hashCode() {
         return Objects.hash(id, name, connectionType, connectionStatus, sources, targets, clientCount, failOverEnabled,
                 credentials, trustedCertificates, uri, validateCertificate, processorPoolSize, specificConfig,
-                payloadMappingDefinition, sshTunnel, tags, lifecycle);
+                payloadMappingDefinition, sshTunnel, tags, lifecycle, revision, modified, created);
     }
 
     @Override
@@ -426,6 +496,9 @@ public String toString() {
                 ", payloadMappingDefinition=" + payloadMappingDefinition +
                 ", tags=" + tags +
                 ", lifecycle=" + lifecycle +
+                ", revision=" + revision +
+                ", modified=" + modified +
+                ", created=" + created +
                 "]";
     }
 
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/AbstractConnectionBuilder.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/AbstractConnectionBuilder.java
index 5bf00d4797a..6243c22352f 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/AbstractConnectionBuilder.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/AbstractConnectionBuilder.java
@@ -16,6 +16,7 @@
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
 import java.text.MessageFormat;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -49,6 +50,9 @@ abstract class AbstractConnectionBuilder implements ConnectionBuilder {
     @Nullable MappingContext mappingContext = null;
     @Nullable String trustedCertificates;
     @Nullable ConnectionLifecycle lifecycle = null;
+    @Nullable ConnectionRevision revision = null;
+    @Nullable Instant modified = null;
+    @Nullable Instant created = null;
     @Nullable SshTunnel sshTunnel = null;
 
     // optional with default:
@@ -192,6 +196,24 @@ public ConnectionBuilder lifecycle(@Nullable final ConnectionLifecycle lifecycle
         return this;
     }
 
+    @Override
+    public ConnectionBuilder revision(@Nullable final ConnectionRevision revision) {
+        this.revision = revision;
+        return this;
+    }
+
+    @Override
+    public ConnectionBuilder modified(@Nullable final Instant modified) {
+        this.modified = modified;
+        return this;
+    }
+
+    @Override
+    public ConnectionBuilder created(@Nullable final Instant created) {
+        this.created = created;
+        return this;
+    }
+
     @Override
     public ConnectionBuilder sshTunnel(@Nullable final SshTunnel sshTunnel) {
         this.sshTunnel = sshTunnel;
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/Connection.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/Connection.java
index b9a99b60f1e..bcb51110a54 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/Connection.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/Connection.java
@@ -20,21 +20,19 @@
 
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.entity.Entity;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
-import org.eclipse.ditto.base.model.json.Jsonifiable;
 import org.eclipse.ditto.json.JsonArray;
 import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
-import org.eclipse.ditto.json.JsonFieldSelector;
 import org.eclipse.ditto.json.JsonObject;
 
 /**
  * Represents a connection within the Connectivity service.
  */
 @Immutable
-public interface Connection extends Jsonifiable.WithFieldSelectorAndPredicate<JsonField> {
+public interface Connection extends Entity<ConnectionRevision> {
 
     /**
      * Returns the identifier of this {@code Connection}.
@@ -242,11 +240,6 @@ default JsonObject toJson() {
         return toJson(FieldType.notHidden());
     }
 
-    @Override
-    default JsonObject toJson(final JsonSchemaVersion schemaVersion, final JsonFieldSelector fieldSelector) {
-        return toJson(schemaVersion, FieldType.notHidden()).get(fieldSelector);
-    }
-
     /**
      * An enumeration of the known {@code JsonField}s of a {@code Connection}.
      */
@@ -261,6 +254,33 @@ final class JsonFields {
                 FieldType.HIDDEN,
                 JsonSchemaVersion.V_2);
 
+        /**
+         * JSON field containing the Connection's revision.
+         * @since 3.2.0
+         */
+        public static final JsonFieldDefinition<Long> REVISION = JsonFactory.newLongFieldDefinition("_revision",
+                FieldType.SPECIAL,
+                FieldType.HIDDEN,
+                JsonSchemaVersion.V_2);
+
+        /**
+         * JSON field containing the Connection's modified timestamp in ISO-8601 format.
+         * @since 3.2.0
+         */
+        public static final JsonFieldDefinition<String> MODIFIED = JsonFactory.newStringFieldDefinition("_modified",
+                FieldType.SPECIAL,
+                FieldType.HIDDEN,
+                JsonSchemaVersion.V_2);
+
+        /**
+         * JSON field containing the Connection's created timestamp in ISO-8601 format.
+         * @since 3.2.0
+         */
+        public static final JsonFieldDefinition<String> CREATED = JsonFactory.newStringFieldDefinition("_created",
+                FieldType.SPECIAL,
+                FieldType.HIDDEN,
+                JsonSchemaVersion.V_2);
+
         /**
          * JSON field containing the {@code Connection} identifier.
          */
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ConnectionBuilder.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ConnectionBuilder.java
index a124f64ccaa..56daf691b7b 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ConnectionBuilder.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ConnectionBuilder.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.ditto.connectivity.model;
 
+import java.time.Instant;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -203,6 +204,44 @@ default ConnectionBuilder credentialsFromJson(final JsonObject jsonObject) {
      */
     ConnectionBuilder lifecycle(@Nullable ConnectionLifecycle lifecycle);
 
+    /**
+     * Sets the given revision number to this builder.
+     *
+     * @param revisionNumber the revision number to be set.
+     * @return this builder to allow method chaining.
+     * @since 3.2.0
+     */
+    default ConnectionBuilder revision(final long revisionNumber) {
+        return revision(ConnectionRevision.newInstance(revisionNumber));
+    }
+
+    /**
+     * Sets the {@link ConnectionRevision} of the connection.
+     *
+     * @param revision the connection revision
+     * @return this builder
+     * @since 3.2.0
+     */
+    ConnectionBuilder revision(@Nullable ConnectionRevision revision);
+
+    /**
+     * Sets the given modified timestamp to this builder.
+     *
+     * @param modified the timestamp to be set.
+     * @return this builder to allow method chaining.
+     * @since 3.2.0
+     */
+    ConnectionBuilder modified(@Nullable Instant modified);
+
+    /**
+     * Sets the given created timestamp to this builder.
+     *
+     * @param created the created timestamp to be set.
+     * @return this builder to allow method chaining.
+     * @since 3.2.0
+     */
+    ConnectionBuilder created(@Nullable Instant created);
+
     /**
      * Sets the {@link SshTunnel} of the connection.
      *
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ConnectionRevision.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ConnectionRevision.java
new file mode 100755
index 00000000000..2986f7a82d3
--- /dev/null
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ConnectionRevision.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.connectivity.model;
+
+import org.eclipse.ditto.base.model.entity.Revision;
+
+/**
+ * Represents the current revision of a Connection.
+ */
+public interface ConnectionRevision extends Revision<ConnectionRevision> {
+
+    /**
+     * Returns a new immutable {@code ConnectionRevision} which is initialised with the given revision number.
+     *
+     * @param revisionNumber the {@code long} value of the revision.
+     * @return the new immutable {@code ConnectionRevision}.
+     */
+    static ConnectionRevision newInstance(final long revisionNumber) {
+        return ConnectivityModelFactory.newConnectionRevision(revisionNumber);
+    }
+
+}
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ConnectivityModelFactory.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ConnectivityModelFactory.java
index 61ca499af91..4ace7c5435f 100755
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ConnectivityModelFactory.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ConnectivityModelFactory.java
@@ -991,4 +991,15 @@ public static LogEntryBuilder newLogEntryBuilder(final String correlationId,
         return ImmutableLogEntry.getBuilder(correlationId, timestamp, logCategory, logType, logLevel, message);
     }
 
+    /**
+     * Returns a new immutable {@link ConnectionRevision} which is initialised with the given revision number.
+     *
+     * @param revisionNumber the {@code long} value of the revision.
+     * @return the new immutable {@code ConnectionRevision}.
+     * @since 3.2.0
+     */
+    public static ConnectionRevision newConnectionRevision(final long revisionNumber) {
+        return ImmutableConnectionRevision.of(revisionNumber);
+    }
+
 }
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableConnectionRevision.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableConnectionRevision.java
new file mode 100755
index 00000000000..c9ec22b8000
--- /dev/null
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableConnectionRevision.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.connectivity.model;
+
+import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
+
+import java.util.Objects;
+
+import javax.annotation.concurrent.Immutable;
+
+/**
+ * An immutable implementation of {@link ConnectionRevision}.
+ */
+@Immutable
+final class ImmutableConnectionRevision implements ConnectionRevision {
+
+    private final long value;
+
+    private ImmutableConnectionRevision(final long theValue) {
+        value = theValue;
+    }
+
+    /**
+     * Returns a new instance of {@code ConnectionRevision} with the given value.
+     *
+     * @param value the value of the new revision.
+     * @return a new Connection revision.
+     */
+    public static ImmutableConnectionRevision of(final long value) {
+        return new ImmutableConnectionRevision(value);
+    }
+
+    @Override
+    public boolean isGreaterThan(final ConnectionRevision other) {
+        return 0 < compareTo(other);
+    }
+
+    @Override
+    public boolean isGreaterThanOrEqualTo(final ConnectionRevision other) {
+        return 0 <= compareTo(other);
+    }
+
+    @Override
+    public boolean isLowerThan(final ConnectionRevision other) {
+        return 0 > compareTo(other);
+    }
+
+    @Override
+    public boolean isLowerThanOrEqualTo(final ConnectionRevision other) {
+        return 0 >= compareTo(other);
+    }
+
+    @Override
+    public ConnectionRevision increment() {
+        return of(value + 1);
+    }
+
+    @Override
+    public long toLong() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final ImmutableConnectionRevision that = (ImmutableConnectionRevision) o;
+        return value == that.value;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(value);
+    }
+
+    @Override
+    public int compareTo(final ConnectionRevision o) {
+        checkNotNull(o, "other revision to compare this revision with");
+        return Long.compare(value, o.toLong());
+    }
+
+}
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/ConnectivityCommand.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/ConnectivityCommand.java
index 6c33196e410..53ead396749 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/ConnectivityCommand.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/ConnectivityCommand.java
@@ -12,14 +12,16 @@
  */
 package org.eclipse.ditto.connectivity.model.signals.commands;
 
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonFieldDefinition;
-import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.base.model.entity.type.EntityType;
+import org.eclipse.ditto.base.model.entity.type.WithEntityType;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
-import org.eclipse.ditto.connectivity.model.ConnectivityConstants;
 import org.eclipse.ditto.base.model.signals.commands.Command;
+import org.eclipse.ditto.connectivity.model.ConnectivityConstants;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonPointer;
 
 /**
  * Base interface for all commands which are understood by the Connectivity service. Implementations of this interface
@@ -27,7 +29,8 @@
  *
  * @param <T> the type of the implementing class.
  */
-public interface ConnectivityCommand<T extends ConnectivityCommand<T>> extends Command<T> {
+public interface ConnectivityCommand<T extends ConnectivityCommand<T>> extends Command<T>,
+        WithEntityType {
 
     /**
      * Type Prefix of Connectivity commands.
@@ -57,6 +60,17 @@ default String getTypePrefix() {
     @Override
     T setDittoHeaders(DittoHeaders dittoHeaders);
 
+    /**
+     * Returns the entity type {@link ConnectivityConstants#ENTITY_TYPE}.
+     *
+     * @return the Connection entity type.
+     * @since 3.2.0
+     */
+    @Override
+    default EntityType getEntityType() {
+        return ConnectivityConstants.ENTITY_TYPE;
+    }
+
     /**
      * This class contains definitions for all specific fields of a {@code ConnectivityCommand}'s JSON representation.
      */
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionPreconditionFailedException.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionPreconditionFailedException.java
new file mode 100644
index 00000000000..6746f57942c
--- /dev/null
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionPreconditionFailedException.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.connectivity.model.signals.commands.exceptions;
+
+import java.net.URI;
+import java.text.MessageFormat;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+import javax.annotation.concurrent.NotThreadSafe;
+
+import org.eclipse.ditto.base.model.common.HttpStatus;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.connectivity.model.ConnectivityException;
+import org.eclipse.ditto.json.JsonObject;
+
+/**
+ * Thrown when validating a precondition header fails on a Connection or one of its sub-entities.
+ * @since 3.2.0
+ */
+@Immutable
+@JsonParsableException(errorCode = ConnectionPreconditionFailedException.ERROR_CODE)
+public final class ConnectionPreconditionFailedException extends DittoRuntimeException implements
+        ConnectivityException {
+
+    /**
+     * Error code of this exception.
+     */
+    public static final String ERROR_CODE = ERROR_CODE_PREFIX + "precondition.failed";
+
+    private static final String MESSAGE_TEMPLATE =
+            "The comparison of precondition header ''{0}'' for the requested connection resource evaluated to false." +
+                    " Header value: ''{1}'', actual entity-tag: ''{2}''.";
+
+    private static final String DEFAULT_DESCRIPTION = "The comparison of the provided precondition header with the " +
+            "current ETag value of the requested connection resource evaluated to false. Check the value of your " +
+            "conditional header value.";
+
+    private ConnectionPreconditionFailedException(final DittoHeaders dittoHeaders,
+            @Nullable final String message,
+            @Nullable final String description,
+            @Nullable final Throwable cause,
+            @Nullable final URI href) {
+        super(ERROR_CODE, HttpStatus.PRECONDITION_FAILED, dittoHeaders, message, description, cause, href);
+    }
+
+    /**
+     * A mutable builder for a {@link ConnectionPreconditionFailedException}.
+     *
+     * @param conditionalHeaderName the name of the conditional header.
+     * @param expected the expected value.
+     * @param actual the actual ETag value.
+     * @return the builder.
+     */
+    public static Builder newBuilder(final String conditionalHeaderName, final String expected, final String actual) {
+        return new Builder(conditionalHeaderName, expected, actual);
+    }
+
+    /**
+     * Constructs a new {@link ConnectionPreconditionFailedException} object with the exception message extracted from
+     * the given JSON object.
+     *
+     * @param jsonObject the JSON to read the {@link org.eclipse.ditto.base.model.exceptions.DittoRuntimeException.JsonFields#MESSAGE} field from.
+     * @param dittoHeaders the headers of the command which resulted in this exception.
+     * @return the new {@link ConnectionPreconditionFailedException}.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonMissingFieldException if this JsonObject did not contain an error message.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static ConnectionPreconditionFailedException fromJson(final JsonObject jsonObject,
+            final DittoHeaders dittoHeaders) {
+        return DittoRuntimeException.fromJson(jsonObject, dittoHeaders, new Builder());
+    }
+
+    @Override
+    public DittoRuntimeException setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new Builder()
+                .message(getMessage())
+                .description(getDescription().orElse(null))
+                .cause(getCause())
+                .href(getHref().orElse(null))
+                .dittoHeaders(dittoHeaders)
+                .build();
+    }
+
+    /**
+     * A mutable builder with a fluent API for a {@link ConnectionPreconditionFailedException}.
+     */
+    @NotThreadSafe
+    public static final class Builder
+            extends DittoRuntimeExceptionBuilder<ConnectionPreconditionFailedException> {
+
+        private Builder() {
+            description(DEFAULT_DESCRIPTION);
+        }
+
+        private Builder(final String conditionalHeaderName, final String expected, final String actual) {
+            this();
+            message(MessageFormat.format(MESSAGE_TEMPLATE, conditionalHeaderName, expected, actual));
+        }
+
+        @Override
+        protected ConnectionPreconditionFailedException doBuild(final DittoHeaders dittoHeaders,
+                @Nullable final String message,
+                @Nullable final String description,
+                @Nullable final Throwable cause,
+                @Nullable final URI href) {
+            return new ConnectionPreconditionFailedException(dittoHeaders, message, description, cause, href);
+        }
+
+    }
+}
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionPreconditionNotModifiedException.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionPreconditionNotModifiedException.java
new file mode 100644
index 00000000000..ecb5143274b
--- /dev/null
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionPreconditionNotModifiedException.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.connectivity.model.signals.commands.exceptions;
+
+import java.net.URI;
+import java.text.MessageFormat;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+import javax.annotation.concurrent.NotThreadSafe;
+
+import org.eclipse.ditto.base.model.common.HttpStatus;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.connectivity.model.ConnectivityException;
+import org.eclipse.ditto.json.JsonObject;
+
+/**
+ * Thrown when validating a precondition header on a connection or one of its sub-entities leads to status
+ * {@link org.eclipse.ditto.base.model.common.HttpStatus#NOT_MODIFIED}.
+ */
+@Immutable
+@JsonParsableException(errorCode = ConnectionPreconditionNotModifiedException.ERROR_CODE)
+public final class ConnectionPreconditionNotModifiedException extends DittoRuntimeException
+        implements ConnectivityException {
+
+    /**
+     * Error code of this exception.
+     */
+    public static final String ERROR_CODE = ERROR_CODE_PREFIX + "precondition.notmodified";
+
+    private static final String MESSAGE_TEMPLATE =
+            "The comparison of precondition header ''if-none-match'' for the requested connection resource evaluated to " +
+                    "false. Expected: ''{0}'' not to match actual: ''{1}''.";
+
+    private static final String DEFAULT_DESCRIPTION =
+            "The comparison of the provided precondition header ''if-none-match'' with the current ETag value of the " +
+                    "requested connection resource evaluated to false. Check the value of your conditional header value.";
+
+    private ConnectionPreconditionNotModifiedException(final DittoHeaders dittoHeaders,
+            @Nullable final String message,
+            @Nullable final String description,
+            @Nullable final Throwable cause,
+            @Nullable final URI href) {
+        super(ERROR_CODE, HttpStatus.NOT_MODIFIED, dittoHeaders, message, description, cause, href);
+    }
+
+    /**
+     * A mutable builder for a {@link ConnectionPreconditionNotModifiedException}.
+     *
+     * @param expectedNotToMatch the value which was expected not to match {@code matched} value.
+     * @param matched the matched value.
+     * @return the builder.
+     */
+    public static Builder newBuilder(final String expectedNotToMatch, final String matched) {
+        return new Builder(expectedNotToMatch, matched);
+    }
+
+    /**
+     * Constructs a new {@link ConnectionPreconditionNotModifiedException} object with the exception message extracted from
+     * the given JSON object.
+     *
+     * @param jsonObject the JSON to read the
+     * {@link org.eclipse.ditto.base.model.exceptions.DittoRuntimeException.JsonFields#MESSAGE} field from.
+     * @param dittoHeaders the headers of the command which resulted in this exception.
+     * @return the new ConditionalHeadersNotModifiedException.
+     * @throws NullPointerException if any argument is {@code null}.
+     * @throws org.eclipse.ditto.json.JsonMissingFieldException if this JsonObject did not contain an error message.
+     * @throws org.eclipse.ditto.json.JsonParseException if the passed in {@code jsonObject} was not in the expected
+     * format.
+     */
+    public static ConnectionPreconditionNotModifiedException fromJson(final JsonObject jsonObject,
+            final DittoHeaders dittoHeaders) {
+        return DittoRuntimeException.fromJson(jsonObject, dittoHeaders, new Builder());
+    }
+
+    @Override
+    public DittoRuntimeException setDittoHeaders(final DittoHeaders dittoHeaders) {
+        return new Builder()
+                .message(getMessage())
+                .description(getDescription().orElse(null))
+                .cause(getCause())
+                .href(getHref().orElse(null))
+                .dittoHeaders(dittoHeaders)
+                .build();
+    }
+
+    /**
+     * A mutable builder with a fluent API for a {@link ConnectionPreconditionNotModifiedException}.
+     */
+    @NotThreadSafe
+    public static final class Builder extends DittoRuntimeExceptionBuilder<ConnectionPreconditionNotModifiedException> {
+
+        private Builder() {
+            description(DEFAULT_DESCRIPTION);
+        }
+
+        private Builder(final String expectedNotToMatch, final String matched) {
+            this();
+            message(MessageFormat.format(MESSAGE_TEMPLATE, expectedNotToMatch, matched));
+        }
+
+        @Override
+        protected ConnectionPreconditionNotModifiedException doBuild(final DittoHeaders dittoHeaders,
+                @Nullable final String message,
+                @Nullable final String description,
+                @Nullable final Throwable cause,
+                @Nullable final URI href) {
+            return new ConnectionPreconditionNotModifiedException(dittoHeaders, message, description, cause, href);
+        }
+
+    }
+}
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnection.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnection.java
index bd9e0c25df1..dfafac737c3 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnection.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnection.java
@@ -15,24 +15,29 @@
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Predicate;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
-import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand;
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonField;
-import org.eclipse.ditto.json.JsonObject;
-import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonParsableCommand;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
-import org.eclipse.ditto.connectivity.model.ConnectionId;
-import org.eclipse.ditto.connectivity.model.WithConnectionId;
 import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
 import org.eclipse.ditto.base.model.signals.commands.AbstractCommand;
 import org.eclipse.ditto.base.model.signals.commands.CommandJsonDeserializer;
+import org.eclipse.ditto.base.model.signals.commands.WithSelectedFields;
+import org.eclipse.ditto.connectivity.model.ConnectionId;
+import org.eclipse.ditto.connectivity.model.WithConnectionId;
+import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonField;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonFieldSelector;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
 
 /**
  * Command which retrieves a {@link org.eclipse.ditto.connectivity.model.Connection}.
@@ -40,7 +45,8 @@
 @Immutable
 @JsonParsableCommand(typePrefix = ConnectivityCommand.TYPE_PREFIX, name = RetrieveConnection.NAME)
 public final class RetrieveConnection extends AbstractCommand<RetrieveConnection>
-        implements ConnectivityQueryCommand<RetrieveConnection>, WithConnectionId, SignalWithEntityId<RetrieveConnection> {
+        implements ConnectivityQueryCommand<RetrieveConnection>, WithConnectionId, WithSelectedFields,
+        SignalWithEntityId<RetrieveConnection> {
 
     /**
      * Name of this command.
@@ -52,11 +58,19 @@ public final class RetrieveConnection extends AbstractCommand<RetrieveConnection
      */
     public static final String TYPE = ConnectivityCommand.TYPE_PREFIX + NAME;
 
+    static final JsonFieldDefinition<String> JSON_SELECTED_FIELDS =
+            JsonFactory.newStringFieldDefinition("selectedFields", FieldType.REGULAR,
+                    JsonSchemaVersion.V_2);
+
     private final ConnectionId connectionId;
+    @Nullable private final JsonFieldSelector selectedFields;
 
-    private RetrieveConnection(final ConnectionId connectionId, final DittoHeaders dittoHeaders) {
+    private RetrieveConnection(final ConnectionId connectionId,
+            @Nullable final JsonFieldSelector selectedFields,
+            final DittoHeaders dittoHeaders) {
         super(TYPE, dittoHeaders);
         this.connectionId = connectionId;
+        this.selectedFields = selectedFields;
     }
 
     /**
@@ -69,7 +83,23 @@ private RetrieveConnection(final ConnectionId connectionId, final DittoHeaders d
      */
     public static RetrieveConnection of(final ConnectionId connectionId, final DittoHeaders dittoHeaders) {
         checkNotNull(connectionId, "Connection ID");
-        return new RetrieveConnection(connectionId, dittoHeaders);
+        return new RetrieveConnection(connectionId, null, dittoHeaders);
+    }
+
+    /**
+     * Returns a new instance of {@code RetrieveConnection}.
+     *
+     * @param connectionId the identifier of the connection to be retrieved.
+     * @param selectedFields the fields of the JSON representation of the Connection to retrieve.
+     * @param dittoHeaders the headers of the request.
+     * @return a new RetrieveConnection command.
+     * @throws NullPointerException if any argument is {@code null}.
+     */
+    public static RetrieveConnection of(final ConnectionId connectionId,
+            @Nullable final JsonFieldSelector selectedFields,
+            final DittoHeaders dittoHeaders) {
+        checkNotNull(connectionId, "Connection ID");
+        return new RetrieveConnection(connectionId, selectedFields, dittoHeaders);
     }
 
     /**
@@ -101,8 +131,12 @@ public static RetrieveConnection fromJson(final JsonObject jsonObject, final Dit
         return new CommandJsonDeserializer<RetrieveConnection>(TYPE, jsonObject).deserialize(() -> {
             final String readConnectionId = jsonObject.getValueOrThrow(ConnectivityCommand.JsonFields.JSON_CONNECTION_ID);
             final ConnectionId connectionId = ConnectionId.of(readConnectionId);
+            final Optional<JsonFieldSelector> selectedFields = jsonObject.getValue(JSON_SELECTED_FIELDS)
+                    .map(str -> JsonFactory.newFieldSelector(str, JsonFactory.newParseOptionsBuilder()
+                            .withoutUrlDecoding()
+                            .build()));
 
-            return of(connectionId, dittoHeaders);
+            return of(connectionId, selectedFields.orElse(null), dittoHeaders);
         });
     }
 
@@ -113,6 +147,9 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
         final Predicate<JsonField> predicate = schemaVersion.and(thePredicate);
         jsonObjectBuilder.set(ConnectivityCommand.JsonFields.JSON_CONNECTION_ID, String.valueOf(connectionId),
                 predicate);
+        if (null != selectedFields) {
+            jsonObjectBuilder.set(JSON_SELECTED_FIELDS, selectedFields.toString(), predicate);
+        }
     }
 
     @Override
@@ -125,9 +162,14 @@ public Category getCategory() {
         return Category.QUERY;
     }
 
+    @Override
+    public Optional<JsonFieldSelector> getSelectedFields() {
+        return Optional.ofNullable(selectedFields);
+    }
+
     @Override
     public RetrieveConnection setDittoHeaders(final DittoHeaders dittoHeaders) {
-        return of(connectionId, dittoHeaders);
+        return of(connectionId, selectedFields, dittoHeaders);
     }
 
     @Override
@@ -147,12 +189,13 @@ public boolean equals(@Nullable final Object o) {
             return false;
         }
         final RetrieveConnection that = (RetrieveConnection) o;
-        return Objects.equals(connectionId, that.connectionId);
+        return Objects.equals(connectionId, that.connectionId) &&
+                Objects.equals(selectedFields, that.selectedFields);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), connectionId);
+        return Objects.hash(super.hashCode(), connectionId, selectedFields);
     }
 
     @Override
@@ -160,6 +203,7 @@ public String toString() {
         return getClass().getSimpleName() + " [" +
                 super.toString() +
                 ", connectionId=" + connectionId +
+                ", selectedFields=" + selectedFields +
                 "]";
     }
 
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnections.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnections.java
index 319d1edd04b..aab45f4854f 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnections.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnections.java
@@ -13,6 +13,7 @@
 package org.eclipse.ditto.connectivity.model.signals.commands.query;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Predicate;
 
 import javax.annotation.Nullable;
@@ -23,10 +24,12 @@
 import org.eclipse.ditto.base.model.json.JsonParsableCommand;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.base.model.signals.commands.AbstractCommand;
+import org.eclipse.ditto.base.model.signals.commands.WithSelectedFields;
 import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonFieldSelector;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.eclipse.ditto.json.JsonPointer;
@@ -40,7 +43,7 @@
 @Immutable
 @JsonParsableCommand(typePrefix = ConnectivityCommand.TYPE_PREFIX, name = RetrieveConnections.NAME)
 public final class RetrieveConnections extends AbstractCommand<RetrieveConnections>
-        implements ConnectivityQueryCommand<RetrieveConnections> {
+        implements ConnectivityQueryCommand<RetrieveConnections>, WithSelectedFields {
 
     /**
      * Name of the "Retrieve Connections" command.
@@ -54,11 +57,19 @@ public final class RetrieveConnections extends AbstractCommand<RetrieveConnectio
     static final JsonFieldDefinition<Boolean> JSON_IDS_ONLY =
             JsonFactory.newBooleanFieldDefinition("idsOnly", FieldType.REGULAR, JsonSchemaVersion.V_2);
 
+    static final JsonFieldDefinition<String> JSON_SELECTED_FIELDS =
+            JsonFactory.newStringFieldDefinition("selectedFields", FieldType.REGULAR,
+                    JsonSchemaVersion.V_2);
+
     private final boolean idsOnly;
+    @Nullable private final JsonFieldSelector selectedFields;
 
-    private RetrieveConnections(final boolean idsOnly, final DittoHeaders dittoHeaders) {
+    private RetrieveConnections(final boolean idsOnly,
+            @Nullable final JsonFieldSelector selectedFields,
+            final DittoHeaders dittoHeaders) {
         super(TYPE, dittoHeaders);
         this.idsOnly = idsOnly;
+        this.selectedFields = selectedFields;
     }
 
     /**
@@ -70,7 +81,22 @@ private RetrieveConnections(final boolean idsOnly, final DittoHeaders dittoHeade
      */
     public static RetrieveConnections newInstance(final boolean idsOnly, final DittoHeaders dittoHeaders) {
 
-        return new RetrieveConnections(idsOnly, dittoHeaders);
+        return new RetrieveConnections(idsOnly, null, dittoHeaders);
+    }
+
+    /**
+     * Returns a new instance of the retrieve connections command.
+     *
+     * @param dittoHeaders provide additional information regarding connections retrieval like a correlation ID.
+     * @param selectedFields the fields of the JSON representation of the Connection to retrieve.
+     * @return the instance.
+     * @throws NullPointerException if any argument is {@code null}.
+     */
+    public static RetrieveConnections newInstance(final boolean idsOnly,
+            @Nullable final JsonFieldSelector selectedFields,
+            final DittoHeaders dittoHeaders) {
+
+        return new RetrieveConnections(idsOnly, selectedFields, dittoHeaders);
     }
 
     /**
@@ -100,8 +126,13 @@ public static RetrieveConnections fromJson(final String jsonString, final DittoH
      */
     public static RetrieveConnections fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
         final boolean idsOnly = jsonObject.getValueOrThrow(JSON_IDS_ONLY);
+        final JsonFieldSelector extractedFieldSelector = jsonObject.getValue(JSON_SELECTED_FIELDS)
+                .map(str -> JsonFactory.newFieldSelector(str, JsonFactory.newParseOptionsBuilder()
+                        .withoutUrlDecoding()
+                        .build()))
+                .orElse(null);
 
-        return new RetrieveConnections(idsOnly, dittoHeaders);
+        return new RetrieveConnections(idsOnly, extractedFieldSelector, dittoHeaders);
     }
 
     /**
@@ -113,6 +144,11 @@ public boolean getIdsOnly() {
         return idsOnly;
     }
 
+    @Override
+    public Optional<JsonFieldSelector> getSelectedFields() {
+        return Optional.ofNullable(selectedFields);
+    }
+
     @Override
     public Category getCategory() {
         return Category.QUERY;
@@ -120,7 +156,7 @@ public Category getCategory() {
 
     @Override
     public RetrieveConnections setDittoHeaders(final DittoHeaders dittoHeaders) {
-        return new RetrieveConnections(idsOnly, dittoHeaders);
+        return new RetrieveConnections(idsOnly, selectedFields, dittoHeaders);
     }
 
     @Override
@@ -134,6 +170,9 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
 
         final Predicate<JsonField> predicate = jsonSchemaVersion.and(thePredicate);
         jsonObjectBuilder.set(JSON_IDS_ONLY, idsOnly, predicate);
+        if (null != selectedFields) {
+            jsonObjectBuilder.set(JSON_SELECTED_FIELDS, selectedFields.toString(), predicate);
+        }
     }
 
     @Override
@@ -148,12 +187,13 @@ public boolean equals(@Nullable final Object o) {
             return false;
         }
         final RetrieveConnections that = (RetrieveConnections) o;
-        return Objects.equals(idsOnly, that.idsOnly);
+        return Objects.equals(idsOnly, that.idsOnly) &&
+                Objects.equals(selectedFields, that.selectedFields);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), idsOnly);
+        return Objects.hash(super.hashCode(), idsOnly, selectedFields);
     }
 
     @Override
@@ -161,6 +201,7 @@ public String toString() {
         return getClass().getSimpleName() + " [" +
                 super.toString() +
                 ", idsOnly=" + idsOnly +
+                ", selectedFields=" + selectedFields +
                 "]";
     }
 
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveResolvedHonoConnection.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveResolvedHonoConnection.java
index f4ba9a53678..54441b71ece 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveResolvedHonoConnection.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveResolvedHonoConnection.java
@@ -15,22 +15,27 @@
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Predicate;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonParsableCommand;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
 import org.eclipse.ditto.base.model.signals.commands.AbstractCommand;
 import org.eclipse.ditto.base.model.signals.commands.CommandJsonDeserializer;
+import org.eclipse.ditto.base.model.signals.commands.WithSelectedFields;
 import org.eclipse.ditto.connectivity.model.ConnectionId;
 import org.eclipse.ditto.connectivity.model.WithConnectionId;
 import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonFieldSelector;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonObjectBuilder;
 
@@ -43,7 +48,8 @@
 @Immutable
 @JsonParsableCommand(typePrefix = ConnectivityCommand.TYPE_PREFIX, name = RetrieveResolvedHonoConnection.NAME)
 public final class RetrieveResolvedHonoConnection extends AbstractCommand<RetrieveResolvedHonoConnection>
-        implements ConnectivityQueryCommand<RetrieveResolvedHonoConnection>, WithConnectionId, SignalWithEntityId<RetrieveResolvedHonoConnection> {
+        implements ConnectivityQueryCommand<RetrieveResolvedHonoConnection>, WithConnectionId, WithSelectedFields,
+        SignalWithEntityId<RetrieveResolvedHonoConnection> {
 
     /**
      * Name of this command.
@@ -55,11 +61,19 @@ public final class RetrieveResolvedHonoConnection extends AbstractCommand<Retrie
      */
     public static final String TYPE = ConnectivityCommand.TYPE_PREFIX + NAME;
 
+    static final JsonFieldDefinition<String> JSON_SELECTED_FIELDS =
+            JsonFactory.newStringFieldDefinition("selectedFields", FieldType.REGULAR,
+                    JsonSchemaVersion.V_2);
+
     private final ConnectionId connectionId;
+    @Nullable private final JsonFieldSelector selectedFields;
 
-    private RetrieveResolvedHonoConnection(final ConnectionId connectionId, final DittoHeaders dittoHeaders) {
+    private RetrieveResolvedHonoConnection(final ConnectionId connectionId,
+            @Nullable final JsonFieldSelector selectedFields,
+            final DittoHeaders dittoHeaders) {
         super(TYPE, dittoHeaders);
         this.connectionId = connectionId;
+        this.selectedFields = selectedFields;
     }
 
     /**
@@ -72,7 +86,23 @@ private RetrieveResolvedHonoConnection(final ConnectionId connectionId, final Di
      */
     public static RetrieveResolvedHonoConnection of(final ConnectionId connectionId, final DittoHeaders dittoHeaders) {
         checkNotNull(connectionId, "connectionId");
-        return new RetrieveResolvedHonoConnection(connectionId, dittoHeaders);
+        return new RetrieveResolvedHonoConnection(connectionId, null, dittoHeaders);
+    }
+
+    /**
+     * Returns a new instance of {@code RetrieveResolvedHonoConnection}.
+     *
+     * @param connectionId the identifier of the connection to be retrieved.
+     * @param selectedFields the fields of the JSON representation of the HonoConnection to retrieve.
+     * @param dittoHeaders the headers of the request.
+     * @return a new RetrieveResolvedHonoConnection command.
+     * @throws NullPointerException if any argument is {@code null}.
+     */
+    public static RetrieveResolvedHonoConnection of(final ConnectionId connectionId,
+            @Nullable final JsonFieldSelector selectedFields,
+            final DittoHeaders dittoHeaders) {
+        checkNotNull(connectionId, "Connection ID");
+        return new RetrieveResolvedHonoConnection(connectionId, selectedFields, dittoHeaders);
     }
 
     /**
@@ -104,8 +134,12 @@ public static RetrieveResolvedHonoConnection fromJson(final JsonObject jsonObjec
         return new CommandJsonDeserializer<RetrieveResolvedHonoConnection>(TYPE, jsonObject).deserialize(() -> {
             final String readConnectionId = jsonObject.getValueOrThrow(ConnectivityCommand.JsonFields.JSON_CONNECTION_ID);
             final ConnectionId connectionId = ConnectionId.of(readConnectionId);
+            final Optional<JsonFieldSelector> selectedFields = jsonObject.getValue(JSON_SELECTED_FIELDS)
+                    .map(str -> JsonFactory.newFieldSelector(str, JsonFactory.newParseOptionsBuilder()
+                            .withoutUrlDecoding()
+                            .build()));
 
-            return of(connectionId, dittoHeaders);
+            return of(connectionId, selectedFields.orElse(null), dittoHeaders);
         });
     }
 
@@ -116,6 +150,9 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
         final Predicate<JsonField> predicate = schemaVersion.and(thePredicate);
         jsonObjectBuilder.set(ConnectivityCommand.JsonFields.JSON_CONNECTION_ID, String.valueOf(connectionId),
                 predicate);
+        if (null != selectedFields) {
+            jsonObjectBuilder.set(JSON_SELECTED_FIELDS, selectedFields.toString(), predicate);
+        }
     }
 
     @Override
@@ -128,9 +165,14 @@ public Category getCategory() {
         return Category.QUERY;
     }
 
+    @Override
+    public Optional<JsonFieldSelector> getSelectedFields() {
+        return Optional.ofNullable(selectedFields);
+    }
+
     @Override
     public RetrieveResolvedHonoConnection setDittoHeaders(final DittoHeaders dittoHeaders) {
-        return of(connectionId, dittoHeaders);
+        return of(connectionId, selectedFields, dittoHeaders);
     }
 
     @Override
@@ -150,12 +192,13 @@ public boolean equals(@Nullable final Object o) {
             return false;
         }
         final RetrieveResolvedHonoConnection that = (RetrieveResolvedHonoConnection) o;
-        return Objects.equals(connectionId, that.connectionId);
+        return Objects.equals(connectionId, that.connectionId) &&
+                Objects.equals(selectedFields, that.selectedFields);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), connectionId);
+        return Objects.hash(super.hashCode(), connectionId, selectedFields);
     }
 
     @Override
@@ -163,6 +206,7 @@ public String toString() {
         return getClass().getSimpleName() + " [" +
                 super.toString() +
                 ", connectionId=" + connectionId +
+                ", selectedFields=" + selectedFields +
                 "]";
     }
 
diff --git a/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnectionTest.java b/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnectionTest.java
index 1137132cc16..eca9da01802 100644
--- a/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnectionTest.java
+++ b/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnectionTest.java
@@ -24,6 +24,7 @@
 import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand;
 import org.eclipse.ditto.connectivity.model.signals.commands.TestConstants;
 import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldSelector;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.assertions.DittoJsonAssertions;
@@ -52,7 +53,7 @@ public void testHashCodeAndEquals() {
     public void assertImmutability() {
         assertInstancesOf(RetrieveConnection.class,
                 areImmutable(),
-                provided(ConnectionId.class).isAlsoImmutable());
+                provided(ConnectionId.class, JsonFieldSelector.class).isAlsoImmutable());
     }
 
     @Test
diff --git a/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnectionsTest.java b/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnectionsTest.java
index 375d243bf80..8d70bccc83f 100644
--- a/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnectionsTest.java
+++ b/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveConnectionsTest.java
@@ -15,6 +15,7 @@
 
 import static org.eclipse.ditto.json.assertions.DittoJsonAssertions.assertThat;
 import static org.mutabilitydetector.unittesting.AllowedReason.assumingFields;
+import static org.mutabilitydetector.unittesting.AllowedReason.provided;
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
@@ -28,6 +29,7 @@
 import org.eclipse.ditto.base.model.signals.commands.GlobalCommandRegistry;
 import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand;
 import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldSelector;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.assertions.DittoJsonAssertions;
@@ -72,7 +74,8 @@ public void setUp() {
     public void assertImmutability() {
         assertInstancesOf(RetrieveConnections.class,
                 areImmutable(),
-                assumingFields("connectionIds").areSafelyCopiedUnmodifiableCollectionsWithImmutableElements());
+                assumingFields("connectionIds").areSafelyCopiedUnmodifiableCollectionsWithImmutableElements(),
+                provided(JsonFieldSelector.class).isAlsoImmutable());
     }
 
     @Test
diff --git a/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveResolvedHonoConnectionTest.java b/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveResolvedHonoConnectionTest.java
index 94bd12fb22a..5018d59d8af 100644
--- a/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveResolvedHonoConnectionTest.java
+++ b/connectivity/model/src/test/java/org/eclipse/ditto/connectivity/model/signals/commands/query/RetrieveResolvedHonoConnectionTest.java
@@ -27,6 +27,7 @@
 import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand;
 import org.eclipse.ditto.connectivity.model.signals.commands.TestConstants;
 import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldSelector;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.assertions.DittoJsonAssertions;
@@ -55,7 +56,7 @@ public void testHashCodeAndEquals() {
     public void assertImmutability() {
         assertInstancesOf(RetrieveResolvedHonoConnection.class,
                 areImmutable(),
-                provided(ConnectionId.class).isAlsoImmutable());
+                provided(ConnectionId.class, JsonFieldSelector.class).isAlsoImmutable());
     }
 
     @Test
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/ConnectionExistenceChecker.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/ConnectionExistenceChecker.java
new file mode 100644
index 00000000000..24fa1f91095
--- /dev/null
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/ConnectionExistenceChecker.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.connectivity.service.enforcement.pre;
+
+import java.util.concurrent.CompletionStage;
+
+import org.eclipse.ditto.connectivity.api.ConnectivityMessagingConstants;
+import org.eclipse.ditto.connectivity.model.ConnectionId;
+import org.eclipse.ditto.connectivity.model.signals.commands.modify.ModifyConnection;
+import org.eclipse.ditto.internal.utils.cache.entry.Entry;
+import org.eclipse.ditto.internal.utils.cluster.ShardRegionProxyActorFactory;
+import org.eclipse.ditto.internal.utils.cluster.config.DefaultClusterConfig;
+import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
+import org.eclipse.ditto.policies.enforcement.config.DefaultEnforcementConfig;
+import org.eclipse.ditto.policies.enforcement.config.EnforcementConfig;
+
+import com.github.benmanes.caffeine.cache.AsyncCacheLoader;
+
+import akka.actor.ActorRef;
+import akka.actor.ActorSystem;
+
+/**
+ * checks for the existence of connections.
+ */
+final class ConnectionExistenceChecker {
+
+    public static final String ENFORCEMENT_CACHE_DISPATCHER = "enforcement-cache-dispatcher";
+
+    private final AsyncCacheLoader<ConnectionId, Entry<ConnectionId>> connectionIdLoader;
+    private final ActorSystem actorSystem;
+
+    ConnectionExistenceChecker(final ActorSystem actorSystem) {
+        this.actorSystem = actorSystem;
+        final var enforcementConfig = DefaultEnforcementConfig.of(
+                DefaultScopedConfig.dittoScoped(actorSystem.settings().config()));
+        connectionIdLoader = getConnectionIdLoader(actorSystem, enforcementConfig);
+    }
+
+    private AsyncCacheLoader<ConnectionId, Entry<ConnectionId>> getConnectionIdLoader(
+            final ActorSystem actorSystem,
+            final EnforcementConfig enforcementConfig) {
+
+        final var clusterConfig = DefaultClusterConfig.of(actorSystem.settings().config().getConfig("ditto.cluster"));
+        final ShardRegionProxyActorFactory shardRegionProxyActorFactory =
+                ShardRegionProxyActorFactory.newInstance(actorSystem, clusterConfig);
+
+        final ActorRef connectionShardRegion = shardRegionProxyActorFactory.getShardRegionProxyActor(
+                ConnectivityMessagingConstants.CLUSTER_ROLE, ConnectivityMessagingConstants.SHARD_REGION);
+        return new PreEnforcementConnectionIdCacheLoader(enforcementConfig.getAskWithRetryConfig(),
+                actorSystem.getScheduler(),
+                connectionShardRegion);
+    }
+
+    public CompletionStage<Boolean> checkExistence(final ModifyConnection signal) {
+        try {
+            return connectionIdLoader.asyncLoad(signal.getEntityId(),
+                            actorSystem.dispatchers().lookup(ENFORCEMENT_CACHE_DISPATCHER))
+                    .thenApply(Entry::exists);
+        } catch (final Exception e) {
+            throw new IllegalStateException("Could not load connection via connectionIdLoader", e);
+        }
+    }
+
+}
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/ModifyToCreateConnectionTransformer.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/ModifyToCreateConnectionTransformer.java
new file mode 100644
index 00000000000..5d713fe5781
--- /dev/null
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/ModifyToCreateConnectionTransformer.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.connectivity.service.enforcement.pre;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.base.service.signaltransformer.SignalTransformer;
+import org.eclipse.ditto.connectivity.model.signals.commands.modify.CreateConnection;
+import org.eclipse.ditto.connectivity.model.signals.commands.modify.ModifyConnection;
+
+import com.typesafe.config.Config;
+
+import akka.actor.ActorSystem;
+
+/**
+ * Transforms a ModifyConnection into a CreateConnection if the connection does not exist already.
+ */
+public final class ModifyToCreateConnectionTransformer implements SignalTransformer {
+
+    private final ConnectionExistenceChecker existenceChecker;
+
+    @SuppressWarnings("unused")
+    ModifyToCreateConnectionTransformer(final ActorSystem actorSystem, final Config config) {
+        this(new ConnectionExistenceChecker(actorSystem));
+    }
+
+    ModifyToCreateConnectionTransformer(final ConnectionExistenceChecker existenceChecker) {
+        this.existenceChecker = existenceChecker;
+    }
+
+    @Override
+    public CompletionStage<Signal<?>> apply(final Signal<?> signal) {
+        if (signal instanceof ModifyConnection modifyConnection) {
+            return existenceChecker.checkExistence(modifyConnection)
+                    .thenApply(exists -> {
+                        if (Boolean.FALSE.equals(exists)) {
+                            return CreateConnection.of(
+                                    modifyConnection.getConnection(),
+                                    modifyConnection.getDittoHeaders()
+                            );
+                        } else {
+                            return modifyConnection;
+                        }
+                    });
+        } else {
+            return CompletableFuture.completedStage(signal);
+        }
+    }
+
+}
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/PreEnforcementConnectionIdCacheLoader.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/PreEnforcementConnectionIdCacheLoader.java
new file mode 100644
index 00000000000..8968c77b109
--- /dev/null
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/PreEnforcementConnectionIdCacheLoader.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.connectivity.service.enforcement.pre;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.commands.Command;
+import org.eclipse.ditto.connectivity.model.ConnectionId;
+import org.eclipse.ditto.connectivity.model.ConnectivityConstants;
+import org.eclipse.ditto.connectivity.model.signals.commands.exceptions.ConnectionNotAccessibleException;
+import org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnection;
+import org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnectionResponse;
+import org.eclipse.ditto.internal.utils.cache.entry.Entry;
+import org.eclipse.ditto.internal.utils.cacheloaders.ActorAskCacheLoader;
+import org.eclipse.ditto.internal.utils.cacheloaders.config.AskWithRetryConfig;
+import org.eclipse.ditto.json.JsonFieldSelector;
+
+import com.github.benmanes.caffeine.cache.AsyncCacheLoader;
+
+import akka.actor.ActorRef;
+import akka.actor.Scheduler;
+
+/**
+ * Cache loader used for Connection existence check in pre-enforcement.
+ */
+final class PreEnforcementConnectionIdCacheLoader implements
+        AsyncCacheLoader<ConnectionId, Entry<ConnectionId>> {
+
+    private final ActorAskCacheLoader<ConnectionId, Command<?>, ConnectionId> delegate;
+
+    /**
+     * Constructor.
+     *
+     * @param askWithRetryConfig the configuration for the "ask with retry" pattern applied for the cache loader.
+     * @param scheduler the scheduler to use for the "ask with retry" for retries.
+     * @param shardRegionProxy the shard-region-proxy.
+     */
+    public PreEnforcementConnectionIdCacheLoader(final AskWithRetryConfig askWithRetryConfig,
+            final Scheduler scheduler,
+            final ActorRef shardRegionProxy) {
+
+        delegate = ActorAskCacheLoader.forShard(askWithRetryConfig,
+                scheduler,
+                ConnectivityConstants.ENTITY_TYPE,
+                shardRegionProxy,
+                connectionId -> RetrieveConnection.of(connectionId, JsonFieldSelector.newInstance("id"), DittoHeaders.empty()),
+                PreEnforcementConnectionIdCacheLoader::handleRetrieveConnectionResponse);
+    }
+
+    @Override
+    public CompletableFuture<Entry<ConnectionId>> asyncLoad(final ConnectionId key, final Executor executor) {
+        return delegate.asyncLoad(key, executor);
+    }
+
+    private static Entry<ConnectionId> handleRetrieveConnectionResponse(final Object response) {
+
+        if (response instanceof RetrieveConnectionResponse retrieveConnectionResponse) {
+            final ConnectionId connectionId = retrieveConnectionResponse.getEntityId();
+            return Entry.of(-1, connectionId);
+        } else if (response instanceof ConnectionNotAccessibleException) {
+            return Entry.nonexistent();
+        } else {
+            throw new IllegalStateException("expect RetrieveConnectionResponse, got: " + response);
+        }
+    }
+
+}
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/package-info.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/package-info.java
new file mode 100644
index 00000000000..35e7d14ecc6
--- /dev/null
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/enforcement/pre/package-info.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+@org.eclipse.ditto.utils.jsr305.annotations.AllParametersAndReturnValuesAreNonnullByDefault
+package org.eclipse.ditto.connectivity.service.enforcement.pre;
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/stages/StagedCommand.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/stages/StagedCommand.java
index 96777760a5a..140dbb0501f 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/stages/StagedCommand.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/stages/StagedCommand.java
@@ -27,6 +27,8 @@
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.connectivity.model.ConnectionId;
+import org.eclipse.ditto.connectivity.model.WithConnectionId;
 import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
 import org.eclipse.ditto.json.JsonField;
@@ -41,7 +43,8 @@
  * It contains a sequence of actions. Some actions are asynchronous. The connection actor can thus schedule the next
  * action as a staged command to self after an asynchronous action. Synchronous actions can be executed right away.
  */
-public final class StagedCommand implements ConnectivityCommand<StagedCommand>, Iterator<StagedCommand> {
+public final class StagedCommand implements ConnectivityCommand<StagedCommand>, Iterator<StagedCommand>,
+        WithConnectionId {
 
     private final ConnectivityCommand<?> command;
     @Nullable private final ConnectivityEvent<?> event;
@@ -82,6 +85,17 @@ public ConnectivityCommand<?> getCommand() {
         return command;
     }
 
+    @Override
+    public ConnectionId getEntityId() {
+        if (command instanceof WithConnectionId withConnectionId) {
+            return withConnectionId.getEntityId();
+        } else if (event != null) {
+            return event.getEntityId();
+        } else {
+            throw new IllegalStateException("Could not determine ConnectionId in StagedCommand");
+        }
+    }
+
     /**
      * @return the event to persist, apply or publish or dummy-event.
      */
@@ -210,4 +224,5 @@ public ConnectionAction nextAction() {
     private Queue<ConnectionAction> getActionsAsQueue() {
         return new LinkedList<>(actions);
     }
+
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/AbstractConnectivityCommandStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/AbstractConnectivityCommandStrategy.java
index 2d11f67ebbf..65608619c5e 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/AbstractConnectivityCommandStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/AbstractConnectivityCommandStrategy.java
@@ -29,7 +29,8 @@
 import org.eclipse.ditto.connectivity.model.signals.commands.exceptions.ConnectionNotAccessibleException;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
 import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
-import org.eclipse.ditto.internal.utils.persistentactors.commands.AbstractCommandStrategy;
+import org.eclipse.ditto.internal.utils.headers.conditional.ConditionalHeadersValidator;
+import org.eclipse.ditto.internal.utils.persistentactors.etags.AbstractConditionHeaderCheckingCommandStrategy;
 
 /**
  * Abstract base class for {@link org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand} strategies.
@@ -37,12 +38,20 @@
  * @param <C> the type of the handled command
  */
 abstract class AbstractConnectivityCommandStrategy<C extends Command<?>>
-        extends AbstractCommandStrategy<C, Connection, ConnectionState, ConnectivityEvent<?>> {
+        extends AbstractConditionHeaderCheckingCommandStrategy<C, Connection, ConnectionState, ConnectivityEvent<?>> {
 
-    AbstractConnectivityCommandStrategy(final Class<?> theMatchingClass) {
+    private static final ConditionalHeadersValidator VALIDATOR =
+            ConnectionsConditionalHeadersValidatorProvider.getInstance();
+
+    protected AbstractConnectivityCommandStrategy(final Class<C> theMatchingClass) {
         super(theMatchingClass);
     }
 
+    @Override
+    protected ConditionalHeadersValidator getValidator() {
+        return VALIDATOR;
+    }
+
     @Override
     public boolean isDefined(final C command) {
         return command instanceof ConnectivityCommand || command instanceof ConnectivitySudoCommand;
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/CloseConnectionStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/CloseConnectionStrategy.java
index 3b3bb0e322e..36db15991b5 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/CloseConnectionStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/CloseConnectionStrategy.java
@@ -16,20 +16,22 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.model.Connection;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand;
-import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.CloseConnection;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.CloseConnectionResponse;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionClosed;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand;
+import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 
 /**
  * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.modify.CloseConnection} command.
@@ -56,4 +58,15 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
                         ConnectionAction.SEND_RESPONSE);
         return newMutationResult(StagedCommand.of(command, event, response, actions), event, response);
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final CloseConnection command,
+            @Nullable final Connection previousEntity) {
+        return Optional.ofNullable(previousEntity).flatMap(EntityTag::fromEntity);
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final CloseConnection command, @Nullable final Connection newEntity) {
+        return Optional.of(getEntityOrThrow(newEntity)).flatMap(EntityTag::fromEntity);
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionConflictStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionConflictStrategy.java
index 8387721afdc..9d6050e93fc 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionConflictStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionConflictStrategy.java
@@ -14,15 +14,18 @@
 
 import static org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory.newErrorResult;
 
+import java.util.Optional;
+
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.model.Connection;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
-import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 import org.eclipse.ditto.connectivity.model.signals.commands.exceptions.ConnectionConflictException;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.CreateConnection;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
+import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 
 /**
  * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.modify.CreateConnection} command
@@ -49,4 +52,15 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
                         .build();
         return newErrorResult(conflictException, command);
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final CreateConnection command,
+            @Nullable final Connection previousEntity) {
+        return Optional.ofNullable(previousEntity).flatMap(EntityTag::fromEntity);
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final CreateConnection command, @Nullable final Connection newEntity) {
+        return Optional.ofNullable(newEntity).flatMap(EntityTag::fromEntity);
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionUninitializedStrategies.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionUninitializedStrategies.java
deleted file mode 100644
index f606c1e0215..00000000000
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionUninitializedStrategies.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.eclipse.ditto.connectivity.service.messaging.persistence.strategies.commands;
-
-import java.util.Optional;
-import java.util.function.Consumer;
-
-import javax.annotation.Nullable;
-
-import org.eclipse.ditto.base.model.entity.metadata.Metadata;
-import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.connectivity.model.Connection;
-import org.eclipse.ditto.connectivity.model.signals.commands.exceptions.ConnectionNotAccessibleException;
-import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
-import org.eclipse.ditto.internal.utils.persistentactors.commands.AbstractCommandStrategy;
-import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
-import org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory;
-
-/**
- * Strategies to handle signals as an uninitialized connection that stashes every command.
- */
-public final class ConnectionUninitializedStrategies
-        extends AbstractCommandStrategy<Command<?>, Connection, ConnectionState, ConnectivityEvent<?>>
-        implements ConnectivityCommandStrategies {
-
-    private final Consumer<Command<?>> action;
-
-    private ConnectionUninitializedStrategies(final Consumer<Command<?>> action) {
-        super(Command.class);
-        this.action = action;
-    }
-
-    /**
-     * Return a new instance of this class.
-     *
-     * @param action what to do on connectivity commands.
-     * @return the empty result.
-     */
-    public static ConnectionUninitializedStrategies of(final Consumer<Command<?>> action) {
-        return new ConnectionUninitializedStrategies(action);
-    }
-
-    @Override
-    public boolean isDefined(final Command<?> command) {
-        return true;
-    }
-
-    @Override
-    protected Optional<Metadata> calculateRelativeMetadata(@Nullable final Connection entity,
-            final Command<?> command) {
-        return Optional.empty();
-    }
-
-    @Override
-    protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> context,
-            @Nullable final Connection entity,
-            final long nextRevision, final Command<?> command, @Nullable final Metadata metadata) {
-        action.accept(command);
-        return Result.empty();
-    }
-
-    @Override
-    public Result<ConnectivityEvent<?>> unhandled(final Context<ConnectionState> context,
-            @Nullable final Connection entity,
-            final long nextRevision,
-            final Command<?> command) {
-
-        return ResultFactory.newErrorResult(ConnectionNotAccessibleException
-                .newBuilder(context.getState().id())
-                .dittoHeaders(command.getDittoHeaders())
-                .build(), command);
-    }
-
-}
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionsConditionalHeadersValidatorProvider.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionsConditionalHeadersValidatorProvider.java
new file mode 100644
index 00000000000..d83645f573e
--- /dev/null
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionsConditionalHeadersValidatorProvider.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.connectivity.service.messaging.persistence.strategies.commands;
+
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
+import org.eclipse.ditto.connectivity.model.signals.commands.exceptions.ConnectionPreconditionFailedException;
+import org.eclipse.ditto.connectivity.model.signals.commands.exceptions.ConnectionPreconditionNotModifiedException;
+import org.eclipse.ditto.internal.utils.headers.conditional.ConditionalHeadersValidator;
+
+/**
+ * Provides a {@link ConditionalHeadersValidator} which checks conditional (http) headers based on a given ETag on
+ * Connection resources.
+ */
+@Immutable
+final class ConnectionsConditionalHeadersValidatorProvider {
+
+    /**
+     * Settings for validating conditional headers on Connection resources.
+     */
+    private static class ConnectionsConditionalHeadersValidationSettings
+            implements ConditionalHeadersValidator.ValidationSettings {
+
+        /**
+         * Returns a builder for a {@link org.eclipse.ditto.things.model.signals.commands.exceptions.ThingPreconditionFailedException}.
+         *
+         * @param conditionalHeaderName the name of the conditional header.
+         * @param expected the expected value.
+         * @param actual the actual ETag value.
+         * @return the builder.
+         */
+        @Override
+        public DittoRuntimeExceptionBuilder<?> createPreconditionFailedExceptionBuilder(final String conditionalHeaderName,
+                final String expected, final String actual) {
+            return ConnectionPreconditionFailedException.newBuilder(conditionalHeaderName, expected, actual);
+        }
+
+        /**
+         * Returns a builder for a {@link ConnectionPreconditionNotModifiedException}.
+         *
+         * @param expectedNotToMatch the value which was expected not to match {@code matched} value.
+         * @param matched the matched value.
+         * @return the builder.
+         */
+        @Override
+        public DittoRuntimeExceptionBuilder<?> createPreconditionNotModifiedExceptionBuilder(
+                final String expectedNotToMatch, final String matched) {
+            return ConnectionPreconditionNotModifiedException.newBuilder(expectedNotToMatch, matched);
+        }
+    }
+
+    private static final ConditionalHeadersValidator INSTANCE = createInstance();
+
+    private ConnectionsConditionalHeadersValidatorProvider() {
+        throw new AssertionError();
+    }
+
+    /**
+     * Returns the (singleton) instance of {@link org.eclipse.ditto.internal.utils.headers.conditional.ConditionalHeadersValidator} for Thing resources.
+     *
+     * @return the {@link org.eclipse.ditto.internal.utils.headers.conditional.ConditionalHeadersValidator}.
+     */
+    public static ConditionalHeadersValidator getInstance() {
+        return INSTANCE;
+    }
+
+    private static ConditionalHeadersValidator createInstance() {
+        return ConditionalHeadersValidator.of(new ConnectionsConditionalHeadersValidationSettings(),
+                checker -> false);
+    }
+
+}
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/CreateConnectionStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/CreateConnectionStrategy.java
index e4978b5a5e0..0e640ab3cc0 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/CreateConnectionStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/CreateConnectionStrategy.java
@@ -22,7 +22,9 @@
 import static org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory.newErrorResult;
 import static org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory.newMutationResult;
 
+import java.time.Instant;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import javax.annotation.Nullable;
@@ -30,16 +32,17 @@
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectivityStatus;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand;
-import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.CreateConnection;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.CreateConnectionResponse;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionCreated;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand;
+import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 
 /**
  * This strategy handles the {@link CreateConnection} command.
@@ -50,6 +53,21 @@ final class CreateConnectionStrategy extends AbstractConnectivityCommandStrategy
         super(CreateConnection.class);
     }
 
+    @Override
+    public boolean isDefined(final CreateConnection command) {
+        return true;
+    }
+
+    @Override
+    public boolean isDefined(final Context<ConnectionState> context, @Nullable final Connection connection,
+            final CreateConnection command) {
+        final boolean connectionExists = Optional.ofNullable(connection)
+                .map(t -> !t.isDeleted())
+                .orElse(false);
+
+        return !connectionExists && Objects.equals(context.getState().id(), command.getEntityId());
+    }
+
     @Override
     protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> context,
             @Nullable final Connection entity,
@@ -57,7 +75,12 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
             final CreateConnection command,
             @Nullable final Metadata metadata) {
 
-        final Connection connection = command.getConnection().toBuilder().lifecycle(ACTIVE).build();
+        final Instant timestamp = getEventTimestamp();
+        final Connection connection = command.getConnection().toBuilder().lifecycle(ACTIVE)
+                .revision(nextRevision)
+                .created(timestamp)
+                .modified(timestamp)
+                .build();
         final ConnectivityEvent<?> event =
                 ConnectionCreated.of(connection, nextRevision, getEventTimestamp(), command.getDittoHeaders(),
                         metadata);
@@ -78,4 +101,15 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
             return newMutationResult(command, event, response, true, false);
         }
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final CreateConnection command,
+            @Nullable final Connection previousEntity) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final CreateConnection command, @Nullable final Connection newEntity) {
+        return Optional.ofNullable(newEntity).flatMap(EntityTag::fromEntity);
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/DeleteConnectionStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/DeleteConnectionStrategy.java
index f27f0559c68..459aed74e2d 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/DeleteConnectionStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/DeleteConnectionStrategy.java
@@ -16,23 +16,25 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.model.Connection;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand;
-import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.DeleteConnection;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.DeleteConnectionResponse;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionDeleted;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand;
+import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.modify.DeleteConnection}
+ * This strategy handles the {@link DeleteConnection}
  * command.
  */
 final class DeleteConnectionStrategy extends AbstractConnectivityCommandStrategy<DeleteConnection> {
@@ -61,4 +63,14 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
         return newMutationResult(StagedCommand.of(command, event, response, actions), event, response);
     }
 
+    @Override
+    public Optional<EntityTag> previousEntityTag(final DeleteConnection command,
+            @Nullable final Connection previousEntity) {
+        return Optional.ofNullable(previousEntity).flatMap(EntityTag::fromEntity);
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final DeleteConnection command, @Nullable final Connection newEntity) {
+        return Optional.empty();
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/EnableConnectionLogsStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/EnableConnectionLogsStrategy.java
index b6047eaebbd..5f2c17b9fe2 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/EnableConnectionLogsStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/EnableConnectionLogsStrategy.java
@@ -14,16 +14,21 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
+import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.EnableConnectionLogs;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.EnableConnectionLogsResponse;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.modify.EnableConnectionLogs} command.
+ * This strategy handles the {@link EnableConnectionLogs} command.
  */
 final class EnableConnectionLogsStrategy extends AbstractEphemeralStrategy<EnableConnectionLogs> {
 
@@ -40,4 +45,15 @@ WithDittoHeaders getResponse(final ConnectionState state, final DittoHeaders hea
     List<ConnectionAction> getActions() {
         return Arrays.asList(ConnectionAction.BROADCAST_TO_CLIENT_ACTORS_IF_STARTED, ConnectionAction.SEND_RESPONSE, ConnectionAction.ENABLE_LOGGING);
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final EnableConnectionLogs command,
+            @Nullable final Connection previousEntity) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final EnableConnectionLogs command, @Nullable final Connection newEntity) {
+        return Optional.empty();
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/LoggingExpiredStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/LoggingExpiredStrategy.java
index 81f09893640..e44ccc0b1f5 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/LoggingExpiredStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/LoggingExpiredStrategy.java
@@ -12,11 +12,17 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging.persistence.strategies.commands;
 
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
+import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.LoggingExpired;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.modify.LoggingExpired} command.
+ * This strategy handles the {@link LoggingExpired} command.
  */
 final class LoggingExpiredStrategy extends AbstractSingleActionStrategy<LoggingExpired> {
 
@@ -28,4 +34,15 @@ final class LoggingExpiredStrategy extends AbstractSingleActionStrategy<LoggingE
     ConnectionAction getAction() {
         return ConnectionAction.DISABLE_LOGGING;
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final LoggingExpired command,
+            @Nullable final Connection previousEntity) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final LoggingExpired command, @Nullable final Connection newEntity) {
+        return Optional.empty();
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ModifyConnectionStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ModifyConnectionStrategy.java
index d8252b31f1b..2c9813c8a49 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ModifyConnectionStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ModifyConnectionStrategy.java
@@ -16,6 +16,7 @@
 import static org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory.newErrorResult;
 import static org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory.newMutationResult;
 
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -25,21 +26,22 @@
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectionConfigurationInvalidException;
 import org.eclipse.ditto.connectivity.model.ConnectivityStatus;
+import org.eclipse.ditto.connectivity.model.signals.commands.modify.ModifyConnection;
+import org.eclipse.ditto.connectivity.model.signals.commands.modify.ModifyConnectionResponse;
+import org.eclipse.ditto.connectivity.model.signals.events.ConnectionModified;
+import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
 import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
 import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
 import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand;
 import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 import org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory;
-import org.eclipse.ditto.connectivity.model.signals.commands.modify.ModifyConnection;
-import org.eclipse.ditto.connectivity.model.signals.commands.modify.ModifyConnectionResponse;
-import org.eclipse.ditto.connectivity.model.signals.events.ConnectionModified;
-import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.modify.ModifyConnection} command.
+ * This strategy handles the {@link ModifyConnection} command.
  */
 final class ModifyConnectionStrategy extends AbstractConnectivityCommandStrategy<ModifyConnection> {
 
@@ -54,7 +56,11 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
             final ModifyConnection command,
             @Nullable final Metadata metadata) {
 
-        final Connection connection = command.getConnection().toBuilder().lifecycle(ACTIVE).build();
+        final Instant eventTs = getEventTimestamp();
+        final Connection connection = command.getConnection().toBuilder().lifecycle(ACTIVE)
+                .revision(nextRevision)
+                .modified(eventTs)
+                .build();
         if (entity != null && entity.getConnectionType() != connection.getConnectionType() &&
                 !command.getDittoHeaders().isSudo()) {
             return ResultFactory.newErrorResult(
@@ -96,4 +102,15 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
             return newMutationResult(command, event, response);
         }
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final ModifyConnection command,
+            @Nullable final Connection previousEntity) {
+        return Optional.ofNullable(previousEntity).flatMap(EntityTag::fromEntity);
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final ModifyConnection command, @Nullable final Connection newEntity) {
+        return Optional.of(getEntityOrThrow(newEntity)).flatMap(EntityTag::fromEntity);
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/OpenConnectionStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/OpenConnectionStrategy.java
index f5978d4ec57..14048528575 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/OpenConnectionStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/OpenConnectionStrategy.java
@@ -29,15 +29,16 @@
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.model.Connection;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand;
-import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.OpenConnection;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.OpenConnectionResponse;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionOpened;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand;
+import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 
 /**
  * This strategy handles the {@link OpenConnection} command.
@@ -69,4 +70,15 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
             return newMutationResult(StagedCommand.of(command, event, response, actions), event, response);
         }
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final OpenConnection command,
+            @Nullable final Connection previousEntity) {
+        return Optional.ofNullable(previousEntity).flatMap(EntityTag::fromEntity);
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final OpenConnection command, @Nullable final Connection newEntity) {
+        return Optional.of(getEntityOrThrow(newEntity)).flatMap(EntityTag::fromEntity);
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ResetConnectionLogsStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ResetConnectionLogsStrategy.java
index aa80d590d8a..fc59fe58805 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ResetConnectionLogsStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ResetConnectionLogsStrategy.java
@@ -14,13 +14,18 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
+import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.ResetConnectionLogs;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.ResetConnectionLogsResponse;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
 
 /**
  * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.modify.ResetConnectionLogs}
@@ -41,4 +46,15 @@ WithDittoHeaders getResponse(final ConnectionState state, final DittoHeaders hea
     List<ConnectionAction> getActions() {
         return Arrays.asList(ConnectionAction.BROADCAST_TO_CLIENT_ACTORS_IF_STARTED, ConnectionAction.SEND_RESPONSE);
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final ResetConnectionLogs command,
+            @Nullable final Connection previousEntity) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final ResetConnectionLogs command, @Nullable final Connection newEntity) {
+        return Optional.empty();
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ResetConnectionMetricsStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ResetConnectionMetricsStrategy.java
index 40db31d9de2..f7a3faf7625 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ResetConnectionMetricsStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ResetConnectionMetricsStrategy.java
@@ -14,16 +14,21 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
+import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.ResetConnectionMetrics;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.ResetConnectionMetricsResponse;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.modify.ResetConnectionMetrics}
+ * This strategy handles the {@link ResetConnectionMetrics}
  * command.
  */
 final class ResetConnectionMetricsStrategy extends AbstractEphemeralStrategy<ResetConnectionMetrics> {
@@ -41,4 +46,16 @@ WithDittoHeaders getResponse(final ConnectionState state, final DittoHeaders hea
     List<ConnectionAction> getActions() {
         return Arrays.asList(ConnectionAction.BROADCAST_TO_CLIENT_ACTORS_IF_STARTED, ConnectionAction.SEND_RESPONSE);
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final ResetConnectionMetrics command,
+            @Nullable final Connection previousEntity) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final ResetConnectionMetrics command,
+            @Nullable final Connection newEntity) {
+        return Optional.empty();
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionLogsStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionLogsStrategy.java
index c93539703cf..988b39526cc 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionLogsStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionLogsStrategy.java
@@ -12,11 +12,17 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging.persistence.strategies.commands;
 
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
+import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnectionLogs;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnectionLogs}
+ * This strategy handles the {@link RetrieveConnectionLogs}
  * command.
  */
 final class RetrieveConnectionLogsStrategy extends AbstractSingleActionStrategy<RetrieveConnectionLogs> {
@@ -29,4 +35,16 @@ final class RetrieveConnectionLogsStrategy extends AbstractSingleActionStrategy<
     ConnectionAction getAction() {
         return ConnectionAction.RETRIEVE_CONNECTION_LOGS;
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final RetrieveConnectionLogs command,
+            @Nullable final Connection previousEntity) {
+        return nextEntityTag(command, previousEntity);
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final RetrieveConnectionLogs command,
+            @Nullable final Connection newEntity) {
+        return Optional.ofNullable(newEntity).flatMap(EntityTag::fromEntity);
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionMetricsStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionMetricsStrategy.java
index a6de954cfb6..c9f801253a1 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionMetricsStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionMetricsStrategy.java
@@ -12,11 +12,17 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging.persistence.strategies.commands;
 
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
+import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnectionMetrics;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnectionMetrics}
+ * This strategy handles the {@link RetrieveConnectionMetrics}
  * command.
  */
 final class RetrieveConnectionMetricsStrategy extends AbstractSingleActionStrategy<RetrieveConnectionMetrics> {
@@ -29,4 +35,16 @@ final class RetrieveConnectionMetricsStrategy extends AbstractSingleActionStrate
     ConnectionAction getAction() {
         return ConnectionAction.RETRIEVE_CONNECTION_METRICS;
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final RetrieveConnectionMetrics command,
+            @Nullable final Connection previousEntity) {
+        return nextEntityTag(command, previousEntity);
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final RetrieveConnectionMetrics command,
+            @Nullable final Connection newEntity) {
+        return Optional.ofNullable(newEntity).flatMap(EntityTag::fromEntity);
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionStatusStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionStatusStrategy.java
index 98bba007344..17d63c06cf3 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionStatusStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionStatusStrategy.java
@@ -12,11 +12,17 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging.persistence.strategies.commands;
 
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
+import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnectionStatus;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnectionStatus}
+ * This strategy handles the {@link RetrieveConnectionStatus}
  * command.
  */
 final class RetrieveConnectionStatusStrategy extends AbstractSingleActionStrategy<RetrieveConnectionStatus> {
@@ -29,4 +35,16 @@ final class RetrieveConnectionStatusStrategy extends AbstractSingleActionStrateg
     ConnectionAction getAction() {
         return ConnectionAction.RETRIEVE_CONNECTION_STATUS;
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final RetrieveConnectionStatus command,
+            @Nullable final Connection previousEntity) {
+        return nextEntityTag(command, previousEntity);
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final RetrieveConnectionStatus command,
+            @Nullable final Connection newEntity) {
+        return Optional.ofNullable(newEntity).flatMap(EntityTag::fromEntity);
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionStrategy.java
index 0efc54c8747..8afe2019b92 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveConnectionStrategy.java
@@ -12,19 +12,26 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging.persistence.strategies.commands;
 
+import java.util.Optional;
+
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
+import org.eclipse.ditto.base.model.headers.DittoHeadersSettable;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.model.Connection;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
-import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
-import org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory;
+import org.eclipse.ditto.connectivity.model.signals.commands.exceptions.ConnectionNotAccessibleException;
+import org.eclipse.ditto.connectivity.model.signals.commands.query.ConnectivityQueryCommand;
 import org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnection;
 import org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnectionResponse;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
+import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
+import org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory;
+import org.eclipse.ditto.json.JsonObject;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnection} command.
+ * This strategy handles the {@link RetrieveConnection} command.
  */
 final class RetrieveConnectionStrategy extends AbstractConnectivityCommandStrategy<RetrieveConnection> {
 
@@ -41,9 +48,40 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
 
         if (entity != null) {
             return ResultFactory.newQueryResult(command,
-                    RetrieveConnectionResponse.of(entity.toJson(), command.getDittoHeaders()));
+                    appendETagHeaderIfProvided(command, getRetrieveConnectionResponse(entity, command), entity)
+            );
         } else {
             return ResultFactory.newErrorResult(notAccessible(context, command), command);
         }
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final RetrieveConnection command,
+            @Nullable final Connection previousEntity) {
+        return nextEntityTag(command, previousEntity);
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final RetrieveConnection command, @Nullable final Connection newEntity) {
+        return Optional.ofNullable(newEntity).flatMap(EntityTag::fromEntity);
+    }
+
+    private static DittoHeadersSettable<?> getRetrieveConnectionResponse(@Nullable final Connection connection,
+            final ConnectivityQueryCommand<RetrieveConnection> command) {
+        if (connection != null) {
+            return RetrieveConnectionResponse.of(getConnectionJson(connection, command),
+                    command.getDittoHeaders());
+        } else {
+            return ConnectionNotAccessibleException.newBuilder(((RetrieveConnection) command).getEntityId())
+                    .dittoHeaders(command.getDittoHeaders())
+                    .build();
+        }
+    }
+
+    private static JsonObject getConnectionJson(final Connection connection,
+            final ConnectivityQueryCommand<RetrieveConnection> command) {
+        return ((RetrieveConnection) command).getSelectedFields()
+                .map(selectedFields -> connection.toJson(command.getImplementedSchemaVersion(), selectedFields))
+                .orElseGet(() -> connection.toJson(command.getImplementedSchemaVersion()));
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveResolvedHonoConnectionStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveResolvedHonoConnectionStrategy.java
index d997d23cb4f..aef990c5d4c 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveResolvedHonoConnectionStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/RetrieveResolvedHonoConnectionStrategy.java
@@ -12,11 +12,17 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging.persistence.strategies.commands;
 
+import java.util.Optional;
+
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
+import org.eclipse.ditto.base.model.headers.DittoHeadersSettable;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectionType;
+import org.eclipse.ditto.connectivity.model.signals.commands.exceptions.ConnectionNotAccessibleException;
+import org.eclipse.ditto.connectivity.model.signals.commands.query.ConnectivityQueryCommand;
 import org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveConnectionResponse;
 import org.eclipse.ditto.connectivity.model.signals.commands.query.RetrieveResolvedHonoConnection;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
@@ -24,6 +30,7 @@
 import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
 import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 import org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory;
+import org.eclipse.ditto.json.JsonObject;
 
 import akka.actor.ActorSystem;
 
@@ -49,13 +56,45 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
 
         final Result<ConnectivityEvent<?>> result;
         if (entity != null && entity.getConnectionType() == ConnectionType.HONO) {
-            final var json = honoConnectionFactory.getHonoConnection(entity).toJson();
-
-            result = ResultFactory.newQueryResult(command,
-                    RetrieveConnectionResponse.of(json, command.getDittoHeaders()));
+            return ResultFactory.newQueryResult(command,
+                    appendETagHeaderIfProvided(command, getRetrieveConnectionResponse(entity, command), entity)
+            );
         } else {
             result = ResultFactory.newErrorResult(notAccessible(context, command), command);
         }
         return result;
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final RetrieveResolvedHonoConnection command,
+            @Nullable final Connection previousEntity) {
+        return nextEntityTag(command, previousEntity);
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final RetrieveResolvedHonoConnection command,
+            @Nullable final Connection newEntity) {
+        return Optional.ofNullable(newEntity).flatMap(EntityTag::fromEntity);
+    }
+
+    private DittoHeadersSettable<?> getRetrieveConnectionResponse(@Nullable final Connection connection,
+            final ConnectivityQueryCommand<RetrieveResolvedHonoConnection> command) {
+        if (connection != null) {
+            return RetrieveConnectionResponse.of(getConnectionJson(connection, command),
+                    command.getDittoHeaders());
+        } else {
+            return ConnectionNotAccessibleException.newBuilder(((RetrieveResolvedHonoConnection) command).getEntityId())
+                    .dittoHeaders(command.getDittoHeaders())
+                    .build();
+        }
+    }
+
+    private JsonObject getConnectionJson(final Connection connection,
+            final ConnectivityQueryCommand<RetrieveResolvedHonoConnection> command) {
+
+        final Connection honoConnection = honoConnectionFactory.getHonoConnection(connection);
+        return ((RetrieveResolvedHonoConnection) command).getSelectedFields()
+                .map(selectedFields -> honoConnection.toJson(command.getImplementedSchemaVersion(), selectedFields))
+                .orElseGet(() -> honoConnection.toJson(command.getImplementedSchemaVersion()));
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/StagedCommandStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/StagedCommandStrategy.java
index b35efef2929..50921897e83 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/StagedCommandStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/StagedCommandStrategy.java
@@ -13,17 +13,19 @@
 package org.eclipse.ditto.connectivity.service.messaging.persistence.strategies.commands;
 
 import java.text.MessageFormat;
+import java.util.Optional;
 
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectivityInternalErrorException;
+import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
 import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
 import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand;
 import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 import org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory;
-import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
 
 /**
  * This strategy handles the {@link org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand}
@@ -50,4 +52,15 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
                         .dittoHeaders(command.getDittoHeaders())
                         .build(), command));
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final StagedCommand command,
+            @Nullable final Connection previousEntity) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final StagedCommand command, @Nullable final Connection newEntity) {
+        return Optional.empty();
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/SudoAddConnectionLogEntryStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/SudoAddConnectionLogEntryStrategy.java
index 9f71bd93e8b..3c59a182321 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/SudoAddConnectionLogEntryStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/SudoAddConnectionLogEntryStrategy.java
@@ -12,9 +12,12 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging.persistence.strategies.commands;
 
+import java.util.Optional;
+
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.api.commands.sudo.SudoAddConnectionLogEntry;
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectionId;
@@ -58,4 +61,16 @@ private ConnectionLogger getAppropriateLogger(final ConnectionLoggerRegistry con
                 logEntry.getLogType(),
                 logEntry.getAddress().orElse(null));
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final SudoAddConnectionLogEntry command,
+            @Nullable final Connection previousEntity) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final SudoAddConnectionLogEntry command,
+            @Nullable final Connection newEntity) {
+        return Optional.empty();
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/SudoRetrieveConnectionTagsStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/SudoRetrieveConnectionTagsStrategy.java
index 0b8b7a30fa9..f447b56f18e 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/SudoRetrieveConnectionTagsStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/SudoRetrieveConnectionTagsStrategy.java
@@ -12,9 +12,12 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging.persistence.strategies.commands;
 
+import java.util.Optional;
+
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.api.commands.sudo.SudoRetrieveConnectionTags;
 import org.eclipse.ditto.connectivity.api.commands.sudo.SudoRetrieveConnectionTagsResponse;
 import org.eclipse.ditto.connectivity.model.Connection;
@@ -46,4 +49,16 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
             return ResultFactory.newErrorResult(notAccessible(context, command), command);
         }
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final SudoRetrieveConnectionTags command,
+            @Nullable final Connection previousEntity) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final SudoRetrieveConnectionTags command,
+            @Nullable final Connection newEntity) {
+        return Optional.empty();
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/TestConnectionConflictStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/TestConnectionConflictStrategy.java
index 6837d04401d..7ce4217df36 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/TestConnectionConflictStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/TestConnectionConflictStrategy.java
@@ -14,15 +14,18 @@
 
 import static org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory.newQueryResult;
 
+import java.util.Optional;
+
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.model.Connection;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
-import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.TestConnection;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.TestConnectionResponse;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
+import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 
 /**
  * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.modify.TestConnection} command
@@ -44,4 +47,15 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
         return newQueryResult(command,
                 TestConnectionResponse.alreadyCreated(context.getState().id(), command.getDittoHeaders()));
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final TestConnection command,
+            @Nullable final Connection previousEntity) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final TestConnection command, @Nullable final Connection newEntity) {
+        return Optional.empty();
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/TestConnectionStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/TestConnectionStrategy.java
index 42ae1cc3514..4001ceb4f75 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/TestConnectionStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/TestConnectionStrategy.java
@@ -18,21 +18,23 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.model.Connection;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
-import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand;
-import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.TestConnection;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.TestConnectionResponse;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionCreated;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectivityEvent;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionAction;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.ConnectionState;
+import org.eclipse.ditto.connectivity.service.messaging.persistence.stages.StagedCommand;
+import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 
 /**
  * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.commands.modify.TestConnection} command.
@@ -43,6 +45,20 @@ final class TestConnectionStrategy extends AbstractConnectivityCommandStrategy<T
         super(TestConnection.class);
     }
 
+    @Override
+    public boolean isDefined(final TestConnection command) {
+        return true;
+    }
+
+    @Override
+    public boolean isDefined(final Context<ConnectionState> context, @Nullable final Connection connection, final TestConnection command) {
+        final boolean connectionExists = Optional.ofNullable(connection)
+                .map(t -> !t.isDeleted())
+                .orElse(false);
+
+        return !connectionExists && Objects.equals(context.getState().id(), command.getEntityId());
+    }
+
     @Override
     protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> context,
             @Nullable final Connection entity,
@@ -67,4 +83,15 @@ protected Result<ConnectivityEvent<?>> doApply(final Context<ConnectionState> co
                     TestConnectionResponse.alreadyCreated(context.getState().id(), command.getDittoHeaders()));
         }
     }
+
+    @Override
+    public Optional<EntityTag> previousEntityTag(final TestConnection command,
+            @Nullable final Connection previousEntity) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EntityTag> nextEntityTag(final TestConnection command, @Nullable final Connection newEntity) {
+        return Optional.empty();
+    }
 }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionClosedStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionClosedStrategy.java
index f106c7b3c4d..cc65c9f2dfc 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionClosedStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionClosedStrategy.java
@@ -18,11 +18,11 @@
 
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectivityStatus;
-import org.eclipse.ditto.internal.utils.persistentactors.events.EventStrategy;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionClosed;
+import org.eclipse.ditto.internal.utils.persistentactors.events.EventStrategy;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.events.ConnectionClosed} event.
+ * This strategy handles the {@link ConnectionClosed} event.
  */
 final class ConnectionClosedStrategy implements EventStrategy<ConnectionClosed, Connection> {
 
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionCreatedStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionCreatedStrategy.java
index 10fc23649c7..27cabadce17 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionCreatedStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionCreatedStrategy.java
@@ -15,11 +15,11 @@
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.connectivity.model.Connection;
-import org.eclipse.ditto.internal.utils.persistentactors.events.EventStrategy;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionCreated;
+import org.eclipse.ditto.internal.utils.persistentactors.events.EventStrategy;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.events.ConnectionCreated} event.
+ * This strategy handles the {@link ConnectionCreated} event.
  */
 final class ConnectionCreatedStrategy implements EventStrategy<ConnectionCreated, Connection> {
 
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionDeletedStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionDeletedStrategy.java
index ed958633104..5709cda7baf 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionDeletedStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionDeletedStrategy.java
@@ -16,11 +16,11 @@
 
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectionLifecycle;
-import org.eclipse.ditto.internal.utils.persistentactors.events.EventStrategy;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionDeleted;
+import org.eclipse.ditto.internal.utils.persistentactors.events.EventStrategy;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.events.ConnectionDeleted} event.
+ * This strategy handles the {@link ConnectionDeleted} event.
  */
 final class ConnectionDeletedStrategy implements EventStrategy<ConnectionDeleted, Connection> {
 
@@ -29,7 +29,9 @@ final class ConnectionDeletedStrategy implements EventStrategy<ConnectionDeleted
     public Connection handle(final ConnectionDeleted event, @Nullable final Connection connection,
             final long revision) {
         if (connection != null) {
-            return connection.toBuilder().lifecycle(ConnectionLifecycle.DELETED).build();
+            return connection.toBuilder().lifecycle(ConnectionLifecycle.DELETED)
+                    .modified(event.getTimestamp().orElse(null))
+                    .build();
         } else {
             return null;
         }
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionModifiedStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionModifiedStrategy.java
index 8a3a5e17f8f..72f0d14d249 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionModifiedStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionModifiedStrategy.java
@@ -15,11 +15,11 @@
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.connectivity.model.Connection;
-import org.eclipse.ditto.internal.utils.persistentactors.events.EventStrategy;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionModified;
+import org.eclipse.ditto.internal.utils.persistentactors.events.EventStrategy;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.events.ConnectionModified} event.
+ * This strategy handles the {@link ConnectionModified} event.
  */
 final class ConnectionModifiedStrategy implements EventStrategy<ConnectionModified, Connection> {
 
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionOpenedStrategy.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionOpenedStrategy.java
index 517b0986a45..884dbd10742 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionOpenedStrategy.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/events/ConnectionOpenedStrategy.java
@@ -18,17 +18,20 @@
 
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectivityStatus;
-import org.eclipse.ditto.internal.utils.persistentactors.events.EventStrategy;
 import org.eclipse.ditto.connectivity.model.signals.events.ConnectionOpened;
+import org.eclipse.ditto.internal.utils.persistentactors.events.EventStrategy;
 
 /**
- * This strategy handles the {@link org.eclipse.ditto.connectivity.model.signals.events.ConnectionOpened} event.
+ * This strategy handles the {@link ConnectionOpened} event.
  */
 final class ConnectionOpenedStrategy implements EventStrategy<ConnectionOpened, Connection> {
 
     @Override
     public Connection handle(final ConnectionOpened event, @Nullable final Connection connection,
             final long revision) {
-        return checkNotNull(connection, "connection").toBuilder().connectionStatus(ConnectivityStatus.OPEN).build();
+        return checkNotNull(connection, "connection")
+                .toBuilder()
+                .connectionStatus(ConnectivityStatus.OPEN)
+                .build();
     }
 }
diff --git a/connectivity/service/src/main/resources/connectivity-extension.conf b/connectivity/service/src/main/resources/connectivity-extension.conf
index e69de29bb2d..0529d13a7a2 100644
--- a/connectivity/service/src/main/resources/connectivity-extension.conf
+++ b/connectivity/service/src/main/resources/connectivity-extension.conf
@@ -0,0 +1,5 @@
+ditto.extensions {
+  signal-transformers-provider.extension-config.signal-transformers = [
+    "org.eclipse.ditto.connectivity.service.enforcement.pre.ModifyToCreateConnectionTransformer", // always keep this as first transformer in order to guarantee that all following transformers know that the command is creating a connection instead of modifying it
+  ] ${ditto.extensions.signal-transformers-provider.extension-config.signal-transformers}
+}
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/ErrorHandlingActorTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/ErrorHandlingActorTest.java
index 7391eb710c3..d40dd99cad9 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/ErrorHandlingActorTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/ErrorHandlingActorTest.java
@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import org.assertj.core.api.Assertions;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectionId;
@@ -91,7 +92,12 @@ public void tryCreateConnectionExpectSuccessResponseIndependentOfConnectionStatu
             // create connection
             final ConnectivityModifyCommand<?> command = CreateConnection.of(connection, DittoHeaders.empty());
             underTest.tell(command, getRef());
-            expectMsg(CreateConnectionResponse.of(connection, DittoHeaders.empty()));
+            final CreateConnectionResponse resp =
+                    expectMsgClass(dilated(CONNECT_TIMEOUT), CreateConnectionResponse.class);
+            Assertions.assertThat(resp.getConnection())
+                    .usingRecursiveComparison()
+                    .ignoringFields("revision", "modified", "created")
+                    .isEqualTo(connection);
         }};
         tearDown();
     }
@@ -121,9 +127,12 @@ public void tryDeleteConnectionExpectErrorResponse() {
             // create connection
             final CreateConnection createConnection = CreateConnection.of(connection, DittoHeaders.empty());
             underTest.tell(createConnection, getRef());
-            final CreateConnectionResponse createConnectionResponse =
-                    CreateConnectionResponse.of(connection, DittoHeaders.empty());
-            expectMsg(dilated(CONNECT_TIMEOUT), createConnectionResponse);
+            final CreateConnectionResponse resp =
+                    expectMsgClass(dilated(CONNECT_TIMEOUT), CreateConnectionResponse.class);
+            Assertions.assertThat(resp.getConnection())
+                    .usingRecursiveComparison()
+                    .ignoringFields("revision", "modified", "created")
+                    .isEqualTo(connection);
 
             // delete connection
             final ConnectivityModifyCommand<?> command = DeleteConnection.of(connectionId, DittoHeaders.empty());
@@ -147,9 +156,12 @@ private void tryModifyConnectionExpectErrorResponse(final String action) {
             // create connection
             final CreateConnection createConnection = CreateConnection.of(connection, DittoHeaders.empty());
             underTest.tell(createConnection, getRef());
-            final CreateConnectionResponse createConnectionResponse =
-                    CreateConnectionResponse.of(connection, DittoHeaders.empty());
-            expectMsg(createConnectionResponse);
+            final CreateConnectionResponse resp =
+                    expectMsgClass(dilated(CONNECT_TIMEOUT), CreateConnectionResponse.class);
+            Assertions.assertThat(resp.getConnection())
+                    .usingRecursiveComparison()
+                    .ignoringFields("revision", "modified", "created")
+                    .isEqualTo(connection);
 
             // modify connection
             final ConnectivityModifyCommand<?> command;
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
index 8362c2e16b5..31d1320b877 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collections;
@@ -28,12 +27,14 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.assertj.core.api.Assertions;
 import org.awaitility.Awaitility;
 import org.eclipse.ditto.base.api.persistence.cleanup.CleanupPersistence;
 import org.eclipse.ditto.base.api.persistence.cleanup.CleanupPersistenceResponse;
 import org.eclipse.ditto.base.model.correlationid.TestNameCorrelationId;
 import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.connectivity.api.BaseClientState;
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectionConfigurationInvalidException;
@@ -212,8 +213,14 @@ public void testConnection() {
     @Test
     public void testConnectionTypeHono() throws IOException {
         //GIVEN
-        final var honoConnection = generateConnectionObjectFromJsonFile("hono-connection-custom-test.json");
-        final var expectedHonoConnection = generateConnectionObjectFromJsonFile("hono-connection-custom-expected.json");
+        final var honoConnection = generateConnectionObjectFromJsonFile("hono-connection-custom-test.json")
+                .toBuilder()
+                .id(connectionId)
+                .build();
+        final var expectedHonoConnection = generateConnectionObjectFromJsonFile("hono-connection-custom-expected.json")
+                .toBuilder()
+                .id(connectionId)
+                .build();
         final var testConnection = TestConnection.of(honoConnection, dittoHeadersWithCorrelationId);
         final var testProbe = actorSystemResource1.newTestProbe();
         final var connectionSupervisorActor = createSupervisor();
@@ -257,7 +264,10 @@ public TestActor.AutoPilot run(final ActorRef sender, final Object msg) {
                         ConfigFactory.empty()));
 
         final var underTest = actorSystemResource1.newActor(connectionActorProps, connectionId.toString());
-        underTest.tell(createConnection(honoConnection), testProbe.ref());
+        final CreateConnection createConnection = createConnection(
+                honoConnection.toBuilder().id(connectionId).build()
+        );
+        underTest.tell(createConnection, testProbe.ref());
         testProbe.expectMsgClass(FiniteDuration.apply(20, "s"), CreateConnectionResponse.class);
 
         Arrays.stream(ConnectionType.values()).forEach(connectionType -> {
@@ -353,7 +363,7 @@ public void manageConnection() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // close connection
         final CloseConnection closeConnection = CloseConnection.of(connectionId, dittoHeadersWithCorrelationId);
@@ -378,7 +388,7 @@ public void deleteConnectionUpdatesSubscriptionsAndClosesConnection() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // delete connection
         underTest.tell(DeleteConnection.of(connectionId, dittoHeadersWithCorrelationId), testProbe.ref());
@@ -468,7 +478,7 @@ public void createConnectionAfterDeleted() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // delete connection
         underTest.tell(DeleteConnection.of(connectionId, dittoHeadersWithCorrelationId), testProbe.ref());
@@ -479,7 +489,7 @@ public void createConnectionAfterDeleted() {
         // create connection again (while ConnectionActor is in deleted state)
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
     }
 
     @Test
@@ -491,7 +501,7 @@ public void openConnectionAfterDeletedFails() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // delete connection
         underTest.tell(DeleteConnection.of(connectionId, dittoHeadersWithCorrelationId), testProbe.ref());
@@ -512,7 +522,7 @@ public void createConnectionInClosedState() {
 
         // create connection
         underTest.tell(createConnection(closedConnection), testProbe.ref());
-        testProbe.expectMsg(createConnectionResponse(closedConnection));
+        expectCreateConnectionResponse(testProbe, closedConnection);
 
         // assert that client actor is not called for closed connection
         mockClientActorProbe.expectNoMessage();
@@ -677,7 +687,7 @@ public void modifyConnectionInClosedState() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // close connection
         underTest.tell(CloseConnection.of(connectionId, dittoHeadersWithCorrelationId), testProbe.ref());
@@ -700,7 +710,7 @@ public void retrieveMetricsInClosedStateDoesNotStartClientActor() {
 
         // create connection
         underTest.tell(createConnection(closedConnection), testProbe.ref());
-        testProbe.expectMsg(createConnectionResponse(closedConnection));
+        expectCreateConnectionResponse(testProbe, closedConnection);
         mockClientActorProbe.expectNoMessage();
 
         // retrieve metrics
@@ -724,7 +734,7 @@ public void modifyConnectionClosesAndRestartsClientActor() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // modify connection | Implicitly validates the restart by waiting for pubsub subscribe from client actor.
         underTest.tell(ModifyConnection.of(connection, dittoHeadersWithCorrelationId), testProbe.ref());
@@ -749,7 +759,7 @@ public void recoverOpenConnection() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // stop actor
         actorSystemResource1.stopActor(underTest);
@@ -800,7 +810,7 @@ public void recoverModifiedConnection() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // modify connection
         final var modifiedConnection = ConnectivityModelFactory.newConnectionBuilder(connection)
@@ -822,7 +832,11 @@ public void recoverModifiedConnection() {
 
         // retrieve connection status
         underTest.tell(RetrieveConnection.of(connectionId, dittoHeadersWithCorrelationId), testProbe.ref());
-        testProbe.expectMsg(RetrieveConnectionResponse.of(modifiedConnection.toJson(), dittoHeadersWithCorrelationId));
+        testProbe.expectMsg(RetrieveConnectionResponse.of(modifiedConnection.toJson(),
+                dittoHeadersWithCorrelationId.toBuilder()
+                        .eTag(EntityTag.fromString("\"rev:2\""))
+                        .build()
+        ));
     }
 
     @Test
@@ -834,7 +848,7 @@ public void recoverClosedConnection() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // close connection
         underTest.tell(CloseConnection.of(connectionId, dittoHeadersWithCorrelationId), testProbe.ref());
@@ -876,7 +890,7 @@ public void recoverDeletedConnection() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // delete connection
         underTest.tell(DeleteConnection.of(connectionId, dittoHeadersWithCorrelationId), testProbe.ref());
@@ -900,7 +914,7 @@ public void exceptionDuringClientActorPropsCreation() {
         final var supervisor = actorSystemResource1.newTestProbe();
 
         final var connectionActorProps = ConnectionPersistenceActor.props(
-                TestConstants.createRandomConnectionId(),
+                connectionId,
                 Mockito.mock(MongoReadJournal.class),
                 commandForwarderActor,
                 pubSubMediatorProbe.ref(),
@@ -925,7 +939,7 @@ public void exceptionDuringClientActorPropsCreation() {
 
     @Test
     public void exceptionDueToCustomValidator() {
-        final var connectionActorProps = ConnectionPersistenceActor.props(TestConstants.createRandomConnectionId(),
+        final var connectionActorProps = ConnectionPersistenceActor.props(connectionId,
                 Mockito.mock(MongoReadJournal.class),
                 commandForwarderActor,
                 pubSubMediatorProbe.ref(),
@@ -960,7 +974,7 @@ public void testResetConnectionMetrics() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // reset metrics
         final var resetConnectionMetrics = ResetConnectionMetrics.of(connectionId, dittoHeadersWithCorrelationId);
@@ -979,7 +993,7 @@ public void testConnectionActorRespondsToCleanupCommand() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // send cleanup command
         underTest.tell(CleanupPersistence.of(connectionId, dittoHeadersWithCorrelationId), testProbe.ref());
@@ -995,7 +1009,7 @@ public void enableConnectionLogs() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         //Close logging which are automatically enabled via create connection
         underTest.tell(LoggingExpired.of(connectionId, dittoHeadersWithCorrelationId), testProbe.ref());
@@ -1017,7 +1031,7 @@ public void retrieveLogsInClosedStateDoesNotStartClientActor() {
 
         // create connection
         underTest.tell(createConnection(closedConnection), testProbe.ref());
-        testProbe.expectMsg(createConnectionResponse(closedConnection));
+        expectCreateConnectionResponse(testProbe, closedConnection);
         clientActorProbe.expectNoMessage();
 
         // retrieve logs
@@ -1048,7 +1062,7 @@ public void retrieveLogsIsAggregated() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // retrieve logs
         final var retrieveConnectionLogs = RetrieveConnectionLogs.of(connectionId, dittoHeadersWithCorrelationId);
@@ -1075,7 +1089,7 @@ public void resetConnectionLogs() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // reset logs
         underTest.tell(resetConnectionLogs, testProbe.ref());
@@ -1092,7 +1106,7 @@ public void enabledConnectionLogsAreEnabledAgainAfterModify() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         // Wait until connection is established
         // enable connection logs
@@ -1121,7 +1135,7 @@ public void disabledConnectionLogsAreNotEnabledAfterModify() {
         // create connection
         underTest.tell(createConnection(), testProbe.ref());
         simulateSuccessfulOpenConnectionInClientActor();
-        testProbe.expectMsg(createConnectionResponse());
+        expectCreateConnectionResponse(testProbe, connection);
 
         //Close logging which are automatically enabled via create connection
         underTest.tell(LoggingExpired.of(connectionId, DittoHeaders.empty()), testProbe.ref());
@@ -1238,9 +1252,13 @@ public void retriesStartingClientActor() {
         final DittoHeaders headersIndicatingFailingInstantiation = createConnection.getDittoHeaders().toBuilder()
                 .putHeader("number-of-instantiation-failures",
                         String.valueOf(TestConstants.CONNECTION_CONFIG.getClientActorRestartsBeforeEscalation()))
+                .responseRequired(false)
                 .build();
         underTest.tell(createConnection.setDittoHeaders(headersIndicatingFailingInstantiation), testProbe.ref());
-        testProbe.expectMsg(createConnectionResponse().setDittoHeaders(headersIndicatingFailingInstantiation));
+        final CreateConnectionResponse resp =
+                expectCreateConnectionResponse(testProbe, connection);
+        assertThat(resp.getDittoHeaders())
+                .isEqualTo(headersIndicatingFailingInstantiation);
 
         assertThat(underTest.isTerminated()).isFalse();
     }
@@ -1266,9 +1284,13 @@ public void escalatesWhenClientActorFailsTooOften() {
         final DittoHeaders headersIndicatingFailingInstantiation = createConnection.getDittoHeaders().toBuilder()
                 .putHeader("number-of-instantiation-failures",
                         String.valueOf(TestConstants.CONNECTION_CONFIG.getClientActorRestartsBeforeEscalation() + 1))
+                .responseRequired(false)
                 .build();
         underTest.tell(createConnection.setDittoHeaders(headersIndicatingFailingInstantiation), testProbe.ref());
-        testProbe.expectMsg(createConnectionResponse().setDittoHeaders(headersIndicatingFailingInstantiation));
+        final CreateConnectionResponse resp =
+                expectCreateConnectionResponse(testProbe, connection);
+        assertThat(resp.getDittoHeaders())
+                .isEqualTo(headersIndicatingFailingInstantiation);
 
         testProbe.expectTerminated(underTest, FiniteDuration.apply(3, TimeUnit.SECONDS));
     }
@@ -1281,7 +1303,7 @@ public void deleteConnectionCommandEmitsEvent() {
 
         // create connection
         underTest.tell(createConnection(closedConnection), testProbe.ref());
-        testProbe.expectMsg(createConnectionResponse(closedConnection));
+        expectCreateConnectionResponse(testProbe, closedConnection);
         pubSubMediatorProbe.expectMsgClass(DistributedPubSubMediator.Subscribe.class);
 
         // delete connection
@@ -1310,14 +1332,17 @@ private CreateConnection createConnection(final Connection connection) {
         return CreateConnection.of(connection, dittoHeadersWithCorrelationId);
     }
 
-    private CreateConnectionResponse createConnectionResponse() {
-        return createConnectionResponse(connection);
-    }
-
-    private CreateConnectionResponse createConnectionResponse(final Connection connection) {
-        return CreateConnectionResponse.of(connection, dittoHeadersWithCorrelationId);
+    private CreateConnectionResponse expectCreateConnectionResponse(final TestProbe probe, 
+            final Connection theConnection) {
+        final CreateConnectionResponse resp =
+                probe.expectMsgClass(CreateConnectionResponse.class);
+        Assertions.assertThat(resp.getConnection())
+                .usingRecursiveComparison()
+                .ignoringFields("revision", "modified", "created")
+                .isEqualTo(theConnection);
+        return resp;
     }
-
+    
     private void simulateSuccessfulOpenConnectionInClientActor() {
         expectMockClientActorMessage(EnableConnectionLogs.of(connectionId, DittoHeaders.empty()));
         expectMockClientActorMessage(OpenConnection.of(connectionId, dittoHeadersWithCorrelationId));
diff --git a/documentation/src/main/resources/jsonschema/connection.json b/documentation/src/main/resources/jsonschema/connection.json
index c0c1be174db..ce9f1c7642c 100644
--- a/documentation/src/main/resources/jsonschema/connection.json
+++ b/documentation/src/main/resources/jsonschema/connection.json
@@ -840,6 +840,20 @@
           }
         }
       }
+    },
+    "_revision": {
+      "type": "integer",
+      "description": "_(read-only)_ The revision is a counter which is incremented on each modification of a connection."
+    },
+    "_created": {
+      "type": "string",
+      "description": "_(read-only)_ The created timestamp of the connection in ISO-8601 UTC format. The timestamp is set on creation of a connection.",
+      "format": "date-time"
+    },
+    "_modified": {
+      "type": "string",
+      "description": "_(read-only)_ The modified timestamp of the connection in ISO-8601 UTC format. The timestamp is set on each modification of a connection.",
+      "format": "date-time"
     }
   },
   "additionalProperties": false,
diff --git a/documentation/src/main/resources/jsonschema/policy.json b/documentation/src/main/resources/jsonschema/policy.json
index 71ea2179a8a..cd627629c3a 100644
--- a/documentation/src/main/resources/jsonschema/policy.json
+++ b/documentation/src/main/resources/jsonschema/policy.json
@@ -1,12 +1,36 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
-  "description": "A Policy enables developers to configure fine-grained access control for Things.",
+  "description": "A policy enables developers to configure fine-grained access control for Things.",
   "title": "Policy",
   "properties": {
     "policyId": {
       "type": "string",
-      "description": "Unique identifier representing the Policy, has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).\n\nExamples for a valid Policy ID:\n * `org.eclipse.ditto:xdk_policy_53`\n * `foo:xdk_53`\n * `org.eclipse.vorto_42:xdk_policy`"
+      "description": "Unique identifier representing the policy, has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).\n\nExamples for a valid policy ID:\n * `org.eclipse.ditto:xdk_policy_53`\n * `foo:xdk_53`\n * `org.eclipse.vorto_42:xdk_policy`"
+    },
+    "imports": {
+      "title": "PolicyImports",
+      "type": "object",
+      "description": "Policy imports containing one policy import for each key. The key is the policy ID of the referenced policy.",
+      "properties": {
+        "additionalProperties": {
+          "title": "PolicyImport",
+          "type": "object",
+          "description": "Single policy import defining which policy entries of the referenced policy are imported.",
+          "properties": {
+            "entries" : {
+              "title": "ImportedEntries",
+              "type": "array",
+              "description": "The policy entries to import from the referenced policy identified by their labels. In case the field is omitted or an empty array is provided, all policy entries defined as implicit (\"importable\": \"implicit\") are imported.",
+              "items": {
+                "type": "string",
+                "description": "Label of a policy entry to import from the referenced policy."
+              },
+              "maxItems": 10
+            }
+          }
+        }
+      }
     },
     "entries": {
       "title": "PolicyEntries",
@@ -16,7 +40,7 @@
         "additionalProperties": {
           "title": "Label",
           "type": "object",
-          "description": "Single Policy entry containing Subjects and Resources.",
+          "description": "Single policy entry containing Subjects and Resources.",
           "properties": {
             "subjects": {
               "title": "Subjects",
@@ -34,7 +58,7 @@
                   },
                   "expiry": {
                     "type": "string",
-                    "description": "The optional expiry timestamp (formatted in ISO-8601) indicates how long this subject should be considered before it is automatically deleted from the Policy.",
+                    "description": "The optional expiry timestamp (formatted in ISO-8601) indicates how long this subject should be considered before it is automatically deleted from the policy.",
                     "format": "date-time"
                   },
                   "requestedAcks": {
@@ -70,13 +94,13 @@
               "additionalProperties": {
                 "title": "ResourceEntry",
                 "type": "object",
-                "description": "Single Resource entry defining permissions per effect. The keys must be in the format `type:path` with `type` being one of the following `thing`, `policy` or `message` resources. See [Policy documentation](../basic-policy.html#which-resources-can-be-controlled) for detailed information.",
+                "description": "Single Resource entry defining permissions per effect. The keys must be in the format `type:path` with `type` being one of the following `thing`, `policy` or `message` resources. See [policy documentation](../basic-policy.html#which-resources-can-be-controlled) for detailed information.",
                 "properties": {
                   "grant": {
                     "type": "array",
                     "items": {
                       "type": "string",
-                      "description": "All subjects specified in this Policy entry are granted read/write permission on the resources specified in the path, and all subsequent paths, except they are revoked at a subsequent policy label.",
+                      "description": "All subjects specified in this policy entry are granted read/write permission on the resources specified in the path, and all subsequent paths, except they are revoked at a subsequent policy label.",
                       "enum": [
                         "READ",
                         "WRITE"
@@ -87,7 +111,7 @@
                     "type": "array",
                     "items": {
                       "type": "string",
-                      "description": "All subjects specified in this Policy entry are prohibited to read/write on the resources specified in the path, and all subsequent paths, except they are granted again such permission at a subsequent policy label.",
+                      "description": "All subjects specified in this policy entry are prohibited to read/write on the resources specified in the path, and all subsequent paths, except they are granted again such permission at a subsequent policy label.",
                       "enum": [
                         "READ",
                         "WRITE"
@@ -116,29 +140,23 @@
         }
       }
     },
-    "imports": {
-      "title": "PolicyImports",
+    "_revision": {
+      "type": "integer",
+      "description": "_(read-only)_ The revision is a counter which is incremented on each modification of a policy."
+    },
+    "_created": {
+      "type": "string",
+      "description": "_(read-only)_ The created timestamp of the policy in ISO-8601 UTC format. The timestamp is set on creation of a policy.",
+      "format": "date-time"
+    },
+    "_modified": {
+      "type": "string",
+      "description": "_(read-only)_ The modified timestamp of the policy in ISO-8601 UTC format. The timestamp is set on each modification of a policy.",
+      "format": "date-time"
+    },
+    "_metadata": {
       "type": "object",
-      "description": "Policy imports containing one policy import for each key. The key is the policy ID of the referenced policy.",
-      "properties": {
-        "additionalProperties": {
-          "title": "PolicyImport",
-          "type": "object",
-          "description": "Single policy import defining which policy entries of the referenced policy are imported.",
-          "properties": {
-            "entries" : {
-              "title": "ImportedEntries",
-              "type": "array",
-              "description": "The policy entries to import from the referenced policy identified by their labels. In case the field is omitted or an empty array is provided, all policy entries defined as implicit (\"importable\": \"implicit\") are imported.",
-              "items": {
-                "type": "string",
-                "description": "Label of a policy entry to import from the referenced policy."
-              },
-              "maxItems": 10
-            }
-          }
-        }
-      }
+      "description": "_(read-only)_ The metadata of the policy. This field is not returned by default but must be selected explicitly. The content is a JSON object having the policy's JSON structure with the difference that the JSON leaves of the policy are JSON objects containing the metadata."
     }
   },
   "required": [
diff --git a/documentation/src/main/resources/jsonschema/thing_v2.json b/documentation/src/main/resources/jsonschema/thing_v2.json
index c17f67ada98..d7ef22efbdf 100644
--- a/documentation/src/main/resources/jsonschema/thing_v2.json
+++ b/documentation/src/main/resources/jsonschema/thing_v2.json
@@ -1,36 +1,36 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
-  "description": "A *Thing* is a generic entity which can be used as a handle for multiple *Features* belonging to this *Thing*.",
+  "description": "A *thing* is a generic entity which can be used as a handle for multiple *Features* belonging to this *thing*.",
   "title": "Thing in API v2",
   "properties": {
     "thingId": {
       "type": "string",
-      "description": "Unique identifier representing the Thing, has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).\n\nExamples for a valid Thing ID:\n * `org.eclipse.ditto:xdk_53`\n * `foo:xdk_53`\n * `org.eclipse.vorto_42:xdk_thing`"
+      "description": "Unique identifier representing the thing, has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).\n\nExamples for a valid thing ID:\n * `org.eclipse.ditto:xdk_53`\n * `foo:xdk_53`\n * `org.eclipse.vorto_42:xdk_thing`"
     },
     "policyId": {
       "type": "string",
-      "description": "Links to the ID of an existing Policy which contains the authorization information applied for this Thing. The policy ID has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))."
+      "description": "Links to the ID of an existing Policy which contains the authorization information applied for this thing. The policy ID has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))."
     },
     "definition": {
       "title": "Definition",
       "type": "string",
-      "description": "The definition of this Thing declaring its model in the form '<namespace>:<name>:<version>' or a valid HTTP(s) URL.",
+      "description": "The definition of this thing declaring its model in the form '<namespace>:<name>:<version>' or a valid HTTP(s) URL.",
       "pattern": "([_a-zA-Z0-9\\-.]+):([_a-zA-Z0-9\\-.]+):([_a-zA-Z0-9\\-.]+)"
     },
     "attributes": {
       "title": "Attributes",
       "type": "object",
-      "description": "The Attributes that describe this Thing in more detail. Can be an arbitrary JSON object. Attributes are typically used to model rather static properties at the Thing level. Static means that the values do not change as frequently as property values of Features."
+      "description": "The Attributes that describe this thing in more detail. Can be an arbitrary JSON object. Attributes are typically used to model rather static properties at the thing level. Static means that the values do not change as frequently as property values of Features."
     },
     "features": {
       "title": "Features",
       "type": "object",
-      "description": "The Features belonging to this Thing. A Thing can handle any number of Features.\n The key of this object represents the `featureId`. Due to the fact that a Feature ID often needs to be set in the path of a HTTP request, we strongly recommend to use a restricted the set of characters (e.g. those for [Uniform Resource Identifiers (URI)](http://www.ietf.org/rfc/rfc3986.txt)).",
+      "description": "The Features belonging to this thing. A thing can handle any number of Features.\n The key of this object represents the `featureId`. Due to the fact that a Feature ID often needs to be set in the path of a HTTP request, we strongly recommend to use a restricted the set of characters (e.g. those for [Uniform Resource Identifiers (URI)](http://www.ietf.org/rfc/rfc3986.txt)).",
       "additionalProperties": {
         "title": "Feature",
         "type": "object",
-        "description": "A Feature is used to manage all data and functionality of a Thing that can be clustered in an outlined technical context.",
+        "description": "A Feature is used to manage all data and functionality of a thing that can be clustered in an outlined technical context.",
         "additionalProperties": {
           "type": "object",
           "description": "The elements of a Feature.",
@@ -67,21 +67,21 @@
     },
     "_revision": {
       "type": "integer",
-      "description": "_(read-only)_ The revision is a counter which is incremented on each modification of a Thing."
+      "description": "_(read-only)_ The revision is a counter which is incremented on each modification of a thing."
     },
     "_created": {
       "type": "string",
-      "description": "_(read-only)_ The created timestamp of the Thing in ISO-8601 UTC format. The timestamp is set on creation of a Thing.",
+      "description": "_(read-only)_ The created timestamp of the thing in ISO-8601 UTC format. The timestamp is set on creation of a thing.",
       "format": "date-time"
     },
     "_modified": {
       "type": "string",
-      "description": "_(read-only)_ The modified timestamp of the Thing in ISO-8601 UTC format. The timestamp is set on each modification of a Thing.",
+      "description": "_(read-only)_ The modified timestamp of the thing in ISO-8601 UTC format. The timestamp is set on each modification of a thing.",
       "format": "date-time"
     },
     "_metadata": {
       "type": "object",
-      "description": "_(read-only)_ The Metadata of the Thing. This field is not returned by default but must be selected explicitly. The content is a JSON object having the Thing's JSON structure with the difference that the JSON leaves of the Thing are JSON objects containing the metadata."
+      "description": "_(read-only)_ The Metadata of the thing. This field is not returned by default but must be selected explicitly. The content is a JSON object having the thing's JSON structure with the difference that the JSON leaves of the thing are JSON objects containing the metadata."
     }
   },
   "required": [
diff --git a/documentation/src/main/resources/openapi/ditto-api-2.yml b/documentation/src/main/resources/openapi/ditto-api-2.yml
index 521b4b0456b..18684504337 100644
--- a/documentation/src/main/resources/openapi/ditto-api-2.yml
+++ b/documentation/src/main/resources/openapi/ditto-api-2.yml
@@ -29,7 +29,7 @@ tags:
   - name: CloudEvents
     description: Process CloudEvents in Ditto
   - name: Connections
-    description: Manage Connections
+    description: Manage connections
 security:
   - Google:
       - openid
@@ -6818,13 +6818,14 @@ paths:
           command to process.
   /connections:
     get:
-      summary: Retrieve all Connections
+      summary: Retrieve all connections
       description: Returns all connections.
       security:
         - DevOpsBasic: []
       tags:
         - Connections
       parameters:
+        - $ref: '#/components/parameters/ConnectionFieldsQueryParam'
         - name: ids-only
           in: query
           description: 'When set to true, the request will return the registered ids only and not the whole connections objects.'
@@ -6865,7 +6866,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/AdvancedError'
     post:
-      summary: Create a new Connection
+      summary: Create a new connection
       description: |-
         Creates the connection defined in the JSON body.
         The ID of the connection will be **generated** by the backend. Any `ID` specified in the request body is therefore
@@ -6965,14 +6966,15 @@ paths:
         required: true
   '/connections/{connectionId}':
     get:
-      summary: Retrieve a specific Connection
+      summary: Retrieve a specific connection
       description: Returns the connection identified by the `connectionId` path parameter.
       security:
         - DevOpsBasic: []
       tags:
         - Connections
       parameters:
-        - $ref: '#/components/parameters/connectionIdPathParam'
+        - $ref: '#/components/parameters/ConnectionIdPathParam'
+        - $ref: '#/components/parameters/ConnectionFieldsQueryParam'
       responses:
         '200':
           description: The request successfully returned the connection.
@@ -7005,14 +7007,14 @@ paths:
               schema:
                 $ref: '#/components/schemas/AdvancedError'
     put:
-      summary: Update a specific Connection registered
+      summary: Create or update a connection with a specified ID
       description: Update the connection identified by the `connectionId` path parameter.
       security:
         - DevOpsBasic: []
       tags:
         - Connections
       parameters:
-        - $ref: '#/components/parameters/connectionIdPathParam'
+        - $ref: '#/components/parameters/ConnectionIdPathParam'
       responses:
         '204':
           description: The connection was successfully updated.
@@ -7079,14 +7081,14 @@ paths:
                   headerMapping: {}
         required: true
     delete:
-      summary: Delete a specific Connection
+      summary: Delete a specific connection
       description: Delete the connection identified by the `connectionId` path parameter.
       security:
         - DevOpsBasic: []
       tags:
         - Connections
       parameters:
-        - $ref: '#/components/parameters/connectionIdPathParam'
+        - $ref: '#/components/parameters/ConnectionIdPathParam'
       responses:
         '204':
           description: The connection was successfully deleted.
@@ -7116,7 +7118,7 @@ paths:
                 $ref: '#/components/schemas/AdvancedError'
   '/connections/{connectionId}/command':
     post:
-      summary: Send a command to a specific Connection.
+      summary: Send a command to a specific connection
       description: |-
         Sends the command specified in the body to the connection identified by the `connectionId`
         path parameter.
@@ -7125,7 +7127,7 @@ paths:
       tags:
         - Connections
       parameters:
-        - $ref: '#/components/parameters/connectionIdPathParam'
+        - $ref: '#/components/parameters/ConnectionIdPathParam'
       responses:
         '200':
           description: The command was sent to the connection successfully.
@@ -7169,14 +7171,14 @@ paths:
         required: true
   '/connections/{connectionId}/status':
     get:
-      summary: Retrieve status of a specific Connection
+      summary: Retrieve status of a specific connection
       description: Returns the status of the connection identified by the `connectionId` path parameter.
       security:
         - DevOpsBasic: []
       tags:
         - Connections
       parameters:
-        - $ref: '#/components/parameters/connectionIdPathParam'
+        - $ref: '#/components/parameters/ConnectionIdPathParam'
       responses:
         '200':
           description: The request successfully returned the connection status.
@@ -7210,14 +7212,14 @@ paths:
                 $ref: '#/components/schemas/AdvancedError'
   '/connections/{connectionId}/metrics':
     get:
-      summary: Retrieve metrics of a specific Connection
+      summary: Retrieve metrics of a specific connection
       description: Returns the metrics of the connection identified by the `connectionId` path parameter.
       security:
         - DevOpsBasic: []
       tags:
         - Connections
       parameters:
-        - $ref: '#/components/parameters/connectionIdPathParam'
+        - $ref: '#/components/parameters/ConnectionIdPathParam'
       responses:
         '200':
           description: The request successfully returned the connection metrics.
@@ -7251,7 +7253,7 @@ paths:
                 $ref: '#/components/schemas/AdvancedError'
   '/connections/{connectionId}/logs':
     get:
-      summary: Retrieve logs of a specific Connection
+      summary: Retrieve logs of a specific connection
       description: |-
         Returns the logs of the connection identified by the `connectionId` path parameter.
         **Before** log entries are generated and returned, logging needs be enabled with the `command`
@@ -7262,7 +7264,7 @@ paths:
       tags:
         - Connections
       parameters:
-        - $ref: '#/components/parameters/connectionIdPathParam'
+        - $ref: '#/components/parameters/ConnectionIdPathParam'
       responses:
         '200':
           description: The request successfully returned the connection logs.
@@ -8158,13 +8160,58 @@ components:
       required: false
       schema:
         type: string
-    connectionIdPathParam:
+    ConnectionIdPathParam:
       name: connectionId
       in: path
       description: The ID of the connection
       required: true
       schema:
         type: string
+    ConnectionFieldsQueryParam:
+      name: fields
+      in: query
+      description: |-
+        Contains a comma-separated list of fields to be included in the returned
+        JSON.
+
+        #### Selectable fields
+
+        * `id`
+        * `name`
+        * `_revision`
+
+          Specifically selects the revision of the connection. The revision is a counter, which is incremented on each modification of a connection.
+
+        * `_created`
+
+          Specifically selects the created timestamp of the connection in ISO-8601 UTC format. The timestamp is set on creation of a connection.
+
+        * `_modified`
+
+          Specifically selects the modified timestamp of the connection in ISO-8601 UTC format. The timestamp is set on each modification of a connection.
+
+        * `connectionType`
+        * `connectionStatus`
+        * `credentials`
+        * `uri`
+        * `sources`
+        * `targets`
+        * `sshTunnel`
+        * `clientCount`
+        * `failoverEnabled`
+        * `validateCertificates`
+        * `processorPoolSize`
+        * `specificConfig`
+        * `mappingDefinitions`
+        * `tags`
+        * `ca`
+
+        #### Examples
+
+        * `?fields=id,_revision,sources`
+      required: false
+      schema:
+        type: string
   schemas:
     Error:
       properties:
diff --git a/documentation/src/main/resources/openapi/sources/api-2-index.yml b/documentation/src/main/resources/openapi/sources/api-2-index.yml
index c27374cb8ef..00a8df3365e 100644
--- a/documentation/src/main/resources/openapi/sources/api-2-index.yml
+++ b/documentation/src/main/resources/openapi/sources/api-2-index.yml
@@ -41,7 +41,7 @@ tags:
   - name: CloudEvents
     description: Process CloudEvents in Ditto
   - name: Connections
-    description: Manage Connections
+    description: Manage connections
 
 security:
   - Google:
@@ -271,8 +271,10 @@ components:
       $ref: "./parameters/thingIdPathParam.yml"
     TimeoutParam:
       $ref: "./parameters/timeoutParam.yml"
-    connectionIdPathParam:
+    ConnectionIdPathParam:
       $ref: './parameters/connectionIdPathParam.yml'
+    ConnectionFieldsQueryParam:
+      $ref: "./parameters/connectionFieldsQueryParam.yml"
 
   schemas:
     Error:
diff --git a/documentation/src/main/resources/openapi/sources/parameters/connectionFieldsQueryParam.yml b/documentation/src/main/resources/openapi/sources/parameters/connectionFieldsQueryParam.yml
new file mode 100644
index 00000000000..72219de913b
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/parameters/connectionFieldsQueryParam.yml
@@ -0,0 +1,54 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+name: fields
+in: query
+description: |-
+  Contains a comma-separated list of fields to be included in the returned
+  JSON.
+
+  #### Selectable fields
+
+  * `id`
+  * `name`
+  * `_revision`
+
+    Specifically selects the revision of the connection. The revision is a counter, which is incremented on each modification of a connection.
+
+  * `_created`
+
+    Specifically selects the created timestamp of the connection in ISO-8601 UTC format. The timestamp is set on creation of a connection.
+
+  * `_modified`
+
+    Specifically selects the modified timestamp of the connection in ISO-8601 UTC format. The timestamp is set on each modification of a connection.
+
+  * `connectionType`
+  * `connectionStatus`
+  * `credentials`
+  * `uri`
+  * `sources`
+  * `targets`
+  * `sshTunnel`
+  * `clientCount`
+  * `failoverEnabled`
+  * `validateCertificates`
+  * `processorPoolSize`
+  * `specificConfig`
+  * `mappingDefinitions`
+  * `tags`
+  * `ca`
+
+  #### Examples
+
+  * `?fields=id,_revision,sources`
+required: false
+schema:
+  type: string
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/paths/connections/command.yml b/documentation/src/main/resources/openapi/sources/paths/connections/command.yml
index cd0ec278f05..58286fad517 100644
--- a/documentation/src/main/resources/openapi/sources/paths/connections/command.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/connections/command.yml
@@ -9,7 +9,7 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 post:
-  summary: Send a command to a specific Connection.
+  summary: Send a command to a specific connection
   description: |-
     Sends the command specified in the body to the connection identified by the `connectionId`
     path parameter.
diff --git a/documentation/src/main/resources/openapi/sources/paths/connections/connectionId.yml b/documentation/src/main/resources/openapi/sources/paths/connections/connectionId.yml
index 41c16566236..a76a2affb06 100644
--- a/documentation/src/main/resources/openapi/sources/paths/connections/connectionId.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/connections/connectionId.yml
@@ -9,7 +9,7 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 get:
-  summary: Retrieve a specific Connection
+  summary: Retrieve a specific connection
   description: |-
     Returns the connection identified by the `connectionId` path parameter.
   security:
@@ -18,6 +18,7 @@ get:
     - Connections
   parameters:
     - $ref: '../../parameters/connectionIdPathParam.yml'
+    - $ref: '../../parameters/connectionFieldsQueryParam.yml'
   responses:
     '200':
       description: The request successfully returned the connection.
@@ -52,7 +53,7 @@ get:
           schema:
             $ref: '../../schemas/errors/advancedError.yml'
 put:
-  summary: Update a specific Connection registered
+  summary: Create or update a connection with a specified ID
   description: |-
     Update the connection identified by the `connectionId` path parameter.
   security:
@@ -142,7 +143,7 @@ put:
         }
     required: true
 delete:
-  summary: Delete a specific Connection
+  summary: Delete a specific connection
   description: |-
     Delete the connection identified by the `connectionId` path parameter.
   security:
diff --git a/documentation/src/main/resources/openapi/sources/paths/connections/connections.yml b/documentation/src/main/resources/openapi/sources/paths/connections/connections.yml
index dfc2b5372a3..310948336a3 100644
--- a/documentation/src/main/resources/openapi/sources/paths/connections/connections.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/connections/connections.yml
@@ -9,7 +9,7 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 get:
-  summary: Retrieve all Connections
+  summary: Retrieve all connections
   description: |-
     Returns all connections.
   security:
@@ -17,6 +17,7 @@ get:
   tags:
     - Connections
   parameters:
+    - $ref: '../../parameters/connectionFieldsQueryParam.yml'
     - name: ids-only
       in: query
       description: |-
@@ -60,7 +61,7 @@ get:
           schema:
             $ref: '../../schemas/errors/advancedError.yml'
 post:
-  summary: Create a new Connection
+  summary: Create a new connection
   description: |-
     Creates the connection defined in the JSON body.
     The ID of the connection will be **generated** by the backend. Any `ID` specified in the request body is therefore
diff --git a/documentation/src/main/resources/openapi/sources/paths/connections/logs.yml b/documentation/src/main/resources/openapi/sources/paths/connections/logs.yml
index fa2c6d03abe..605b1bb7d1f 100644
--- a/documentation/src/main/resources/openapi/sources/paths/connections/logs.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/connections/logs.yml
@@ -9,7 +9,7 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 get:
-  summary: Retrieve logs of a specific Connection
+  summary: Retrieve logs of a specific connection
   description: |-
     Returns the logs of the connection identified by the `connectionId` path parameter.
     **Before** log entries are generated and returned, logging needs be enabled with the `command`
diff --git a/documentation/src/main/resources/openapi/sources/paths/connections/metrics.yml b/documentation/src/main/resources/openapi/sources/paths/connections/metrics.yml
index a9b0a10ae16..be0f5846cc7 100644
--- a/documentation/src/main/resources/openapi/sources/paths/connections/metrics.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/connections/metrics.yml
@@ -9,7 +9,7 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 get:
-  summary: Retrieve metrics of a specific Connection
+  summary: Retrieve metrics of a specific connection
   description: |-
     Returns the metrics of the connection identified by the `connectionId` path parameter.
   security:
diff --git a/documentation/src/main/resources/openapi/sources/paths/connections/status.yml b/documentation/src/main/resources/openapi/sources/paths/connections/status.yml
index 34f93bfd76b..b7f3296734f 100644
--- a/documentation/src/main/resources/openapi/sources/paths/connections/status.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/connections/status.yml
@@ -9,7 +9,7 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 get:
-  summary: Retrieve status of a specific Connection
+  summary: Retrieve status of a specific connection
   description: |-
     Returns the status of the connection identified by the `connectionId` path parameter.
   security:
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractConnectionsRetrievalActor.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractConnectionsRetrievalActor.java
index 0805ae353ea..6c4dde22a86 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractConnectionsRetrievalActor.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractConnectionsRetrievalActor.java
@@ -24,6 +24,8 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
+import javax.annotation.Nullable;
+
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
@@ -46,6 +48,7 @@
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.json.JsonArray;
 import org.eclipse.ditto.json.JsonCollectors;
+import org.eclipse.ditto.json.JsonFieldSelector;
 
 import akka.actor.AbstractActor;
 import akka.actor.ActorRef;
@@ -111,7 +114,10 @@ protected void retrieveConnectionsById(final RetrieveAllConnectionIdsResponse al
                 retrieveConnections(connectionIds
                         .stream()
                         .map(ConnectionId::of)
-                        .toList(), initialCommand.getDittoHeaders())
+                        .toList(),
+                        initialCommand.getSelectedFields().orElse(null),
+                        initialCommand.getDittoHeaders()
+                )
                         .thenAccept(retrieveConnectionsResponse -> {
                             sender.tell(retrieveConnectionsResponse, getSelf());
                             stop();
@@ -147,13 +153,15 @@ private void handleRetrieveConnections(final RetrieveConnections retrieveConnect
     }
 
     private CompletionStage<RetrieveConnectionsResponse> retrieveConnections(
-            final Collection<ConnectionId> connectionIds, final DittoHeaders dittoHeaders) {
+            final Collection<ConnectionId> connectionIds,
+            @Nullable final JsonFieldSelector selectedFields,
+            final DittoHeaders dittoHeaders) {
 
         checkNotNull(connectionIds, "connectionIds");
         checkNotNull(dittoHeaders, "dittoHeaders");
 
         final List<CompletableFuture<RetrieveConnectionResponse>> completableFutures = connectionIds.parallelStream()
-                .map(connectionId -> retrieveConnection(RetrieveConnection.of(connectionId, dittoHeaders)))
+                .map(connectionId -> retrieveConnection(RetrieveConnection.of(connectionId, selectedFields, dittoHeaders)))
                 .map(CompletionStage::toCompletableFuture)
                 .toList();
 
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/connections/ConnectionsParameter.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/connections/ConnectionsParameter.java
index 93da53e6d70..d07da3c7272 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/connections/ConnectionsParameter.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/connections/ConnectionsParameter.java
@@ -22,7 +22,13 @@ public enum ConnectionsParameter {
      * Request parameter for doing a dry-run before creating a connection.
      */
     DRY_RUN("dry-run"),
-    IDS_ONLY("ids-only");
+
+    IDS_ONLY("ids-only"),
+
+    /**
+     * Request parameter for including only the selected fields in the Connection JSON document(s).
+     */
+    FIELDS("fields");
 
     private final String parameterValue;
 
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/connections/ConnectionsRoute.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/connections/ConnectionsRoute.java
index 631d66c73a4..b2f26de0ced 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/connections/ConnectionsRoute.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/connections/ConnectionsRoute.java
@@ -51,8 +51,10 @@
 import org.eclipse.ditto.gateway.service.endpoints.routes.AbstractRoute;
 import org.eclipse.ditto.gateway.service.endpoints.routes.RouteBaseProperties;
 import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldSelector;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonObjectBuilder;
+import org.eclipse.ditto.json.JsonPointer;
 
 import akka.http.javadsl.model.MediaTypes;
 import akka.http.javadsl.server.PathMatchers;
@@ -142,11 +144,25 @@ private Route connections(final RequestContext ctx, final DittoHeaders dittoHead
         return pathEndOrSingleSlash(() ->
                 concat(
                         get(() -> // GET /connections?ids-only=false
-                                parameterOptional(ConnectionsParameter.IDS_ONLY.toString(), idsOnly -> handlePerRequest(ctx,
-                                        RetrieveConnections.newInstance(idsOnly.map(Boolean::valueOf).orElse(false),
-                                                dittoHeaders)
-                                ))
-
+                                parameterOptional(ConnectionsParameter.IDS_ONLY.toString(), idsOnly ->
+                                        parameterOptional(ConnectionsParameter.FIELDS.toString(), fieldsString ->
+                                                {
+                                                    final Optional<JsonFieldSelector> selectedFields =
+                                                            calculateSelectedFields(fieldsString);
+                                                    return handlePerRequest(ctx, RetrieveConnections.newInstance(
+                                                            idsOnly.map(Boolean::valueOf).orElseGet(() -> selectedFields
+                                                                    .filter(sf -> sf.getPointers().size() == 1 &&
+                                                                            sf.getPointers().contains(
+                                                                                    JsonPointer.of("id")
+                                                                            )
+                                                                    ).isPresent()
+                                                            ),
+                                                            selectedFields.orElse(null),
+                                                            dittoHeaders)
+                                                    );
+                                                }
+                                        )
+                                )
                         ),
                         post(() -> // POST /connections?dry-run=<dryRun>
                                 parameterOptional(ConnectionsParameter.DRY_RUN.toString(), dryRun ->
@@ -198,13 +214,17 @@ private Route connectionsEntry(final RequestContext ctx,
                                         payloadSource ->
                                                 handlePerRequest(ctx, dittoHeaders, payloadSource, payloadJsonString ->
                                                         ModifyConnection.of(
-                                                                buildConnectionForPut(connectionId,
-                                                                        payloadJsonString),
+                                                                buildConnectionForPut(connectionId, payloadJsonString),
                                                                 dittoHeaders))
                                 )
                         ),
                         get(() -> // GET /connections/<connectionId>
-                                handlePerRequest(ctx, RetrieveConnection.of(connectionId, dittoHeaders))
+                                parameterOptional(ConnectionsParameter.FIELDS.toString(), fieldsString ->
+                                        handlePerRequest(ctx, RetrieveConnection.of(connectionId,
+                                                calculateSelectedFields(fieldsString).orElse(null),
+                                                dittoHeaders)
+                                        )
+                                )
                         ),
                         delete(() -> // DELETE /connections/<connectionId>
                                 handlePerRequest(ctx, DeleteConnection.of(connectionId, dittoHeaders))
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/query/RetrievePolicy.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/query/RetrievePolicy.java
index 0c956f8b7b5..6c5bf984dba 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/query/RetrievePolicy.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/query/RetrievePolicy.java
@@ -89,7 +89,7 @@ public static RetrievePolicy of(final PolicyId policyId, final DittoHeaders ditt
      *
      * @param policyId the ID of a single Policy to be retrieved by this command.
      * @param dittoHeaders the optional command headers of the request.
-     * @param selectedFields the fields of the JSON representation of the Thing to retrieve.
+     * @param selectedFields the fields of the JSON representation of the Policy to retrieve.
      * @return a Command for retrieving the Policy with the {@code policyId} as its ID which is readable from the passed
      * authorization context.
      * @throws NullPointerException if any argument is {@code null}.
diff --git a/things/service/src/main/resources/things.conf b/things/service/src/main/resources/things.conf
index e0741e2ae6c..0e3e3237e74 100755
--- a/things/service/src/main/resources/things.conf
+++ b/things/service/src/main/resources/things.conf
@@ -9,7 +9,7 @@ ditto {
       "org.eclipse.ditto.policies.enforcement.pre.CreationRestrictionPreEnforcer"
     ]
     signal-transformers-provider.extension-config.signal-transformers = [
-      "org.eclipse.ditto.things.service.enforcement.pre.ModifyToCreateThingTransformer", // always keep this as first transformer in order to guarantee that all following transformers know that the command is creating a policy instead of modifying it
+      "org.eclipse.ditto.things.service.enforcement.pre.ModifyToCreateThingTransformer", // always keep this as first transformer in order to guarantee that all following transformers know that the command is creating a thing instead of modifying it
       "org.eclipse.ditto.things.service.signaltransformation.placeholdersubstitution.ThingsPlaceholderSubstitution"
     ]
     snapshot-adapter = "org.eclipse.ditto.things.service.persistence.serializer.ThingMongoSnapshotAdapter"

From 76fabb35097e5cce7d28664169ffafa069aea3fd Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Mon, 30 Jan 2023 09:18:54 +0100
Subject: [PATCH 027/173] fixed that a missing (deleted) referenced policy of a
 policy import caused logging ERRORs in the BackgroundSyncStream

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../write/streaming/BackgroundSyncStream.java | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/BackgroundSyncStream.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/BackgroundSyncStream.java
index 24408f24ad3..4842c267655 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/BackgroundSyncStream.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/BackgroundSyncStream.java
@@ -36,6 +36,7 @@
 import org.eclipse.ditto.policies.model.PolicyConstants;
 import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.policies.model.PolicyImport;
+import org.eclipse.ditto.policies.model.signals.commands.exceptions.PolicyNotAccessibleException;
 import org.eclipse.ditto.things.model.ThingConstants;
 import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.thingsearch.service.persistence.write.model.Metadata;
@@ -53,7 +54,7 @@
  */
 public final class BackgroundSyncStream {
 
-    private static Logger LOGGER = DittoLoggerFactory.getThreadSafeLogger(BackgroundSyncStream.class);
+    private static final Logger LOGGER = DittoLoggerFactory.getThreadSafeLogger(BackgroundSyncStream.class);
     private static final ThingId EMPTY_THING_ID = ThingId.of(LowerBound.emptyEntityId(ThingConstants.ENTITY_TYPE));
     private static final PolicyId EMPTY_POLICY_ID = PolicyId.of(LowerBound.emptyEntityId(PolicyConstants.ENTITY_TYPE));
 
@@ -186,7 +187,7 @@ private Source<Metadata, NotUsed> emitUnlessConsistent(final Metadata persisted,
                         .orElseGet(() -> CompletableFuture.completedStage(true));
                 return Source.completionStage(consistencyCheckCs)
                         .flatMapConcat(policiesAreConsistent -> {
-                            if (policiesAreConsistent) {
+                            if (Boolean.TRUE.equals(policiesAreConsistent)) {
                                 return Source.empty();
                             } else {
                                 return Source.single(indexed.invalidateCaches(false, true)).log("PoliciesInconsistent");
@@ -283,13 +284,17 @@ private CompletionStage<Boolean> isPolicyTagUpToDate(final PolicyTag policyTag)
                         final String message = String.format(
                                 "Error in background sync stream when trying to retrieve policy revision of " +
                                         "Policy with ID <%s>", policyId);
-                        LOGGER.error(message, error);
+                        LOGGER.warn(message, error);
                         return false;
                     } else if (response instanceof SudoRetrievePolicyRevisionResponse retrieveResponse) {
                         final long revision = retrieveResponse.getRevision();
                         return policyTag.getRevision() == revision;
+                    } else if (response instanceof PolicyNotAccessibleException) {
+                        LOGGER.info("Policy with ID <{}> is/was no longer accessible when trying to retrieve policy " +
+                                "revision of Policy", policyId);
+                        return false;
                     } else {
-                        LOGGER.error("Unexpected message in background sync stream when trying to retrieve policy " +
+                        LOGGER.warn("Unexpected message in background sync stream when trying to retrieve policy " +
                                         "revision of Policy with ID <{}>. Expected <{}> but got <{}>.",
                                 policyId, SudoRetrievePolicyRevisionResponse.class, response.getClass());
                         return false;
@@ -305,12 +310,16 @@ private CompletionStage<Optional<Policy>> retrievePolicy(final PolicyId policyId
                     if (error != null) {
                         final String message = String.format("Error in background sync stream when trying to " +
                                 "retrieve policy with ID <%s>", policyId);
-                        LOGGER.error(message, error);
+                        LOGGER.warn(message, error);
                         return Optional.empty();
                     } else if (response instanceof SudoRetrievePolicyResponse retrieveResponse) {
                         return Optional.of(retrieveResponse.getPolicy());
+                    } else if (response instanceof PolicyNotAccessibleException) {
+                        LOGGER.info("Policy with ID <{}> is/was no longer accessible when trying to retrieve policy",
+                                policyId);
+                        return Optional.empty();
                     } else {
-                        LOGGER.error("Unexpected message in background sync stream when trying to retrieve policy " +
+                        LOGGER.warn("Unexpected message in background sync stream when trying to retrieve policy " +
                                         "with ID <{}>. Expected <{}> but got <{}>.",
                                 policyId, SudoRetrievePolicyRevisionResponse.class, response.getClass());
                         return Optional.empty();

From 25f6a1e7f11b816a30ce650da650cfd0e5a21336 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Tue, 31 Jan 2023 15:43:53 +0100
Subject: [PATCH 028/173] stabilized DittoProtocolSubImpl when unresolved
 placeholders were contained in acknowledgement labels

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../grafana-datasources/datasource.yaml       | 39 +++++++++++++++++++
 .../pubsubthings/DittoProtocolSubImpl.java    | 18 ++++++---
 2 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 deployment/operations/grafana-datasources/datasource.yaml

diff --git a/deployment/operations/grafana-datasources/datasource.yaml b/deployment/operations/grafana-datasources/datasource.yaml
new file mode 100644
index 00000000000..14f5b356dd7
--- /dev/null
+++ b/deployment/operations/grafana-datasources/datasource.yaml
@@ -0,0 +1,39 @@
+# config file version
+apiVersion: 1
+
+# list of datasources to insert/update depending
+# whats available in the database
+datasources:
+  #
+  # Prometheus datasource
+  #
+- name: prometheus
+  # <string, required> datasource type. Required
+  type: prometheus
+  # <string, required> access mode. direct or proxy. Required
+  access: proxy
+  # <int> org id. will default to orgId 1 if not specified
+  orgId: 1
+  # <string> url
+  url: http://prometheus:9090
+  # <bool> allow users to edit datasources from the UI.
+  editable: false
+
+- name: elasticsearch
+  # <string, required> datasource type. Required
+  type: elasticsearch
+  # <string, required> access mode. direct or proxy. Required
+  access: proxy
+  # <int> org id. will default to orgId 1 if not specified
+  orgId: 1
+  # <string> url
+  url: http://elasticsearch:9200
+  # <bool> allow users to edit datasources from the UI.
+  editable: false
+  database: "[logstash-]YYYY.MM.DD"
+  # <map> fields that will be converted to json and stored in json_data
+  jsonData:
+    interval: Daily
+    timeField: "@timestamp"
+    esVersion: '8.0.0'
+    logMessageField: message
diff --git a/internal/utils/pubsub-things/src/main/java/org/eclipse/ditto/internal/utils/pubsubthings/DittoProtocolSubImpl.java b/internal/utils/pubsub-things/src/main/java/org/eclipse/ditto/internal/utils/pubsubthings/DittoProtocolSubImpl.java
index 80fde2bfee7..661ec64a1db 100644
--- a/internal/utils/pubsub-things/src/main/java/org/eclipse/ditto/internal/utils/pubsubthings/DittoProtocolSubImpl.java
+++ b/internal/utils/pubsub-things/src/main/java/org/eclipse/ditto/internal/utils/pubsubthings/DittoProtocolSubImpl.java
@@ -25,6 +25,9 @@
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.acks.AcknowledgementLabel;
+import org.eclipse.ditto.base.model.acks.AcknowledgementLabelInvalidException;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedAcks;
 import org.eclipse.ditto.internal.utils.pubsub.DistributedSub;
 import org.eclipse.ditto.internal.utils.pubsub.StreamingType;
@@ -131,9 +134,11 @@ public CompletionStage<Void> declareAcknowledgementLabels(
             return CompletableFuture.completedFuture(null);
         }
 
-        // don't complete the future with the exception this method emits as this is a bug in Ditto which we must escalate
-        // via the actor supervision strategy
-        ensureAcknowledgementLabelsAreFullyResolved(acknowledgementLabels);
+        try {
+            ensureAcknowledgementLabelsAreFullyResolved(acknowledgementLabels);
+        } catch (final DittoRuntimeException dre) {
+            return CompletableFuture.failedStage(dre);
+        }
 
         return distributedAcks.declareAcknowledgementLabels(acknowledgementLabels, subscriber, group)
                 .thenApply(ack -> null);
@@ -144,9 +149,10 @@ private static void ensureAcknowledgementLabelsAreFullyResolved(final Collection
                 .filter(Predicate.not(AcknowledgementLabel::isFullyResolved))
                 .findFirst()
                 .ifPresent(ackLabel -> {
-                    // if this happens, this is a bug in the Ditto codebase! at this point the AckLabel must be resolved
-                    throw new IllegalArgumentException("AcknowledgementLabel was not fully resolved while " +
-                            "trying to declare it: " + ackLabel);
+                    throw AcknowledgementLabelInvalidException.of(ackLabel,
+                            "AcknowledgementLabel was not fully resolved while trying to declare it",
+                            null,
+                            DittoHeaders.empty());
                 });
     }
 

From 44ab2a3dd994f6230cf98aaf89226f9fbea09b68 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Tue, 31 Jan 2023 16:30:39 +0100
Subject: [PATCH 029/173] updated github repository locations to new
 "eclipse-ditto" org

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 NOTICE.md                                     |  2 +-
 README.md                                     |  4 +-
 RELEASE.md                                    |  8 +-
 .../service/mapping/CloudEventsMapper.java    |  2 +-
 .../src/main/resources/_data/topnav.yml       |  6 +-
 ...example-demonstrating-rest-to-websocket.md |  4 +-
 .../_posts/2018-04-25-connectivity-service.md |  4 +-
 .../2018-10-16-example-mqtt-bidirectional.md  |  4 +-
 .../2019-12-12-release-announcement-100.md    |  2 +-
 .../2020-04-16-connecting-to-ttn-via-mqtt.md  |  2 +-
 ...2020-10-08-asynchronous-client-creation.md |  2 +-
 .../2021-03-22-azure-iot-hub-integration.md   |  2 +-
 .../_posts/2022-03-03-wot-integration.md      |  2 +-
 .../DADR-0004-signal-enrichment.md            |  2 +-
 .../DADR-0007-concierge-removal.md            |  6 +-
 .../architecture-services-connectivity.md     |  6 +-
 .../ditto/architecture-services-policies.md   |  6 +-
 .../architecture-services-things-search.md    |  4 +-
 .../ditto/architecture-services-things.md     |  6 +-
 .../pages/ditto/basic-namespaces-and-names.md |  6 +-
 .../ditto/basic-wot-integration-example.md    |  2 +-
 .../pages/ditto/basic-wot-integration.md      |  4 +-
 .../resources/pages/ditto/client-sdk-java.md  |  2 +-
 .../pages/ditto/client-sdk-javascript.md      |  8 +-
 .../pages/ditto/connectivity-hmac-signing.md  |  4 +-
 .../ditto/connectivity-manage-connections.md  |  2 +-
 .../pages/ditto/connectivity-mapping.md       |  6 +-
 .../connectivity-protocol-bindings-kafka2.md  |  2 +-
 .../main/resources/pages/ditto/feedback.md    |  4 +-
 .../pages/ditto/installation-extending.md     |  2 +-
 .../pages/ditto/installation-operating.md     | 26 ++---
 .../pages/ditto/installation-running.md       |  2 +-
 .../pages/ditto/intro-hello-world.md          |  2 +-
 .../resources/pages/ditto/presentations.md    |  2 +-
 .../pages/ditto/release_notes_010M3.md        |  8 +-
 .../pages/ditto/release_notes_020M1.md        |  8 +-
 .../pages/ditto/release_notes_030M1.md        | 10 +-
 .../pages/ditto/release_notes_030M2.md        | 12 +--
 .../pages/ditto/release_notes_080.md          |  4 +-
 .../pages/ditto/release_notes_080M1.md        | 16 +--
 .../pages/ditto/release_notes_080M2.md        | 18 ++--
 .../pages/ditto/release_notes_080M3.md        | 10 +-
 .../pages/ditto/release_notes_090.md          | 14 +--
 .../pages/ditto/release_notes_090M1.md        | 14 +--
 .../pages/ditto/release_notes_090M2.md        | 18 ++--
 .../pages/ditto/release_notes_100.md          |  8 +-
 .../pages/ditto/release_notes_100M1a.md       | 24 ++---
 .../pages/ditto/release_notes_100M2.md        | 18 ++--
 .../pages/ditto/release_notes_110.md          | 36 +++----
 .../pages/ditto/release_notes_111.md          |  6 +-
 .../pages/ditto/release_notes_112.md          | 12 +--
 .../pages/ditto/release_notes_113.md          | 16 +--
 .../pages/ditto/release_notes_115.md          |  4 +-
 .../pages/ditto/release_notes_120.md          | 22 ++---
 .../pages/ditto/release_notes_121.md          |  4 +-
 .../pages/ditto/release_notes_130.md          | 24 ++---
 .../pages/ditto/release_notes_140.md          | 26 ++---
 .../pages/ditto/release_notes_150.md          | 34 +++----
 .../pages/ditto/release_notes_151.md          |  2 +-
 .../pages/ditto/release_notes_200.md          | 52 +++++-----
 .../pages/ditto/release_notes_201.md          | 12 +--
 .../pages/ditto/release_notes_210.md          | 60 ++++++------
 .../pages/ditto/release_notes_211.md          | 16 +--
 .../pages/ditto/release_notes_212.md          | 10 +-
 .../pages/ditto/release_notes_213.md          |  4 +-
 .../pages/ditto/release_notes_220.md          | 24 ++---
 .../pages/ditto/release_notes_221.md          |  8 +-
 .../pages/ditto/release_notes_230.md          | 20 ++--
 .../pages/ditto/release_notes_231.md          | 10 +-
 .../pages/ditto/release_notes_232.md          | 10 +-
 .../pages/ditto/release_notes_240.md          | 32 +++---
 .../pages/ditto/release_notes_241.md          |  6 +-
 .../pages/ditto/release_notes_242.md          |  4 +-
 .../pages/ditto/release_notes_300.md          | 98 +++++++++----------
 .../2018_02_07-virtualiot-meetup/index.html   |  2 +-
 .../2018_05_23-meetup-iot-hessen/index.html   |  4 +-
 .../index.html                                |  6 +-
 .../index.html                                |  2 +-
 .../index.html                                |  4 +-
 .../index.html                                |  2 +-
 .../index.html                                |  6 +-
 .../index.html                                |  4 +-
 .../2021_06_ditto-20-overview/index.html      |  4 +-
 .../slides/2021_06_ditto-in-20-min/index.html |  4 +-
 .../index.html                                |  8 +-
 .../index.html                                |  4 +-
 .../slides/2022_10_ditto-and-wot/index.html   |  4 +-
 .../slides/2023_01_ditto-in-30-min/index.html |  4 +-
 legal/NOTICE.md                               |  2 +-
 pom.xml                                       |  2 +-
 90 files changed, 472 insertions(+), 472 deletions(-)

diff --git a/NOTICE.md b/NOTICE.md
index 3e022ace3d9..0f7d66929c6 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -23,7 +23,7 @@ SPDX-License-Identifier: EPL-2.0
 
 # Source Code
 
-* https://github.com/eclipse/ditto
+* https://github.com/eclipse-ditto/ditto
 
 # Third-party Content
 
diff --git a/README.md b/README.md
index 71564ff8b25..ee6d28b749c 100755
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 # Eclipse Ditto™
 
 [![Join the chat at https://gitter.im/eclipse/ditto](https://badges.gitter.im/eclipse/ditto.svg)](https://gitter.im/eclipse/ditto?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://github.com/eclipse/ditto/workflows/build/badge.svg)](https://github.com/eclipse/ditto/actions?query=workflow%3Abuild)
+[![Build Status](https://github.com/eclipse-ditto/ditto/workflows/build/badge.svg)](https://github.com/eclipse-ditto/ditto/actions?query=workflow%3Abuild)
 [![Maven Central](https://img.shields.io/maven-central/v/org.eclipse.ditto/ditto?label=maven)](https://search.maven.org/search?q=g:org.eclipse.ditto)
 [![Docker pulls](https://img.shields.io/docker/pulls/eclipse/ditto-things.svg)](https://hub.docker.com/search?q=eclipse%2Fditto&type=image)
 [![License](https://img.shields.io/badge/License-EPL%202.0-green.svg)](https://opensource.org/licenses/EPL-2.0)
@@ -41,7 +41,7 @@ In order to start up Ditto via *Docker Compose*, you'll need:
   * at least 2 CPU cores which can be used by Docker
   * at least 4 GB of RAM which can be used by Docker
 
-You also have other possibilities to run Ditto, please have a look [here](https://github.com/eclipse/ditto/tree/master/deployment) to explore them.
+You also have other possibilities to run Ditto, please have a look [here](https://github.com/eclipse-ditto/ditto/tree/master/deployment) to explore them.
 
 ### Start Ditto
 
diff --git a/RELEASE.md b/RELEASE.md
index b986c398bd4..406b6573eba 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -18,17 +18,17 @@ Ditto releases are tracked and planned here: https://projects.eclipse.org/projec
    * New features, changes, bug fixes to last release / milestone release
    * Add migration notes (if there are any)
 * Write a Blog post announcement, e.g. like for: https://www.eclipse.org/ditto/2022-12-16-release-announcement-310.html
-* Close GitHub milestone (and assign all Issues/PRs which were still included in that milestone): https://github.com/eclipse/ditto/milestones
-* Create a GitHub release: https://github.com/eclipse/ditto/releases (based on the Tags which was pushed during release job)
+* Close GitHub milestone (and assign all Issues/PRs which were still included in that milestone): https://github.com/eclipse-ditto/ditto/milestones
+* Create a GitHub release: https://github.com/eclipse-ditto/ditto/releases (based on the Tags which was pushed during release job)
 * Write a mail to the "ditto-dev" mailing list
 * Tweet about it ;)
 * Set binary compatibility check version to the new public release. Delete all exclusions and module-level deactivation of japi-cmp plugin except for *.internal packages.
-* Update https://github.com/eclipse/ditto/blob/master/SECURITY.md with the supported versions to receive security fixes
+* Update https://github.com/eclipse-ditto/ditto/blob/master/SECURITY.md with the supported versions to receive security fixes
 * For major+minor versions:
    * Create a "release" branch"release-<version>" from the released git tag
       * needed to build the documentation from
       * required for bugfixes to build a bugfix release for the affected minor version
-   * Add the new version to the documentation config: https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/_config.yml#L114
+   * Add the new version to the documentation config: https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/_config.yml#L114
    * Adjust the "website" CI jobs to also build the newly added branch:
       * https://ci.eclipse.org/ditto/view/Website/
          * https://ci.eclipse.org/ditto/view/Website/job/website-build-and-deploy-fast/ will build the latest released minor version + "master" (development) version
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/CloudEventsMapper.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/CloudEventsMapper.java
index b863c083fe7..1c5d913dddb 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/CloudEventsMapper.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/CloudEventsMapper.java
@@ -58,7 +58,7 @@ public final class CloudEventsMapper extends AbstractMessageMapper {
     private static final String TYPE = "type";
     private static final String OUTBOUNDTYPE = "org.eclipse.ditto.outbound";
     private static final String OUTBOUNDSPECVERSION = "1.0";
-    private static final String OUTBOUNDSOURCE = "https://github.com/eclipse/ditto";
+    private static final String OUTBOUNDSOURCE = "https://github.com/eclipse-ditto/ditto";
     private static final String DATA = "data";
     private static final String DATA_BASE64 = "data_base64";
     private static final String OUTBOUND_DATA_CONTENT_TYPE = "datacontenttype";
diff --git a/documentation/src/main/resources/_data/topnav.yml b/documentation/src/main/resources/_data/topnav.yml
index 4bf938138ec..7a473874854 100644
--- a/documentation/src/main/resources/_data/topnav.yml
+++ b/documentation/src/main/resources/_data/topnav.yml
@@ -13,15 +13,15 @@ topnav:
     - title:
       image: GitHub-Mark-Light-32px.png
       alt: Sources at GitHub
-      external_url: https://github.com/eclipse/ditto
+      external_url: https://github.com/eclipse-ditto/ditto
     - title: SDKs
       image: GitHub-Mark-Light-32px.png
       alt: SDK sources at GitHub
-      external_url: https://github.com/eclipse/ditto-clients
+      external_url: https://github.com/eclipse-ditto/ditto-clients
     - title: examples
       image: GitHub-Mark-Light-32px.png
       alt: Example sources at GitHub
-      external_url: https://github.com/eclipse/ditto-examples
+      external_url: https://github.com/eclipse-ditto/ditto-examples
 
 #Topnav dropdowns
 topnav_dropdowns:
diff --git a/documentation/src/main/resources/_posts/2018-01-15-example-demonstrating-rest-to-websocket.md b/documentation/src/main/resources/_posts/2018-01-15-example-demonstrating-rest-to-websocket.md
index e8a4ba79ba1..62e96d14bc3 100644
--- a/documentation/src/main/resources/_posts/2018-01-15-example-demonstrating-rest-to-websocket.md
+++ b/documentation/src/main/resources/_posts/2018-01-15-example-demonstrating-rest-to-websocket.md
@@ -11,7 +11,7 @@ toc: false
 ---
 
 There's a new example showing how to combine the REST and WebSocket API
-over at the [Eclipse Ditto examples repository](https://github.com/eclipse/ditto-examples/tree/master/rest-to-websocket).
+over at the [Eclipse Ditto examples repository](https://github.com/eclipse-ditto/ditto-examples/tree/master/rest-to-websocket).
 Right from the project's description:
 
 >This example shows how to leverage the powers of combining the REST and
@@ -31,7 +31,7 @@ Right from the project's description:
 href="https://raw.githubusercontent.com/eclipse/ditto-examples/master/rest-to-websocket/docs/images/make-coffee.gif" 
 alt="Eclipse Ditto REST to WebSocket example gif" 
 max-width=800 
-caption="Source: https://github.com/eclipse/ditto-examples" %}
+caption="Source: https://github.com/eclipse-ditto/ditto-examples" %}
 
 If you have any wishes, improvements, are missing something
 or just want to get in touch with us, you can use one of
diff --git a/documentation/src/main/resources/_posts/2018-04-25-connectivity-service.md b/documentation/src/main/resources/_posts/2018-04-25-connectivity-service.md
index b466b335581..d8f87c6ab18 100644
--- a/documentation/src/main/resources/_posts/2018-04-25-connectivity-service.md
+++ b/documentation/src/main/resources/_posts/2018-04-25-connectivity-service.md
@@ -24,8 +24,8 @@ That worked quite well, but still had some issues:
 
 Our current implementation focus lies on two GitHub issues resolving those problems:
 
-* [Enhance existing AMQP-bridge with AMQP 0.9.1 connectivity](https://github.com/eclipse/ditto/issues/129)
-* [Support mapping arbitrary message payloads in AMQP-bridge](https://github.com/eclipse/ditto/issues/130)
+* [Enhance existing AMQP-bridge with AMQP 0.9.1 connectivity](https://github.com/eclipse-ditto/ditto/issues/129)
+* [Support mapping arbitrary message payloads in AMQP-bridge](https://github.com/eclipse-ditto/ditto/issues/130)
 
 
 ## Changes and Enhancements
diff --git a/documentation/src/main/resources/_posts/2018-10-16-example-mqtt-bidirectional.md b/documentation/src/main/resources/_posts/2018-10-16-example-mqtt-bidirectional.md
index fc03b528fa6..569cb507301 100644
--- a/documentation/src/main/resources/_posts/2018-10-16-example-mqtt-bidirectional.md
+++ b/documentation/src/main/resources/_posts/2018-10-16-example-mqtt-bidirectional.md
@@ -20,7 +20,7 @@ which was released recently with milestone [0.8.0-M2](2018-09-27-milestone-annou
 
 On his journey into digital twin land he made a great example with an ESP8266 powered board connected via an MQTT broker
 to Ditto and published it to the 
-[Eclipse Ditto examples repository](https://github.com/eclipse/ditto-examples/tree/master/mqtt-bidirectional):
+[Eclipse Ditto examples repository](https://github.com/eclipse-ditto/ditto-examples/tree/master/mqtt-bidirectional):
 
 > This example is about how to communicate between device and solution in a two way pattern through Ditto using MQTT. 
   This means we will add a policy, a thing and a MQTT connection to Ditto. 
@@ -40,7 +40,7 @@ to Ditto and published it to the
 href="https://raw.githubusercontent.com/eclipse/ditto-examples/master/mqtt-bidirectional/img/diagram.jpg" 
 alt="Eclipse Ditto bidirectional MQTT diagram" 
 max-width=800 
-caption="Source: https://github.com/eclipse/ditto-examples" %}
+caption="Source: https://github.com/eclipse-ditto/ditto-examples" %}
 
 > We will use an Octopus-board with an ESP8266 on it. It has several sensors built in, but for simplicity we will
  just use it's temperature and altitude sensor. 
diff --git a/documentation/src/main/resources/_posts/2019-12-12-release-announcement-100.md b/documentation/src/main/resources/_posts/2019-12-12-release-announcement-100.md
index f600cd71527..5b892c42708 100644
--- a/documentation/src/main/resources/_posts/2019-12-12-release-announcement-100.md
+++ b/documentation/src/main/resources/_posts/2019-12-12-release-announcement-100.md
@@ -60,7 +60,7 @@ millions of managed things.
 
 The main changes compared to the last release, [0.9.0](release_notes_090.html), are:
 
-* addition of a Java and a JavaScript client SDK in separate [GitHub repo](https://github.com/eclipse/ditto-clients)
+* addition of a Java and a JavaScript client SDK in separate [GitHub repo](https://github.com/eclipse-ditto/ditto-clients)
 * configurable OpenID Connect authorization servers
 * support for OpenID Connect / OAuth2.0 based authentication in Ditto Java Client
 * invoking custom foreign HTTP endpoints as a result of events/messages
diff --git a/documentation/src/main/resources/_posts/2020-04-16-connecting-to-ttn-via-mqtt.md b/documentation/src/main/resources/_posts/2020-04-16-connecting-to-ttn-via-mqtt.md
index 8eb9c448211..9c4d42d14fb 100644
--- a/documentation/src/main/resources/_posts/2020-04-16-connecting-to-ttn-via-mqtt.md
+++ b/documentation/src/main/resources/_posts/2020-04-16-connecting-to-ttn-via-mqtt.md
@@ -69,7 +69,7 @@ sudo chmod +x /usr/local/bin/docker-compose
 That is required to get the `docker-compose.yaml` file and other resources required to run Ditto with Docker Compose.
 
 ```shell
-git clone --depth 1 https://github.com/eclipse/ditto.git
+git clone --depth 1 https://github.com/eclipse-ditto/ditto.git
 ```
 
 
diff --git a/documentation/src/main/resources/_posts/2020-10-08-asynchronous-client-creation.md b/documentation/src/main/resources/_posts/2020-10-08-asynchronous-client-creation.md
index 8128cf19ac3..a00eff72714 100644
--- a/documentation/src/main/resources/_posts/2020-10-08-asynchronous-client-creation.md
+++ b/documentation/src/main/resources/_posts/2020-10-08-asynchronous-client-creation.md
@@ -10,7 +10,7 @@ sidebar: false
 toc: false
 ---
 
-Before [Ditto Java Client](https://github.com/eclipse/ditto-clients/tree/master/java) 1.3.0,
+Before [Ditto Java Client](https://github.com/eclipse-ditto/ditto-clients/tree/master/java) 1.3.0,
 a client object connects to a configured Ditto back-end during its creation.
 
 ```java
diff --git a/documentation/src/main/resources/_posts/2021-03-22-azure-iot-hub-integration.md b/documentation/src/main/resources/_posts/2021-03-22-azure-iot-hub-integration.md
index 025047de9fd..7e88a7627a1 100644
--- a/documentation/src/main/resources/_posts/2021-03-22-azure-iot-hub-integration.md
+++ b/documentation/src/main/resources/_posts/2021-03-22-azure-iot-hub-integration.md
@@ -205,5 +205,5 @@ generate a SAS token out of that string.
 ## Getting started
 
 To get started using Azure IoT Hub as a message broker for Eclipse Ditto, the 
-[Azure IoT Hub Device Simulator Example](https://github.com/eclipse/ditto-examples/tree/master/azure/azure-iot-hub-device-simulator) 
+[Azure IoT Hub Device Simulator Example](https://github.com/eclipse-ditto/ditto-examples/tree/master/azure/azure-iot-hub-device-simulator) 
 is a good entry point.
diff --git a/documentation/src/main/resources/_posts/2022-03-03-wot-integration.md b/documentation/src/main/resources/_posts/2022-03-03-wot-integration.md
index 43521bcc84d..41c4d057923 100644
--- a/documentation/src/main/resources/_posts/2022-03-03-wot-integration.md
+++ b/documentation/src/main/resources/_posts/2022-03-03-wot-integration.md
@@ -191,7 +191,7 @@ e.g. have a builder based API for building new objects or to read a TD/TM from a
 </dependency>
 ```
 
-Please have a look at the added [ditto-wot-model module](https://github.com/eclipse/ditto/tree/master/wot/model) to find
+Please have a look at the added [ditto-wot-model module](https://github.com/eclipse-ditto/ditto/tree/master/wot/model) to find
 out more about example usage.
 
 
diff --git a/documentation/src/main/resources/architecture/DADR-0004-signal-enrichment.md b/documentation/src/main/resources/architecture/DADR-0004-signal-enrichment.md
index 4a65664e1a0..7717a2c2567 100644
--- a/documentation/src/main/resources/architecture/DADR-0004-signal-enrichment.md
+++ b/documentation/src/main/resources/architecture/DADR-0004-signal-enrichment.md
@@ -8,7 +8,7 @@ accepted
 
 ## Context
 
-Supporting a new feature, the so called [signal enrichment](https://github.com/eclipse/ditto/issues/561), raises a few
+Supporting a new feature, the so called [signal enrichment](https://github.com/eclipse-ditto/ditto/issues/561), raises a few
 questions towards throughput and scalability impact of that new feature.
 
 In the current architecture, Ditto internally publishes events (as part of the applied "event sourcing" pattern) for 
diff --git a/documentation/src/main/resources/architecture/DADR-0007-concierge-removal.md b/documentation/src/main/resources/architecture/DADR-0007-concierge-removal.md
index c79c4cfc1a8..2e09671da42 100644
--- a/documentation/src/main/resources/architecture/DADR-0007-concierge-removal.md
+++ b/documentation/src/main/resources/architecture/DADR-0007-concierge-removal.md
@@ -2,7 +2,7 @@
 
 Date: 12.04.2022
 
-Related GitHub issue: [#1339](https://github.com/eclipse/ditto/issues/1339)
+Related GitHub issue: [#1339](https://github.com/eclipse-ditto/ditto/issues/1339)
 
 ## Status
 
@@ -47,10 +47,10 @@ Additional benefits depending on where the authorization / policy enforcement is
 | Aspect                                                                     | Approach: authorization at edges (gateway/connectivity)                                                                                                                                | Approach: authorization in entity services (policies/things)                                                                                                                                                                                                                |
 |----------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Policy enforcer caching                                                    | -- **distributed caching** potentially each instance of edge will eventually cache a policy enforced for a specific policy<br/>--- **unpredictable cache sizes** due to missing sharding | +++ **very localized caching**, e.g. a policy only used by one thing is only cached within the `ThingPersistenceActor` which uses the policy                                                                                                                              |
-| Partial event handling [#96](https://github.com/eclipse/ditto/issues/96)   | + **edges directly can use policy enforcers** to create multiple "partial events" based on one "source event"                                                                          | -- **information** regarding how the edges should split up one "source event" into several "partial events" must be **piggybacked as event header**                                                                                                                         |
+| Partial event handling [#96](https://github.com/eclipse-ditto/ditto/issues/96)   | + **edges directly can use policy enforcers** to create multiple "partial events" based on one "source event"                                                                          | -- **information** regarding how the edges should split up one "source event" into several "partial events" must be **piggybacked as event header**                                                                                                                         |
 | Live command / message processing                                          | + **edges can directly route authorized live commands / messages** to other interested edges (e.g. gateway WS to connectivity)                                                         | - **for live commands / messages one additional "hop"** (only compared to the left column - this "hop" is currently with concierge service also necessary)<br/>via the "things" service has to be done as the "things" service would also authorize live commands/messages. |
 | Smart channel selection                                                    | -- **rather complex state machine logic from concierge must be moved to edges** for supporting the "live channel condition" use cases                                                  | ++ **live channel condition** logic can be done completely in `ThingPersistenceActor`, simplifying the implementation a lot                                                                                                                                                 |
-| Conditional messages [#1363](https://github.com/eclipse/ditto/issues/1363) | - **rather complex implementation required similar to smart channel selection**                                                                                                        | + **simple implementation**, can be done completely in `ThingPersistenceActor`                                                                                                                                                                                              |
+| Conditional messages [#1363](https://github.com/eclipse-ditto/ditto/issues/1363) | - **rather complex implementation required similar to smart channel selection**                                                                                                        | + **simple implementation**, can be done completely in `ThingPersistenceActor`                                                                                                                                                                                              |
 | ######                                                                     | ######                                                                                                                                                                                 | ######                                                                                                                                                                                                                                                                      |
 | Overall weight                                                             | ------                                                                                                                                                                                 | +++                                                                                                                                                                                                                                                                         |
 
diff --git a/documentation/src/main/resources/pages/ditto/architecture-services-connectivity.md b/documentation/src/main/resources/pages/ditto/architecture-services-connectivity.md
index 958ad7f5fb8..102f8fe3660 100644
--- a/documentation/src/main/resources/pages/ditto/architecture-services-connectivity.md
+++ b/documentation/src/main/resources/pages/ditto/architecture-services-connectivity.md
@@ -18,15 +18,15 @@ connectivity service offers a flexible and customizable [payload mapping] on top
 The model of the connectivity service is defined around the entity `Connection`:
 
 
-* [model](https://github.com/eclipse/ditto/tree/master/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model)
+* [model](https://github.com/eclipse-ditto/ditto/tree/master/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model)
 
 ## Signals
 
 Other services can communicate with the connectivity service via:
 
-* [ConnectivityCommands](https://github.com/eclipse/ditto/tree/master/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/ConnectivityCommand.java):
+* [ConnectivityCommands](https://github.com/eclipse-ditto/ditto/tree/master/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/ConnectivityCommand.java):
   implementing classes provide commands which are processed by this service
-* [ConnectivityEvents](https://github.com/eclipse/ditto/tree/master/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/events/ConnectivityEvent.java):
+* [ConnectivityEvents](https://github.com/eclipse-ditto/ditto/tree/master/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/events/ConnectivityEvent.java):
   implementing classes represent events which are emitted when entities managed by this service were modified
 
 ## Persistence
diff --git a/documentation/src/main/resources/pages/ditto/architecture-services-policies.md b/documentation/src/main/resources/pages/ditto/architecture-services-policies.md
index ab171527f17..e05292e3ca4 100644
--- a/documentation/src/main/resources/pages/ditto/architecture-services-policies.md
+++ b/documentation/src/main/resources/pages/ditto/architecture-services-policies.md
@@ -12,15 +12,15 @@ The "policies" service takes care of persisting [Policies](basic-policy.html).
 The model of the policies service is defined around the entity `Policy`:
 
 
-* [Policy model](https://github.com/eclipse/ditto/tree/master/policies/model/src/main/java/org/eclipse/ditto/policies/model)
+* [Policy model](https://github.com/eclipse-ditto/ditto/tree/master/policies/model/src/main/java/org/eclipse/ditto/policies/model)
 
 ## Signals
 
 Other services can communicate with the policies service via:
 
-* [PolicyCommands](https://github.com/eclipse/ditto/tree/master/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/PolicyCommand.java):
+* [PolicyCommands](https://github.com/eclipse-ditto/ditto/tree/master/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/PolicyCommand.java):
   implementing classes provide commands which are processed by this service
-* [PolicyEvents](https://github.com/eclipse/ditto/tree/master/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyEvent.java):
+* [PolicyEvents](https://github.com/eclipse-ditto/ditto/tree/master/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyEvent.java):
   implementing classes represent events which are emitted when entities managed by this service were modified
 
 ## Persistence
diff --git a/documentation/src/main/resources/pages/ditto/architecture-services-things-search.md b/documentation/src/main/resources/pages/ditto/architecture-services-things-search.md
index a63c8e9785e..05e64b1f221 100644
--- a/documentation/src/main/resources/pages/ditto/architecture-services-things-search.md
+++ b/documentation/src/main/resources/pages/ditto/architecture-services-things-search.md
@@ -21,14 +21,14 @@ and [policies](architecture-services-policies.html) services.
 It however contains a model which can transform an <a href="#" data-toggle="tooltip" data-original-title="{{site.data.glossary.rql}}">RQL</a> 
 search query into a Java domain model which is defined here:
 
-* [rql parser ast](https://github.com/eclipse/ditto/tree/master/rql/model/src/main/java/org/eclipse/ditto/rql/model/predicates/ast)
+* [rql parser ast](https://github.com/eclipse-ditto/ditto/tree/master/rql/model/src/main/java/org/eclipse/ditto/rql/model/predicates/ast)
 
 ## Signals
 
 Other services can communicate with the things-search service via:
 
 
-* [commands](https://github.com/eclipse/ditto/tree/master/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/signals/commands):
+* [commands](https://github.com/eclipse-ditto/ditto/tree/master/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/signals/commands):
   containing commands and command responses which are processed by this service
 
 ## Persistence
diff --git a/documentation/src/main/resources/pages/ditto/architecture-services-things.md b/documentation/src/main/resources/pages/ditto/architecture-services-things.md
index 7c8936f2202..0bdebcc0c2e 100644
--- a/documentation/src/main/resources/pages/ditto/architecture-services-things.md
+++ b/documentation/src/main/resources/pages/ditto/architecture-services-things.md
@@ -11,15 +11,15 @@ The "things" service takes care of persisting [Things](basic-thing.html) and [Fe
 
 The model of the things service is defined around the entities `Thing` and `Feature`:
 
-* [Thing model](https://github.com/eclipse/ditto/tree/master/things/model/src/main/java/org/eclipse/ditto/things/model)
+* [Thing model](https://github.com/eclipse-ditto/ditto/tree/master/things/model/src/main/java/org/eclipse/ditto/things/model)
 
 ## Signals
 
 Other services can communicate with the things service via:
 
-* [ThingCommands](https://github.com/eclipse/ditto/tree/master/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/ThingCommand.java):
+* [ThingCommands](https://github.com/eclipse-ditto/ditto/tree/master/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/ThingCommand.java):
   implementing classes provide commands which are processed by this service
-* [ThingEvents](https://github.com/eclipse/ditto/tree/master/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/ThingEvent.java):
+* [ThingEvents](https://github.com/eclipse-ditto/ditto/tree/master/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/ThingEvent.java):
   implementing classes represent events which are emitted when entities managed by this service were modified
 
 ## Persistence
diff --git a/documentation/src/main/resources/pages/ditto/basic-namespaces-and-names.md b/documentation/src/main/resources/pages/ditto/basic-namespaces-and-names.md
index 4f8ef8a90ee..573b1d64f9f 100644
--- a/documentation/src/main/resources/pages/ditto/basic-namespaces-and-names.md
+++ b/documentation/src/main/resources/pages/ditto/basic-namespaces-and-names.md
@@ -19,7 +19,7 @@ The namespace must conform to the following notation:
 
 When writing a Java application, you can use the following regex to validate your namespaces:  
     ``(?<ns>|(?:(?:[a-zA-Z]\w*+)(?:[.-][a-zA-Z]\w*+)*+))``
-    (see [RegexPatterns#NAMESPACE_REGEX](https://github.com/eclipse/ditto/blob/master/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/RegexPatterns.java)).
+    (see [RegexPatterns#NAMESPACE_REGEX](https://github.com/eclipse-ditto/ditto/blob/master/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/RegexPatterns.java)).
 	
 Examples for valid namespaces:
 * `org.eclipse.ditto`,
@@ -36,7 +36,7 @@ The name must conform to the following notation:
 
 When writing a Java application, you can use the following regex to validate your thing name:  
     ``(?<name>[^\x00-\x1F\x7F-\xFF/]++)``
-    (see [RegexPatterns#ENTITY_NAME_REGEX](https://github.com/eclipse/ditto/blob/master/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/RegexPatterns.java)).
+    (see [RegexPatterns#ENTITY_NAME_REGEX](https://github.com/eclipse-ditto/ditto/blob/master/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/RegexPatterns.java)).
 
 Examples for valid names:
     * `ditto`,
@@ -53,7 +53,7 @@ A namespaced ID must conform to the following expectations:
 
 When writing a Java application, you can use the following regex to validate your namespaced IDs:  
 	``(?<ns>|(?:(?:[a-zA-Z]\w*+)(?:[.-][a-zA-Z]\w*+)*+)):(?<name>[^\x00-\x1F\x7F-\xFF/]++)``
-	(see [RegexPatterns#ID_REGEX](https://github.com/eclipse/ditto/blob/master/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/RegexPatterns.java)).
+	(see [RegexPatterns#ID_REGEX](https://github.com/eclipse-ditto/ditto/blob/master/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/RegexPatterns.java)).
 
 Examples for valid IDs:
 * `org.eclipse.ditto:smart-coffee-1`,
diff --git a/documentation/src/main/resources/pages/ditto/basic-wot-integration-example.md b/documentation/src/main/resources/pages/ditto/basic-wot-integration-example.md
index 38172367068..2d2ecad67df 100644
--- a/documentation/src/main/resources/pages/ditto/basic-wot-integration-example.md
+++ b/documentation/src/main/resources/pages/ditto/basic-wot-integration-example.md
@@ -15,7 +15,7 @@ Wrapping up the [WoT integration](basic-wot-integration.html) with a practical e
 You can provide a WoT Thing Model via any HTTP(s) URL addressable endpoint, for example simply put your WoT TMs into
 a GitHub repository.  
 For this example, Ditto added a model into its `ditto-examples` GitHub Repo:  
-[floor-lamp-1.0.0.tm.jsonld](https://github.com/eclipse/ditto-examples/blob/master/wot/models/floor-lamp-1.0.0.tm.jsonld)
+[floor-lamp-1.0.0.tm.jsonld](https://github.com/eclipse-ditto/ditto-examples/blob/master/wot/models/floor-lamp-1.0.0.tm.jsonld)
 
 This file is available as HTTP served file at:  
 [https://eclipse-ditto.github.io/ditto-examples/wot/models/floor-lamp-1.0.0.tm.jsonld](https://eclipse-ditto.github.io/ditto-examples/wot/models/floor-lamp-1.0.0.tm.jsonld)
diff --git a/documentation/src/main/resources/pages/ditto/basic-wot-integration.md b/documentation/src/main/resources/pages/ditto/basic-wot-integration.md
index aece030ee24..43ee2ffe879 100644
--- a/documentation/src/main/resources/pages/ditto/basic-wot-integration.md
+++ b/documentation/src/main/resources/pages/ditto/basic-wot-integration.md
@@ -294,7 +294,7 @@ Prerequisites to use the Thing Description generation:
   when retrieving the Thing via HTTP `GET /api/2/<namespace>:<thing-name>`
 
 The available configuration of the WoT integration can be found in the 
-[things.conf](https://github.com/eclipse/ditto/blob/master/things/service/src/main/resources/things.conf)
+[things.conf](https://github.com/eclipse-ditto/ditto/blob/master/things/service/src/main/resources/things.conf)
 config file of the [things service](architecture-services-things.html) at path `ditto.things.wot`.  
 There you can configure which `securityDefinitions` shall be added to the generated TDs and which `base` path 
 prefix to create into the TDs, depending on your public Ditto endpoint.
@@ -370,7 +370,7 @@ In order to resolve TM placeholders, Ditto applies the following strategy:
 * when a placeholder was not found in the `"model-placeholders"` of the Thing/Feature, a fallback to the Ditto 
   configuration is done:
     * placeholder fallbacks can be configured in Ditto via the 
-      [things.conf](https://github.com/eclipse/ditto/blob/master/things/service/src/main/resources/things.conf) 
+      [things.conf](https://github.com/eclipse-ditto/ditto/blob/master/things/service/src/main/resources/things.conf) 
       configuration file of the [things service](architecture-services-things.html) at path 
       `ditto.things.wot.to-thing-description.placeholders`.<br/>  
       This map may contain static values, but use and JSON type as value (e.g. also a JSON Object), e.g.:
diff --git a/documentation/src/main/resources/pages/ditto/client-sdk-java.md b/documentation/src/main/resources/pages/ditto/client-sdk-java.md
index 5e2bd1c80f2..9f0e8f82f49 100644
--- a/documentation/src/main/resources/pages/ditto/client-sdk-java.md
+++ b/documentation/src/main/resources/pages/ditto/client-sdk-java.md
@@ -270,5 +270,5 @@ client.twin().registerForThingChanges("REG1", change -> {
 ## Further examples
 
 For further examples on how to use the Ditto client, please have a look at the class 
-[DittoClientUsageExamples](https://github.com/eclipse/ditto-clients/blob/master/java/src/test/java/org/eclipse/ditto/client/DittoClientUsageExamples.java)
+[DittoClientUsageExamples](https://github.com/eclipse-ditto/ditto-clients/blob/master/java/src/test/java/org/eclipse/ditto/client/DittoClientUsageExamples.java)
  which is configured to connect to the [Ditto sandbox](https://ditto.eclipseprojects.io).
diff --git a/documentation/src/main/resources/pages/ditto/client-sdk-javascript.md b/documentation/src/main/resources/pages/ditto/client-sdk-javascript.md
index 27c7cc73e79..be88bf1130c 100644
--- a/documentation/src/main/resources/pages/ditto/client-sdk-javascript.md
+++ b/documentation/src/main/resources/pages/ditto/client-sdk-javascript.md
@@ -13,13 +13,13 @@ Install `@eclipse-ditto/ditto-javascript-client-dom` for the DOM (browser) imple
 the API and build your own client implementation.
 
 More information can be found in the descriptions of the subpackages:
-* [@eclipse-ditto/ditto-javascript-client-api](https://github.com/eclipse/ditto-clients/blob/master/javascript/lib/api/README.md)
-* [@eclipse-ditto/ditto-javascript-client-dom](https://github.com/eclipse/ditto-clients/blob/master/javascript/lib/dom/README.md) 
-* [@eclipse-ditto/ditto-javascript-client-node](https://github.com/eclipse/ditto-clients/blob/master/javascript/lib/node/README.md)
+* [@eclipse-ditto/ditto-javascript-client-api](https://github.com/eclipse-ditto/ditto-clients/blob/master/javascript/lib/api/README.md)
+* [@eclipse-ditto/ditto-javascript-client-dom](https://github.com/eclipse-ditto/ditto-clients/blob/master/javascript/lib/dom/README.md) 
+* [@eclipse-ditto/ditto-javascript-client-node](https://github.com/eclipse-ditto/ditto-clients/blob/master/javascript/lib/node/README.md)
 
 All released versions are published on [npmjs.com](https://www.npmjs.com/~eclipse_ditto).
 
-## Compatibility with [Eclipse Ditto](https://github.com/eclipse/ditto)
+## Compatibility with [Eclipse Ditto](https://github.com/eclipse-ditto/ditto)
 
 The newest release of the JavaScript client will always try to cover as much API
 functionality of the same Eclipse Ditto major version as possible. There might
diff --git a/documentation/src/main/resources/pages/ditto/connectivity-hmac-signing.md b/documentation/src/main/resources/pages/ditto/connectivity-hmac-signing.md
index 42badf66df5..ad11a5a2d1e 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-hmac-signing.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-hmac-signing.md
@@ -93,7 +93,7 @@ The parameters of the algorithm `az-sasl` are:
 
 ### Configuration
 
-Algorithm names and implementations are configured in [`connectivity.conf`](https://github.com/eclipse/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf).
+Algorithm names and implementations are configured in [`connectivity.conf`](https://github.com/eclipse-ditto/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf).
 The default configuration provides the names and implementations of the available pre-defined algorithms for the given
 connection types.
 ```hocon
@@ -130,7 +130,7 @@ and which interface needs to be implemented.
 |                          | HTTP Push connection | AMQP 1.0 connection |
 | ------------------------ | -------------------- | ------------------- |
 | Config path       | `ditto.connectivity.connection.http-push.hmac-algorithms`   | `ditto.connectivity.connection.amqp10.hmac-algorithms` |
-| Class to implement  | [HttpRequestSigningFactory](https://github.com/eclipse/ditto/blob/master/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpRequestSigningFactory.java)  | [AmqpConnectionSigningFactory](https://github.com/eclipse/ditto/blob/master/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpConnectionSigningFactory.java) |
+| Class to implement  | [HttpRequestSigningFactory](https://github.com/eclipse-ditto/ditto/blob/master/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpRequestSigningFactory.java)  | [AmqpConnectionSigningFactory](https://github.com/eclipse-ditto/ditto/blob/master/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/amqp/AmqpConnectionSigningFactory.java) |
 
 
 ### Example integrations
diff --git a/documentation/src/main/resources/pages/ditto/connectivity-manage-connections.md b/documentation/src/main/resources/pages/ditto/connectivity-manage-connections.md
index 4e2a595f752..da222f593cb 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-manage-connections.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-manage-connections.md
@@ -226,7 +226,7 @@ The contained fields in a single log entry are the following:
 * `message`:       the actual log message
 
 Please inspect the other available configuration options in 
-[connectivity.conf](https://github.com/eclipse/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf) 
+[connectivity.conf](https://github.com/eclipse-ditto/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf) 
 at path `ditto.connectivity.monitoring.logger.publisher` to learn about other configuration possibilities.
 
 
diff --git a/documentation/src/main/resources/pages/ditto/connectivity-mapping.md b/documentation/src/main/resources/pages/ditto/connectivity-mapping.md
index d03d3af5c7b..edc9989b693 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-mapping.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-mapping.md
@@ -1185,8 +1185,8 @@ Beside the JavaScript based mapping - which can be configured/changed at runtime
 connectivity service - there is also the possibility to implement a custom Java based mapper.
 
 The interface to be implemented is
-[`MessageMapper`](https://github.com/eclipse/ditto/blob/master/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/MessageMapper.java))
-and there is an abstract class [`AbstractMessageMapper`](https://github.com/eclipse/ditto/blob/master/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/AbstractMessageMapper.java)
+[`MessageMapper`](https://github.com/eclipse-ditto/ditto/blob/master/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/MessageMapper.java))
+and there is an abstract class [`AbstractMessageMapper`](https://github.com/eclipse-ditto/ditto/blob/master/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/mapping/AbstractMessageMapper.java)
 which eases implementation of a custom mapper.
 
 Simply extend from `AbstractMessageMapper` to provide a custom mapper:
@@ -1278,7 +1278,7 @@ In order to use this custom Java based mapper implementation, the following step
 ### Example for Custom Java based mapper
 
 Please have a look at the following Ditto example project:
-* [custom-ditto-java-payload-mapper](https://github.com/eclipse/ditto-examples/tree/master/custom-ditto-java-payload-mapper)
+* [custom-ditto-java-payload-mapper](https://github.com/eclipse-ditto/ditto-examples/tree/master/custom-ditto-java-payload-mapper)
 
 This shows how to implement, add and configure a custom, Protobuf based, Java payload mapper for Ditto to use in the
 connectivity service for mapping a custom domain specific Protbuf encoded payload.
diff --git a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-kafka2.md b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-kafka2.md
index 3bbcc50e272..30c67ebe4b2 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-kafka2.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-kafka2.md
@@ -22,7 +22,7 @@ be configured for the connection in order to transform the messages.
 
 ## Global Kafka client configuration
 
-The behavior of the used Kafka client can be configured in the [connectivity.conf](https://github.com/eclipse/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf)
+The behavior of the used Kafka client can be configured in the [connectivity.conf](https://github.com/eclipse-ditto/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf)
 under key `ditto.connectivity.connection.kafka`:
 * `consumer`: The Kafka consumer configuration applied when configuring [sources](#source-format) in order to consume messages from Kafka
 * `committer`: The Kafka committer configuration to apply when consuming messages, e.g. the `max-batch` size and `max-interval` duration
diff --git a/documentation/src/main/resources/pages/ditto/feedback.md b/documentation/src/main/resources/pages/ditto/feedback.md
index b9222adea96..f075ba5bc6f 100644
--- a/documentation/src/main/resources/pages/ditto/feedback.md
+++ b/documentation/src/main/resources/pages/ditto/feedback.md
@@ -9,6 +9,6 @@ topnav: topnav
 You have following possibilities in order to get support or give feedback:
 
 * Join the chat at [https://gitter.im/eclipse/ditto](https://gitter.im/eclipse/ditto?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) for questions
-* start a [GitHub discussion](https://github.com/eclipse/ditto/discussions) for questions and general discussions
+* start a [GitHub discussion](https://github.com/eclipse-ditto/ditto/discussions) for questions and general discussions
 * As your question on [StackOverflow](https://stackoverflow.com/questions/tagged/eclipse-ditto)
-* create a [GitHub issue](https://github.com/eclipse/ditto/issues) for found bugs / feature requests
+* create a [GitHub issue](https://github.com/eclipse-ditto/ditto/issues) for found bugs / feature requests
diff --git a/documentation/src/main/resources/pages/ditto/installation-extending.md b/documentation/src/main/resources/pages/ditto/installation-extending.md
index 1bf0a83cadc..739764ae882 100644
--- a/documentation/src/main/resources/pages/ditto/installation-extending.md
+++ b/documentation/src/main/resources/pages/ditto/installation-extending.md
@@ -65,7 +65,7 @@ If however lots of configuration changes should be done, a more feasible approac
 Those configuration files can contain any [Ditto configuration](installation-operating.html#ditto-configuration) done in
 the service config files.
 
-For example, the [gateway.conf](https://github.com/eclipse/ditto/blob/master/gateway/service/src/main/resources/gateway.conf)
+For example, the [gateway.conf](https://github.com/eclipse-ditto/ditto/blob/master/gateway/service/src/main/resources/gateway.conf)
 contains the following configuration snippet:
 ```hocon
 ditto {
diff --git a/documentation/src/main/resources/pages/ditto/installation-operating.md b/documentation/src/main/resources/pages/ditto/installation-operating.md
index aa90da3fbaf..0685bde2b5e 100644
--- a/documentation/src/main/resources/pages/ditto/installation-operating.md
+++ b/documentation/src/main/resources/pages/ditto/installation-operating.md
@@ -35,11 +35,11 @@ Each of Ditto's microservice has many options for configuration, e.g. timeouts,
 
 In order to have a look at all possible configuration options and what default values they have, here are the 
 configuration files of Ditto's microservices:
-* Policies: [policies.conf](https://github.com/eclipse/ditto/blob/master/policies/service/src/main/resources/policies.conf)
-* Things: [things.conf](https://github.com/eclipse/ditto/blob/master/things/service/src/main/resources/things.conf)
-* Things-Search: [things-search.conf](https://github.com/eclipse/ditto/blob/master/thingsearch/service/src/main/resources/things-search.conf)
-* Connectivity: [connectivity.conf](https://github.com/eclipse/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf)
-* Gateway: [gateway.conf](https://github.com/eclipse/ditto/blob/master/gateway/service/src/main/resources/gateway.conf)
+* Policies: [policies.conf](https://github.com/eclipse-ditto/ditto/blob/master/policies/service/src/main/resources/policies.conf)
+* Things: [things.conf](https://github.com/eclipse-ditto/ditto/blob/master/things/service/src/main/resources/things.conf)
+* Things-Search: [things-search.conf](https://github.com/eclipse-ditto/ditto/blob/master/thingsearch/service/src/main/resources/things-search.conf)
+* Connectivity: [connectivity.conf](https://github.com/eclipse-ditto/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf)
+* Gateway: [gateway.conf](https://github.com/eclipse-ditto/ditto/blob/master/gateway/service/src/main/resources/gateway.conf)
 
 Whenever you find the syntax `${?UPPER_CASE_ENV_NAME}` in the configuration files, you may overwrite the default value
 by specifying that environment variable when running the container.
@@ -232,7 +232,7 @@ Values that are valid URIs are treated specially and only the password of the us
 encrypted.
 
 Configuration can be seen at [Ditto service configuration files](#ditto-configuration) in
-the [connectivity.conf](https://github.com/eclipse/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf)
+the [connectivity.conf](https://github.com/eclipse-ditto/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf)
 at "ditto.connectivity.connection.encryption" section of the config.
 
 If at some point encryption is decided to be disabled the symmetric key is important to be kept in the 
@@ -412,7 +412,7 @@ To put it in a nutshell, Ditto reports:
     * mapping times
 
 Have a look at the 
-[example Grafana dashboards](https://github.com/eclipse/ditto/tree/master/deployment/operations/grafana-dashboards)
+[example Grafana dashboards](https://github.com/eclipse-ditto/ditto/tree/master/deployment/operations/grafana-dashboards)
 and build and share new ones back to the Ditto community.
 
 ## Tracing
@@ -690,14 +690,14 @@ Piggyback commands can be used for managing policies, e.g. in order to create, r
 "devops" (super) user.
 
 All 
-[PolicyCommand](https://github.com/eclipse/ditto/blob/master/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/PolicyCommand.java)s
+[PolicyCommand](https://github.com/eclipse-ditto/ditto/blob/master/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/PolicyCommand.java)s
 may be sent via piggyback - however be aware that the internal JSON representation of the policy commands must be used 
 and not the [Ditto Protocol](protocol-specification-policies.html).
 
 The internal JSON representation can be found in the code, e.g. defined in the static `fromJson` methods of the commands.
 
 Example piggyback for 
-[CreatePolicy](https://github.com/eclipse/ditto/blob/master/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/modify/CreatePolicy.java):
+[CreatePolicy](https://github.com/eclipse-ditto/ditto/blob/master/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/modify/CreatePolicy.java):
 ```json
 {
   "targetActorSelection": "/system/sharding/policy",
@@ -719,7 +719,7 @@ Example piggyback for
 ```
 
 Example piggyback for 
-[RetrievePolicy](https://github.com/eclipse/ditto/blob/master/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/query/RetrievePolicy.java):
+[RetrievePolicy](https://github.com/eclipse-ditto/ditto/blob/master/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/query/RetrievePolicy.java):
 ```json
 {
   "targetActorSelection": "/system/sharding/policy",
@@ -741,14 +741,14 @@ Piggyback commands can be used for managing things, e.g. in order to create, ret
 "devops" (super) user.
 
 All
-[ThingCommand](https://github.com/eclipse/ditto/blob/master/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/ThingCommand.java)s
+[ThingCommand](https://github.com/eclipse-ditto/ditto/blob/master/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/ThingCommand.java)s
 may be sent via piggyback - however be aware that the internal JSON representation of the thing commands must be used
 and not the [Ditto Protocol](protocol-specification-things.html).
 
 The internal JSON representation can be found in the code, e.g. defined in the static `fromJson` methods of the commands.
 
 Example piggyback for
-[CreateThing](https://github.com/eclipse/ditto/blob/master/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/CreateThing.java):
+[CreateThing](https://github.com/eclipse-ditto/ditto/blob/master/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/CreateThing.java):
 ```json
 {
   "targetActorSelection": "/system/sharding/thing",
@@ -768,7 +768,7 @@ Example piggyback for
 ```
 
 Example piggyback for
-[RetrieveThing](https://github.com/eclipse/ditto/blob/master/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/query/RetrieveThing.java):
+[RetrieveThing](https://github.com/eclipse-ditto/ditto/blob/master/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/query/RetrieveThing.java):
 ```json
 {
   "targetActorSelection": "/system/sharding/thing",
diff --git a/documentation/src/main/resources/pages/ditto/installation-running.md b/documentation/src/main/resources/pages/ditto/installation-running.md
index e2aa2005f20..231d699e245 100644
--- a/documentation/src/main/resources/pages/ditto/installation-running.md
+++ b/documentation/src/main/resources/pages/ditto/installation-running.md
@@ -26,7 +26,7 @@ In order to start Ditto, you'll need:
 * some other tools like docker-compose, helm, k3s, minikube or openshift to run Ditto.
  
 You can choose from several options to run/deploy Ditto.
-A good starting point here is [Ditto Deployment](https://github.com/eclipse/ditto/blob/master/deployment/README.md).
+A good starting point here is [Ditto Deployment](https://github.com/eclipse-ditto/ditto/blob/master/deployment/README.md).
 After completing the deployment of your choice Ditto should be up & running.
 
 Now you have running:
diff --git a/documentation/src/main/resources/pages/ditto/intro-hello-world.md b/documentation/src/main/resources/pages/ditto/intro-hello-world.md
index 61283b69bac..32d53683fa2 100644
--- a/documentation/src/main/resources/pages/ditto/intro-hello-world.md
+++ b/documentation/src/main/resources/pages/ditto/intro-hello-world.md
@@ -62,7 +62,7 @@ Inside "definition" we can add one JSON string value.
 
 We create a Thing for the example from above by using [cURL](https://github.com/curl/curl). Basic authentication will use the credentials of a user "ditto". 
 Those credentials have been created by default in the [nginx](https://github.com/nginx/nginx) started via "docker". 
-(See [ditto/deployment/docker/README.md](https://github.com/eclipse/ditto/blob/master/deployment/docker/README.md))
+(See [ditto/deployment/docker/README.md](https://github.com/eclipse-ditto/ditto/blob/master/deployment/docker/README.md))
 
 ```bash
 curl -u ditto:ditto -X PUT -H 'Content-Type: application/json' -d '{
diff --git a/documentation/src/main/resources/pages/ditto/presentations.md b/documentation/src/main/resources/pages/ditto/presentations.md
index 7d6b106c737..f68e7a09618 100644
--- a/documentation/src/main/resources/pages/ditto/presentations.md
+++ b/documentation/src/main/resources/pages/ditto/presentations.md
@@ -88,7 +88,7 @@ Organized via [Meetup](https://www.meetup.com/IoT-Hessen/events/248886802/) by D
 
 The slides can be found here: [2018_05_23-meetup-iot-hessen](slides/2018_05_23-meetup-iot-hessen/index.html).
 
-The code of the showed live demo can be found in our [ditto-examples](https://github.com/eclipse/ditto-examples/tree/master/octopus-via-hono).
+The code of the showed live demo can be found in our [ditto-examples](https://github.com/eclipse-ditto/ditto-examples/tree/master/octopus-via-hono).
 
 ## 07.02.2018 Virtual IoT Meetup
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_010M3.md b/documentation/src/main/resources/pages/ditto/release_notes_010M3.md
index faf6238293b..44d576175e5 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_010M3.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_010M3.md
@@ -15,7 +15,7 @@ bugfixes were added.
 
 ## New features
 
-### [AMQP Bridge](https://github.com/eclipse/ditto/pull/65)
+### [AMQP Bridge](https://github.com/eclipse-ditto/ditto/pull/65)
 
 A new service "ditto-amqp-bridge" was added in order to be able establish a connection to AMQP 1.0
 endpoints like for example [Eclipse Hono](https://eclipse.org/hono/).
@@ -24,7 +24,7 @@ That way messages in [Ditto Protocol](protocol-overview.html) coming from Eclips
 For more details, please have a look at the [AMQP 1.0 binding](connectivity-protocol-bindings-amqp10.html) and the 
 [AMQP-Bridge architecture](architecture-services-connectivity.html).
 
-### [DevOps commands HTTP endpoint](https://github.com/eclipse/ditto/pull/55)
+### [DevOps commands HTTP endpoint](https://github.com/eclipse-ditto/ditto/pull/55)
 
 In order to dynamically make changes to a running Ditto cluster without restarting, Ditto added an implementation
 of so called "DevOps commands". Those can be triggered via a HTTP API for all services at once or specifically targeted
@@ -39,7 +39,7 @@ Further information can be found in the [operating chapter](installation-operati
 
 ## Bugfixes
 
-### [Stabilization of eventually consistent search index](https://github.com/eclipse/ditto/pull/83)
+### [Stabilization of eventually consistent search index](https://github.com/eclipse-ditto/ditto/pull/83)
 
 In various conditions the search index which is updated by the [search](basic-search.html) of Ditto was not updated in case
 events were missed or there were timing issues.
@@ -48,7 +48,7 @@ Those issues were resolved by improving the approach for keeping track of the al
 
 ### Various smaller bugfixes
 
-This is a complete list of the [merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A0.1.0-M3+).
+This is a complete list of the [merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A0.1.0-M3+).
 
 
 ## Documentation
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_020M1.md b/documentation/src/main/resources/pages/ditto/release_notes_020M1.md
index 3b710b11f0e..1d1c676e3bc 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_020M1.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_020M1.md
@@ -12,7 +12,7 @@ bugfixes were added.
 
 ## New features
 
-### [Search in namespaces](https://github.com/eclipse/ditto/pull/104)
+### [Search in namespaces](https://github.com/eclipse-ditto/ditto/pull/104)
 
 A query parameter `namespaces` was added to the [HTTP search API](httpapi-search.html).
 It can be used in order to restrict search to Things within specific namespaces. For example, with the route
@@ -25,7 +25,7 @@ only Things with IDs of the form `john:<id-suffix>` and `mark:<id-suffix>` are r
 
 Namespace restriction happens at the start of a search query execution and may speed up a search queries considerably.
 
-### [Feature Definition](https://github.com/eclipse/ditto/issues/60)
+### [Feature Definition](https://github.com/eclipse-ditto/ditto/issues/60)
 
 Ditto's model (to be precise the `Feature`) was enhanced by a `Definition`. This field is intended to store which 
 contract a Feature follows (which state and capabilities can be expected from a Feature).
@@ -38,14 +38,14 @@ a look at [its documentation](basic-feature.html#feature-definition).
 
 ## Bugfixes
 
-### [AMQP 1.0 failover is not working](https://github.com/eclipse/ditto/issues/97)
+### [AMQP 1.0 failover is not working](https://github.com/eclipse-ditto/ditto/issues/97)
 
 Using `"failover": true` when creating a new AMQP 1.0 connection caused that the connection could not be established. 
 
 
 ### Various smaller bugfixes
 
-This is a complete list of the [merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A0.2.0-M1+).
+This is a complete list of the [merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A0.2.0-M1+).
 
 
 ## Documentation
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_030M1.md b/documentation/src/main/resources/pages/ditto/release_notes_030M1.md
index c5785a09b3d..0f39893317f 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_030M1.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_030M1.md
@@ -12,7 +12,7 @@ bugfixes were added.
 
 ## Changes
 
-### [OpenJ9 based Docker images](https://github.com/eclipse/ditto/pull/133)
+### [OpenJ9 based Docker images](https://github.com/eclipse-ditto/ditto/pull/133)
 
 The official Eclipse Ditto Docker images are now based on the [Eclipse OpenJ9](https://www.eclipse.org/openj9/) JVM.
 With this JVM (cheers to the OpenJ9 developers for this awesome JVM) Ditto's containers need a lot less memory having
@@ -28,12 +28,12 @@ the [new features](#new-features).
 
 ## New features
 
-### [AMQP 0.9.1 connectivity](https://github.com/eclipse/ditto/issues/129)
+### [AMQP 0.9.1 connectivity](https://github.com/eclipse-ditto/ditto/issues/129)
 
 The new `connectivity` service can now, additionally to AMQP 1.0, manage and open connections to AMQP 0.9.1 endpoints 
 (e.g. provided by a [RabbitMQ](https://www.rabbitmq.com) broker).
 
-### [Payload mapping to/from Ditto Protocol](https://github.com/eclipse/ditto/issues/130)
+### [Payload mapping to/from Ditto Protocol](https://github.com/eclipse-ditto/ditto/issues/130)
 
 The new `connectivity` service can now also map message arbitrary text or byte payload from incoming AMQP 1.0 / 0.9.1 
 connections which are not yet in [Ditto Protocol](protocol-overview.html) messages in such and can also map outgoing 
@@ -47,7 +47,7 @@ Ditto Protocol messages (e.g. responses or events) back to some arbitrary text o
 The former AMQP bridge did loose the connection to AMQP 1.0 endpoints. This is now much more stable from which also the 
 new AMQP 0.9.1 connections benefit.
 
-### [Docker compose config was wrong](https://github.com/eclipse/ditto/issues/140)
+### [Docker compose config was wrong](https://github.com/eclipse-ditto/ditto/issues/140)
 
 The entrypoint/command was pointing to a wrong `starter.jar`.
 
@@ -55,7 +55,7 @@ The entrypoint/command was pointing to a wrong `starter.jar`.
 ### Various smaller bugfixes
 
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A0.3.0-M1+).
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A0.3.0-M1+).
 
 
 ## Documentation
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_030M2.md b/documentation/src/main/resources/pages/ditto/release_notes_030M2.md
index cbdc8273f81..f94dbc8f471 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_030M2.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_030M2.md
@@ -12,7 +12,7 @@ bugfixes were added.
 
 ## Changes
 
-### [Reduce network load for cache-sync](https://github.com/eclipse/ditto/issues/126)
+### [Reduce network load for cache-sync](https://github.com/eclipse-ditto/ditto/issues/126)
 
 With 0.3.0-M1 Ditto had a performance issue when managing more than ~100.000 Things in its memory as Ditto used a 
 distributed cluster cache which was not intended to be used in that way. Over time, as cache entries could not be deleted
@@ -25,7 +25,7 @@ This is the biggest change in this milestone and required a lot of refactoring e
 committers Daniel and Yufei who did an amazing job: the roundtrip times in a Ditto cluster are now at a constant and
 very good rate.
 
-### [Cluster bootstrapping improved](https://github.com/eclipse/ditto/issues/167)
+### [Cluster bootstrapping improved](https://github.com/eclipse-ditto/ditto/issues/167)
 
 Ditto now uses the [akka-management](https://developer.lightbend.com/docs/akka-management/current/index.html) library
 in order to bootstrap a new cluster. By default Ditto now uses a DNS-based approach to find its other cluster-nodes and
@@ -49,13 +49,13 @@ The search-index of the [Ditto search](basic-search.html) had several issues whi
 when searching for Things.
 
 These issues were adressed in several fixes:
-* [#159](https://github.com/eclipse/ditto/pull/159)
-* [#169](https://github.com/eclipse/ditto/pull/169)
-* [#175](https://github.com/eclipse/ditto/pull/175)
+* [#159](https://github.com/eclipse-ditto/ditto/pull/159)
+* [#169](https://github.com/eclipse-ditto/ditto/pull/169)
+* [#175](https://github.com/eclipse-ditto/ditto/pull/175)
 
 
 ### Various smaller bugfixes
 
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A0.3.0-M2+).
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A0.3.0-M2+).
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_080.md b/documentation/src/main/resources/pages/ditto/release_notes_080.md
index 9cdc7291ee8..f9b3e0fa386 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_080.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_080.md
@@ -41,7 +41,7 @@ bugfixes were added.
 
 #### New features
 
-##### [Support Hono's command&control in Ditto connectivity](https://github.com/eclipse/ditto/issues/164)
+##### [Support Hono's command&control in Ditto connectivity](https://github.com/eclipse-ditto/ditto/issues/164)
 
 Eclipse Ditto can now map arbitrary headers when connecting to AMQP 1.0 endpoints or AMQP 0.9.1 brokers.
 That way Ditto can send "command&control" messages to Eclipse Hono and correlate a potential response coming from a 
@@ -50,7 +50,7 @@ device.
 #### Bugfixes
 
 This release contains several bugfixes, this is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A0.8.0+).
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A0.8.0+).
 
 
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_080M1.md b/documentation/src/main/resources/pages/ditto/release_notes_080M1.md
index 62fcfd36090..3163955acac 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_080M1.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_080M1.md
@@ -22,13 +22,13 @@ bugfixes were added.
 
 ## Changes
 
-### [Marked some DittoHeaders as internal](https://github.com/eclipse/ditto/pull/195)
+### [Marked some DittoHeaders as internal](https://github.com/eclipse-ditto/ditto/pull/195)
 
 In order to prevent that a user of Ditto's API (e.g. WebSocket or AMQP) sets arbitrary security relevant headers, 
 those `DittoHeaders` are no marked as "not readable from external". Other headers which should not be propagated to 
 the outside of Ditto are marked as "not to be written to external".
 
-### [Update to Kamon 1.0 and report metrics to Prometheus](https://github.com/eclipse/ditto/issues/105)
+### [Update to Kamon 1.0 and report metrics to Prometheus](https://github.com/eclipse-ditto/ditto/issues/105)
 
 Previously, Ditto was using Kamon 0.6.x and reported metrics/traces to a [Graphite](https://graphiteapp.org) back-end. 
 Together with the update to Kamon 1.0 the Ditto services now provide HTTP endpoints which can be scraped by 
@@ -40,14 +40,14 @@ guide.
 
 ## New features
 
-### [Kubernetes cluster bootstrapping](https://github.com/eclipse/ditto/pull/201)
+### [Kubernetes cluster bootstrapping](https://github.com/eclipse-ditto/ditto/pull/201)
 
 Ditto now discovers its cluster nodes automatically also when running in Kubernetes. It uses the 
 kubernetes-api in order to discover the other cluster nodes.
 
 An example on how to run Ditto with Kubernetes is provided in the /kubernetes git directory.
 
-### [Allow placeholders inside connection config](https://github.com/eclipse/ditto/issues/178)
+### [Allow placeholders inside connection config](https://github.com/eclipse-ditto/ditto/issues/178)
 
 In many cases configuration values of a [Connection](connectivity-manage-connections.html) can be dependent on the 
 message's headers. This feature allows Ditto connections to access header fields and use it in the connection's 
@@ -59,7 +59,7 @@ from Hono authenticated `device-id` via the placeholder `header:device-id`.
 
 ## Bugfixes
 
-### [Fixed excessive memory consumption of things-service](https://github.com/eclipse/ditto/pull/194)
+### [Fixed excessive memory consumption of things-service](https://github.com/eclipse-ditto/ditto/pull/194)
 
 In previous versions, Ditto's `things-service` created a lot of instances for each Thing which was loaded into memory.
 This is now optimized so that the service does no longer need so much memory.
@@ -71,11 +71,11 @@ In this milestone we put a lot of effort in further stabilizing AMQP 1.0 and 0.9
 
 These issues were addressed in several fixes:
 
-* [#189](https://github.com/eclipse/ditto/pull/189)
-* [#178](https://github.com/eclipse/ditto/issues/178)
+* [#189](https://github.com/eclipse-ditto/ditto/pull/189)
+* [#178](https://github.com/eclipse-ditto/ditto/issues/178)
 
 ### Various smaller bugfixes
 
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A0.8.0-M1+).
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A0.8.0-M1+).
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_080M2.md b/documentation/src/main/resources/pages/ditto/release_notes_080M2.md
index 28631cca3d7..e49c2f3ec84 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_080M2.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_080M2.md
@@ -15,7 +15,7 @@ bugfixes were added.
 
 ## Changes
 
-### [Define and enforce max. entity sizes in Ditto cluster](https://github.com/eclipse/ditto/issues/221)
+### [Define and enforce max. entity sizes in Ditto cluster](https://github.com/eclipse-ditto/ditto/issues/221)
 
 In previous versions of Ditto the entity sizes (e.g. for things and policies) were technically not limited. The only 
 implicit limit was a max. cluster message size of 10m. As Ditto is not intended to manage digital twins which are that
@@ -25,29 +25,29 @@ big, the sizes of the twins are now by default limited to:
 * max [Message payload](basic-messages.html) size: 250k
 
 They can be adjusted to other needs via the configuration located in 
-[ditto-limits.conf](https://github.com/eclipse/ditto/blob/master/services/base/src/main/resources/ditto-limits.conf).
+[ditto-limits.conf](https://github.com/eclipse-ditto/ditto/blob/master/services/base/src/main/resources/ditto-limits.conf).
 
 The default maximum frame size in the ditto cluster was changed to 256k and can be adjusted in the 
-[ditto-akka-config.conf](https://github.com/eclipse/ditto/blob/master/services/base/src/main/resources/ditto-akka-config.conf#L93).
+[ditto-akka-config.conf](https://github.com/eclipse-ditto/ditto/blob/master/services/base/src/main/resources/ditto-akka-config.conf#L93).
 
 
 ## New features
 
-### [MQTT support](https://github.com/eclipse/ditto/issues/220)
+### [MQTT support](https://github.com/eclipse-ditto/ditto/issues/220)
 
-In two big PRs ([#225](https://github.com/eclipse/ditto/pull/225) and [#235](https://github.com/eclipse/ditto/pull/235)) 
+In two big PRs ([#225](https://github.com/eclipse-ditto/ditto/pull/225) and [#235](https://github.com/eclipse-ditto/ditto/pull/235)) 
 Ditto added support for connecting to MQTT brokers (like for example [Eclipse Mosquitto](https://mosquitto.org)) via its
 [connectivity feature](connectivity-overview.html). Have a look at the 
 [MQTT protocol binding](connectivity-protocol-bindings-mqtt.html) for details.
 
-### [Subscribing for change notifications by optional filter](https://github.com/eclipse/ditto/issues/149)
+### [Subscribing for change notifications by optional filter](https://github.com/eclipse-ditto/ditto/issues/149)
 
 Until previous versions, when [subscribing for changes](basic-changenotifications.html), the subscriber always got all
 changes he was entitled to see (based on [access control](basic-auth.html)). Now it is possible to specify for which
 changes to subscribe based on the optional `namespaces` to consider and an optional [RQL](basic-rql.html) `filter`.
 The new feature is documented as [change notification filters](basic-changenotifications.html#filtering).
 
-### [Support for conditional requests](https://github.com/eclipse/ditto/pull/226)
+### [Support for conditional requests](https://github.com/eclipse-ditto/ditto/pull/226)
 
 Ditto's APIs now support `If-Match` and `If-None-Match` headers specified in 
 [rfc7232](https://tools.ietf.org/html/rfc7232#section-3.2) for `things` and `policies` resources. Have a look at the
@@ -57,11 +57,11 @@ can help with advanced interaction-patterns with your twins.
 
 ## Bugfixes
 
-### [Reconnection to AMQP 0.9.1 connections](https://github.com/eclipse/ditto/issues/228)
+### [Reconnection to AMQP 0.9.1 connections](https://github.com/eclipse-ditto/ditto/issues/228)
 
 Reconnection did not always work, e.g. when the AMQP 0.9.1 broker was not reachable for a while.
 
 ### Various smaller bugfixes
 
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A0.8.0-M2+).
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A0.8.0-M2+).
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_080M3.md b/documentation/src/main/resources/pages/ditto/release_notes_080M3.md
index 12698802c09..1072887a84c 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_080M3.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_080M3.md
@@ -16,7 +16,7 @@ bugfixes were added.
 
 With more and more Things, the search service was slowing down massively.
 
-Two Pull Requests ([#275](https://github.com/eclipse/ditto/pull/275), [#278](https://github.com/eclipse/ditto/pull/278)) 
+Two Pull Requests ([#275](https://github.com/eclipse-ditto/ditto/pull/275), [#278](https://github.com/eclipse-ditto/ditto/pull/278)) 
 addressed this issue with the following changes:
 * add an index on `_policyId` and `__policyRev` for the `thingEntities` collection.
 * add the field `_thingId` to new documents in `policiesBasedSearchIndex`.
@@ -30,7 +30,7 @@ addressed this issue with the following changes:
  with the Ditto cluster stopped) using the 
  {% include file.html title="MongoDB migration script from 0.8.0-M2 to 0.8.0-M3" file="migration_mongodb_0.8.0-M2_0.8.0-M3.js" %}.**
 
-### [Netty 3 was removed from dependencies](https://github.com/eclipse/ditto/issues/161)
+### [Netty 3 was removed from dependencies](https://github.com/eclipse-ditto/ditto/issues/161)
 
 Due to licensing issues with Netty 3, it was removed in this release and replaced with 
 [Akka's Artery](https://doc.akka.io/docs/akka/current/remoting-artery.html) remoting which uses by default a plain TCP 
@@ -42,7 +42,7 @@ cluster with all services running the new version.
 
 ## New features
 
-### [Apply enforcement for incoming messages in connectivity service](https://github.com/eclipse/ditto/issues/265)
+### [Apply enforcement for incoming messages in connectivity service](https://github.com/eclipse-ditto/ditto/issues/265)
 
 When adding a [connection](connectivity-manage-connections.html), an optional enforcement (e.g. for 
 [AMQP 1.0](connectivity-protocol-bindings-amqp10.html)) may be configured in order to only accept messages having, 
@@ -51,7 +51,7 @@ for example, a defined header value.
 This is also very useful to be used for connecting to [Eclipse Hono](https://eclipse.org/hono/) which sends a header
 `device_id` in every message which Ditto can check against the ID of the addressed twin. 
 
-### [Allow to create a new thing that uses a copied policy](https://github.com/eclipse/ditto/issues/268)
+### [Allow to create a new thing that uses a copied policy](https://github.com/eclipse-ditto/ditto/issues/268)
 
 When [creating a new Thing](protocol-specification-things-create-or-modify.html) it is now possible to copy the 
 [Policy](basic-policy.html) already used in another Thing.
@@ -66,5 +66,5 @@ This milestone contains several bugfixes related to memory leaks, recovery of co
 ### Various smaller bugfixes
 
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A0.8.0-M3+).
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A0.8.0-M3+).
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_090.md b/documentation/src/main/resources/pages/ditto/release_notes_090.md
index 39c5e4281e3..e14eada9339 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_090.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_090.md
@@ -42,7 +42,7 @@ bugfixes were added.
 
 #### Changes
 
-##### [Streamline configuration](https://github.com/eclipse/ditto/issues/350)
+##### [Streamline configuration](https://github.com/eclipse-ditto/ditto/issues/350)
 
 In this release, we changed how internally the configuration is determined in Ditto's microservices. This should not 
 have any impact on a user of Eclipse Ditto. As however some configuration keys were remanded or restructured, some
@@ -51,18 +51,18 @@ adjustments when manually configuring Ditto could be required.
 
 #### New features
 
-##### [Introduce cursor-based paging for search requests](https://github.com/eclipse/ditto/pull/407)
+##### [Introduce cursor-based paging for search requests](https://github.com/eclipse-ditto/ditto/pull/407)
 
 In order to provide a constant performance for using pagination for the `things-search` miscroservice across even large 
 result sets (100s of thousands or more) of digital twins, a new cursor-based approach was added in addition to the 
 old `offset/limit` approach which gets slower for each page.
 
-##### [Simple throttling for amqp 1.0 consumers](https://github.com/eclipse/ditto/pull/420)
+##### [Simple throttling for amqp 1.0 consumers](https://github.com/eclipse-ditto/ditto/pull/420)
 
 Added a simple throttling mechanism for amqp 1.0 consumers.
 The throttling is configurable by defining the number of messages allowed per time interval.
 
-##### [Collect connectivity log entries and provide via devops command](https://github.com/eclipse/ditto/issues/318)
+##### [Collect connectivity log entries and provide via devops command](https://github.com/eclipse-ditto/ditto/issues/318)
 
 In order to let a user analyze failures / unexpected behavior in his connections (e.g. to an MQTT or AMQP broker) 
 without giving him full access to the log-files of Ditto, a connection scoped mechanism for retrieving connectivity logs 
@@ -71,21 +71,21 @@ was added.
 
 #### Bugfixes
 
-##### [Memory and performance fixes in concierge, gateway](https://github.com/eclipse/ditto/pull/400)
+##### [Memory and performance fixes in concierge, gateway](https://github.com/eclipse-ditto/ditto/pull/400)
 
 Ditto's `concierge` service did use a sharding approach for enforcing authorization information which lead to huge 
 amounts of memory required when managing multi million of digital twins.
 
 That, in addition to some memory fixes in the gateway and addition of metrics, was fixed in this PR.
 
-##### [Ensure ordering for processed commands](https://github.com/eclipse/ditto/pull/417)
+##### [Ensure ordering for processed commands](https://github.com/eclipse-ditto/ditto/pull/417)
 
 In previous versions of Ditto the order in which command were processed not guaranteed to be maintained. As maintaining
 the order however is the expected behavior, we decided to treat that as bug and added to the `concierge` service (where
 the order could be lost) to sequentially process commands issues via HTTP/WebSocket and connections.
 
 This release contains several bugfixes, this is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A0.9.0+).
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A0.9.0+).
 
 
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_090M1.md b/documentation/src/main/resources/pages/ditto/release_notes_090M1.md
index a1afe23ff11..e755058ea7b 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_090M1.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_090M1.md
@@ -12,32 +12,32 @@ a preview of what to expect in the next release.
 
 ## Changes
 
-### [Optimized/reduced memory consumption of ditto-json](https://github.com/eclipse/ditto/pull/304)
+### [Optimized/reduced memory consumption of ditto-json](https://github.com/eclipse-ditto/ditto/pull/304)
 
 `ditto-json` used quite a lot of memory when building up JSON structures - this change optimized that by a factor of 
 10-20, so now it is possible to keep ~1.000.000 things in memory with ~4GB of memory.
 
-### [Update several dependencies](https://github.com/eclipse/ditto/issues/300)
+### [Update several dependencies](https://github.com/eclipse-ditto/ditto/issues/300)
 
 Several used dependencies were updated to their latest (bugfix) releases or even to a stable 1.x version.
 
 
 ## New features
 
-### [Erasing data without downtime](https://github.com/eclipse/ditto/issues/234)
+### [Erasing data without downtime](https://github.com/eclipse-ditto/ditto/issues/234)
 
 GDPR requires erasure of data on request of data subject.
 
-### [Enhance placeholders by functions](https://github.com/eclipse/ditto/issues/337)
+### [Enhance placeholders by functions](https://github.com/eclipse-ditto/ditto/issues/337)
 
 The already existing placeholder mechanism for connections was enhanced by optionally adding function calls (currently 
 simple string manipulations like `fn:substring-before(':')`).
 
-### [Connect to Apache Kafka](https://github.com/eclipse/ditto/issues/224)
+### [Connect to Apache Kafka](https://github.com/eclipse-ditto/ditto/issues/224)
 
 In order to publish Ditto protocol messages (e.g. events/responses/messages/...) to Apache Kafka topics.
 
-### [Collect and provide connection metrics](https://github.com/eclipse/ditto/issues/317)
+### [Collect and provide connection metrics](https://github.com/eclipse-ditto/ditto/issues/317)
 
 Provide metrics about established connections (e.g. to AMQP 1.0, Kafka, MQTT, ...).
 
@@ -47,5 +47,5 @@ Provide metrics about established connections (e.g. to AMQP 1.0, Kafka, MQTT, ..
 ### Various smaller bugfixes
 
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A0.9.0-M1+).
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A0.9.0-M1+).
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_090M2.md b/documentation/src/main/resources/pages/ditto/release_notes_090M2.md
index 67d57c3d214..d27985ce662 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_090M2.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_090M2.md
@@ -11,12 +11,12 @@ This second milestone of the "0.9.0" release provides closes more gaps towards t
 
 ## Changes
 
-### [Make it easy to add new Authentication mechanisms and allow chaining them](https://github.com/eclipse/ditto/issues/348)
+### [Make it easy to add new Authentication mechanisms and allow chaining them](https://github.com/eclipse-ditto/ditto/issues/348)
 
 If we have multiple applicable authentication mechanisms all of them are processed until either one of them 
 authenticates successfully or all of them fail.
 
-### [Unify implementations of things-search across API versions](https://github.com/eclipse/ditto/pull/392)
+### [Unify implementations of things-search across API versions](https://github.com/eclipse-ditto/ditto/pull/392)
 
 Ditto's "search" capabilities were rewritten so that bot API v1 and API v2 use the same MongoDB based search index.
 
@@ -29,24 +29,24 @@ Ditto's "search" capabilities were rewritten so that bot API v1 and API v2 use t
 
 ### Various contributions for a setup of Eclipse Ditto on Microsoft Azure
 
-As discussed in the ongoing issue [Eclipse Ditto on Microsoft Azure](https://github.com/eclipse/ditto/issues/358) Microsoft
+As discussed in the ongoing issue [Eclipse Ditto on Microsoft Azure](https://github.com/eclipse-ditto/ditto/issues/358) Microsoft
 added a few PRs in order to deploy Ditto on MS Azure cloud:
 
-* [Enable support for MongoDB persistence in K8s](https://github.com/eclipse/ditto/pull/364)
-* [Fix Nginx connectivity after Helm update](https://github.com/eclipse/ditto/pull/375)
-* [Recover from closed JMS AMQP message producer](https://github.com/eclipse/ditto/pull/367)
-* [Improve nginx configuration for gateway restarts](https://github.com/eclipse/ditto/pull/386)
+* [Enable support for MongoDB persistence in K8s](https://github.com/eclipse-ditto/ditto/pull/364)
+* [Fix Nginx connectivity after Helm update](https://github.com/eclipse-ditto/ditto/pull/375)
+* [Recover from closed JMS AMQP message producer](https://github.com/eclipse-ditto/ditto/pull/367)
+* [Improve nginx configuration for gateway restarts](https://github.com/eclipse-ditto/ditto/pull/386)
 
 
 ## Bugfixes
 
 
-### [MQTT publish fails if no sources are configured](https://github.com/eclipse/ditto/issues/387)
+### [MQTT publish fails if no sources are configured](https://github.com/eclipse-ditto/ditto/issues/387)
 
 Fixed: If using a MQTT connection that only has targets but no sources, publishing of events will fail.
 
 ### Various smaller bugfixes
 
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A0.9.0-M2+).
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A0.9.0-M2+).
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_100.md b/documentation/src/main/resources/pages/ditto/release_notes_100.md
index d370a66589c..575e10c463a 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_100.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_100.md
@@ -31,7 +31,7 @@ bugfixes were added.
 
 ### Changes
 
-#### [Remove suffixed collections](https://github.com/eclipse/ditto/issues/537)
+#### [Remove suffixed collections](https://github.com/eclipse-ditto/ditto/issues/537)
 
 We removed suffixed collection support from Things and Policies persistence.
 These collections do not scale well with increased amount of namespaces and lead to massive problems with mongodb as 
@@ -40,7 +40,7 @@ sharding can't be used.
 
 ### New features
 
-#### [Comprehensive support for command responses](https://github.com/eclipse/ditto/issues/540)
+#### [Comprehensive support for command responses](https://github.com/eclipse-ditto/ditto/issues/540)
 
 Adds the possibility to define a "reply target" for [connection sources](basic-connections.html#sources) where 
 * the response address may be configured
@@ -52,7 +52,7 @@ specified a `reply-to` address.
 Used in combination with [Eclipse Hono](https://eclipse.org/hono/)  it is possible to send responses to devices which 
 e.g. need to retrieve data from Ditto.
 
-#### [Add "definition" to Thing in order to reference used model](https://github.com/eclipse/ditto/issues/247)
+#### [Add "definition" to Thing in order to reference used model](https://github.com/eclipse-ditto/ditto/issues/247)
 
 In order to specify which model a Thing follows, the JSON of the Thing entity was enhanced with a single string for 
 `"definintion"`. This can e.g. be used in order to place an [Eclipse Vorto](https://eclipse.org/vorto/) 
@@ -60,7 +60,7 @@ In order to specify which model a Thing follows, the JSON of the Thing entity wa
 
 ### Bugfixes
 
-#### [Fixed NullPointer in StreamingSessionActor](https://github.com/eclipse/ditto/pull/546)
+#### [Fixed NullPointer in StreamingSessionActor](https://github.com/eclipse-ditto/ditto/pull/546)
 
 When closing a WebSocket session, a `NullPointerException` occurred which is fixed now.
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_100M1a.md b/documentation/src/main/resources/pages/ditto/release_notes_100M1a.md
index 11c17a627b9..c2e56e1757c 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_100M1a.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_100M1a.md
@@ -11,52 +11,52 @@ This first milestone of the "1.0.0" release provides a preview of what to expect
 
 ## Changes
 
-### [Add HiveMQ MQTT client as an alternative for MQTT integration](https://github.com/eclipse/ditto/pull/487)
+### [Add HiveMQ MQTT client as an alternative for MQTT integration](https://github.com/eclipse-ditto/ditto/pull/487)
 
-Due to the problems described in [#450](https://github.com/eclipse/ditto/issues/450) we decided to add the HiveMQ
+Due to the problems described in [#450](https://github.com/eclipse-ditto/ditto/issues/450) we decided to add the HiveMQ
  MQTT Client as an alternative for the connection of Ditto to MQTT brokers. Once it has proven to be working and
   stable in production, it will replace the previous client (Alpakka/Paho).
   
-### [Scalable event publishing](https://github.com/eclipse/ditto/pull/483)
+### [Scalable event publishing](https://github.com/eclipse-ditto/ditto/pull/483)
 
 This patch improves horizontal scalability of Ditto's event publishing mechanism. Find a more detailed description of
  this change in the pull request.
  
-### [Typed entity IDs](https://github.com/eclipse/ditto/pull/475)
+### [Typed entity IDs](https://github.com/eclipse-ditto/ditto/pull/475)
 
 This change introduces validated Java representations for entity IDs.
 
-### [Introduce architectural decision records (ADR)](https://github.com/eclipse/ditto/pull/470)
+### [Introduce architectural decision records (ADR)](https://github.com/eclipse-ditto/ditto/pull/470)
 
 We want to keep track of architectural decisions and decided to use the format of ADRs for this purpose.
 
-### [Relax uri restrictions](https://github.com/eclipse/ditto/pull/451)
+### [Relax uri restrictions](https://github.com/eclipse-ditto/ditto/pull/451)
 
 With this change we allow more characters in uris.
 
-### [Background cleanup for stale journal entries and snapshots](https://github.com/eclipse/ditto/pull/446)
+### [Background cleanup for stale journal entries and snapshots](https://github.com/eclipse-ditto/ditto/pull/446)
 
 This change introduces a asynchronous background deletion approach which replaces the current approach.
 
 
 ## New features
 
-### [Initial contribution of Java client SDK](https://github.com/eclipse/ditto-clients/pull/1)
+### [Initial contribution of Java client SDK](https://github.com/eclipse-ditto/ditto-clients/pull/1)
 
 Contribution was extracted from former commercial-only client - all references to Bosch were removed. Consists of
  full working, OSGi capable "ditto-client" artifact. More information can be found in our
  [SDK documentation](client-sdk-java.html).
  
-### [Configurable authorization servers](https://github.com/eclipse/ditto/pull/477)
+### [Configurable authorization servers](https://github.com/eclipse-ditto/ditto/pull/477)
 
 Eclipse Ditto now supports all OAuth 2.0 providers which implement OpenID Connect out-of-the-box. See this 
 [blog post](https://www.eclipse.org/ditto/2019-08-28-openid-connect.html) for more details.
  
-### [Fine grained access for connections](https://github.com/eclipse/ditto/pull/463)
+### [Fine grained access for connections](https://github.com/eclipse-ditto/ditto/pull/463)
 
 With this change it is possible to restrict access to connections on any level via a policy.
 
-### [Reconnecting feature for created connections](https://github.com/eclipse/ditto/pull/442)
+### [Reconnecting feature for created connections](https://github.com/eclipse-ditto/ditto/pull/442)
 
 When creating a connection, it will also contain the desired status of the connection.
 
@@ -66,5 +66,5 @@ When creating a connection, it will also contain the desired status of the conne
 ### Various smaller bugfixes
 
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.0.0-M1a).
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.0.0-M1a).
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_100M2.md b/documentation/src/main/resources/pages/ditto/release_notes_100M2.md
index 36aaa6d2732..67764441e3c 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_100M2.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_100M2.md
@@ -11,7 +11,7 @@ The second milestone is one last stop preparing for the upcoming "1.0.0" release
 
 ## Changes
 
-### [Don't allow double slashes in JSON pointers and REST](https://github.com/eclipse/ditto/pull/524)
+### [Don't allow double slashes in JSON pointers and REST](https://github.com/eclipse-ditto/ditto/pull/524)
 
 Ditto allowed to have double slashed in JSON pointers (e.g.: `features//foo/properties`) and HTTP endpoints.
 Allowing those did not always result the API behave like expected, so this is now handled more strictly.
@@ -20,7 +20,7 @@ in a status code `400` (Bad request) at the HTTP API.
 
 ### Connection JSON format was adjusted
 
-As a result of the newly added feature "[Map Hono device connection status to Thing feature](https://github.com/eclipse/ditto/issues/492)"
+As a result of the newly added feature "[Map Hono device connection status to Thing feature](https://github.com/eclipse-ditto/ditto/issues/492)"
 (see below), the JSON format of connections was adjusted.
 
 The new format is documented here: 
@@ -32,7 +32,7 @@ The good news however is that previously created connections will automatically
 
 ## New features
 
-### [Enhance Ditto's connectivity by invoking HTTP endpoints](https://github.com/eclipse/ditto/issues/491)
+### [Enhance Ditto's connectivity by invoking HTTP endpoints](https://github.com/eclipse-ditto/ditto/issues/491)
 
 One of the bigger feature enhancements since the last milestone release is connections to existing HTTP endpoints/servers.<br/>
 By adding the "connection type" HTTP to Ditto's connectivity feature Ditto can now perform HTTP calls for the configured
@@ -41,7 +41,7 @@ By adding the "connection type" HTTP to Ditto's connectivity feature Ditto can n
 That may be used in order to integrate with other public HTTP APIs. See also the 
 [published blog post about that](2019-10-17-http-connectivity.html). 
 
-### [Map Hono device connection status to Thing feature](https://github.com/eclipse/ditto/issues/492)
+### [Map Hono device connection status to Thing feature](https://github.com/eclipse-ditto/ditto/issues/492)
 
 The integration with [Eclipse Hono](https://eclipse.org/hono/) was improved by adding the possibility tp extract 
 `creation-time` and `ttd`  headers from consumed Hono telemetry and event messages and automatically updating the 
@@ -51,14 +51,14 @@ This feature was added by enhancing and generalizing the overall [payload mappin
 as a result now multiple payload mappings may be defined and selectively applied to sources/targets in 
 [connections](connectivity-manage-connections.html).
 
-### [Support for OAuth based authentication in Ditto Java client](https://github.com/eclipse/ditto-clients/issues/17)
+### [Support for OAuth based authentication in Ditto Java client](https://github.com/eclipse-ditto/ditto-clients/issues/17)
 
 In [1.0.0-M1a](release_notes_100-M1a.html) support for arbitrary OpenID Connect providers was 
 [added](2019-08-28-openid-connect.html) to Ditto.<br/>
 Now the Ditto Java client can authenticate itself by either providing "client-id" and "client-secret" or by 
 supplying JWT tokens via a custom callback.
 
-### [Throttle max. processed inbound websocket per time interval](https://github.com/eclipse/ditto/pull/517)
+### [Throttle max. processed inbound websocket per time interval](https://github.com/eclipse-ditto/ditto/pull/517)
 
 It is not always desirable that a single websocket connection may "flood" a Ditto backend with a massive amount of 
 commands.<br/>
@@ -68,12 +68,12 @@ The defaults configuration is: 100 / 1second
 
 ## Bugfixes
 
-### [Deleted things were still available in search](https://github.com/eclipse/ditto/issues/526)
+### [Deleted things were still available in search](https://github.com/eclipse-ditto/ditto/issues/526)
 
 When things were deleted, they were still available and findable in the search index (as the search index was cleared
 via a `TTL` index). This is now fixed.
 
-### [Failed connections AMQP 1.0 target didn't back-off](https://github.com/eclipse/ditto/pull/516)
+### [Failed connections AMQP 1.0 target didn't back-off](https://github.com/eclipse-ditto/ditto/pull/516)
 
 When an AMQP 1.0 endpoint did not allow to open a link to an address, Ditto tried to reconnect in a high frequency.
 As such errors are most likely configuration errors, that almost never is a good solution. The aggressive reconnect
@@ -83,5 +83,5 @@ This fix introduces an exponential back-off mechanism.
 ### Various smaller bugfixes
 
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.0.0-M2).
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.0.0-M2).
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_110.md b/documentation/src/main/resources/pages/ditto/release_notes_110.md
index e452ba8cb2d..48462d47939 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_110.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_110.md
@@ -8,7 +8,7 @@ permalink: release_notes_110.html
 
 The first minor (feature adding) release of Eclipse Ditto 1 is finally here: **1.1.0**.
 
-It is API and [binary compatible](https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
+It is API and [binary compatible](https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
 to Eclipse Ditto 1.0.0.
 
 ## Changelog
@@ -19,16 +19,16 @@ bugfixes were added.
 
 ### Changes
 
-#### [Java 11 as runtime environment](https://github.com/eclipse/ditto/issues/308)
+#### [Java 11 as runtime environment](https://github.com/eclipse-ditto/ditto/issues/308)
 
 The default Java runtime for Ditto's Docker containers was switched from Java 8 to Java 11 which should have some 
 benefits in storing Strings in memory (this was already added in Java 9).
 
 Language features of newer Java versions can now be used in the "services" part of Ditto, the Java APIs and models relevant 
-for [semantic versioning](https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md) 
+for [semantic versioning](https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md) 
 are still compatible to Java 8.
 
-#### [CBOR as Ditto internal serialization provider](https://github.com/eclipse/ditto/pull/598)
+#### [CBOR as Ditto internal serialization provider](https://github.com/eclipse-ditto/ditto/pull/598)
 
 As a bachelor thesis, [Erik Escher](https://github.com/erikescher) evaluated mechanisms to improve the serialization 
 overhead done in Ditto clusters.
@@ -37,7 +37,7 @@ His findings using [CBOR](https://cbor.io) as an alternative to plain JSON resul
 roundtrip times and throughput.
 The Ditto team was happy to accept his pull request, again improving overall performance in Ditto.
 
-#### [More strict Content-Type parsing for HTTP request payload](https://github.com/eclipse/ditto/pull/650)
+#### [More strict Content-Type parsing for HTTP request payload](https://github.com/eclipse-ditto/ditto/pull/650)
 
 In the past, Ditto did not evaluate the HTTP `Content-Type` header of HTTP requests sending along payload. As this 
 can be a potential security issue (e.g. in scope of CORS requests), the `Content-Type` is now strictly enforced to
@@ -46,16 +46,16 @@ be of `application/json` wherever Ditto only accepts JSON request payload.
 
 ### New features
 
-#### [Management of policies via Ditto Protocol and in Java client](https://github.com/eclipse/ditto/issues/554)
+#### [Management of policies via Ditto Protocol and in Java client](https://github.com/eclipse-ditto/ditto/issues/554)
 
 The [policy](basic-policy.html) entities can now - in addition to their HTTP API - be managed via the 
 [Ditto Protocol](protocol-specification-policies.html). That means also via 
 [WebSocket](httpapi-protocol-bindings-websocket.html) and [connections](basic-connections.html) (e.g. AMQP, MQTT, ..).
 
 APIs for [policy management](client-sdk-java.html#manage-policies) were also added to the 
-[Ditto Java Client](https://github.com/eclipse/ditto-clients/pull/46).
+[Ditto Java Client](https://github.com/eclipse-ditto/ditto-clients/pull/46).
 
-#### [Searching things via Ditto Protocol and in Java client](https://github.com/eclipse/ditto/issues/575)
+#### [Searching things via Ditto Protocol and in Java client](https://github.com/eclipse-ditto/ditto/issues/575)
 
 New [Ditto Protocol for search](protocol-specification-things-search.html) was added in order to define a search query
 via the Ditto Protocol and also get results via an asynchronous channel. As a result, searching for things is now also
@@ -63,9 +63,9 @@ possible via [WebSocket](httpapi-protocol-bindings-websocket.html) and [connecti
 (e.g. AMQP, MQTT, ..).
 
 APIs for [searching things](client-sdk-java.html#search-for-things) were also added to the 
-[Ditto Java Client](https://github.com/eclipse/ditto-clients/pull/53).
+[Ditto Java Client](https://github.com/eclipse-ditto/ditto-clients/pull/53).
 
-#### [Enriching messages and events before publishing to external subscribers](https://github.com/eclipse/ditto/issues/561)
+#### [Enriching messages and events before publishing to external subscribers](https://github.com/eclipse-ditto/ditto/issues/561)
 
 When subscribing [change notifications](basic-changenotifications.html) or for messages to publish to external system or
 deliver via [WebSocket](httpapi-protocol-bindings-websocket.html) it is now possible to [enrich](basic-enrichment.html) 
@@ -75,9 +75,9 @@ This can be useful when e.g. only a sensor value of a device changes, but your a
 additional context of the affected thing (e.g. a location which does not change with each sensor update).
 
 APIs for [enriching changes](client-sdk-java.html#subscribe-to-enriched-change-notifications) were also added to the 
-[Ditto Java Client](https://github.com/eclipse/ditto-clients/pull/43).
+[Ditto Java Client](https://github.com/eclipse-ditto/ditto-clients/pull/43).
 
-#### [Establish connections to MQTT 5 brokers](https://github.com/eclipse/ditto/issues/561)
+#### [Establish connections to MQTT 5 brokers](https://github.com/eclipse-ditto/ditto/issues/561)
 
 The Ditto community (namely [Alexander Wellbrock (w4tsn)](https://github.com/w4tsn) from 
 [othermo GmbH](https://www.othermo.de)) contributed MQTT 5 support to Ditto's connectivity capabilities.<br/>
@@ -86,19 +86,19 @@ With that is is possible to also establish connections to MQTT 5 brokers and eve
 
 Thank you very much for this great contribution.
 
-#### [End-2-end acknowledgements](https://github.com/eclipse/ditto/issues/611)
+#### [End-2-end acknowledgements](https://github.com/eclipse-ditto/ditto/issues/611)
 
 Until now, messages consumed by Eclipse Ditto were processed without a guarantee. That is being addressed with this
 first feature addition, the model and logic in order to request and emit [acknowledgements](basic-acknowledgements.html).
 
-The follow-up issue [#661](https://github.com/eclipse/ditto/issues/661) will automatically handle acknowledgements 
+The follow-up issue [#661](https://github.com/eclipse-ditto/ditto/issues/661) will automatically handle acknowledgements 
 in Ditto managed connections, configured for connection sources and targets, providing QoS 1 (at least once) semantic
 for message processing in Ditto via connections.
 
 APIs for [requesting and issuing acknowledgements](client-sdk-java.html#request-and-issue-acknowledgements) were also 
-added to the [Ditto Java Client](https://github.com/eclipse/ditto-clients/pull/56).
+added to the [Ditto Java Client](https://github.com/eclipse-ditto/ditto-clients/pull/56).
 
-#### [Pre-authenticated authentication mechanism](https://github.com/eclipse/ditto/issues/560)
+#### [Pre-authenticated authentication mechanism](https://github.com/eclipse-ditto/ditto/issues/560)
 
 Officially added+[documented](installation-operating.html#pre-authentication) support of how Ditto external 
 authentication providers may be configured to authenticate users in Ditto by adding them as an HTTP reverse proxy in 
@@ -107,7 +107,7 @@ front of Ditto.
 
 ### Deprecations
 
-#### [API version 1 deprecation](https://github.com/eclipse/ditto/pull/608)
+#### [API version 1 deprecation](https://github.com/eclipse-ditto/ditto/pull/608)
 
 Now that Ditto has a full replacement for ACLs, namely [policies](basic-policy.html) which now can 
 also be managed via the [Ditto Protocol](protocol-specification-policies.html) and the 
@@ -125,7 +125,7 @@ So when you start using Ditto, please make sure to use API version `2` (using po
 
 Several bugs in Ditto 1.0.0 were fixed for 1.1.0.<br/>
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.1.0), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.1.0), including the fixed bugs.
 
 
 ## Migration notes
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_111.md b/documentation/src/main/resources/pages/ditto/release_notes_111.md
index bb38587e4fb..26596dd4bff 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_111.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_111.md
@@ -15,13 +15,13 @@ Compared to the latest release [1.1.0](release_notes_110.html), the following bu
 ### Bugfixes
 
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.1.1), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.1.1), including the fixed bugs.
 
 
-#### [Allow to respond to live messages via ditto client](https://github.com/eclipse/ditto-clients/pull/60)
+#### [Allow to respond to live messages via ditto client](https://github.com/eclipse-ditto/ditto-clients/pull/60)
 
 Don't force response-required to be false when calling send() without response consumer.
 
-#### [Header mapping](https://github.com/eclipse/ditto/pull/671)
+#### [Header mapping](https://github.com/eclipse-ditto/ditto/pull/671)
 
 Remove filtering of unknown headers for adaptables. We need those headers for header mapping in connectivity.
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_112.md b/documentation/src/main/resources/pages/ditto/release_notes_112.md
index 91efd48c483..fad6efd18ba 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_112.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_112.md
@@ -14,7 +14,7 @@ Compared to the latest release [1.1.1](release_notes_111.html), the following ch
 
 ### Changes
 
-#### [Publish minor and micro version tags to Docker Hub](https://github.com/eclipse/ditto/pull/693)
+#### [Publish minor and micro version tags to Docker Hub](https://github.com/eclipse-ditto/ditto/pull/693)
 
 Starting with Ditto 1.1.2, the Docker images built and pushed to Docker Hub are:
 * full version (e.g. `1.1.2`)
@@ -25,17 +25,17 @@ Starting with Ditto 1.1.2, the Docker images built and pushed to Docker Hub are:
 ### Bugfixes
 
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.1.2), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.1.2), including the fixed bugs.
 
 
-#### [Fix NullPointerException when disabling validation of certificates in connections](https://github.com/eclipse/ditto/pull/688)
+#### [Fix NullPointerException when disabling validation of certificates in connections](https://github.com/eclipse-ditto/ditto/pull/688)
 
-Fixed [Mqtt 3 connection without using certificate validation](https://github.com/eclipse/ditto/issues/679).
+Fixed [Mqtt 3 connection without using certificate validation](https://github.com/eclipse-ditto/ditto/issues/679).
 
-#### [Connection creation timeout](https://github.com/eclipse/ditto/pull/692)
+#### [Connection creation timeout](https://github.com/eclipse-ditto/ditto/pull/692)
 
 There was an issue where sometimes the creation of a connection entity failed with a timeout just because the establishing of the actual connection took too much time.
 
-#### [Minor improvements to throughput/performance](https://github.com/eclipse/ditto/pull/689)
+#### [Minor improvements to throughput/performance](https://github.com/eclipse-ditto/ditto/pull/689)
 
 Some minor overall simplifications and performance improvements. 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_113.md b/documentation/src/main/resources/pages/ditto/release_notes_113.md
index 5d75f90a6ed..857d9eb5e4a 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_113.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_113.md
@@ -15,29 +15,29 @@ Compared to the latest release [1.1.2](release_notes_112.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.1.3), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.1.3), including the fixed bugs.
 
 
-#### [Do not decided based on the response if it was required](https://github.com/eclipse/ditto/pull/734)
+#### [Do not decided based on the response if it was required](https://github.com/eclipse-ditto/ditto/pull/734)
 
-Fixed [Responses should not decide whether they're required](https://github.com/eclipse/ditto/issues/677).
+Fixed [Responses should not decide whether they're required](https://github.com/eclipse-ditto/ditto/issues/677).
 
-#### [Include fields query parameter when retrieving feature properties](https://github.com/eclipse/ditto/pull/727)
+#### [Include fields query parameter when retrieving feature properties](https://github.com/eclipse-ditto/ditto/pull/727)
 
 There was an issue where the fields query parameter wasn't taken into account when retrieving feature properties.
 
-#### [Delegate default options from wrapping message mapper to wrapped message mapper](https://github.com/eclipse/ditto/pull/723)
+#### [Delegate default options from wrapping message mapper to wrapped message mapper](https://github.com/eclipse-ditto/ditto/pull/723)
 
 The WrappingMessageMapper didn't delegate the default options to the message mapper it was wrapping.
 
-#### [Improved error message for unknown/invalid host names in a connection configuration](https://github.com/eclipse/ditto/pull/676)
+#### [Improved error message for unknown/invalid host names in a connection configuration](https://github.com/eclipse-ditto/ditto/pull/676)
 
 An unknown/invalid host in a connection configuration caused an exception with an error message that did not indicate the actual cause.
 
-#### [Reworked reconnect behaviour of java client](https://github.com/eclipse/ditto-clients/pull/64)
+#### [Reworked reconnect behaviour of java client](https://github.com/eclipse-ditto/ditto-clients/pull/64)
 
 There were reported issues with the reconnecting behaviour of the java client. We improved the reconnecting behaviour, so it should be more reliable.
 
-#### [Added org.reactivestreams to osgi imports](https://github.com/eclipse/ditto-clients/pull/73)
+#### [Added org.reactivestreams to osgi imports](https://github.com/eclipse-ditto/ditto-clients/pull/73)
 
 The package `org.reactivestreams` was missing in the OSGI imports of our java client.
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_115.md b/documentation/src/main/resources/pages/ditto/release_notes_115.md
index f837808dd64..9e9ba3d183f 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_115.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_115.md
@@ -18,10 +18,10 @@ Compared to the latest release [1.1.3](release_notes_113.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.1.5), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.1.5), including the fixed bugs.
 
 
-#### [Compile model modules with Java 8](https://github.com/eclipse/ditto/pull/769)
+#### [Compile model modules with Java 8](https://github.com/eclipse-ditto/ditto/pull/769)
 
 The 2 modules in the Ditto model were accidentally compiled with Java 11 as source/target which caused 
 that e.g. the Ditto client could not be used any longer with Java 8:
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_120.md b/documentation/src/main/resources/pages/ditto/release_notes_120.md
index a5364cb6d92..fa6d73f9bb9 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_120.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_120.md
@@ -9,7 +9,7 @@ permalink: release_notes_120.html
 
 The second minor (feature adding) release of Eclipse Ditto 1 is here: **1.2.0**.
 
-It is API and [binary compatible](https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
+It is API and [binary compatible](https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
 to Eclipse Ditto 1.0.0 and 1.1.0.
 
 ## Changelog
@@ -21,7 +21,7 @@ The main change of Ditto 1.2.0 is the now full support for QoS 1 ("at least once
 
 ### Changes
 
-#### [Update Docker base image to OpenJ9 0.21.0](https://github.com/eclipse/ditto/pull/743)
+#### [Update Docker base image to OpenJ9 0.21.0](https://github.com/eclipse-ditto/ditto/pull/743)
 
 Updated to running the Ditto Docker containers with the latest OpenJ9 0.21.0 (with OpenJDK 11).
 
@@ -37,45 +37,45 @@ environment variable `CONNECTIVITY_MESSAGE_MAPPING_MAX_POOL_SIZE`).
 
 ### New features
 
-#### [`fn:filter` function for connectivity header mapping](https://github.com/eclipse/ditto/pull/674)
+#### [`fn:filter` function for connectivity header mapping](https://github.com/eclipse-ditto/ditto/pull/674)
 
 In connection [header mappings](connectivity-header-mapping.html) as part of the placeholders, the new 
 [`fn:filter`](basic-placeholders.html#function-library) function may be used in order to remove the result of the 
 previous expression in the function pipeline unless the condition specified by the parameters is satisfied.
 
-#### [Whoami HTTP resource](https://github.com/eclipse/ditto/pull/687)
+#### [Whoami HTTP resource](https://github.com/eclipse-ditto/ditto/pull/687)
 
 The new HTTP `GET` resource `/whoami` may be called in order to find out which authorization subjects were resolved in 
 the HTTP call's authentication. This can be e.g. useful to find out the used JWT subject which should be added to 
 [policies](basic-policy.html#subjects).
 
-#### [Support using client certificate based authentication in HTTP push connections](https://github.com/eclipse/ditto/pull/695)
+#### [Support using client certificate based authentication in HTTP push connections](https://github.com/eclipse-ditto/ditto/pull/695)
 
 Connections of type [HTTP push](connectivity-protocol-bindings-http.html) can now, additionally to username/password 
 based authentication, make use of 
 [client certificate based authentication](connectivity-protocol-bindings-http.html#client-certificate-authentication).
 
-#### [Automatic end-2-end acknowledgements handling for managed connections](https://github.com/eclipse/ditto/issues/661)
+#### [Automatic end-2-end acknowledgements handling for managed connections](https://github.com/eclipse-ditto/ditto/issues/661)
 
 Acknowledgements can now be configured to be requested for messages consumed by connection 
 [sources (acknowledgement requests)](basic-connections.html#source-acknowledgement-requests) and can automatically be 
 issued by targets to automatically [issue acknowledgements](basic-connections.html#target-issued-acknowledgement-label) 
 for all published twin events, live commands and live messages that request them.
 
-#### [End-2-end acknowledgements support for "live" messages/commands](https://github.com/eclipse/ditto/issues/757)
+#### [End-2-end acknowledgements support for "live" messages/commands](https://github.com/eclipse-ditto/ditto/issues/757)
 
 Acknowledgements for [live messages/commands](basic-acknowledgements.html#assure-qos-until-processing-of-a-live-commandmessage-by-a-subscriber---live-response)
 are now supported as well. Both requesting and issuing them, e.g. in order to acknowledge that a message was 
 successfully received without directly responding to it.
 
-#### [Addition of `_created` date to things](https://github.com/eclipse/ditto/issues/749)
+#### [Addition of `_created` date to things](https://github.com/eclipse-ditto/ditto/issues/749)
 
 Whenever a [thing](basic-thing.html) is now created, a JSON field `"_created"` is now added containing the creation 
 date. This field can be selected via [fields selection](httpapi-concepts.html#with-field-selector), as the already 
 existing `"_modified"` field can also be. The created date can also be used as part of 
 [search RQL queries](basic-rql.html).
 
-#### [Support for adding `_metadata` to things](https://github.com/eclipse/ditto/issues/680)
+#### [Support for adding `_metadata` to things](https://github.com/eclipse-ditto/ditto/issues/680)
 
 On modifying API calls to a [thing](basic-thing.html), additional metadata can now be passed with the header field 
 `"put-header"`. Documentation for this feature is still missing, but will be added soon after the 1.2.0 release.
@@ -84,9 +84,9 @@ On modifying API calls to a [thing](basic-thing.html), additional metadata can n
 
 Several bugs in Ditto 1.1.x were fixed for 1.2.0.<br/>
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.2.0), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.2.0), including the fixed bugs.
 
-#### [Connectivity service does not consume message after reconnect to AMQP (0.9.1)](https://github.com/eclipse/ditto/issues/770)
+#### [Connectivity service does not consume message after reconnect to AMQP (0.9.1)](https://github.com/eclipse-ditto/ditto/issues/770)
 
 Connections via AMQP 0.9.1 did not correctly resume message consumption after the broker was e.g. restarted.
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_121.md b/documentation/src/main/resources/pages/ditto/release_notes_121.md
index 050e00eee1a..81dd65ad3a5 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_121.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_121.md
@@ -16,10 +16,10 @@ Compared to the latest release [1.2.0](release_notes_120.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.2.1), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.2.1), including the fixed bugs.
 
 
-#### [Ditto JSON is not OSGi compatible due to missing imports](https://github.com/eclipse/ditto/issues/790)
+#### [Ditto JSON is not OSGi compatible due to missing imports](https://github.com/eclipse-ditto/ditto/issues/790)
 
 The OSGi bundle `ditto-json` was not compatible to be run in OSGi environments as imports of 3rd party libraries
 were used which were not defined in the `Import-Package` of the bundle.
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_130.md b/documentation/src/main/resources/pages/ditto/release_notes_130.md
index fe6c5c04949..ee52e23efad 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_130.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_130.md
@@ -7,7 +7,7 @@ summary: "Version 1.3.0 of Eclipse Ditto, released on 30.09.2020"
 permalink: release_notes_130.html
 ---
 
-Ditto **1.3.0** is API and [binary compatible](https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
+Ditto **1.3.0** is API and [binary compatible](https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
 to prior Eclipse Ditto 1.x versions.
 
 ## Changelog
@@ -18,18 +18,18 @@ bugfixes were added.
 
 ### Changes
 
-#### [Update Akka, Akka HTTP and Scala to latest versions](https://github.com/eclipse/ditto/issues/774)
+#### [Update Akka, Akka HTTP and Scala to latest versions](https://github.com/eclipse-ditto/ditto/issues/774)
 
 The core libraries Ditto is built on were updated to their latest versions which should improve cluster stability
 and overall performance.
 
-#### [Removed OWASP security headers](https://github.com/eclipse/ditto/pull/804)
+#### [Removed OWASP security headers](https://github.com/eclipse-ditto/ditto/pull/804)
 
 Setting the [OWASP recommended secure HTTP headers](https://owasp.org/www-project-secure-headers/) 
 (e.g. `X-Frame-Options`, `X-Content-Type-Options`, `X-XSS-Protection`) was removed from the Ditto codebase as such 
 headers are typically set in a reverse proxy (e.g. nginx) or in a cloud loadbalancer in front of Ditto. 
 
-#### [Ditto Java Client: Changed default initial reconnect behavior](https://github.com/eclipse/ditto-clients/pull/86)
+#### [Ditto Java Client: Changed default initial reconnect behavior](https://github.com/eclipse-ditto/ditto-clients/pull/86)
 
 A newly created configuration was added whether a Ditto Java Client should retry connecting to a Ditto backend
 even when the initial connection attempt failed 
@@ -49,7 +49,7 @@ connection should fail with an exception instead, so this is the new default beh
 
 ### New features
 
-#### [Automatic creation of things](https://github.com/eclipse/ditto/issues/760)
+#### [Automatic creation of things](https://github.com/eclipse-ditto/ditto/issues/760)
 
 Added a [payload mapper](connectivity-mapping.html) for connectivity which implicitly creates a new digital twin (thing)
 for incoming messages: [ImplicitThingCreation Mapper](connectivity-mapping.html#implicitthingcreation-mapper).
@@ -60,7 +60,7 @@ automatically creates connected devices, for example when a new device connects
 This new feature can work together with the 
 [Hono feature for implicit registration of devices connected via gateways](https://github.com/eclipse/hono/issues/2053).
 
-#### [Use response of HTTP push connections as live message response](https://github.com/eclipse/ditto/pull/809)
+#### [Use response of HTTP push connections as live message response](https://github.com/eclipse-ditto/ditto/pull/809)
 
 When [HTTP connections](connectivity-protocol-bindings-http.html) there are now several options 
 to respond to published [live messages](protocol-specification-things-messages.html): 
@@ -69,7 +69,7 @@ to respond to published [live messages](protocol-specification-things-messages.h
 For example, it is possible to use the HTTP response of the foreign HTTP endpoint (Webhook) as Ditto live message 
 response.
 
-#### [Raw payload mapper to enable raw pass-through of live messages](https://github.com/eclipse/ditto/issues/777)
+#### [Raw payload mapper to enable raw pass-through of live messages](https://github.com/eclipse-ditto/ditto/issues/777)
 
 Added a [payload mapper](connectivity-mapping.html) for connectivity which converts consumed messages via connectivity 
 in "raw mode": [RawMessage mapper](connectivity-mapping.html#rawmessage-mapper).
@@ -85,21 +85,21 @@ WebSocket.
 
 Several bugs in Ditto 1.2.x were fixed for 1.3.0.<br/>
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.3.0), including the fixed bugs.<br/>
-Here as well for the Ditto Java Client: [merged pull requests](https://github.com/eclipse/ditto-clients/pulls?q=is%3Apr+milestone%3A1.3.0)
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.3.0), including the fixed bugs.<br/>
+Here as well for the Ditto Java Client: [merged pull requests](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is%3Apr+milestone%3A1.3.0)
 
-#### [Responses from HTTP /messages API were JSON escaped](https://github.com/eclipse/ditto/issues/805)
+#### [Responses from HTTP /messages API were JSON escaped](https://github.com/eclipse-ditto/ditto/issues/805)
 
 With Ditto 1.2.0 HTTP responses to the `POST /messages` APIs which transported `application/json` were falsely JSON 
 escaped. As the fix for that had to be done in several steps and at several places, the fix is not backported to the 
 Ditto 1.2.0 line and it is suggested to update to Ditto 1.3.0 right away, if affected by this bug.
 
-#### [Putting `_metadata` while creating a Thing does not work bug](https://github.com/eclipse/ditto/issues/801)
+#### [Putting `_metadata` while creating a Thing does not work bug](https://github.com/eclipse-ditto/ditto/issues/801)
 
 When putting [Metadata](basic-metadata.html) as part of a "create thing" API call, the metadata was not applied. Only
 when updating an existing thing, the metadata was applied.
 
-#### [Ditto Java Client: threads leakage](https://github.com/eclipse/ditto-clients/pull/87)
+#### [Ditto Java Client: threads leakage](https://github.com/eclipse-ditto/ditto-clients/pull/87)
 
 The Ditto Java client did not close/cleanup its threadpools when closing the client.
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_140.md b/documentation/src/main/resources/pages/ditto/release_notes_140.md
index dedc5f167f2..489874d8c44 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_140.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_140.md
@@ -7,7 +7,7 @@ summary: "Version 1.4.0 of Eclipse Ditto, released on 28.10.2020"
 permalink: release_notes_140.html
 ---
 
-Ditto **1.4.0** is API and [binary compatible](https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
+Ditto **1.4.0** is API and [binary compatible](https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
 to prior Eclipse Ditto 1.x versions.
 
 ## Changelog
@@ -18,22 +18,22 @@ bugfixes were added.
 
 ### Changes
 
-#### [Status codes of live responses are no longer interpreted for acknowledgement requests](https://github.com/eclipse/ditto/pull/833)
+#### [Status codes of live responses are no longer interpreted for acknowledgement requests](https://github.com/eclipse-ditto/ditto/pull/833)
 
 Senders of live responses may freely choose the status code, since it no longer affects the technical settlement and redelivery of the corresponding live commands.
 
-#### [The header response-required is always set to false for responses and events](https://github.com/eclipse/ditto/pull/850)
+#### [The header response-required is always set to false for responses and events](https://github.com/eclipse-ditto/ditto/pull/850)
 
 Ditto sets the header `response-required` to `false` for signals that do not anticipate any responses,
 so that the header has a consistent meaning regardless of signal type.
 
-#### [OCSP is optional for connections](https://github.com/eclipse/ditto/pull/854)
+#### [OCSP is optional for connections](https://github.com/eclipse-ditto/ditto/pull/854)
 
 Ditto will establish a connection even if the broker has a revoked certificate according to OCSP.
 Failed revocation checks will generate warnings in the connection log.
 This is to guard against unavailability of OCSP servers.
 
-#### [Placeholder topic:entityId renamed to topic:entityName](https://github.com/eclipse/ditto/pull/859)
+#### [Placeholder topic:entityId renamed to topic:entityName](https://github.com/eclipse-ditto/ditto/pull/859)
 
 The placeholder `topic:entityId`  was not named correctly. It was resolved with the
 name of an entity and not the complete ID. Therefore, a new placeholder
@@ -41,36 +41,36 @@ name of an entity and not the complete ID. Therefore, a new placeholder
 
 ### New features
 
-#### [Acknowledgement label declaration](https://github.com/eclipse/ditto/issues/792)
+#### [Acknowledgement label declaration](https://github.com/eclipse-ditto/ditto/issues/792)
 
 Each subscriber of Ditto signals by Websocket or other connections is required to declare the labels of acknowledgements
 it may send. The labels should be unique to the subscriber. Labels of acknowledgements sent via a connection source or
 issued by a connection target must be prefixed by the connection ID followed by a colon. This is to prevent racing in
 fulfillment of acknowledgement requests and to detect misconfiguration early.
 
-Acknowledgement label declaration is available in [Ditto java client](https://github.com/eclipse/ditto-clients/pull/98).
+Acknowledgement label declaration is available in [Ditto java client](https://github.com/eclipse-ditto/ditto-clients/pull/98).
 
 ### Bugfixes
 
 Several bugs in Ditto 1.3.0 were fixed for 1.4.0.<br/>
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.4.0), including the fixed bugs.<br/>
-Here as well for the Ditto Java Client: [merged pull requests](https://github.com/eclipse/ditto-clients/pulls?q=is%3Apr+milestone%3A1.4.0)
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.4.0), including the fixed bugs.<br/>
+Here as well for the Ditto Java Client: [merged pull requests](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is%3Apr+milestone%3A1.4.0)
 
-#### [Thread-safe loggers added](https://github.com/eclipse/ditto/issues/773)
+#### [Thread-safe loggers added](https://github.com/eclipse-ditto/ditto/issues/773)
 
 Concurrency issues in Ditto loggers and logging adapters are addressed by introducing thread-safe variants.
 
-#### [Search via SSE enabled](https://github.com/eclipse/ditto/issues/822)
+#### [Search via SSE enabled](https://github.com/eclipse-ditto/ditto/issues/822)
 
 Search via SSE was disabled due to incorrect initialization. It is enabled again.
 
-#### [Memory consumption of outgoing AMQP connections limited](https://github.com/eclipse/ditto/pull/853)
+#### [Memory consumption of outgoing AMQP connections limited](https://github.com/eclipse-ditto/ditto/pull/853)
 
 AMQP 1.0 connections to a slow broker could accumulate indefinitely messages yet to be published.
 Now only a fixed number of messages are retained.
 
-#### [Java client: Message ordering fixed](https://github.com/eclipse/ditto-clients/pull/97)
+#### [Java client: Message ordering fixed](https://github.com/eclipse-ditto/ditto-clients/pull/97)
 
 There was a bug in Ditto Java client that may cause messages to be handled in a different order
 than when they are received. It made some search results look empty when they are not.
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_150.md b/documentation/src/main/resources/pages/ditto/release_notes_150.md
index 7a8e2073e09..b94a01e3adb 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_150.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_150.md
@@ -7,7 +7,7 @@ summary: "Version 1.5.0 of Eclipse Ditto, released on 10.12.2020"
 permalink: release_notes_150.html
 ---
 
-Ditto **1.5.0** is API and [binary compatible](https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
+Ditto **1.5.0** is API and [binary compatible](https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
 to prior Eclipse Ditto 1.x versions.
 
 ## Changelog
@@ -21,7 +21,7 @@ bugfixes were added.
 
 ### Changes
 
-#### [Negatively settling processed AMQP 1.0 messages changed to `rejected`](https://github.com/eclipse/ditto/pull/907)
+#### [Negatively settling processed AMQP 1.0 messages changed to `rejected`](https://github.com/eclipse-ditto/ditto/pull/907)
 
 In previous versions, Ditto negatively settled messages consumed via AMQP 1.0 which could not be applied to Ditto 
 (e.g. because the received message could not be understood or permissions were missing) with `modified[undeliverable-here]`.
@@ -30,22 +30,22 @@ This was changed to settle with `rejected`
 (see [AMQP 1.0 spec](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-rejected)) 
 instead, as this is the more correct settlement outcome.
 
-#### [MongoDB for unit tests was increased to version 4.2](https://github.com/eclipse/ditto/pull/896)
+#### [MongoDB for unit tests was increased to version 4.2](https://github.com/eclipse-ditto/ditto/pull/896)
 
 Prior to Ditto 1.5.0, the unit tests still were done against MongoDB version 3.6 which reaches end-of-life in April 2021.
 
-#### [Config files consolidation](https://github.com/eclipse/ditto/pull/888)
+#### [Config files consolidation](https://github.com/eclipse-ditto/ditto/pull/888)
 
 No special `-cloud.conf` and `-docker.conf` config files are needed any longer, there are only special config files 
 ending with `-dev.conf` which contain configuration in order to start Eclipse Ditto e.g. locally in an IDE.
 
 ### New features
 
-#### [Header mapping for Feature ID in connectivity](https://github.com/eclipse/ditto/issues/857)
+#### [Header mapping for Feature ID in connectivity](https://github.com/eclipse-ditto/ditto/issues/857)
 
 Feature IDs may now be used as placeholders in [Connectivity header mappings](basic-placeholders.html#scope-connections). 
 
-#### [Addition of "desired" feature properties in model and APIs](https://github.com/eclipse/ditto/issues/697)
+#### [Addition of "desired" feature properties in model and APIs](https://github.com/eclipse-ditto/ditto/issues/697)
 
 A feature which was long on the roadmap of Eclipse Ditto is the ability to distinguish between reported and [desired 
 twin state](basic-feature.html#feature-desired-properties).
@@ -56,7 +56,7 @@ for a property.
 
 This issue layed the foundation by creating the model and the APIs in order to manage those `desiredProperties`.
 
-#### [Issuing "weak acknowledgements" when a command requesting acks was filtered out](https://github.com/eclipse/ditto/issues/852)
+#### [Issuing "weak acknowledgements" when a command requesting acks was filtered out](https://github.com/eclipse-ditto/ditto/issues/852)
 
 When using [acknowledgements](basic-acknowledgements.html) in order to guarantee "at least once" (QoS 1) delivery and 
 scenarios like: 
@@ -66,7 +66,7 @@ scenarios like:
 resending the signal will not help. 
 Ditto now emits a "weak acknowledgement" for such cases that does not trigger redelivery.
 
-#### [Ditto internal pub/sub supports using a "grouping" concept](https://github.com/eclipse/ditto/issues/878)
+#### [Ditto internal pub/sub supports using a "grouping" concept](https://github.com/eclipse-ditto/ditto/issues/878)
 
 A "group" concept was added to Ditto pub/sub:
 * Subscribers may subscribe with a group name.
@@ -75,7 +75,7 @@ A "group" concept was added to Ditto pub/sub:
 With this feature, the event publishing at connections will scale with the number of client actors by having the client 
 actors subscribe for events directly using the connection ID as group.
 
-#### [Addition of "cloudevents" HTTP endpoint](https://github.com/eclipse/ditto/issues/889)
+#### [Addition of "cloudevents" HTTP endpoint](https://github.com/eclipse-ditto/ditto/issues/889)
 
 While [cloud events](https://cloudevents.io) provide bindings for Kafka, MQTT, ... they also have an HTTP endpoint 
 binding, which can easily be used in the combination with Knative.
@@ -91,10 +91,10 @@ for this addition to Eclipse Ditto.
 
 Several bugs in Ditto 1.4.0 were fixed for 1.5.0.<br/>
 This is a complete list of the 
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.5.0), including the fixed bugs.<br/>
-Here as well for the Ditto Java Client: [merged pull requests](https://github.com/eclipse/ditto-clients/pulls?q=is%3Apr+milestone%3A1.5.0)
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.5.0), including the fixed bugs.<br/>
+Here as well for the Ditto Java Client: [merged pull requests](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is%3Apr+milestone%3A1.5.0)
 
-#### [Fix that sending messages with non-existing "value" was not possible via HTTP endpoints](https://github.com/eclipse/ditto/pull/875)
+#### [Fix that sending messages with non-existing "value" was not possible via HTTP endpoints](https://github.com/eclipse-ditto/ditto/pull/875)
 
 The HTTP `/messages` endpoints did not allow that a Ditto Protocol messages with non-existing `"value"`  were created for
 HTTP invocations which did not include payload at all.
@@ -102,14 +102,14 @@ HTTP invocations which did not include payload at all.
 That was fixed in the way that for requests with `Content-Length: 0` the `"value"` is now removed from the resulting 
 Ditto Protocol message instead of being `"value": ""` (empty JSON string).
 
-#### [Ditto Java client: When starting consumption with invalid filter, wrongly timeout exception is propagate to the user](https://github.com/eclipse/ditto-clients/pull/105)
+#### [Ditto Java client: When starting consumption with invalid filter, wrongly timeout exception is propagate to the user](https://github.com/eclipse-ditto/ditto-clients/pull/105)
 
 `dittoClient.twin().startConsumption(org.eclipse.ditto.client.options.Options.Consumption.filter("invalidFilter"))`
 throwed a wrong exception and did not propagate the real error to the user.
 
-Affected [Ditto PR](https://github.com/eclipse/ditto/pull/902).
+Affected [Ditto PR](https://github.com/eclipse-ditto/ditto/pull/902).
 
-#### [Ditto Java client: Fix FeatureChange consumption for specific feature change-registration](https://github.com/eclipse/ditto-clients/pull/101)
+#### [Ditto Java client: Fix FeatureChange consumption for specific feature change-registration](https://github.com/eclipse-ditto/ditto-clients/pull/101)
 
 This fixes a bug that caused ignoring features in a FeatureChange for change-registrations on single features, 
 when only a single subpath exists in the feature (i.e. feature with only properties).
@@ -119,7 +119,7 @@ when only a single subpath exists in the feature (i.e. feature with only propert
 
 ### MongoDB hostname configuration
 
-Due to the [consolidation of config files](https://github.com/eclipse/ditto/pull/888), it is now **required to configure
+Due to the [consolidation of config files](https://github.com/eclipse-ditto/ditto/pull/888), it is now **required to configure
 the MongoDB `hostname` explicitly** as the default hostname was changed to `localhost`.<br/>
 Previously, this hostname was automatically set to `mongodb` (which is the hostname of the MongoDB when e.g. the 
 `docker-compose.yaml` deployment is used) in Docker based environments.
@@ -127,4 +127,4 @@ Previously, this hostname was automatically set to `mongodb` (which is the hostn
 This now has to be manually done via the environment variable `MONGO_DB_HOSTNAME`.
 
 The default `docker-compose.yaml` was also adjusted accordingly: 
-[docker-compose.yml](https://github.com/eclipse/ditto/blob/master/deployment/docker/docker-compose.yml)
+[docker-compose.yml](https://github.com/eclipse-ditto/ditto/blob/master/deployment/docker/docker-compose.yml)
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_151.md b/documentation/src/main/resources/pages/ditto/release_notes_151.md
index dff517cf0b2..ffed300e2fd 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_151.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_151.md
@@ -16,4 +16,4 @@ Compared to the latest release [1.5.0](release_notes_150.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A1.5.1), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A1.5.1), including the fixed bugs.
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_200.md b/documentation/src/main/resources/pages/ditto/release_notes_200.md
index 1ae02d1b642..43ea9d5f524 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_200.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_200.md
@@ -72,7 +72,7 @@ pointing to an alternative implementation to use instead. Now, these deprecated
 
 Some changes to the codebase which could not be done in Ditto 1.x without breaking binary compatibility were also done.
 
-#### [Removed content-type header mapping for connection targets](https://github.com/eclipse/ditto/pull/934)
+#### [Removed content-type header mapping for connection targets](https://github.com/eclipse-ditto/ditto/pull/934)
 
 Removed the default header mapping of `content-type` for new connection targets. The header mapping led to irritating
 results, when payload mapping and header mapping disagreed on the actual `content-type`. Existing connections will still
@@ -83,7 +83,7 @@ If you need to keep the old behavior, please have a look at the
 
 #### OpenID Connect configuration change
 
-For supporting [Configurable OpenID Connect / OAuth2.0 claim extraction](https://github.com/eclipse/ditto/issues/512), 
+For supporting [Configurable OpenID Connect / OAuth2.0 claim extraction](https://github.com/eclipse-ditto/ditto/issues/512), 
 the configuration format was changed, please have a look at the  
 [migration notes](#openid-connect-configuration-for-gateway).
 
@@ -205,7 +205,7 @@ In addition, all APIs which returned a `CompletableFuture` were adjusted to retu
 
 #### Ditto JavaScript client
 
-Starting with Ditto 2.0.0, the releases of the [Ditto JavaScript client](https://github.com/eclipse/ditto-clients/tree/master/javascript)
+Starting with Ditto 2.0.0, the releases of the [Ditto JavaScript client](https://github.com/eclipse-ditto/ditto-clients/tree/master/javascript)
 are in sync with Ditto releases.  
 In oder to have a simplified usage of the JS client, the "api" module must no longer be explicitly imported, 
 simply directly import one of the following 2 npm modules:
@@ -215,7 +215,7 @@ simply directly import one of the following 2 npm modules:
 
 ### New features
 
-#### [Merge/PATCH updates of digital twins](https://github.com/eclipse/ditto/issues/288)
+#### [Merge/PATCH updates of digital twins](https://github.com/eclipse-ditto/ditto/issues/288)
 
 This new feature allows updating parts of a thing without affecting existing parts. You may now for example update an
 attribute, add a new property to a feature and delete a property of a different feature in a _single request_. The new
@@ -223,57 +223,57 @@ merge functionality is available via the HTTP API and the all channels using the
 [Merge updates via HTTP](httpapi-concepts.html#merge-updates)
 or the [Merge protocol specification](protocol-specification-things-merge.html) for more details and examples.
 
-#### [Configurable OpenID Connect / OAuth2.0 claim extraction](https://github.com/eclipse/ditto/issues/512)
+#### [Configurable OpenID Connect / OAuth2.0 claim extraction](https://github.com/eclipse-ditto/ditto/issues/512)
 
 OpenID Connect support has been extended; Previously, only the `sub` field from a JWT was injected as an authorization subject.
 This is now configurable: The Ditto Gateway config takes a list of placeholder strings that are used to construct authorization subjects.  
 See [OpenID Connect](installation-operating.html#openid-connect)
 
-#### [Establishing connections to endpoints via SSH tunnel](https://github.com/eclipse/ditto/issues/985)
+#### [Establishing connections to endpoints via SSH tunnel](https://github.com/eclipse-ditto/ditto/issues/985)
 
 Add support for connecting to an external system from Ditto via an SSH tunnel.
 
-#### [DevOps API to retrieve all known connections](https://github.com/eclipse/ditto/issues/605)
+#### [DevOps API to retrieve all known connections](https://github.com/eclipse-ditto/ditto/issues/605)
 
 Adds a new [DevOps command](connectivity-manage-connections.html) to list all 
 configured, non-deleted connections.
 
-#### [Expiring policy subjects](https://github.com/eclipse/ditto/issues/890)
+#### [Expiring policy subjects](https://github.com/eclipse-ditto/ditto/issues/890)
 
 In order to give access for a certain "authorized subject" only until a fixed timestamp, a Policy subject can 
 optionally be provided with an ["expiry" timestamp](basic-policy.html#expiring-policy-subjects) 
 (being an ISO-8601 string).
 
-#### [Publishing of announcement message prior to policy expiry](https://github.com/eclipse/ditto/issues/964)
+#### [Publishing of announcement message prior to policy expiry](https://github.com/eclipse-ditto/ditto/issues/964)
 
 For "expiring" policy subjects it is useful to get an [announcement](basic-signals-announcement.html) message prior
 to the actual expiry in order to be able to prolong the temporary access rights.
 
-#### [Addition of policy actions in order to inject a policy subject](https://github.com/eclipse/ditto/issues/926)
+#### [Addition of policy actions in order to inject a policy subject](https://github.com/eclipse-ditto/ditto/issues/926)
 
 New [policy HTTP API](basic-policy.html#action-activatetokenintegration) to inject authorization subjects based on 
 the <a href="#" data-toggle="tooltip" data-original-title="{{site.data.glossary.jwt}}">JWT</a> of the HTTP request.
 
-#### [Built-in acknowledgement for search updates / strong consistency of the search index](https://github.com/eclipse/ditto/issues/914)
+#### [Built-in acknowledgement for search updates / strong consistency of the search index](https://github.com/eclipse-ditto/ditto/issues/914)
 
 Ditto's search index is only eventually consistent. Applications that rely on search to for twin interactions which 
 need to know when a change is reflected in the search index, may request the new built-in 
 [`"search-persisted"`](basic-acknowledgements.html#built-in-acknowledgement-labels) acknowledgement label.
 
-#### [Restoring active connection faster after a hard restart of the Ditto cluster](https://github.com/eclipse/ditto/pull/1018)
+#### [Restoring active connection faster after a hard restart of the Ditto cluster](https://github.com/eclipse-ditto/ditto/pull/1018)
 
 Prioritize very active [connections](basic-connections.html) over inactive connections for reconnecting:  
 The higher the priority, the earlier it will be reconnected on startup.
 
-#### [Support for "Last Will" for MQTT connections](https://github.com/eclipse/ditto/issues/1021)
+#### [Support for "Last Will" for MQTT connections](https://github.com/eclipse-ditto/ditto/issues/1021)
 
 Adds "Last Will" support for managed MQTT connections
 
-#### [Allow setting retain flag for MQTT connections](https://github.com/eclipse/ditto/issues/1029)
+#### [Allow setting retain flag for MQTT connections](https://github.com/eclipse-ditto/ditto/issues/1029)
 
 The `retain` flag of MQTT messages published via a managed connection is set according to a message header.
 
-#### [Provide JWT tokens to Websocket endpoint with browser APIs](https://github.com/eclipse/ditto/issues/667)
+#### [Provide JWT tokens to Websocket endpoint with browser APIs](https://github.com/eclipse-ditto/ditto/issues/667)
 
 Prior to Ditto 2.0 it was only possible to pass a JWT to the `/ws` endpoint with the `Authorization` header.  
 As this however is not possible to influence in the browser based JavaScript API of `WebSocket`, it was not possible
@@ -286,24 +286,24 @@ This is now possible by supplying the JWT via a [query-parameter `access_token`]
 
 Several bugs in Ditto 1.5.x were fixed for 2.0.0.  
 This is a complete list of the
-* [merged pull requests for milestone 2.0.0-M1](https://github.com/eclipse/ditto/pulls?q=is:pr+milestone:2.0.0-M1)
-* [merged pull requests for milestone 2.0.0-M2](https://github.com/eclipse/ditto/pulls?q=is:pr+milestone:2.0.0-M2)
-* [merged pull requests for milestone 2.0.0](https://github.com/eclipse/ditto/pulls?q=is:pr+milestone:2.0.0)
+* [merged pull requests for milestone 2.0.0-M1](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:2.0.0-M1)
+* [merged pull requests for milestone 2.0.0-M2](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:2.0.0-M2)
+* [merged pull requests for milestone 2.0.0](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:2.0.0)
 
-Here as well for the Ditto Java Client: [merged pull requests for milestone 2.0.0](https://github.com/eclipse/ditto-clients/pulls?q=is:pr+milestone:2.0.0)
+Here as well for the Ditto Java Client: [merged pull requests for milestone 2.0.0](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is:pr+milestone:2.0.0)
 
 
-#### ["content-type" of a Ditto Protocol JSON message did not describe its "value"](https://github.com/eclipse/ditto/pull/987)
+#### ["content-type" of a Ditto Protocol JSON message did not describe its "value"](https://github.com/eclipse-ditto/ditto/pull/987)
 
 The `"content-type"` field in [Ditto Protocol headers](protocol-specification.html#headers) was intended to identify the 
 type of the [`"value"`](protocol-specification.html#value). This was not consequently ensured which has now been fixed.
 
-#### [Password encoding/decoding for AMQP 1.0 connections with special characters](https://github.com/eclipse/ditto/pull/996)
+#### [Password encoding/decoding for AMQP 1.0 connections with special characters](https://github.com/eclipse-ditto/ditto/pull/996)
 
 When passwords contained a `+` sign, they were wrongly decoded for 
 [AMQP 1.0 connections](connectivity-protocol-bindings-amqp10.html).
 
-#### [Merging "extraFields" into thing payload when using "normalization" mapper](https://github.com/eclipse/ditto/issues/947)
+#### [Merging "extraFields" into thing payload when using "normalization" mapper](https://github.com/eclipse-ditto/ditto/issues/947)
 
 When selecting [extra](basic-connections.html#target-topics-and-enrichment) via "enrichment", the actual value of an 
 event could be overwritten by the "extra" data. The event data now always has priority.
@@ -331,7 +331,7 @@ In order to migrate existing [things](basic-thing.html) from API version 1 to AP
 ### "content-type" header mapping in connection targets
 
 Due to the 
-[removed default content-type header mapping for connection targets](https://github.com/eclipse/ditto/pull/934), 
+[removed default content-type header mapping for connection targets](https://github.com/eclipse-ditto/ditto/pull/934), 
 it might be necessary to update the way connection targets are created in case you create connection targets without
 explicit `headerMapping` and rely on a specific content-type on the receiving side. The request to create connection 
 targets can be updated to contain the "old" default in this case:
@@ -361,7 +361,7 @@ targets can be updated to contain the "old" default in this case:
 ### OpenID Connect configuration for gateway
 
 The oauth configuration section of the Gateway service has been altered to support
-[arbitrary claims for authorization subjects](https://github.com/eclipse/ditto/issues/512). 
+[arbitrary claims for authorization subjects](https://github.com/eclipse-ditto/ditto/issues/512). 
 The `openid-connect-issuers` map now takes key-object pairs rather than key-string pairs:
 
 old:
@@ -420,5 +420,5 @@ This call returns a `CompletionStage` which finally resolves to a connected `Dit
 
 Looking forward, the current plans for Ditto 2.1.0 are:
 
-* [Support for consuming messages from Apache Kafka](https://github.com/eclipse/ditto/issues/586)
-* [Let policies import other policies to enable re-use when securing things](https://github.com/eclipse/ditto/issues/298)
+* [Support for consuming messages from Apache Kafka](https://github.com/eclipse-ditto/ditto/issues/586)
+* [Let policies import other policies to enable re-use when securing things](https://github.com/eclipse-ditto/ditto/issues/298)
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_201.md b/documentation/src/main/resources/pages/ditto/release_notes_201.md
index e5ffa831021..c578eb78a57 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_201.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_201.md
@@ -16,28 +16,28 @@ Compared to the latest release [2.0.0](release_notes_200.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.0.1), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.0.1), including the fixed bugs.
 
-#### [Fixed that error responses in WS contained wrong topic path](https://github.com/eclipse/ditto/pull/1057)
+#### [Fixed that error responses in WS contained wrong topic path](https://github.com/eclipse-ditto/ditto/pull/1057)
 
 The Ditto WebSocket returned a wrong `topic` for DittoProtocol messages for error responses.
 
-#### [Optimized MQTT protocol level acknowledgements](https://github.com/eclipse/ditto/pull/1064)
+#### [Optimized MQTT protocol level acknowledgements](https://github.com/eclipse-ditto/ditto/pull/1064)
 
 When using MQTT option `"reconnectForRedelivery"`, the downtime during the reconnect was optimized to be very small
 in order to lose only few "QoS 0" messages.
 
-#### [Made AckUpdater work with ddata sharding](https://github.com/eclipse/ditto/pull/1063)
+#### [Made AckUpdater work with ddata sharding](https://github.com/eclipse-ditto/ditto/pull/1063)
 
 "Weak" Acknowledgements were broken in 2.0.0 when Ditto was operated in a cluster with more than 1 instances.
 
-#### [Fixed write-concern for commands requesting "search-persisted" ACK](https://github.com/eclipse/ditto/pull/1059)
+#### [Fixed write-concern for commands requesting "search-persisted" ACK](https://github.com/eclipse-ditto/ditto/pull/1059)
 
 The Ditto search was updated with a wrong write concern which caused higher search update times.  
 In addition, requests with "search-persisted" acknowledgement used the wrong write concern as well which could have
 caused search inconsistencies. 
 
-#### [Fixed that logging was not configurable](https://github.com/eclipse/ditto/pull/1066)
+#### [Fixed that logging was not configurable](https://github.com/eclipse-ditto/ditto/pull/1066)
 
 Previously, there were no options to configure logging for Ditto - this was fixed and it is possible to
 either configure a "logstash" endpoint or files based log appending.
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_210.md b/documentation/src/main/resources/pages/ditto/release_notes_210.md
index b985ddbc70b..945b871e2ae 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_210.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_210.md
@@ -7,7 +7,7 @@ summary: "Version 2.1.0 of Eclipse Ditto, released on 27.09.2021"
 permalink: release_notes_210.html
 ---
 
-Ditto **2.1.0** is API and [binary compatible](https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
+Ditto **2.1.0** is API and [binary compatible](https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
 to prior Eclipse Ditto 2.x versions.
 
 ## Changelog
@@ -41,10 +41,10 @@ The following non-functional work is also included:
 <br/>
 
 For a complete list of all merged PRs, inspect the following milestones:
-* [merged pull requests for milestone 2.1.0-M1](https://github.com/eclipse/ditto/pulls?q=is:pr+milestone:2.1.0-M1)
-* [merged pull requests for milestone 2.1.0-M2](https://github.com/eclipse/ditto/pulls?q=is:pr+milestone:2.1.0-M2)
-* [merged pull requests for milestone 2.1.0-M3](https://github.com/eclipse/ditto/pulls?q=is:pr+milestone:2.1.0-M3)
-* [merged pull requests for milestone 2.1.0](https://github.com/eclipse/ditto/pulls?q=is:pr+milestone:2.1.0)
+* [merged pull requests for milestone 2.1.0-M1](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:2.1.0-M1)
+* [merged pull requests for milestone 2.1.0-M2](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:2.1.0-M2)
+* [merged pull requests for milestone 2.1.0-M3](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:2.1.0-M3)
+* [merged pull requests for milestone 2.1.0](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:2.1.0)
 
 <br/>
 <br/>
@@ -54,7 +54,7 @@ bugfixes were added.
 
 ### Changes
 
-#### [Support using URLs in "definitions"](https://github.com/eclipse/ditto/pull/1185)
+#### [Support using URLs in "definitions"](https://github.com/eclipse-ditto/ditto/pull/1185)
 
 In addition to using the currently supported pattern `<namespace>:<name>:<version>` in 
 [thing definitions](basic-thing.html#definition) and 
@@ -64,9 +64,9 @@ This is useful to link a Thing to a model definition available via an HTTP URL,
 [WoT (Web of Things) Thing Model](https://www.w3.org/TR/wot-thing-description11/#thing-model).
 
 A discussion of how a WoT "Thing Model" can be mapped to an Eclipse Ditto "Thing" is currently 
-[ongoing on GitHub](https://github.com/eclipse/ditto/discussions/1163), please join in to provide feedback.
+[ongoing on GitHub](https://github.com/eclipse-ditto/ditto/discussions/1163), please join in to provide feedback.
 
-#### [Addition of category "misconfigured" for current connection status](https://github.com/eclipse/ditto/pull/1151)
+#### [Addition of category "misconfigured" for current connection status](https://github.com/eclipse-ditto/ditto/pull/1151)
 
 When [retrieving the connection status](connectivity-manage-connections.html#retrieve-connection-status), a connection 
 was previously in status `"failed"` when e.g. the credentials to an endpoint were wrong or a queue in a message broker
@@ -74,7 +74,7 @@ was not existing.
 
 By adding a new status `"misconfigured"` such configuration errors are now differentiable from real "failures".
 
-#### [Tracing support, reporting traces to an "Open Telemetry" endpoint](https://github.com/eclipse/ditto/issues/1135)
+#### [Tracing support, reporting traces to an "Open Telemetry" endpoint](https://github.com/eclipse-ditto/ditto/issues/1135)
 
 Eclipse Ditto can now optionally be configured to enable [tracing](installation-operating.html#tracing) and to report
 traces to an "Open Telemetry" endpoint.  
@@ -90,18 +90,18 @@ to end users.
 
 E.g. support configuration of a [logstash endpoint or a custom file appender](installation-operating.html#logging).
 
-#### [Improving background deletion of dangling DB journal entries / snapshots based on the current MongoDB load](https://github.com/eclipse/ditto/pull/1168)
+#### [Improving background deletion of dangling DB journal entries / snapshots based on the current MongoDB load](https://github.com/eclipse-ditto/ditto/pull/1168)
 
 The deletion of dangling / no longer needed DB entries was improved to react better to the current load of the database.
 
-#### [Improving search update by applying "delta updates" saving lots of bandwidth to MongoDB](https://github.com/eclipse/ditto/pull/1174)
+#### [Improving search update by applying "delta updates" saving lots of bandwidth to MongoDB](https://github.com/eclipse-ditto/ditto/pull/1174)
 
 Previous versions of Ditto updated the documents in the search index always completely, also if only one value of a thing
 was modified.  
 This is now drastically improved so that only changed values are updated in the search index which saves a lot of 
 network traffic towards the database.
 
-#### [Reducing cluster communication for search updates using a smart cache](https://github.com/eclipse/ditto/pull/1150)
+#### [Reducing cluster communication for search updates using a smart cache](https://github.com/eclipse-ditto/ditto/pull/1150)
 
 Minimized internal cluster roundtrips to load thing data in order to calculate the search index documents by using a 
 cache.
@@ -109,7 +109,7 @@ cache.
 
 ### New features
 
-#### [Support consuming messages from Apache Kafka](https://github.com/eclipse/ditto/issues/586)
+#### [Support consuming messages from Apache Kafka](https://github.com/eclipse-ditto/ditto/issues/586)
 
 Implemented connection sources for Apache Kafka connections.  
 This latest addition completes the Apache Kafka integration in Eclipse Ditto and can utilize Ditto's 
@@ -122,7 +122,7 @@ integrate your favorite Digital Twin framework with your favorite event streamin
 When updating from a Ditto version where Kafka was used before, please notice and follow the 
 [migration notes](#adapt-kafka-client-configuration) on Kafka related configuration changes.
 
-#### [Conditional requests (updates + retrieves)](https://github.com/eclipse/ditto/issues/559)
+#### [Conditional requests (updates + retrieves)](https://github.com/eclipse-ditto/ditto/issues/559)
 
 Utilizing the existing [RQL](basic-rql.html) filters, it is now possible to specify a `condition` when performing any of
 operations (like modifications or retrievals) on a thing.
@@ -134,30 +134,30 @@ older than a specified timestamp in the condition.
 Please have a look at our [blog post](2021-09-23-conditional-requests.html) about this new feature and the newly added 
 [documentation of conditions](basic-connections.html) to find out more.
 
-#### [Enrichment of "ThingDeleted" events with extra fields](https://github.com/eclipse/ditto/pull/1184)
+#### [Enrichment of "ThingDeleted" events with extra fields](https://github.com/eclipse-ditto/ditto/pull/1184)
 
 Previously, Eclipse Ditto could not [enrich](basic-enrichment.html) `ThingDeleted` events with additional data from the
 deleted thing - this now is supported.
 
-#### [HMAC based authentication for Ditto managed connections](https://github.com/eclipse/ditto/issues/1060)
+#### [HMAC based authentication for Ditto managed connections](https://github.com/eclipse-ditto/ditto/issues/1060)
 
 For better integration with Microsoft's Azure and Amazon's AWS ecosystems, Eclipse Ditto HTTP connections now support 
 HMAC-based authentication methods such as that of "Azure Monitor Data Collector" and "AWS Signature Version 4".
 
 Please read the [blog post](2021-06-17-hmac-credentials.html) to learn more about that.
 
-#### [SASL authentication for Azure IoT Hub](https://github.com/eclipse/ditto/issues/1078)
+#### [SASL authentication for Azure IoT Hub](https://github.com/eclipse-ditto/ditto/issues/1078)
 
 For better integration with "Azure IoT Hub", Eclipse Ditto AMQP and HTTP connections now support its shared 
 access signature authentication.
 
-#### [Publishing of connection opened/closed announcements](https://github.com/eclipse/ditto/issues/1052)
+#### [Publishing of connection opened/closed announcements](https://github.com/eclipse-ditto/ditto/issues/1052)
 
 An Eclipse Ditto connection can now be configured to send an 
 [announcement](protocol-specification-connections-announcement.html) to the target endpoint, when the connection
 is opening and when it is closing again (e.g. during a restart of Eclipse Ditto).
 
-#### [Support "at least once" delivery for policy subject deletion announcements](https://github.com/eclipse/ditto/issues/1107)
+#### [Support "at least once" delivery for policy subject deletion announcements](https://github.com/eclipse-ditto/ditto/issues/1107)
 
 Policy subject [deletion announcements](basic-policy.html#subject-deletion-announcements) can now be configured to be 
 delivered "at least once", using Eclipse Ditto's built in [acknowledgement](basic-acknowledgements.html) mechanism.
@@ -167,14 +167,14 @@ delivered "at least once", using Eclipse Ditto's built in [acknowledgement](basi
 
 Several bugs in Ditto 2.0.x were fixed for 2.1.0.  
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.1.0), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.1.0), including the fixed bugs.
 
-#### [Fix "search-persisted" acknowledgement not working for thing deletion](https://github.com/eclipse/ditto/pull/1141)
+#### [Fix "search-persisted" acknowledgement not working for thing deletion](https://github.com/eclipse-ditto/ditto/pull/1141)
 
 Previously, when requesting the built-in [acknowledgement label "search-persisted"](basic-acknowledgements.html#built-in-acknowledgement-labels)
 for thing deletions the response did not wait for the deletion in the search index which has been fixed now.
 
-#### [Fix reconnect loop to MQTT brokers when using separate MQTT publisher client](https://github.com/eclipse/ditto/pull/1117)
+#### [Fix reconnect loop to MQTT brokers when using separate MQTT publisher client](https://github.com/eclipse-ditto/ditto/pull/1117)
 
 Eclipse Ditto 2.0.0 could run into an endless reconnect loop to an MQTT broker when a separate publisher client was 
 configured. This has been fixed.
@@ -214,14 +214,14 @@ ditto.connectivity.connection {
 ## Ditto clients
 
 For a complete list of all merged client PRs, inspect the following milestones:
-* [merged pull requests for milestone 2.1.0-M1](https://github.com/eclipse/ditto-clients/pulls?q=is:pr+milestone:2.1.0-M1)
-* [merged pull requests for milestone 2.1.0-M2](https://github.com/eclipse/ditto-clients/pulls?q=is:pr+milestone:2.1.0-M2)
-* [merged pull requests for milestone 2.1.0-M3](https://github.com/eclipse/ditto-clients/pulls?q=is:pr+milestone:2.1.0-M3)
-* [merged pull requests for milestone 2.1.0](https://github.com/eclipse/ditto-clients/pulls?q=is:pr+milestone:2.1.0)
+* [merged pull requests for milestone 2.1.0-M1](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is:pr+milestone:2.1.0-M1)
+* [merged pull requests for milestone 2.1.0-M2](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is:pr+milestone:2.1.0-M2)
+* [merged pull requests for milestone 2.1.0-M3](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is:pr+milestone:2.1.0-M3)
+* [merged pull requests for milestone 2.1.0](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is:pr+milestone:2.1.0)
 
 ### Ditto Java SDK
 
-#### [Enhance Ditto java client with a "disconnection listener"](https://github.com/eclipse/ditto-clients/pull/167)
+#### [Enhance Ditto java client with a "disconnection listener"](https://github.com/eclipse-ditto/ditto-clients/pull/167)
 
 A new disconnection listener can be configured which:
 * is called whenever the connection to the Ditto backend was disconnected
@@ -230,15 +230,15 @@ A new disconnection listener can be configured which:
 
 ### Ditto JavaScript SDK
 
-See separate [Changelog](https://github.com/eclipse/ditto-clients/blob/master/javascript/CHANGELOG.md) of JS client.
+See separate [Changelog](https://github.com/eclipse-ditto/ditto-clients/blob/master/javascript/CHANGELOG.md) of JS client.
 
 
 ## Roadmap
 
 Looking forward, the current plans for Ditto 2.2.0 are:
 
-* [Add HTTP API for "live" commands](https://github.com/eclipse/ditto/issues/106)
-* [Add support for twin life-cycle events](https://github.com/eclipse/ditto/issues/898)
+* [Add HTTP API for "live" commands](https://github.com/eclipse-ditto/ditto/issues/106)
+* [Add support for twin life-cycle events](https://github.com/eclipse-ditto/ditto/issues/898)
 * Defining "channel" conditions on API requests against Ditto so that Ditto decides based on the condition whether to 
   use "twin" or "live" channel
 * Concept and first work on a WoT (Web of Things) integration
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_211.md b/documentation/src/main/resources/pages/ditto/release_notes_211.md
index 7287d5199e4..5367a180a4e 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_211.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_211.md
@@ -16,35 +16,35 @@ Compared to the latest release [2.1.0](release_notes_210.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.1.1), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.1.1), including the fixed bugs.
 
 In addition, this is a complete list of the
-[merged Ditto Client pull requests](https://github.com/eclipse/ditto-clients/pulls?q=is%3Apr+milestone%3A2.1.1), including the fixed bugs.
+[merged Ditto Client pull requests](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is%3Apr+milestone%3A2.1.1), including the fixed bugs.
 
-#### [Stabilize connection live status for AMQP 1.0 connections](https://github.com/eclipse/ditto/pull/1206)
+#### [Stabilize connection live status for AMQP 1.0 connections](https://github.com/eclipse-ditto/ditto/pull/1206)
 
 The connection live status was not always correct for AMQP 1.0 connections which were `misconfigured`.
 
-#### [Fixed drop behavior of mapping queue in LegacyBaseConsumerActor](https://github.com/eclipse/ditto/pull/1195)
+#### [Fixed drop behavior of mapping queue in LegacyBaseConsumerActor](https://github.com/eclipse-ditto/ditto/pull/1195)
 
 Connections using the `LegacyBaseConsumerActor` like AMQP 0.9.1, MQTT, HTTP did silently drop messages if the configured
 buffer size was reached and backpressure was applied.  
 This is now logged as warning and a retry is invoked.
 
-#### [Fix status 500 when sorting a field containing non-primitive values](https://github.com/eclipse/ditto/pull/1207)
+#### [Fix status 500 when sorting a field containing non-primitive values](https://github.com/eclipse-ditto/ditto/pull/1207)
 
 When sorting on e.g. JSON objects in the things-search a HTTP status 500 was returned.
 
-#### [Explicitly configure MongoDB query batchSize same as the limit](https://github.com/eclipse/ditto/pull/1211)
+#### [Explicitly configure MongoDB query batchSize same as the limit](https://github.com/eclipse-ditto/ditto/pull/1211)
 
 The used MongoDB driver used a max `batchSize` of `16` for performing searches. When the requested result size was 
 higher than 16, this lead to multiple roundtrips/batches for a search resulting in not ideal performance.
 
-#### [Fix mqtt connection status for sources with multiple addresses](https://github.com/eclipse/ditto/pull/1214)
+#### [Fix mqtt connection status for sources with multiple addresses](https://github.com/eclipse-ditto/ditto/pull/1214)
 
 The connection live status for MQTT connections with sources containing multiple addresses contained `failure` status
 entries for "missing" sources.
 
-#### Ditto Java Client: [Shutdown executor after stream cancellation](https://github.com/eclipse/ditto-clients/pull/174)
+#### Ditto Java Client: [Shutdown executor after stream cancellation](https://github.com/eclipse-ditto/ditto-clients/pull/174)
 
 The Ditto Java client had a thread leak which is now fixed.
\ No newline at end of file
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_212.md b/documentation/src/main/resources/pages/ditto/release_notes_212.md
index 2f16cbd148d..e5819b1171b 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_212.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_212.md
@@ -16,25 +16,25 @@ Compared to the latest release [2.1.1](release_notes_211.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.1.2), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.1.2), including the fixed bugs.
 
-#### [Improve performance of JWT validations by caching jwt validator](https://github.com/eclipse/ditto/pull/1217)
+#### [Improve performance of JWT validations by caching jwt validator](https://github.com/eclipse-ditto/ditto/pull/1217)
 
 For some users of Ditto, the performance of JWT validations was dramatically bad. This bugfix caches the creation of 
 the JWT parser based on the public key and should dramatically improve the performance of HTTP requests using JWT.
 
-#### [Improve Kafka consumer performance](https://github.com/eclipse/ditto/pull/1218)
+#### [Improve Kafka consumer performance](https://github.com/eclipse-ditto/ditto/pull/1218)
 
 This bugfix should reduce the CPU load in the connectivity service and number of requests/second to the Kafka broker by 
 increasing `fetch.max.wait.ms` to 5 seconds.  
 It should also reduce the consumer lag due to a lack of threads when there are a lot of consumers running.
 
-#### [Keep order of json elements in connection model in set structures](https://github.com/eclipse/ditto/pull/1219)
+#### [Keep order of json elements in connection model in set structures](https://github.com/eclipse-ditto/ditto/pull/1219)
 
 Previously, the JSON element order e.g. in arrays in a managed `connection` could be mixed up, e.g. from creation to
 persistence. This has been fixed by maintaining the JSON element order in the connection model.
 
-#### [Updated to Akka HTTP 10.2.7 due to critical reported CVE](https://github.com/eclipse/ditto/pull/1222)
+#### [Updated to Akka HTTP 10.2.7 due to critical reported CVE](https://github.com/eclipse-ditto/ditto/pull/1222)
 
 The for Ditto's HTTP API used library contained a critical security issue 
 [CVE-2021-42697](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42697) which has been resolved in Akka HTTP 10.2.7 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_213.md b/documentation/src/main/resources/pages/ditto/release_notes_213.md
index 697692848f3..303f903dc8b 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_213.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_213.md
@@ -16,9 +16,9 @@ Compared to the latest release [2.1.2](release_notes_212.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.1.3), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.1.3), including the fixed bugs.
 
-#### [Update logback to 1.2.8 due to "possibility of vulnerability"](https://github.com/eclipse/ditto/pull/1253)
+#### [Update logback to 1.2.8 due to "possibility of vulnerability"](https://github.com/eclipse-ditto/ditto/pull/1253)
 
 The reported [LOGBACK-1591](https://jira.qos.ch/browse/LOGBACK-1591) reports a "Possibility of vulnerability" with
 a medium severity.
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_220.md b/documentation/src/main/resources/pages/ditto/release_notes_220.md
index d28f48f3c95..b43ac979c20 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_220.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_220.md
@@ -7,7 +7,7 @@ summary: "Version 2.2.0 of Eclipse Ditto, released on 22.11.2021"
 permalink: release_notes_220.html
 ---
 
-Ditto **2.2.0** is API and [binary compatible](https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
+Ditto **2.2.0** is API and [binary compatible](https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
 to prior Eclipse Ditto 2.x versions.
 
 ## Changelog
@@ -33,7 +33,7 @@ The following non-functional work is also included:
 <br/>
 
 For a complete list of all merged PRs, inspect the following milestones:
-* [merged pull requests for milestone 2.2.0](https://github.com/eclipse/ditto/pulls?q=is:pr+milestone:2.2.0)
+* [merged pull requests for milestone 2.2.0](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:2.2.0)
 
 <br/>
 <br/>
@@ -43,7 +43,7 @@ bugfixes were added.
 
 ### Changes
 
-#### [Allow using the dash `-` as part of the "namespace" part in Ditto thing and policy IDs](https://github.com/eclipse/ditto/issues/1231)
+#### [Allow using the dash `-` as part of the "namespace" part in Ditto thing and policy IDs](https://github.com/eclipse-ditto/ditto/issues/1231)
 
 A feedback from our community was that the dash `-` should be an allowed character in the 
 [namespace](basic-namespaces-and-names.html#namespace) part of Ditto managed IDs.  
@@ -53,7 +53,7 @@ to use the reverse-domain-notation for a package name with domains including das
 
 ### New features
 
-#### [Filter for twin life-cycle events](https://github.com/eclipse/ditto/issues/898)
+#### [Filter for twin life-cycle events](https://github.com/eclipse-ditto/ditto/issues/898)
 
 When applying [filtering for change notifications](basic-changenotifications.html#filtering), the existing RQL based
 filter was enhanced with the possibility to use [topic and resource placeholders](basic-rql.html#placeholders-as-query-properties)
@@ -64,17 +64,17 @@ Only emit events for Thing creation and deletion:
 and(in(topic:action,'created','deleted'),eq(resource:path,'/'))
 ```
 
-#### [Possibility to forward connection logs](https://github.com/eclipse/ditto/pull/1230)
+#### [Possibility to forward connection logs](https://github.com/eclipse-ditto/ditto/pull/1230)
 
 Configure [log publishing](connectivity-manage-connections.html#publishing-connection-logs)for your Ditto managed
 connections in order to get connection logs wherever you need them to analyze.
 
-#### [Add OAuth2 client credentials flow as an authentication mechanism for Ditto managed HTTP connections](https://github.com/eclipse/ditto/pull/1233)
+#### [Add OAuth2 client credentials flow as an authentication mechanism for Ditto managed HTTP connections](https://github.com/eclipse-ditto/ditto/pull/1233)
 
 Have a look at our [blog post](2021-11-03-oauth2.html) which shares an example of how to configure a Ditto managed
 HTTP connection to make use of OAuth2.0 authentication.
 
-#### [Enable loading additional extra JavaScript libraries for Rhino based JS mapping engine](https://github.com/eclipse/ditto/pull/1208)
+#### [Enable loading additional extra JavaScript libraries for Rhino based JS mapping engine](https://github.com/eclipse-ditto/ditto/pull/1208)
 
 The used [Rhino JS engine](https://github.com/mozilla/rhino) allows making use of "CommonJS" in order to load JS
 modules via `require('')` into the engine. This feature has now been exposed by Ditto, configuring the environment
@@ -87,7 +87,7 @@ additional JS modules into the container.
 
 Several bugs in Ditto 2.1.x were fixed for 2.2.0.  
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.2.0), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.2.0), including the fixed bugs.
 
 
 ## Migration notes
@@ -97,7 +97,7 @@ No migrations required updating from Ditto 2.1.x
 ## Ditto clients
 
 For a complete list of all merged client PRs, inspect the following milestones:
-* [merged pull requests for milestone 2.2.0](https://github.com/eclipse/ditto-clients/pulls?q=is:pr+milestone:2.2.0)
+* [merged pull requests for milestone 2.2.0](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is:pr+milestone:2.2.0)
 
 ### Ditto Java SDK
 
@@ -105,13 +105,13 @@ No mentionable changes/enhancements/bugfixes.
 
 ### Ditto JavaScript SDK
 
-See separate [Changelog](https://github.com/eclipse/ditto-clients/blob/master/javascript/CHANGELOG.md) of JS client.
+See separate [Changelog](https://github.com/eclipse-ditto/ditto-clients/blob/master/javascript/CHANGELOG.md) of JS client.
 
 
 ## Roadmap
 
 Looking forward, the current plans for Ditto 2.3.0 are:
 
-* [Add HTTP API for "live" commands](https://github.com/eclipse/ditto/issues/106)
-* [Smart channel strategy for live/twin read access](https://github.com/eclipse/ditto/issues/1228)
+* [Add HTTP API for "live" commands](https://github.com/eclipse-ditto/ditto/issues/106)
+* [Smart channel strategy for live/twin read access](https://github.com/eclipse-ditto/ditto/issues/1228)
 * More work on concept and first work on a WoT (Web of Things) integration
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_221.md b/documentation/src/main/resources/pages/ditto/release_notes_221.md
index 76b4d49992f..43d6f66eea6 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_221.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_221.md
@@ -16,20 +16,20 @@ Compared to the latest release [2.2.0](release_notes_220.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.2.1), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.2.1), including the fixed bugs.
 
-#### [Update logback to 1.2.8 due to "possibility of vulnerability"](https://github.com/eclipse/ditto/pull/1253)
+#### [Update logback to 1.2.8 due to "possibility of vulnerability"](https://github.com/eclipse-ditto/ditto/pull/1253)
 
 The reported [LOGBACK-1591](https://jira.qos.ch/browse/LOGBACK-1591) reports a "Possibility of vulnerability" with
 a medium severity.
 
-#### [Switch to ByteSerializer and ByteDeserializer for Kafka Consumer and Publisher](https://github.com/eclipse/ditto/pull/1241)
+#### [Switch to ByteSerializer and ByteDeserializer for Kafka Consumer and Publisher](https://github.com/eclipse-ditto/ditto/pull/1241)
 
 With Ditto 2.2.0, when consuming binary messages from Apache Kafka, the charset was not considered correctly and
 therefore binary payload (e.g. protobuf messages) were not consumed correctly.  
 That was fixed by using the binary deserializer.
 
-#### [Also disable hostname verification when HTTP connection wants to ignore SSL](https://github.com/eclipse/ditto/pull/1243)
+#### [Also disable hostname verification when HTTP connection wants to ignore SSL](https://github.com/eclipse-ditto/ditto/pull/1243)
 
 For [managed HTTP connections](connectivity-protocol-bindings-http.html) for which `validateCertificates` was disabled,
 single HTTP interactions when publishing messages were still using certificate validation.  
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_230.md b/documentation/src/main/resources/pages/ditto/release_notes_230.md
index 101879640da..15b91da08a4 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_230.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_230.md
@@ -7,7 +7,7 @@ summary: "Version 2.3.0 of Eclipse Ditto, released on 21.01.2022"
 permalink: release_notes_230.html
 ---
 
-Ditto **2.3.0** is API and [binary compatible](https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
+Ditto **2.3.0** is API and [binary compatible](https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
 to prior Eclipse Ditto 2.x versions.
 
 ## Changelog
@@ -49,7 +49,7 @@ The following non-functional work is also included:
 <br/>
 
 For a complete list of all merged PRs, inspect the following milestones:
-* [merged pull requests for milestone 2.3.0](https://github.com/eclipse/ditto/pulls?q=is:pr+milestone:2.3.0)
+* [merged pull requests for milestone 2.3.0](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:2.3.0)
 
 <br/>
 <br/>
@@ -60,7 +60,7 @@ bugfixes were added.
 
 ### New features
 
-#### [HTTP API for "live" commands](https://github.com/eclipse/ditto/issues/106)
+#### [HTTP API for "live" commands](https://github.com/eclipse-ditto/ditto/issues/106)
 
 Ditto's ["live" channel](protocol-twinlive.html#live) is now also available for commands invoked via HTTP API.  
 See also the [blogpost covering that topic](2021-12-20-http-live-channel.html).
@@ -72,7 +72,7 @@ Live commands bypass the twin and go directly to the devices.
 However, an existing twin is still required for policy enforcement.
 
 
-#### [Smart channel strategy for live/twin read access](https://github.com/eclipse/ditto/issues/1228)
+#### [Smart channel strategy for live/twin read access](https://github.com/eclipse-ditto/ditto/issues/1228)
 
 Ditto adds support for selecting the "twin" or the "live" channel for thing query commands based on an 
 [RQL condition](basic-rql.html) of a newly added parameter 
@@ -82,12 +82,12 @@ See also the [blogpost covering that topic](2021-12-22-live-channel-condition.ht
 In addition, a new [payload mapper](connectivity-mapping.html#updatetwinwithliveresponse-mapper) automatically updating 
 the twin based on received live data from devices was added.
 
-#### [Configurable allowing creation of entities based on namespace and authenticated subjects](https://github.com/eclipse/ditto/pull/1251)
+#### [Configurable allowing creation of entities based on namespace and authenticated subjects](https://github.com/eclipse-ditto/ditto/pull/1251)
 
 This added feature allows configuring restrictions, which [authenticated subjects](basic-auth.html#authenticated-subjects)
 may create new entities (things / policies) in which namespaces.
 
-#### [Allow using `*` as a placeholder for the feature id in selected fields](https://github.com/eclipse/ditto/pull/1277)
+#### [Allow using `*` as a placeholder for the feature id in selected fields](https://github.com/eclipse-ditto/ditto/pull/1277)
 
 When selecting for certain [`fields` of a thing](httpapi-concepts.html#field-selector-with-wildcard) or when using 
 [signal enrichment (extraFields)](basic-enrichment.html) in order to add more (unchanged) data from a twin to e.g. events 
@@ -98,7 +98,7 @@ the wildcard `*` can now be used in order to select all features of a thing with
 
 Several bugs in Ditto 2.2.x were fixed for 2.3.0.  
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.3.0), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.3.0), including the fixed bugs.
 
 
 ## Migration notes
@@ -108,7 +108,7 @@ No migrations required updating from Ditto 2.2.x
 ## Ditto clients
 
 For a complete list of all merged client PRs, inspect the following milestones:
-* [merged pull requests for milestone 2.3.0](https://github.com/eclipse/ditto-clients/pulls?q=is:pr+milestone:2.3.0)
+* [merged pull requests for milestone 2.3.0](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is:pr+milestone:2.3.0)
 
 ### Ditto Java SDK
 
@@ -116,7 +116,7 @@ No mentionable changes/enhancements/bugfixes.
 
 ### Ditto JavaScript SDK
 
-See separate [Changelog](https://github.com/eclipse/ditto-clients/blob/master/javascript/CHANGELOG.md) of JS client.
+See separate [Changelog](https://github.com/eclipse-ditto/ditto-clients/blob/master/javascript/CHANGELOG.md) of JS client.
 
 
 ## Roadmap
@@ -124,4 +124,4 @@ See separate [Changelog](https://github.com/eclipse/ditto-clients/blob/master/ja
 Looking forward, the current plans for Ditto 2.4.0 are:
 
 * Update service code to Java 17 (APIs stay at Java 8) + run Ditto containers with Java 17 runtime
-* Continue work on the started [WoT (Web of Things) integration](https://github.com/eclipse/ditto/pull/1270)
+* Continue work on the started [WoT (Web of Things) integration](https://github.com/eclipse-ditto/ditto/pull/1270)
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_231.md b/documentation/src/main/resources/pages/ditto/release_notes_231.md
index 55f2ec3af1a..8031aa26f6a 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_231.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_231.md
@@ -16,23 +16,23 @@ Compared to the latest release [2.3.0](release_notes_230.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.3.1), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.3.1), including the fixed bugs.
 
-#### [Fix that placeholder `time:now` could not be used in connection header mapping](https://github.com/eclipse/ditto/pull/1292)
+#### [Fix that placeholder `time:now` could not be used in connection header mapping](https://github.com/eclipse-ditto/ditto/pull/1292)
 
 The in version 2.3.0 newly added placeholder `time:now` could not be used in connectivity's header mapping, 
 this is now fixed.
 
-#### [Enable use of entity placeholders for MQTT and HTTP connections](https://github.com/eclipse/ditto/pull/1293)
+#### [Enable use of entity placeholders for MQTT and HTTP connections](https://github.com/eclipse-ditto/ditto/pull/1293)
 
 The `entity:id` placeholder could not be used in MQTT and HTTP connections, this is now fixed.
 
-#### [Reduce the likelihood of search index inconsistency due to reordering of patch updates](https://github.com/eclipse/ditto/pull/1296)
+#### [Reduce the likelihood of search index inconsistency due to reordering of patch updates](https://github.com/eclipse-ditto/ditto/pull/1296)
 
 This fix speeds up the consistency of search entries which could get inconsistent during rolling updates for very active 
 things. 
 
-#### [Fixed that JSON `null` in "correlation-id" of Ditto Protocol headers were parsed as JSON String "null"](https://github.com/eclipse/ditto/pull/1295)
+#### [Fixed that JSON `null` in "correlation-id" of Ditto Protocol headers were parsed as JSON String "null"](https://github.com/eclipse-ditto/ditto/pull/1295)
 
 When parsing messages as Ditto Protocol, a `"correlation-id"` header field being `null` was translated to the string 
 literal `"null"` - this has been fixed by treating the "correlation-id" as not being present instead.
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_232.md b/documentation/src/main/resources/pages/ditto/release_notes_232.md
index 2a5e48427e0..56105dac21f 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_232.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_232.md
@@ -16,23 +16,23 @@ Compared to the latest release [2.3.1](release_notes_231.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.3.2), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.3.2), including the fixed bugs.
 
-#### [Fix search consistency for failed patch updates](https://github.com/eclipse/ditto/pull/1300)
+#### [Fix search consistency for failed patch updates](https://github.com/eclipse-ditto/ditto/pull/1300)
 
 The search index could get never consistent for some things, as failed "patch updates" to the search index were not 
 retried.
 
-#### [Fix search sync infinite loop](https://github.com/eclipse/ditto/pull/1301)
+#### [Fix search sync infinite loop](https://github.com/eclipse-ditto/ditto/pull/1301)
 
 Forcing a full search index update could lead to an infinite loop when processing "Thing Deleted" events.
 
-#### [Ignore DittoMessageMapper for Hono delivery failed notifications](https://github.com/eclipse/ditto/pull/1299)
+#### [Ignore DittoMessageMapper for Hono delivery failed notifications](https://github.com/eclipse-ditto/ditto/pull/1299)
 
 Delivery failure notification sent via Eclipse Hono with content-type `application/vnd.eclipse-hono-delivery-failure-notification+json`
 are now excluded to be handled by the default `DittoMessageMapper` used in connections.
 
-#### [Fixed potential race condition in LiveSignalEnforcement](https://github.com/eclipse/ditto/pull/1305)
+#### [Fixed potential race condition in LiveSignalEnforcement](https://github.com/eclipse-ditto/ditto/pull/1305)
 
 For live response messages a race condition could happen where a 503 ("Thing not available") exception was produced
 instead of running in a 408 timeout.
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_240.md b/documentation/src/main/resources/pages/ditto/release_notes_240.md
index fd16ed09dce..81d52d3adc0 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_240.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_240.md
@@ -7,7 +7,7 @@ summary: "Version 2.4.0 of Eclipse Ditto, released on 14.04.2022"
 permalink: release_notes_240.html
 ---
 
-Ditto **2.4.0** is API and [binary compatible](https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
+Ditto **2.4.0** is API and [binary compatible](https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0005-semantic-versioning.md)
 to prior Eclipse Ditto 2.x versions.
 
 ## Changelog
@@ -40,8 +40,8 @@ The following non-functional work is also included:
 <br/>
 
 For a complete list of all merged PRs, inspect the following milestones:
-* [merged pull requests for milestone 2.4.0-M1](https://github.com/eclipse/ditto/pulls?q=is:pr+milestone:2.4.0-M1)
-* [merged pull requests for milestone 2.4.0](https://github.com/eclipse/ditto/pulls?q=is:pr+milestone:2.4.0)
+* [merged pull requests for milestone 2.4.0-M1](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:2.4.0-M1)
+* [merged pull requests for milestone 2.4.0](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:2.4.0)
 
 <br/>
 <br/>
@@ -52,7 +52,7 @@ bugfixes were added:
 
 ### Changes
 
-#### [Upgrade to Java 17 + change of Java runtime to Hotspot](https://github.com/eclipse/ditto/issues/1283)
+#### [Upgrade to Java 17 + change of Java runtime to Hotspot](https://github.com/eclipse-ditto/ditto/issues/1283)
 
 We upgraded the compiler target level for our service modules from 11 to 17 and also use a Java 17 runtime environment
 for our service containers. Please note that the Ditto model still remains compatible to Java 8.  
@@ -65,7 +65,7 @@ Docker images for the following architectures will be published to docker.io:
 * `linux/amd64`
 * `linux/arm64` (new)
 
-#### [Removal of rate limiting / throttling limits as default](https://github.com/eclipse/ditto/pull/1324)
+#### [Removal of rate limiting / throttling limits as default](https://github.com/eclipse-ditto/ditto/pull/1324)
 
 By default, Ditto had configurations in place to rate limit consumption of messages received via:
 * AMQP 1.0 connections
@@ -78,7 +78,7 @@ and can be enabled manually, as mentioned in the [configuration - rate limiting
 
 ### New features
 
-#### [W3C WoT (Web of Things) integration](https://github.com/eclipse/ditto/issues/1034)
+#### [W3C WoT (Web of Things) integration](https://github.com/eclipse-ditto/ditto/issues/1034)
 
 Ditto adds and optional (and currently *experimental*) integration of the 
 [Web of Things (WoT) Thing Description 1.1](https://www.w3.org/TR/wot-thing-description11/) specification.
@@ -90,13 +90,13 @@ skeleton upon creation of a thing.
 For more details, please have a look at the [blogpost](2022-03-03-wot-integration.html) and the 
 [WoT integration documentation](basic-wot-integration.html).
 
-#### [SSE (ServerSentEvent) API for subscribing to messages](https://github.com/eclipse/ditto/issues/1186)
+#### [SSE (ServerSentEvent) API for subscribing to messages](https://github.com/eclipse-ditto/ditto/issues/1186)
 
 Messages to or from a digital twin can now be subscribed to with the [SSE endpoint](httpapi-sse.html), either on 
 [Thing level](httpapi-sse.html#subscribe-for-messages-for-a-specific-thing) or for a specific 
 [Feature](httpapi-sse.html#subscribe-for-messages-of-a-specific-feature-of-a-specific-thing)
 
-#### [Recovery status for connections indicating when e.g. recovery is no longer tried after max backoff](https://github.com/eclipse/ditto/pull/1336)
+#### [Recovery status for connections indicating when e.g. recovery is no longer tried after max backoff](https://github.com/eclipse-ditto/ditto/pull/1336)
 
 The new recovery status contains one of the values:
 * ongoing
@@ -107,12 +107,12 @@ The new recovery status contains one of the values:
 and can be used to find out whether an automatic failover is still ongoing or if the max amount of configured reconnects 
 applying backoff was reached and that recovery is no longer happening.
 
-#### [Enhance placeholders to resolve to multiple values](https://github.com/eclipse/ditto/pull/1331)
+#### [Enhance placeholders to resolve to multiple values](https://github.com/eclipse-ditto/ditto/pull/1331)
 
 Placeholders may now resolve to multiple values instead of only a single one which enables e.g. applying 
 [placeholder functions](basic-placeholders.html#function-expressions) to each element of an array.
 
-#### [Advanced JWT placeholder operations](https://github.com/eclipse/ditto/pull/1309)
+#### [Advanced JWT placeholder operations](https://github.com/eclipse-ditto/ditto/pull/1309)
 
 Using the above feature of placeholders being resolved to multiple values, the JWT placeholder, which can be used
 in [scope of the OpenID connect configuration](basic-placeholders.html#scope-openid-connect-configuration), can now 
@@ -126,7 +126,7 @@ Example extracting only subjects from a JSON array "roles" contained in a JWT en
 {%raw%}{{ jwt:extra/roles | fn:filter('like','*moderator') }}{%endraw%}
 ```
 
-#### [Support for a wildcard/placeholder identifying the changed feature in order to enrich e.g. its definition](https://github.com/eclipse/ditto/issues/710)
+#### [Support for a wildcard/placeholder identifying the changed feature in order to enrich e.g. its definition](https://github.com/eclipse-ditto/ditto/issues/710)
 
 Using the above feature of placeholders being resolved to multiple values, it is now possible to use a placeholder 
 `{%raw%}{{ feature:id }}{%endraw%}` as part of an [enrichment `extraFields` pointer](basic-enrichment.html) resolving
@@ -143,8 +143,8 @@ published via websocket or a connection:
 
 Several bugs in Ditto 2.3.x were fixed for 2.4.0.
 This is a complete list of the
-[merged pull requests for 2.4.0-M1](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.4.0-M1) and 
-[merged pull requests for 2.4.0](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.4.0), 
+[merged pull requests for 2.4.0-M1](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.4.0-M1) and 
+[merged pull requests for 2.4.0](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.4.0), 
 including the fixed bugs.
 
 
@@ -160,11 +160,11 @@ Migrations required updating from Ditto 2.3.x or earlier versions:
 ## Ditto clients
 
 For a complete list of all merged client PRs, inspect the following milestones:
-* [merged pull requests for milestone 2.4.0-M1](https://github.com/eclipse/ditto-clients/pulls?q=is:pr+milestone:2.4.0-M1)
+* [merged pull requests for milestone 2.4.0-M1](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is:pr+milestone:2.4.0-M1)
 
 ### Ditto Java SDK
 
-#### [Fix returning the revision of a Policy when retrieved via the client](https://github.com/eclipse/ditto-clients/pull/182)
+#### [Fix returning the revision of a Policy when retrieved via the client](https://github.com/eclipse-ditto/ditto-clients/pull/182)
 
 When using the `client.policies().retrievePolicy(PolicyId)` functionality in the Ditto Java client, the `getRevision()`
 method of the returned policy was always empty.  
@@ -172,7 +172,7 @@ The revision will now be included.
 
 ### Ditto JavaScript SDK
 
-See separate [Changelog](https://github.com/eclipse/ditto-clients/blob/master/javascript/CHANGELOG.md) of JS client.
+See separate [Changelog](https://github.com/eclipse-ditto/ditto-clients/blob/master/javascript/CHANGELOG.md) of JS client.
 
 
 ## Roadmap
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_241.md b/documentation/src/main/resources/pages/ditto/release_notes_241.md
index 3d00c17865f..52439f04927 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_241.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_241.md
@@ -16,14 +16,14 @@ Compared to the latest release [2.4.0](release_notes_240.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.4.1), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.4.1), including the fixed bugs.
 
-#### [In case of ThingDeleteModel always consider model as not outdated](https://github.com/eclipse/ditto/pull/1368)
+#### [In case of ThingDeleteModel always consider model as not outdated](https://github.com/eclipse-ditto/ditto/pull/1368)
 
 The search index could run into consistency problem which this fix improves.  
 The final fix for having a fully consistent search index however will only be available in Ditto `3.0.0` where the 
 index was completely rebuilt.
 
-#### [Enable self signed certificates for kafka](https://github.com/eclipse/ditto/pull/1456)
+#### [Enable self signed certificates for kafka](https://github.com/eclipse-ditto/ditto/pull/1456)
 
 Fix that self-signed certificates for Kafka connections could not be used.
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_242.md b/documentation/src/main/resources/pages/ditto/release_notes_242.md
index d32a2343d42..a3112c3a125 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_242.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_242.md
@@ -16,8 +16,8 @@ Compared to the latest release [2.4.1](release_notes_241.html), the following bu
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse/ditto/pulls?q=is%3Apr+milestone%3A2.4.2), including the fixed bugs.
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A2.4.2), including the fixed bugs.
 
-#### [Skip hostname verification check with self signed in kafka](https://github.com/eclipse/ditto/pull/1475)
+#### [Skip hostname verification check with self signed in kafka](https://github.com/eclipse-ditto/ditto/pull/1475)
 
 Another required fix in order to connect to a Kafka with a self signed certificate.
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_300.md b/documentation/src/main/resources/pages/ditto/release_notes_300.md
index ce620028691..62daecf59aa 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_300.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_300.md
@@ -50,10 +50,10 @@ We want to especially highlight the following bugfixes also included:
 
 ### Changes
 
-#### [New Ditto "thing" search index](https://github.com/eclipse/ditto/issues/1374)
+#### [New Ditto "thing" search index](https://github.com/eclipse-ditto/ditto/issues/1374)
 
 Change reasoning documented in 
-[DADR-0008](https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0008-wildcard-search-index.md).
+[DADR-0008](https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0008-wildcard-search-index.md).
 
 The Ditto 2.x implementation of the search index uses the [attribute pattern](https://www.mongodb.com/blog/post/building-with-patterns-the-attribute-pattern) 
 for indexing data in MongoDB. 
@@ -74,10 +74,10 @@ query and update performance is improved and more stable than with the current a
 {% include note.html content="Be aware of the
   [migration note](#migration-building-up-new-search-index) before updating to Ditto 3.0." %}
 
-#### [Removal of former "ditto-concierge" service](https://github.com/eclipse/ditto/issues/1339)
+#### [Removal of former "ditto-concierge" service](https://github.com/eclipse-ditto/ditto/issues/1339)
 
 Change reasoning documented in
-[DADR-0007](https://github.com/eclipse/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0007-concierge-removal.md).
+[DADR-0007](https://github.com/eclipse-ditto/ditto/blob/master/documentation/src/main/resources/architecture/DADR-0007-concierge-removal.md).
 
 In order to reduce the complexity of message flows and the required networking "hops" in a Ditto cluster for a command
 to be authorized and applied, it was decided to eliminate the former "ditto-concierge" service.
@@ -101,7 +101,7 @@ Ditto 3.0 requires less resources and provide lower latency + higher throughput
 
 #### Clear declaration and configuration of Ditto "Extension points"
 
-As part of the ["ditto-concierge" service removal](https://github.com/eclipse/ditto/issues/1339) a new and common 
+As part of the ["ditto-concierge" service removal](https://github.com/eclipse-ditto/ditto/issues/1339) a new and common 
 mechanism for [extending Ditto](installation-extending.html) was introduced.  
 Examples of such extensions are:
 * adding additional, custom HTTP APIs to Ditto
@@ -111,7 +111,7 @@ Examples of such extensions are:
 Check out the [documentation on extending Ditto](installation-extending.html) and the existing extension points 
 (interfaces extending `DittoExtensionPoint`) to find out what can be extended and how to do it.
 
-#### [Rewrite of Ditto managed MQTT connection to use reactive client](https://github.com/eclipse/ditto/pull/1411)
+#### [Rewrite of Ditto managed MQTT connection to use reactive client](https://github.com/eclipse-ditto/ditto/pull/1411)
 
 Ditto's MQTT connection integration now consumes messages in a reactive manner. Together with throttling this effectively enables backpressure.  
 
@@ -119,10 +119,10 @@ Ditto's MQTT connection integration now consumes messages in a reactive manner.
 
 Improving Ditto's resilience is part of almost every release. Those improvements are included in 3.0:
 
-* [Allow turning the akka SBR on/off during runtime](https://github.com/eclipse/ditto/pull/1373)
-* [Implement graceful shutdown for http publisher actor](https://github.com/eclipse/ditto/pull/1381)
+* [Allow turning the akka SBR on/off during runtime](https://github.com/eclipse-ditto/ditto/pull/1373)
+* [Implement graceful shutdown for http publisher actor](https://github.com/eclipse-ditto/ditto/pull/1381)
 
-#### [DevOps commands response consistency](https://github.com/eclipse/ditto/pull/1380)
+#### [DevOps commands response consistency](https://github.com/eclipse-ditto/ditto/pull/1380)
 
 Devops commands error responses are fixed to have similar structure to non-error ones.  
 Responses to requests with `"aggregate": false` are stripped to remove service name and instance (or layers of `"?"`)
@@ -133,18 +133,18 @@ If devops commands were utilized, this will require a migration of the response
 {% include note.html content="Be aware of the
   [migration note](#migration-devops-commands-response-adjustments) before updating to Ditto 3.0." %}
 
-#### [Make Ditto pubsub update operations simpler and more consistent](https://github.com/eclipse/ditto/pull/1427)
+#### [Make Ditto pubsub update operations simpler and more consistent](https://github.com/eclipse-ditto/ditto/pull/1427)
 
 Simplify Ditto pubsub update operations to make sure that subscriptions are active before sending acknowledgements.
 
 
 ### New features
 
-#### [Ability to search in JSON arrays and also in feature definitions](https://github.com/eclipse/ditto/pull/1396)
+#### [Ability to search in JSON arrays and also in feature definitions](https://github.com/eclipse-ditto/ditto/pull/1396)
 
 [Searching in arrays](basic-search.html#search-queries-in-json-arrays) is now officially supported and enabled by default.
 
-This also enables [support to search by feature definition](https://github.com/eclipse/ditto/pull/1417).
+This also enables [support to search by feature definition](https://github.com/eclipse-ditto/ditto/pull/1417).
 
 You can use this e.g. in order to search for all things having a feature with a certain definition:
 ```
@@ -158,14 +158,14 @@ There were however still some open issues and bugs which lead to that the metada
 
 The following features, enhancements and fixes about [metadata](basic-metadata.html) are included in Ditto 3.0:
 
-* [Retrieve thing metadata when not retrieving complete thing](https://github.com/eclipse/ditto/issues/772)
-* [Metadata is not deleted when thing parts are deleted](https://github.com/eclipse/ditto/issues/829)
-* [Make is possible to delete metadata from a thing](https://github.com/eclipse/ditto/issues/779)
-* [Metadata cannot be set on sub-resources via HTTP](https://github.com/eclipse/ditto/issues/1146)
-* [Add initial-metadata support to thing creation](https://github.com/eclipse/ditto/issues/884)
-* [Search does not work for _metadata](https://github.com/eclipse/ditto/issues/1404)
+* [Retrieve thing metadata when not retrieving complete thing](https://github.com/eclipse-ditto/ditto/issues/772)
+* [Metadata is not deleted when thing parts are deleted](https://github.com/eclipse-ditto/ditto/issues/829)
+* [Make is possible to delete metadata from a thing](https://github.com/eclipse-ditto/ditto/issues/779)
+* [Metadata cannot be set on sub-resources via HTTP](https://github.com/eclipse-ditto/ditto/issues/1146)
+* [Add initial-metadata support to thing creation](https://github.com/eclipse-ditto/ditto/issues/884)
+* [Search does not work for _metadata](https://github.com/eclipse-ditto/ditto/issues/1404)
 
-#### [New HTTP API for CRUD of connections](https://github.com/eclipse/ditto/issues/1406)
+#### [New HTTP API for CRUD of connections](https://github.com/eclipse-ditto/ditto/issues/1406)
 
 With Ditto 2.x, connection management in Ditto could only be done via 
 [piggyback devops commands](installation-operating.html#piggyback-commands).
@@ -182,17 +182,17 @@ The latest live version of the UI can be found here:
 You can use it in order to e.g. connect to your Ditto installation to manage things, policies and even connections.
 
 Contributions:
-* [Eclipse Ditto explorer UI](https://github.com/eclipse/ditto/pull/1397)
-* [Ditto explorer UI: Improvements from review](https://github.com/eclipse/ditto/pull/1405)
-* [Explorer UI - Add initial support for connections](https://github.com/eclipse/ditto/pull/1414)
-* [added mechanism to build "ditto-ui" Docker image](https://github.com/eclipse/ditto/pull/1415)
-* [Explorer UI - review improvements for connections](https://github.com/eclipse/ditto/pull/1418)
-* [Explorer UI: add local_ditto_ide and ditto_sanbdox environments](https://github.com/eclipse/ditto/pull/1422)
-* [Explorer UI - add support for policies](https://github.com/eclipse/ditto/pull/1430)
-* [Explorer UI - Fix: Avoid storing credentials](https://github.com/eclipse/ditto/pull/1464)
-* [Explorer UI - Improve message to feature and some WoT support](https://github.com/eclipse/ditto/pull/1455)
-
-#### [Support for EC signed JsonWebKeys (JWKs)](https://github.com/eclipse/ditto/pull/1432)
+* [Eclipse Ditto explorer UI](https://github.com/eclipse-ditto/ditto/pull/1397)
+* [Ditto explorer UI: Improvements from review](https://github.com/eclipse-ditto/ditto/pull/1405)
+* [Explorer UI - Add initial support for connections](https://github.com/eclipse-ditto/ditto/pull/1414)
+* [added mechanism to build "ditto-ui" Docker image](https://github.com/eclipse-ditto/ditto/pull/1415)
+* [Explorer UI - review improvements for connections](https://github.com/eclipse-ditto/ditto/pull/1418)
+* [Explorer UI: add local_ditto_ide and ditto_sanbdox environments](https://github.com/eclipse-ditto/ditto/pull/1422)
+* [Explorer UI - add support for policies](https://github.com/eclipse-ditto/ditto/pull/1430)
+* [Explorer UI - Fix: Avoid storing credentials](https://github.com/eclipse-ditto/ditto/pull/1464)
+* [Explorer UI - Improve message to feature and some WoT support](https://github.com/eclipse-ditto/ditto/pull/1455)
+
+#### [Support for EC signed JsonWebKeys (JWKs)](https://github.com/eclipse-ditto/ditto/pull/1432)
 
 In Ditto 2.x the deserialization of an Elliptic Curve Json Web Token (JWT) failed, because Ditto assumed it to be an 
 RSA token and missed the modulus and exponent information.  
@@ -204,32 +204,32 @@ With the [W3C Web of Things "Thing Description 1.1" standard](https://www.w3.org
 its final phases before official recommendation by the W3C, we think it is time to enable the [WoT Integration](basic-wot-integration.html)
 in Ditto by default and suggest it as the "default" type system for Ditto.
 
-Together with some minor adjustments to the [Ditto WoT model](https://github.com/eclipse/ditto/tree/master/wot/model) to
+Together with some minor adjustments to the [Ditto WoT model](https://github.com/eclipse-ditto/ditto/tree/master/wot/model) to
 the final changes to the 1.1 version of WoT TD, the following improvements also made it into Ditto 3.0:
 
-* [Added WoT context extension ontologies in different formats](https://github.com/eclipse/ditto/pull/1442)
-* [Apply WoT Ditto extension in skeleton and TD generation](https://github.com/eclipse/ditto/pull/1460)
+* [Added WoT context extension ontologies in different formats](https://github.com/eclipse-ditto/ditto/pull/1442)
+* [Apply WoT Ditto extension in skeleton and TD generation](https://github.com/eclipse-ditto/ditto/pull/1460)
 
 By using the Ditto WoT Extension Ontology located at 
 [https://ditto.eclipseprojects.io/wot/ditto-extension](https://ditto.eclipseprojects.io/wot/ditto-extension), it is possible
 to define an additional `"category"` for WoT properties. That can for example be used to ease the migration from Vorto 
 models, e.g. by defining a `"ditto:category": "configuration"` inside a WoT ThingModel.
 
-#### [Make "default namespace" for creating new entities configurable](https://github.com/eclipse/ditto/pull/1372)
+#### [Make "default namespace" for creating new entities configurable](https://github.com/eclipse-ditto/ditto/pull/1372)
 
 When e.g. creating new entities (things/policies) via `HTTP POST`, previously an empty namespace was used to create them in.  
-This namespace can now be [configured](https://github.com/eclipse/ditto/blob/master/edge/service/src/main/resources/ditto-edge-service.conf#L12-L13)
+This namespace can now be [configured](https://github.com/eclipse-ditto/ditto/blob/master/edge/service/src/main/resources/ditto-edge-service.conf#L12-L13)
 via the environment variable `DITTO_DEFAULT_NAMESPACE` set to the "edge" services (ditto-gateway and ditto-connectivity).
 
-#### [Provide custom namespace when creating things via HTTP POST](https://github.com/eclipse/ditto/issues/550)
+#### [Provide custom namespace when creating things via HTTP POST](https://github.com/eclipse-ditto/ditto/issues/550)
 
 Provides the option to provide a custom namespace to create a new thing in when using `HTTP POST`.
 
-#### [Make it possible to provide multiple OIDC issuer urls for a single configured openid-connect "prefix"](https://github.com/eclipse/ditto/pull/1465)
+#### [Make it possible to provide multiple OIDC issuer urls for a single configured openid-connect "prefix"](https://github.com/eclipse-ditto/ditto/pull/1465)
 
 Configure multiple `issuer` endpoints for the same configured [openid-connect-provider](installation-operating.html#openid-connect).
 
-#### [Addition of a "CloudEvents" mapper for mapping CE payloads in Ditto connections](https://github.com/eclipse/ditto/pull/1437)
+#### [Addition of a "CloudEvents" mapper for mapping CE payloads in Ditto connections](https://github.com/eclipse-ditto/ditto/pull/1437)
 
 Adds a [CloudEvents](connectivity-mapping.html#cloudevents-mapper) in order to e.g. consume CloudEvents via Apache Kafka
 or MQTT and additionally to also publish CEs as well via all supported connectivity types.
@@ -239,9 +239,9 @@ or MQTT and additionally to also publish CEs as well via all supported connectiv
 
 Several bugs in Ditto 2.4.x were fixed for 3.0.0.  
 This is a complete list of the
-* [merged pull requests for milestone 3.0.0](https://github.com/eclipse/ditto/pulls?q=is:pr+milestone:3.0.0)
+* [merged pull requests for milestone 3.0.0](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:3.0.0)
 
-Here as well for the Ditto Java Client: [merged pull requests for milestone 3.0.0](https://github.com/eclipse/ditto-clients/pulls?q=is:pr+milestone:3.0.0)
+Here as well for the Ditto Java Client: [merged pull requests for milestone 3.0.0](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is:pr+milestone:3.0.0)
 
 #### Passwords stored in the URI of connections to no longer need to be double encoded
 
@@ -249,29 +249,29 @@ Previously for some passwords containing special characters like e.g. a `+` the
 before storing it to the [Connection](basic-connections.html) `URI`.
 
 This has been fixed by the PR:
-* [Remove double decoding credentials of Connection URI passwords](https://github.com/eclipse/ditto/pull/1471)
+* [Remove double decoding credentials of Connection URI passwords](https://github.com/eclipse-ditto/ditto/pull/1471)
 
 Also fixing the reported issue:
-* [Basic auth in (mqtt) connection requires you to encode the username and password twice](https://github.com/eclipse/ditto/issues/1199)
+* [Basic auth in (mqtt) connection requires you to encode the username and password twice](https://github.com/eclipse-ditto/ditto/issues/1199)
 
 {% include note.html content="Be aware of the
   [migration note](#migration-connection-uri-password-encoding) before updating to Ditto 3.0." %}
 
-#### [When merging a feature, the normalized payload does not contain full feature](https://github.com/eclipse/ditto/issues/1446)
+#### [When merging a feature, the normalized payload does not contain full feature](https://github.com/eclipse-ditto/ditto/issues/1446)
 
 When using the [Normalized mapper](connectivity-mapping.html#normalized-mapper) in Ditto connections together with
 [extra field enrichment](basic-enrichment.html), the outcome "merged" thing JSON structure could miss some information
 from the enriched "extra" data.  
 This has been fixed.
 
-#### [Fix that adding custom Java MessageMappers to Ditto via classpath is no longer possible](https://github.com/eclipse/ditto/issues/1463)
+#### [Fix that adding custom Java MessageMappers to Ditto via classpath is no longer possible](https://github.com/eclipse-ditto/ditto/issues/1463)
 
 Writing own, Java based, `MessageMappers` and adding them to the classpath 
 [as documented](connectivity-mapping.html#custom-java-based-implementation) did no longer work.  
 This has been fixed and the documentation for doing exactly that has been updated.
 
 In addition, an example of how to provide a custom Protobuf payload mapper has been provided via 
-[custom-ditto-java-payload-mapper](https://github.com/eclipse/ditto-examples/tree/master/custom-ditto-java-payload-mapper).
+[custom-ditto-java-payload-mapper](https://github.com/eclipse-ditto/ditto-examples/tree/master/custom-ditto-java-payload-mapper).
 
 
 ## Migration notes
@@ -380,7 +380,7 @@ When [Restricting entity creation](installation-operating.html#restricting-entit
 the configuration for Ditto 3.0 has to be adjusted.
 
 As the configuration was part of the former "ditto-concierge" service (which was removed from Ditto 3.0), the configuration
-is now located in [ditto-entity-creation.conf](https://github.com/eclipse/ditto/blob/master/internal/utils/config/src/main/resources/ditto-entity-creation.conf).
+is now located in [ditto-entity-creation.conf](https://github.com/eclipse-ditto/ditto/blob/master/internal/utils/config/src/main/resources/ditto-entity-creation.conf).
 
 So the configuration keys changed 
 * from: `ditto.concierge.enforcement.entity-creation`
@@ -391,7 +391,7 @@ done for the "ditto-concierge" service.
 
 ### Migration: DevOps commands response adjustments
 
-In [#1380](https://github.com/eclipse/ditto/pull/1380) the response of DevOps commands was consolidated to have a simpler
+In [#1380](https://github.com/eclipse-ditto/ditto/pull/1380) the response of DevOps commands was consolidated to have a simpler
 response format.  
 If DevOps command responses were used in prior Ditto versions, please adjust according to the 
 [new response formats](installation-operating.html#devops-commands).
@@ -415,8 +415,8 @@ double encoding **must be migrated** to use single encoding instead.
 
 Looking forward, the current plans for Ditto 3.1.0 are:
 
-* [Support AMQP Message Annotations when extracting values for Headers](https://github.com/eclipse/ditto/issues/1390)
-* [Policy imports](https://github.com/eclipse/ditto/issues/298) which will allow re-use of policies by importing existing ones
+* [Support AMQP Message Annotations when extracting values for Headers](https://github.com/eclipse-ditto/ditto/issues/1390)
+* [Policy imports](https://github.com/eclipse-ditto/ditto/issues/298) which will allow re-use of policies by importing existing ones
 * Perform a benchmark of Ditto 3.0 and provide a "tuning" chapter in the documentation as a reference to the commonly 
   asked questions 
   * how many Things Ditto can manage 
diff --git a/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html b/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
index 3879ba04d1b..8bdf308e188 100644
--- a/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
+++ b/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
@@ -594,7 +594,7 @@ <h3>thanks for attending</h3>
     <a href="https://www.bosch-si.com" target="_blank">Bosch Software Innovations GmbH</a> All rights reserved. |
     <a href="https://www.bosch.com/terms-of-use/terms-of-use/provider/" target="_blank">Imprint</a> |
     <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-    <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+    <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html b/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
index aa2a389f315..8832e8b1e28 100644
--- a/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
+++ b/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
@@ -614,7 +614,7 @@ <h2>examples for orchestrations</h2>
             <section id="demo" class="new-chapter" data-background="../bg-images/background-demo-small.jpg" data-state="chapter-background">
                 <h1>Demo time!</h1>
                 <br/>
-                <h3><a href="https://github.com/eclipse/ditto-examples/tree/master/octopus-via-hono">GitHub sources</a></h3>
+                <h3><a href="https://github.com/eclipse-ditto/ditto-examples/tree/master/octopus-via-hono">GitHub sources</a></h3>
             </section>
         </section>
 
@@ -683,7 +683,7 @@ <h1>Q & A</h1>
     <a href="https://www.bosch-si.com" target="_blank">Bosch Software Innovations GmbH</a> All rights reserved. |
     <a href="https://www.bosch.com/terms-of-use/terms-of-use/provider/" target="_blank">Imprint</a> |
     <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-    <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+    <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2018_10_22-eclipse-iot-wg-f2f-ludwigsburg/index.html b/documentation/src/main/resources/slides/2018_10_22-eclipse-iot-wg-f2f-ludwigsburg/index.html
index 3711b9dc217..b9cd0e98936 100644
--- a/documentation/src/main/resources/slides/2018_10_22-eclipse-iot-wg-f2f-ludwigsburg/index.html
+++ b/documentation/src/main/resources/slides/2018_10_22-eclipse-iot-wg-f2f-ludwigsburg/index.html
@@ -248,7 +248,7 @@ <h2>Stats</h2>
           </tr>
           <tr>
             <td>Questions via GitHub</td>
-            <td><a href="https://github.com/eclipse/ditto/issues?utf8=✓&q=is%3Aissue+label%3Aquestion+">15</a>
+            <td><a href="https://github.com/eclipse-ditto/ditto/issues?utf8=✓&q=is%3Aissue+label%3Aquestion+">15</a>
               (increasing interest)
             </td>
           </tr>
@@ -287,7 +287,7 @@ <h2>Collaboration</h2>
           <li class="fragment">Eclipse Hono: &#10004;<br/>(telemetry/events/command&control)</li>
           <li class="fragment" style="margin-top: 0.5em;">Eclipse Mosquitto: &#10004;<br/>(connection to MQTT 3.1.1 brokers)</li>
           <li class="fragment" style="margin-top: 0.5em;">Eclipse Vorto:<br/>on our agenda to integrate in order to
-            validate structure of digital twins: <a href="https://github.com/eclipse/ditto/issues/107">#107</a>, <a href="https://github.com/eclipse/ditto/issues/247">#247</a></li>
+            validate structure of digital twins: <a href="https://github.com/eclipse-ditto/ditto/issues/107">#107</a>, <a href="https://github.com/eclipse-ditto/ditto/issues/247">#247</a></li>
         </ul>
       </section>
     </section>
@@ -300,7 +300,7 @@ <h2>Collaboration</h2>
   <a href="https://www.bosch-si.com" target="_blank">Bosch Software Innovations GmbH</a> All rights reserved. |
   <a href="https://www.bosch.com/terms-of-use/terms-of-use/provider/" target="_blank">Imprint</a> |
   <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-  <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+  <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
   <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2019_10_21-eclipse-iot-wg-f2f-ludwigsburg/index.html b/documentation/src/main/resources/slides/2019_10_21-eclipse-iot-wg-f2f-ludwigsburg/index.html
index 33709e6a956..9c31b557605 100644
--- a/documentation/src/main/resources/slides/2019_10_21-eclipse-iot-wg-f2f-ludwigsburg/index.html
+++ b/documentation/src/main/resources/slides/2019_10_21-eclipse-iot-wg-f2f-ludwigsburg/index.html
@@ -307,7 +307,7 @@ <h2>Challenges</h2>
   <a href="https://www.bosch-si.com" target="_blank">Bosch Software Innovations GmbH</a> All rights reserved. |
   <a href="https://www.bosch.com/terms-of-use/terms-of-use/provider/" target="_blank">Imprint</a> |
   <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-  <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+  <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
   <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html b/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
index fee2fe1c3eb..95fb0ced1a3 100644
--- a/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
+++ b/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
@@ -589,7 +589,7 @@ <h3>thanks to The Things Network for organising this virtual conference</h3>
               <p>Links:</p>
               <ul>
                 <li><a target="_blank" href="https://www.eclipse.org/ditto">Ditto website and documentation</a></li>
-                <li><a target="_blank" href="https://github.com/eclipse/ditto">GitHub</a> - please give us a star ;)</li>
+                <li><a target="_blank" href="https://github.com/eclipse-ditto/ditto">GitHub</a> - please give us a star ;)</li>
                 <li><a target="_blank" href="https://gitter.im/eclipse/ditto">Chatroom to ask more questions</a></li>
                 <li><a target="_blank" href="https://developer.bosch-iot-suite.com/service/things/">Commercial offering incl. free plan</a></li>
               </ul>
@@ -603,7 +603,7 @@ <h3>thanks to The Things Network for organising this virtual conference</h3>
     Copyright ©2020
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
     <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-    <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+    <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2020_07_28-iot-wg-status-update/index.html b/documentation/src/main/resources/slides/2020_07_28-iot-wg-status-update/index.html
index 4d62558df58..ed3bfe740d8 100644
--- a/documentation/src/main/resources/slides/2020_07_28-iot-wg-status-update/index.html
+++ b/documentation/src/main/resources/slides/2020_07_28-iot-wg-status-update/index.html
@@ -313,7 +313,7 @@ <h2>Roadmap</h2>
     Copyright ©2020
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
     <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-    <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+    <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2020_10_19-eclipse-iot-wg-community-day/index.html b/documentation/src/main/resources/slides/2020_10_19-eclipse-iot-wg-community-day/index.html
index 7c9fb9178cb..f9f92594b70 100644
--- a/documentation/src/main/resources/slides/2020_10_19-eclipse-iot-wg-community-day/index.html
+++ b/documentation/src/main/resources/slides/2020_10_19-eclipse-iot-wg-community-day/index.html
@@ -311,7 +311,7 @@ <h2>Achievements</h2>
           </ul>
         </li>
         <li class="fragment" style="font-size: 0.9em; margin-top: 0.5em;">
-          Initial contribution of a <a href="https://github.com/eclipse/ditto-clients-golang/">Ditto Golang client</a>
+          Initial contribution of a <a href="https://github.com/eclipse-ditto/ditto-clients-golang/">Ditto Golang client</a>
         </li>
       </ul>
       <h4 style="text-align: left; margin-top: 1em;" class="fragment">LoRaWAN Virtual Conference:
@@ -337,7 +337,7 @@ <h2>Obstacles</h2>
     <section id="status-5" style="clear: both;">
       <h2>Roadmap</h2>
       <ul>
-        <li style="font-size: 0.9em; margin-top: 0.5em;"><a href="https://github.com/eclipse/ditto/milestone/26">1.4.0
+        <li style="font-size: 0.9em; margin-top: 0.5em;"><a href="https://github.com/eclipse-ditto/ditto/milestone/26">1.4.0
           (12/2020)</a>:
           <ul>
             <li class="fragment">enhance twin by "desired" properties</li>
@@ -362,7 +362,7 @@ <h2>Roadmap</h2>
   Copyright ©2020
   <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
   <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-  <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+  <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
   <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2021_05_ditto-introduction-deck/index.html b/documentation/src/main/resources/slides/2021_05_ditto-introduction-deck/index.html
index 6b7f4030493..eb064691626 100644
--- a/documentation/src/main/resources/slides/2021_05_ditto-introduction-deck/index.html
+++ b/documentation/src/main/resources/slides/2021_05_ditto-introduction-deck/index.html
@@ -579,7 +579,7 @@ <h1>Wrap up</h1>
               <p>Links:</p>
               <ul>
                 <li><a target="_blank" href="https://www.eclipse.org/ditto">Ditto website and documentation</a></li>
-                <li><a target="_blank" href="https://github.com/eclipse/ditto">GitHub</a> - please give us a star ;)</li>
+                <li><a target="_blank" href="https://github.com/eclipse-ditto/ditto">GitHub</a> - please give us a star ;)</li>
                 <li><a target="_blank" href="https://gitter.im/eclipse/ditto">Chatroom to ask more questions</a></li>
                 <li><a target="_blank" href="https://developer.bosch-iot-suite.com/service/things/">Commercial offering incl. free plan</a></li>
               </ul>
@@ -593,7 +593,7 @@ <h1>Wrap up</h1>
     Copyright ©2021
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
     <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-    <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+    <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2021_06_ditto-20-overview/index.html b/documentation/src/main/resources/slides/2021_06_ditto-20-overview/index.html
index ec926345d90..3d16be605f8 100644
--- a/documentation/src/main/resources/slides/2021_06_ditto-20-overview/index.html
+++ b/documentation/src/main/resources/slides/2021_06_ditto-20-overview/index.html
@@ -287,7 +287,7 @@ <h3>Looking ahead</h3>
               <p>Links:</p>
               <ul>
                 <li><a target="_blank" href="https://www.eclipse.org/ditto">Ditto website and documentation</a></li>
-                <li><a target="_blank" href="https://github.com/eclipse/ditto">GitHub</a> - please give us a star ;)</li>
+                <li><a target="_blank" href="https://github.com/eclipse-ditto/ditto">GitHub</a> - please give us a star ;)</li>
                 <li><a target="_blank" href="https://gitter.im/eclipse/ditto">Chatroom to ask more questions</a></li>
                 <li><a target="_blank" href="https://developer.bosch-iot-suite.com/service/things/">Commercial offering incl. free plan</a></li>
               </ul>
@@ -301,7 +301,7 @@ <h3>Looking ahead</h3>
     Copyright ©2021
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
     <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-    <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+    <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2021_06_ditto-in-20-min/index.html b/documentation/src/main/resources/slides/2021_06_ditto-in-20-min/index.html
index c43230282e1..08fca90e49f 100644
--- a/documentation/src/main/resources/slides/2021_06_ditto-in-20-min/index.html
+++ b/documentation/src/main/resources/slides/2021_06_ditto-in-20-min/index.html
@@ -414,7 +414,7 @@ <h1>Wrap up</h1>
               <p>Links:</p>
               <ul>
                 <li><a target="_blank" href="https://www.eclipse.org/ditto">Ditto website and documentation</a></li>
-                <li><a target="_blank" href="https://github.com/eclipse/ditto">GitHub</a> - please give us a star ;)</li>
+                <li><a target="_blank" href="https://github.com/eclipse-ditto/ditto">GitHub</a> - please give us a star ;)</li>
                 <li><a target="_blank" href="https://gitter.im/eclipse/ditto">Chatroom to ask more questions</a></li>
                 <li><a target="_blank" href="https://developer.bosch-iot-suite.com/service/things/">Commercial offering incl. free plan</a></li>
               </ul>
@@ -428,7 +428,7 @@ <h1>Wrap up</h1>
     Copyright ©2021
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
     <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-    <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+    <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2021_10_25-eclipse-iot-wg-community-day/index.html b/documentation/src/main/resources/slides/2021_10_25-eclipse-iot-wg-community-day/index.html
index 0a03b651211..d17d5882b5e 100644
--- a/documentation/src/main/resources/slides/2021_10_25-eclipse-iot-wg-community-day/index.html
+++ b/documentation/src/main/resources/slides/2021_10_25-eclipse-iot-wg-community-day/index.html
@@ -287,13 +287,13 @@ <h2>Current topics</h2>
         <li style="font-size: 0.9em; margin-top: 0.5em;">
           W3C WoT (Web of Things) integration:
           <ul>
-            <li>Ongoing <a href="https://github.com/eclipse/ditto/discussions/1163">discussion</a> about how integration could look like</li>
+            <li>Ongoing <a href="https://github.com/eclipse-ditto/ditto/discussions/1163">discussion</a> about how integration could look like</li>
             <li>in close exchange with W3C, e.g. we
               <a href="https://github.com/w3c/wot-thing-description/issues/1177">suggested a WoT Thing Model enhancement</a></li>
           </ul>
         </li>
         <li class="fragment" style="font-size: 0.9em; margin-top: 0.5em;">
-          Initial contribution of a <a href="https://github.com/eclipse/ditto-clients-python/">Ditto Python client</a>
+          Initial contribution of a <a href="https://github.com/eclipse-ditto/ditto-clients-python/">Ditto Python client</a>
         </li>
       </ul>
     </section>
@@ -302,7 +302,7 @@ <h2>Current topics</h2>
     <section id="status-5" style="clear: both;">
       <h2>Roadmap</h2>
       <ul>
-        <li style="font-size: 0.9em; margin-top: 0.5em;"><a href="https://github.com/eclipse/ditto/milestone/38">2.2.0</a> (late 2021):
+        <li style="font-size: 0.9em; margin-top: 0.5em;"><a href="https://github.com/eclipse-ditto/ditto/milestone/38">2.2.0</a> (late 2021):
           <ul>
             <li class="fragment">filter for lifecycle events (e.g. twin created/deleted)</li>
             <li class="fragment">HTTP API for “live” commands</li>
@@ -325,7 +325,7 @@ <h2>Roadmap</h2>
   Copyright ©2021
   <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
   <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-  <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+  <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
   <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2022_10_24_eclipse-iot-wg-community-day/index.html b/documentation/src/main/resources/slides/2022_10_24_eclipse-iot-wg-community-day/index.html
index afc7f8cb0a4..feeb3218875 100644
--- a/documentation/src/main/resources/slides/2022_10_24_eclipse-iot-wg-community-day/index.html
+++ b/documentation/src/main/resources/slides/2022_10_24_eclipse-iot-wg-community-day/index.html
@@ -322,7 +322,7 @@ <h2>Current topics</h2>
       <section id="status-6" style="clear: both;">
         <h2>Roadmap</h2>
         <ul>
-          <li style="font-size: 0.9em; margin-top: 0.5em;"><a href="https://github.com/eclipse/ditto/milestone/53">3.1.0</a> (late 2022):
+          <li style="font-size: 0.9em; margin-top: 0.5em;"><a href="https://github.com/eclipse-ditto/ditto/milestone/53">3.1.0</a> (late 2022):
             <ul>
               <li class="fragment">Policy Imports</li>
               <li class="fragment">Conditional message sending</li>
@@ -349,7 +349,7 @@ <h2>Roadmap</h2>
     Copyright ©2022
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
     <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-    <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+    <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2022_10_ditto-and-wot/index.html b/documentation/src/main/resources/slides/2022_10_ditto-and-wot/index.html
index 383c5b307aa..b77e23bf34a 100644
--- a/documentation/src/main/resources/slides/2022_10_ditto-and-wot/index.html
+++ b/documentation/src/main/resources/slides/2022_10_ditto-and-wot/index.html
@@ -523,7 +523,7 @@ <h2>Links</h2>
               <ul>
                 <li><a target="_blank" href="https://www.eclipse.org/ditto/2022-03-03-wot-integration.html">Ditto Blogpost about WoT integration</a></li>
                 <li><a target="_blank" href="https://www.eclipse.org/ditto/basic-wot-integration.html">Ditto docs about WoT integration</a></li>
-                <li><a target="_blank" href="https://github.com/eclipse/ditto">GitHub</a> - please give us a star ;)</li>
+                <li><a target="_blank" href="https://github.com/eclipse-ditto/ditto">GitHub</a> - please give us a star ;)</li>
                 <li><a target="_blank" href="https://gitter.im/eclipse/ditto">Chatroom to ask more questions</a></li>
               </ul>
             </section>
@@ -536,7 +536,7 @@ <h2>Links</h2>
     Copyright ©2022
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
     <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-    <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+    <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html b/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html
index 825e4784080..115339d5c21 100644
--- a/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html
+++ b/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html
@@ -497,7 +497,7 @@ <h2>Links</h2>
               <ul>
                 <li><a target="_blank" href="https://www.eclipse.org/ditto/2022-03-03-wot-integration.html">Ditto Blogpost about WoT integration</a></li>
                 <li><a target="_blank" href="https://www.eclipse.org/ditto/basic-wot-integration.html">Ditto docs about WoT integration</a></li>
-                <li><a target="_blank" href="https://github.com/eclipse/ditto">GitHub</a> - please give us a star ;)</li>
+                <li><a target="_blank" href="https://github.com/eclipse-ditto/ditto">GitHub</a> - please give us a star ;)</li>
                 <li><a target="_blank" href="https://gitter.im/eclipse/ditto">Chatroom to ask more questions</a></li>
               </ul>
             </section>
@@ -510,7 +510,7 @@ <h2>Links</h2>
     Copyright ©2023
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
     <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
-    <a href="https://github.com/eclipse/ditto" target="_blank">GitHub</a> |
+    <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
 
diff --git a/legal/NOTICE.md b/legal/NOTICE.md
index 64523368e2d..c5b2026dc69 100644
--- a/legal/NOTICE.md
+++ b/legal/NOTICE.md
@@ -24,7 +24,7 @@ SPDX-License-Identifier: EPL-2.0
 
 # Source Code
 
-* https://github.com/eclipse/ditto
+* https://github.com/eclipse-ditto/ditto
 
 # Third-party Content
 
diff --git a/pom.xml b/pom.xml
index b8c9190c220..f5998d5a886 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>https://github.com/eclipse/ditto/issues</url>
+        <url>https://github.com/eclipse-ditto/ditto/issues</url>
     </issueManagement>
 
     <prerequisites>

From 63efb2b7d5ca6d8de1a7ced7cc4fccd7655b92fe Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Mon, 30 Jan 2023 09:16:54 +0100
Subject: [PATCH 030/173] added streaming protocol usage example to history
 documentation

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .run/ConnectivityService.run.xml              | 22 +----
 .run/Ditto.run.xml                            | 12 ---
 .run/GatewayService.run.xml                   | 18 ----
 .run/PoliciesService.run.xml                  | 23 +----
 .run/SearchService.run.xml                    | 18 ----
 .run/ThingsService.run.xml                    | 21 +----
 .../resources/pages/ditto/basic-history.md    | 89 +++++++++++++++++--
 7 files changed, 91 insertions(+), 112 deletions(-)

diff --git a/.run/ConnectivityService.run.xml b/.run/ConnectivityService.run.xml
index fd0fa2ff98d..19697e5c888 100644
--- a/.run/ConnectivityService.run.xml
+++ b/.run/ConnectivityService.run.xml
@@ -1,31 +1,15 @@
-<!--
-  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
-  ~
-  ~ See the NOTICE file(s) distributed with this work for additional
-  ~ information regarding copyright ownership.
-  ~
-  ~ This program and the accompanying materials are made available under the
-  ~ terms of the Eclipse Public License 2.0 which is available at
-  ~ http://www.eclipse.org/legal/epl-2.0
-  ~
-  ~ SPDX-License-Identifier: EPL-2.0
-  -->
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ConnectivityService" type="Application" factoryName="Application" folderName="Ditto" nameIsGenerated="true">
     <envs>
       <env name="LOG_LEVEL_APPLICATION" value="INFO" />
+      <env name="CLEANUP_HISTORY_RETENTION_DURATION" value="6d" />
+      <env name="CONNECTION_EVENT_HISTORICAL_HEADERS_TO_PERSIST.0" value="ditto-originator" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.eclipse.ditto.connectivity.service.ConnectivityService" />
     <module name="ditto-connectivity-service" />
     <option name="VM_PARAMETERS" value="-Xms512m -Xmx512m --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/sun.security.util=ALL-UNNAMED" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.eclipse.ditto.services.connectivity.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.run/Ditto.run.xml b/.run/Ditto.run.xml
index ac5bcbb86b2..6aacf9255db 100644
--- a/.run/Ditto.run.xml
+++ b/.run/Ditto.run.xml
@@ -1,15 +1,3 @@
-<!--
-  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
-  ~
-  ~ See the NOTICE file(s) distributed with this work for additional
-  ~ information regarding copyright ownership.
-  ~
-  ~ This program and the accompanying materials are made available under the
-  ~ terms of the Eclipse Public License 2.0 which is available at
-  ~ http://www.eclipse.org/legal/epl-2.0
-  ~
-  ~ SPDX-License-Identifier: EPL-2.0
-  -->
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Ditto" type="CompoundRunConfigurationType">
     <toRun name="PoliciesService" type="Application" />
diff --git a/.run/GatewayService.run.xml b/.run/GatewayService.run.xml
index 7884b94f5bc..de83356697b 100644
--- a/.run/GatewayService.run.xml
+++ b/.run/GatewayService.run.xml
@@ -1,15 +1,3 @@
-<!--
-  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
-  ~
-  ~ See the NOTICE file(s) distributed with this work for additional
-  ~ information regarding copyright ownership.
-  ~
-  ~ This program and the accompanying materials are made available under the
-  ~ terms of the Eclipse Public License 2.0 which is available at
-  ~ http://www.eclipse.org/legal/epl-2.0
-  ~
-  ~ SPDX-License-Identifier: EPL-2.0
-  -->
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="GatewayService" type="Application" factoryName="Application" folderName="Ditto">
     <envs>
@@ -18,12 +6,6 @@
     <option name="MAIN_CLASS_NAME" value="org.eclipse.ditto.gateway.service.starter.GatewayService" />
     <module name="ditto-gateway-service" />
     <option name="VM_PARAMETERS" value="-Xms512m -Xmx512m -Dcom.sun.management.jmxremote.port=9301 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.eclipse.ditto.services.gateway.starter.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/PoliciesService.run.xml b/.run/PoliciesService.run.xml
index b4789fa5f43..f966193eb35 100644
--- a/.run/PoliciesService.run.xml
+++ b/.run/PoliciesService.run.xml
@@ -1,31 +1,16 @@
-<!--
-  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
-  ~
-  ~ See the NOTICE file(s) distributed with this work for additional
-  ~ information regarding copyright ownership.
-  ~
-  ~ This program and the accompanying materials are made available under the
-  ~ terms of the Eclipse Public License 2.0 which is available at
-  ~ http://www.eclipse.org/legal/epl-2.0
-  ~
-  ~ SPDX-License-Identifier: EPL-2.0
-  -->
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="PoliciesService" type="Application" factoryName="Application" folderName="Ditto" nameIsGenerated="true">
     <envs>
       <env name="LOG_LEVEL_APPLICATION" value="INFO" />
+      <env name="CLEANUP_HISTORY_RETENTION_DURATION" value="5d" />
+      <env name="POLICY_EVENT_HISTORICAL_HEADERS_TO_PERSIST.0" value="ditto-originator" />
+      <env name="POLICY_EVENT_HISTORICAL_HEADERS_TO_PERSIST.1" value="correlation-id" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.eclipse.ditto.policies.service.starter.PoliciesService" />
     <module name="ditto-policies-service" />
     <option name="VM_PARAMETERS" value="-Xms512m -Xmx512m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.eclipse.ditto.services.policies.starter.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/.run/SearchService.run.xml b/.run/SearchService.run.xml
index 98ee0fb7b41..25444065eaa 100644
--- a/.run/SearchService.run.xml
+++ b/.run/SearchService.run.xml
@@ -1,15 +1,3 @@
-<!--
-  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
-  ~
-  ~ See the NOTICE file(s) distributed with this work for additional
-  ~ information regarding copyright ownership.
-  ~
-  ~ This program and the accompanying materials are made available under the
-  ~ terms of the Eclipse Public License 2.0 which is available at
-  ~ http://www.eclipse.org/legal/epl-2.0
-  ~
-  ~ SPDX-License-Identifier: EPL-2.0
-  -->
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="SearchService" type="Application" factoryName="Application" folderName="Ditto" nameIsGenerated="true">
     <envs>
@@ -23,12 +11,6 @@
     <option name="MAIN_CLASS_NAME" value="org.eclipse.ditto.thingsearch.service.starter.SearchService" />
     <module name="ditto-thingsearch-service" />
     <option name="VM_PARAMETERS" value="-Xms512m -Xmx512m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.eclipse.ditto.services.thingsearch.starter.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/ThingsService.run.xml b/.run/ThingsService.run.xml
index 3a9dafa3e4b..5716c61ad0a 100644
--- a/.run/ThingsService.run.xml
+++ b/.run/ThingsService.run.xml
@@ -1,31 +1,14 @@
-<!--
-  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
-  ~
-  ~ See the NOTICE file(s) distributed with this work for additional
-  ~ information regarding copyright ownership.
-  ~
-  ~ This program and the accompanying materials are made available under the
-  ~ terms of the Eclipse Public License 2.0 which is available at
-  ~ http://www.eclipse.org/legal/epl-2.0
-  ~
-  ~ SPDX-License-Identifier: EPL-2.0
-  -->
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ThingsService" type="Application" factoryName="Application" folderName="Ditto" nameIsGenerated="true">
     <envs>
       <env name="LOG_LEVEL_APPLICATION" value="INFO" />
+      <env name="CLEANUP_HISTORY_RETENTION_DURATION" value="24h" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.eclipse.ditto.things.service.starter.ThingsService" />
     <module name="ditto-things-service" />
     <option name="VM_PARAMETERS" value="-Xms512m -Xmx512m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.eclipse.ditto.services.things.starter.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/documentation/src/main/resources/pages/ditto/basic-history.md b/documentation/src/main/resources/pages/ditto/basic-history.md
index 89c9cec0e9b..fdf9c908c7c 100644
--- a/documentation/src/main/resources/pages/ditto/basic-history.md
+++ b/documentation/src/main/resources/pages/ditto/basic-history.md
@@ -12,11 +12,11 @@ Starting with **Eclipse Ditto 3.2.0**, APIs for retrieving the history of the fo
 
 The capabilities of these APIs are the following:
 
-| Entity     | Retrieving entity at a specific revision or timestamp | Streaming modification events of an entity specifying from/to revision/timestamp |
-|------------|-------------------------------------------------------|----------------------------------------------------------------------------------|
-| Thing      | ✓                                                     | ✓                                                                                |
-| Policy     | ✓                                                     | ✓                                                                                |
-| Connection | ✓                                                     | no                                                                               |
+| Entity     | [Retrieving entity at a specific revision or timestamp](#retrieving-entity-from-history) | [Streaming modification events of an entity specifying from/to revision/timestamp](#streaming-historical-events-of-entity) |
+|------------|------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------|
+| Thing      | ✓                                                                                        | ✓                                                                                                                          |
+| Policy     | ✓                                                                                        | ✓                                                                                                                          |
+| Connection | ✓                                                                                        | no                                                                                                                         |
 
 {% include note.html content="Ditto's history API capabilities are not comparable with the features of a time series database.
     E.g. no aggregations on or compactions of the historical data can be done." %}
@@ -53,7 +53,7 @@ curl -u ditto:ditto 'http://localhost:8080/api/2/policies/org.eclipse.ditto:poli
   --header 'at-historical-revision: 1'
   
 # Access a connection:
-curl -u ditto:ditto 'http://localhost:8080/api/2/connections/some-connection-1' \
+curl -u devops:foobar 'http://localhost:8080/api/2/connections/some-connection-1' \
   --header 'at-historical-revision: 1'
 ```
 
@@ -78,7 +78,7 @@ curl -u ditto:ditto 'http://localhost:8080/api/2/policies/org.eclipse.ditto:poli
   --header 'at-historical-timestamp: 2022-10-24T06:11:15Z'
   
 # Access a connection:
-curl -u ditto:ditto 'http://localhost:8080/api/2/connections/some-connection-1' \
+curl -u devops:foobar 'http://localhost:8080/api/2/connections/some-connection-1' \
   --header 'at-historical-timestamp: 2022-10-24T07:11Z'
 ```
 
@@ -144,6 +144,81 @@ Please inspect the [protocol specification of DittoProtocol messages for streami
 to find out how to stream historical (persisted) events via DittoProtocol.  
 Using the DittoProtocol, historical events can be streamed either via WebSocket or connections.
 
+Example protocol interaction for retrieving the persisted events of a thing:
+
+**First:** Subscribe for the persisted events of a thing
+```json
+{
+  "topic": "org.eclipse.ditto/thing-2/things/twin/streaming/subscribeForPersistedEvents",
+  "path": "/",
+  "headers": {},
+  "value": {
+    "fromHistoricalRevision": 1,
+    "toHistoricalRevision": 10
+  }
+}
+```
+
+Alternatively to `fromHistoricalRevision` and `toHistoricalRevision`, also a timestamp based range may be used:
+`fromHistoricalTimestamp` and `toHistoricalTimestamp`.  
+The "to" can be omitted in order to receive all events up to the current revision or timestamp.
+
+As a result, the following `created` event is received as response:
+```json
+{
+  "topic": "org.eclipse.ditto/thing-2/things/twin/streaming/created",
+  "path": "/",
+  "headers": {},
+  "value": {
+    "subscriptionId": "0"
+  }
+}
+```
+
+**Second:** Once the streaming subscription is confirmed to be created, request demand (of how many events to get streamed), 
+referencing the `subscriptionId`:
+```json
+{
+  "topic": "org.eclipse.ditto/thing-2/things/twin/streaming/request",
+  "path": "/",
+  "headers": {},
+  "value": {
+    "subscriptionId": "0",
+    "demand": 25
+  }
+}
+```
+
+The backend will start sending the requested persisted events as `next` messages: 
+```json
+{
+  "topic": "org.eclipse.ditto/thing-2/things/twin/streaming/next",
+  "path": "/",
+  "headers": {},
+  "value": {
+    "subscriptionId": "0",
+    "item": {
+      
+    }
+  }
+}
+```
+
+It will do so either until all existing events were sent, in that case a `complete` event is sent:
+```json
+{
+  "topic": "org.eclipse.ditto/thing-2/things/twin/streaming/complete",
+  "path": "/",
+  "headers": {},
+  "value": {
+    "subscriptionId": "0"
+  }
+}
+```
+
+Or it will stop after the `demand` was fulfilled, waiting for the requester to claim more demand with a new `request` 
+message.
+
 
 ## Configuring historical headers to persist
 

From 889b14b404f89d3bd79e36a006c00a8177ea98f4 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Tue, 7 Feb 2023 14:48:30 +0100
Subject: [PATCH 031/173] increased defaults for configured
 history-retention-duration

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 connectivity/service/src/main/resources/connectivity.conf       | 2 +-
 .../src/main/resources/pages/ditto/installation-operating.md    | 2 +-
 policies/service/src/main/resources/policies.conf               | 2 +-
 things/service/src/main/resources/things.conf                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/connectivity/service/src/main/resources/connectivity.conf b/connectivity/service/src/main/resources/connectivity.conf
index 353972cdc5f..e2bc8a317a1 100644
--- a/connectivity/service/src/main/resources/connectivity.conf
+++ b/connectivity/service/src/main/resources/connectivity.conf
@@ -701,7 +701,7 @@ ditto {
         # allowed to remove them in scope of cleanup.
         # If this e.g. is set to 30d - then effectively an event history of 30 days would be available via the read
         # journal.
-        history-retention-duration = 0d
+        history-retention-duration = 30d
         history-retention-duration = ${?CLEANUP_HISTORY_RETENTION_DURATION}
 
         # quiet-period defines how long to stay in a state where the background cleanup is not yet started
diff --git a/documentation/src/main/resources/pages/ditto/installation-operating.md b/documentation/src/main/resources/pages/ditto/installation-operating.md
index ef0605abb5b..fb992b7ce28 100644
--- a/documentation/src/main/resources/pages/ditto/installation-operating.md
+++ b/documentation/src/main/resources/pages/ditto/installation-operating.md
@@ -812,7 +812,7 @@ cleanup {
   # allowed to remove them in scope of cleanup.
   # If this e.g. is set to 30d - then effectively an event history of 30 days would be available via the read
   # journal.
-  history-retention-duration = 0d
+  history-retention-duration = 3d
   history-retention-duration = ${?CLEANUP_HISTORY_RETENTION_DURATION}
 
   # quiet-period defines how long to stay in a state where the background cleanup is not yet started
diff --git a/policies/service/src/main/resources/policies.conf b/policies/service/src/main/resources/policies.conf
index 0f1a79e8065..ea441dfee6d 100755
--- a/policies/service/src/main/resources/policies.conf
+++ b/policies/service/src/main/resources/policies.conf
@@ -121,7 +121,7 @@ ditto {
         # allowed to remove them in scope of cleanup.
         # If this e.g. is set to 30d - then effectively an event history of 30 days would be available via the read
         # journal.
-        history-retention-duration = 0d
+        history-retention-duration = 30d
         history-retention-duration = ${?CLEANUP_HISTORY_RETENTION_DURATION}
 
         # quiet-period defines how long to stay in a state where the background cleanup is not yet started
diff --git a/things/service/src/main/resources/things.conf b/things/service/src/main/resources/things.conf
index 0e3e3237e74..0b3d818f8ca 100755
--- a/things/service/src/main/resources/things.conf
+++ b/things/service/src/main/resources/things.conf
@@ -86,7 +86,7 @@ ditto {
         # allowed to remove them in scope of cleanup.
         # If this e.g. is set to 30d - then effectively an event history of 30 days would be available via the read
         # journal.
-        history-retention-duration = 0d
+        history-retention-duration = 3d
         history-retention-duration = ${?CLEANUP_HISTORY_RETENTION_DURATION}
 
         # quiet-period defines how long to stay in a state where the background cleanup is not yet started

From d53f630bf5e1b1bd92fee26dab8deb6bc6ded3b7 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Tue, 7 Feb 2023 16:53:01 +0100
Subject: [PATCH 032/173] provide release notes for Ditto bugfix release 3.1.2

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../pages/ditto/release_notes_311.md          |  4 +--
 .../pages/ditto/release_notes_312.md          | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 documentation/src/main/resources/pages/ditto/release_notes_312.md

diff --git a/documentation/src/main/resources/pages/ditto/release_notes_311.md b/documentation/src/main/resources/pages/ditto/release_notes_311.md
index 83d3759a627..22bb47f3861 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_311.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_311.md
@@ -7,11 +7,11 @@ summary: "Version 3.1.1 of Eclipse Ditto, released on 05.01.2023"
 permalink: release_notes_311.html
 ---
 
-This is a bugfix release, no new features since [3.0.0](release_notes_300.html) were added.
+This is a bugfix release, no new features since [3.1.0](release_notes_310.html) were added.
 
 ## Changelog
 
-Compared to the latest release [3.0.0](release_notes_300.html), the following bugfixes were added.
+Compared to the latest release [3.1.0](release_notes_310.html), the following bugfixes were added.
 
 ### Bugfixes
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_312.md b/documentation/src/main/resources/pages/ditto/release_notes_312.md
new file mode 100644
index 00000000000..831404f639e
--- /dev/null
+++ b/documentation/src/main/resources/pages/ditto/release_notes_312.md
@@ -0,0 +1,31 @@
+---
+title: Release notes 3.1.2
+tags: [release_notes]
+published: true
+keywords: release notes, announcements, changelog
+summary: "Version 3.1.2 of Eclipse Ditto, released on 08.02.2023"
+permalink: release_notes_312.html
+---
+
+This is a bugfix release, no new features since [3.1.1](release_notes_311.html) were added.
+
+## Changelog
+
+Compared to the latest release [3.1.1](release_notes_311.html), the following bugfixes were added.
+
+### Bugfixes
+
+This is a complete list of the
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A3.1.2).
+
+#### [Outgoing mqtt connections fail to publish messages when tracing is enabled](https://github.com/eclipse-ditto/ditto/issues/1563)
+
+When [tracing](installation-operating.html#tracing) was enabled for a Ditto installation, outbound MQTT messages could
+not be published due to an exception caused by an empty user property.  
+This was fixed.
+
+#### [Fixed that a missing (deleted) referenced policy of a policy import caused logging ERRORs](https://github.com/eclipse-ditto/ditto/pull/1571)
+
+When a policy referenced in a [policy import](basic-policy.html#policy-imports) was deleted, this caused logging `ERROR`s
+in the [search](architecture-services-things-search.html) service.  
+This was fixed.

From a00dd2e91a5c73cfe58a8b731f51ae0dde758e98 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Wed, 8 Feb 2023 09:28:43 +0100
Subject: [PATCH 033/173] updated sidebar to inlcude release 3.1.2

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../src/main/resources/_data/sidebars/ditto_sidebar.yml        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
index e114dd11074..689dadad93b 100644
--- a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
+++ b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
@@ -23,6 +23,9 @@ entries:
       - title: Release Notes
         output: web
         folderitems:
+          - title: 3.1.2
+            url: /release_notes_312.html
+            output: web
           - title: 3.1.1
             url: /release_notes_311.html
             output: web

From cc8125ba73b1dd4bd3bf560832cc04cb882da37d Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Wed, 8 Feb 2023 11:11:24 +0100
Subject: [PATCH 034/173] updated default ditto.protocol.blocklist to exclude
 headers "accept-encoding" and "x-forwarded-scheme"

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 internal/utils/config/src/main/resources/ditto-protocol.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/internal/utils/config/src/main/resources/ditto-protocol.conf b/internal/utils/config/src/main/resources/ditto-protocol.conf
index 75fc78f98d8..a7714e1dd4b 100644
--- a/internal/utils/config/src/main/resources/ditto-protocol.conf
+++ b/internal/utils/config/src/main/resources/ditto-protocol.conf
@@ -5,5 +5,7 @@ ditto.protocol {
     "cache-control",
     "connection",
     "timeout-access",
+    "accept-encoding",
+    "x-forwarded-scheme",
   ]
 }

From d4f3c7cf454a47285bec6e72e8d04900a3830553 Mon Sep 17 00:00:00 2001
From: Andrey Balarev <andrey.balarev@bosch.com>
Date: Thu, 9 Feb 2023 14:41:15 +0200
Subject: [PATCH 035/173] Hono connection address suffix added - hono tenant id

Signed-off-by: Andrey Balarev <andrey.balarev@bosch.com>
---
 .../hono/DefaultHonoConnectionFactory.java    | 15 ++++++++--
 .../DefaultHonoConnectionFactoryTest.java     | 28 ++++++++++---------
 .../ConnectionPersistenceActorTest.java       | 21 ++++++++++----
 .../hono-connection-custom-expected.json      | 14 +++++-----
 .../connectivity-protocol-bindings-hono.md    | 20 ++++++++-----
 5 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/hono/DefaultHonoConnectionFactory.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/hono/DefaultHonoConnectionFactory.java
index 18c806b30fc..99043999f82 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/hono/DefaultHonoConnectionFactory.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/hono/DefaultHonoConnectionFactory.java
@@ -16,6 +16,8 @@
 import java.text.MessageFormat;
 import java.util.Set;
 
+import org.eclipse.ditto.connectivity.model.Connection;
+import org.eclipse.ditto.connectivity.model.ConnectionId;
 import org.eclipse.ditto.connectivity.model.HonoAddressAlias;
 import org.eclipse.ditto.connectivity.model.UserPasswordCredentials;
 import org.eclipse.ditto.connectivity.service.config.DefaultHonoConfig;
@@ -33,6 +35,8 @@ public final class DefaultHonoConnectionFactory extends HonoConnectionFactory {
 
     private final HonoConfig honoConfig;
 
+    private ConnectionId connectionId;
+
     /**
      * Constructs a {@code DefaultHonoConnectionFactory} for the specified arguments.
      *
@@ -44,6 +48,11 @@ public DefaultHonoConnectionFactory(final ActorSystem actorSystem, final Config
         honoConfig = new DefaultHonoConfig(actorSystem);
     }
 
+    @Override
+    protected void preConversion(final Connection honoConnection) {
+        connectionId = honoConnection.getId();
+    }
+
     @Override
     public URI getBaseUri() {
         return honoConfig.getBaseUri();
@@ -76,12 +85,14 @@ protected UserPasswordCredentials getCredentials() {
 
     @Override
     protected String resolveSourceAddress(final HonoAddressAlias honoAddressAlias) {
-        return MessageFormat.format("hono.{0}", honoAddressAlias.getAliasValue());
+        return MessageFormat.format("hono.{0}.{1}",
+                honoAddressAlias.getAliasValue(), connectionId);
     }
 
     @Override
     protected String resolveTargetAddress(final HonoAddressAlias honoAddressAlias) {
-        return MessageFormat.format("hono.{0}/'{{thing:id}}'", honoAddressAlias.getAliasValue());
+        return MessageFormat.format("hono.{0}.{1}/'{{thing:id}}'",
+                honoAddressAlias.getAliasValue(), connectionId);
     }
 
 }
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/hono/DefaultHonoConnectionFactoryTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/hono/DefaultHonoConnectionFactoryTest.java
index 86a6bd2443e..d2b7344b440 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/hono/DefaultHonoConnectionFactoryTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/hono/DefaultHonoConnectionFactoryTest.java
@@ -30,6 +30,7 @@
 
 import org.assertj.core.api.Assertions;
 import org.eclipse.ditto.connectivity.model.Connection;
+import org.eclipse.ditto.connectivity.model.ConnectionId;
 import org.eclipse.ditto.connectivity.model.ConnectivityModelFactory;
 import org.eclipse.ditto.connectivity.model.HonoAddressAlias;
 import org.eclipse.ditto.connectivity.model.ReplyTarget;
@@ -120,6 +121,7 @@ private Connection getExpectedHonoConnection(final Connection originalConnection
                 "correlation-id", "{{ header:correlation-id }}",
                 "subject", "{{ header:subject | fn:default(topic:action-subject) }}"
         );
+        final var connectionId = originalConnection.getId();
         return ConnectivityModelFactory.newConnectionBuilder(originalConnection)
                 .uri(honoConfig.getBaseUri().toString().replaceFirst("(\\S+://)(\\S+)",
                         "$1" + URLEncoder.encode(honoConfig.getUserPasswordCredentials().getUsername(), StandardCharsets.UTF_8)
@@ -133,22 +135,22 @@ private Connection getExpectedHonoConnection(final Connection originalConnection
                 )
                 .setSources(List.of(
                         ConnectivityModelFactory.newSourceBuilder(sourcesByAddress.get(TELEMETRY.getAliasValue()))
-                                .addresses(Set.of(getExpectedResolvedSourceAddress(TELEMETRY)))
+                                .addresses(Set.of(getExpectedResolvedSourceAddress(TELEMETRY, connectionId)))
                                 .replyTarget(ReplyTarget.newBuilder()
-                                        .address(getExpectedResolvedCommandTargetAddress())
+                                        .address(getExpectedResolvedCommandTargetAddress(connectionId))
                                         .headerMapping(commandReplyTargetHeaderMapping)
                                         .build())
                                 .build(),
                         ConnectivityModelFactory.newSourceBuilder(sourcesByAddress.get(EVENT.getAliasValue()))
-                                .addresses(Set.of(getExpectedResolvedSourceAddress(EVENT)))
+                                .addresses(Set.of(getExpectedResolvedSourceAddress(EVENT, connectionId)))
                                 .replyTarget(ReplyTarget.newBuilder()
-                                        .address(getExpectedResolvedCommandTargetAddress())
+                                        .address(getExpectedResolvedCommandTargetAddress(connectionId))
                                         .headerMapping(commandReplyTargetHeaderMapping)
                                         .build())
                                 .build(),
                         ConnectivityModelFactory.newSourceBuilder(
                                         sourcesByAddress.get(COMMAND_RESPONSE.getAliasValue()))
-                                .addresses(Set.of(getExpectedResolvedSourceAddress(COMMAND_RESPONSE)))
+                                .addresses(Set.of(getExpectedResolvedSourceAddress(COMMAND_RESPONSE, connectionId)))
                                 .headerMapping(ConnectivityModelFactory.newHeaderMapping(Map.of(
                                         "correlation-id", "{{ header:correlation-id }}",
                                         "status", "{{ header:status }}"
@@ -157,8 +159,8 @@ private Connection getExpectedHonoConnection(final Connection originalConnection
                 ))
                 .setTargets(List.of(
                         ConnectivityModelFactory.newTargetBuilder(targets.get(0))
-                                .address(getExpectedResolvedCommandTargetAddress())
-                                .originalAddress(getExpectedResolvedCommandTargetAddress())
+                                .address(getExpectedResolvedCommandTargetAddress(connectionId))
+                                .originalAddress(getExpectedResolvedCommandTargetAddress(connectionId))
                                 .headerMapping(ConnectivityModelFactory.newHeaderMapping(
                                         Stream.concat(
                                                 basicAdditionalTargetHeaderMappingEntries.entrySet().stream(),
@@ -168,8 +170,8 @@ private Connection getExpectedHonoConnection(final Connection originalConnection
                                 ))
                                 .build(),
                         ConnectivityModelFactory.newTargetBuilder(targets.get(1))
-                                .address(getExpectedResolvedCommandTargetAddress())
-                                .originalAddress(getExpectedResolvedCommandTargetAddress())
+                                .address(getExpectedResolvedCommandTargetAddress(connectionId))
+                                .originalAddress(getExpectedResolvedCommandTargetAddress(connectionId))
                                 .headerMapping(ConnectivityModelFactory.newHeaderMapping(
                                         basicAdditionalTargetHeaderMappingEntries
                                 ))
@@ -184,12 +186,12 @@ private static Map<String, Source> getSourcesByAddress(final Iterable<Source> so
         return result;
     }
 
-    private static String getExpectedResolvedSourceAddress(final HonoAddressAlias honoAddressAlias) {
-        return "hono." + honoAddressAlias.getAliasValue();
+    private static String getExpectedResolvedSourceAddress(final HonoAddressAlias honoAddressAlias, final ConnectionId connectionId) {
+        return "hono." + honoAddressAlias.getAliasValue() + "." + connectionId;
     }
 
-    private static String getExpectedResolvedCommandTargetAddress() {
-        return "hono." + HonoAddressAlias.COMMAND.getAliasValue() + "/{{thing:id}}";
+    private static String getExpectedResolvedCommandTargetAddress(final ConnectionId connectionId) {
+        return "hono." + HonoAddressAlias.COMMAND.getAliasValue() + "." + connectionId + "/{{thing:id}}";
     }
 
 }
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
index 31d1320b877..29e65232d02 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
@@ -27,6 +27,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import javax.annotation.Nullable;
+
 import org.assertj.core.api.Assertions;
 import org.awaitility.Awaitility;
 import org.eclipse.ditto.base.api.persistence.cleanup.CleanupPersistence;
@@ -88,6 +90,7 @@
 import org.eclipse.ditto.internal.utils.test.Retry;
 import org.eclipse.ditto.internal.utils.tracing.DittoTracingInitResource;
 import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.thingsearch.model.signals.commands.subscription.CreateSubscription;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -213,11 +216,11 @@ public void testConnection() {
     @Test
     public void testConnectionTypeHono() throws IOException {
         //GIVEN
-        final var honoConnection = generateConnectionObjectFromJsonFile("hono-connection-custom-test.json")
+        final var honoConnection = generateConnectionObjectFromJsonFile("hono-connection-custom-test.json", null)
                 .toBuilder()
                 .id(connectionId)
                 .build();
-        final var expectedHonoConnection = generateConnectionObjectFromJsonFile("hono-connection-custom-expected.json")
+        final var expectedHonoConnection = generateConnectionObjectFromJsonFile("hono-connection-custom-expected.json", connectionId)
                 .toBuilder()
                 .id(connectionId)
                 .build();
@@ -243,7 +246,7 @@ public void testConnectionTypeHono() throws IOException {
     @Test
     public void testRestartByConnectionType() throws IOException {
         // GIVEN
-        final var honoConnection = generateConnectionObjectFromJsonFile("hono-connection-custom-test.json");
+        final var honoConnection = generateConnectionObjectFromJsonFile("hono-connection-custom-test.json", null);
         mockClientActorProbe.setAutoPilot(new TestActor.AutoPilot() {
             @Override
             public TestActor.AutoPilot run(final ActorRef sender, final Object msg) {
@@ -283,13 +286,19 @@ public TestActor.AutoPilot run(final ActorRef sender, final Object msg) {
         });
     }
 
-    private static Connection generateConnectionObjectFromJsonFile(final String fileName) throws IOException {
+    private static Connection generateConnectionObjectFromJsonFile(final String fileName,
+            @Nullable ConnectionId connectionId) throws IOException {
         final var testClassLoader = DefaultHonoConnectionFactoryTest.class.getClassLoader();
         try (final var connectionJsonFileStreamReader = new InputStreamReader(
                 testClassLoader.getResourceAsStream(fileName)
         )) {
-            return ConnectivityModelFactory.connectionFromJson(
-                    JsonFactory.readFrom(connectionJsonFileStreamReader).asObject());
+            JsonObject jsonObject = JsonFactory.readFrom(connectionJsonFileStreamReader).asObject();
+            var connId = jsonObject.getValue("id");
+            if (connectionId != null && connId.isPresent()) {
+                var jsonString = jsonObject.formatAsString().replace(connId.get().asString(), connectionId);
+                jsonObject = JsonFactory.readFrom(jsonString).asObject();
+            }
+            return ConnectivityModelFactory.connectionFromJson(jsonObject);
         }
     }
 
diff --git a/connectivity/service/src/test/resources/hono-connection-custom-expected.json b/connectivity/service/src/test/resources/hono-connection-custom-expected.json
index 649861792bb..6ccab3c12a8 100644
--- a/connectivity/service/src/test/resources/hono-connection-custom-expected.json
+++ b/connectivity/service/src/test/resources/hono-connection-custom-expected.json
@@ -7,7 +7,7 @@
   "sources": [
     {
       "addresses": [
-        "hono.telemetry"
+        "hono.telemetry.test-connection-id"
       ],
       "consumerCount": 1,
       "qos": 0,
@@ -32,7 +32,7 @@
         "implicitStandaloneThingCreation"
       ],
       "replyTarget": {
-        "address": "hono.command/{{thing:id}}",
+        "address": "hono.command.test-connection-id/{{thing:id}}",
         "headerMapping": {
           "device_id": "custom_value1",
           "user_key1": "user_value1",
@@ -48,7 +48,7 @@
     },
     {
       "addresses": [
-        "hono.event"
+        "hono.event.test-connection-id"
       ],
       "consumerCount": 1,
       "qos": 1,
@@ -72,7 +72,7 @@
         "implicitStandaloneThingCreation"
       ],
       "replyTarget": {
-        "address": "hono.command/{{thing:id}}",
+        "address": "hono.command.test-connection-id/{{thing:id}}",
         "headerMapping": {
           "device_id": "{{ thing:id }}",
           "subject": "custom_value2",
@@ -88,7 +88,7 @@
     },
     {
       "addresses": [
-        "hono.command_response"
+        "hono.command_response.test-connection-id"
       ],
       "consumerCount": 1,
       "qos": 0,
@@ -120,7 +120,7 @@
   ],
   "targets": [
     {
-      "address": "hono.command/{{thing:id}}",
+      "address": "hono.command.test-connection-id/{{thing:id}}",
       "topics": [
         "_/_/things/live/messages",
         "_/_/things/live/commands"
@@ -137,7 +137,7 @@
       }
     },
     {
-      "address": "hono.command/{{thing:id}}",
+      "address": "hono.command.test-connection-id/{{thing:id}}",
       "topics": [
         "_/_/things/twin/events",
         "_/_/things/live/events"
diff --git a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-hono.md b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-hono.md
index c6fd325131b..940d6a8c0be 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-hono.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-hono.md
@@ -8,13 +8,16 @@ permalink: connectivity-protocol-bindings-hono.html
 Consume messages from Eclipse Hono through Apache Kafka brokers and send messages to 
 Eclipse Hono the same manner as [Kafka connection](connectivity-protocol-bindings-kafka2.html) does.
 
-This connection type is created just for convenience - to avoid the need the user to be aware of the specific 
+This connection type is implemented just for convenience - to avoid the need the user to be aware of the specific 
 header mappings, address formats and Kafka specificConfig, which are required to connect to Eclipse Hono. 
 These specifics are applied automatically at runtime for the connections of type Hono.
 
 Hono connection is based on Kafka connection and uses it behind the scenes, so most of the 
 [Kafka connection documentation](connectivity-protocol-bindings-kafka2.html) is valid for Hono connection too, 
-but with the following specifics (exceptions): 
+but with some exceptions, described bellow.
+
+#### Important note
+During the creation of hono connection, the connection ID must be provided to be the same as `Hono-tenantId`. This is needed to match the Kafka topics (aka connection addresses) to the topics on which Hono will send and listen to. See bellow sections [Source addresses](#source-addresses), [Source reply target](#source-reply-target) and [Target Address](#target-address)
 
 ## Specific Hono connection configuration
 
@@ -30,20 +33,23 @@ protocol identifier and the host name of `base-uri` to form the connection URI l
 
 Note: If any of these parameters has to be changed, the service must be restarted to apply the new values.
 
-
 ### Source format
 #### Source addresses
 For a Hono connection source "addresses" are specified as aliases, which are resolved at runtime to Kafka topics to subscribe to. 
 Valid source addresses (aliases) are `event`, `telemetry` and `command_response`. 
 Runtime, these are resolved as following:
-* `event` -> `hono.event`
-* `telemetry` -> `hono.telemetry`
-* `command_response` -> `hono.command_response`
+* `event` -> `{%raw%}hono.event.{{connection:id}}{%endraw%}`
+* `telemetry` -> `{%raw%}hono.telemetry.{{connection:id}}{%endraw%}`
+* `command_response` -> `{%raw%}hono.command_response.{{connection:id}}{%endraw%}`
+ 
+Note: The {{connection:id}} will be replaced by the value of connectionId
 
 #### Source reply target
 Similar to source addresses, the reply target `address` is an alias as well. The single valid value for it is `command`. 
 It is resolved to Kafka topic/key like this:
-* `command` -> `hono.command/<thingId>` (&lt;thingId> is substituted by thing ID value).
+* `command` -> `{%raw%}hono.command.{{connection:id}}/<thingId>{%endraw%}` (&lt;thingId> is substituted by thing ID value).
+
+Note: The {{connection:id}} will be replaced by the value of connectionId
 
 The needed header mappings for the `replyTarget` are also populated automatically at runtime and there is 
 no need to specify them in the connection definition. Any of the following specified value will be substituted (i.e. ignored).

From 0f093a2c6cec9454bea1ecf044d6c085d4c449a6 Mon Sep 17 00:00:00 2001
From: Abhijeet Mishra <abhijeetmishra498@gmail.com>
Date: Fri, 27 Jan 2023 00:22:23 +0530
Subject: [PATCH 036/173] Added case insensitive search for things-search
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Abhijeet Mishra <“abhijeet.mishra498@gmail.com”>
---
 .../ditto/base/model/common/ILikeHelper.java  | 78 +++++++++++++++++++
 .../parser/internal/RqlPredicateParser.scala  | 10 ++-
 .../rql/query/criteria/CriteriaFactory.java   |  8 ++
 .../query/criteria/CriteriaFactoryImpl.java   |  9 +++
 .../query/criteria/ILikePredicateImpl.java    | 43 ++++++++++
 .../criteria/visitors/PredicateVisitor.java   |  1 +
 .../filter/ParameterPredicateVisitor.java     |  1 +
 .../ThingPredicatePredicateVisitor.java       | 10 ++-
 .../visitors/CreateBsonPredicateVisitor.java  | 12 +++
 9 files changed, 168 insertions(+), 4 deletions(-)
 create mode 100644 base/model/src/main/java/org/eclipse/ditto/base/model/common/ILikeHelper.java
 create mode 100644 rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/ILikePredicateImpl.java

diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/common/ILikeHelper.java b/base/model/src/main/java/org/eclipse/ditto/base/model/common/ILikeHelper.java
new file mode 100644
index 00000000000..04ce7f61c33
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/common/ILikeHelper.java
@@ -0,0 +1,78 @@
+
+/*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.common;
+
+import java.util.regex.Pattern;
+
+/**
+ * A helper to create "like" patterns.
+ *
+ * @since 2.3.0
+ */
+public final class ILikeHelper {
+
+    private static final String LEADING_WILDCARD = "\\Q\\E.*";
+    private static final String TRAILING_WILDCARD = ".*\\Q\\E";
+
+    private ILikeHelper() {
+    }
+
+    /**
+     * Convert a wildcard expression into a regular expression.
+     *
+     * The wildcard cards supported are:
+     *
+     * <dl>
+     *     <dt><code>*</code></dt><dd>Matching any number of any character</dd>
+     *     <dt><code>?</code></dt><dd>Matches any single character</dd>
+     * </dl>
+     *
+     * @param expression The wildcard expression to convert.
+     * @return The regular expression, which can be compiled with {@link Pattern#compile(String)}.
+     */
+    public static String convertToRegexSyntax(final String expression) {
+        if (expression == null) {
+            return null;
+        }
+
+        // simplify expression by replacing repeating wildcard with a single one
+        final String valueString = replaceRepeatingWildcards(expression);
+        // shortcut for single * wildcard
+        if ("*".equals(valueString)) {
+            return ".*";
+        }
+
+        // first escape the whole string
+        String escapedString = Pattern.compile(Pattern.quote(valueString)).toString();
+        // then enable allowed wildcards (* and ?) again
+        escapedString = escapedString.replaceAll("\\*", "\\\\E.*\\\\Q");
+        escapedString = escapedString.replaceAll("\\?", "\\\\E.\\\\Q"); // escape Char wild cards for ?
+
+        // prepend ^ if is a prefix match (no * at the beginning of the string, much faster)
+        if (!valueString.startsWith(LEADING_WILDCARD)) {
+            escapedString = "^" + escapedString;
+        }
+        // append $ if is a postfix match  (no * at the end of the string, much faster)
+        if (!valueString.endsWith(TRAILING_WILDCARD)) {
+            escapedString = escapedString + "$";
+        }
+        return escapedString;
+    }
+
+    private static String replaceRepeatingWildcards(final String value) {
+        return value.replaceAll("\\*{2,}", "*");
+    }
+
+}
+
diff --git a/rql/parser/src/main/scala/org/eclipse/ditto/rql/parser/internal/RqlPredicateParser.scala b/rql/parser/src/main/scala/org/eclipse/ditto/rql/parser/internal/RqlPredicateParser.scala
index b0312f2a718..4da7f37112e 100644
--- a/rql/parser/src/main/scala/org/eclipse/ditto/rql/parser/internal/RqlPredicateParser.scala
+++ b/rql/parser/src/main/scala/org/eclipse/ditto/rql/parser/internal/RqlPredicateParser.scala
@@ -28,7 +28,7 @@ import scala.util.{Failure, Success}
   * <pre>
   * Query                      = SingleComparisonOp | MultiComparisonOp | MultiLogicalOp | SingleLogicalOp | ExistsOp
   * SingleComparisonOp         = SingleComparisonName, '(', ComparisonProperty, ',', ComparisonValue, ')'
-  * SingleComparisonName       = "eq" | "ne" | "gt" | "ge" | "lt" | "le" | "like"
+  * SingleComparisonName       = "eq" | "ne" | "gt" | "ge" | "lt" | "le" | "like" | "ilike"
   * MultiComparisonOp          = MultiComparisonName, '(', ComparisonProperty, ',', ComparisonValue, { ',', ComparisonValue }, ')'
   * MultiComparisonName        = "in"
   * MultiLogicalOp             = MultiLogicalName, '(', Query, { ',', Query }, ')'
@@ -71,10 +71,10 @@ private class RqlPredicateParser(override val input: ParserInput) extends RqlPar
   }
 
   /**
-    * SingleComparisonName       = "eq" | "ne" | "gt" | "ge" | "lt" | "le" | "like"
+    * SingleComparisonName       = "eq" | "ne" | "gt" | "ge" | "lt" | "le" | "like" | "ilike"
     */
   private def SingleComparisonName: Rule1[SingleComparisonNode.Type] = rule {
-    eq | ne | gt | ge | lt | le | like
+    eq | ne | gt | ge | lt | le | like | ilike
   }
 
   private def eq: Rule1[SingleComparisonNode.Type] = rule {
@@ -105,6 +105,10 @@ private class RqlPredicateParser(override val input: ParserInput) extends RqlPar
     "like" ~ push(SingleComparisonNode.Type.LIKE)
   }
 
+  private def ilike: Rule1[SingleComparisonNode.Type] = rule {
+    "ilike" ~ push(SingleComparisonNode.Type.ILIKE)
+  }
+
   /**
     * MultiComparisonOp          = MultiComparisonName, '(', ComparisonProperty, ',', ComparisonValue, { ',', ComparisonValue }, ')'
     */
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactory.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactory.java
index cc78834d5ae..74f4641c411 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactory.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactory.java
@@ -152,6 +152,14 @@ default Criteria nor(final Criteria criteria) {
      */
     Predicate like(@Nullable Object value);
 
+    /**
+     *Creates a predicate which checks lower than or equals.
+     *
+     * @param value the value, may be {@code null}.
+     * @return the predicate. 
+     */
+    Predicate ilike(@Nullable object value);
+    
     /**
      * The $in predicate selects the documents where the value of a field equals any value in the specified array.
      *
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactoryImpl.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactoryImpl.java
index b1a195c62a0..e825b0b2526 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactoryImpl.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactoryImpl.java
@@ -110,6 +110,15 @@ public Predicate like(@Nullable final Object value) {
         }
     }
 
+    @Override
+    public Predicate ilike(@Nullable final Object value) {
+        if (value instanceof String) {
+            return new ILikePredicateImpl(value);
+        } else {
+            throw new IllegalArgumentException("In the like predicate only string values are allowed.");
+        }
+    }
+
     @Override
     public Predicate in(final List<?> values) {
         return new InPredicateImpl(requireNonNull(values));
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/ILikePredicateImpl.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/ILikePredicateImpl.java
new file mode 100644
index 00000000000..fbf55977a77
--- /dev/null
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/ILikePredicateImpl.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.rql.query.criteria;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.ditto.base.model.common.ILikeHelper;
+import org.eclipse.ditto.rql.query.criteria.visitors.PredicateVisitor;
+
+/**
+ * ILike predicate.
+ */
+final class ILikePredicateImpl extends AbstractSinglePredicate {
+
+    public ILikePredicateImpl(@Nullable final Object value) {
+        super(value);
+    }
+
+    @Nullable
+    private String convertToRegexSyntaxAndGetOption() {
+        final Object value = getValue();
+        if (value != null) {
+            return ILikeHelper.convertToRegexSyntax(value.toString());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public <T> T accept(final PredicateVisitor<T> visitor) {
+        return visitor.visitILike(convertToRegexSyntaxAndGetOption());
+    }
+}
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/visitors/PredicateVisitor.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/visitors/PredicateVisitor.java
index 868d2245ed4..1b42b856b10 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/visitors/PredicateVisitor.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/visitors/PredicateVisitor.java
@@ -39,4 +39,5 @@ public interface PredicateVisitor<T> {
 
     T visitIn(List<?> values);
 
+    T visitILike(@Nullable String value)
 }
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/filter/ParameterPredicateVisitor.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/filter/ParameterPredicateVisitor.java
index a73b7ec2ad9..90acb7e0b9b 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/filter/ParameterPredicateVisitor.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/filter/ParameterPredicateVisitor.java
@@ -54,6 +54,7 @@ final class ParameterPredicateVisitor implements PredicateVisitor {
         SINGLE_COMPARISON_NODE_MAPPING.put(SingleComparisonNode.Type.LT, CriteriaFactory::lt);
         SINGLE_COMPARISON_NODE_MAPPING.put(SingleComparisonNode.Type.LE, CriteriaFactory::le);
         SINGLE_COMPARISON_NODE_MAPPING.put(SingleComparisonNode.Type.LIKE, CriteriaFactory::like);
+        SINGLE_COMPARISON_NODE_MAPPING.put(SingleComparisonNode.Type.ILIKE, CriteriaFactory::ilike);
     }
 
     private final List<Criteria> criteria = new ArrayList<>();
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitor.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitor.java
index fdcda2c60a6..76a4f1fad5a 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitor.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitor.java
@@ -240,7 +240,15 @@ public Function<String, Predicate<Thing>> visitLike(@Nullable final String value
                         .filter(str -> null != value && Pattern.compile(value).matcher(str).matches())
                         .isPresent();
     }
-
+    @Override
+    public Function<String, Predicate<Thing>> visitILike(@Nullable final String value) {
+        return fieldName ->
+                thing -> getThingField(fieldName, thing)
+                        .filter(JsonValue::isString)
+                        .map(JsonValue::asString)
+                        .filter(str -> null != value && Pattern.compile(value, Pattern.CASE_INSENSITIVE).matcher(str).matches())
+                        .isPresent();
+    }
     @Nullable
     private Object resolveValue(@Nullable final Object value) {
         if (value instanceof ParsedPlaceholder) {
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonPredicateVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonPredicateVisitor.java
index 22bf085b85a..a8ebc60753b 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonPredicateVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonPredicateVisitor.java
@@ -137,6 +137,18 @@ public Function<String, Bson> visitLike(final String value) {
         return fieldName -> Filters.regex(fieldName, valueWithoutLeadingOrTrailingWildcard, "");
     }
 
+    @Override
+    public Function<String, Bson> visitILike(final String value) {
+        // remove leading or trailing wildcard because queries like /^a/ are much faster than /^a.*$/ or /^a.*/
+        // from mongodb docs:
+        // "Additionally, while /^a/, /^a.*/, and /^a.*$/ match equivalent strings, they have different performance
+        // characteristics. All of these expressions use an index if an appropriate index exists;
+        // however, /^a.*/, and /^a.*$/ are slower. /^a/ can stop scanning after matching the prefix."
+        final String valueWithoutLeadingOrTrailingWildcard = removeLeadingOrTrailingWildcard(value);
+        Pattern pattern = Pattern.compile(valueWithoutLeadingOrTrailingWildcard, Pattern.CASE_INSENSITIVE)
+        return fieldName -> Filters.regex(fieldName, pattern, "");
+    }
+
     private static String removeLeadingOrTrailingWildcard(final String valueString) {
         String valueWithoutLeadingOrTrailingWildcard = valueString;
         if (valueString.startsWith(LEADING_WILDCARD)) {

From 9fae3bf289209d663f993a1adafed4d85a0b1b9d Mon Sep 17 00:00:00 2001
From: Abhijeet Mishra <abhijeetmishra498@gmail.com>
Date: Sun, 5 Feb 2023 21:26:35 +0530
Subject: [PATCH 037/173] correction & update the year in the copyright headers
 of the added files to 2023
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Abhijeet Mishra <“abhijeet.mishra498@gmail.com”>
---
 .../ditto/base/model/common/ILikeHelper.java  |  2 +-
 .../base/model/common/ILikeHelperTest.java    | 38 +++++++++++++++++++
 .../predicates/ast/SingleComparisonNode.java  |  7 +++-
 .../rql/query/criteria/CriteriaFactory.java   |  4 +-
 .../query/criteria/ILikePredicateImpl.java    |  2 +-
 .../criteria/visitors/PredicateVisitor.java   |  2 +-
 .../visitors/CreateBsonPredicateVisitor.java  |  5 ++-
 7 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100644 base/model/src/test/java/org/eclipse/ditto/base/model/common/ILikeHelperTest.java

diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/common/ILikeHelper.java b/base/model/src/main/java/org/eclipse/ditto/base/model/common/ILikeHelper.java
index 04ce7f61c33..6f118c1f128 100644
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/common/ILikeHelper.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/common/ILikeHelper.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/common/ILikeHelperTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/common/ILikeHelperTest.java
new file mode 100644
index 00000000000..a5d68283bf0
--- /dev/null
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/common/ILikeHelperTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.common;
+
+import java.util.regex.Pattern;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public final class ILikeHelperTest {
+
+    @Test
+    public void testWildcards() {
+        assertExpression("", "*", true);
+        assertExpression("foo", "*", true);
+        assertExpression("foo.bar", "FOO.BAR", true);
+        assertExpression("foo..bar", "foo.bar", false);
+        assertExpression("foo..bar", "FOO*", true);
+        assertExpression("foo..bar", "*Bar", true);
+        assertExpression("foo.bar.baz", "bar", false);
+        assertExpression("foo.bar.baz", "*bAr*", true);
+    }
+
+    private static void assertExpression(final String value, final String expression, final boolean matches) {
+        Pattern p = Pattern.compile(LikeHelper.convertToRegexSyntax(expression), Pattern.CASE_INSENSITIVE);
+        Assert.assertEquals(matches, p.matcher(value).matches());
+    }
+}
diff --git a/rql/model/src/main/java/org/eclipse/ditto/rql/model/predicates/ast/SingleComparisonNode.java b/rql/model/src/main/java/org/eclipse/ditto/rql/model/predicates/ast/SingleComparisonNode.java
index b8359d0cc90..70b492c7fb2 100755
--- a/rql/model/src/main/java/org/eclipse/ditto/rql/model/predicates/ast/SingleComparisonNode.java
+++ b/rql/model/src/main/java/org/eclipse/ditto/rql/model/predicates/ast/SingleComparisonNode.java
@@ -78,7 +78,12 @@ public enum Type {
         /**
          * Represents a lower than or equals comparison.
          */
-        LIKE("like");
+        LIKE("like"),
+        
+         /**
+         * Represents a lower than or equals comparison case insensitive.
+         */
+        ILIKE("ilike");
 
         private final String name;
 
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactory.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactory.java
index 74f4641c411..f397746406c 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactory.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactory.java
@@ -153,12 +153,12 @@ default Criteria nor(final Criteria criteria) {
     Predicate like(@Nullable Object value);
 
     /**
-     *Creates a predicate which checks lower than or equals.
+     *Creates a predicate which checks lower than or equals case insensitive.
      *
      * @param value the value, may be {@code null}.
      * @return the predicate. 
      */
-    Predicate ilike(@Nullable object value);
+    Predicate ilike(@Nullable Object value);
     
     /**
      * The $in predicate selects the documents where the value of a field equals any value in the specified array.
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/ILikePredicateImpl.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/ILikePredicateImpl.java
index fbf55977a77..fc915438975 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/ILikePredicateImpl.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/ILikePredicateImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Contributors to the Eclipse Foundation
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/visitors/PredicateVisitor.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/visitors/PredicateVisitor.java
index 1b42b856b10..68e732efda5 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/visitors/PredicateVisitor.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/visitors/PredicateVisitor.java
@@ -39,5 +39,5 @@ public interface PredicateVisitor<T> {
 
     T visitIn(List<?> values);
 
-    T visitILike(@Nullable String value)
+    T visitILike(@Nullable String value);
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonPredicateVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonPredicateVisitor.java
index a8ebc60753b..09154ae9e54 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonPredicateVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonPredicateVisitor.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 
@@ -145,8 +146,8 @@ public Function<String, Bson> visitILike(final String value) {
         // characteristics. All of these expressions use an index if an appropriate index exists;
         // however, /^a.*/, and /^a.*$/ are slower. /^a/ can stop scanning after matching the prefix."
         final String valueWithoutLeadingOrTrailingWildcard = removeLeadingOrTrailingWildcard(value);
-        Pattern pattern = Pattern.compile(valueWithoutLeadingOrTrailingWildcard, Pattern.CASE_INSENSITIVE)
-        return fieldName -> Filters.regex(fieldName, pattern, "");
+        Pattern pattern = Pattern.compile(valueWithoutLeadingOrTrailingWildcard, Pattern.CASE_INSENSITIVE);
+        return fieldName -> Filters.regex(fieldName, pattern);
     }
 
     private static String removeLeadingOrTrailingWildcard(final String valueString) {

From 9e9af25714b07e05a3995cd1685956e1ef65d7d0 Mon Sep 17 00:00:00 2001
From: Abhijeet Mishra <abhijeetmishra498@gmail.com>
Date: Mon, 13 Feb 2023 18:36:38 +0530
Subject: [PATCH 038/173] correction and refactoring in ilike
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Abhijeet Mishra <“abhijeet.mishra498@gmail.com”>
---
 .../ditto/base/model/common/ILikeHelper.java  | 78 -------------------
 .../base/model/common/ILikeHelperTest.java    | 38 ---------
 .../base/model/common/LikeHelperTest.java     | 10 +++
 .../sources/parameters/searchFilter.yml       |  2 +
 .../main/resources/pages/ditto/basic-rql.md   | 32 ++++++++
 .../predicates/ast/SingleComparisonNode.java  |  4 +-
 .../rql/query/criteria/CriteriaFactory.java   |  6 +-
 .../query/criteria/CriteriaFactoryImpl.java   |  2 +-
 .../query/criteria/ILikePredicateImpl.java    |  4 +-
 .../criteria/visitors/PredicateVisitor.java   |  3 +-
 .../ThingPredicatePredicateVisitor.java       |  2 +
 .../ThingPredicatePredicateVisitorTest.java   |  7 ++
 12 files changed, 63 insertions(+), 125 deletions(-)
 delete mode 100644 base/model/src/main/java/org/eclipse/ditto/base/model/common/ILikeHelper.java
 delete mode 100644 base/model/src/test/java/org/eclipse/ditto/base/model/common/ILikeHelperTest.java

diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/common/ILikeHelper.java b/base/model/src/main/java/org/eclipse/ditto/base/model/common/ILikeHelper.java
deleted file mode 100644
index 6f118c1f128..00000000000
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/common/ILikeHelper.java
+++ /dev/null
@@ -1,78 +0,0 @@
-
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.eclipse.ditto.base.model.common;
-
-import java.util.regex.Pattern;
-
-/**
- * A helper to create "like" patterns.
- *
- * @since 2.3.0
- */
-public final class ILikeHelper {
-
-    private static final String LEADING_WILDCARD = "\\Q\\E.*";
-    private static final String TRAILING_WILDCARD = ".*\\Q\\E";
-
-    private ILikeHelper() {
-    }
-
-    /**
-     * Convert a wildcard expression into a regular expression.
-     *
-     * The wildcard cards supported are:
-     *
-     * <dl>
-     *     <dt><code>*</code></dt><dd>Matching any number of any character</dd>
-     *     <dt><code>?</code></dt><dd>Matches any single character</dd>
-     * </dl>
-     *
-     * @param expression The wildcard expression to convert.
-     * @return The regular expression, which can be compiled with {@link Pattern#compile(String)}.
-     */
-    public static String convertToRegexSyntax(final String expression) {
-        if (expression == null) {
-            return null;
-        }
-
-        // simplify expression by replacing repeating wildcard with a single one
-        final String valueString = replaceRepeatingWildcards(expression);
-        // shortcut for single * wildcard
-        if ("*".equals(valueString)) {
-            return ".*";
-        }
-
-        // first escape the whole string
-        String escapedString = Pattern.compile(Pattern.quote(valueString)).toString();
-        // then enable allowed wildcards (* and ?) again
-        escapedString = escapedString.replaceAll("\\*", "\\\\E.*\\\\Q");
-        escapedString = escapedString.replaceAll("\\?", "\\\\E.\\\\Q"); // escape Char wild cards for ?
-
-        // prepend ^ if is a prefix match (no * at the beginning of the string, much faster)
-        if (!valueString.startsWith(LEADING_WILDCARD)) {
-            escapedString = "^" + escapedString;
-        }
-        // append $ if is a postfix match  (no * at the end of the string, much faster)
-        if (!valueString.endsWith(TRAILING_WILDCARD)) {
-            escapedString = escapedString + "$";
-        }
-        return escapedString;
-    }
-
-    private static String replaceRepeatingWildcards(final String value) {
-        return value.replaceAll("\\*{2,}", "*");
-    }
-
-}
-
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/common/ILikeHelperTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/common/ILikeHelperTest.java
deleted file mode 100644
index a5d68283bf0..00000000000
--- a/base/model/src/test/java/org/eclipse/ditto/base/model/common/ILikeHelperTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.eclipse.ditto.base.model.common;
-
-import java.util.regex.Pattern;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public final class ILikeHelperTest {
-
-    @Test
-    public void testWildcards() {
-        assertExpression("", "*", true);
-        assertExpression("foo", "*", true);
-        assertExpression("foo.bar", "FOO.BAR", true);
-        assertExpression("foo..bar", "foo.bar", false);
-        assertExpression("foo..bar", "FOO*", true);
-        assertExpression("foo..bar", "*Bar", true);
-        assertExpression("foo.bar.baz", "bar", false);
-        assertExpression("foo.bar.baz", "*bAr*", true);
-    }
-
-    private static void assertExpression(final String value, final String expression, final boolean matches) {
-        Pattern p = Pattern.compile(LikeHelper.convertToRegexSyntax(expression), Pattern.CASE_INSENSITIVE);
-        Assert.assertEquals(matches, p.matcher(value).matches());
-    }
-}
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/common/LikeHelperTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/common/LikeHelperTest.java
index 41d134522dc..1c13f78a245 100644
--- a/base/model/src/test/java/org/eclipse/ditto/base/model/common/LikeHelperTest.java
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/common/LikeHelperTest.java
@@ -21,6 +21,7 @@ public final class LikeHelperTest {
 
     @Test
     public void testWildcards() {
+        //case sensitive test cases
         assertExpression("", "*", true);
         assertExpression("foo", "*", true);
         assertExpression("foo.bar", "foo.bar", true);
@@ -29,6 +30,15 @@ public void testWildcards() {
         assertExpression("foo..bar", "*bar", true);
         assertExpression("foo.bar.baz", "bar", false);
         assertExpression("foo.bar.baz", "*bar*", true);
+        //case insensitive test cases appending this  (?i) before text
+        assertExpression("", "*", true);
+        assertExpression("foo", "*", true);
+        assertExpression("foo.bar", "(?i)FOO.BAR", true);
+        assertExpression("foo..bar", "(?i)foo.bar", false);
+        assertExpression("foo..bar", "(?i)FOO*", true);
+        assertExpression("foo..bar", "*(?i)Bar", true);
+        assertExpression("foo.bar.baz", "(?i)bar", false);
+        assertExpression("foo.bar.baz", "*(?i)bAr*", true);
     }
 
     private static void assertExpression(final String value, final String expression, final boolean matches) {
diff --git a/documentation/src/main/resources/openapi/sources/parameters/searchFilter.yml b/documentation/src/main/resources/openapi/sources/parameters/searchFilter.yml
index cc62a721e5b..6dbd6a803d4 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/searchFilter.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/searchFilter.yml
@@ -30,6 +30,8 @@ description: |-
 
   * ```like({property},{value})```  (i.e. contains values similar to the expressions listed)
 
+  * ```ilike({property},{value})```  (i.e. contains values similar and case insensitive to the expressions listed)
+
   * ```exists({property})```  (i.e. all things in which the given path exists)
 
 
diff --git a/documentation/src/main/resources/pages/ditto/basic-rql.md b/documentation/src/main/resources/pages/ditto/basic-rql.md
index 23fcc0acb37..d3897dec88d 100644
--- a/documentation/src/main/resources/pages/ditto/basic-rql.md
+++ b/documentation/src/main/resources/pages/ditto/basic-rql.md
@@ -218,6 +218,38 @@ like(attributes/key1,"*known-chars-in-between*")
 like(attributes/key1,"just-som?-char?-unkn?wn")
 ```
 
+#### ilike
+Filter property values which are like (similar) and case insensitive `<value>`.
+
+```
+ilike(<property>,<value>) 
+```
+
+{% include note.html content="The `ilike` operator is not defined in the linked RQL grammar, it is a Ditto
+    specific operator." %}
+
+**Details concerning the ilike-operator**
+
+The `ilike` operator provides some regular expression capabilities for pattern matching Strings with case insensitivity.
+
+The following expressions are supported:
+
+* \*endswith => match at the end of a specific String.
+* startswith\* => match at the beginning of a specific String.
+* \*contains\* => match if contains a specific String.
+* Th?ng => match for a wildcard character.
+
+**Examples**
+```
+ilike(attributes/key1,"*known-CHARS-at-end")
+
+ilike(attributes/key1,"known-chars-AT-start*") 
+
+ilike(attributes/key1,"*KNOWN-CHARS-IN-BETWEEN*") 
+
+ilike(attributes/key1,"just-som?-char?-unkn?wn")
+```
+
 #### exists
 
 Filter property values which exist.
diff --git a/rql/model/src/main/java/org/eclipse/ditto/rql/model/predicates/ast/SingleComparisonNode.java b/rql/model/src/main/java/org/eclipse/ditto/rql/model/predicates/ast/SingleComparisonNode.java
index 70b492c7fb2..421947b8536 100755
--- a/rql/model/src/main/java/org/eclipse/ditto/rql/model/predicates/ast/SingleComparisonNode.java
+++ b/rql/model/src/main/java/org/eclipse/ditto/rql/model/predicates/ast/SingleComparisonNode.java
@@ -76,12 +76,12 @@ public enum Type {
         LE("le"),
 
         /**
-         * Represents a lower than or equals comparison.
+         * Represents a string 'like' comparison, supporting wildcards '*' for multiple and '?' for a single character.
          */
         LIKE("like"),
         
          /**
-         * Represents a lower than or equals comparison case insensitive.
+         * Represents a string 'like' comparison, supporting wildcards '*' for multiple and '?' for a single character with case sensitivity.
          */
         ILIKE("ilike");
 
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactory.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactory.java
index f397746406c..f27a67e2a6e 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactory.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactory.java
@@ -145,7 +145,7 @@ default Criteria nor(final Criteria criteria) {
     Predicate le(@Nullable Object value);
 
     /**
-     * Creates a predicate which checks lower than or equals.
+     * Represents a string 'like' comparison, supporting wildcards '*' for multiple and '?' for a single character.
      *
      * @param value the value, may be {@code null}.
      * @return the predicate.
@@ -153,8 +153,8 @@ default Criteria nor(final Criteria criteria) {
     Predicate like(@Nullable Object value);
 
     /**
-     *Creates a predicate which checks lower than or equals case insensitive.
-     *
+     * Represents a string 'like' comparison, supporting wildcards '*' for multiple and '?' for a single character with case insensitivity.
+     * @since 3.2.0
      * @param value the value, may be {@code null}.
      * @return the predicate. 
      */
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactoryImpl.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactoryImpl.java
index e825b0b2526..02de81067c2 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactoryImpl.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/CriteriaFactoryImpl.java
@@ -115,7 +115,7 @@ public Predicate ilike(@Nullable final Object value) {
         if (value instanceof String) {
             return new ILikePredicateImpl(value);
         } else {
-            throw new IllegalArgumentException("In the like predicate only string values are allowed.");
+            throw new IllegalArgumentException("In the ilike predicate only string values are allowed.");
         }
     }
 
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/ILikePredicateImpl.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/ILikePredicateImpl.java
index fc915438975..19cd596252c 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/ILikePredicateImpl.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/ILikePredicateImpl.java
@@ -14,7 +14,7 @@
 
 import javax.annotation.Nullable;
 
-import org.eclipse.ditto.base.model.common.ILikeHelper;
+import org.eclipse.ditto.base.model.common.LikeHelper;
 import org.eclipse.ditto.rql.query.criteria.visitors.PredicateVisitor;
 
 /**
@@ -30,7 +30,7 @@ public ILikePredicateImpl(@Nullable final Object value) {
     private String convertToRegexSyntaxAndGetOption() {
         final Object value = getValue();
         if (value != null) {
-            return ILikeHelper.convertToRegexSyntax(value.toString());
+            return LikeHelper.convertToRegexSyntax(value.toString());
         } else {
             return null;
         }
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/visitors/PredicateVisitor.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/visitors/PredicateVisitor.java
index 68e732efda5..cc016f33594 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/visitors/PredicateVisitor.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/criteria/visitors/PredicateVisitor.java
@@ -37,7 +37,8 @@ public interface PredicateVisitor<T> {
 
     T visitLike(@Nullable String value);
 
+    T visitILike(@Nullable String value);
+
     T visitIn(List<?> values);
 
-    T visitILike(@Nullable String value);
 }
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitor.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitor.java
index 76a4f1fad5a..3fef861ef91 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitor.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitor.java
@@ -240,6 +240,7 @@ public Function<String, Predicate<Thing>> visitLike(@Nullable final String value
                         .filter(str -> null != value && Pattern.compile(value).matcher(str).matches())
                         .isPresent();
     }
+
     @Override
     public Function<String, Predicate<Thing>> visitILike(@Nullable final String value) {
         return fieldName ->
@@ -249,6 +250,7 @@ public Function<String, Predicate<Thing>> visitILike(@Nullable final String valu
                         .filter(str -> null != value && Pattern.compile(value, Pattern.CASE_INSENSITIVE).matcher(str).matches())
                         .isPresent();
     }
+    
     @Nullable
     private Object resolveValue(@Nullable final Object value) {
         if (value instanceof ParsedPlaceholder) {
diff --git a/rql/query/src/test/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitorTest.java b/rql/query/src/test/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitorTest.java
index 691f740d3c9..0a036c4d33b 100644
--- a/rql/query/src/test/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitorTest.java
+++ b/rql/query/src/test/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitorTest.java
@@ -137,6 +137,13 @@ public void matchingStringLike() {
                 .isTrue();
     }
 
+    @Test
+    public void matchingStringILike() {
+        // the sut already works on regex Pattern - the translation from "*" to ".*" followed by case insensitivity is done in LikePredicateImpl
+        doTest(sut.visitLike("this-is.*"), JsonValue.of("THIS-IS-THE-CONTENT"))
+                .isTrue();
+    }
+
     @Test
     public void matchingViaPlaceholderStringLike() {
         // the sut already works on regex Pattern - the translation from "*" to ".*" is done in LikePredicateImpl

From 877532a804c083df2768affcc5d2316cac598526 Mon Sep 17 00:00:00 2001
From: Abhijeet Mishra <abhijeetmishra498@gmail.com>
Date: Tue, 14 Feb 2023 15:49:58 +0530
Subject: [PATCH 039/173] correction & refactoring in LikeHelperTest class &
 removed copy&paste error

Signed-off-by: Abhijeet Mishra <abhijeetmishra498@gmail.com>
---
 .../base/model/common/LikeHelperTest.java     | 28 +++++++++++++------
 .../ThingPredicatePredicateVisitorTest.java   |  2 +-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/common/LikeHelperTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/common/LikeHelperTest.java
index 1c13f78a245..be15e71c7f9 100644
--- a/base/model/src/test/java/org/eclipse/ditto/base/model/common/LikeHelperTest.java
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/common/LikeHelperTest.java
@@ -30,19 +30,29 @@ public void testWildcards() {
         assertExpression("foo..bar", "*bar", true);
         assertExpression("foo.bar.baz", "bar", false);
         assertExpression("foo.bar.baz", "*bar*", true);
-        //case insensitive test cases appending this  (?i) before text
-        assertExpression("", "*", true);
-        assertExpression("foo", "*", true);
-        assertExpression("foo.bar", "(?i)FOO.BAR", true);
-        assertExpression("foo..bar", "(?i)foo.bar", false);
-        assertExpression("foo..bar", "(?i)FOO*", true);
-        assertExpression("foo..bar", "*(?i)Bar", true);
-        assertExpression("foo.bar.baz", "(?i)bar", false);
-        assertExpression("foo.bar.baz", "*(?i)bAr*", true);
     }
 
     private static void assertExpression(final String value, final String expression, final boolean matches) {
         Pattern p = Pattern.compile(LikeHelper.convertToRegexSyntax(expression));
         Assert.assertEquals(matches, p.matcher(value).matches());
     }
+
+    @Test
+    public void testCaseInsensitiveWildcards() {
+        //case insensitive test cases 
+        assertExpressionCaseInsensitive("", "*", true);
+        assertExpressionCaseInsensitive("foo", "*", true);
+        assertExpressionCaseInsensitive("foo.bar", "FOO.BAR", true);
+        assertExpressionCaseInsensitive("foo..bar", "foo.bar", false);
+        assertExpressionCaseInsensitive("foo..bar", "FOO*", true);
+        assertExpressionCaseInsensitive("foo..bar", "*Bar", true);
+        assertExpressionCaseInsensitive("foo.bar.baz", "bar", false);
+        assertExpressionCaseInsensitive("foo.bar.baz", "*bAr*", true);
+    }
+
+    private static void assertExpressionCaseInsensitive(final String value, final String expression, final boolean matches) {
+        Pattern p = Pattern.compile(LikeHelper.convertToRegexSyntax(expression), Pattern.CASE_INSENSITIVE);
+        Assert.assertEquals(matches, p.matcher(value).matches());
+    }
+
 }
diff --git a/rql/query/src/test/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitorTest.java b/rql/query/src/test/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitorTest.java
index 0a036c4d33b..c27423ae570 100644
--- a/rql/query/src/test/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitorTest.java
+++ b/rql/query/src/test/java/org/eclipse/ditto/rql/query/things/ThingPredicatePredicateVisitorTest.java
@@ -140,7 +140,7 @@ public void matchingStringLike() {
     @Test
     public void matchingStringILike() {
         // the sut already works on regex Pattern - the translation from "*" to ".*" followed by case insensitivity is done in LikePredicateImpl
-        doTest(sut.visitLike("this-is.*"), JsonValue.of("THIS-IS-THE-CONTENT"))
+        doTest(sut.visitILike("this-is.*"), JsonValue.of("THIS-IS-THE-CONTENT"))
                 .isTrue();
     }
 

From f47d440d23ab7d7a4ce01fadea41ee67cca4bd1e Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Tue, 14 Feb 2023 12:02:37 +0100
Subject: [PATCH 040/173] stabilize MQTT unsubscribing

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../client/BaseGenericMqttSubscribingClient.java       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/client/BaseGenericMqttSubscribingClient.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/client/BaseGenericMqttSubscribingClient.java
index 7d1f35158b6..4ec4fc9ad48 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/client/BaseGenericMqttSubscribingClient.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/hivemq/client/BaseGenericMqttSubscribingClient.java
@@ -226,9 +226,13 @@ protected Single<GenericMqttSubAck> sendSubscribe(final Mqtt3RxClient mqtt3RxCli
 
         @Override
         Completable sendUnsubscribe(final Mqtt3RxClient mqtt3RxClient, final MqttTopicFilter... mqttTopicFilters) {
-            final var unsubscribe =
-                    Mqtt3Unsubscribe.builder().addTopicFilters(mqttTopicFilters).build();
-            return mqtt3RxClient.unsubscribe(unsubscribe);
+            if (mqttTopicFilters.length == 0) {
+                return Completable.complete();
+            } else {
+                final var unsubscribe =
+                        Mqtt3Unsubscribe.builder().addTopicFilters(mqttTopicFilters).build();
+                return mqtt3RxClient.unsubscribe(unsubscribe);
+            }
         }
 
         @Override

From 68a5e764b6e2a145c8093e41b3721c549f781628 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Tue, 14 Feb 2023 14:06:38 +0100
Subject: [PATCH 041/173] added agreed on "additional OSS contributing rules"
 for Eclipse Ditto to existing CONTRIBUTING.md

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 CONTRIBUTING.md | 137 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 127 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1cb0974a9f3..09328574e5c 100755
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -56,7 +56,7 @@ Please make sure any file you newly create contains a proper license header. Fin
 Adjusted for Java classes:
 ```java
 /*
- * Copyright (c) 2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -72,7 +72,7 @@ Adjusted for Java classes:
 Adjusted for XML files:
 ```xml
 <!--
-  ~ Copyright (c) 2019 Contributors to the Eclipse Foundation
+  ~ Copyright (c) 2023 Contributors to the Eclipse Foundation
   ~
   ~ See the NOTICE file(s) distributed with this work for additional
   ~ information regarding copyright ownership.
@@ -85,14 +85,6 @@ Adjusted for XML files:
   -->
 ```
 
-### Important
-    
-Please do not forget to add your name/organization to the [legal/NOTICE.md](legal/NOTICE.md) file's Copyright Holders 
-section. If this is not the first contribution you make, then simply update the time period contained in the copyright
-entry to use the year of your first contribution as the lower boundary and the current year as the upper boundary, e.g.
-
-    Copyright 2018-2019 ACME Corporation
-
 ## Submitting the Changes
 
 Submit a pull request via the normal GitHub UI.
@@ -100,3 +92,128 @@ Submit a pull request via the normal GitHub UI.
 ## After Submitting
 
 * Do not use your branch for any other development, otherwise further changes that you make will be visible in the PR.
+
+
+# OSS development process - rules
+
+As of 02/2023, the following additional "rules" regarding the open OSS development process were agreed on.
+
+## Addition of new features via feature toggles
+
+Goals:
+* Reduce the risk for other Ditto users that a new feature have an impact on existing functionality and stability
+* Whenever possible (and feasible), added functionality shall be added using a "feature toggle".
+
+Ditto already has a class `FeatureToggle.java` where feature toggles are contained and providing functionality to
+"secure" a feature with a method in there which throws an `UnsupportedSignalException` once a feature is used which
+is disabled via feature toggle.
+
+The toggles are then configured in `ditto-devops.conf` file and can be enabled/disabled via the contained environment variables.
+
+## Creating GitHub issues before starting to work on code
+
+Goals:
+* Improve transparency on what is currently happening
+* Openly discuss new features and whether they are a good fit for Ditto
+* Reduce "time waste"
+
+Whenever a new feature or a bugfix is being worked on, we want to create an issue in Ditto's GitHub project **beforehand**:
+https://github.com/eclipse-ditto/ditto/issues
+
+This provides the needed transparency for other contributors before much effort is put into a new topic in order to:
+* Get input on the background (e.g. use case behind / "the need") of the feature/bugfix
+* Provide feedback, maybe even suggesting alternatives instead
+* Provide suggestions of how to implement it the most efficient way
+* Maybe even find synergies when more than 1 contributing companies currently have the same topic to work on
+
+The following situation shall be prevented:
+* If no issue is created upfront, a contributing company e.g. invests 2 months of work in a new feature
+* Then a PR is created with this new functionality
+* Only then, a discussion with other contributors can start
+* At this point, when there e.g. is a big flaw in the architecture or security or API stability of the added functionality,
+  the invested 2 months could - in the worst case - be a complete waste of time
+* This could easily be resolved by discussing it beforehand
+
+## Create PullRequests early
+
+Goals:
+* Get early feedback on implementation details of new features / bugfixes
+* Prevent that an implementation goes "into the wrong direction" (e.g. performance or security wise)
+
+PullRequests should be created quite early and publicly on the Ditto project.  
+If they are not yet "ready" to review/merge, they must be marked as "DRAFT" - once they are ready, they can be marked
+as such and a review can be performed.
+
+## Make use of GitHub "Projects" for showing current work for next release
+
+Goals:
+* Make transparent "who" currently works on "what"
+* Make transparent what the current agenda for the next Ditto release is
+
+The new "Projects" capabilities of GitHub look more than sufficient of what we want to achieve here:
+* https://github.com/orgs/eclipse-ditto/projects/1
+* https://github.com/orgs/eclipse-ditto/projects/1/views/2 (table view is especially useful, as grouping by "Milestone" is necessary)
+
+## Establish system-tests in the OpenSource codebase
+
+Goals:
+* Provide means to run automated tests for future enhancements to Ditto
+* Secure existing functionality, avoid breaking APIs and existing functionality when changes to the Ditto OSS codebase are done
+
+The system tests for Eclipse Ditto were initiated here:  
+https://github.com/eclipse-ditto/ditto-testing
+
+The tests should be part of the validations done in a PR before a PR is approved and merged.  
+In order to be able to do that, we want to clarify if the Eclipse Foundation can provide enough resources in order to 
+run the system-tests in a stable way.
+
+Currently, that seems to be quite difficult, as projects only have very limited resources in order to run their builds.  
+In addition, the CI runs in an OpenShift cluster with additional restrictions, e.g. regarding the kind of Docker images
+which can be run, exposing of the Docker socket, etc.
+
+## Regular community meetings
+
+Goals:
+
+* Discuss upcoming topics/problems in advance
+* Stay in touch via audio/video
+* Build up a (contributor and adopter) community who can help each other
+
+We want to re-establish regular community meetings/call, e.g. a meeting every 2 weeks for 1 hour.  
+We can utilize the Zoom account from the Eclipse Foundation to have a "neutral" one .. or just use "Google Meet".
+
+## Chat for (internal) exchanges
+
+Goals:
+* Have a direct channel where to reach other Ditto committers and contributors
+* In order to get timely responses if e.g. a bugfix release has to be scheduled/done quickly
+
+We can use "Gitter.IM" communities to add different rooms of which some also can be private:  
+https://gitter.im/EclipseDitto/community
+
+## Release strategy
+
+Goals:
+* Have rules of how often to do "planned feature releases"
+* Have options for contributing companies to prioritize a release (e.g. if urgent bugfix or urgent feature release)
+
+The suggestion would be to have approximately 4 planned minor releases per year, 1 each quarter (e.g. 03 / 06 / 09 / 12).  
+If needed and all contributing companies agree minor releases can also happen earlier/more often.
+
+Bugfix releases should be done immediately if a critical bug was fixed and either the contributors or the community need a quick fix release.
+
+## Approving / merging PRs
+
+Goals:
+* PullRequests - once they are ready - shall not stay unmerged for a long time as this leads to the risk they are not 
+  mergable or get outdated quickly
+
+Approach:
+
+* Before merging a PR at least 1 approval is required
+  * Approvals shall only be issued after a code review
+  * Preferably that would be 1 approval from an existing Ditto committer
+  * But could also be the approval of an active contributor who does not yet have committer status
+* If no approval is given for a PR within a duration of 4 weeks after declaring it "ready", a PR can also be merged without other approvals
+  * Before doing so, the reasons for not approving must be found out (e.g. via the Chat / community call)
+  * If the reason simply is "no time" and there are no objections against that PR, the PR can be merged without other approvals

From 114a35dc637f5ecea0cbac9c23317bdd92f1bb5d Mon Sep 17 00:00:00 2001
From: Andrey Balarev <andrey.balarev@bosch.com>
Date: Tue, 14 Feb 2023 15:13:11 +0200
Subject: [PATCH 042/173] Fixed from review issues in documentation.

Signed-off-by: Andrey Balarev <andrey.balarev@bosch.com>
---
 .../pages/ditto/connectivity-protocol-bindings-hono.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-hono.md b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-hono.md
index 940d6a8c0be..761e016ede3 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-hono.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-hono.md
@@ -41,15 +41,15 @@ Runtime, these are resolved as following:
 * `event` -> `{%raw%}hono.event.{{connection:id}}{%endraw%}`
 * `telemetry` -> `{%raw%}hono.telemetry.{{connection:id}}{%endraw%}`
 * `command_response` -> `{%raw%}hono.command_response.{{connection:id}}{%endraw%}`
- 
-Note: The {{connection:id}} will be replaced by the value of connectionId
+
+Note: The `{%raw%}{{connection:id}}{%endraw%}` will be replaced by the value of connectionId
 
 #### Source reply target
 Similar to source addresses, the reply target `address` is an alias as well. The single valid value for it is `command`. 
 It is resolved to Kafka topic/key like this:
 * `command` -> `{%raw%}hono.command.{{connection:id}}/<thingId>{%endraw%}` (&lt;thingId> is substituted by thing ID value).
 
-Note: The {{connection:id}} will be replaced by the value of connectionId
+Note: The `{%raw%}{{connection:id}}{%endraw%}` will be replaced by the value of connectionId
 
 The needed header mappings for the `replyTarget` are also populated automatically at runtime and there is 
 no need to specify them in the connection definition. Any of the following specified value will be substituted (i.e. ignored).
@@ -101,7 +101,9 @@ and [Header mapping for connections](connectivity-header-mapping.html).
 #### Target address 
 The target `address` is specified as an alias and the only valid alias is `command`. 
 It is automatically resolved at runtime to the following Kafka topic/key:
-* `command` -> `hono.command/<thingId>` (&lt;thingId> is substituted by thing ID value).
+* `command` -> `{%raw%}hono.command.{{connection:id}}/<thingId>{%endraw%}` (&lt;thingId> is substituted by thing ID value).
+
+Note: The `{%raw%}{{connection:id}}{%endraw%}` will be replaced by the value of connectionId
 
 #### Target header mapping
 The target `headerMapping` section is also populated automatically at runtime and there is

From c217920d072cda4edc73229d4d7c1d3f6ecfc008 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Tue, 14 Feb 2023 19:51:07 +0100
Subject: [PATCH 043/173] re-generated openapi docs

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 documentation/src/main/resources/openapi/ditto-api-2.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/src/main/resources/openapi/ditto-api-2.yml b/documentation/src/main/resources/openapi/ditto-api-2.yml
index 18684504337..4f2fbe042d3 100644
--- a/documentation/src/main/resources/openapi/ditto-api-2.yml
+++ b/documentation/src/main/resources/openapi/ditto-api-2.yml
@@ -8017,6 +8017,8 @@ components:
 
         * ```like({property},{value})```  (i.e. contains values similar to the expressions listed)
 
+        * ```ilike({property},{value})```  (i.e. contains values similar and case insensitive to the expressions listed)
+
         * ```exists({property})```  (i.e. all things in which the given path exists)
 
 

From 2e2ecb13406ca0f4256d99fe014117f42184d921 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Wed, 15 Feb 2023 09:56:49 +0100
Subject: [PATCH 044/173] improve resiliency of connection id retrieval from
 journal by excluding empty events

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../service/messaging/ConnectionIdsRetrievalActor.java    | 8 ++++++++
 .../ditto/internal/utils/persistentactors/EmptyEvent.java | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/ConnectionIdsRetrievalActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/ConnectionIdsRetrievalActor.java
index 7e7e133c9a7..9373a78fb35 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/ConnectionIdsRetrievalActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/ConnectionIdsRetrievalActor.java
@@ -40,6 +40,7 @@
 import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
 import org.eclipse.ditto.internal.utils.cluster.DistPubSubAccess;
 import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
+import org.eclipse.ditto.internal.utils.persistentactors.EmptyEvent;
 
 import akka.NotUsed;
 import akka.actor.AbstractActor;
@@ -114,6 +115,12 @@ private static boolean isDeleted(final Document document) {
                 .orElse(true);
     }
 
+    private static boolean isNotEmptyEvent(final Document document) {
+        return Optional.ofNullable(document.getString(MongoReadJournal.J_EVENT_MANIFEST))
+                .map(manifest -> !EmptyEvent.TYPE.equals(manifest))
+                .orElse(false);
+    }
+
     private static boolean isNotDeleted(final Document document) {
         return Optional.ofNullable(document.getString(MongoReadJournal.J_EVENT_MANIFEST))
                 .map(manifest -> !ConnectionDeleted.TYPE.equals(manifest))
@@ -166,6 +173,7 @@ private void getAllConnectionIDs(final WithDittoHeaders cmd) {
             final Source<String, NotUsed> idsFromSnapshots = getIdsFromSnapshotsSource();
             final Source<String, NotUsed> idsFromJournal = persistenceIdsFromJournalSourceSupplier.get()
                     .filter(ConnectionIdsRetrievalActor::isNotDeleted)
+                    .filter(ConnectionIdsRetrievalActor::isNotEmptyEvent)
                     .map(document -> document.getString(MongoReadJournal.J_EVENT_PID));
 
             final CompletionStage<CommandResponse> retrieveAllConnectionIdsResponse =
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/EmptyEvent.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/EmptyEvent.java
index 4d4d6c1df13..51d6a0430e0 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/EmptyEvent.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/EmptyEvent.java
@@ -56,7 +56,7 @@ public final class EmptyEvent implements Event<EmptyEvent> {
 
     static final String NAME = "empty-event";
 
-    static final String TYPE = TYPE_PREFIX + NAME;
+    public static final String TYPE = TYPE_PREFIX + NAME;
 
     private static final JsonFieldDefinition<JsonValue> JSON_EFFECT =
             JsonFactory.newJsonValueFieldDefinition("effect", FieldType.REGULAR, JsonSchemaVersion.V_2);

From 528edb9d0cd6e8e9d70d1047ce0a67283599a7a8 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Wed, 15 Feb 2023 10:53:45 +0100
Subject: [PATCH 045/173] added "ilike" to thingssearch-model

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../ditto/thingsearch/model/ImmutableSearchProperty.java | 7 +++++++
 .../eclipse/ditto/thingsearch/model/SearchFilter.java    | 5 +++++
 .../eclipse/ditto/thingsearch/model/SearchProperty.java  | 9 +++++++++
 .../thingsearch/model/ImmutableSearchPropertyTest.java   | 8 ++++++++
 4 files changed, 29 insertions(+)

diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchProperty.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchProperty.java
index 166c9ceb140..123394aed9f 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchProperty.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchProperty.java
@@ -240,6 +240,13 @@ public PropertySearchFilter like(final String value) {
         return ImmutablePropertyFilter.of(SearchFilter.Type.LIKE, propertyPath, JsonFactory.newValue(value));
     }
 
+    @Override
+    public PropertySearchFilter ilike(final String value) {
+        checkStringValue(value);
+
+        return ImmutablePropertyFilter.of(SearchFilter.Type.ILIKE, propertyPath, JsonFactory.newValue(value));
+    }
+
     @Override
     public PropertySearchFilter in(final boolean value, final Boolean... furtherValues) {
         return in(toCollection(JsonFactory::newValue, value, furtherValues));
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchFilter.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchFilter.java
index 57d47a3c347..d56e192ca9c 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchFilter.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchFilter.java
@@ -99,6 +99,11 @@ enum Type {
          */
         LIKE("like"),
 
+        /**
+         * Filter type for checking if a string matches a regular expression, in a case insensitive way.
+         */
+        ILIKE("ilike"),
+
         /**
          * Filter type for checking if an entity is contained in a set of given entities.
          */
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchProperty.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchProperty.java
index 4a2850868c2..5f9dccd95f3 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchProperty.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchProperty.java
@@ -293,6 +293,15 @@ public interface SearchProperty {
      */
     PropertySearchFilter like(String value);
 
+    /**
+     * Returns a new search filter for checking if the value of this property is case insensitive like the given value.
+     *
+     * @param value the value to compare the value of this property with.
+     * @return the new search filter.
+     * @throws NullPointerException if {@code value} is {@code null}.
+     */
+    PropertySearchFilter ilike(String value);
+
     /**
      * Returns a new search filter for checking if the value of this property is in the given value(s).
      *
diff --git a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchPropertyTest.java b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchPropertyTest.java
index 3e1b07c90dc..0ce96aa648e 100755
--- a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchPropertyTest.java
+++ b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchPropertyTest.java
@@ -207,6 +207,14 @@ public void likeReturnsExpected() {
                 .hasStringRepresentation("like(" + PROPERTY_PATH + ",\"" + BOSCH + "\")");
     }
 
+    @Test
+    public void ilikeReturnsExpected() {
+        assertThat(underTest.ilike(BOSCH))
+                .hasType(SearchFilter.Type.ILIKE)
+                .hasOnlyValue(BOSCH)
+                .hasStringRepresentation("ilike(" + PROPERTY_PATH + ",\"" + BOSCH + "\")");
+    }
+
     @Test(expected = NullPointerException.class)
     public void tryToCallInWithNullStringForMandatoryValue() {
         underTest.in(null, ACME);

From ef97a0cca27ef0377b2aaebf44aa92cca1570c44 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@bosch.io>
Date: Wed, 15 Feb 2023 11:39:06 +0100
Subject: [PATCH 046/173] ignore very unstable unit test

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
---
 .../messaging/persistence/ConnectionPersistenceActorTest.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
index 29e65232d02..5fc675a4de2 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActorTest.java
@@ -94,6 +94,7 @@
 import org.eclipse.ditto.thingsearch.model.signals.commands.subscription.CreateSubscription;
 import org.junit.Before;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -1241,6 +1242,7 @@ private static boolean isMessageSenderInstanceOf(final Object message, final Cla
     }
 
     @Test
+    @Ignore("TODO unignore and stabilize flaky test")
     public void retriesStartingClientActor() {
         final var parent = actorSystemResource1.newTestProbe();
         final var underTest = parent.childActorOf(

From dd79a8c81237eb857d3e9f72896c5dd801f799b0 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <ditto@jaeckles.de>
Date: Mon, 20 Feb 2023 11:32:21 +0100
Subject: [PATCH 047/173] removed access token from star history chart

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ee6d28b749c..cc627a66e31 100755
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ You should be able to work with your locally running default using the `local_di
 
 ## Star History
 
-[![Star History Chart](https://api.star-history.com/svg?repos=eclipse-ditto/ditto&type=Date)](https://star-history.com/?secret=Z2hwXzJERUNBUmFRa09KM3BvdTFMUkJ1Y3VnY25FV3hxVjNBM3hEVQ==#eclipse-ditto/ditto&Date)
+[![Star History Chart](https://api.star-history.com/svg?repos=eclipse-ditto/ditto&type=Date)](https://star-history.com/#eclipse-ditto/ditto&Date)
 
 ## Getting started
 

From 02ce409095b9ed39f7917198f05ba049b222f2b7 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Mon, 13 Feb 2023 20:44:14 +0100
Subject: [PATCH 048/173] Explorer UI - autocomplete for search

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/index.css                                 |   8 ++
 ui/index.html                                |   1 +
 ui/modules/connections/connections.html      |   3 +
 ui/modules/connections/connectionsMonitor.js |  58 +++++++++-
 ui/modules/things/searchFilter.js            | 110 ++++++++++++++++---
 ui/modules/things/things.html                |   4 +-
 ui/modules/utils.js                          |  47 +++++++-
 7 files changed, 205 insertions(+), 26 deletions(-)

diff --git a/ui/index.css b/ui/index.css
index 401a2c5ab0c..0f725c5f5e5 100644
--- a/ui/index.css
+++ b/ui/index.css
@@ -179,4 +179,12 @@ hr {
 h5>.badge {
     vertical-align: top;
     font-size: 0.6em;
+}
+
+.autoComplete_wrapper {
+    flex-grow: 1;
+}
+
+.autoComplete_wrapper ul > li[aria-selected="true"] {
+    background-color: rgba(123, 123, 123, 0.1);
 }
\ No newline at end of file
diff --git a/ui/index.html b/ui/index.html
index d9d9935f995..6905061c8a3 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -45,6 +45,7 @@
         integrity="sha512-GZ1RIgZaSc8rnco/8CXfRdCpDxRCphenIiZ2ztLy3XQfCbQUSCuk8IudvNHxkRA3oUg6q0qejgN/qqyG1duv5Q=="
         crossorigin="anonymous" type="text/javascript" charset="utf-8"></script>
     <script src="https://cdn.jsdelivr.net/npm/jsonpath-plus@5.0.3/dist/index-browser-esm.min.js" type="module"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@tarekraafat/autocomplete.js@10.2.7/dist/autoComplete.min.js"></script>
     <script src="modules/utils/crudToolbar.js" type="module"></script>
     <script src="main.js" type="module"></script>
 </head>
diff --git a/ui/modules/connections/connections.html b/ui/modules/connections/connections.html
index a191afa1ff4..f026ff9ef87 100644
--- a/ui/modules/connections/connections.html
+++ b/ui/modules/connections/connections.html
@@ -166,6 +166,9 @@ <h6>Connection Logs</h6>
                     Refresh
                 </button>
             </div>
+            <!-- <div class="input-group input-group-sm mb-1">
+                <input id="inputConnectionLogFilter" type="search" class="form-control form-control-sm" placeholder="Filter logs..."></input>
+            </div> -->
             <div class="table-wrap">
                 <table class="table table-striped table-hover table-sm">
                     <thead>
diff --git a/ui/modules/connections/connectionsMonitor.js b/ui/modules/connections/connectionsMonitor.js
index 1d313c389f2..3695803f422 100644
--- a/ui/modules/connections/connectionsMonitor.js
+++ b/ui/modules/connections/connectionsMonitor.js
@@ -29,6 +29,7 @@ let dom = {
   buttonRetrieveConnectionMetrics: null,
   buttonResetConnectionMetrics: null,
   tableValidationConnections: null,
+  // inputConnectionLogFilter: null,
 };
 
 let connectionLogs;
@@ -60,6 +61,7 @@ export function ready() {
   dom.buttonRetrieveConnectionMetrics.onclick = retrieveConnectionMetrics;
   document.querySelector('a[data-bs-target="#tabConnectionMetrics"]').onclick = retrieveConnectionMetrics;
   dom.buttonResetConnectionMetrics.onclick = onResetConnectionMetricsClick;
+  // dom.inputConnectionLogFilter.onchange = onConnectionLogFilterChange;
 }
 
 function onResetConnectionMetricsClick() {
@@ -112,19 +114,27 @@ function retrieveConnectionStatus() {
 
 function retrieveConnectionLogs() {
   Utils.assert(selectedConnectionId, 'Please select a connection', dom.tableValidationConnections);
-  dom.tbodyConnectionLogs.innerHTML = '';
-  connectionLogDetail.setValue('');
   API.callConnectionsAPI('retrieveConnectionLogs', (response) => {
     connectionLogs = response.connectionLogs;
     adjustEnableButton(response);
-    response.connectionLogs.forEach((entry) => {
-      Utils.addTableRow(dom.tbodyConnectionLogs, Utils.formatDate(entry.timestamp, true), false, false, entry.type, entry.level);
-    });
-    dom.tbodyConnectionLogs.scrollTop = dom.tbodyConnectionLogs.scrollHeight - dom.tbodyConnectionLogs.clientHeight;
+    fillConnectionLogsTable(response.connectionLogs);
   },
   selectedConnectionId);
 }
 
+let connectionLogsFilter;
+
+function fillConnectionLogsTable(entries) {
+  dom.tbodyConnectionLogs.innerHTML = '';
+  connectionLogDetail.setValue('');
+
+  let filter = connectionLogsFilter ? connectionLogsFilter.match : (a => true);
+  entries.filter(filter).forEach((entry) => {
+    Utils.addTableRow(dom.tbodyConnectionLogs, Utils.formatDate(entry.timestamp, true), false, false, entry.type, entry.level);
+  });
+  dom.tbodyConnectionLogs.scrollTop = dom.tbodyConnectionLogs.scrollHeight - dom.tbodyConnectionLogs.clientHeight;
+}
+
 function adjustEnableButton(response) {
   if (response.enabledUntil) {
     dom.buttonEnableConnectionLogs.querySelector('i').classList.replace('bi-toggle-off', 'bi-toggle-on');
@@ -145,3 +155,39 @@ function onConnectionChange(connection, isNewConnection = true) {
     retrieveConnectionLogs();
   }
 }
+
+function JsonFilter() {
+  let _filters = [];
+
+  const match = (object) => {
+    let result = true;
+    _filters.forEach((f) => result = result && object[f.key] === f.value);
+    return result;
+  };
+
+  const add = (key, value) => {
+    _filters.push({key: key, value: value});
+  };
+
+  return {
+    match,
+    add,
+  };
+}
+
+const knownFields = ['category', 'type', 'level'];
+
+function onConnectionLogFilterChange(event) {
+  if (event.target.value && event.target.value !== '') {
+    connectionLogsFilter = new JsonFilter();
+    event.target.value.split(/(\s+)/).forEach((elem) => {
+      const keyValue = elem.split(':');
+      if (keyValue.length === 2 && knownFields.includes(keyValue[0].trim())) {
+        connectionLogsFilter.add(keyValue[0].trim(), keyValue[1].trim());
+      }
+    });
+  } else {
+    connectionLogsFilter = null;
+  }
+  fillConnectionLogsTable(connectionLogs);
+}
diff --git a/ui/modules/things/searchFilter.js b/ui/modules/things/searchFilter.js
index fbbbe2f72ef..077b4449e1f 100644
--- a/ui/modules/things/searchFilter.js
+++ b/ui/modules/things/searchFilter.js
@@ -31,7 +31,9 @@ const filterHistory = [];
 
 let keyStrokeTimeout;
 
-const FILTER_PLACEHOLDER = '*****';
+const FILTER_PLACEHOLDER = '...';
+
+let autoCompleteJS;
 
 const dom = {
   filterList: null,
@@ -53,15 +55,15 @@ export async function ready() {
 
   dom.pinnedThings.onclick = ThingsSearch.pinnedTriggered;
 
+  autoCompleteJS = Utils.createAutoComplete('#searchFilterEdit', createFilterList, 'Search for Things...');
+  autoCompleteJS.input.addEventListener('selection', (event) => {
+    const selection = event.detail.selection.value;
+    fillSearchFilterEdit(selection.rql);
+  });
 
   dom.filterList.addEventListener('click', (event) => {
     if (event.target && event.target.classList.contains('dropdown-item')) {
-      dom.searchFilterEdit.value = event.target.textContent;
-      checkIfFavourite();
-      const filterEditNeeded = checkAndMarkParameter();
-      if (!filterEditNeeded) {
-        ThingsSearch.searchTriggered(event.target.textContent);
-      }
+      fillSearchFilterEdit(event.target.textContent);
     }
   });
 
@@ -78,7 +80,7 @@ export async function ready() {
   };
 
   dom.searchFilterEdit.onkeyup = (event) => {
-    if (event.key === 'Enter' || event.code === 13) {
+    if ((event.key === 'Enter' || event.code === 13) && dom.searchFilterEdit.value.indexOf(FILTER_PLACEHOLDER) < 0) {
       fillHistory(dom.searchFilterEdit.value);
       ThingsSearch.searchTriggered(dom.searchFilterEdit.value);
     } else {
@@ -87,14 +89,10 @@ export async function ready() {
     }
   };
 
-  dom.searchFilterEdit.onclick = (event) => {
-    if (event.target.selectionStart === event.target.selectionEnd) {
-      event.target.select();
-    }
+  dom.searchFilterEdit.onchange = () => {
+    ThingsSearch.removeMoreFromThingList();
   };
 
-  dom.searchFilterEdit.onchange = ThingsSearch.removeMoreFromThingList;
-
   dom.searchFilterEdit.focus();
 }
 
@@ -111,6 +109,16 @@ function onEnvironmentChanged() {
   updateFilterList();
 }
 
+function fillSearchFilterEdit(fillString) {
+  dom.searchFilterEdit.value = fillString;
+
+  checkIfFavourite();
+  const filterEditNeeded = checkAndMarkParameter();
+  if (!filterEditNeeded) {
+    ThingsSearch.searchTriggered(dom.searchFilterEdit.value);
+  }
+}
+
 /**
  * Updates the UI filterList
  */
@@ -118,15 +126,81 @@ function updateFilterList() {
   dom.filterList.innerHTML = '';
   Utils.addDropDownEntries(dom.filterList, ['Favourite search filters'], true);
   Utils.addDropDownEntries(dom.filterList, Environments.current().filterList ?? []);
-  Utils.addDropDownEntries(dom.filterList, ['Field search filters'], true);
-  Utils.addDropDownEntries(dom.filterList, (Environments.current().fieldList ?? [])
-      .map((f) => `eq(${f.path},${FILTER_PLACEHOLDER})`));
   Utils.addDropDownEntries(dom.filterList, ['Example search filters'], true);
   Utils.addDropDownEntries(dom.filterList, filterExamples);
   Utils.addDropDownEntries(dom.filterList, ['Recent search filters'], true);
   Utils.addDropDownEntries(dom.filterList, filterHistory);
 }
 
+async function createFilterList(query) {
+  const date24h = new Date();
+  const date1h = new Date();
+  const date1m = new Date();
+  date24h.setDate(date24h.getDate() - 1);
+  date1h.setHours(date1h.getHours() - 1);
+  date1m.setMinutes(date1m.getMinutes() -1);
+
+  return [
+    {
+      label: 'Created since 1m',
+      rql: `gt(_created,"${date1m.toISOString()}")`,
+      group: 'Time',
+    },
+    {
+      label: 'Created since 1h',
+      rql: `gt(_created,"${date1h.toISOString()}")`,
+      group: 'Time',
+    },
+    {
+      label: 'Created since 24h',
+      rql: `gt(_created,"${date24h.toISOString()}")`,
+      group: 'Time',
+    },
+    {
+      label: 'Modified since 1m',
+      rql: `gt(_modified,"${date1m.toISOString()}")`,
+      group: 'Time',
+    },
+    {
+      label: 'Modified since 1h',
+      rql: `gt(_modified,"${date1h.toISOString()}")`,
+      group: 'Time',
+    },
+    {
+      label: 'Modified since 24h',
+      rql: `gt(_modified,"${date24h.toISOString()}")`,
+      group: 'Time',
+    },
+    {
+      label: `thingId = ${FILTER_PLACEHOLDER}`,
+      rql: `eq(thingId,"${FILTER_PLACEHOLDER}")`,
+      group: 'ThingId',
+    },
+    {
+      label: `thingId ~ ${FILTER_PLACEHOLDER}`,
+      rql: `like(thingId,"${FILTER_PLACEHOLDER}*")`,
+      group: 'ThingId',
+    },
+    {
+      label: `exists ${FILTER_PLACEHOLDER}`,
+      rql: `exists(${FILTER_PLACEHOLDER})`,
+      group: 'Other',
+    },
+    ...(Environments.current().filterList ?? []).map((f) => ({label: f, rql: f, group: 'Favourite'})),
+    ...(Environments.current().fieldList ?? []).map((f) => ({
+      label: `${f.label} = ${FILTER_PLACEHOLDER}`,
+      rql: `eq(${f.path},"${FILTER_PLACEHOLDER}")`,
+      group: 'Field',
+    })),
+    ...(Environments.current().fieldList ?? []).map((f) => ({
+      label: `${f.label} ~ ${FILTER_PLACEHOLDER}`,
+      rql: `like(${f.path},"*${FILTER_PLACEHOLDER}*")`,
+      group: 'Field',
+    })),
+    ...filterHistory.map((f) => ({label: f, rql: f, group: 'Recent'})),
+  ];
+}
+
 /**
  * Adds or removes the given filter from the list of search filters
  * @param {String} filter filter
@@ -160,6 +234,8 @@ function checkIfFavourite() {
 function checkAndMarkParameter() {
   const index = dom.searchFilterEdit.value.indexOf(FILTER_PLACEHOLDER);
   if (index >= 0) {
+    // filterString.replace(FILTER_PLACEHOLDER, '');
+    // dom.searchFilterEdit.value = filterString;
     dom.searchFilterEdit.focus();
     dom.searchFilterEdit.setSelectionRange(index, index + FILTER_PLACEHOLDER.length);
     return true;
diff --git a/ui/modules/things/things.html b/ui/modules/things/things.html
index 718866f7761..272c137281a 100644
--- a/ui/modules/things/things.html
+++ b/ui/modules/things/things.html
@@ -26,8 +26,8 @@ <h5>Things</h5>
                             data-bs-toggle="dropdown"></button>
                         <ul id="filterList" class="dropdown-menu" style="position: fixed; top: auto;"></ul>
                     </div>
-                    <input type="text" class="form-control form-control-sm autocomplete" placeholder="Search things..."
-                        id="searchFilterEdit" autocomplete="off"></input>
+                    <input type="search" class="form-control form-control-sm" 
+                        id="searchFilterEdit" spellcheck=false autocomplete="off"></input>
                     <button id="searchThings" class="btn btn-outline-secondary btn-sm" data-bs-toggle="tooltip"
                         title="Search things by thingId or valid ditto search filter">
                         search
diff --git a/ui/modules/utils.js b/ui/modules/utils.js
index af9e595832a..22520be2720 100644
--- a/ui/modules/utils.js
+++ b/ui/modules/utils.js
@@ -156,7 +156,7 @@ export function addDropDownEntries(target, items, isHeader = false) {
     const li = document.createElement('li');
     li.innerHTML = isHeader ?
         `<h6 class="dropdown-header">${value}</h6>` :
-        `<a class="dropdown-item">${value}</a>`;
+        `<a class="dropdown-item" href="#">${value}</a>`;
     target.appendChild(li);
   });
 }
@@ -309,6 +309,51 @@ export function createAceEditor(domId, sessionMode, readOnly) {
   return result;
 }
 
+/**
+ * Creates a autocomplete input field
+ * @param {String} selector selector for the input field
+ * @param {function} src src
+ * @param {String} placeHolder placeholder for input field
+ * @return {Object} autocomplete instance
+ */
+export function createAutoComplete(selector, src, placeHolder) {
+  return new autoComplete({
+    selector: selector,
+    data: {
+      src: src,
+      keys: ['label'],
+    },
+    placeHolder: placeHolder,
+    resultsList: {
+      class: 'dropdown-menu show',
+      maxResults: 30,
+    },
+    resultItem: {
+      class: 'dropdown-item',
+      highlight: true,
+      element: (item, data) => {
+        item.style = 'display: flex;';
+        item.innerHTML = `<span style="flex-grow: 1;" >${data.match}</span>
+            <span style="color: 3a8c9a;" class="fw-light fst-italic ms-1">${data.value.group}</span>`;
+      },
+    },
+    events: {
+      input: {
+        results: () => {
+          Array.from(document.getElementsByClassName('resizable_pane')).forEach((resizePane) => {
+            resizePane.style.overflow = 'unset';
+          });
+        },
+        close: () => {
+          Array.from(document.getElementsByClassName('resizable_pane')).forEach((resizePane) => {
+            resizePane.style.overflow = 'auto';
+          });
+        },
+      },
+    },
+  });
+}
+
 /**
  * Links the hidden input element for validation to the table
  * @param {HTMLElement} tableElement tbody that is validated

From 7f2e58bd353e959e931b3880d5d7003ea45d2b58 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <ditto@jaeckles.de>
Date: Tue, 21 Feb 2023 14:12:19 +0100
Subject: [PATCH 049/173] update Jekyll version in Gemfile dependencies to get
 local build/serve working * update contact information for Thomas Jaeckle

Signed-off-by: Thomas Jaeckle <ditto@jaeckles.de>
---
 documentation/src/main/resources/Gemfile      |  2 +-
 documentation/src/main/resources/Gemfile.lock | 47 ++++++++++---------
 .../src/main/resources/_data/authors.yml      |  2 +-
 pom.xml                                       |  4 +-
 things/service/pom.xml                        |  6 ---
 5 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/documentation/src/main/resources/Gemfile b/documentation/src/main/resources/Gemfile
index 05068a53e5c..957b8ed6e5f 100644
--- a/documentation/src/main/resources/Gemfile
+++ b/documentation/src/main/resources/Gemfile
@@ -8,7 +8,7 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 4.2.2"
+gem "jekyll", "~> 4.3.2"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 
diff --git a/documentation/src/main/resources/Gemfile.lock b/documentation/src/main/resources/Gemfile.lock
index 2a43b377843..d4a9af012af 100644
--- a/documentation/src/main/resources/Gemfile.lock
+++ b/documentation/src/main/resources/Gemfile.lock
@@ -1,36 +1,38 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
     ffi (1.15.5)
     forwardable-extended (2.6.0)
+    google-protobuf (3.22.0-arm64-darwin)
     http_parser.rb (0.8.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.2)
+    jekyll (4.3.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 2.0)
-    jekyll-sass-converter (2.2.0)
-      sassc (> 2.0.1, < 3.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
@@ -39,32 +41,33 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
-    rb-fsevent (0.11.1)
+    public_suffix (5.0.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.29.0)
+    rouge (4.1.0)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.8.0)
+    sass-embedded (1.58.3-arm64-darwin)
+      google-protobuf (~> 3.21)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.4.2)
     webrick (1.7.0)
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-22
 
 DEPENDENCIES
-  jekyll (~> 4.2.2)
+  jekyll (~> 4.3.2)
   jekyll-sitemap (~> 1.4.0)
   tzinfo-data
   webrick (~> 1.7.0)
diff --git a/documentation/src/main/resources/_data/authors.yml b/documentation/src/main/resources/_data/authors.yml
index 93333c8d446..ef679a63b10 100644
--- a/documentation/src/main/resources/_data/authors.yml
+++ b/documentation/src/main/resources/_data/authors.yml
@@ -1,6 +1,6 @@
 thomas_jaeckle:
     name: Thomas Jäckle
-    email: thomas.jaeckle@bosch.io
+    email: ditto@jaeckles.de
     web: https://github.com/thjaeckle
 
 florian_fendt:
diff --git a/pom.xml b/pom.xml
index f5998d5a886..cc179fb0532 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,10 +86,8 @@
         <developer>
             <id>tjaeckle</id>
             <name>Thomas Jaeckle</name>
-            <email>thomas.jaeckle@bosch.io</email>
+            <email>ditto@jaeckles.de</email>
             <url>https://github.com/thjaeckle</url>
-            <organization>Bosch.IO GmbH</organization>
-            <organizationUrl>https://www.bosch.io</organizationUrl>
             <roles>
                 <role>Lead</role>
                 <role>Committer</role>
diff --git a/things/service/pom.xml b/things/service/pom.xml
index c0c507bcf15..12119051343 100644
--- a/things/service/pom.xml
+++ b/things/service/pom.xml
@@ -205,12 +205,6 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-internal-utils-akka</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
 
         <dependency>
             <groupId>com.github.docker-java</groupId>

From 77b1c03143999e9f5a13382113ee89afd58eec20 Mon Sep 17 00:00:00 2001
From: Stanchev Aleksandar <aleksandar.stanchev@bosch.io>
Date: Fri, 10 Feb 2023 14:17:24 +0200
Subject: [PATCH 050/173] Create of thing's policy is atomic with creation the
 of thing itself Signed-off-by: Stanchev Aleksandar
 <aleksandar.stanchev@bosch.io>

Signed-off-by: Stanchev Aleksandar <aleksandar.stanchev@bosch.io>
---
 .../AbstractPersistenceSupervisor.java        | 21 +++++++-
 .../enforcement/RollbackCreatedPolicy.java    | 43 +++++++++++++++++
 .../enforcement/ThingEnforcerActor.java       |  3 ++
 .../enforcement/ThingPolicyCreated.java       | 28 +++++++++++
 .../actors/ThingSupervisorActor.java          | 48 +++++++++++++++++++
 5 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/RollbackCreatedPolicy.java
 create mode 100644 things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingPolicyCreated.java

diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
index 081e81121bb..c82cf237a71 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
@@ -347,6 +347,18 @@ protected CompletionStage<Object> modifyTargetActorCommandResponse(final Signal<
         return CompletableFuture.completedStage(persistenceCommandResponse);
     }
 
+
+    /**
+     * Hook for handling unexpected PersistenceActor exceptions before response is sent back to the SupervisorActor.
+     *
+     * @param error the error
+     * @param enforcedSignal the ditto headers from the initial command
+     */
+    protected CompletionStage<Object> handleTargetActorException(final Throwable error,
+            final Signal<?> enforcedSignal) {
+        return CompletableFuture.failedFuture(error);
+    }
+
     /**
      * Return a preferably static supervisor strategy for this actor. By default, child actor is stopped when killed
      * or failing, triggering restart after exponential back-off.
@@ -968,7 +980,14 @@ private CompletionStage<EnforcedSignalAndTargetActorResponse> enforcerResponseTo
                             modifyTargetActorCommandResponse(enforcedSignal, response))
                     .thenApply(response ->
                             new EnforcedSignalAndTargetActorResponse(enforcedSignal, response)
-                    );
+                    ).exceptionallyCompose(error -> {
+                        log.withCorrelationId(enforcedSignal)
+                                .error(error, "Unexpected target actor response error!");
+                        return handleTargetActorException(error, enforcedSignal)
+                                // Would never gon in apply as handleTargetActorException will always return failed future
+                                // Added only for compilation
+                                .thenApply(o -> new EnforcedSignalAndTargetActorResponse(null, null));
+                    });
         } else if (enforcerResponse instanceof DistributedPubWithMessage distributedPubWithMessage) {
             return askTargetActor(distributedPubWithMessage,
                     distributedPubWithMessage.signal().getDittoHeaders().isResponseRequired(), sender
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/RollbackCreatedPolicy.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/RollbackCreatedPolicy.java
new file mode 100644
index 00000000000..ace2e01ba88
--- /dev/null
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/RollbackCreatedPolicy.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+package org.eclipse.ditto.things.service.enforcement;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.eclipse.ditto.base.model.common.ResponseType;
+import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.things.model.signals.commands.modify.CreateThing;
+import org.eclipse.ditto.things.model.signals.commands.modify.CreateThingResponse;
+
+
+public record RollbackCreatedPolicy(Signal<?> initialCommand, Object response, CompletableFuture<Object> responseFuture) {
+
+    public static RollbackCreatedPolicy of(final Signal<?> command, final Object response,
+            final CompletableFuture<Object> responseFuture) {
+        return new RollbackCreatedPolicy(command, response, responseFuture);
+    }
+
+    public static boolean shouldRollback(final Signal<?> command, final Object response) {
+        return  command instanceof CreateThing && response instanceof CreateThingResponse thingResponse &&
+                thingResponse.getResponseType() == ResponseType.ERROR;
+    }
+
+    public void completeInitialResponse() {
+        if (response instanceof Throwable t) {
+            responseFuture.completeExceptionally(t);
+        } else {
+            responseFuture.complete(response);
+        }
+    }
+}
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java
index 713bc5b9a99..67beaaa4a47 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java
@@ -361,6 +361,9 @@ private Policy handleCreatePolicyResponse(final CreatePolicy createPolicy, final
             final CreateThing createThing) {
 
         if (policyResponse instanceof CreatePolicyResponse createPolicyResponse) {
+            getContext().getParent().tell(
+                    ThingPolicyCreated.of(createThing.getEntityId(), createPolicyResponse.getEntityId(),
+                            createPolicyResponse.getDittoHeaders()), getSelf());
             return createPolicyResponse.getPolicyCreated().orElseThrow();
         } else {
             if (shouldReportInitialPolicyCreationFailure(policyResponse)) {
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingPolicyCreated.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingPolicyCreated.java
new file mode 100644
index 00000000000..035195c942a
--- /dev/null
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingPolicyCreated.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+package org.eclipse.ditto.things.service.enforcement;
+
+
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.policies.model.PolicyId;
+import org.eclipse.ditto.things.model.ThingId;
+
+
+public record ThingPolicyCreated(ThingId thingId, PolicyId policyId, DittoHeaders dittoHeaders) {
+
+    public static ThingPolicyCreated of(final ThingId thingId, final PolicyId policyId, final DittoHeaders dittoHeaders) {
+        return new ThingPolicyCreated(thingId, policyId, dittoHeaders);
+    }
+
+}
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
index 6e93323c2ea..b12601c2064 100755
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
@@ -16,6 +16,7 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
 import javax.annotation.Nullable;
@@ -23,6 +24,8 @@
 import org.eclipse.ditto.base.model.acks.DittoAcknowledgementLabel;
 import org.eclipse.ditto.base.model.auth.AuthorizationContext;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
+import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.base.model.signals.commands.Command;
@@ -30,6 +33,7 @@
 import org.eclipse.ditto.base.model.signals.events.Event;
 import org.eclipse.ditto.base.service.actors.ShutdownBehaviour;
 import org.eclipse.ditto.base.service.config.supervision.ExponentialBackOffConfig;
+import org.eclipse.ditto.internal.utils.cacheloaders.AskWithRetry;
 import org.eclipse.ditto.internal.utils.cluster.ShardRegionProxyActorFactory;
 import org.eclipse.ditto.internal.utils.cluster.StopShardedActor;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
@@ -42,10 +46,12 @@
 import org.eclipse.ditto.policies.api.PoliciesMessagingConstants;
 import org.eclipse.ditto.policies.enforcement.PolicyEnforcerProvider;
 import org.eclipse.ditto.policies.enforcement.config.DefaultEnforcementConfig;
+import org.eclipse.ditto.policies.model.signals.commands.modify.DeletePolicy;
 import org.eclipse.ditto.things.api.ThingsMessagingConstants;
 import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.signals.commands.ThingCommandResponse;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingUnavailableException;
+import org.eclipse.ditto.things.model.signals.commands.modify.CreateThing;
 import org.eclipse.ditto.things.model.signals.commands.query.RetrieveThing;
 import org.eclipse.ditto.things.model.signals.commands.query.RetrieveThingResponse;
 import org.eclipse.ditto.things.model.signals.commands.query.ThingQueryCommand;
@@ -53,6 +59,8 @@
 import org.eclipse.ditto.things.service.common.config.DittoThingsConfig;
 import org.eclipse.ditto.things.service.enforcement.ThingEnforcement;
 import org.eclipse.ditto.things.service.enforcement.ThingEnforcerActor;
+import org.eclipse.ditto.things.service.enforcement.ThingPolicyCreated;
+import org.eclipse.ditto.things.service.enforcement.RollbackCreatedPolicy;
 import org.eclipse.ditto.thingsearch.api.ThingsSearchConstants;
 
 import akka.actor.ActorKilledException;
@@ -94,6 +102,8 @@ public final class ThingSupervisorActor extends AbstractPersistenceSupervisor<Th
     private final ActorRef searchShardRegionProxy;
 
     private final Duration shutdownTimeout;
+    @Nullable
+    private ThingPolicyCreated policyCreatedEvent;
 
     @SuppressWarnings("unused")
     private ThingSupervisorActor(final ActorRef pubSubMediator,
@@ -307,6 +317,10 @@ protected CompletionStage<Object> modifyTargetActorCommandResponse(final Signal<
                             pair.response() instanceof RetrieveThingResponse retrieveThingResponse) {
                         return inlinePolicyEnrichment.enrichPolicy(retrieveThing, retrieveThingResponse)
                                 .map(Object.class::cast);
+                    } else if (RollbackCreatedPolicy.shouldRollback(pair.command(), pair.response())) {
+                        CompletableFuture<Object> responseF = new CompletableFuture<>();
+                        getSelf().tell(RollbackCreatedPolicy.of(pair.command(), pair.response(), responseF), getSelf());
+                        return Source.fromCompletionStage(responseF);
                     } else {
                         return Source.single(pair.response());
                     }
@@ -315,6 +329,36 @@ protected CompletionStage<Object> modifyTargetActorCommandResponse(final Signal<
                 .run(materializer);
     }
 
+    @Override
+    protected CompletableFuture<Object> handleTargetActorException(final Throwable error, final Signal<?> enforcedSignal) {
+        if (enforcedSignal instanceof CreateThing createThing) {
+            CompletableFuture<Object> responseFuture = new CompletableFuture<>();
+            getSelf().tell(RollbackCreatedPolicy.of(createThing, error, responseFuture), getSelf());
+            return responseFuture;
+        }
+        return CompletableFuture.failedFuture(error);
+    }
+
+    private void handlerRollbackCreatedPolicy(final RollbackCreatedPolicy rollback) {
+        if (policyCreatedEvent != null) {
+            DittoHeaders dittoHeaders = rollback.initialCommand().getDittoHeaders();
+            final DeletePolicy deletePolicy = DeletePolicy.of(policyCreatedEvent.policyId(), dittoHeaders.toBuilder()
+                    .putHeader(DittoHeaderDefinition.DITTO_SUDO.getKey(), "true").build());
+            AskWithRetry.askWithRetry(policiesShardRegion, deletePolicy,
+                    enforcementConfig.getAskWithRetryConfig(),
+                    getContext().system(), response -> {
+                        log.withCorrelationId(dittoHeaders)
+                                .info("Policy <{}> deleted after rolling back it's creation. " +
+                                        "Policies shard region response: <{}>", deletePolicy.getEntityId(), response);
+                        rollback.completeInitialResponse();
+                        return response;
+                    });
+
+        } else {
+            rollback.completeInitialResponse();
+        }
+    }
+
     @Override
     protected ThingId getEntityId() throws Exception {
         return ThingId.of(URLDecoder.decode(getSelf().path().name(), StandardCharsets.UTF_8));
@@ -377,6 +421,10 @@ protected Receive activeBehaviour(final Runnable matchProcessNextTwinMessageBeha
             final FI.UnitApply<Object> matchAnyBehavior) {
         return ReceiveBuilder.create()
                 .matchEquals(Control.SHUTDOWN_TIMEOUT, this::shutdownActor)
+                .match(ThingPolicyCreated.class, event -> {
+                    this.policyCreatedEvent = event;
+                    log.withCorrelationId(event.dittoHeaders()).info("Policy <{}> created", event.policyId());
+                }).match(RollbackCreatedPolicy.class, this::handlerRollbackCreatedPolicy)
                 .build()
                 .orElse(super.activeBehaviour(matchProcessNextTwinMessageBehavior, matchAnyBehavior));
     }

From 10243357966e1d6d8ed8b0ad57c262d916f6c36f Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Thu, 23 Feb 2023 19:44:42 +0100
Subject: [PATCH 051/173] Explorer UI - change favorite spelling

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/modules/things/featureMessages.html |  4 ++--
 ui/modules/things/featureMessages.js   |  4 ++--
 ui/modules/things/searchFilter.js      | 18 +++++++++---------
 ui/modules/things/things.html          |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ui/modules/things/featureMessages.html b/ui/modules/things/featureMessages.html
index 1fee8384e90..c35f30fd50b 100644
--- a/ui/modules/things/featureMessages.html
+++ b/ui/modules/things/featureMessages.html
@@ -25,8 +25,8 @@
         <div class="input-group input-group-sm mb-1 has-validation">
             <label class="input-group-text">Template</label>
             <div class="btn-group dropend">
-                <button id="buttonMessageFavourite" class="btn btn-outline-secondary btn-sm" data-bs-toggle="tooltip"
-                    title="Save favourite for message on this feature">
+                <button id="buttonMessageFavorite" class="btn btn-outline-secondary btn-sm" data-bs-toggle="tooltip"
+                    title="Save favorite for message on this feature">
                     <i id="favIconMessage" class="bi bi-star"></i>
                 </button>
                 <button class="btn btn-outline-secondary btn-sm dropdown-toggle dropdown-toggle-split"
diff --git a/ui/modules/things/featureMessages.js b/ui/modules/things/featureMessages.js
index 69f1cdd24f0..53ab92a2afd 100644
--- a/ui/modules/things/featureMessages.js
+++ b/ui/modules/things/featureMessages.js
@@ -25,7 +25,7 @@ const dom = {
   inputMessageTimeout: null,
   inputMessageTemplate: null,
   buttonMessageSend: null,
-  buttonMessageFavourite: null,
+  buttonMessageFavorite: null,
   ulMessageTemplates: null,
   favIconMessage: null,
   tableValidationFeature: null,
@@ -61,7 +61,7 @@ export async function ready() {
     messageFeature();
   };
 
-  dom.buttonMessageFavourite.onclick = () => {
+  dom.buttonMessageFavorite.onclick = () => {
     const templateName = dom.inputMessageTemplate.value;
     const featureId = theFeatureId;
     Utils.assert(featureId, 'Please select a Feature', dom.tableValidationFeature);
diff --git a/ui/modules/things/searchFilter.js b/ui/modules/things/searchFilter.js
index 077b4449e1f..30de74f3b86 100644
--- a/ui/modules/things/searchFilter.js
+++ b/ui/modules/things/searchFilter.js
@@ -40,7 +40,7 @@ const dom = {
   favIcon: null,
   searchFilterEdit: null,
   searchThings: null,
-  searchFavourite: null,
+  searchFavorite: null,
   tabThings: null,
   pinnedThings: null,
 };
@@ -72,8 +72,8 @@ export async function ready() {
     ThingsSearch.searchTriggered(dom.searchFilterEdit.value);
   };
 
-  dom.searchFavourite.onclick = () => {
-    if (toggleFilterFavourite(dom.searchFilterEdit.value)) {
+  dom.searchFavorite.onclick = () => {
+    if (toggleFilterFavorite(dom.searchFilterEdit.value)) {
       dom.favIcon.classList.toggle('bi-star');
       dom.favIcon.classList.toggle('bi-star-fill');
     }
@@ -85,7 +85,7 @@ export async function ready() {
       ThingsSearch.searchTriggered(dom.searchFilterEdit.value);
     } else {
       clearTimeout(keyStrokeTimeout);
-      keyStrokeTimeout = setTimeout(checkIfFavourite, 1000);
+      keyStrokeTimeout = setTimeout(checkIfFavorite, 1000);
     }
   };
 
@@ -112,7 +112,7 @@ function onEnvironmentChanged() {
 function fillSearchFilterEdit(fillString) {
   dom.searchFilterEdit.value = fillString;
 
-  checkIfFavourite();
+  checkIfFavorite();
   const filterEditNeeded = checkAndMarkParameter();
   if (!filterEditNeeded) {
     ThingsSearch.searchTriggered(dom.searchFilterEdit.value);
@@ -124,7 +124,7 @@ function fillSearchFilterEdit(fillString) {
  */
 function updateFilterList() {
   dom.filterList.innerHTML = '';
-  Utils.addDropDownEntries(dom.filterList, ['Favourite search filters'], true);
+  Utils.addDropDownEntries(dom.filterList, ['Favorite search filters'], true);
   Utils.addDropDownEntries(dom.filterList, Environments.current().filterList ?? []);
   Utils.addDropDownEntries(dom.filterList, ['Example search filters'], true);
   Utils.addDropDownEntries(dom.filterList, filterExamples);
@@ -186,7 +186,7 @@ async function createFilterList(query) {
       rql: `exists(${FILTER_PLACEHOLDER})`,
       group: 'Other',
     },
-    ...(Environments.current().filterList ?? []).map((f) => ({label: f, rql: f, group: 'Favourite'})),
+    ...(Environments.current().filterList ?? []).map((f) => ({label: f, rql: f, group: 'Favorite'})),
     ...(Environments.current().fieldList ?? []).map((f) => ({
       label: `${f.label} = ${FILTER_PLACEHOLDER}`,
       rql: `eq(${f.path},"${FILTER_PLACEHOLDER}")`,
@@ -206,7 +206,7 @@ async function createFilterList(query) {
  * @param {String} filter filter
  * @return {boolean} true if the filter was toggled
  */
-function toggleFilterFavourite(filter) {
+function toggleFilterFavorite(filter) {
   if (!filter || filter === '') {
     return false;
   }
@@ -223,7 +223,7 @@ function toggleFilterFavourite(filter) {
 /**
  * Initializes the UI for the favicon dependent on wether the search filter is in the search filters
  */
-function checkIfFavourite() {
+function checkIfFavorite() {
   if (Environments.current().filterList.indexOf(dom.searchFilterEdit.value) >= 0) {
     dom.favIcon.classList.replace('bi-star', 'bi-star-fill');
   } else {
diff --git a/ui/modules/things/things.html b/ui/modules/things/things.html
index 272c137281a..4e4464f5553 100644
--- a/ui/modules/things/things.html
+++ b/ui/modules/things/things.html
@@ -18,8 +18,8 @@ <h5>Things</h5>
             <div class="col-md-6 resizable_flex_column">
                 <div class="input-group input-group-sm mb-1 mt-1">
                     <div class="btn-group dropend">
-                        <button id="searchFavourite" class="btn btn-outline-secondary btn-sm" data-bs-toggle="tooltip"
-                            title="Toggle favourite for search filter">
+                        <button id="searchFavorite" class="btn btn-outline-secondary btn-sm" data-bs-toggle="tooltip"
+                            title="Toggle favorite for search filter">
                             <i id="favIcon" class="bi bi-star"></i>
                         </button>
                         <button class="btn btn-outline-secondary btn-sm dropdown-toggle dropdown-toggle-split"

From c9a6d5eed62a6e2ff2742ea9a0b9044b91456f50 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Thu, 23 Feb 2023 20:40:30 +0100
Subject: [PATCH 052/173] UI - removed old dropdown for searchfilters

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/modules/things/searchFilter.js | 28 +---------------------------
 ui/modules/things/things.html     |  3 ---
 ui/modules/utils.js               |  7 ++++---
 3 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/ui/modules/things/searchFilter.js b/ui/modules/things/searchFilter.js
index 30de74f3b86..83f0542f4ad 100644
--- a/ui/modules/things/searchFilter.js
+++ b/ui/modules/things/searchFilter.js
@@ -36,7 +36,6 @@ const FILTER_PLACEHOLDER = '...';
 let autoCompleteJS;
 
 const dom = {
-  filterList: null,
   favIcon: null,
   searchFilterEdit: null,
   searchThings: null,
@@ -61,12 +60,6 @@ export async function ready() {
     fillSearchFilterEdit(selection.rql);
   });
 
-  dom.filterList.addEventListener('click', (event) => {
-    if (event.target && event.target.classList.contains('dropdown-item')) {
-      fillSearchFilterEdit(event.target.textContent);
-    }
-  });
-
   dom.searchThings.onclick = () => {
     fillHistory(dom.searchFilterEdit.value);
     ThingsSearch.searchTriggered(dom.searchFilterEdit.value);
@@ -106,7 +99,6 @@ function onEnvironmentChanged() {
   if (!Environments.current()['pinnedThings']) {
     Environments.current().pinnedThings = [];
   }
-  updateFilterList();
 }
 
 function fillSearchFilterEdit(fillString) {
@@ -119,19 +111,6 @@ function fillSearchFilterEdit(fillString) {
   }
 }
 
-/**
- * Updates the UI filterList
- */
-function updateFilterList() {
-  dom.filterList.innerHTML = '';
-  Utils.addDropDownEntries(dom.filterList, ['Favorite search filters'], true);
-  Utils.addDropDownEntries(dom.filterList, Environments.current().filterList ?? []);
-  Utils.addDropDownEntries(dom.filterList, ['Example search filters'], true);
-  Utils.addDropDownEntries(dom.filterList, filterExamples);
-  Utils.addDropDownEntries(dom.filterList, ['Recent search filters'], true);
-  Utils.addDropDownEntries(dom.filterList, filterHistory);
-}
-
 async function createFilterList(query) {
   const date24h = new Date();
   const date1h = new Date();
@@ -181,11 +160,6 @@ async function createFilterList(query) {
       rql: `like(thingId,"${FILTER_PLACEHOLDER}*")`,
       group: 'ThingId',
     },
-    {
-      label: `exists ${FILTER_PLACEHOLDER}`,
-      rql: `exists(${FILTER_PLACEHOLDER})`,
-      group: 'Other',
-    },
     ...(Environments.current().filterList ?? []).map((f) => ({label: f, rql: f, group: 'Favorite'})),
     ...(Environments.current().fieldList ?? []).map((f) => ({
       label: `${f.label} = ${FILTER_PLACEHOLDER}`,
@@ -198,6 +172,7 @@ async function createFilterList(query) {
       group: 'Field',
     })),
     ...filterHistory.map((f) => ({label: f, rql: f, group: 'Recent'})),
+    ...filterExamples.map((f) => ({label: f, rql: f, group: 'Example'})),
   ];
 }
 
@@ -247,7 +222,6 @@ function checkAndMarkParameter() {
 function fillHistory(filter) {
   if (!filterHistory.includes(filter)) {
     filterHistory.unshift(filter);
-    updateFilterList();
   }
 }
 
diff --git a/ui/modules/things/things.html b/ui/modules/things/things.html
index 4e4464f5553..2c5275686ec 100644
--- a/ui/modules/things/things.html
+++ b/ui/modules/things/things.html
@@ -22,9 +22,6 @@ <h5>Things</h5>
                             title="Toggle favorite for search filter">
                             <i id="favIcon" class="bi bi-star"></i>
                         </button>
-                        <button class="btn btn-outline-secondary btn-sm dropdown-toggle dropdown-toggle-split"
-                            data-bs-toggle="dropdown"></button>
-                        <ul id="filterList" class="dropdown-menu" style="position: fixed; top: auto;"></ul>
                     </div>
                     <input type="search" class="form-control form-control-sm" 
                         id="searchFilterEdit" spellcheck=false autocomplete="off"></input>
diff --git a/ui/modules/utils.js b/ui/modules/utils.js
index 22520be2720..6b69fff8eb5 100644
--- a/ui/modules/utils.js
+++ b/ui/modules/utils.js
@@ -321,7 +321,7 @@ export function createAutoComplete(selector, src, placeHolder) {
     selector: selector,
     data: {
       src: src,
-      keys: ['label'],
+      keys: ['label', 'group'],
     },
     placeHolder: placeHolder,
     resultsList: {
@@ -333,8 +333,9 @@ export function createAutoComplete(selector, src, placeHolder) {
       highlight: true,
       element: (item, data) => {
         item.style = 'display: flex;';
-        item.innerHTML = `<span style="flex-grow: 1;" >${data.match}</span>
-            <span style="color: 3a8c9a;" class="fw-light fst-italic ms-1">${data.value.group}</span>`;
+        item.innerHTML = `<span style="flex-grow: 1;" >${data.key === 'label' ? data.match : data.value.label}</span>
+            <span style="color: 3a8c9a;" class="fw-light fst-italic ms-1">
+              ${data.key === 'group' ? data.match : data.value.group}</span>`;
       },
     },
     events: {

From 03aa5a5255a0914ac1fa6ef67effbc5dea09c372 Mon Sep 17 00:00:00 2001
From: Bob Claerhout <bob.claerhout@aloxy.io>
Date: Tue, 28 Feb 2023 09:00:42 +0100
Subject: [PATCH 053/173] fix href in docs

Signed-off-by: Bob Claerhout <bob.claerhout@aloxy.io>
---
 .../src/main/resources/pages/ditto/installation-operating.md    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/src/main/resources/pages/ditto/installation-operating.md b/documentation/src/main/resources/pages/ditto/installation-operating.md
index fb992b7ce28..e12756f5d16 100644
--- a/documentation/src/main/resources/pages/ditto/installation-operating.md
+++ b/documentation/src/main/resources/pages/ditto/installation-operating.md
@@ -37,7 +37,7 @@ In order to have a look at all possible configuration options and what default v
 configuration files of Ditto's microservices:
 * Policies: [policies.conf](https://github.com/eclipse-ditto/ditto/blob/master/policies/service/src/main/resources/policies.conf)
 * Things: [things.conf](https://github.com/eclipse-ditto/ditto/blob/master/things/service/src/main/resources/things.conf)
-* Things-Search: [things-search.conf](https://github.com/eclipse-ditto/ditto/blob/master/thingsearch/service/src/main/resources/things-search.conf)
+* Things-Search: [things-search.conf](https://github.com/eclipse-ditto/ditto/blob/master/thingsearch/service/src/main/resources/search.conf)
 * Connectivity: [connectivity.conf](https://github.com/eclipse-ditto/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf)
 * Gateway: [gateway.conf](https://github.com/eclipse-ditto/ditto/blob/master/gateway/service/src/main/resources/gateway.conf)
 

From c13213136d064e487874479f11d3aacdc40ec08e Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Mon, 6 Mar 2023 20:12:58 +0100
Subject: [PATCH 054/173] [#1592] provide "Bearer" authentication for devops
 resources controlled via UI * added radiobutton groups so that "Authorize"
 modal clearly shows/states which authentication to use where * reduced to a
 single "Authorize" button in modal * simplified environment a bit

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 ui/index.css                               |   4 +
 ui/modules/api.js                          |  29 +++--
 ui/modules/environments/authorization.html | 126 ++++++++++++---------
 ui/modules/environments/authorization.js   |  56 ++++++---
 ui/templates/environmentTemplates.json     |  23 ++--
 5 files changed, 148 insertions(+), 90 deletions(-)

diff --git a/ui/index.css b/ui/index.css
index 0f725c5f5e5..347968dbfe0 100644
--- a/ui/index.css
+++ b/ui/index.css
@@ -46,6 +46,10 @@ body {
     padding-top: 60px;
 }
 
+#authorizationModal label {
+    display: inline;
+}
+
 .toast-header {
     color: #842029;
     background-color: #f8d7da;
diff --git a/ui/modules/api.js b/ui/modules/api.js
index cdadd62a39e..eb343316f2b 100644
--- a/ui/modules/api.js
+++ b/ui/modules/api.js
@@ -277,18 +277,25 @@ let authHeaderValue;
  * @param {boolean} forDevOps if true, the credentials for the dev ops api will be used.
  */
 export function setAuthHeader(forDevOps) {
-  if (forDevOps && Environments.current().useBasicAuth) {
-    authHeaderKey = 'Authorization';
-    authHeaderValue = 'Basic ' + window.btoa(Environments.current().usernamePasswordDevOps);
-  } else if (Environments.current().useBasicAuth) {
-    authHeaderKey = 'Authorization';
-    authHeaderValue = 'Basic ' + window.btoa(Environments.current().usernamePassword);
-  } else if (Environments.current().useDittoPreAuthenticatedAuth) {
-    authHeaderKey = 'x-ditto-pre-authenticated';
-    authHeaderValue = Environments.current().dittoPreAuthenticatedUsername;
+  if (forDevOps) {
+    if (Environments.current().devopsAuth === 'basic') {
+      authHeaderKey = 'Authorization';
+      authHeaderValue = 'Basic ' + window.btoa(Environments.current().usernamePasswordDevOps);
+    } else if (Environments.current().devopsAuth === 'bearer') {
+      authHeaderKey = 'Authorization';
+      authHeaderValue ='Bearer ' + Environments.current().bearerDevOps;
+    }
   } else {
-    authHeaderKey = 'Authorization';
-    authHeaderValue ='Bearer ' + Environments.current().bearer;
+    if (Environments.current().mainAuth === 'basic') {
+      authHeaderKey = 'Authorization';
+      authHeaderValue = 'Basic ' + window.btoa(Environments.current().usernamePassword);
+    } else if (Environments.current().mainAuth === 'pre') {
+      authHeaderKey = 'x-ditto-pre-authenticated';
+      authHeaderValue = Environments.current().dittoPreAuthenticatedUsername;
+    } else if (Environments.current().mainAuth === 'bearer') {
+      authHeaderKey = 'Authorization';
+      authHeaderValue ='Bearer ' + Environments.current().bearer;
+    }
   }
 }
 
diff --git a/ui/modules/environments/authorization.html b/ui/modules/environments/authorization.html
index 91637f2fe04..ef3a0b88486 100644
--- a/ui/modules/environments/authorization.html
+++ b/ui/modules/environments/authorization.html
@@ -18,78 +18,94 @@
                 <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <div class="modal-body">
-                <h5>Basic Auth</h5>
-                <hr />
                 <div class="row">
-                    <div class="col-md-5">
-                        <label>Main User</label>
-                    </div>
-                    <div class="col-md-7">
-                        <div class="input-group input-group-sm mb-1">
-                            <label class="input-group-text">Username</label>
-                            <input type="text" class="form-control form-control-sm" id="userName"></input>
+                    <h5>Basic Auth</h5>
+                    <hr />
+                    <div class="row">
+                        <div class="col-md-5">
+                            <input type="radio" id="main-userpass" name="main-auth" value="basic"></input>
+                            <label for="main-userpass">Main User</label>
                         </div>
-                        <div class="input-group input-group-sm mb-1">
-                            <label class="input-group-text">Password</label>
-                            <input type="password" class="form-control form-control-sm" id="password"></input>
+                        <div class="col-md-7">
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="userName" class="input-group-text">Username</label>
+                                <input type="text" class="form-control form-control-sm" id="userName"></input>
+                            </div>
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="password" class="input-group-text">Password</label>
+                                <input type="password" class="form-control form-control-sm" id="password"></input>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="row">
-                    <div class="col-md-5">
-                        <label>DevOps User<br /><small>(for Connections, optional)</small></label>
-                    </div>
-                    <div class="col-md-7">
-                        <div class="input-group input-group-sm mb-1">
-                            <label class="input-group-text">DevOps Username</label>
-                            <input type="text" class="form-control form-control-sm" id="devOpsUserName"></input>
+                    <div class="row">
+                        <div class="col-md-5">
+                            <input type="radio" id="devops-userpass" name="devops-auth" value="basic"></input>
+                            <label for="devops-userpass">DevOps User<br /><small>(for Connections, optional)</small></label>
                         </div>
-                        <div class="input-group input-group-sm mb-1">
-                            <label class="input-group-text">DevOps Password</label>
-                            <input type="password" class="form-control form-control-sm" id="devOpsPassword"></input>
+                        <div class="col-md-7">
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="devOpsUserName" class="input-group-text">DevOps Username</label>
+                                <input type="text" class="form-control form-control-sm" id="devOpsUserName"></input>
+                            </div>
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="devOpsPassword" class="input-group-text">DevOps Password</label>
+                                <input type="password" class="form-control form-control-sm" id="devOpsPassword"></input>
+                            </div>
                         </div>
                     </div>
                 </div>
-                <div class="input-group input-group-sm" style="flex-direction: row-reverse;">
-                    <button class="btn btn-outline-secondary btn-sm" data-bs-dismiss="modal"
-                        id="authorizeBasic">Authorize</button>
-                </div>
-                <h5>Bearer</h5>
-                <hr />
-                <div class="row">
-                    <div class="col-md-5">
-                        <label>Main User<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
+                <div class="row mt-3">
+                    <h5>Bearer</h5>
+                    <hr />
+                    <div class="row">
+                        <div class="col-md-5">
+                            <input type="radio" id="main-bearer" name="main-auth" value="bearer"></input>
+                            <label for="main-bearer">Main User<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
+                        </div>
+                        <div class="col-md-7">
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="bearer" class="input-group-text">Bearer</label>
+                                <input type="password" class="form-control form-control-sm" id="bearer"></input>
+                            </div>
+                        </div>
                     </div>
-                    <div class="col-md-7">
-                        <div class="input-group input-group-sm mb-1">
-                            <label class="input-group-text">Bearer</label>
-                            <input type="password" class="form-control form-control-sm" id="bearer"></input>
+                    <div class="row">
+                        <div class="col-md-5">
+                            <input type="radio" id="devops-bearer" name="devops-auth" value="bearer"></input>
+                            <label for="devops-bearer">DevOps User<br /><small>(JWT OAuth2.0 Bearer token, optional)</small></label>
+                        </div>
+                        <div class="col-md-7">
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="bearerDevOps" class="input-group-text">DevOps Bearer</label>
+                                <input type="password" class="form-control form-control-sm" id="bearerDevOps"></input>
+                            </div>
+                            <div class="input-group input-group-sm mb-1">
                         </div>
                     </div>
-                </div>
-                <div class="input-group input-group-sm" style="flex-direction: row-reverse;">
-                    <button class="btn btn-outline-secondary btn-sm" data-bs-dismiss="modal"
-                        id="authorizeBearer">Authorize</button>
-                </div>
-                <h5>Ditto Pre Authenticated</h5>
-                <hr />
-                <div class="row">
-                    <div class="col-md-5">
-                        <label>Main User<br />
-                            <small>(via HTTP header 'x-ditto-pre-authenticated', must take the form
-                                <code>prefix:suffix</code>)</small>
-                        </label>
                     </div>
-                    <div class="col-md-7">
-                        <div class="input-group input-group-sm mb-1">
-                            <label class="input-group-text">Username</label>
-                            <input type="text" class="form-control form-control-sm" id="dittoPreAuthenticatedUsername"></input>
+                </div>
+                <div class="row mt-3">
+                    <h5>Ditto Pre Authenticated</h5>
+                    <hr />
+                    <div class="row">
+                        <div class="col-md-5">
+                            <input type="radio" id="main-pre" name="main-auth" value="pre"></input>
+                            <label for="main-pre">Main User<br />
+                                <small>(via HTTP header 'x-ditto-pre-authenticated', must take the form
+                                    <code>prefix:suffix</code>)</small>
+                            </label>
+                        </div>
+                        <div class="col-md-7">
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="dittoPreAuthenticatedUsername" class="input-group-text">prefix:suffix</label>
+                                <input type="text" class="form-control form-control-sm" id="dittoPreAuthenticatedUsername"></input>
+                            </div>
                         </div>
                     </div>
                 </div>
                 <div class="input-group input-group-sm" style="flex-direction: row-reverse;">
                     <button class="btn btn-outline-secondary btn-sm" data-bs-dismiss="modal"
-                        id="authorizePreAuthenticated">Authorize</button>
+                        id="authorizeSubmit">Authorize</button>
                 </div>
             </div>
         </div>
diff --git a/ui/modules/environments/authorization.js b/ui/modules/environments/authorization.js
index 6c261a8fe1e..9a1752f6a0b 100644
--- a/ui/modules/environments/authorization.js
+++ b/ui/modules/environments/authorization.js
@@ -21,6 +21,7 @@ let dom = {
   bearer: null,
   userName: null,
   password: null,
+  bearerDevOps: null,
   devOpsUserName: null,
   devOpsPassword: null,
   dittoPreAuthenticatedUsername: null,
@@ -30,24 +31,50 @@ let dom = {
 export function ready() {
   Utils.getAllElementsById(dom);
 
-  document.getElementById('authorizeBearer').onclick = () => {
-    Environments.current().useBasicAuth = false;
-    Environments.current().useDittoPreAuthenticatedAuth = false;
-    Environments.current().bearer = dom.bearer.value;
-    Environments.environmentsJsonChanged('authorization');
+  document.getElementById('authorize').onclick = () => {
+    let mainAuth = Environments.current().mainAuth;
+    let devopsAuth = Environments.current().devopsAuth;
+
+    if (!mainAuth) {
+      if (dom.dittoPreAuthenticatedUsername.value && dom.dittoPreAuthenticatedUsername.value.length > 0) {
+        mainAuth = 'pre';
+      } else if (dom.bearer.value && dom.bearer.value.length > 0) {
+        mainAuth = 'bearer';
+      } else if (dom.userName.value && dom.userName.value.length > 0) {
+        mainAuth = 'basic';
+      }
+    }
+    if (!devopsAuth) {
+      if (dom.bearerDevOps.value && dom.bearerDevOps.value.length > 0) {
+        devopsAuth = 'bearer';
+      } else if (dom.devOpsUserName.value && dom.devOpsUserName.value.length > 0) {
+        devopsAuth = 'basic';
+      }
+    }
+
+    const mainAuths = document.querySelectorAll('input[name="main-auth"]');
+    for(let i = 0; i < mainAuths.length; i++) {
+      mainAuths[i].checked = mainAuths[i].value === mainAuth;
+    }
+
+    const devopsAuths = document.querySelectorAll('input[name="devops-auth"]');
+    for(let i = 0; i < devopsAuths.length; i++) {
+      devopsAuths[i].checked = devopsAuths[i].value === devopsAuth;
+    }
+
   };
 
-  document.getElementById('authorizeBasic').onclick = () => {
-    Environments.current().useBasicAuth = true;
-    Environments.current().useDittoPreAuthenticatedAuth = false;
+  document.getElementById('authorizeSubmit').onclick = () => {
+    const mainAuthSelector = document.querySelector('input[name="main-auth"]:checked');
+    const mainAuth = mainAuthSelector ? mainAuthSelector.value : undefined;
+    const devopsAuthSelector = document.querySelector('input[name="devops-auth"]:checked');
+    const devopsAuth = devopsAuthSelector ? devopsAuthSelector.value : undefined;
+    Environments.current().mainAuth = mainAuth;
+    Environments.current().devopsAuth = devopsAuth;
     Environments.current().usernamePassword = dom.userName.value + ':' + dom.password.value;
     Environments.current().usernamePasswordDevOps = dom.devOpsUserName.value + ':' + dom.devOpsPassword.value;
-    Environments.environmentsJsonChanged('authorization');
-  };
-
-  document.getElementById('authorizePreAuthenticated').onclick = () => {
-    Environments.current().useBasicAuth = false;
-    Environments.current().useDittoPreAuthenticatedAuth = true;
+    Environments.current().bearer = dom.bearer.value;
+    Environments.current().bearerDevOps = dom.bearerDevOps.value;
     Environments.current().dittoPreAuthenticatedUsername = dom.dittoPreAuthenticatedUsername.value;
     Environments.environmentsJsonChanged();
   };
@@ -63,6 +90,7 @@ export function onEnvironmentChanged() {
   dom.devOpsUserName.value = usernamePassword.split(':')[0];
   dom.devOpsPassword.value = usernamePassword.split(':')[1];
   dom.bearer.value = Environments.current().bearer ? Environments.current().bearer : '';
+  dom.bearerDevOps.value = Environments.current().bearerDevOps ? Environments.current().bearerDevOps : '';
   dom.dittoPreAuthenticatedUsername.value = Environments.current().dittoPreAuthenticatedUsername ?
                                             Environments.current().dittoPreAuthenticatedUsername :
                                             '';
diff --git a/ui/templates/environmentTemplates.json b/ui/templates/environmentTemplates.json
index 6cbfe8e24a2..5bca6192b7c 100644
--- a/ui/templates/environmentTemplates.json
+++ b/ui/templates/environmentTemplates.json
@@ -3,30 +3,33 @@
     "api_uri": "http://localhost:8080",
     "ditto_version": 3,
     "bearer": null,
+    "bearerDevOps": null,
     "defaultUsernamePassword": "ditto:ditto",
+    "defaultDittoPreAuthenticatedUsername": null,
     "defaultUsernamePasswordDevOps": "devops:foobar",
-    "useBasicAuth": true,
-    "useDittoPreAuthenticatedAuth": false,
-    "defaultDittoPreAuthenticatedUsername": null
+    "mainAuth": "basic",
+    "devopsAuth": "basic"
   },
   "local_ditto_ide": {
     "api_uri": "http://localhost:8080",
     "ditto_version": 3,
     "bearer": null,
+    "bearerDevOps": null,
     "defaultUsernamePassword": null,
-    "defaultUsernamePasswordDevOps": null,
-    "useBasicAuth": false,
-    "useDittoPreAuthenticatedAuth": true,
-    "defaultDittoPreAuthenticatedUsername": "pre:ditto"
+    "defaultDittoPreAuthenticatedUsername": "pre:ditto",
+    "defaultUsernamePasswordDevOps": "devops:foobar",
+    "mainAuth": "pre",
+    "devopsAuth": "basic"
   },
   "ditto_sandbox": {
     "api_uri": "https://ditto.eclipseprojects.io",
     "ditto_version": 3,
     "bearer": null,
+    "bearerDevOps": null,
     "defaultUsernamePassword": "ditto:ditto",
+    "defaultDittoPreAuthenticatedUsername": null,
     "defaultUsernamePasswordDevOps": null,
-    "useBasicAuth": true,
-    "useDittoPreAuthenticatedAuth": false,
-    "defaultDittoPreAuthenticatedUsername": null
+    "mainAuth": "basic",
+    "devopsAuth": null
   }
 }
\ No newline at end of file

From 176acd83036d7dde5eea60c467b7fdb5c6426b6c Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Tue, 7 Mar 2023 07:55:20 +0100
Subject: [PATCH 055/173] [#1592] switched grouping of different auth* methods
 based on "main / devops" auth

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 ui/modules/environments/authorization.html | 67 +++++++++++-----------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/ui/modules/environments/authorization.html b/ui/modules/environments/authorization.html
index ef3a0b88486..c0e2b7051f4 100644
--- a/ui/modules/environments/authorization.html
+++ b/ui/modules/environments/authorization.html
@@ -19,12 +19,12 @@
             </div>
             <div class="modal-body">
                 <div class="row">
-                    <h5>Basic Auth</h5>
+                    <h5>Main authentication</h5>
                     <hr />
                     <div class="row">
                         <div class="col-md-5">
                             <input type="radio" id="main-userpass" name="main-auth" value="basic"></input>
-                            <label for="main-userpass">Main User</label>
+                            <label for="main-userpass">Basic</label>
                         </div>
                         <div class="col-md-7">
                             <div class="input-group input-group-sm mb-1">
@@ -37,42 +37,58 @@ <h5>Basic Auth</h5>
                             </div>
                         </div>
                     </div>
-                    <div class="row">
+                    <div class="row pt-2">
                         <div class="col-md-5">
-                            <input type="radio" id="devops-userpass" name="devops-auth" value="basic"></input>
-                            <label for="devops-userpass">DevOps User<br /><small>(for Connections, optional)</small></label>
+                            <input type="radio" id="main-bearer" name="main-auth" value="bearer"></input>
+                            <label for="main-bearer">Bearer<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
                         </div>
                         <div class="col-md-7">
                             <div class="input-group input-group-sm mb-1">
-                                <label for="devOpsUserName" class="input-group-text">DevOps Username</label>
-                                <input type="text" class="form-control form-control-sm" id="devOpsUserName"></input>
+                                <label for="bearer" class="input-group-text">Bearer</label>
+                                <input type="password" class="form-control form-control-sm" id="bearer"></input>
                             </div>
+                        </div>
+                    </div>
+                    <div class="row pt-2">
+                        <div class="col-md-5">
+                            <input type="radio" id="main-pre" name="main-auth" value="pre"></input>
+                            <label for="main-pre">Pre authenticated<br />
+                                <small>(via HTTP header 'x-ditto-pre-authenticated', must take the form
+                                    <code>prefix:suffix</code>)</small>
+                            </label>
+                        </div>
+                        <div class="col-md-7">
                             <div class="input-group input-group-sm mb-1">
-                                <label for="devOpsPassword" class="input-group-text">DevOps Password</label>
-                                <input type="password" class="form-control form-control-sm" id="devOpsPassword"></input>
+                                <label for="dittoPreAuthenticatedUsername" class="input-group-text">prefix:suffix</label>
+                                <input type="text" class="form-control form-control-sm" id="dittoPreAuthenticatedUsername"></input>
                             </div>
                         </div>
                     </div>
                 </div>
                 <div class="row mt-3">
-                    <h5>Bearer</h5>
+                    <h5>DevOps authentication</h5>
+                    <small>(for Connections and administrative tasks, optional)</small>
                     <hr />
                     <div class="row">
                         <div class="col-md-5">
-                            <input type="radio" id="main-bearer" name="main-auth" value="bearer"></input>
-                            <label for="main-bearer">Main User<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
+                            <input type="radio" id="devops-userpass" name="devops-auth" value="basic"></input>
+                            <label for="devops-userpass">Basic<br /></label>
                         </div>
                         <div class="col-md-7">
                             <div class="input-group input-group-sm mb-1">
-                                <label for="bearer" class="input-group-text">Bearer</label>
-                                <input type="password" class="form-control form-control-sm" id="bearer"></input>
+                                <label for="devOpsUserName" class="input-group-text">DevOps Username</label>
+                                <input type="text" class="form-control form-control-sm" id="devOpsUserName"></input>
+                            </div>
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="devOpsPassword" class="input-group-text">DevOps Password</label>
+                                <input type="password" class="form-control form-control-sm" id="devOpsPassword"></input>
                             </div>
                         </div>
                     </div>
-                    <div class="row">
+                    <div class="row pt-2">
                         <div class="col-md-5">
                             <input type="radio" id="devops-bearer" name="devops-auth" value="bearer"></input>
-                            <label for="devops-bearer">DevOps User<br /><small>(JWT OAuth2.0 Bearer token, optional)</small></label>
+                            <label for="devops-bearer">Bearer<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
                         </div>
                         <div class="col-md-7">
                             <div class="input-group input-group-sm mb-1">
@@ -84,25 +100,6 @@ <h5>Bearer</h5>
                     </div>
                     </div>
                 </div>
-                <div class="row mt-3">
-                    <h5>Ditto Pre Authenticated</h5>
-                    <hr />
-                    <div class="row">
-                        <div class="col-md-5">
-                            <input type="radio" id="main-pre" name="main-auth" value="pre"></input>
-                            <label for="main-pre">Main User<br />
-                                <small>(via HTTP header 'x-ditto-pre-authenticated', must take the form
-                                    <code>prefix:suffix</code>)</small>
-                            </label>
-                        </div>
-                        <div class="col-md-7">
-                            <div class="input-group input-group-sm mb-1">
-                                <label for="dittoPreAuthenticatedUsername" class="input-group-text">prefix:suffix</label>
-                                <input type="text" class="form-control form-control-sm" id="dittoPreAuthenticatedUsername"></input>
-                            </div>
-                        </div>
-                    </div>
-                </div>
                 <div class="input-group input-group-sm" style="flex-direction: row-reverse;">
                     <button class="btn btn-outline-secondary btn-sm" data-bs-dismiss="modal"
                         id="authorizeSubmit">Authorize</button>

From 594ac98ec3fc3d836feed2bfe24ecb24dc10e4a5 Mon Sep 17 00:00:00 2001
From: Stanchev Aleksandar <aleksandar.stanchev@bosch.io>
Date: Mon, 6 Mar 2023 17:24:32 +0200
Subject: [PATCH 056/173] Added unit tests and fixed things pointed out in the
 code review.

Signed-off-by: Stanchev Aleksandar <aleksandar.stanchev@bosch.io>
---
 .../AbstractPersistenceSupervisor.java        |  26 +-
 .../enforcement/RollbackCreatedPolicy.java    |  43 ----
 .../enforcement/ThingEnforcerActor.java       |   5 +-
 .../enforcement/ThingPolicyCreated.java       |  16 +-
 .../actors/ThingSupervisorActor.java          | 106 ++++++--
 .../MultiStageCommandEnforcementTest.java     |   4 +
 .../actors/ThingPersistenceActorTest.java     | 231 ++++++++++++++++++
 7 files changed, 347 insertions(+), 84 deletions(-)
 delete mode 100644 things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/RollbackCreatedPolicy.java

diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
index c82cf237a71..e330df7d4c3 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
@@ -351,12 +351,12 @@ protected CompletionStage<Object> modifyTargetActorCommandResponse(final Signal<
     /**
      * Hook for handling unexpected PersistenceActor exceptions before response is sent back to the SupervisorActor.
      *
-     * @param error the error
-     * @param enforcedSignal the ditto headers from the initial command
+     * @param enforcedCommand the enforced initial command
+     * @param throwable the throwable
+     * @return a new {@link java.util.concurrent.CompletionStage} failed with the initial throwable.
      */
-    protected CompletionStage<Object> handleTargetActorException(final Throwable error,
-            final Signal<?> enforcedSignal) {
-        return CompletableFuture.failedFuture(error);
+    protected CompletionStage<Object> handleTargetActorException(final Object enforcedCommand, final Throwable throwable) {
+        return CompletableFuture.failedFuture(throwable);
     }
 
     /**
@@ -828,8 +828,9 @@ private void handleSignalEnforcementResponse(@Nullable final Object response,
                             "forwarding to target actor, telling sender: {}", dre);
             sender.tell(dre, getSelf());
         } else if (response instanceof Status.Success success) {
-            log.debug("Ignoring Status.Success message as expected 'to be ignored' outcome: <{}>", success);
+            log.withCorrelationId(signal).debug("Ignoring Status.Success message as expected 'to be ignored' outcome: <{}>", success);
         } else if (null != response) {
+            log.withCorrelationId(signal).debug("Sending response: <{}> back to sender: <{}>", response, sender.path());
             sender.tell(response, getSelf());
         } else {
             log.withCorrelationId(signal)
@@ -903,6 +904,10 @@ protected CompletionStage<Object> enforceSignalAndForwardToTargetActor(final S s
                             dittoHeaders = tracedSignal.getDittoHeaders();
                         }
                         return enforcerResponseToTargetActor(dittoHeaders, enforcedCommand, sender)
+                                .exceptionallyCompose(error -> handleTargetActorException(enforcedCommand, error)
+                                        .thenApply(o -> new EnforcedSignalAndTargetActorResponse(null, null)))
+                                        // HandleTargetActorException will always return failed future thenApply only
+                                        // for compilation
                                 .whenComplete((result, error) -> {
                                     startedSpan.mark("processed");
                                     stopTimer(processingTimer).accept(result, error);
@@ -980,14 +985,7 @@ private CompletionStage<EnforcedSignalAndTargetActorResponse> enforcerResponseTo
                             modifyTargetActorCommandResponse(enforcedSignal, response))
                     .thenApply(response ->
                             new EnforcedSignalAndTargetActorResponse(enforcedSignal, response)
-                    ).exceptionallyCompose(error -> {
-                        log.withCorrelationId(enforcedSignal)
-                                .error(error, "Unexpected target actor response error!");
-                        return handleTargetActorException(error, enforcedSignal)
-                                // Would never gon in apply as handleTargetActorException will always return failed future
-                                // Added only for compilation
-                                .thenApply(o -> new EnforcedSignalAndTargetActorResponse(null, null));
-                    });
+                    );
         } else if (enforcerResponse instanceof DistributedPubWithMessage distributedPubWithMessage) {
             return askTargetActor(distributedPubWithMessage,
                     distributedPubWithMessage.signal().getDittoHeaders().isResponseRequired(), sender
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/RollbackCreatedPolicy.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/RollbackCreatedPolicy.java
deleted file mode 100644
index ace2e01ba88..00000000000
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/RollbackCreatedPolicy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-
-package org.eclipse.ditto.things.service.enforcement;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.eclipse.ditto.base.model.common.ResponseType;
-import org.eclipse.ditto.base.model.signals.Signal;
-import org.eclipse.ditto.things.model.signals.commands.modify.CreateThing;
-import org.eclipse.ditto.things.model.signals.commands.modify.CreateThingResponse;
-
-
-public record RollbackCreatedPolicy(Signal<?> initialCommand, Object response, CompletableFuture<Object> responseFuture) {
-
-    public static RollbackCreatedPolicy of(final Signal<?> command, final Object response,
-            final CompletableFuture<Object> responseFuture) {
-        return new RollbackCreatedPolicy(command, response, responseFuture);
-    }
-
-    public static boolean shouldRollback(final Signal<?> command, final Object response) {
-        return  command instanceof CreateThing && response instanceof CreateThingResponse thingResponse &&
-                thingResponse.getResponseType() == ResponseType.ERROR;
-    }
-
-    public void completeInitialResponse() {
-        if (response instanceof Throwable t) {
-            responseFuture.completeExceptionally(t);
-        } else {
-            responseFuture.complete(response);
-        }
-    }
-}
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java
index 67beaaa4a47..230b1f7232d 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java
@@ -361,9 +361,8 @@ private Policy handleCreatePolicyResponse(final CreatePolicy createPolicy, final
             final CreateThing createThing) {
 
         if (policyResponse instanceof CreatePolicyResponse createPolicyResponse) {
-            getContext().getParent().tell(
-                    ThingPolicyCreated.of(createThing.getEntityId(), createPolicyResponse.getEntityId(),
-                            createPolicyResponse.getDittoHeaders()), getSelf());
+            getContext().getParent().tell(new ThingPolicyCreated(createThing.getEntityId(),
+                    createPolicyResponse.getEntityId(), createPolicy.getDittoHeaders()), getSelf());
             return createPolicyResponse.getPolicyCreated().orElseThrow();
         } else {
             if (shouldReportInitialPolicyCreationFailure(policyResponse)) {
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingPolicyCreated.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingPolicyCreated.java
index 035195c942a..b4aad9af16c 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingPolicyCreated.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingPolicyCreated.java
@@ -18,11 +18,11 @@
 import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.things.model.ThingId;
 
-
-public record ThingPolicyCreated(ThingId thingId, PolicyId policyId, DittoHeaders dittoHeaders) {
-
-    public static ThingPolicyCreated of(final ThingId thingId, final PolicyId policyId, final DittoHeaders dittoHeaders) {
-        return new ThingPolicyCreated(thingId, policyId, dittoHeaders);
-    }
-
-}
+/**
+ * Used by the {@link org.eclipse.ditto.things.service.enforcement.ThingEnforcerActor} to notify the
+ * ThingSupervisorActor that a policy was created in result of ThingCreate enforcement.
+ * @param thingId thingId of the thing for which policy is created
+ * @param policyId the policyId of the created policy
+ * @param dittoHeaders dittoHeaders containing the correlationId of the initial command
+ */
+ public record ThingPolicyCreated(ThingId thingId, PolicyId policyId, DittoHeaders dittoHeaders) {}
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
index b12601c2064..12a5ea8255d 100755
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
@@ -12,10 +12,12 @@
  */
 package org.eclipse.ditto.things.service.persistence.actors;
 
+
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Objects;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
@@ -23,6 +25,7 @@
 
 import org.eclipse.ditto.base.model.acks.DittoAcknowledgementLabel;
 import org.eclipse.ditto.base.model.auth.AuthorizationContext;
+import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
 import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
@@ -60,7 +63,6 @@
 import org.eclipse.ditto.things.service.enforcement.ThingEnforcement;
 import org.eclipse.ditto.things.service.enforcement.ThingEnforcerActor;
 import org.eclipse.ditto.things.service.enforcement.ThingPolicyCreated;
-import org.eclipse.ditto.things.service.enforcement.RollbackCreatedPolicy;
 import org.eclipse.ditto.thingsearch.api.ThingsSearchConstants;
 
 import akka.actor.ActorKilledException;
@@ -318,9 +320,9 @@ protected CompletionStage<Object> modifyTargetActorCommandResponse(final Signal<
                         return inlinePolicyEnrichment.enrichPolicy(retrieveThing, retrieveThingResponse)
                                 .map(Object.class::cast);
                     } else if (RollbackCreatedPolicy.shouldRollback(pair.command(), pair.response())) {
-                        CompletableFuture<Object> responseF = new CompletableFuture<>();
+                        final CompletableFuture<Object> responseF = new CompletableFuture<>();
                         getSelf().tell(RollbackCreatedPolicy.of(pair.command(), pair.response(), responseF), getSelf());
-                        return Source.fromCompletionStage(responseF);
+                        return Source.completionStage(responseF);
                     } else {
                         return Source.single(pair.response());
                     }
@@ -330,20 +332,29 @@ protected CompletionStage<Object> modifyTargetActorCommandResponse(final Signal<
     }
 
     @Override
-    protected CompletableFuture<Object> handleTargetActorException(final Throwable error, final Signal<?> enforcedSignal) {
-        if (enforcedSignal instanceof CreateThing createThing) {
-            CompletableFuture<Object> responseFuture = new CompletableFuture<>();
-            getSelf().tell(RollbackCreatedPolicy.of(createThing, error, responseFuture), getSelf());
+    protected CompletableFuture<Object> handleTargetActorException(final Object enforcedCommand, final Throwable throwable) {
+        if (RollbackCreatedPolicy.shouldRollback(enforcedCommand, throwable) &&
+                enforcedCommand instanceof Signal<?> signal) {
+            log.withCorrelationId(signal)
+                    .warning("Target actor exception received. Sending RollbackCreatedPolicy msg to self.");
+            final CompletableFuture<Object> responseFuture = new CompletableFuture<>();
+            getSelf().tell(RollbackCreatedPolicy.of(signal, throwable, responseFuture), getSelf());
             return responseFuture;
+        } else {
+            log.warning(throwable, "Target actor exception received.");
+            return CompletableFuture.failedFuture(throwable);
         }
-        return CompletableFuture.failedFuture(error);
     }
 
-    private void handlerRollbackCreatedPolicy(final RollbackCreatedPolicy rollback) {
+    private void handleRollbackCreatedPolicy(final RollbackCreatedPolicy rollback) {
         if (policyCreatedEvent != null) {
-            DittoHeaders dittoHeaders = rollback.initialCommand().getDittoHeaders();
-            final DeletePolicy deletePolicy = DeletePolicy.of(policyCreatedEvent.policyId(), dittoHeaders.toBuilder()
-                    .putHeader(DittoHeaderDefinition.DITTO_SUDO.getKey(), "true").build());
+            final String correlationId = rollback.initialCommand().getDittoHeaders().getCorrelationId()
+                    .orElse("unexpected:" + UUID.randomUUID());
+            final DittoHeaders dittoHeaders = DittoHeaders.newBuilder()
+                    .correlationId(correlationId)
+                    .putHeader(DittoHeaderDefinition.DITTO_SUDO.getKey(), "true")
+                    .build();
+            final DeletePolicy deletePolicy = DeletePolicy.of(policyCreatedEvent.policyId(), dittoHeaders);
             AskWithRetry.askWithRetry(policiesShardRegion, deletePolicy,
                     enforcementConfig.getAskWithRetryConfig(),
                     getContext().system(), response -> {
@@ -357,6 +368,7 @@ private void handlerRollbackCreatedPolicy(final RollbackCreatedPolicy rollback)
         } else {
             rollback.completeInitialResponse();
         }
+        policyCreatedEvent = null;
     }
 
     @Override
@@ -421,10 +433,10 @@ protected Receive activeBehaviour(final Runnable matchProcessNextTwinMessageBeha
             final FI.UnitApply<Object> matchAnyBehavior) {
         return ReceiveBuilder.create()
                 .matchEquals(Control.SHUTDOWN_TIMEOUT, this::shutdownActor)
-                .match(ThingPolicyCreated.class, event -> {
-                    this.policyCreatedEvent = event;
-                    log.withCorrelationId(event.dittoHeaders()).info("Policy <{}> created", event.policyId());
-                }).match(RollbackCreatedPolicy.class, this::handlerRollbackCreatedPolicy)
+                .match(ThingPolicyCreated.class, msg -> {
+                    log.withCorrelationId(msg.dittoHeaders()).info("ThingPolicyCreated msg received: <{}>", msg.policyId());
+                    this.policyCreatedEvent = msg;
+                }).match(RollbackCreatedPolicy.class, this::handleRollbackCreatedPolicy)
                 .build()
                 .orElse(super.activeBehaviour(matchProcessNextTwinMessageBehavior, matchAnyBehavior));
     }
@@ -441,4 +453,66 @@ private enum Control {
         SHUTDOWN_TIMEOUT
     }
 
+    /**
+     * Used from the {@link org.eclipse.ditto.things.service.persistence.actors.ThingSupervisorActor} to signal itself
+     * to delete an already created policy because of a failure in creating a thing
+     * @param initialCommand the initial command that triggered the creation of a thing and policy
+     * @param response the response from the thing persistence actor
+     * @param responseFuture a future that when completed with the response from the thing persistence actor the response
+     * will be sent to the initial sender.
+     */
+    private record RollbackCreatedPolicy(Signal<?> initialCommand, Object response, CompletableFuture<Object> responseFuture) {
+
+        /**
+         * Initialises an instance of {@link org.eclipse.ditto.things.service.persistence.actors.ThingSupervisorActor.RollbackCreatedPolicy}
+         * @param initialCommand the initial initialCommand that triggered the creation of a thing and policy
+         * @param response the response from the thing persistence actor
+         * @param responseFuture a future that when completed with the response from the thing persistence actor the response
+         * will be sent to the initial sender.
+         * @return an instance of {@link org.eclipse.ditto.things.service.persistence.actors.ThingSupervisorActor.RollbackCreatedPolicy}
+         */
+        public static RollbackCreatedPolicy of(final Signal<?> initialCommand, final Object response,
+                final CompletableFuture<Object> responseFuture) {
+            return new RollbackCreatedPolicy(initialCommand, response, responseFuture);
+        }
+
+        /**
+         * Evaluates if a failure in the creation of a thing should lead to deleting of that thing's policy.
+         * @param command the initial command.
+         * @param response the response from the {@link org.eclipse.ditto.things.service.persistence.actors.ThingPersistenceActor}.
+         * @return if the thing's policy is to be deleted.
+         */
+        public static boolean shouldRollback(final Signal<?> command, @Nullable final Object response) {
+            return shouldRollback(command, response, null);
+        }
+
+        /**
+         * Evaluates if a failure in the creation of a thing should lead to deleting of that thing's policy.
+         * @param command the initial command.
+         * @param throwable the throwable received from the Persistence Actor
+         * @return if the thing's policy is to be deleted.
+         */
+        public static boolean shouldRollback(final Object command, @Nullable final Throwable throwable) {
+            if (command instanceof Signal<?> signal) {
+                return shouldRollback(signal, null, throwable);
+            } else {
+                return false;
+            }
+        }
+        private static boolean shouldRollback(final Signal<?> command, @Nullable final Object response, @Nullable final Throwable throwable) {
+            return  command instanceof CreateThing && (response instanceof DittoRuntimeException || throwable != null);
+        }
+
+        /**
+         * Completes the responseFuture with the response which in turn should send the Persistence actor response to
+         * the initial sender.
+         */
+        void completeInitialResponse() {
+            if (response instanceof Throwable t) {
+                responseFuture.completeExceptionally(t);
+            } else {
+                responseFuture.complete(response);
+            }
+        }
+    }
 }
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/MultiStageCommandEnforcementTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/MultiStageCommandEnforcementTest.java
index 44f3a4686f9..df7facea575 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/MultiStageCommandEnforcementTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/MultiStageCommandEnforcementTest.java
@@ -47,6 +47,8 @@
 import org.eclipse.ditto.policies.model.signals.commands.exceptions.PolicyNotAccessibleException;
 import org.eclipse.ditto.policies.model.signals.commands.modify.CreatePolicy;
 import org.eclipse.ditto.policies.model.signals.commands.modify.CreatePolicyResponse;
+import org.eclipse.ditto.policies.model.signals.commands.modify.DeletePolicy;
+import org.eclipse.ditto.policies.model.signals.commands.modify.DeletePolicyResponse;
 import org.eclipse.ditto.policies.model.signals.commands.query.RetrievePolicy;
 import org.eclipse.ditto.policies.model.signals.commands.query.RetrievePolicyResponse;
 import org.eclipse.ditto.things.api.commands.sudo.SudoRetrieveThingResponse;
@@ -450,6 +452,8 @@ public void createThingWithExplicitPolicyNotAuthorizedBySelf() {
 
             thingPersistenceActorProbe.expectMsgClass(CreateThing.class);
             thingPersistenceActorProbe.reply(ThingNotModifiableException.newBuilder(thingId).build());
+            policiesShardRegionProbe.expectMsgClass(DeletePolicy.class);
+            policiesShardRegionProbe.reply(DeletePolicyResponse.of(policyId, DEFAULT_HEADERS));
 
             // THEN: initial requester receives error
             expectMsgClass(ThingNotModifiableException.class);
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorTest.java
index e87263621fb..d338ad604fa 100755
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActorTest.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -45,6 +46,9 @@
 import org.eclipse.ditto.base.model.signals.events.Event;
 import org.eclipse.ditto.internal.utils.cluster.DistPubSubAccess;
 import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
+import org.eclipse.ditto.internal.utils.pubsub.DistributedPub;
+import org.eclipse.ditto.internal.utils.pubsub.extractors.AckExtractor;
+import org.eclipse.ditto.internal.utils.pubsubthings.LiveSignalPub;
 import org.eclipse.ditto.internal.utils.test.Retry;
 import org.eclipse.ditto.internal.utils.tracing.DittoTracingInitResource;
 import org.eclipse.ditto.json.JsonFactory;
@@ -63,6 +67,8 @@
 import org.eclipse.ditto.policies.model.SubjectIssuer;
 import org.eclipse.ditto.policies.model.signals.commands.modify.CreatePolicy;
 import org.eclipse.ditto.policies.model.signals.commands.modify.CreatePolicyResponse;
+import org.eclipse.ditto.policies.model.signals.commands.modify.DeletePolicy;
+import org.eclipse.ditto.policies.model.signals.commands.modify.DeletePolicyResponse;
 import org.eclipse.ditto.things.api.Permission;
 import org.eclipse.ditto.things.model.Attributes;
 import org.eclipse.ditto.things.model.Feature;
@@ -112,6 +118,7 @@
 import org.eclipse.ditto.things.model.signals.events.ThingCreated;
 import org.eclipse.ditto.things.model.signals.events.ThingEvent;
 import org.eclipse.ditto.things.model.signals.events.ThingModified;
+import org.eclipse.ditto.things.service.enforcement.TestSetup;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -124,12 +131,15 @@
 import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigValueFactory;
 
+import akka.actor.AbstractActor;
 import akka.actor.ActorRef;
 import akka.actor.ActorSelection;
 import akka.actor.PoisonPill;
 import akka.actor.Props;
 import akka.cluster.pubsub.DistributedPubSubMediator;
+import akka.japi.pf.ReceiveBuilder;
 import akka.testkit.TestActorRef;
+import akka.testkit.TestProbe;
 import akka.testkit.javadsl.TestKit;
 import scala.PartialFunction;
 import scala.concurrent.Await;
@@ -2004,6 +2014,227 @@ public void testRemovalOfEmptyMetadataAfterDeletion() {
         }};
     }
 
+    @Test
+    public void unavailableExpectedAndPolicyIsDeletedIfPersistenceActorFails() {
+        final DittoHeaders dittoHeaders = dittoHeadersV2.toBuilder()
+                .correlationId(UUID.randomUUID().toString())
+                .build();
+        final Policy inlinePolicy = PoliciesModelFactory.newPolicyBuilder(POLICY_ID)
+                .setRevision(1L)
+                .forLabel("authorize-self")
+                .setSubject(SubjectIssuer.newInstance("test"), AUTH_SUBJECT)
+                .setGrantedPermissions(PoliciesResourceType.thingResource(JsonPointer.empty()),
+                        Permissions.newInstance(Permission.READ, Permission.WRITE))
+                .setGrantedPermissions(PoliciesResourceType.policyResource(JsonPointer.empty()),
+                        Permissions.newInstance(Permission.READ, Permission.WRITE))
+                .setGrantedPermissions(PoliciesResourceType.messageResource(JsonPointer.empty()),
+                        Permissions.newInstance(Permission.READ, Permission.WRITE))
+                .build();
+        final CreatePolicyResponse createPolicyResponse = CreatePolicyResponse.of(POLICY_ID, inlinePolicy,
+                DittoHeaders.empty());
+        when(policyEnforcerProvider.getPolicyEnforcer(POLICY_ID))
+                .thenReturn(CompletableFuture.completedStage(Optional.of(PolicyEnforcer.of(inlinePolicy))));
+
+        final DeletePolicyResponse deletePolicyResponse = DeletePolicyResponse.of(POLICY_ID, dittoHeaders);
+
+        new TestKit(actorSystem) {
+            {
+                Thing thing = createThingV2WithRandomId().toBuilder().setPolicyId(null).build();
+                ThingId thingId = getIdOrThrow(thing);
+
+                ActorRef underTest = createSupervisorActorWithCustomPersistenceActor(thingId,
+                        (thingId1, mongoReadJournal, distributedPub, searchShardRegionProxy) -> FailingInCtorActor.props());
+
+                CreateThing createThing = CreateThing.of(thing, null, dittoHeaders);
+                underTest.tell(createThing, getRef());
+                policiesShardRegionTestProbe.expectMsgClass(CreatePolicy.class);
+                policiesShardRegionTestProbe.reply(createPolicyResponse);
+                policiesShardRegionTestProbe.expectMsgClass(DeletePolicy.class);
+                policiesShardRegionTestProbe.reply(deletePolicyResponse);
+                expectMsgClass(ThingUnavailableException.class);
+                expectNoMessage();
+
+            }
+        };
+    }
+
+    @Test
+    public void policyShouldNotBeDeletedOnThingRetrieveAndActorFail() {
+        final DittoHeaders dittoHeaders = dittoHeadersV2.toBuilder()
+                .correlationId(UUID.randomUUID().toString())
+                .build();
+        final Policy inlinePolicy = PoliciesModelFactory.newPolicyBuilder(POLICY_ID)
+                .setRevision(1L)
+                .forLabel("authorize-self")
+                .setSubject(SubjectIssuer.newInstance("test"), AUTH_SUBJECT)
+                .setGrantedPermissions(PoliciesResourceType.thingResource(JsonPointer.empty()),
+                        Permissions.newInstance(Permission.READ, Permission.WRITE))
+                .setGrantedPermissions(PoliciesResourceType.policyResource(JsonPointer.empty()),
+                        Permissions.newInstance(Permission.READ, Permission.WRITE))
+                .setGrantedPermissions(PoliciesResourceType.messageResource(JsonPointer.empty()),
+                        Permissions.newInstance(Permission.READ, Permission.WRITE))
+                .build();
+        when(policyEnforcerProvider.getPolicyEnforcer(POLICY_ID))
+                .thenReturn(CompletableFuture.completedStage(Optional.of(PolicyEnforcer.of(inlinePolicy))));
+
+        new TestKit(actorSystem) {
+            {
+                Thing thing = createThingV2WithRandomId().toBuilder().setPolicyId(null).build();
+                ThingId thingId = getIdOrThrow(thing);
+
+                ActorRef underTest = createSupervisorActorWithCustomPersistenceActor(thingId,
+                        (thingId1, mongoReadJournal, distributedPub, searchShardRegionProxy) -> FailingInCtorActor.props());
+
+                RetrieveThing retrieveThing = RetrieveThing.of(thingId, dittoHeaders);
+                underTest.tell(retrieveThing, getRef());
+                policiesShardRegionTestProbe.expectNoMessage();
+                expectMsgClass(ThingUnavailableException.class);
+                expectNoMessage();
+
+            }
+        };
+    }
+
+    @Test
+    public void policyShouldBeDeletedOnThingCreateAndErrorResponse() {
+        final DittoHeaders dittoHeaders = dittoHeadersV2.toBuilder()
+                .correlationId(UUID.randomUUID().toString())
+                .build();
+        final Policy inlinePolicy = PoliciesModelFactory.newPolicyBuilder(POLICY_ID)
+                .setRevision(1L)
+                .forLabel("authorize-self")
+                .setSubject(SubjectIssuer.newInstance("test"), AUTH_SUBJECT)
+                .setGrantedPermissions(PoliciesResourceType.thingResource(JsonPointer.empty()),
+                        Permissions.newInstance(Permission.READ, Permission.WRITE))
+                .setGrantedPermissions(PoliciesResourceType.policyResource(JsonPointer.empty()),
+                        Permissions.newInstance(Permission.READ, Permission.WRITE))
+                .setGrantedPermissions(PoliciesResourceType.messageResource(JsonPointer.empty()),
+                        Permissions.newInstance(Permission.READ, Permission.WRITE))
+                .build();
+        final CreatePolicyResponse createPolicyResponse = CreatePolicyResponse.of(POLICY_ID, inlinePolicy,
+                DittoHeaders.empty());
+        when(policyEnforcerProvider.getPolicyEnforcer(POLICY_ID))
+                .thenReturn(CompletableFuture.completedStage(Optional.of(PolicyEnforcer.of(inlinePolicy))));
+
+        final DeletePolicyResponse deletePolicyResponse = DeletePolicyResponse.of(POLICY_ID, dittoHeaders);
+
+        new TestKit(actorSystem) {
+            {
+                Thing thing = createThingV2WithRandomId().toBuilder().setPolicyId(null).build();
+                ThingId thingId = getIdOrThrow(thing);
+
+                TestProbe testProbe = TestProbe.apply("mock-thingPersistenceActorProbe", actorSystem);
+                ActorRef underTest = createSupervisorActorWithCustomPersistenceActor(thingId, testProbe.ref());
+
+                CreateThing createThing = CreateThing.of(thing, null, dittoHeaders);
+                underTest.tell(createThing, getRef());
+
+                testProbe.expectNoMsg();
+
+
+                policiesShardRegionTestProbe.expectMsgClass(CreatePolicy.class);
+                policiesShardRegionTestProbe.reply(createPolicyResponse);
+
+                testProbe.expectMsgClass(CreateThing.class);
+                testProbe.reply(ThingUnavailableException.newBuilder(thingId)
+                        .dittoHeaders(dittoHeaders)
+                        .message("Error in target persistent actor").build());
+
+                policiesShardRegionTestProbe.expectMsgClass(DeletePolicy.class);
+                policiesShardRegionTestProbe.reply(deletePolicyResponse);
+                expectMsgClass(ThingUnavailableException.class);
+                expectNoMessage();
+
+            }
+        };
+    }
+
+    public static final class FailingInCtorActor extends AbstractActor {
+
+        public FailingInCtorActor() {
+            super();
+            throw new RuntimeException("Failed to create PersistenceActor");
+        }
+
+        @Override
+        public Receive createReceive() {
+            return ReceiveBuilder.create().build();
+        }
+
+        private static Props props() {
+            return Props.create(FailingInCtorActor.class);
+        }
+    }
+
+    private ActorRef createSupervisorActorWithCustomPersistenceActor(final ThingId thingId,
+            final ThingPersistenceActorPropsFactory persistenceActorPropsFactory) {
+        final LiveSignalPub liveSignalPub = new TestSetup.DummyLiveSignalPub(pubSubMediator);
+        final Props props =
+                ThingSupervisorActor.props(pubSubMediator,
+                        policiesShardRegion,
+                        new DistributedPub<>() {
+
+                            @Override
+                            public ActorRef getPublisher() {
+                                return pubSubMediator;
+                            }
+
+                            @Override
+                            public Object wrapForPublication(final ThingEvent<?> message,
+                                    final CharSequence groupIndexKey) {
+                                return message;
+                            }
+
+                            @Override
+                            public <S extends ThingEvent<?>> Object wrapForPublicationWithAcks(final S message,
+                                    final CharSequence groupIndexKey, final AckExtractor<S> ackExtractor) {
+                                return wrapForPublication(message, groupIndexKey);
+                            }
+                        },
+                        liveSignalPub,
+                        persistenceActorPropsFactory,
+                        null,
+                        policyEnforcerProvider,
+                        Mockito.mock(MongoReadJournal.class));
+
+        return actorSystem.actorOf(props, thingId.toString());
+    }
+
+    private ActorRef createSupervisorActorWithCustomPersistenceActor(final ThingId thingId,
+            final ActorRef persistenceActor) {
+        final LiveSignalPub liveSignalPub = new TestSetup.DummyLiveSignalPub(pubSubMediator);
+        final Props props =
+                ThingSupervisorActor.props(pubSubMediator,
+                        policiesShardRegion,
+                        new DistributedPub<>() {
+
+                            @Override
+                            public ActorRef getPublisher() {
+                                return pubSubMediator;
+                            }
+
+                            @Override
+                            public Object wrapForPublication(final ThingEvent<?> message,
+                                    final CharSequence groupIndexKey) {
+                                return message;
+                            }
+
+                            @Override
+                            public <S extends ThingEvent<?>> Object wrapForPublicationWithAcks(final S message,
+                                    final CharSequence groupIndexKey, final AckExtractor<S> ackExtractor) {
+                                return wrapForPublication(message, groupIndexKey);
+                            }
+                        },
+                        liveSignalPub,
+                        persistenceActor,
+                        null,
+                        policyEnforcerProvider,
+                        Mockito.mock(MongoReadJournal.class));
+
+        return actorSystem.actorOf(props, thingId.toString());
+    }
+
+
     private void assertPublishEvent(final ThingEvent<?> event) {
         final ThingEvent<?> msg = pubSubTestProbe.expectMsgClass(ThingEvent.class);
         Assertions.assertThat(msg.toJson())

From 93056b9d4ef42df11e61c7efb6bf7ff6b3cdc35b Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Tue, 7 Mar 2023 17:11:19 +0100
Subject: [PATCH 057/173] prepare Ditto 3.2.0 release

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 documentation/README.md                       |   2 +-
 documentation/src/main/resources/_config.yml  |   2 +
 .../src/main/resources/_data/authors.yml      |   4 +-
 .../_data/sidebars/ditto_sidebar.yml          |   3 +
 .../src/main/resources/_includes/head.html    |  14 +-
 .../src/main/resources/_includes/topnav.html  |   2 +-
 .../src/main/resources/_layouts/start.html    |   2 +-
 .../_posts/2018-02-08-feature-definition.md   |   2 +-
 .../2018-05-02-connecting-ditto-hono.md       |  18 +--
 .../2018-12-05-example-command-and-control.md |  12 +-
 .../2023-03-08-release-announcement-320.md    |  77 +++++++++
 .../resources/pages/ditto/basic-feature.md    |   2 +-
 .../resources/pages/ditto/basic-signals.md    |   2 +-
 .../pages/ditto/basic-wot-integration.md      |   2 +-
 .../pages/ditto/connectivity-mapping.md       |   2 +-
 .../connectivity-protocol-bindings-amqp10.md  |   6 +-
 .../connectivity-protocol-bindings-mqtt.md    |   2 +-
 .../pages/ditto/release_notes_150.md          |   2 +-
 .../pages/ditto/release_notes_310.md          |   2 +-
 .../pages/ditto/release_notes_320.md          | 150 ++++++++++++++++++
 .../2018_02_07-virtualiot-meetup/index.html   |   6 +-
 .../2018_05_23-meetup-iot-hessen/index.html   |   9 +-
 .../index.html                                |   2 +-
 .../3rd-party-dependencies/maven-plugins.txt  |   4 +-
 pom.xml                                       |   8 +-
 25 files changed, 284 insertions(+), 53 deletions(-)
 create mode 100644 documentation/src/main/resources/_posts/2023-03-08-release-announcement-320.md
 create mode 100644 documentation/src/main/resources/pages/ditto/release_notes_320.md

diff --git a/documentation/README.md b/documentation/README.md
index 706f130e04b..878139c3b34 100755
--- a/documentation/README.md
+++ b/documentation/README.md
@@ -49,7 +49,7 @@ bundle exec jekyll serve --verbose --unpublished
 Validate that the HTML does not contain dead links, etc.:
 
 ```bash
-htmlproofer --assume-extension --allow-hash-href --disable-external --enforce-https=false --ignore-urls "/http-api-doc.html.*/" src/main/resources/_site/
+htmlproofer --assume-extension --allow-hash-href --disable-external --ignore-urls "/http-api-doc.html.*/","http://localhost:4000/feed.xml","http://www.ontology-of-units-of-measure.org/page/om-2" src/main/resources/_site/
 ```
 
 #### Alternative 2: use Maven (UNIX)
diff --git a/documentation/src/main/resources/_config.yml b/documentation/src/main/resources/_config.yml
index 517bf8d7893..e87bf431546 100644
--- a/documentation/src/main/resources/_config.yml
+++ b/documentation/src/main/resources/_config.yml
@@ -114,6 +114,8 @@ plugins:
 docVersions:
   - label: "development"
     basePath: ""
+  - label: "3.2"
+    basePath: "3.2"
   - label: "3.1"
     basePath: "3.1"
   - label: "3.0"
diff --git a/documentation/src/main/resources/_data/authors.yml b/documentation/src/main/resources/_data/authors.yml
index ef679a63b10..1e286541d99 100644
--- a/documentation/src/main/resources/_data/authors.yml
+++ b/documentation/src/main/resources/_data/authors.yml
@@ -1,6 +1,6 @@
 thomas_jaeckle:
     name: Thomas Jäckle
-    email: ditto@jaeckles.de
+    email: thomas.jaeckle@beyonnex.io
     web: https://github.com/thjaeckle
 
 florian_fendt:
@@ -10,7 +10,7 @@ florian_fendt:
 
 juergen_fickel:
     name: Jürgen Fickel
-    email: juergen.fickel@bosch.io
+    email: eclipse-foundation@retujo.de
     web: https://github.com/jufickel-b
 
 philipp_michalski:
diff --git a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
index 689dadad93b..2dec4961e8d 100644
--- a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
+++ b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
@@ -23,6 +23,9 @@ entries:
       - title: Release Notes
         output: web
         folderitems:
+          - title: 3.2.0
+            url: /release_notes_320.html
+            output: web
           - title: 3.1.2
             url: /release_notes_312.html
             output: web
diff --git a/documentation/src/main/resources/_includes/head.html b/documentation/src/main/resources/_includes/head.html
index 8e92a1e37f9..89e575f0cde 100644
--- a/documentation/src/main/resources/_includes/head.html
+++ b/documentation/src/main/resources/_includes/head.html
@@ -6,17 +6,17 @@
 <title>{% if page.title %} {% if page.layout == "post" %} {{ page.title }} • {{ site.topnav_title }}{% else %} {{ page.title }} • {{ site.short_title }}{% endif %}{% else %}{{ site.site_title }}{% endif %}</title>
 
 <link rel="stylesheet" href="{{ "css/syntax.css" }}">
-<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" crossorigin="anonymous">
+<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" crossorigin="anonymous">
 <link rel="stylesheet" href="css/modern-business.css">
-<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" crossorigin="anonymous">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" crossorigin="anonymous">
 <link rel="stylesheet" href="css/customstyles.css">
 <link rel="stylesheet" href="css/boxshadowproperties.css">
 <link rel="stylesheet" href="css/theme-ditto.css">
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700">
 
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js" crossorigin="anonymous"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" crossorigin="anonymous"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/anchor-js/2.0.0/anchor.min.js" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/2.0.0/anchor.min.js" crossorigin="anonymous"></script>
 <script src="{{ "js/toc.js" }}"></script>
 <script src="{{ "js/customscripts.js" }}"></script>
 
@@ -36,5 +36,5 @@
 <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.url }}">
 
 <!-- Eclipse Foundation cookie consent: -->
-<link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-<script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+<link rel="stylesheet" type="text/css" href="https://www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
+<script src="https://www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
diff --git a/documentation/src/main/resources/_includes/topnav.html b/documentation/src/main/resources/_includes/topnav.html
index b97d3cfb6a4..d17e798b338 100644
--- a/documentation/src/main/resources/_includes/topnav.html
+++ b/documentation/src/main/resources/_includes/topnav.html
@@ -72,7 +72,7 @@
                         <input type="text" id="search-input" placeholder="search...">
                         <ul id="results-container"></ul>
                     </div>
-                    <script src="//cdnjs.cloudflare.com/ajax/libs/simple-jekyll-search/0.0.9/jekyll-search.js" type="text/javascript"></script>
+                    <script src="https://cdnjs.cloudflare.com/ajax/libs/simple-jekyll-search/0.0.9/jekyll-search.js" type="text/javascript"></script>
                     <script type="text/javascript">
                             SimpleJekyllSearch.init({
                                 searchInput: document.getElementById('search-input'),
diff --git a/documentation/src/main/resources/_layouts/start.html b/documentation/src/main/resources/_layouts/start.html
index d6a3bc24d59..c91cde11d33 100644
--- a/documentation/src/main/resources/_layouts/start.html
+++ b/documentation/src/main/resources/_layouts/start.html
@@ -7,7 +7,7 @@
             $('[data-toggle="tooltip"]').tooltip()
         })
     </script>
-    <script src="//iot.eclipse.org/assets/js/eclipsefdn.adopters.js"></script>
+    <script src="https://iot.eclipse.org/assets/js/eclipsefdn.adopters.js"></script>
     <script>
         eclipseFdnAdopters.getList({
            project_id: "iot.ditto",
diff --git a/documentation/src/main/resources/_posts/2018-02-08-feature-definition.md b/documentation/src/main/resources/_posts/2018-02-08-feature-definition.md
index 71384f5b621..4549430c2ce 100644
--- a/documentation/src/main/resources/_posts/2018-02-08-feature-definition.md
+++ b/documentation/src/main/resources/_posts/2018-02-08-feature-definition.md
@@ -67,7 +67,7 @@ For diving deeper into feature definitions, please have a look at [Basic concept
 
 However, nothing can stop you from enforcing types by yourself:
 
-  1. Use the [Ditto generator](http://vorto.eclipse.org/#/generators) to generate JSON schema files from your Vorto
+  1. Use the Ditto generator to generate JSON schema files from your Vorto
      model(s).
   2. Identify the schema files to be used by the Feature definition identifiers.
   3. Validate the JSON representation of your feature using the JSON schema before sending it over the wire.
diff --git a/documentation/src/main/resources/_posts/2018-05-02-connecting-ditto-hono.md b/documentation/src/main/resources/_posts/2018-05-02-connecting-ditto-hono.md
index 07a08702c9d..db809c7a177 100644
--- a/documentation/src/main/resources/_posts/2018-05-02-connecting-ditto-hono.md
+++ b/documentation/src/main/resources/_posts/2018-05-02-connecting-ditto-hono.md
@@ -27,7 +27,7 @@ or `WebSocket`.
 This blog post walks through the steps required to connect Ditto and Hono by adding a connection between the Hono and 
 Ditto sandboxes at
 
-* [hono.eclipse.org](http://hono.eclipse.org) 
+* [hono.eclipse.org](https://hono.eclipseprojects.io) 
 * [ditto.eclipseprojects.io](https://ditto.eclipseprojects.io)
 
 
@@ -79,7 +79,7 @@ the Hono documentation.
 First of all, create a new Hono tenant (we chose the tenant name `org.eclipse.ditto`):
 
 ```bash
-$ curl -X POST -i -H 'Content-Type: application/json' -d '{"tenant-id": "org.eclipse.ditto"}' http://hono.eclipse.org:28080/tenant
+$ curl -X POST -i -H 'Content-Type: application/json' -d '{"tenant-id": "org.eclipse.ditto"}' https://hono.eclipseprojects.io:28080/tenant
 ```
 
 ### Register a device
@@ -87,7 +87,7 @@ $ curl -X POST -i -H 'Content-Type: application/json' -d '{"tenant-id": "org.ecl
 Register a new device in Hono (we chose the device-id `demo-device`):
 
 ```bash
-$ curl -X POST -i -H 'Content-Type: application/json' -d '{"device-id": "demo-device"}' http://hono.eclipse.org:28080/registration/org.eclipse.ditto
+$ curl -X POST -i -H 'Content-Type: application/json' -d '{"device-id": "demo-device"}' https://hono.eclipseprojects.io:28080/registration/org.eclipse.ditto
 ```
 
 ### Add a device credential
@@ -107,7 +107,7 @@ $ curl -X POST -i -H 'Content-Type: application/json' -d '{
       "hash-function" : "sha-512",
       "pwd-hash": "'$PWD_HASH'"
   }]
-}' http://hono.eclipse.org:28080/credentials/org.eclipse.ditto
+}' https://hono.eclipseprojects.io:28080/credentials/org.eclipse.ditto
 ```
 
 ### Publish data
@@ -115,8 +115,8 @@ $ curl -X POST -i -H 'Content-Type: application/json' -d '{
 You are now able to publish `telemetry` (or also `event`) data via the Hono HTTP adapter:
 
 ```bash
-$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"temp": 23.07}' http://hono.eclipse.org:8080/telemetry
-$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"hum": 45.85}'  http://hono.eclipse.org:8080/telemetry
+$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"temp": 23.07}' https://hono.eclipseprojects.io:8080/telemetry
+$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"hum": 45.85}'  https://hono.eclipseprojects.io:8080/telemetry
 ```
 
 However as there is not yet a `consumer` listening for the messages, the Hono HTTP adapter will for example return an
@@ -736,10 +736,10 @@ Whenever the device now sends telemetry in its own JSON format
 Verify that by simulate sending telemetry using the Hono HTTP adapter:
 
 ```bash
-$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"temp": 14.51}' http://hono.eclipse.org:8080/telemetry
-$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"hum": 52.17}'  http://hono.eclipse.org:8080/telemetry
+$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"temp": 14.51}' https://hono.eclipseprojects.io:8080/telemetry
+$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"hum": 52.17}'  https://hono.eclipseprojects.io:8080/telemetry
 
-$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"temp": 23.07, "hum": 45.85}'  http://hono.eclipse.org:8080/telemetry
+$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"temp": 23.07, "hum": 45.85}'  https://hono.eclipseprojects.io:8080/telemetry
 ```
 
 <br/>
diff --git a/documentation/src/main/resources/_posts/2018-12-05-example-command-and-control.md b/documentation/src/main/resources/_posts/2018-12-05-example-command-and-control.md
index fc7aace9e74..bd30c0e47df 100644
--- a/documentation/src/main/resources/_posts/2018-12-05-example-command-and-control.md
+++ b/documentation/src/main/resources/_posts/2018-12-05-example-command-and-control.md
@@ -43,9 +43,9 @@ post.
 #### Create Hono device
 ```bash
 # setup a tenant
-$ curl -X POST -i -H 'Content-Type: application/json' -d '{"tenant-id": "org.eclipse.ditto"}' http://hono.eclipse.org:28080/tenant
+$ curl -X POST -i -H 'Content-Type: application/json' -d '{"tenant-id": "org.eclipse.ditto"}' https://hono.eclipseprojects.io:28080/tenant
 # create a device
-$ curl -X POST -i -H 'Content-Type: application/json' -d '{"device-id": "org.eclipse.ditto:teapot"}' http://hono.eclipse.org:28080/registration/org.eclipse.ditto
+$ curl -X POST -i -H 'Content-Type: application/json' -d '{"device-id": "org.eclipse.ditto:teapot"}' https://hono.eclipseprojects.io:28080/registration/org.eclipse.ditto
 # add device credentials
 $ PWD_HASH=$(echo -n 'teapot' | openssl dgst -binary -sha512 | base64 -w 0)
 $ curl -X POST -i -H 'Content-Type: application/json' -d '{
@@ -56,7 +56,7 @@ $ curl -X POST -i -H 'Content-Type: application/json' -d '{
       "hash-function" : "sha-512",
       "pwd-hash": "'$PWD_HASH'"
   }]
-}' http://hono.eclipse.org:28080/credentials/org.eclipse.ditto
+}' https://hono.eclipseprojects.io:28080/credentials/org.eclipse.ditto
 ```
 
 #### Create Ditto policy for digital twin
@@ -186,7 +186,7 @@ curl -X POST -i -u teapot@org.eclipse.ditto:teapot -H 'hono-ttd: 60' -H 'Content
            "path": "/features/water/properties/temperature",
            "value": 23
          }' \
-     http://hono.eclipse.org:8080/telemetry
+     https://hono.eclipseprojects.io:8080/telemetry
 ```
 
 The request is now open to receive a command for 60 seconds before it is terminated.
@@ -222,7 +222,7 @@ correlate the request and the response we are now going to send.
 ### Device sends a command response
 
 We use the header value of `hono-cmd-req-id` to construct the response address: 
-`http://hono.eclipse.org:8080/control/res/013command-and-controlreplies` 
+`https://hono.eclipseprojects.io:8080/control/res/013command-and-controlreplies` 
 
 Another curl command completes the roundtrip with a response from the simulated device:
 
@@ -240,7 +240,7 @@ curl -i -X POST -u teapot@org.eclipse.ditto:teapot \
            "value": { "eta": 56},
            "status": 200
          }' \
-     http://hono.eclipse.org:8080/control/res/013command-and-controlreplies
+     https://hono.eclipseprojects.io:8080/control/res/013command-and-controlreplies
 ```
 
 ### Message response is received at Ditto Message API
diff --git a/documentation/src/main/resources/_posts/2023-03-08-release-announcement-320.md b/documentation/src/main/resources/_posts/2023-03-08-release-announcement-320.md
new file mode 100644
index 00000000000..6bac6889500
--- /dev/null
+++ b/documentation/src/main/resources/_posts/2023-03-08-release-announcement-320.md
@@ -0,0 +1,77 @@
+---
+title: "Announcing Eclipse Ditto Release 3.2.0"
+published: true
+permalink: 2023-03-08-release-announcement-320.html
+layout: post
+author: thomas_jaeckle
+tags: [blog]
+hide_sidebar: true
+sidebar: false
+toc: false
+---
+
+The Eclipse Ditto teams is proud to announce the availability of Eclipse Ditto 
+[3.2.0](https://projects.eclipse.org/projects/iot.ditto/releases/3.2.0).
+
+Version 3.2.0 brings a new **History API**, **Eclipse Hono** connection type, **case-insensitive searches** and
+other smaller improvements, e.g. on the Ditto UI and in the JS client.
+
+
+## Adoption
+
+Companies are willing to show their adoption of Eclipse Ditto publicly: 
+[https://iot.eclipse.org/adopters/?#iot.ditto](https://iot.eclipse.org/adopters/?#iot.ditto)
+
+When you use Eclipse Ditto it would be great to support the project by putting your logo there.  
+
+
+## Changelog
+
+The main improvements and additions of Ditto 3.2.0 are:
+
+* New **History API** in order to be able to:
+  * access historical state of things/policies/connections (with either given revision number or timestamp)
+  * stream persisted events of things/policies via async APIs (WebSocket, Connections) and things also via existing SSE (Server-Sent-Events) API
+  * configure deletion retention of events in the database for each entity
+* Addition of new **Eclipse Hono** connection type for Ditto managed connections
+* Option to do **case-insensitive searches** and addition of a new RQL operator to declare case-insensitive like: `ilike`
+* UI enhancements:
+  * Push notifications on the Ditto UI using SSE (Server-Sent-Events), e.g. on thing updates
+  * Autocomplete functionality for the search slot
+  * Added configuring `Bearer` auth type for the "devops" authentication
+* JavaScript client:
+  * Support for **"merge" / "patch"** functionality in the **JS client**
+
+The following non-functional enhancements are also included:
+
+None in this release.
+
+The following notable fixes are included:
+
+* Undo creating implicitly created policy as part of thing creation if creation of thing failed
+
+Please have a look at the [3.2.0 release notes](release_notes_320.html) for a more detailed information on the release.
+
+
+## Artifacts
+
+The new Java artifacts have been published at the [Eclipse Maven repository](https://repo.eclipse.org/content/repositories/ditto/)
+as well as [Maven central](https://repo1.maven.org/maven2/org/eclipse/ditto/).
+
+The Ditto JavaScript client release was published on [npmjs.com](https://www.npmjs.com/~eclipse_ditto):
+* [@eclipse-ditto/ditto-javascript-client-dom](https://www.npmjs.com/package/@eclipse-ditto/ditto-javascript-client-dom)
+* [@eclipse-ditto/ditto-javascript-client-node](https://www.npmjs.com/package/@eclipse-ditto/ditto-javascript-client-node)
+
+
+The Docker images have been pushed to Docker Hub:
+* [eclipse/ditto-policies](https://hub.docker.com/r/eclipse/ditto-policies/)
+* [eclipse/ditto-things](https://hub.docker.com/r/eclipse/ditto-things/)
+* [eclipse/ditto-things-search](https://hub.docker.com/r/eclipse/ditto-things-search/)
+* [eclipse/ditto-gateway](https://hub.docker.com/r/eclipse/ditto-gateway/)
+* [eclipse/ditto-connectivity](https://hub.docker.com/r/eclipse/ditto-connectivity/)
+
+<br/>
+<br/>
+{% include image.html file="ditto.svg" alt="Ditto" max-width=500 %}
+--<br/>
+The Eclipse Ditto team
diff --git a/documentation/src/main/resources/pages/ditto/basic-feature.md b/documentation/src/main/resources/pages/ditto/basic-feature.md
index fe31fc85114..aac13752427 100644
--- a/documentation/src/main/resources/pages/ditto/basic-feature.md
+++ b/documentation/src/main/resources/pages/ditto/basic-feature.md
@@ -89,7 +89,7 @@ then be interpreted as the link to an Eclipse Vorto "function block" model.
 
 > Vorto is an open source tool that allows to create and manage technology agnostic, abstract device descriptions,
 so called information models. Information models describe the attributes and the capabilities of real world devices.
-Source: [http://www.eclipse.org/vorto/](http://www.eclipse.org/vorto/)
+Source: [https://www.eclipse.org/vorto/](https://www.eclipse.org/vorto/)
 
 {% include warning.html content="The Eclipse Vorto project is no longer actively maintained, so it can be seen
   as feature complete." %}
diff --git a/documentation/src/main/resources/pages/ditto/basic-signals.md b/documentation/src/main/resources/pages/ditto/basic-signals.md
index e3d667ee2e9..5ff6a19fcc8 100644
--- a/documentation/src/main/resources/pages/ditto/basic-signals.md
+++ b/documentation/src/main/resources/pages/ditto/basic-signals.md
@@ -25,7 +25,7 @@ pattern they occur.
 
 Ditto uses Commands, Events,
 <a href="#" data-toggle="tooltip" data-original-title="{{site.data.glossary.cqrs}}">CQRS</a> and EventSourcing.
-[This page](http://cqrs.nu/Faq) provides a quite good explanation of the basic concepts on all of those aspects:
+[This page](https://cqrs.nu/Faq) provides a quite good explanation of the basic concepts on all of those aspects:
 
 ### Command
 
diff --git a/documentation/src/main/resources/pages/ditto/basic-wot-integration.md b/documentation/src/main/resources/pages/ditto/basic-wot-integration.md
index 43ee2ffe879..f34f5bd7de6 100644
--- a/documentation/src/main/resources/pages/ditto/basic-wot-integration.md
+++ b/documentation/src/main/resources/pages/ditto/basic-wot-integration.md
@@ -183,7 +183,7 @@ To describe geolocations you can use: [W3C Basic Geo (WGS84 lat/long) Vocabulary
 ```
 
 To describe units you can choose between:
-* [QUDT.org](http://www.qudt.org)  
+* [QUDT.org](https://www.qudt.org)  
   ```json
   {
     "@context": [
diff --git a/documentation/src/main/resources/pages/ditto/connectivity-mapping.md b/documentation/src/main/resources/pages/ditto/connectivity-mapping.md
index edc9989b693..15a8f578341 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-mapping.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-mapping.md
@@ -519,7 +519,7 @@ code execution.
 ### Constraints
 
 Rhino does not fully support EcmaScript 6. Check which language constructs are supported before using
-them in a mapping function. See [http://mozilla.github.io/rhino/compat/engines.html](http://mozilla.github.io/rhino/compat/engines.html).
+them in a mapping function. See [https://mozilla.github.io/rhino/compat/engines.html](https://mozilla.github.io/rhino/compat/engines.html).
 
 Ditto currently includes Rhino version `1.7.14` and has the `VERSION_ES6` flag enabled.
 
diff --git a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-amqp10.md b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-amqp10.md
index 2b95a6bb97e..89a2857bb70 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-amqp10.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-amqp10.md
@@ -117,13 +117,13 @@ For AMQP 1.0 sources, when configuring
 endpoint are treated in the following way:
 
 For Ditto acknowledgements with successful [status](protocol-specification-acks.html#combined-status-code):
-* Acknowledges the AMQP 1.0 message with `accepted` outcome (see [AMQP 1.0 spec: 3.4.2 Accepted](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-accepted))
+* Acknowledges the AMQP 1.0 message with `accepted` outcome (see [AMQP 1.0 spec: 3.4.2 Accepted](https://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-accepted))
 
 For Ditto acknowledgements with mixed successful/failed [status](protocol-specification-acks.html#combined-status-code):
 * If some of the aggregated [acknowledgements](basic-acknowledgements.html#acknowledgements-acks) require redelivery (e.g. based on a timeout):
-   * Negatively acknowledges the AMQP 1.0 message with `modified[delivery-failed]` outcome (see [AMQP 1.0 spec: 3.4.5 Modified](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-modified))
+   * Negatively acknowledges the AMQP 1.0 message with `modified[delivery-failed]` outcome (see [AMQP 1.0 spec: 3.4.5 Modified](https://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-modified))
 * If none of the aggregated [acknowledgements](basic-acknowledgements.html#acknowledgements-acks) require redelivery:
-   * Negatively acknowledges the AMQP 1.0 message with `rejected` outcome (see [AMQP 1.0 spec: 3.4.3 Rejected](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-rejected)) preventing redelivery by the AMQP 1.0 endpoint
+   * Negatively acknowledges the AMQP 1.0 message with `rejected` outcome (see [AMQP 1.0 spec: 3.4.3 Rejected](https://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-rejected)) preventing redelivery by the AMQP 1.0 endpoint
 
 ### Target format
 
diff --git a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-mqtt.md b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-mqtt.md
index 4dd28fc8d6a..edf92788859 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-mqtt.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-mqtt.md
@@ -291,7 +291,7 @@ Default: empty string
 
 ### Configure Last Will message
 
-To notify other clients when the connection is disconnected ungracefully the [Last Will feature](http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718028) 
+To notify other clients when the connection is disconnected ungracefully the [Last Will feature](https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718028) 
 can be used. The message which will be published, is specified in the connection and stored 
 in the broker when it connects. The message contains a topic, retained message flag, QoS, and the text payload to be 
 published. These can be configured in the [Specific Configuration](#specific-configuration) of the connection. 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_150.md b/documentation/src/main/resources/pages/ditto/release_notes_150.md
index b94a01e3adb..53ce88a8820 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_150.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_150.md
@@ -27,7 +27,7 @@ In previous versions, Ditto negatively settled messages consumed via AMQP 1.0 wh
 (e.g. because the received message could not be understood or permissions were missing) with `modified[undeliverable-here]`.
 
 This was changed to settle with `rejected` 
-(see [AMQP 1.0 spec](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-rejected)) 
+(see [AMQP 1.0 spec](https://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-rejected)) 
 instead, as this is the more correct settlement outcome.
 
 #### [MongoDB for unit tests was increased to version 4.2](https://github.com/eclipse-ditto/ditto/pull/896)
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_310.md b/documentation/src/main/resources/pages/ditto/release_notes_310.md
index 74c004f0d2f..3881724df62 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_310.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_310.md
@@ -48,7 +48,7 @@ There is a separate [blog post](2022-11-04-live-message-conditions.html) on this
 #### [Support AMQP Message Annotations when extracting values for Headers](https://github.com/eclipse-ditto/ditto/issues/1390)
 
 Ditto managed connections with the [AMQP 1.0](connectivity-protocol-bindings-amqp10.html) can now process 
-[AMQP 1.0 Message Annotations](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-message-annotations)
+[AMQP 1.0 Message Annotations](https://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-message-annotations)
 by reading/writing them as if they would be message headers.
 
 #### [Let policies import other policies to enable re-use when securing things](https://github.com/eclipse-ditto/ditto/issues/298)
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_320.md b/documentation/src/main/resources/pages/ditto/release_notes_320.md
new file mode 100644
index 00000000000..f4c12fc31e1
--- /dev/null
+++ b/documentation/src/main/resources/pages/ditto/release_notes_320.md
@@ -0,0 +1,150 @@
+---
+title: Release notes 3.2.0
+tags: [release_notes]
+published: true
+keywords: release notes, announcements, changelog
+summary: "Version 3.2.0 of Eclipse Ditto, released on 08.03.2023"
+permalink: release_notes_320.html
+---
+
+The second minor release of Ditto 3.x, Eclipse Ditto version 3.2.0 is here.
+
+This release is completely [IP (intellectual property) checked by the Eclipse Foundation](https://www.eclipse.org/projects/handbook/#ip)
+meaning that project code as well as all used dependencies were "[...] reviewed to ensure that the copyrights
+expressed are correct, licensing is valid and compatible, and that other issues have been uncovered and properly
+investigated."
+
+## Changelog
+
+Eclipse Ditto 3.2.0 focuses on the following areas:
+
+* New **History API** in order to be able to:
+  * access historical state of things/policies/connections (with either given revision number or timestamp)
+  * stream persisted events of things/policies via async APIs (WebSocket, Connections) and things also via existing SSE (Server-Sent-Events) API
+  * configure deletion retention of events in the database for each entity
+* Addition of new **Eclipse Hono** connection type for Ditto managed connections
+* Option to do **case-insensitive searches** and addition of a new RQL operator to declare case-insensitive like: `ilike`
+* UI enhancements:
+  * Push notifications on the Ditto UI using SSE (Server-Sent-Events), e.g. on thing updates
+  * Autocomplete functionality for the search slot
+  * Added configuring `Bearer` auth type for the "devops" authentication
+* JavaScript client:
+  * Support for **"merge" / "patch"** functionality in the **JS client**
+
+The following non-functional work is also included:
+
+None in this release.
+
+The following notable fixes are included:
+
+* Undo creating implicitly created policy as part of thing creation if creation of thing failed
+
+
+### New features
+
+#### [Provide API to stream/replay persisted events from the event journal](https://github.com/eclipse-ditto/ditto/issues/1498)
+
+Starting with this release, Eclipse Ditto is now able to provide historical values via its APIs.  
+Ditto makes use of the [Event Sourcing](basic-signals.html#architectural-style) persistence pattern in order to persist
+the different managed entities:
+* things
+* policies
+* connections
+
+As a result of this persistence pattern, the history therefore was "always there" (as delta events in the database), 
+it was just not yet provided as API.
+
+This gap has now been closed, see the added [documentation for "History capabilities"](basic-history.html).
+
+A configurable [cleanup retention time](basic-history.html#cleanup-retention-time-configuration) lets the operator of 
+Ditto decide how much of history to keep, differently configured for "things", "policies" and "connections".  
+For policies and connections it might even make sense to never clean up any events (if only few updates are expected to be done) 
+and as a result get audit log capabilities for those entities (to find out "who" did "what" changes "when") - or to e.g.
+undo configuration changes to connections or compare between different revisions.
+
+Possible is also streaming all events from a thing or policy in order to e.g. show the change of a thing's state 
+(or a particular property value) over time.
+
+{% include note.html content="Ditto's history API capabilities are not comparable with the features of a time series database.
+    E.g. no aggregations on or compactions of the historical data can be done." %}
+
+#### [Add new "Hono" connection type](https://github.com/eclipse-ditto/ditto/pull/1548)
+
+A new connection type [Hono](connectivity-protocol-bindings-hono.html) was added which takes some configuration from 
+static Ditto configuration (e.g. the Kafka endpoint and credentials) in order to better abstract from potential changes
+to [Eclipse Hono™](https://www.eclipse.org/hono/), e.g. regarding Kafka topic structure.
+
+#### [Things-Search Case Sensitivity Option](https://github.com/eclipse-ditto/ditto/issues/1087)
+
+Ditto's search API did not yet provide the option to perform a search (or apply an [RQL filter](basic-rql.html)) ignoring
+the upper/lower case of words.  
+This option has been added as new `ilike` function, both to the [search](basic-search.html) and to all places where
+[RQL filter](basic-rql.html) can be used.
+
+This was a contribution from [Abhijeet Mishra](https://github.com/Abhijeetmishr) - many thanks for that.
+
+#### Enhancements in Ditto explorer UI
+
+We again received several contributions by [Thomas Fries](https://github.com/thfries),
+who contributed the Ditto explorer UI.  
+The latest live version of the UI can be found here:  
+[https://eclipse-ditto.github.io/ditto/](https://eclipse-ditto.github.io/ditto/)
+
+You can use it in order to e.g. connect to your Ditto installation to manage things, policies and even connections.
+
+Contributions in this release:
+* [UI activate Server Sent Events](https://github.com/eclipse-ditto/ditto/pull/1532)
+* [Explorer UI - autocomplete for search](https://github.com/eclipse-ditto/ditto/pull/1580)
+* [UI - removed old dropdown for searchfilters](https://github.com/eclipse-ditto/ditto/pull/1584)
+* [UI: Provide Bearer authentication for devops user](https://github.com/eclipse-ditto/ditto/issues/1592)
+
+
+#### Enhancements in Ditto Clients
+
+##### [added merge functionality to javascript client sdk](https://github.com/eclipse-ditto/ditto-clients/pull/217)
+
+The [Ditto JS client](https://github.com/eclipse-ditto/ditto-clients/tree/master/javascript) did not yet support the
+[merge/path](protocol-specification-things-merge.html) of Ditto.  
+This was now provided and is available in the 3.2.0 version of the JS client.
+
+This was a contribution from [Pieter-Jan Lanneer](https://github.com/PJGitLan) - many thanks for that.
+
+### Changes
+
+None in this release.
+
+
+### Bugfixes
+
+Some bugs in Ditto 3.1.x were also fixed for 3.2.0.  
+This is a complete list of the
+* [merged pull requests for milestone 3.2.0](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:3.2.0)
+
+Here as well for the Ditto Clients: [merged pull requests for milestone 3.2.0](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is:pr+milestone:3.2.0)
+
+#### [Creation of thing's policy is atomic with creation the of thing itself](https://github.com/eclipse-ditto/ditto/pull/1581)
+
+Fixes providing atomic behaviour while creating a thing and an implicit policy as result of the thing creation.  
+In the rare case of failing to create a thing, its policy will be rolled back (deleted) in order to not fail create retry.
+
+## Migration notes
+
+There are no migration steps required when updating from Ditto 3.1.x to Ditto 3.2.0.  
+When updating from Ditto 2.x version to 3.2.0, the migration notes of 
+[Ditto 3.0.0](release_notes_300.html#migration-notes) and [Ditto 3.1.0](release_notes_310.html#migration-notes) apply.
+
+
+## Roadmap
+
+Looking forward, the (current) ideas for Ditto 3.3.0 are:
+
+* [Support replacing certain json objects in a merge/patch command instead of merging their fields](https://github.com/eclipse-ditto/ditto/issues/1593)
+* [UI: Enhance Ditto-UI to configure log levels of Ditto](https://github.com/eclipse-ditto/ditto/issues/1590)
+* [Provide CoAP endpoint in Ditto's gateway, providing the Ditto HTTP API via CoAP](https://github.com/eclipse-ditto/ditto/issues/1582)
+  * Maybe - as no-one declared interest yet in this
+* Perform a benchmark of Ditto and provide a "tuning" chapter in the documentation as a reference to the commonly 
+  asked questions 
+  * how many Things Ditto can manage
+  * how many updates/second can be done
+  * whether Ditto can scale horizontally
+  * how many resources (e.g. machines) are required at which scale
diff --git a/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html b/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
index 8bdf308e188..0b3803480ae 100644
--- a/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
+++ b/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
@@ -178,7 +178,7 @@ <h2>Eclipse Ditto introduction</h2>
                 <hr />
                 <small class="introlink">by <a
                         href="mailto:thomas.jaeckle@bosch-si.com">Thomas Jäckle</a> (<a
-                        href="http://twitter.com/thjaeckle">@thjaeckle</a>)
+                        href="https://twitter.com/thjaeckle">@thjaeckle</a>)
                 </small>
             </section>
 
@@ -256,9 +256,9 @@ <h2>in IIoT / Industry 4.0</h2>
                 </ul>
                 <div style="float:right; width: 40%;">
                     <img src="../images/asset-admin-shell.png" style="width: 80%" alt="Asset admin shell" />
-                    <div style="font-size: 0.4em;"><a href="http://acplt.github.io/openAAS/AssetAdministrationShell.html">Source</a></div>
+                    <div style="font-size: 0.4em;"><a href="https://acplt.github.io/openAAS/AssetAdministrationShell.html">Source</a></div>
                 </div>
-                <!-- img source: http://acplt.github.io/openAAS/AssetAdministrationShell.html -->
+                <!-- img source: https://acplt.github.io/openAAS/AssetAdministrationShell.html -->
             </section>
         </section>
 
diff --git a/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html b/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
index 8832e8b1e28..2c8594095a0 100644
--- a/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
+++ b/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
@@ -181,7 +181,7 @@ <h2 style="font-size: 1.0em">23.05.2018</h2>
                 <hr />
                 <small class="introlink">by <a
                         href="mailto:thomas.jaeckle@bosch-si.com">Thomas Jäckle</a> (<a
-                        href="http://twitter.com/thjaeckle">@thjaeckle</a>)
+                        href="https://twitter.com/thjaeckle">@thjaeckle</a>)
                 </small>
             </section>
 
@@ -191,11 +191,10 @@ <h2>who am I?</h2>
                 <div style="float:left; width: 25%;">
                     <img src="../images/thjaeckle_400x400.jpg" alt="Thomas Jäckle" style="width: 100%; border-radius: 50%" />
                     <h4>Thomas Jäckle</h4>
-                    <h4><a href="http://twitter.com/thjaeckle">@thjaeckle</a></h4>
+                    <h4><a href="https://twitter.com/thjaeckle">@thjaeckle</a></h4>
                     <br style="clear: both"/>
                 </div>
                 <div style="float:right; width: 70%;">
-                    <img src="//www.brand.bosch.com/images/icons/bosch-logo.png" alt="Bosch logo" style="width: 30%; float: right; padding-left: 2px; margin-top: -1em"/>
                     <h4>software developer <br/>@ Bosch Software Innovations</h4>
                     <h4 style="padding-top:1em">project lead of Eclipse Ditto</h4>
                     <h4 style="padding-top:1em">lead developer of commercial service<br/>"Bosch IoT Things"</h4>
@@ -290,9 +289,9 @@ <h2>in IIoT / Industry 4.0</h2>
                 </ul>
                 <div style="float:right; width: 40%;">
                     <img src="../images/asset-admin-shell.png" style="width: 80%" alt="Asset admin shell" />
-                    <div style="font-size: 0.4em;"><a href="http://acplt.github.io/openAAS/AssetAdministrationShell.html">Source</a></div>
+                    <div style="font-size: 0.4em;"><a href="https://acplt.github.io/openAAS/AssetAdministrationShell.html">Source</a></div>
                 </div>
-                <!-- img source: http://acplt.github.io/openAAS/AssetAdministrationShell.html -->
+                <!-- img source: https://acplt.github.io/openAAS/AssetAdministrationShell.html -->
             </section>
             <section id="twin-3" style="clear: both;">
                 <h2>our interpretation</h2>
diff --git a/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html b/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
index 95fb0ced1a3..3e8308338cd 100644
--- a/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
+++ b/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
@@ -197,7 +197,7 @@ <h2 style="font-size: 0.8em">16.04.2020</h2>
 <!--                <div style="float:left; width: 25%;">-->
 <!--                    <img src="../images/thjaeckle_400x400.jpg" alt="Thomas Jäckle" style="width: 100%; border-radius: 50%" />-->
 <!--                    <h4>Thomas Jäckle</h4>-->
-<!--                    <h4><a href="http://twitter.com/thjaeckle">@thjaeckle</a></h4>-->
+<!--                    <h4><a href="https://twitter.com/thjaeckle">@thjaeckle</a></h4>-->
 <!--                    <br style="clear: both"/>-->
 <!--                </div>-->
 <!--                <div style="float:right; width: 70%;">-->
diff --git a/legal/3rd-party-dependencies/maven-plugins.txt b/legal/3rd-party-dependencies/maven-plugins.txt
index 52967273523..4eeaf96c5b3 100644
--- a/legal/3rd-party-dependencies/maven-plugins.txt
+++ b/legal/3rd-party-dependencies/maven-plugins.txt
@@ -2,7 +2,7 @@ com.github.siom79.japicmp:japicmp-maven-plugin:maven-plugin:0.15.7:runtime
 com.mycila:license-maven-plugin:maven-plugin:4.1:runtime
 net.alchim31.maven:scala-maven-plugin:maven-plugin:4.5.6:runtime
 org.apache.felix:maven-bundle-plugin:maven-plugin:5.1.4:runtime
-org.apache.maven.plugins:maven-clean-plugin:maven-plugin:2.5:runtime
+org.apache.maven.plugins:maven-clean-plugin:maven-plugin:3.2.0:runtime
 org.apache.maven.plugins:maven-compiler-plugin:maven-plugin:3.9.0:runtime
 org.apache.maven.plugins:maven-dependency-plugin:maven-plugin:3.2.0:runtime
 org.apache.maven.plugins:maven-deploy-plugin:maven-plugin:3.0.0-M2:runtime
@@ -14,7 +14,7 @@ org.apache.maven.plugins:maven-javadoc-plugin:maven-plugin:3.3.1:runtime
 org.apache.maven.plugins:maven-resources-plugin:maven-plugin:3.2.0:runtime
 org.apache.maven.plugins:maven-scm-plugin:maven-plugin:1.12.2:runtime
 org.apache.maven.plugins:maven-shade-plugin:maven-plugin:3.2.4:runtime
-org.apache.maven.plugins:maven-site-plugin:maven-plugin:3.3:runtime
+org.apache.maven.plugins:maven-site-plugin:maven-plugin:3.12.1:runtime
 org.apache.maven.plugins:maven-source-plugin:maven-plugin:3.2.1:runtime
 org.apache.maven.plugins:maven-surefire-plugin:maven-plugin:3.0.0-M5:runtime
 org.codehaus.mojo:flatten-maven-plugin:maven-plugin:1.2.7:runtime
diff --git a/pom.xml b/pom.xml
index cc179fb0532..66fa42ef09c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,8 +86,10 @@
         <developer>
             <id>tjaeckle</id>
             <name>Thomas Jaeckle</name>
-            <email>ditto@jaeckles.de</email>
+            <email>thomas.jaeckle@beyonnex.io</email>
             <url>https://github.com/thjaeckle</url>
+            <organization>beyonnex.io GmbH</organization>
+            <organizationUrl>https://beyonnex.io</organizationUrl>
             <roles>
                 <role>Lead</role>
                 <role>Committer</role>
@@ -130,10 +132,8 @@
         <developer>
             <id>jfickel</id>
             <name>Juergen Fickel</name>
-            <email>juergen.fickel@bosch.io</email>
+            <email>eclipse-foundation@retujo.de</email>
             <url>https://github.com/jufickel-b</url>
-            <organization>Bosch.IO GmbH</organization>
-            <organizationUrl>https://www.bosch.io</organizationUrl>
             <roles>
                 <role>Committer</role>
             </roles>

From 2b1a952ed98c72508e044c16e017b4f9eea4307a Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Wed, 8 Mar 2023 13:47:45 +0100
Subject: [PATCH 058/173] post Ditto 3.2.0 release: update
 binary-compatibility-check to version 3.2.0

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 66fa42ef09c..3a06ef54281 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,7 +240,7 @@
         <!-- globally set version for checking binary compatibility against -->
         <!-- whoever changes this to ${revision} or ${project.version} is responsible for API breakage caused by this! -->
         <!-- in other words: never do that here! exclude the 'breakages' locally in the japicmp maven plugin if you intentionally break something -->
-        <binary-compatibility-check.version>3.1.0</binary-compatibility-check.version>
+        <binary-compatibility-check.version>3.2.0</binary-compatibility-check.version>
 
         <maven.skins.fluido.version>1.7</maven.skins.fluido.version>
         <doxia.markdown.version>1.8</doxia.markdown.version>

From ea416fff3c356941121dc64226168e6a2321e985 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Wed, 8 Mar 2023 13:49:02 +0100
Subject: [PATCH 059/173] post Ditto 3.2.0 release: update SECURITY.md

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 SECURITY.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 4992edf5be1..ead6f09625e 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -9,9 +9,9 @@ These versions of Eclipse Ditto are currently being supported with security upda
 
 | Version | Supported          |
 |---------| ------------------ |
+| 3.2x    | :white_check_mark: |
 | 3.1.x   | :white_check_mark: |
-| 3.0.x   | :white_check_mark: |
-| < 3.0.0 | :x:                |
+| < 3.1.0 | :x:                |
 
 ## Reporting a Vulnerability
 

From 0e0241f252a25158636c08a4ec4aeb0428783648 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Mon, 6 Mar 2023 20:12:58 +0100
Subject: [PATCH 060/173] [#1592] provide "Bearer" authentication for devops
 resources controlled via UI * added radiobutton groups so that "Authorize"
 modal clearly shows/states which authentication to use where * reduced to a
 single "Authorize" button in modal * simplified environment a bit

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 ui/index.css                               |   4 +
 ui/modules/api.js                          |  29 +++--
 ui/modules/environments/authorization.html | 126 ++++++++++++---------
 ui/modules/environments/authorization.js   |  56 ++++++---
 ui/templates/environmentTemplates.json     |  23 ++--
 5 files changed, 148 insertions(+), 90 deletions(-)

diff --git a/ui/index.css b/ui/index.css
index 0f725c5f5e5..347968dbfe0 100644
--- a/ui/index.css
+++ b/ui/index.css
@@ -46,6 +46,10 @@ body {
     padding-top: 60px;
 }
 
+#authorizationModal label {
+    display: inline;
+}
+
 .toast-header {
     color: #842029;
     background-color: #f8d7da;
diff --git a/ui/modules/api.js b/ui/modules/api.js
index cdadd62a39e..eb343316f2b 100644
--- a/ui/modules/api.js
+++ b/ui/modules/api.js
@@ -277,18 +277,25 @@ let authHeaderValue;
  * @param {boolean} forDevOps if true, the credentials for the dev ops api will be used.
  */
 export function setAuthHeader(forDevOps) {
-  if (forDevOps && Environments.current().useBasicAuth) {
-    authHeaderKey = 'Authorization';
-    authHeaderValue = 'Basic ' + window.btoa(Environments.current().usernamePasswordDevOps);
-  } else if (Environments.current().useBasicAuth) {
-    authHeaderKey = 'Authorization';
-    authHeaderValue = 'Basic ' + window.btoa(Environments.current().usernamePassword);
-  } else if (Environments.current().useDittoPreAuthenticatedAuth) {
-    authHeaderKey = 'x-ditto-pre-authenticated';
-    authHeaderValue = Environments.current().dittoPreAuthenticatedUsername;
+  if (forDevOps) {
+    if (Environments.current().devopsAuth === 'basic') {
+      authHeaderKey = 'Authorization';
+      authHeaderValue = 'Basic ' + window.btoa(Environments.current().usernamePasswordDevOps);
+    } else if (Environments.current().devopsAuth === 'bearer') {
+      authHeaderKey = 'Authorization';
+      authHeaderValue ='Bearer ' + Environments.current().bearerDevOps;
+    }
   } else {
-    authHeaderKey = 'Authorization';
-    authHeaderValue ='Bearer ' + Environments.current().bearer;
+    if (Environments.current().mainAuth === 'basic') {
+      authHeaderKey = 'Authorization';
+      authHeaderValue = 'Basic ' + window.btoa(Environments.current().usernamePassword);
+    } else if (Environments.current().mainAuth === 'pre') {
+      authHeaderKey = 'x-ditto-pre-authenticated';
+      authHeaderValue = Environments.current().dittoPreAuthenticatedUsername;
+    } else if (Environments.current().mainAuth === 'bearer') {
+      authHeaderKey = 'Authorization';
+      authHeaderValue ='Bearer ' + Environments.current().bearer;
+    }
   }
 }
 
diff --git a/ui/modules/environments/authorization.html b/ui/modules/environments/authorization.html
index 91637f2fe04..ef3a0b88486 100644
--- a/ui/modules/environments/authorization.html
+++ b/ui/modules/environments/authorization.html
@@ -18,78 +18,94 @@
                 <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <div class="modal-body">
-                <h5>Basic Auth</h5>
-                <hr />
                 <div class="row">
-                    <div class="col-md-5">
-                        <label>Main User</label>
-                    </div>
-                    <div class="col-md-7">
-                        <div class="input-group input-group-sm mb-1">
-                            <label class="input-group-text">Username</label>
-                            <input type="text" class="form-control form-control-sm" id="userName"></input>
+                    <h5>Basic Auth</h5>
+                    <hr />
+                    <div class="row">
+                        <div class="col-md-5">
+                            <input type="radio" id="main-userpass" name="main-auth" value="basic"></input>
+                            <label for="main-userpass">Main User</label>
                         </div>
-                        <div class="input-group input-group-sm mb-1">
-                            <label class="input-group-text">Password</label>
-                            <input type="password" class="form-control form-control-sm" id="password"></input>
+                        <div class="col-md-7">
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="userName" class="input-group-text">Username</label>
+                                <input type="text" class="form-control form-control-sm" id="userName"></input>
+                            </div>
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="password" class="input-group-text">Password</label>
+                                <input type="password" class="form-control form-control-sm" id="password"></input>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="row">
-                    <div class="col-md-5">
-                        <label>DevOps User<br /><small>(for Connections, optional)</small></label>
-                    </div>
-                    <div class="col-md-7">
-                        <div class="input-group input-group-sm mb-1">
-                            <label class="input-group-text">DevOps Username</label>
-                            <input type="text" class="form-control form-control-sm" id="devOpsUserName"></input>
+                    <div class="row">
+                        <div class="col-md-5">
+                            <input type="radio" id="devops-userpass" name="devops-auth" value="basic"></input>
+                            <label for="devops-userpass">DevOps User<br /><small>(for Connections, optional)</small></label>
                         </div>
-                        <div class="input-group input-group-sm mb-1">
-                            <label class="input-group-text">DevOps Password</label>
-                            <input type="password" class="form-control form-control-sm" id="devOpsPassword"></input>
+                        <div class="col-md-7">
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="devOpsUserName" class="input-group-text">DevOps Username</label>
+                                <input type="text" class="form-control form-control-sm" id="devOpsUserName"></input>
+                            </div>
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="devOpsPassword" class="input-group-text">DevOps Password</label>
+                                <input type="password" class="form-control form-control-sm" id="devOpsPassword"></input>
+                            </div>
                         </div>
                     </div>
                 </div>
-                <div class="input-group input-group-sm" style="flex-direction: row-reverse;">
-                    <button class="btn btn-outline-secondary btn-sm" data-bs-dismiss="modal"
-                        id="authorizeBasic">Authorize</button>
-                </div>
-                <h5>Bearer</h5>
-                <hr />
-                <div class="row">
-                    <div class="col-md-5">
-                        <label>Main User<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
+                <div class="row mt-3">
+                    <h5>Bearer</h5>
+                    <hr />
+                    <div class="row">
+                        <div class="col-md-5">
+                            <input type="radio" id="main-bearer" name="main-auth" value="bearer"></input>
+                            <label for="main-bearer">Main User<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
+                        </div>
+                        <div class="col-md-7">
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="bearer" class="input-group-text">Bearer</label>
+                                <input type="password" class="form-control form-control-sm" id="bearer"></input>
+                            </div>
+                        </div>
                     </div>
-                    <div class="col-md-7">
-                        <div class="input-group input-group-sm mb-1">
-                            <label class="input-group-text">Bearer</label>
-                            <input type="password" class="form-control form-control-sm" id="bearer"></input>
+                    <div class="row">
+                        <div class="col-md-5">
+                            <input type="radio" id="devops-bearer" name="devops-auth" value="bearer"></input>
+                            <label for="devops-bearer">DevOps User<br /><small>(JWT OAuth2.0 Bearer token, optional)</small></label>
+                        </div>
+                        <div class="col-md-7">
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="bearerDevOps" class="input-group-text">DevOps Bearer</label>
+                                <input type="password" class="form-control form-control-sm" id="bearerDevOps"></input>
+                            </div>
+                            <div class="input-group input-group-sm mb-1">
                         </div>
                     </div>
-                </div>
-                <div class="input-group input-group-sm" style="flex-direction: row-reverse;">
-                    <button class="btn btn-outline-secondary btn-sm" data-bs-dismiss="modal"
-                        id="authorizeBearer">Authorize</button>
-                </div>
-                <h5>Ditto Pre Authenticated</h5>
-                <hr />
-                <div class="row">
-                    <div class="col-md-5">
-                        <label>Main User<br />
-                            <small>(via HTTP header 'x-ditto-pre-authenticated', must take the form
-                                <code>prefix:suffix</code>)</small>
-                        </label>
                     </div>
-                    <div class="col-md-7">
-                        <div class="input-group input-group-sm mb-1">
-                            <label class="input-group-text">Username</label>
-                            <input type="text" class="form-control form-control-sm" id="dittoPreAuthenticatedUsername"></input>
+                </div>
+                <div class="row mt-3">
+                    <h5>Ditto Pre Authenticated</h5>
+                    <hr />
+                    <div class="row">
+                        <div class="col-md-5">
+                            <input type="radio" id="main-pre" name="main-auth" value="pre"></input>
+                            <label for="main-pre">Main User<br />
+                                <small>(via HTTP header 'x-ditto-pre-authenticated', must take the form
+                                    <code>prefix:suffix</code>)</small>
+                            </label>
+                        </div>
+                        <div class="col-md-7">
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="dittoPreAuthenticatedUsername" class="input-group-text">prefix:suffix</label>
+                                <input type="text" class="form-control form-control-sm" id="dittoPreAuthenticatedUsername"></input>
+                            </div>
                         </div>
                     </div>
                 </div>
                 <div class="input-group input-group-sm" style="flex-direction: row-reverse;">
                     <button class="btn btn-outline-secondary btn-sm" data-bs-dismiss="modal"
-                        id="authorizePreAuthenticated">Authorize</button>
+                        id="authorizeSubmit">Authorize</button>
                 </div>
             </div>
         </div>
diff --git a/ui/modules/environments/authorization.js b/ui/modules/environments/authorization.js
index 6c261a8fe1e..9a1752f6a0b 100644
--- a/ui/modules/environments/authorization.js
+++ b/ui/modules/environments/authorization.js
@@ -21,6 +21,7 @@ let dom = {
   bearer: null,
   userName: null,
   password: null,
+  bearerDevOps: null,
   devOpsUserName: null,
   devOpsPassword: null,
   dittoPreAuthenticatedUsername: null,
@@ -30,24 +31,50 @@ let dom = {
 export function ready() {
   Utils.getAllElementsById(dom);
 
-  document.getElementById('authorizeBearer').onclick = () => {
-    Environments.current().useBasicAuth = false;
-    Environments.current().useDittoPreAuthenticatedAuth = false;
-    Environments.current().bearer = dom.bearer.value;
-    Environments.environmentsJsonChanged('authorization');
+  document.getElementById('authorize').onclick = () => {
+    let mainAuth = Environments.current().mainAuth;
+    let devopsAuth = Environments.current().devopsAuth;
+
+    if (!mainAuth) {
+      if (dom.dittoPreAuthenticatedUsername.value && dom.dittoPreAuthenticatedUsername.value.length > 0) {
+        mainAuth = 'pre';
+      } else if (dom.bearer.value && dom.bearer.value.length > 0) {
+        mainAuth = 'bearer';
+      } else if (dom.userName.value && dom.userName.value.length > 0) {
+        mainAuth = 'basic';
+      }
+    }
+    if (!devopsAuth) {
+      if (dom.bearerDevOps.value && dom.bearerDevOps.value.length > 0) {
+        devopsAuth = 'bearer';
+      } else if (dom.devOpsUserName.value && dom.devOpsUserName.value.length > 0) {
+        devopsAuth = 'basic';
+      }
+    }
+
+    const mainAuths = document.querySelectorAll('input[name="main-auth"]');
+    for(let i = 0; i < mainAuths.length; i++) {
+      mainAuths[i].checked = mainAuths[i].value === mainAuth;
+    }
+
+    const devopsAuths = document.querySelectorAll('input[name="devops-auth"]');
+    for(let i = 0; i < devopsAuths.length; i++) {
+      devopsAuths[i].checked = devopsAuths[i].value === devopsAuth;
+    }
+
   };
 
-  document.getElementById('authorizeBasic').onclick = () => {
-    Environments.current().useBasicAuth = true;
-    Environments.current().useDittoPreAuthenticatedAuth = false;
+  document.getElementById('authorizeSubmit').onclick = () => {
+    const mainAuthSelector = document.querySelector('input[name="main-auth"]:checked');
+    const mainAuth = mainAuthSelector ? mainAuthSelector.value : undefined;
+    const devopsAuthSelector = document.querySelector('input[name="devops-auth"]:checked');
+    const devopsAuth = devopsAuthSelector ? devopsAuthSelector.value : undefined;
+    Environments.current().mainAuth = mainAuth;
+    Environments.current().devopsAuth = devopsAuth;
     Environments.current().usernamePassword = dom.userName.value + ':' + dom.password.value;
     Environments.current().usernamePasswordDevOps = dom.devOpsUserName.value + ':' + dom.devOpsPassword.value;
-    Environments.environmentsJsonChanged('authorization');
-  };
-
-  document.getElementById('authorizePreAuthenticated').onclick = () => {
-    Environments.current().useBasicAuth = false;
-    Environments.current().useDittoPreAuthenticatedAuth = true;
+    Environments.current().bearer = dom.bearer.value;
+    Environments.current().bearerDevOps = dom.bearerDevOps.value;
     Environments.current().dittoPreAuthenticatedUsername = dom.dittoPreAuthenticatedUsername.value;
     Environments.environmentsJsonChanged();
   };
@@ -63,6 +90,7 @@ export function onEnvironmentChanged() {
   dom.devOpsUserName.value = usernamePassword.split(':')[0];
   dom.devOpsPassword.value = usernamePassword.split(':')[1];
   dom.bearer.value = Environments.current().bearer ? Environments.current().bearer : '';
+  dom.bearerDevOps.value = Environments.current().bearerDevOps ? Environments.current().bearerDevOps : '';
   dom.dittoPreAuthenticatedUsername.value = Environments.current().dittoPreAuthenticatedUsername ?
                                             Environments.current().dittoPreAuthenticatedUsername :
                                             '';
diff --git a/ui/templates/environmentTemplates.json b/ui/templates/environmentTemplates.json
index 6cbfe8e24a2..5bca6192b7c 100644
--- a/ui/templates/environmentTemplates.json
+++ b/ui/templates/environmentTemplates.json
@@ -3,30 +3,33 @@
     "api_uri": "http://localhost:8080",
     "ditto_version": 3,
     "bearer": null,
+    "bearerDevOps": null,
     "defaultUsernamePassword": "ditto:ditto",
+    "defaultDittoPreAuthenticatedUsername": null,
     "defaultUsernamePasswordDevOps": "devops:foobar",
-    "useBasicAuth": true,
-    "useDittoPreAuthenticatedAuth": false,
-    "defaultDittoPreAuthenticatedUsername": null
+    "mainAuth": "basic",
+    "devopsAuth": "basic"
   },
   "local_ditto_ide": {
     "api_uri": "http://localhost:8080",
     "ditto_version": 3,
     "bearer": null,
+    "bearerDevOps": null,
     "defaultUsernamePassword": null,
-    "defaultUsernamePasswordDevOps": null,
-    "useBasicAuth": false,
-    "useDittoPreAuthenticatedAuth": true,
-    "defaultDittoPreAuthenticatedUsername": "pre:ditto"
+    "defaultDittoPreAuthenticatedUsername": "pre:ditto",
+    "defaultUsernamePasswordDevOps": "devops:foobar",
+    "mainAuth": "pre",
+    "devopsAuth": "basic"
   },
   "ditto_sandbox": {
     "api_uri": "https://ditto.eclipseprojects.io",
     "ditto_version": 3,
     "bearer": null,
+    "bearerDevOps": null,
     "defaultUsernamePassword": "ditto:ditto",
+    "defaultDittoPreAuthenticatedUsername": null,
     "defaultUsernamePasswordDevOps": null,
-    "useBasicAuth": true,
-    "useDittoPreAuthenticatedAuth": false,
-    "defaultDittoPreAuthenticatedUsername": null
+    "mainAuth": "basic",
+    "devopsAuth": null
   }
 }
\ No newline at end of file

From a0fd0f12660cd54d1d594e6df6e461d571d50adb Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Tue, 7 Mar 2023 07:55:20 +0100
Subject: [PATCH 061/173] [#1592] switched grouping of different auth* methods
 based on "main / devops" auth

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 ui/modules/environments/authorization.html | 67 +++++++++++-----------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/ui/modules/environments/authorization.html b/ui/modules/environments/authorization.html
index ef3a0b88486..c0e2b7051f4 100644
--- a/ui/modules/environments/authorization.html
+++ b/ui/modules/environments/authorization.html
@@ -19,12 +19,12 @@
             </div>
             <div class="modal-body">
                 <div class="row">
-                    <h5>Basic Auth</h5>
+                    <h5>Main authentication</h5>
                     <hr />
                     <div class="row">
                         <div class="col-md-5">
                             <input type="radio" id="main-userpass" name="main-auth" value="basic"></input>
-                            <label for="main-userpass">Main User</label>
+                            <label for="main-userpass">Basic</label>
                         </div>
                         <div class="col-md-7">
                             <div class="input-group input-group-sm mb-1">
@@ -37,42 +37,58 @@ <h5>Basic Auth</h5>
                             </div>
                         </div>
                     </div>
-                    <div class="row">
+                    <div class="row pt-2">
                         <div class="col-md-5">
-                            <input type="radio" id="devops-userpass" name="devops-auth" value="basic"></input>
-                            <label for="devops-userpass">DevOps User<br /><small>(for Connections, optional)</small></label>
+                            <input type="radio" id="main-bearer" name="main-auth" value="bearer"></input>
+                            <label for="main-bearer">Bearer<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
                         </div>
                         <div class="col-md-7">
                             <div class="input-group input-group-sm mb-1">
-                                <label for="devOpsUserName" class="input-group-text">DevOps Username</label>
-                                <input type="text" class="form-control form-control-sm" id="devOpsUserName"></input>
+                                <label for="bearer" class="input-group-text">Bearer</label>
+                                <input type="password" class="form-control form-control-sm" id="bearer"></input>
                             </div>
+                        </div>
+                    </div>
+                    <div class="row pt-2">
+                        <div class="col-md-5">
+                            <input type="radio" id="main-pre" name="main-auth" value="pre"></input>
+                            <label for="main-pre">Pre authenticated<br />
+                                <small>(via HTTP header 'x-ditto-pre-authenticated', must take the form
+                                    <code>prefix:suffix</code>)</small>
+                            </label>
+                        </div>
+                        <div class="col-md-7">
                             <div class="input-group input-group-sm mb-1">
-                                <label for="devOpsPassword" class="input-group-text">DevOps Password</label>
-                                <input type="password" class="form-control form-control-sm" id="devOpsPassword"></input>
+                                <label for="dittoPreAuthenticatedUsername" class="input-group-text">prefix:suffix</label>
+                                <input type="text" class="form-control form-control-sm" id="dittoPreAuthenticatedUsername"></input>
                             </div>
                         </div>
                     </div>
                 </div>
                 <div class="row mt-3">
-                    <h5>Bearer</h5>
+                    <h5>DevOps authentication</h5>
+                    <small>(for Connections and administrative tasks, optional)</small>
                     <hr />
                     <div class="row">
                         <div class="col-md-5">
-                            <input type="radio" id="main-bearer" name="main-auth" value="bearer"></input>
-                            <label for="main-bearer">Main User<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
+                            <input type="radio" id="devops-userpass" name="devops-auth" value="basic"></input>
+                            <label for="devops-userpass">Basic<br /></label>
                         </div>
                         <div class="col-md-7">
                             <div class="input-group input-group-sm mb-1">
-                                <label for="bearer" class="input-group-text">Bearer</label>
-                                <input type="password" class="form-control form-control-sm" id="bearer"></input>
+                                <label for="devOpsUserName" class="input-group-text">DevOps Username</label>
+                                <input type="text" class="form-control form-control-sm" id="devOpsUserName"></input>
+                            </div>
+                            <div class="input-group input-group-sm mb-1">
+                                <label for="devOpsPassword" class="input-group-text">DevOps Password</label>
+                                <input type="password" class="form-control form-control-sm" id="devOpsPassword"></input>
                             </div>
                         </div>
                     </div>
-                    <div class="row">
+                    <div class="row pt-2">
                         <div class="col-md-5">
                             <input type="radio" id="devops-bearer" name="devops-auth" value="bearer"></input>
-                            <label for="devops-bearer">DevOps User<br /><small>(JWT OAuth2.0 Bearer token, optional)</small></label>
+                            <label for="devops-bearer">Bearer<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
                         </div>
                         <div class="col-md-7">
                             <div class="input-group input-group-sm mb-1">
@@ -84,25 +100,6 @@ <h5>Bearer</h5>
                     </div>
                     </div>
                 </div>
-                <div class="row mt-3">
-                    <h5>Ditto Pre Authenticated</h5>
-                    <hr />
-                    <div class="row">
-                        <div class="col-md-5">
-                            <input type="radio" id="main-pre" name="main-auth" value="pre"></input>
-                            <label for="main-pre">Main User<br />
-                                <small>(via HTTP header 'x-ditto-pre-authenticated', must take the form
-                                    <code>prefix:suffix</code>)</small>
-                            </label>
-                        </div>
-                        <div class="col-md-7">
-                            <div class="input-group input-group-sm mb-1">
-                                <label for="dittoPreAuthenticatedUsername" class="input-group-text">prefix:suffix</label>
-                                <input type="text" class="form-control form-control-sm" id="dittoPreAuthenticatedUsername"></input>
-                            </div>
-                        </div>
-                    </div>
-                </div>
                 <div class="input-group input-group-sm" style="flex-direction: row-reverse;">
                     <button class="btn btn-outline-secondary btn-sm" data-bs-dismiss="modal"
                         id="authorizeSubmit">Authorize</button>

From 7db85d78bf99f284b0ff7a1067ec129f862346c2 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Tue, 7 Mar 2023 17:11:19 +0100
Subject: [PATCH 062/173] prepare Ditto 3.2.0 release

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 documentation/README.md                       |   2 +-
 documentation/src/main/resources/_config.yml  |   2 +
 .../src/main/resources/_data/authors.yml      |   4 +-
 .../_data/sidebars/ditto_sidebar.yml          |   3 +
 .../src/main/resources/_includes/head.html    |  14 +-
 .../src/main/resources/_includes/topnav.html  |   2 +-
 .../src/main/resources/_layouts/start.html    |   2 +-
 .../_posts/2018-02-08-feature-definition.md   |   2 +-
 .../2018-05-02-connecting-ditto-hono.md       |  18 +--
 .../2018-12-05-example-command-and-control.md |  12 +-
 .../2023-03-08-release-announcement-320.md    |  77 +++++++++
 .../resources/pages/ditto/basic-feature.md    |   2 +-
 .../resources/pages/ditto/basic-signals.md    |   2 +-
 .../pages/ditto/basic-wot-integration.md      |   2 +-
 .../pages/ditto/connectivity-mapping.md       |   2 +-
 .../connectivity-protocol-bindings-amqp10.md  |   6 +-
 .../connectivity-protocol-bindings-mqtt.md    |   2 +-
 .../pages/ditto/release_notes_150.md          |   2 +-
 .../pages/ditto/release_notes_310.md          |   2 +-
 .../pages/ditto/release_notes_320.md          | 150 ++++++++++++++++++
 .../2018_02_07-virtualiot-meetup/index.html   |   6 +-
 .../2018_05_23-meetup-iot-hessen/index.html   |   9 +-
 .../index.html                                |   2 +-
 .../3rd-party-dependencies/maven-plugins.txt  |   4 +-
 pom.xml                                       |   8 +-
 25 files changed, 284 insertions(+), 53 deletions(-)
 create mode 100644 documentation/src/main/resources/_posts/2023-03-08-release-announcement-320.md
 create mode 100644 documentation/src/main/resources/pages/ditto/release_notes_320.md

diff --git a/documentation/README.md b/documentation/README.md
index 706f130e04b..878139c3b34 100755
--- a/documentation/README.md
+++ b/documentation/README.md
@@ -49,7 +49,7 @@ bundle exec jekyll serve --verbose --unpublished
 Validate that the HTML does not contain dead links, etc.:
 
 ```bash
-htmlproofer --assume-extension --allow-hash-href --disable-external --enforce-https=false --ignore-urls "/http-api-doc.html.*/" src/main/resources/_site/
+htmlproofer --assume-extension --allow-hash-href --disable-external --ignore-urls "/http-api-doc.html.*/","http://localhost:4000/feed.xml","http://www.ontology-of-units-of-measure.org/page/om-2" src/main/resources/_site/
 ```
 
 #### Alternative 2: use Maven (UNIX)
diff --git a/documentation/src/main/resources/_config.yml b/documentation/src/main/resources/_config.yml
index 517bf8d7893..e87bf431546 100644
--- a/documentation/src/main/resources/_config.yml
+++ b/documentation/src/main/resources/_config.yml
@@ -114,6 +114,8 @@ plugins:
 docVersions:
   - label: "development"
     basePath: ""
+  - label: "3.2"
+    basePath: "3.2"
   - label: "3.1"
     basePath: "3.1"
   - label: "3.0"
diff --git a/documentation/src/main/resources/_data/authors.yml b/documentation/src/main/resources/_data/authors.yml
index ef679a63b10..1e286541d99 100644
--- a/documentation/src/main/resources/_data/authors.yml
+++ b/documentation/src/main/resources/_data/authors.yml
@@ -1,6 +1,6 @@
 thomas_jaeckle:
     name: Thomas Jäckle
-    email: ditto@jaeckles.de
+    email: thomas.jaeckle@beyonnex.io
     web: https://github.com/thjaeckle
 
 florian_fendt:
@@ -10,7 +10,7 @@ florian_fendt:
 
 juergen_fickel:
     name: Jürgen Fickel
-    email: juergen.fickel@bosch.io
+    email: eclipse-foundation@retujo.de
     web: https://github.com/jufickel-b
 
 philipp_michalski:
diff --git a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
index 689dadad93b..2dec4961e8d 100644
--- a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
+++ b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
@@ -23,6 +23,9 @@ entries:
       - title: Release Notes
         output: web
         folderitems:
+          - title: 3.2.0
+            url: /release_notes_320.html
+            output: web
           - title: 3.1.2
             url: /release_notes_312.html
             output: web
diff --git a/documentation/src/main/resources/_includes/head.html b/documentation/src/main/resources/_includes/head.html
index 8e92a1e37f9..89e575f0cde 100644
--- a/documentation/src/main/resources/_includes/head.html
+++ b/documentation/src/main/resources/_includes/head.html
@@ -6,17 +6,17 @@
 <title>{% if page.title %} {% if page.layout == "post" %} {{ page.title }} • {{ site.topnav_title }}{% else %} {{ page.title }} • {{ site.short_title }}{% endif %}{% else %}{{ site.site_title }}{% endif %}</title>
 
 <link rel="stylesheet" href="{{ "css/syntax.css" }}">
-<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" crossorigin="anonymous">
+<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" crossorigin="anonymous">
 <link rel="stylesheet" href="css/modern-business.css">
-<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" crossorigin="anonymous">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" crossorigin="anonymous">
 <link rel="stylesheet" href="css/customstyles.css">
 <link rel="stylesheet" href="css/boxshadowproperties.css">
 <link rel="stylesheet" href="css/theme-ditto.css">
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700">
 
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js" crossorigin="anonymous"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" crossorigin="anonymous"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/anchor-js/2.0.0/anchor.min.js" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/2.0.0/anchor.min.js" crossorigin="anonymous"></script>
 <script src="{{ "js/toc.js" }}"></script>
 <script src="{{ "js/customscripts.js" }}"></script>
 
@@ -36,5 +36,5 @@
 <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.url }}">
 
 <!-- Eclipse Foundation cookie consent: -->
-<link rel="stylesheet" type="text/css" href="//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
-<script src="//www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
+<link rel="stylesheet" type="text/css" href="https://www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css" />
+<script src="https://www.eclipse.org/eclipse.org-common/themes/solstice/public/javascript/vendor/cookieconsent/default.min.js"></script>
diff --git a/documentation/src/main/resources/_includes/topnav.html b/documentation/src/main/resources/_includes/topnav.html
index b97d3cfb6a4..d17e798b338 100644
--- a/documentation/src/main/resources/_includes/topnav.html
+++ b/documentation/src/main/resources/_includes/topnav.html
@@ -72,7 +72,7 @@
                         <input type="text" id="search-input" placeholder="search...">
                         <ul id="results-container"></ul>
                     </div>
-                    <script src="//cdnjs.cloudflare.com/ajax/libs/simple-jekyll-search/0.0.9/jekyll-search.js" type="text/javascript"></script>
+                    <script src="https://cdnjs.cloudflare.com/ajax/libs/simple-jekyll-search/0.0.9/jekyll-search.js" type="text/javascript"></script>
                     <script type="text/javascript">
                             SimpleJekyllSearch.init({
                                 searchInput: document.getElementById('search-input'),
diff --git a/documentation/src/main/resources/_layouts/start.html b/documentation/src/main/resources/_layouts/start.html
index d6a3bc24d59..c91cde11d33 100644
--- a/documentation/src/main/resources/_layouts/start.html
+++ b/documentation/src/main/resources/_layouts/start.html
@@ -7,7 +7,7 @@
             $('[data-toggle="tooltip"]').tooltip()
         })
     </script>
-    <script src="//iot.eclipse.org/assets/js/eclipsefdn.adopters.js"></script>
+    <script src="https://iot.eclipse.org/assets/js/eclipsefdn.adopters.js"></script>
     <script>
         eclipseFdnAdopters.getList({
            project_id: "iot.ditto",
diff --git a/documentation/src/main/resources/_posts/2018-02-08-feature-definition.md b/documentation/src/main/resources/_posts/2018-02-08-feature-definition.md
index 71384f5b621..4549430c2ce 100644
--- a/documentation/src/main/resources/_posts/2018-02-08-feature-definition.md
+++ b/documentation/src/main/resources/_posts/2018-02-08-feature-definition.md
@@ -67,7 +67,7 @@ For diving deeper into feature definitions, please have a look at [Basic concept
 
 However, nothing can stop you from enforcing types by yourself:
 
-  1. Use the [Ditto generator](http://vorto.eclipse.org/#/generators) to generate JSON schema files from your Vorto
+  1. Use the Ditto generator to generate JSON schema files from your Vorto
      model(s).
   2. Identify the schema files to be used by the Feature definition identifiers.
   3. Validate the JSON representation of your feature using the JSON schema before sending it over the wire.
diff --git a/documentation/src/main/resources/_posts/2018-05-02-connecting-ditto-hono.md b/documentation/src/main/resources/_posts/2018-05-02-connecting-ditto-hono.md
index 07a08702c9d..db809c7a177 100644
--- a/documentation/src/main/resources/_posts/2018-05-02-connecting-ditto-hono.md
+++ b/documentation/src/main/resources/_posts/2018-05-02-connecting-ditto-hono.md
@@ -27,7 +27,7 @@ or `WebSocket`.
 This blog post walks through the steps required to connect Ditto and Hono by adding a connection between the Hono and 
 Ditto sandboxes at
 
-* [hono.eclipse.org](http://hono.eclipse.org) 
+* [hono.eclipse.org](https://hono.eclipseprojects.io) 
 * [ditto.eclipseprojects.io](https://ditto.eclipseprojects.io)
 
 
@@ -79,7 +79,7 @@ the Hono documentation.
 First of all, create a new Hono tenant (we chose the tenant name `org.eclipse.ditto`):
 
 ```bash
-$ curl -X POST -i -H 'Content-Type: application/json' -d '{"tenant-id": "org.eclipse.ditto"}' http://hono.eclipse.org:28080/tenant
+$ curl -X POST -i -H 'Content-Type: application/json' -d '{"tenant-id": "org.eclipse.ditto"}' https://hono.eclipseprojects.io:28080/tenant
 ```
 
 ### Register a device
@@ -87,7 +87,7 @@ $ curl -X POST -i -H 'Content-Type: application/json' -d '{"tenant-id": "org.ecl
 Register a new device in Hono (we chose the device-id `demo-device`):
 
 ```bash
-$ curl -X POST -i -H 'Content-Type: application/json' -d '{"device-id": "demo-device"}' http://hono.eclipse.org:28080/registration/org.eclipse.ditto
+$ curl -X POST -i -H 'Content-Type: application/json' -d '{"device-id": "demo-device"}' https://hono.eclipseprojects.io:28080/registration/org.eclipse.ditto
 ```
 
 ### Add a device credential
@@ -107,7 +107,7 @@ $ curl -X POST -i -H 'Content-Type: application/json' -d '{
       "hash-function" : "sha-512",
       "pwd-hash": "'$PWD_HASH'"
   }]
-}' http://hono.eclipse.org:28080/credentials/org.eclipse.ditto
+}' https://hono.eclipseprojects.io:28080/credentials/org.eclipse.ditto
 ```
 
 ### Publish data
@@ -115,8 +115,8 @@ $ curl -X POST -i -H 'Content-Type: application/json' -d '{
 You are now able to publish `telemetry` (or also `event`) data via the Hono HTTP adapter:
 
 ```bash
-$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"temp": 23.07}' http://hono.eclipse.org:8080/telemetry
-$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"hum": 45.85}'  http://hono.eclipse.org:8080/telemetry
+$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"temp": 23.07}' https://hono.eclipseprojects.io:8080/telemetry
+$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"hum": 45.85}'  https://hono.eclipseprojects.io:8080/telemetry
 ```
 
 However as there is not yet a `consumer` listening for the messages, the Hono HTTP adapter will for example return an
@@ -736,10 +736,10 @@ Whenever the device now sends telemetry in its own JSON format
 Verify that by simulate sending telemetry using the Hono HTTP adapter:
 
 ```bash
-$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"temp": 14.51}' http://hono.eclipse.org:8080/telemetry
-$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"hum": 52.17}'  http://hono.eclipse.org:8080/telemetry
+$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"temp": 14.51}' https://hono.eclipseprojects.io:8080/telemetry
+$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"hum": 52.17}'  https://hono.eclipseprojects.io:8080/telemetry
 
-$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"temp": 23.07, "hum": 45.85}'  http://hono.eclipse.org:8080/telemetry
+$ curl -X POST -i -u demo-device-auth@org.eclipse.ditto:demo-device-password -H 'Content-Type: application/json' -d '{"temp": 23.07, "hum": 45.85}'  https://hono.eclipseprojects.io:8080/telemetry
 ```
 
 <br/>
diff --git a/documentation/src/main/resources/_posts/2018-12-05-example-command-and-control.md b/documentation/src/main/resources/_posts/2018-12-05-example-command-and-control.md
index fc7aace9e74..bd30c0e47df 100644
--- a/documentation/src/main/resources/_posts/2018-12-05-example-command-and-control.md
+++ b/documentation/src/main/resources/_posts/2018-12-05-example-command-and-control.md
@@ -43,9 +43,9 @@ post.
 #### Create Hono device
 ```bash
 # setup a tenant
-$ curl -X POST -i -H 'Content-Type: application/json' -d '{"tenant-id": "org.eclipse.ditto"}' http://hono.eclipse.org:28080/tenant
+$ curl -X POST -i -H 'Content-Type: application/json' -d '{"tenant-id": "org.eclipse.ditto"}' https://hono.eclipseprojects.io:28080/tenant
 # create a device
-$ curl -X POST -i -H 'Content-Type: application/json' -d '{"device-id": "org.eclipse.ditto:teapot"}' http://hono.eclipse.org:28080/registration/org.eclipse.ditto
+$ curl -X POST -i -H 'Content-Type: application/json' -d '{"device-id": "org.eclipse.ditto:teapot"}' https://hono.eclipseprojects.io:28080/registration/org.eclipse.ditto
 # add device credentials
 $ PWD_HASH=$(echo -n 'teapot' | openssl dgst -binary -sha512 | base64 -w 0)
 $ curl -X POST -i -H 'Content-Type: application/json' -d '{
@@ -56,7 +56,7 @@ $ curl -X POST -i -H 'Content-Type: application/json' -d '{
       "hash-function" : "sha-512",
       "pwd-hash": "'$PWD_HASH'"
   }]
-}' http://hono.eclipse.org:28080/credentials/org.eclipse.ditto
+}' https://hono.eclipseprojects.io:28080/credentials/org.eclipse.ditto
 ```
 
 #### Create Ditto policy for digital twin
@@ -186,7 +186,7 @@ curl -X POST -i -u teapot@org.eclipse.ditto:teapot -H 'hono-ttd: 60' -H 'Content
            "path": "/features/water/properties/temperature",
            "value": 23
          }' \
-     http://hono.eclipse.org:8080/telemetry
+     https://hono.eclipseprojects.io:8080/telemetry
 ```
 
 The request is now open to receive a command for 60 seconds before it is terminated.
@@ -222,7 +222,7 @@ correlate the request and the response we are now going to send.
 ### Device sends a command response
 
 We use the header value of `hono-cmd-req-id` to construct the response address: 
-`http://hono.eclipse.org:8080/control/res/013command-and-controlreplies` 
+`https://hono.eclipseprojects.io:8080/control/res/013command-and-controlreplies` 
 
 Another curl command completes the roundtrip with a response from the simulated device:
 
@@ -240,7 +240,7 @@ curl -i -X POST -u teapot@org.eclipse.ditto:teapot \
            "value": { "eta": 56},
            "status": 200
          }' \
-     http://hono.eclipse.org:8080/control/res/013command-and-controlreplies
+     https://hono.eclipseprojects.io:8080/control/res/013command-and-controlreplies
 ```
 
 ### Message response is received at Ditto Message API
diff --git a/documentation/src/main/resources/_posts/2023-03-08-release-announcement-320.md b/documentation/src/main/resources/_posts/2023-03-08-release-announcement-320.md
new file mode 100644
index 00000000000..6bac6889500
--- /dev/null
+++ b/documentation/src/main/resources/_posts/2023-03-08-release-announcement-320.md
@@ -0,0 +1,77 @@
+---
+title: "Announcing Eclipse Ditto Release 3.2.0"
+published: true
+permalink: 2023-03-08-release-announcement-320.html
+layout: post
+author: thomas_jaeckle
+tags: [blog]
+hide_sidebar: true
+sidebar: false
+toc: false
+---
+
+The Eclipse Ditto teams is proud to announce the availability of Eclipse Ditto 
+[3.2.0](https://projects.eclipse.org/projects/iot.ditto/releases/3.2.0).
+
+Version 3.2.0 brings a new **History API**, **Eclipse Hono** connection type, **case-insensitive searches** and
+other smaller improvements, e.g. on the Ditto UI and in the JS client.
+
+
+## Adoption
+
+Companies are willing to show their adoption of Eclipse Ditto publicly: 
+[https://iot.eclipse.org/adopters/?#iot.ditto](https://iot.eclipse.org/adopters/?#iot.ditto)
+
+When you use Eclipse Ditto it would be great to support the project by putting your logo there.  
+
+
+## Changelog
+
+The main improvements and additions of Ditto 3.2.0 are:
+
+* New **History API** in order to be able to:
+  * access historical state of things/policies/connections (with either given revision number or timestamp)
+  * stream persisted events of things/policies via async APIs (WebSocket, Connections) and things also via existing SSE (Server-Sent-Events) API
+  * configure deletion retention of events in the database for each entity
+* Addition of new **Eclipse Hono** connection type for Ditto managed connections
+* Option to do **case-insensitive searches** and addition of a new RQL operator to declare case-insensitive like: `ilike`
+* UI enhancements:
+  * Push notifications on the Ditto UI using SSE (Server-Sent-Events), e.g. on thing updates
+  * Autocomplete functionality for the search slot
+  * Added configuring `Bearer` auth type for the "devops" authentication
+* JavaScript client:
+  * Support for **"merge" / "patch"** functionality in the **JS client**
+
+The following non-functional enhancements are also included:
+
+None in this release.
+
+The following notable fixes are included:
+
+* Undo creating implicitly created policy as part of thing creation if creation of thing failed
+
+Please have a look at the [3.2.0 release notes](release_notes_320.html) for a more detailed information on the release.
+
+
+## Artifacts
+
+The new Java artifacts have been published at the [Eclipse Maven repository](https://repo.eclipse.org/content/repositories/ditto/)
+as well as [Maven central](https://repo1.maven.org/maven2/org/eclipse/ditto/).
+
+The Ditto JavaScript client release was published on [npmjs.com](https://www.npmjs.com/~eclipse_ditto):
+* [@eclipse-ditto/ditto-javascript-client-dom](https://www.npmjs.com/package/@eclipse-ditto/ditto-javascript-client-dom)
+* [@eclipse-ditto/ditto-javascript-client-node](https://www.npmjs.com/package/@eclipse-ditto/ditto-javascript-client-node)
+
+
+The Docker images have been pushed to Docker Hub:
+* [eclipse/ditto-policies](https://hub.docker.com/r/eclipse/ditto-policies/)
+* [eclipse/ditto-things](https://hub.docker.com/r/eclipse/ditto-things/)
+* [eclipse/ditto-things-search](https://hub.docker.com/r/eclipse/ditto-things-search/)
+* [eclipse/ditto-gateway](https://hub.docker.com/r/eclipse/ditto-gateway/)
+* [eclipse/ditto-connectivity](https://hub.docker.com/r/eclipse/ditto-connectivity/)
+
+<br/>
+<br/>
+{% include image.html file="ditto.svg" alt="Ditto" max-width=500 %}
+--<br/>
+The Eclipse Ditto team
diff --git a/documentation/src/main/resources/pages/ditto/basic-feature.md b/documentation/src/main/resources/pages/ditto/basic-feature.md
index fe31fc85114..aac13752427 100644
--- a/documentation/src/main/resources/pages/ditto/basic-feature.md
+++ b/documentation/src/main/resources/pages/ditto/basic-feature.md
@@ -89,7 +89,7 @@ then be interpreted as the link to an Eclipse Vorto "function block" model.
 
 > Vorto is an open source tool that allows to create and manage technology agnostic, abstract device descriptions,
 so called information models. Information models describe the attributes and the capabilities of real world devices.
-Source: [http://www.eclipse.org/vorto/](http://www.eclipse.org/vorto/)
+Source: [https://www.eclipse.org/vorto/](https://www.eclipse.org/vorto/)
 
 {% include warning.html content="The Eclipse Vorto project is no longer actively maintained, so it can be seen
   as feature complete." %}
diff --git a/documentation/src/main/resources/pages/ditto/basic-signals.md b/documentation/src/main/resources/pages/ditto/basic-signals.md
index e3d667ee2e9..5ff6a19fcc8 100644
--- a/documentation/src/main/resources/pages/ditto/basic-signals.md
+++ b/documentation/src/main/resources/pages/ditto/basic-signals.md
@@ -25,7 +25,7 @@ pattern they occur.
 
 Ditto uses Commands, Events,
 <a href="#" data-toggle="tooltip" data-original-title="{{site.data.glossary.cqrs}}">CQRS</a> and EventSourcing.
-[This page](http://cqrs.nu/Faq) provides a quite good explanation of the basic concepts on all of those aspects:
+[This page](https://cqrs.nu/Faq) provides a quite good explanation of the basic concepts on all of those aspects:
 
 ### Command
 
diff --git a/documentation/src/main/resources/pages/ditto/basic-wot-integration.md b/documentation/src/main/resources/pages/ditto/basic-wot-integration.md
index 43ee2ffe879..f34f5bd7de6 100644
--- a/documentation/src/main/resources/pages/ditto/basic-wot-integration.md
+++ b/documentation/src/main/resources/pages/ditto/basic-wot-integration.md
@@ -183,7 +183,7 @@ To describe geolocations you can use: [W3C Basic Geo (WGS84 lat/long) Vocabulary
 ```
 
 To describe units you can choose between:
-* [QUDT.org](http://www.qudt.org)  
+* [QUDT.org](https://www.qudt.org)  
   ```json
   {
     "@context": [
diff --git a/documentation/src/main/resources/pages/ditto/connectivity-mapping.md b/documentation/src/main/resources/pages/ditto/connectivity-mapping.md
index edc9989b693..15a8f578341 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-mapping.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-mapping.md
@@ -519,7 +519,7 @@ code execution.
 ### Constraints
 
 Rhino does not fully support EcmaScript 6. Check which language constructs are supported before using
-them in a mapping function. See [http://mozilla.github.io/rhino/compat/engines.html](http://mozilla.github.io/rhino/compat/engines.html).
+them in a mapping function. See [https://mozilla.github.io/rhino/compat/engines.html](https://mozilla.github.io/rhino/compat/engines.html).
 
 Ditto currently includes Rhino version `1.7.14` and has the `VERSION_ES6` flag enabled.
 
diff --git a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-amqp10.md b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-amqp10.md
index 2b95a6bb97e..89a2857bb70 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-amqp10.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-amqp10.md
@@ -117,13 +117,13 @@ For AMQP 1.0 sources, when configuring
 endpoint are treated in the following way:
 
 For Ditto acknowledgements with successful [status](protocol-specification-acks.html#combined-status-code):
-* Acknowledges the AMQP 1.0 message with `accepted` outcome (see [AMQP 1.0 spec: 3.4.2 Accepted](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-accepted))
+* Acknowledges the AMQP 1.0 message with `accepted` outcome (see [AMQP 1.0 spec: 3.4.2 Accepted](https://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-accepted))
 
 For Ditto acknowledgements with mixed successful/failed [status](protocol-specification-acks.html#combined-status-code):
 * If some of the aggregated [acknowledgements](basic-acknowledgements.html#acknowledgements-acks) require redelivery (e.g. based on a timeout):
-   * Negatively acknowledges the AMQP 1.0 message with `modified[delivery-failed]` outcome (see [AMQP 1.0 spec: 3.4.5 Modified](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-modified))
+   * Negatively acknowledges the AMQP 1.0 message with `modified[delivery-failed]` outcome (see [AMQP 1.0 spec: 3.4.5 Modified](https://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-modified))
 * If none of the aggregated [acknowledgements](basic-acknowledgements.html#acknowledgements-acks) require redelivery:
-   * Negatively acknowledges the AMQP 1.0 message with `rejected` outcome (see [AMQP 1.0 spec: 3.4.3 Rejected](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-rejected)) preventing redelivery by the AMQP 1.0 endpoint
+   * Negatively acknowledges the AMQP 1.0 message with `rejected` outcome (see [AMQP 1.0 spec: 3.4.3 Rejected](https://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-rejected)) preventing redelivery by the AMQP 1.0 endpoint
 
 ### Target format
 
diff --git a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-mqtt.md b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-mqtt.md
index 4dd28fc8d6a..edf92788859 100644
--- a/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-mqtt.md
+++ b/documentation/src/main/resources/pages/ditto/connectivity-protocol-bindings-mqtt.md
@@ -291,7 +291,7 @@ Default: empty string
 
 ### Configure Last Will message
 
-To notify other clients when the connection is disconnected ungracefully the [Last Will feature](http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718028) 
+To notify other clients when the connection is disconnected ungracefully the [Last Will feature](https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718028) 
 can be used. The message which will be published, is specified in the connection and stored 
 in the broker when it connects. The message contains a topic, retained message flag, QoS, and the text payload to be 
 published. These can be configured in the [Specific Configuration](#specific-configuration) of the connection. 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_150.md b/documentation/src/main/resources/pages/ditto/release_notes_150.md
index b94a01e3adb..53ce88a8820 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_150.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_150.md
@@ -27,7 +27,7 @@ In previous versions, Ditto negatively settled messages consumed via AMQP 1.0 wh
 (e.g. because the received message could not be understood or permissions were missing) with `modified[undeliverable-here]`.
 
 This was changed to settle with `rejected` 
-(see [AMQP 1.0 spec](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-rejected)) 
+(see [AMQP 1.0 spec](https://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-rejected)) 
 instead, as this is the more correct settlement outcome.
 
 #### [MongoDB for unit tests was increased to version 4.2](https://github.com/eclipse-ditto/ditto/pull/896)
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_310.md b/documentation/src/main/resources/pages/ditto/release_notes_310.md
index 74c004f0d2f..3881724df62 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_310.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_310.md
@@ -48,7 +48,7 @@ There is a separate [blog post](2022-11-04-live-message-conditions.html) on this
 #### [Support AMQP Message Annotations when extracting values for Headers](https://github.com/eclipse-ditto/ditto/issues/1390)
 
 Ditto managed connections with the [AMQP 1.0](connectivity-protocol-bindings-amqp10.html) can now process 
-[AMQP 1.0 Message Annotations](http://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-message-annotations)
+[AMQP 1.0 Message Annotations](https://docs.oasis-open.org/amqp/core/v1.0/os/amqp-core-messaging-v1.0-os.html#type-message-annotations)
 by reading/writing them as if they would be message headers.
 
 #### [Let policies import other policies to enable re-use when securing things](https://github.com/eclipse-ditto/ditto/issues/298)
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_320.md b/documentation/src/main/resources/pages/ditto/release_notes_320.md
new file mode 100644
index 00000000000..f4c12fc31e1
--- /dev/null
+++ b/documentation/src/main/resources/pages/ditto/release_notes_320.md
@@ -0,0 +1,150 @@
+---
+title: Release notes 3.2.0
+tags: [release_notes]
+published: true
+keywords: release notes, announcements, changelog
+summary: "Version 3.2.0 of Eclipse Ditto, released on 08.03.2023"
+permalink: release_notes_320.html
+---
+
+The second minor release of Ditto 3.x, Eclipse Ditto version 3.2.0 is here.
+
+This release is completely [IP (intellectual property) checked by the Eclipse Foundation](https://www.eclipse.org/projects/handbook/#ip)
+meaning that project code as well as all used dependencies were "[...] reviewed to ensure that the copyrights
+expressed are correct, licensing is valid and compatible, and that other issues have been uncovered and properly
+investigated."
+
+## Changelog
+
+Eclipse Ditto 3.2.0 focuses on the following areas:
+
+* New **History API** in order to be able to:
+  * access historical state of things/policies/connections (with either given revision number or timestamp)
+  * stream persisted events of things/policies via async APIs (WebSocket, Connections) and things also via existing SSE (Server-Sent-Events) API
+  * configure deletion retention of events in the database for each entity
+* Addition of new **Eclipse Hono** connection type for Ditto managed connections
+* Option to do **case-insensitive searches** and addition of a new RQL operator to declare case-insensitive like: `ilike`
+* UI enhancements:
+  * Push notifications on the Ditto UI using SSE (Server-Sent-Events), e.g. on thing updates
+  * Autocomplete functionality for the search slot
+  * Added configuring `Bearer` auth type for the "devops" authentication
+* JavaScript client:
+  * Support for **"merge" / "patch"** functionality in the **JS client**
+
+The following non-functional work is also included:
+
+None in this release.
+
+The following notable fixes are included:
+
+* Undo creating implicitly created policy as part of thing creation if creation of thing failed
+
+
+### New features
+
+#### [Provide API to stream/replay persisted events from the event journal](https://github.com/eclipse-ditto/ditto/issues/1498)
+
+Starting with this release, Eclipse Ditto is now able to provide historical values via its APIs.  
+Ditto makes use of the [Event Sourcing](basic-signals.html#architectural-style) persistence pattern in order to persist
+the different managed entities:
+* things
+* policies
+* connections
+
+As a result of this persistence pattern, the history therefore was "always there" (as delta events in the database), 
+it was just not yet provided as API.
+
+This gap has now been closed, see the added [documentation for "History capabilities"](basic-history.html).
+
+A configurable [cleanup retention time](basic-history.html#cleanup-retention-time-configuration) lets the operator of 
+Ditto decide how much of history to keep, differently configured for "things", "policies" and "connections".  
+For policies and connections it might even make sense to never clean up any events (if only few updates are expected to be done) 
+and as a result get audit log capabilities for those entities (to find out "who" did "what" changes "when") - or to e.g.
+undo configuration changes to connections or compare between different revisions.
+
+Possible is also streaming all events from a thing or policy in order to e.g. show the change of a thing's state 
+(or a particular property value) over time.
+
+{% include note.html content="Ditto's history API capabilities are not comparable with the features of a time series database.
+    E.g. no aggregations on or compactions of the historical data can be done." %}
+
+#### [Add new "Hono" connection type](https://github.com/eclipse-ditto/ditto/pull/1548)
+
+A new connection type [Hono](connectivity-protocol-bindings-hono.html) was added which takes some configuration from 
+static Ditto configuration (e.g. the Kafka endpoint and credentials) in order to better abstract from potential changes
+to [Eclipse Hono™](https://www.eclipse.org/hono/), e.g. regarding Kafka topic structure.
+
+#### [Things-Search Case Sensitivity Option](https://github.com/eclipse-ditto/ditto/issues/1087)
+
+Ditto's search API did not yet provide the option to perform a search (or apply an [RQL filter](basic-rql.html)) ignoring
+the upper/lower case of words.  
+This option has been added as new `ilike` function, both to the [search](basic-search.html) and to all places where
+[RQL filter](basic-rql.html) can be used.
+
+This was a contribution from [Abhijeet Mishra](https://github.com/Abhijeetmishr) - many thanks for that.
+
+#### Enhancements in Ditto explorer UI
+
+We again received several contributions by [Thomas Fries](https://github.com/thfries),
+who contributed the Ditto explorer UI.  
+The latest live version of the UI can be found here:  
+[https://eclipse-ditto.github.io/ditto/](https://eclipse-ditto.github.io/ditto/)
+
+You can use it in order to e.g. connect to your Ditto installation to manage things, policies and even connections.
+
+Contributions in this release:
+* [UI activate Server Sent Events](https://github.com/eclipse-ditto/ditto/pull/1532)
+* [Explorer UI - autocomplete for search](https://github.com/eclipse-ditto/ditto/pull/1580)
+* [UI - removed old dropdown for searchfilters](https://github.com/eclipse-ditto/ditto/pull/1584)
+* [UI: Provide Bearer authentication for devops user](https://github.com/eclipse-ditto/ditto/issues/1592)
+
+
+#### Enhancements in Ditto Clients
+
+##### [added merge functionality to javascript client sdk](https://github.com/eclipse-ditto/ditto-clients/pull/217)
+
+The [Ditto JS client](https://github.com/eclipse-ditto/ditto-clients/tree/master/javascript) did not yet support the
+[merge/path](protocol-specification-things-merge.html) of Ditto.  
+This was now provided and is available in the 3.2.0 version of the JS client.
+
+This was a contribution from [Pieter-Jan Lanneer](https://github.com/PJGitLan) - many thanks for that.
+
+### Changes
+
+None in this release.
+
+
+### Bugfixes
+
+Some bugs in Ditto 3.1.x were also fixed for 3.2.0.  
+This is a complete list of the
+* [merged pull requests for milestone 3.2.0](https://github.com/eclipse-ditto/ditto/pulls?q=is:pr+milestone:3.2.0)
+
+Here as well for the Ditto Clients: [merged pull requests for milestone 3.2.0](https://github.com/eclipse-ditto/ditto-clients/pulls?q=is:pr+milestone:3.2.0)
+
+#### [Creation of thing's policy is atomic with creation the of thing itself](https://github.com/eclipse-ditto/ditto/pull/1581)
+
+Fixes providing atomic behaviour while creating a thing and an implicit policy as result of the thing creation.  
+In the rare case of failing to create a thing, its policy will be rolled back (deleted) in order to not fail create retry.
+
+## Migration notes
+
+There are no migration steps required when updating from Ditto 3.1.x to Ditto 3.2.0.  
+When updating from Ditto 2.x version to 3.2.0, the migration notes of 
+[Ditto 3.0.0](release_notes_300.html#migration-notes) and [Ditto 3.1.0](release_notes_310.html#migration-notes) apply.
+
+
+## Roadmap
+
+Looking forward, the (current) ideas for Ditto 3.3.0 are:
+
+* [Support replacing certain json objects in a merge/patch command instead of merging their fields](https://github.com/eclipse-ditto/ditto/issues/1593)
+* [UI: Enhance Ditto-UI to configure log levels of Ditto](https://github.com/eclipse-ditto/ditto/issues/1590)
+* [Provide CoAP endpoint in Ditto's gateway, providing the Ditto HTTP API via CoAP](https://github.com/eclipse-ditto/ditto/issues/1582)
+  * Maybe - as no-one declared interest yet in this
+* Perform a benchmark of Ditto and provide a "tuning" chapter in the documentation as a reference to the commonly 
+  asked questions 
+  * how many Things Ditto can manage
+  * how many updates/second can be done
+  * whether Ditto can scale horizontally
+  * how many resources (e.g. machines) are required at which scale
diff --git a/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html b/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
index 8bdf308e188..0b3803480ae 100644
--- a/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
+++ b/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
@@ -178,7 +178,7 @@ <h2>Eclipse Ditto introduction</h2>
                 <hr />
                 <small class="introlink">by <a
                         href="mailto:thomas.jaeckle@bosch-si.com">Thomas Jäckle</a> (<a
-                        href="http://twitter.com/thjaeckle">@thjaeckle</a>)
+                        href="https://twitter.com/thjaeckle">@thjaeckle</a>)
                 </small>
             </section>
 
@@ -256,9 +256,9 @@ <h2>in IIoT / Industry 4.0</h2>
                 </ul>
                 <div style="float:right; width: 40%;">
                     <img src="../images/asset-admin-shell.png" style="width: 80%" alt="Asset admin shell" />
-                    <div style="font-size: 0.4em;"><a href="http://acplt.github.io/openAAS/AssetAdministrationShell.html">Source</a></div>
+                    <div style="font-size: 0.4em;"><a href="https://acplt.github.io/openAAS/AssetAdministrationShell.html">Source</a></div>
                 </div>
-                <!-- img source: http://acplt.github.io/openAAS/AssetAdministrationShell.html -->
+                <!-- img source: https://acplt.github.io/openAAS/AssetAdministrationShell.html -->
             </section>
         </section>
 
diff --git a/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html b/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
index 8832e8b1e28..2c8594095a0 100644
--- a/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
+++ b/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
@@ -181,7 +181,7 @@ <h2 style="font-size: 1.0em">23.05.2018</h2>
                 <hr />
                 <small class="introlink">by <a
                         href="mailto:thomas.jaeckle@bosch-si.com">Thomas Jäckle</a> (<a
-                        href="http://twitter.com/thjaeckle">@thjaeckle</a>)
+                        href="https://twitter.com/thjaeckle">@thjaeckle</a>)
                 </small>
             </section>
 
@@ -191,11 +191,10 @@ <h2>who am I?</h2>
                 <div style="float:left; width: 25%;">
                     <img src="../images/thjaeckle_400x400.jpg" alt="Thomas Jäckle" style="width: 100%; border-radius: 50%" />
                     <h4>Thomas Jäckle</h4>
-                    <h4><a href="http://twitter.com/thjaeckle">@thjaeckle</a></h4>
+                    <h4><a href="https://twitter.com/thjaeckle">@thjaeckle</a></h4>
                     <br style="clear: both"/>
                 </div>
                 <div style="float:right; width: 70%;">
-                    <img src="//www.brand.bosch.com/images/icons/bosch-logo.png" alt="Bosch logo" style="width: 30%; float: right; padding-left: 2px; margin-top: -1em"/>
                     <h4>software developer <br/>@ Bosch Software Innovations</h4>
                     <h4 style="padding-top:1em">project lead of Eclipse Ditto</h4>
                     <h4 style="padding-top:1em">lead developer of commercial service<br/>"Bosch IoT Things"</h4>
@@ -290,9 +289,9 @@ <h2>in IIoT / Industry 4.0</h2>
                 </ul>
                 <div style="float:right; width: 40%;">
                     <img src="../images/asset-admin-shell.png" style="width: 80%" alt="Asset admin shell" />
-                    <div style="font-size: 0.4em;"><a href="http://acplt.github.io/openAAS/AssetAdministrationShell.html">Source</a></div>
+                    <div style="font-size: 0.4em;"><a href="https://acplt.github.io/openAAS/AssetAdministrationShell.html">Source</a></div>
                 </div>
-                <!-- img source: http://acplt.github.io/openAAS/AssetAdministrationShell.html -->
+                <!-- img source: https://acplt.github.io/openAAS/AssetAdministrationShell.html -->
             </section>
             <section id="twin-3" style="clear: both;">
                 <h2>our interpretation</h2>
diff --git a/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html b/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
index 95fb0ced1a3..3e8308338cd 100644
--- a/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
+++ b/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
@@ -197,7 +197,7 @@ <h2 style="font-size: 0.8em">16.04.2020</h2>
 <!--                <div style="float:left; width: 25%;">-->
 <!--                    <img src="../images/thjaeckle_400x400.jpg" alt="Thomas Jäckle" style="width: 100%; border-radius: 50%" />-->
 <!--                    <h4>Thomas Jäckle</h4>-->
-<!--                    <h4><a href="http://twitter.com/thjaeckle">@thjaeckle</a></h4>-->
+<!--                    <h4><a href="https://twitter.com/thjaeckle">@thjaeckle</a></h4>-->
 <!--                    <br style="clear: both"/>-->
 <!--                </div>-->
 <!--                <div style="float:right; width: 70%;">-->
diff --git a/legal/3rd-party-dependencies/maven-plugins.txt b/legal/3rd-party-dependencies/maven-plugins.txt
index 52967273523..4eeaf96c5b3 100644
--- a/legal/3rd-party-dependencies/maven-plugins.txt
+++ b/legal/3rd-party-dependencies/maven-plugins.txt
@@ -2,7 +2,7 @@ com.github.siom79.japicmp:japicmp-maven-plugin:maven-plugin:0.15.7:runtime
 com.mycila:license-maven-plugin:maven-plugin:4.1:runtime
 net.alchim31.maven:scala-maven-plugin:maven-plugin:4.5.6:runtime
 org.apache.felix:maven-bundle-plugin:maven-plugin:5.1.4:runtime
-org.apache.maven.plugins:maven-clean-plugin:maven-plugin:2.5:runtime
+org.apache.maven.plugins:maven-clean-plugin:maven-plugin:3.2.0:runtime
 org.apache.maven.plugins:maven-compiler-plugin:maven-plugin:3.9.0:runtime
 org.apache.maven.plugins:maven-dependency-plugin:maven-plugin:3.2.0:runtime
 org.apache.maven.plugins:maven-deploy-plugin:maven-plugin:3.0.0-M2:runtime
@@ -14,7 +14,7 @@ org.apache.maven.plugins:maven-javadoc-plugin:maven-plugin:3.3.1:runtime
 org.apache.maven.plugins:maven-resources-plugin:maven-plugin:3.2.0:runtime
 org.apache.maven.plugins:maven-scm-plugin:maven-plugin:1.12.2:runtime
 org.apache.maven.plugins:maven-shade-plugin:maven-plugin:3.2.4:runtime
-org.apache.maven.plugins:maven-site-plugin:maven-plugin:3.3:runtime
+org.apache.maven.plugins:maven-site-plugin:maven-plugin:3.12.1:runtime
 org.apache.maven.plugins:maven-source-plugin:maven-plugin:3.2.1:runtime
 org.apache.maven.plugins:maven-surefire-plugin:maven-plugin:3.0.0-M5:runtime
 org.codehaus.mojo:flatten-maven-plugin:maven-plugin:1.2.7:runtime
diff --git a/pom.xml b/pom.xml
index cc179fb0532..66fa42ef09c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,8 +86,10 @@
         <developer>
             <id>tjaeckle</id>
             <name>Thomas Jaeckle</name>
-            <email>ditto@jaeckles.de</email>
+            <email>thomas.jaeckle@beyonnex.io</email>
             <url>https://github.com/thjaeckle</url>
+            <organization>beyonnex.io GmbH</organization>
+            <organizationUrl>https://beyonnex.io</organizationUrl>
             <roles>
                 <role>Lead</role>
                 <role>Committer</role>
@@ -130,10 +132,8 @@
         <developer>
             <id>jfickel</id>
             <name>Juergen Fickel</name>
-            <email>juergen.fickel@bosch.io</email>
+            <email>eclipse-foundation@retujo.de</email>
             <url>https://github.com/jufickel-b</url>
-            <organization>Bosch.IO GmbH</organization>
-            <organizationUrl>https://www.bosch.io</organizationUrl>
             <roles>
                 <role>Committer</role>
             </roles>

From 2c9c189268ec054e486ca89323a4f02a4391f1d3 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Wed, 8 Mar 2023 13:47:45 +0100
Subject: [PATCH 063/173] post Ditto 3.2.0 release: update
 binary-compatibility-check to version 3.2.0

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 66fa42ef09c..3a06ef54281 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,7 +240,7 @@
         <!-- globally set version for checking binary compatibility against -->
         <!-- whoever changes this to ${revision} or ${project.version} is responsible for API breakage caused by this! -->
         <!-- in other words: never do that here! exclude the 'breakages' locally in the japicmp maven plugin if you intentionally break something -->
-        <binary-compatibility-check.version>3.1.0</binary-compatibility-check.version>
+        <binary-compatibility-check.version>3.2.0</binary-compatibility-check.version>
 
         <maven.skins.fluido.version>1.7</maven.skins.fluido.version>
         <doxia.markdown.version>1.8</doxia.markdown.version>

From 66e539d2da2699cf92d769601561626b91a1eb04 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Wed, 8 Mar 2023 13:49:02 +0100
Subject: [PATCH 064/173] post Ditto 3.2.0 release: update SECURITY.md

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 SECURITY.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 4992edf5be1..ead6f09625e 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -9,9 +9,9 @@ These versions of Eclipse Ditto are currently being supported with security upda
 
 | Version | Supported          |
 |---------| ------------------ |
+| 3.2x    | :white_check_mark: |
 | 3.1.x   | :white_check_mark: |
-| 3.0.x   | :white_check_mark: |
-| < 3.0.0 | :x:                |
+| < 3.1.0 | :x:                |
 
 ## Reporting a Vulnerability
 

From 9d56a33c10495179480bb8844b45309067d1c6c2 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Mon, 13 Mar 2023 17:26:27 +0100
Subject: [PATCH 065/173] adding some documentation to available configuration

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 .../src/main/resources/connectivity.conf      | 10 +++++++
 .../service/src/main/resources/gateway.conf   | 30 ++++++++++++++++++-
 .../src/main/resources/ditto-kamon.conf       |  4 +++
 .../service/src/main/resources/search.conf    |  8 ++++-
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/connectivity/service/src/main/resources/connectivity.conf b/connectivity/service/src/main/resources/connectivity.conf
index e2bc8a317a1..b63e86477dc 100644
--- a/connectivity/service/src/main/resources/connectivity.conf
+++ b/connectivity/service/src/main/resources/connectivity.conf
@@ -1178,6 +1178,16 @@ akka-contrib-mongodb-persistence-connection-journal-read {
 akka-contrib-mongodb-persistence-connection-snapshots {
   class = "akka.contrib.persistence.mongodb.MongoSnapshots"
   plugin-dispatcher = "connection-persistence-dispatcher"
+
+  circuit-breaker {
+    max-failures = 5 # if an exception during persisting an event/snapshot occurs this often -- a successful write resets the counter
+    max-failures = ${?SNAPSHOT_BREAKER_MAXTRIES}
+    call-timeout = 10s # MongoDB Timeouts causing the circuitBreaker to open
+    call-timeout = ${?SNAPSHOT_BREAKER_TIMEOUT}
+    reset-timeout = 6s # after this time in "Open" state, the cicuitBreaker is "Half-opened" again
+    reset-timeout = ${?SNAPSHOT_BREAKER_RESET}
+  }
+
   overrides {
     snaps-collection = "connection_snaps"
     snaps-index = "connection_snaps_index"
diff --git a/gateway/service/src/main/resources/gateway.conf b/gateway/service/src/main/resources/gateway.conf
index f6e741fec8c..846bf229b0c 100755
--- a/gateway/service/src/main/resources/gateway.conf
+++ b/gateway/service/src/main/resources/gateway.conf
@@ -252,6 +252,12 @@ ditto {
           #     "<your-domain>.<region>.auth0.com/"
           #     "<your-domain-2>.<region>.auth0.com/"
           #   ]
+          #   auth-subjects = [
+          #     "{{ jwt:sub }}",
+          #     "{{ jwt:sub }}/{{ jwt:scp }}",
+          #     "{{ jwt:sub }}/{{ jwt:scp }}@{{ jwt:client_id }}",
+          #     "{{ jwt:roles/support }}"
+          #   ]
           #}
           google = {
             issuer = "accounts.google.com"
@@ -292,13 +298,35 @@ ditto {
         password = ${?DEVOPS_PASSWORD}
 
         # oauth2 auth
+        oauth {
+          # force protocol to HTTPS for security
+          protocol = "https"
+          protocol = ${?DEVOPS_OAUTH2_PROTOCOL}
+
+          # configure the amount of clock skew in seconds to tolerate when verifying the local time against the exp
+          # and nbf claims
+          allowed-clock-skew = 10s
+          allowed-clock-skew = ${?DEVOPS_OAUTH2_ALLOWED_CLOCK_SKEW}
+
+          # map <subject-issuer, configObject> of all supported OpenID Connect authorization servers
+          # issuer should not contain the protocol (e.g. https://)
+          openid-connect-issuers = {
+            # auth0 = {
+            #   issuer = "<your-domain>.<region>.auth0.com/"
+            #   issuers = [
+            #     "<your-domain>.<region>.auth0.com/"
+            #     "<your-domain-2>.<region>.auth0.com/"
+            #   ]
+            #}
+          }
+        }
         devops-oauth2-subjects = ${?DEVOPS_OAUTH2_SUBJECTS}
 
         status-secured = true
         status-secured = ${?DEVOPS_STATUS_SECURED}
 
         # default authentiation method for the status route
-        # can be set to "basic" or "oauth"
+        # can be set to "basic" or "oauth2"
         status-authentication-method = "basic"
         # override by environment variable
         status-authentication-method = ${?STATUS_AUTHENTICATION_METHOD}
diff --git a/internal/utils/config/src/main/resources/ditto-kamon.conf b/internal/utils/config/src/main/resources/ditto-kamon.conf
index 7462fa5381d..8cf38a24c97 100644
--- a/internal/utils/config/src/main/resources/ditto-kamon.conf
+++ b/internal/utils/config/src/main/resources/ditto-kamon.conf
@@ -72,6 +72,10 @@ kamon {
 
   trace {
     # disable reporting by default
+    #   - always: report all traces.
+    #   - never:  don't report any trace.
+    #   - random: randomly decide using the probability defined in the random-sampler.probability setting.
+    #   - adaptive: keeps dynamic samplers for each operation while trying to achieve a set throughput goal.
     sampler = never
     sampler = ${?DITTO_TRACING_SAMPLER}
 
diff --git a/thingsearch/service/src/main/resources/search.conf b/thingsearch/service/src/main/resources/search.conf
index fcc7ff75317..1dcec5529ea 100755
--- a/thingsearch/service/src/main/resources/search.conf
+++ b/thingsearch/service/src/main/resources/search.conf
@@ -113,22 +113,28 @@ ditto {
       force-update-after-start-random-factor = ${?FORCE_UPDATE_AFTER_START_RANDOM_FACTOR}
 
       background-sync {
+        # whether background sync is turned on
         enabled = true
         enabled = ${?BACKGROUND_SYNC_ENABLED}
 
+        # duration between service start-up and the beginning of background sync
         quiet-period = 8m
         quiet-period = ${?BACKGROUND_SYNC_QUIET_PERIOD}
 
+        # how soon to close the remote stream if no element passed through it
         idle-timeout = 5m
         idle-timeout = ${?BACKGROUND_SYNC_IDLE_TIMEOUT}
 
+        # how long to wait before reacting to out-of-date search index entries
         tolerance-window = 20m
         tolerance-window = ${?BACKGROUND_SYNC_TOLERANCE_WINDOW}
 
+        # how long to wait for the policy shard region for the most up-to-date policy revision
         policy-ask-timeout = 10s
         policy-ask-timeout = ${?BACKGROUND_SYNC_POLICY_ASK_TIMEOUT}
 
         keep {
+          # how many events to keep in the actor state
           events = 50
           events = ${?BACKGROUND_SYNC_KEEP_EVENTS}
         }
@@ -169,7 +175,7 @@ ditto {
 
         # delay before updater actor is stopped after receiving thing deleted event
         thing-deletion-timeout = 5m
-        thing-deletion-timeout = ${?THINGS_SEARCH_UPDATER_STREAM_WRITE_INTERVAL}
+        thing-deletion-timeout = ${?THINGS_SEARCH_UPDATER_STREAM_THING_DELETION_TIMEOUT}
 
         # configuration for retrieval of policies/things via sharding
         ask-with-retry {

From c923afa289dfa87960cf29679814ef48c4b7770e Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Tue, 14 Mar 2023 14:27:57 +0100
Subject: [PATCH 066/173] fix reading configured WoT TD "json template" from
 system property * preserving the object structure

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 .../config/DefaultToThingDescriptionConfig.java        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/config/DefaultToThingDescriptionConfig.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/config/DefaultToThingDescriptionConfig.java
index 4520a8e5cda..172775dbd36 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/config/DefaultToThingDescriptionConfig.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/config/DefaultToThingDescriptionConfig.java
@@ -44,9 +44,13 @@ final class DefaultToThingDescriptionConfig implements ToThingDescriptionConfig
 
     private DefaultToThingDescriptionConfig(final ScopedConfig scopedConfig) {
         basePrefix = scopedConfig.getString(ConfigValue.BASE_PREFIX.getConfigPath());
-        jsonTemplate = JsonFactory.readFrom(
-                scopedConfig.getValue(ConfigValue.JSON_TEMPLATE.getConfigPath()).render(ConfigRenderOptions.concise())
-        ).asObject();
+        final String jsonTemplateRendered =
+                scopedConfig.getValue(ConfigValue.JSON_TEMPLATE.getConfigPath()).render(ConfigRenderOptions.concise());
+        final String jsonTemplateStrippedStartEndQuotes =
+                (jsonTemplateRendered.startsWith("\"{") && jsonTemplateRendered.endsWith("}\"")) ?
+                jsonTemplateRendered.substring(1, jsonTemplateRendered.length()-1) : jsonTemplateRendered;
+        final String replaceEscapedQuotesJsonTemplate = jsonTemplateStrippedStartEndQuotes.replace("\\\"", "\"");
+        jsonTemplate = JsonFactory.readFrom(replaceEscapedQuotesJsonTemplate).asObject();
         placeholders = JsonFactory.readFrom(
                 scopedConfig.getValue(ConfigValue.PLACEHOLDERS.getConfigPath()).render(ConfigRenderOptions.concise())
         ).asObject()

From 6b67dd136849b684b0cf1d0b7d01d54731f46128 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Tue, 14 Mar 2023 16:48:42 +0100
Subject: [PATCH 067/173] configure OpenAPI doc to also contain configurable
 "Bearer" security for /connections resource

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 .../src/main/resources/openapi/ditto-api-2.yml    | 14 ++++++++++++++
 .../resources/openapi/sources/api-2-index.yml     |  2 ++
 .../openapi/sources/paths/connections/command.yml |  3 ++-
 .../sources/paths/connections/connectionId.yml    |  9 ++++++---
 .../sources/paths/connections/connections.yml     |  6 ++++--
 .../openapi/sources/paths/connections/logs.yml    |  3 ++-
 .../openapi/sources/paths/connections/metrics.yml |  3 ++-
 .../openapi/sources/paths/connections/status.yml  |  3 ++-
 .../openapi/sources/security/devOpsBearer.yml     | 15 +++++++++++++++
 9 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 documentation/src/main/resources/openapi/sources/security/devOpsBearer.yml

diff --git a/documentation/src/main/resources/openapi/ditto-api-2.yml b/documentation/src/main/resources/openapi/ditto-api-2.yml
index 4f2fbe042d3..07c36196c6c 100644
--- a/documentation/src/main/resources/openapi/ditto-api-2.yml
+++ b/documentation/src/main/resources/openapi/ditto-api-2.yml
@@ -6822,6 +6822,7 @@ paths:
       description: Returns all connections.
       security:
         - DevOpsBasic: []
+        - DevOpsBearer: []
       tags:
         - Connections
       parameters:
@@ -6874,6 +6875,7 @@ paths:
         Supported connection types are `amqp-091`, `amqp-10`, `mqtt`, `mqtt-5`, `kafka`, `hono` and `http-push`.
       security:
         - DevOpsBasic: []
+        - DevOpsBearer: []
       tags:
         - Connections
       parameters:
@@ -6970,6 +6972,7 @@ paths:
       description: Returns the connection identified by the `connectionId` path parameter.
       security:
         - DevOpsBasic: []
+        - DevOpsBearer: []
       tags:
         - Connections
       parameters:
@@ -7011,6 +7014,7 @@ paths:
       description: Update the connection identified by the `connectionId` path parameter.
       security:
         - DevOpsBasic: []
+        - DevOpsBearer: []
       tags:
         - Connections
       parameters:
@@ -7085,6 +7089,7 @@ paths:
       description: Delete the connection identified by the `connectionId` path parameter.
       security:
         - DevOpsBasic: []
+        - DevOpsBearer: []
       tags:
         - Connections
       parameters:
@@ -7124,6 +7129,7 @@ paths:
         path parameter.
       security:
         - DevOpsBasic: []
+        - DevOpsBearer: []
       tags:
         - Connections
       parameters:
@@ -7175,6 +7181,7 @@ paths:
       description: Returns the status of the connection identified by the `connectionId` path parameter.
       security:
         - DevOpsBasic: []
+        - DevOpsBearer: []
       tags:
         - Connections
       parameters:
@@ -7216,6 +7223,7 @@ paths:
       description: Returns the metrics of the connection identified by the `connectionId` path parameter.
       security:
         - DevOpsBasic: []
+        - DevOpsBearer: []
       tags:
         - Connections
       parameters:
@@ -7261,6 +7269,7 @@ paths:
         default. This allows to log possible errors on connection establishing.
       security:
         - DevOpsBasic: []
+        - DevOpsBearer: []
       tags:
         - Connections
       parameters:
@@ -9600,3 +9609,8 @@ components:
       type: http
       description: Eclipse Ditto devops user (devops) + password (foobar)
       scheme: basic
+    DevOpsBearer:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+      description: A JSON Web Token issued by a supported OAuth 2.0 Identity Provider for the Eclipse Ditto devops user.
diff --git a/documentation/src/main/resources/openapi/sources/api-2-index.yml b/documentation/src/main/resources/openapi/sources/api-2-index.yml
index 00a8df3365e..7d2eb650d50 100644
--- a/documentation/src/main/resources/openapi/sources/api-2-index.yml
+++ b/documentation/src/main/resources/openapi/sources/api-2-index.yml
@@ -399,3 +399,5 @@ components:
       $ref: './security/google.yml'
     DevOpsBasic:
       $ref: './security/devOpsBasic.yml'
+    DevOpsBearer:
+      $ref: './security/devOpsBearer.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/connections/command.yml b/documentation/src/main/resources/openapi/sources/paths/connections/command.yml
index 58286fad517..55d39494855 100644
--- a/documentation/src/main/resources/openapi/sources/paths/connections/command.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/connections/command.yml
@@ -14,7 +14,8 @@ post:
     Sends the command specified in the body to the connection identified by the `connectionId`
     path parameter.
   security:
-    - DevOpsBasic: [ ]
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Connections
   parameters:
diff --git a/documentation/src/main/resources/openapi/sources/paths/connections/connectionId.yml b/documentation/src/main/resources/openapi/sources/paths/connections/connectionId.yml
index a76a2affb06..82a5019c2cd 100644
--- a/documentation/src/main/resources/openapi/sources/paths/connections/connectionId.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/connections/connectionId.yml
@@ -13,7 +13,8 @@ get:
   description: |-
     Returns the connection identified by the `connectionId` path parameter.
   security:
-    - DevOpsBasic: [ ]
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Connections
   parameters:
@@ -57,7 +58,8 @@ put:
   description: |-
     Update the connection identified by the `connectionId` path parameter.
   security:
-    - DevOpsBasic: [ ]
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Connections
   parameters:
@@ -147,7 +149,8 @@ delete:
   description: |-
     Delete the connection identified by the `connectionId` path parameter.
   security:
-    - DevOpsBasic: [ ]
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Connections
   parameters:
diff --git a/documentation/src/main/resources/openapi/sources/paths/connections/connections.yml b/documentation/src/main/resources/openapi/sources/paths/connections/connections.yml
index 310948336a3..4e0db9678b8 100644
--- a/documentation/src/main/resources/openapi/sources/paths/connections/connections.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/connections/connections.yml
@@ -13,7 +13,8 @@ get:
   description: |-
     Returns all connections.
   security:
-    - DevOpsBasic: [ ]
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Connections
   parameters:
@@ -68,7 +69,8 @@ post:
     prohibited.
     Supported connection types are `amqp-091`, `amqp-10`, `mqtt`, `mqtt-5`, `kafka`, `hono` and `http-push`.
   security:
-    - DevOpsBasic: [ ]
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Connections
   parameters:
diff --git a/documentation/src/main/resources/openapi/sources/paths/connections/logs.yml b/documentation/src/main/resources/openapi/sources/paths/connections/logs.yml
index 605b1bb7d1f..6bd1f58ed82 100644
--- a/documentation/src/main/resources/openapi/sources/paths/connections/logs.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/connections/logs.yml
@@ -16,7 +16,8 @@ get:
     `connectivity.commands:enableConnectionLogs`. When creating or opening an connection the logging is enabled per
     default. This allows to log possible errors on connection establishing.
   security:
-    - DevOpsBasic: [ ]
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Connections
   parameters:
diff --git a/documentation/src/main/resources/openapi/sources/paths/connections/metrics.yml b/documentation/src/main/resources/openapi/sources/paths/connections/metrics.yml
index be0f5846cc7..754b648dc1f 100644
--- a/documentation/src/main/resources/openapi/sources/paths/connections/metrics.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/connections/metrics.yml
@@ -13,7 +13,8 @@ get:
   description: |-
     Returns the metrics of the connection identified by the `connectionId` path parameter.
   security:
-    - DevOpsBasic: [ ]
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Connections
   parameters:
diff --git a/documentation/src/main/resources/openapi/sources/paths/connections/status.yml b/documentation/src/main/resources/openapi/sources/paths/connections/status.yml
index b7f3296734f..a6027a056bc 100644
--- a/documentation/src/main/resources/openapi/sources/paths/connections/status.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/connections/status.yml
@@ -13,7 +13,8 @@ get:
   description: |-
     Returns the status of the connection identified by the `connectionId` path parameter.
   security:
-    - DevOpsBasic: [ ]
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Connections
   parameters:
diff --git a/documentation/src/main/resources/openapi/sources/security/devOpsBearer.yml b/documentation/src/main/resources/openapi/sources/security/devOpsBearer.yml
new file mode 100644
index 00000000000..08b4d6c9ad7
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/security/devOpsBearer.yml
@@ -0,0 +1,15 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: http
+scheme: bearer
+bearerFormat: JWT
+description: |-
+  A JSON Web Token issued by a supported OAuth 2.0 Identity Provider for the Eclipse Ditto devops user.
\ No newline at end of file

From 90a2dd70aa57bf15989ef806ed73c5fff1e2e29b Mon Sep 17 00:00:00 2001
From: Vit Holasek <xvh@seznam.cz>
Date: Sun, 19 Mar 2023 09:29:44 +0100
Subject: [PATCH 068/173] Fixed filtering desired properties signals. #1599

Signed-off-by: Vit Holasek <xvh@seznam.cz>
---
 .../service/messaging/TestConstants.java      |  16 +++
 .../persistence/SignalFilterTest.java         |  54 ++++++---
 .../events/ThingEventToThingConverter.java    |  19 +++
 .../ThingEventToThingConverterTest.java       | 108 +++++++++++++++++-
 4 files changed, 174 insertions(+), 23 deletions(-)

diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/TestConstants.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/TestConstants.java
index 821780b6797..da6dcfb5ea6 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/TestConstants.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/TestConstants.java
@@ -127,9 +127,11 @@
 import org.eclipse.ditto.protocol.TopicPath;
 import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
 import org.eclipse.ditto.things.model.Attributes;
+import org.eclipse.ditto.things.model.FeatureProperties;
 import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.signals.commands.modify.ModifyThing;
+import org.eclipse.ditto.things.model.signals.events.FeatureDesiredPropertiesModified;
 import org.eclipse.ditto.things.model.signals.events.ThingModified;
 import org.eclipse.ditto.things.model.signals.events.ThingModifiedEvent;
 import org.mockito.Mockito;
@@ -326,6 +328,14 @@ public static final class Things {
 
     }
 
+    public static final class Feature {
+
+        public static final String FEATURE_ID = "Feature";
+        public static final FeatureProperties FEATURE_DESIRED_PROPERTIES = FeatureProperties.newBuilder()
+                .set("property", "test").build();
+
+    }
+
     public static final class Authorization {
 
         public static final String SUBJECT_ID = "some:subject";
@@ -986,6 +996,12 @@ public static ThingModifiedEvent<?> thingModified(final Collection<Authorization
                 TestConstants.INSTANT, dittoHeaders, TestConstants.METADATA);
     }
 
+    public static ThingModifiedEvent<?> featureDesiredPropertiesModified(Collection<AuthorizationSubject> readSubjects) {
+        DittoHeaders dittoHeaders = DittoHeaders.newBuilder().readGrantedSubjects(readSubjects).build();
+        return FeatureDesiredPropertiesModified.of(Things.THING_ID, Feature.FEATURE_ID,
+                Feature.FEATURE_DESIRED_PROPERTIES, 1, null, dittoHeaders, null);
+    }
+
     public static MessageCommand<?, ?> sendThingMessage(final Collection<AuthorizationSubject> readSubjects) {
         final DittoHeaders dittoHeaders = DittoHeaders.newBuilder()
                 .readGrantedSubjects(readSubjects)
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilterTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilterTest.java
index 55c4bd26b77..16047e55328 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilterTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilterTest.java
@@ -78,12 +78,12 @@ public final class SignalFilterTest {
     private static final HeaderMapping HEADER_MAPPING =
             ConnectivityModelFactory.newHeaderMapping(Collections.singletonMap("reply-to", "{{fn:delete()}}"));
 
+    private static final Set<AuthorizationSubject> READ_SUBJECTS =
+            Sets.newSet(newAuthSubject("authorized"), newAuthSubject("ditto"));
+
     @Parameterized.Parameters(name = "topic={0}, readSubjects={1}, configuredTargets={2}, expectedTargets={3}")
     public static Collection<Object[]> data() {
 
-        final Set<AuthorizationSubject> readSubjects =
-                Sets.newSet(newAuthSubject("authorized"), newAuthSubject("ditto"));
-
         final Target twinAuthd = ConnectivityModelFactory.newTargetBuilder()
                 .address("twin/authorized")
                 .authorizationContext(newAuthContext(DittoAuthorizationContextType.UNSPECIFIED, AUTHORIZED, DUMMY))
@@ -196,38 +196,38 @@ public static Collection<Object[]> data() {
 
         final Collection<Object[]> params = new ArrayList<>();
 
-        params.add(new Object[]{TWIN_EVENTS, readSubjects, Lists.list(twinAuthd), Lists.list(twinAuthd)});
-        params.add(new Object[]{TWIN_EVENTS, readSubjects, Lists.list(twinAuthd, twinUnauthd), Lists.list(twinAuthd)});
-        params.add(new Object[]{TWIN_EVENTS, readSubjects, Lists.list(twinAuthd, twinUnauthd, liveAuthd),
+        params.add(new Object[]{TWIN_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd), Lists.list(twinAuthd)});
+        params.add(new Object[]{TWIN_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd, twinUnauthd), Lists.list(twinAuthd)});
+        params.add(new Object[]{TWIN_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd, twinUnauthd, liveAuthd),
                 Lists.list(twinAuthd)});
-        params.add(new Object[]{TWIN_EVENTS, readSubjects, Lists.list(twinAuthd, twinUnauthd, liveAuthd, liveUnauthd),
+        params.add(new Object[]{TWIN_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd, twinUnauthd, liveAuthd, liveUnauthd),
                 Lists.list(twinAuthd)});
-        params.add(new Object[]{TWIN_EVENTS, readSubjects,
+        params.add(new Object[]{TWIN_EVENTS, READ_SUBJECTS,
                 Lists.list(enrichedFiltered, enrichedNotFiltered1, enrichedNotFiltered2),
                 Lists.list(enrichedFiltered)});
-        params.add(new Object[]{TWIN_EVENTS, readSubjects,
+        params.add(new Object[]{TWIN_EVENTS, READ_SUBJECTS,
                 Lists.list(filteredEventTopicPath1, filteredEventTopicPath2, notFilteredEventTopicPath1, notFilteredEventTopicPath2),
                 Lists.list(filteredEventTopicPath1, filteredEventTopicPath2)});
 
-        params.add(new Object[]{LIVE_EVENTS, readSubjects, Lists.list(twinAuthd), emptyList()});
-        params.add(new Object[]{LIVE_EVENTS, readSubjects, Lists.list(twinAuthd, twinUnauthd), emptyList()});
-        params.add(new Object[]{LIVE_EVENTS, readSubjects, Lists.list(twinAuthd, twinUnauthd, liveAuthd),
+        params.add(new Object[]{LIVE_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd), emptyList()});
+        params.add(new Object[]{LIVE_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd, twinUnauthd), emptyList()});
+        params.add(new Object[]{LIVE_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd, twinUnauthd, liveAuthd),
                 Lists.list(liveAuthd)});
-        params.add(new Object[]{LIVE_EVENTS, readSubjects, Lists.list(twinAuthd, twinUnauthd, liveAuthd, liveUnauthd),
+        params.add(new Object[]{LIVE_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd, twinUnauthd, liveAuthd, liveUnauthd),
                 Lists.list(liveAuthd)});
 
-        params.add(new Object[]{LIVE_MESSAGES, readSubjects,
+        params.add(new Object[]{LIVE_MESSAGES, READ_SUBJECTS,
                 Lists.list(twinAuthd, twinUnauthd, liveAuthd, liveUnauthd),
                 Lists.list(twinAuthd, liveAuthd)});
-        params.add(new Object[]{LIVE_MESSAGES, readSubjects,
+        params.add(new Object[]{LIVE_MESSAGES, READ_SUBJECTS,
                 Lists.list(filteredLiveMessageTopicPath1, filteredLiveMessageTopicPath2, notFilteredLiveMessageTopicPath),
                 Lists.list(filteredLiveMessageTopicPath1, filteredLiveMessageTopicPath2)});
 
-        params.add(new Object[]{POLICY_ANNOUNCEMENTS, readSubjects,
+        params.add(new Object[]{POLICY_ANNOUNCEMENTS, READ_SUBJECTS,
                 Lists.list(policyAuthd, policyUnauthd),
                 Lists.list(policyAuthd, policyUnauthd)});
 
-        params.add(new Object[]{CONNECTION_ANNOUNCEMENTS, readSubjects,
+        params.add(new Object[]{CONNECTION_ANNOUNCEMENTS, READ_SUBJECTS,
                 Lists.list(connectionAuthd, connectionUnauthd),
                 Lists.list(connectionAuthd, connectionUnauthd)});
 
@@ -273,7 +273,7 @@ public void test() {
                         URI).targets(targets).build();
 
         final SignalFilter signalFilter = new SignalFilter(connection, connectionMonitorRegistry);
-        final List<Target> filteredTargets = signalFilter.filter(signal(signalTopic, readSubjects));
+        final List<Target> filteredTargets = signalFilter.filter(signal(signalTopic, READ_SUBJECTS));
         Assertions.assertThat(filteredTargets)
                 .isEqualTo(expectedTargets);
     }
@@ -346,4 +346,22 @@ private static Signal<?> signal(final Topic topic, final Collection<Authorizatio
         }
     }
 
+    /**
+     * Test that target filtering works also for desired properties events. Issue #1599
+     */
+    @Test
+    public void testFilterFeatureDesiredPropertiesModified() {
+        Target target = ConnectivityModelFactory.newTargetBuilder().address("address")
+                .authorizationContext(newAuthContext(DittoAuthorizationContextType.UNSPECIFIED, AUTHORIZED, DUMMY))
+                .topics(ConnectivityModelFactory.newFilteredTopicBuilder(TWIN_EVENTS)
+                        .withFilter("like(resource:path,'/features/" + TestConstants.Feature.FEATURE_ID + "*')")
+                        .build()).build();
+        ConnectionId connectionId = ConnectionId.of("testFilterFeatureDesiredPropertiesModified");
+        Connection connection = TestConstants.createConnection(connectionId, target);
+        SignalFilter signalFilter = new SignalFilter(connection, connectionMonitorRegistry);
+        Signal<?> signal = TestConstants.featureDesiredPropertiesModified(READ_SUBJECTS);
+
+        List<Target> filteredTargets = signalFilter.filter(signal);
+        Assertions.assertThat(filteredTargets).hasSize(1).contains(target);
+    }
 }
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/ThingEventToThingConverter.java b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/ThingEventToThingConverter.java
index 7c3e6099fec..0b63e237694 100644
--- a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/ThingEventToThingConverter.java
+++ b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/ThingEventToThingConverter.java
@@ -175,6 +175,25 @@ private static Map<Class<?>, BiFunction<ThingEvent<?>, ThingBuilder.FromScratch,
                         ((FeaturePropertyModified) te).getPropertyValue()).build());
         mappers.put(FeaturePropertyDeleted.class, (te, tb) -> tb.build());
 
+        mappers.put(FeatureDesiredPropertiesCreated.class, (te, tb) -> tb.setFeature(Feature.newBuilder()
+                .desiredProperties(((FeatureDesiredPropertiesCreated) te).getDesiredProperties())
+                .withId(((FeatureDesiredPropertiesCreated) te).getFeatureId())
+                .build()).build());
+        mappers.put(FeatureDesiredPropertiesModified.class, (te, tb) -> tb.setFeature(Feature.newBuilder()
+                .desiredProperties(((FeatureDesiredPropertiesModified) te).getDesiredProperties())
+                .withId(((FeatureDesiredPropertiesModified) te).getFeatureId())
+                .build()).build());
+        mappers.put(FeatureDesiredPropertiesDeleted.class, (te, tb) -> tb.build());
+        mappers.put(FeatureDesiredPropertyCreated.class, (te, tb) ->
+                tb.setFeatureDesiredProperty(((FeatureDesiredPropertyCreated) te).getFeatureId(),
+                        ((FeatureDesiredPropertyCreated) te).getDesiredPropertyPointer(),
+                        ((FeatureDesiredPropertyCreated) te).getDesiredPropertyValue()).build());
+        mappers.put(FeatureDesiredPropertyModified.class, (te, tb) ->
+                tb.setFeatureDesiredProperty(((FeatureDesiredPropertyModified) te).getFeatureId(),
+                        ((FeatureDesiredPropertyModified) te).getDesiredPropertyPointer(),
+                        ((FeatureDesiredPropertyModified) te).getDesiredPropertyValue()).build());
+        mappers.put(FeatureDesiredPropertyDeleted.class, (te, tb) -> tb.build());
+
         return mappers;
     }
 
diff --git a/things/model/src/test/java/org/eclipse/ditto/things/model/signals/events/ThingEventToThingConverterTest.java b/things/model/src/test/java/org/eclipse/ditto/things/model/signals/events/ThingEventToThingConverterTest.java
index 96331f28955..aa58be822fa 100644
--- a/things/model/src/test/java/org/eclipse/ditto/things/model/signals/events/ThingEventToThingConverterTest.java
+++ b/things/model/src/test/java/org/eclipse/ditto/things/model/signals/events/ThingEventToThingConverterTest.java
@@ -21,11 +21,7 @@
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.JsonValue;
-import org.eclipse.ditto.things.model.Attributes;
-import org.eclipse.ditto.things.model.Feature;
-import org.eclipse.ditto.things.model.FeatureProperties;
-import org.eclipse.ditto.things.model.Thing;
-import org.eclipse.ditto.things.model.ThingRevision;
+import org.eclipse.ditto.things.model.*;
 import org.junit.Test;
 
 /**
@@ -39,6 +35,8 @@ public final class ThingEventToThingConverterTest {
     private static final String ATTR_KEY_CITY = "city";
     private static final String KNOWN_CITY = "Immenstaad am Bodensee";
 
+    private static final JsonPointer DESIRED_PROPERTY_POINTER = JsonPointer.of("target_year_1");
+
     @Test
     public void ensureMergeWithExtraFieldsMergesCorrectly() {
         final long revision = 23L;
@@ -124,4 +122,104 @@ public void ensureThingMergedConvertsAsExpected() {
         assertThat(thing.getRevision()).contains(ThingRevision.newInstance(revision));
         assertThat(thing.getAttributes()).contains(Attributes.newBuilder().set("foo", "bar").build());
     }
+
+    @Test
+    public void testThingEventToThingConvertsFeatureDesiredPropertiesCreated() {
+        long revision = 23L;
+        FeatureDesiredPropertiesCreated desiredPropertiesCreated = FeatureDesiredPropertiesCreated.of(
+                TestConstants.Thing.THING_ID, TestConstants.Feature.FLUX_CAPACITOR_ID,
+                TestConstants.Feature.FLUX_CAPACITOR_PROPERTIES, revision,null, DittoHeaders.empty(), null);
+
+        Optional<Thing> thingOpt = ThingEventToThingConverter.thingEventToThing(desiredPropertiesCreated);
+        assertThat(thingOpt).isPresent();
+        Thing thing = thingOpt.get();
+        assertThat(thing.getEntityId()).contains(TestConstants.Thing.THING_ID);
+        assertThat(thing.getRevision()).contains(ThingRevision.newInstance(revision));
+        FeatureProperties desiredProperties = getDesiredProperties(thing);
+        assertThat(desiredProperties).isEqualTo(TestConstants.Feature.FLUX_CAPACITOR_PROPERTIES);
+    }
+
+    private FeatureProperties getDesiredProperties(Thing thing) {
+        Optional<Features> featuresOpt = thing.getFeatures();
+        assertThat(featuresOpt).isPresent();
+        Optional<Feature> featureOpt = featuresOpt.get().getFeature(TestConstants.Feature.FLUX_CAPACITOR_ID);
+        assertThat(featureOpt).isPresent();
+        Optional<FeatureProperties> desiredPropertiesOpt = featureOpt.get().getDesiredProperties();
+        assertThat(desiredPropertiesOpt).isPresent();
+        return desiredPropertiesOpt.get();
+    }
+
+    @Test
+    public void testThingEventToThingConvertsFeatureDesiredPropertiesModified() {
+        long revision = 23L;
+        FeatureDesiredPropertiesModified desiredPropertiesModified = FeatureDesiredPropertiesModified.of(
+                TestConstants.Thing.THING_ID, TestConstants.Feature.FLUX_CAPACITOR_ID,
+                TestConstants.Feature.FLUX_CAPACITOR_PROPERTIES, revision,null, DittoHeaders.empty(), null);
+
+        Optional<Thing> thingOpt = ThingEventToThingConverter.thingEventToThing(desiredPropertiesModified);
+        assertThat(thingOpt).isPresent();
+        Thing thing = thingOpt.get();
+        assertThat(thing.getEntityId()).contains(TestConstants.Thing.THING_ID);
+        assertThat(thing.getRevision()).contains(ThingRevision.newInstance(revision));
+        FeatureProperties desiredProperties = getDesiredProperties(thing);
+        assertThat(desiredProperties).isEqualTo(TestConstants.Feature.FLUX_CAPACITOR_PROPERTIES);
+    }
+
+    @Test
+    public void testThingEventToThingConvertsFeatureDesiredPropertiesDeleted() {
+        long revision = 23L;
+        FeatureDesiredPropertiesDeleted desiredPropertiesDeleted = FeatureDesiredPropertiesDeleted.of(
+                TestConstants.Thing.THING_ID, TestConstants.Feature.FLUX_CAPACITOR_ID, revision,null,
+                DittoHeaders.empty(), null);
+        Optional<Thing> thingOpt = ThingEventToThingConverter.thingEventToThing(desiredPropertiesDeleted);
+        assertThat(thingOpt).isPresent();
+        Thing thing = thingOpt.get();
+        assertThat(thing.getEntityId()).contains(TestConstants.Thing.THING_ID);
+        assertThat(thing.getRevision()).contains(ThingRevision.newInstance(revision));
+    }
+
+    @Test
+    public void testThingEventToThingConvertsFeatureDesiredPropertyCreated() {
+        long revision = 23L;
+        JsonValue value = JsonValue.of(1955);
+        FeatureDesiredPropertyCreated desiredPropertyCreated = FeatureDesiredPropertyCreated.of(
+                TestConstants.Thing.THING_ID, TestConstants.Feature.FLUX_CAPACITOR_ID, DESIRED_PROPERTY_POINTER, value,
+                revision, null, DittoHeaders.empty(), null);
+        Optional<Thing> thingOpt = ThingEventToThingConverter.thingEventToThing(desiredPropertyCreated);
+        assertThat(thingOpt).isPresent();
+        Thing thing = thingOpt.get();
+        assertThat(thing.getEntityId()).contains(TestConstants.Thing.THING_ID);
+        assertThat(thing.getRevision()).contains(ThingRevision.newInstance(revision));
+        FeatureProperties desiredProperties = getDesiredProperties(thing);
+        assertThat(desiredProperties).isEqualTo(FeatureProperties.newBuilder().set("target_year_1", 1955).build());
+    }
+
+    @Test
+    public void testThingEventToThingConvertsFeatureDesiredPropertyModified() {
+        long revision = 23L;
+        JsonValue value = JsonValue.of(1955);
+        FeatureDesiredPropertyModified desiredPropertyModified = FeatureDesiredPropertyModified.of(
+                TestConstants.Thing.THING_ID, TestConstants.Feature.FLUX_CAPACITOR_ID, DESIRED_PROPERTY_POINTER, value,
+                revision, null, DittoHeaders.empty(), null);
+        Optional<Thing> thingOpt = ThingEventToThingConverter.thingEventToThing(desiredPropertyModified);
+        assertThat(thingOpt).isPresent();
+        Thing thing = thingOpt.get();
+        assertThat(thing.getEntityId()).contains(TestConstants.Thing.THING_ID);
+        assertThat(thing.getRevision()).contains(ThingRevision.newInstance(revision));
+        FeatureProperties desiredProperties = getDesiredProperties(thing);
+        assertThat(desiredProperties).isEqualTo(FeatureProperties.newBuilder().set("target_year_1", 1955).build());
+    }
+
+    @Test
+    public void testThingEventToThingConvertsFeatureDesiredPropertyDeleted() {
+        long revision = 23L;
+        FeatureDesiredPropertyDeleted desiredPropertyDeleted = FeatureDesiredPropertyDeleted.of(
+                TestConstants.Thing.THING_ID, TestConstants.Feature.FLUX_CAPACITOR_ID, DESIRED_PROPERTY_POINTER, revision,
+                null, DittoHeaders.empty(), null);
+        Optional<Thing> thingOpt = ThingEventToThingConverter.thingEventToThing(desiredPropertyDeleted);
+        assertThat(thingOpt).isPresent();
+        Thing thing = thingOpt.get();
+        assertThat(thing.getEntityId()).contains(TestConstants.Thing.THING_ID);
+        assertThat(thing.getRevision()).contains(ThingRevision.newInstance(revision));
+    }
 }

From b1c73d5b36bc4e09aaa6558920f51ad65315ab02 Mon Sep 17 00:00:00 2001
From: Vit Holasek <xvh@seznam.cz>
Date: Sun, 19 Mar 2023 19:16:09 +0100
Subject: [PATCH 069/173] Moved filtering test to more suitable place

Signed-off-by: Vit Holasek <xvh@seznam.cz>
---
 .../persistence/SignalFilterTest.java         | 54 +++++++------------
 .../SignalFilterWithFilterTest.java           | 19 +++++++
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilterTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilterTest.java
index 16047e55328..55c4bd26b77 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilterTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilterTest.java
@@ -78,12 +78,12 @@ public final class SignalFilterTest {
     private static final HeaderMapping HEADER_MAPPING =
             ConnectivityModelFactory.newHeaderMapping(Collections.singletonMap("reply-to", "{{fn:delete()}}"));
 
-    private static final Set<AuthorizationSubject> READ_SUBJECTS =
-            Sets.newSet(newAuthSubject("authorized"), newAuthSubject("ditto"));
-
     @Parameterized.Parameters(name = "topic={0}, readSubjects={1}, configuredTargets={2}, expectedTargets={3}")
     public static Collection<Object[]> data() {
 
+        final Set<AuthorizationSubject> readSubjects =
+                Sets.newSet(newAuthSubject("authorized"), newAuthSubject("ditto"));
+
         final Target twinAuthd = ConnectivityModelFactory.newTargetBuilder()
                 .address("twin/authorized")
                 .authorizationContext(newAuthContext(DittoAuthorizationContextType.UNSPECIFIED, AUTHORIZED, DUMMY))
@@ -196,38 +196,38 @@ public static Collection<Object[]> data() {
 
         final Collection<Object[]> params = new ArrayList<>();
 
-        params.add(new Object[]{TWIN_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd), Lists.list(twinAuthd)});
-        params.add(new Object[]{TWIN_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd, twinUnauthd), Lists.list(twinAuthd)});
-        params.add(new Object[]{TWIN_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd, twinUnauthd, liveAuthd),
+        params.add(new Object[]{TWIN_EVENTS, readSubjects, Lists.list(twinAuthd), Lists.list(twinAuthd)});
+        params.add(new Object[]{TWIN_EVENTS, readSubjects, Lists.list(twinAuthd, twinUnauthd), Lists.list(twinAuthd)});
+        params.add(new Object[]{TWIN_EVENTS, readSubjects, Lists.list(twinAuthd, twinUnauthd, liveAuthd),
                 Lists.list(twinAuthd)});
-        params.add(new Object[]{TWIN_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd, twinUnauthd, liveAuthd, liveUnauthd),
+        params.add(new Object[]{TWIN_EVENTS, readSubjects, Lists.list(twinAuthd, twinUnauthd, liveAuthd, liveUnauthd),
                 Lists.list(twinAuthd)});
-        params.add(new Object[]{TWIN_EVENTS, READ_SUBJECTS,
+        params.add(new Object[]{TWIN_EVENTS, readSubjects,
                 Lists.list(enrichedFiltered, enrichedNotFiltered1, enrichedNotFiltered2),
                 Lists.list(enrichedFiltered)});
-        params.add(new Object[]{TWIN_EVENTS, READ_SUBJECTS,
+        params.add(new Object[]{TWIN_EVENTS, readSubjects,
                 Lists.list(filteredEventTopicPath1, filteredEventTopicPath2, notFilteredEventTopicPath1, notFilteredEventTopicPath2),
                 Lists.list(filteredEventTopicPath1, filteredEventTopicPath2)});
 
-        params.add(new Object[]{LIVE_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd), emptyList()});
-        params.add(new Object[]{LIVE_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd, twinUnauthd), emptyList()});
-        params.add(new Object[]{LIVE_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd, twinUnauthd, liveAuthd),
+        params.add(new Object[]{LIVE_EVENTS, readSubjects, Lists.list(twinAuthd), emptyList()});
+        params.add(new Object[]{LIVE_EVENTS, readSubjects, Lists.list(twinAuthd, twinUnauthd), emptyList()});
+        params.add(new Object[]{LIVE_EVENTS, readSubjects, Lists.list(twinAuthd, twinUnauthd, liveAuthd),
                 Lists.list(liveAuthd)});
-        params.add(new Object[]{LIVE_EVENTS, READ_SUBJECTS, Lists.list(twinAuthd, twinUnauthd, liveAuthd, liveUnauthd),
+        params.add(new Object[]{LIVE_EVENTS, readSubjects, Lists.list(twinAuthd, twinUnauthd, liveAuthd, liveUnauthd),
                 Lists.list(liveAuthd)});
 
-        params.add(new Object[]{LIVE_MESSAGES, READ_SUBJECTS,
+        params.add(new Object[]{LIVE_MESSAGES, readSubjects,
                 Lists.list(twinAuthd, twinUnauthd, liveAuthd, liveUnauthd),
                 Lists.list(twinAuthd, liveAuthd)});
-        params.add(new Object[]{LIVE_MESSAGES, READ_SUBJECTS,
+        params.add(new Object[]{LIVE_MESSAGES, readSubjects,
                 Lists.list(filteredLiveMessageTopicPath1, filteredLiveMessageTopicPath2, notFilteredLiveMessageTopicPath),
                 Lists.list(filteredLiveMessageTopicPath1, filteredLiveMessageTopicPath2)});
 
-        params.add(new Object[]{POLICY_ANNOUNCEMENTS, READ_SUBJECTS,
+        params.add(new Object[]{POLICY_ANNOUNCEMENTS, readSubjects,
                 Lists.list(policyAuthd, policyUnauthd),
                 Lists.list(policyAuthd, policyUnauthd)});
 
-        params.add(new Object[]{CONNECTION_ANNOUNCEMENTS, READ_SUBJECTS,
+        params.add(new Object[]{CONNECTION_ANNOUNCEMENTS, readSubjects,
                 Lists.list(connectionAuthd, connectionUnauthd),
                 Lists.list(connectionAuthd, connectionUnauthd)});
 
@@ -273,7 +273,7 @@ public void test() {
                         URI).targets(targets).build();
 
         final SignalFilter signalFilter = new SignalFilter(connection, connectionMonitorRegistry);
-        final List<Target> filteredTargets = signalFilter.filter(signal(signalTopic, READ_SUBJECTS));
+        final List<Target> filteredTargets = signalFilter.filter(signal(signalTopic, readSubjects));
         Assertions.assertThat(filteredTargets)
                 .isEqualTo(expectedTargets);
     }
@@ -346,22 +346,4 @@ private static Signal<?> signal(final Topic topic, final Collection<Authorizatio
         }
     }
 
-    /**
-     * Test that target filtering works also for desired properties events. Issue #1599
-     */
-    @Test
-    public void testFilterFeatureDesiredPropertiesModified() {
-        Target target = ConnectivityModelFactory.newTargetBuilder().address("address")
-                .authorizationContext(newAuthContext(DittoAuthorizationContextType.UNSPECIFIED, AUTHORIZED, DUMMY))
-                .topics(ConnectivityModelFactory.newFilteredTopicBuilder(TWIN_EVENTS)
-                        .withFilter("like(resource:path,'/features/" + TestConstants.Feature.FEATURE_ID + "*')")
-                        .build()).build();
-        ConnectionId connectionId = ConnectionId.of("testFilterFeatureDesiredPropertiesModified");
-        Connection connection = TestConstants.createConnection(connectionId, target);
-        SignalFilter signalFilter = new SignalFilter(connection, connectionMonitorRegistry);
-        Signal<?> signal = TestConstants.featureDesiredPropertiesModified(READ_SUBJECTS);
-
-        List<Target> filteredTargets = signalFilter.filter(signal);
-        Assertions.assertThat(filteredTargets).hasSize(1).contains(target);
-    }
 }
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilterWithFilterTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilterWithFilterTest.java
index dee549fae0d..41cbdbac662 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilterWithFilterTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/persistence/SignalFilterWithFilterTest.java
@@ -23,6 +23,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.assertj.core.api.Assertions;
+import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.connectivity.service.messaging.monitoring.ConnectionMonitorRegistry;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.JsonValue;
@@ -253,4 +255,21 @@ public void applySignalFilterWithNamespacesAndRqlFilter() {
                 targetD); // THEN: only targetA and targetD should be in the filtered targets
     }
 
+    /**
+     * Test that target filtering works also for desired properties events. Issue #1599
+     */
+    @Test
+    public void applySignalFilterOnFeatureDesiredPropertiesModified() {
+        Target target = ConnectivityModelFactory.newTargetBuilder().address("address")
+                .authorizationContext(newAuthContext(DittoAuthorizationContextType.UNSPECIFIED, AUTHORIZED))
+                .topics(ConnectivityModelFactory.newFilteredTopicBuilder(TWIN_EVENTS)
+                        .withFilter("like(resource:path,'/features/" + TestConstants.Feature.FEATURE_ID + "*')")
+                        .build()).build();
+        Connection connection = TestConstants.createConnection(CONNECTION_ID, target);
+        SignalFilter signalFilter = new SignalFilter(connection, connectionMonitorRegistry);
+        Signal<?> signal = TestConstants.featureDesiredPropertiesModified(Collections.singletonList(AUTHORIZED));
+
+        List<Target> filteredTargets = signalFilter.filter(signal);
+        Assertions.assertThat(filteredTargets).hasSize(1).contains(target);
+    }
 }

From 06ca0862e5db10c87349cedde781f2e52a3b55b8 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Tue, 21 Mar 2023 14:53:42 +0100
Subject: [PATCH 070/173] remove mentioning Vorto from "Hello World"

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 .../pages/ditto/intro-hello-world.md          | 139 ++++++++++++------
 1 file changed, 93 insertions(+), 46 deletions(-)

diff --git a/documentation/src/main/resources/pages/ditto/intro-hello-world.md b/documentation/src/main/resources/pages/ditto/intro-hello-world.md
index 32d53683fa2..cec3fb68bee 100644
--- a/documentation/src/main/resources/pages/ditto/intro-hello-world.md
+++ b/documentation/src/main/resources/pages/ditto/intro-hello-world.md
@@ -4,7 +4,7 @@ tags: [getting_started]
 permalink: intro-hello-world.html
 ---
 
-After [starting Ditto](installation-running.html), we have a HTTP and WebSocket API for your
+After [starting Ditto](installation-running.html), we have an HTTP and WebSocket API for your
 [digital twins](intro-digitaltwins.html) at our hands.
 
 ## Example
@@ -13,36 +13,102 @@ Assume we want to create a digital twin for a car. The twin should hold static m
 The state data should change as often as its real world counterpart does.
 
 Those static and dynamic types of data are mapped in the Ditto model to "attributes" (for static metadata), "features" 
-(for dynamic state data) and "definition" (to link a model the thing follows, 
-e.g. an [Eclipse Vorto](https://www.eclipse.org/vorto/) "information model").
+(for dynamic state data) and "definition" (to link a model the thing follows, e.g. a 
+[WoT (Web of Things)](basic-wot-integration.html) "Thing Model").  
 A JSON representation of some metadata and state data could for example look like this:
 
 ```json
 {
-  "definition": "digitaltwin:DigitaltwinExample:1.0.0",
+  "thingId": "io.eclipseprojects.ditto:floor-lamp-0815",
+  "policyId": "io.eclipseprojects.ditto:floor-lamp-0815",
+  "definition": "https://eclipse-ditto.github.io/ditto-examples/wot/models/floor-lamp-1.0.0.tm.jsonld",
   "attributes": {
-    "manufacturer": "ACME",
-    "VIN": "0815666337"
+    "manufacturer": "",
+    "serialNo": ""
   },
   "features": {
-    "transmission": {
+    "Spot1": {
+      "definition": [
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/dimmable-colored-lamp-1.0.0.tm.jsonld",
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/colored-lamp-1.0.0.tm.jsonld",
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/switchable-1.0.0.tm.jsonld"
+      ],
       "properties": {
-        "automatic": true,
-        "mode": "eco",
-        "cur_speed": 90,
-        "gear": 5
+        "dimmer-level": 0,
+        "color": {
+          "r": 0,
+          "g": 0,
+          "b": 0
+        },
+        "on": false
+      }
+    },
+    "Spot2": {
+      "definition": [
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/dimmable-colored-lamp-1.0.0.tm.jsonld",
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/colored-lamp-1.0.0.tm.jsonld",
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/switchable-1.0.0.tm.jsonld"
+      ],
+      "properties": {
+        "dimmer-level": 0,
+        "color": {
+          "r": 0,
+          "g": 0,
+          "b": 0
+        },
+        "on": false
       }
     },
-    "environment-scanner": {
+    "Spot3": {
+      "definition": [
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/dimmable-colored-lamp-1.0.0.tm.jsonld",
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/colored-lamp-1.0.0.tm.jsonld",
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/switchable-1.0.0.tm.jsonld"
+      ],
       "properties": {
-        "temperature": 20.8,
-        "humidity": 73,
-        "barometricPressure": 970.7,
-        "location": {
-          "longitude": 47.682170,
-          "latitude": 9.386372
+        "dimmer-level": 0,
+        "color": {
+          "r": 0,
+          "g": 0,
+          "b": 0
         },
-        "altitude": 399
+        "on": false
+      }
+    },
+    "ConnectionStatus": {
+      "definition": [
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/connection-status-1.0.0.tm.jsonld"
+      ],
+      "properties": {
+        "readySince": "",
+        "readyUntil": ""
+      }
+    },
+    "PowerConsumptionAwareness": {
+      "definition": [
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/power-consumption-aware-1.0.0.tm.jsonld"
+      ],
+      "properties": {
+        "reportPowerConsumption": {}
+      }
+    },
+    "SmokeDetection": {
+      "definition": [
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/smoke-detector-1.0.0.tm.jsonld"
+      ]
+    },
+    "Status-LED": {
+      "definition": [
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/colored-lamp-1.0.0.tm.jsonld",
+        "https://eclipse-ditto.github.io/ditto-examples/wot/models/switchable-1.0.0.tm.jsonld"
+      ],
+      "properties": {
+        "color": {
+          "r": 0,
+          "g": 0,
+          "b": 0
+        },
+        "on": false
       }
     }
   }
@@ -53,7 +119,7 @@ Background: Ditto only knows about "attributes", "features" and the "definition"
 
 Inside "attributes" (the metadata) we can add as much JSON keys as we like with any JSON value we need.
 
-Inside "features" (the state data) we can add as much features as we like - but each feature needs to have 
+Inside "features" (the state data) we can add as many features as we like - but each feature needs to have 
 a "properties" JSON object. Inside that JSON object we can add as much JSON keys as we like with any JSON value we need. 
 
 Inside "definition" we can add one JSON string value. 
@@ -65,38 +131,16 @@ Those credentials have been created by default in the [nginx](https://github.com
 (See [ditto/deployment/docker/README.md](https://github.com/eclipse-ditto/ditto/blob/master/deployment/docker/README.md))
 
 ```bash
-curl -u ditto:ditto -X PUT -H 'Content-Type: application/json' -d '{
-   "definition": "digitaltwin:DigitaltwinExample:1.0.0",
+curl -u ditto:ditto -X POST -H 'Content-Type: application/json' -d '{
+   "definition": "https://eclipse-ditto.github.io/ditto-examples/wot/models/floor-lamp-1.0.0.tm.jsonld",
    "attributes": {
      "manufacturer": "ACME",
      "VIN": "0815666337"
-   },
-   "features": {
-     "transmission": {
-       "properties": {
-         "automatic": true, 
-         "mode": "eco",
-         "cur_speed": 90, 
-         "gear": 5
-       }
-     },
-     "environment-scanner": {
-       "properties": {
-         "temperature": 20.8,
-         "humidity": 73,
-         "barometricPressure": 970.7,
-         "location": {
-           "longitude": 47.682170,
-           "latitude": 9.386372
-         },
-         "altitude": 399
-       }
-     }
    }
- }' 'http://localhost:8080/api/2/things/org.eclipse.ditto:fancy-car'
+ }' 'http://localhost:8080/api/2/things'
 ```
 
-The result is a digital twin in Thing notation. The Thing ID is `org.eclipse.ditto:fancy-car`. 
+The result is a digital twin in Thing notation. The Thing ID is generated when using the `POST` HTTP verb.  
 An ID must always contain a namespace before the `:`. That way Things are easier to organize.
 
 ## Querying an existing Thing
@@ -109,6 +153,9 @@ For Things we know the ID of, we can simply query them by their ID:
 ```bash
 curl -u ditto:ditto -X GET 'http://localhost:8080/api/2/things/org.eclipse.ditto:fancy-car'
 
+# if you have jq installed, that's how to get a prettier response:
+curl -u ditto:ditto -X GET 'http://localhost:8080/api/2/things/org.eclipse.ditto:fancy-car' | jq
+
 # if you have python installed, that's how to get a prettier response:
 curl -u ditto:ditto -X GET 'http://localhost:8080/api/2/things/org.eclipse.ditto:fancy-car' | python -m json.tool
 ```

From 09841791c8f119cf02be46fd79c46fde6640d7c6 Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Wed, 22 Mar 2023 14:25:00 +0100
Subject: [PATCH 071/173] don't use WARN log level when no policy is rolled
 back

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 .../persistence/actors/ThingSupervisorActor.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
index 12a5ea8255d..c268b8806df 100755
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
@@ -336,7 +336,9 @@ protected CompletableFuture<Object> handleTargetActorException(final Object enfo
         if (RollbackCreatedPolicy.shouldRollback(enforcedCommand, throwable) &&
                 enforcedCommand instanceof Signal<?> signal) {
             log.withCorrelationId(signal)
-                    .warning("Target actor exception received. Sending RollbackCreatedPolicy msg to self.");
+                    .info("Target actor exception received: <{}>. " +
+                            "Sending RollbackCreatedPolicy msg to self, potentially rolling back a created policy.",
+                            throwable.getClass().getSimpleName());
             final CompletableFuture<Object> responseFuture = new CompletableFuture<>();
             getSelf().tell(RollbackCreatedPolicy.of(signal, throwable, responseFuture), getSelf());
             return responseFuture;
@@ -347,9 +349,12 @@ protected CompletableFuture<Object> handleTargetActorException(final Object enfo
     }
 
     private void handleRollbackCreatedPolicy(final RollbackCreatedPolicy rollback) {
+        final String correlationId = rollback.initialCommand().getDittoHeaders().getCorrelationId()
+                .orElse("unexpected:" + UUID.randomUUID());
         if (policyCreatedEvent != null) {
-            final String correlationId = rollback.initialCommand().getDittoHeaders().getCorrelationId()
-                    .orElse("unexpected:" + UUID.randomUUID());
+            log.withCorrelationId(correlationId)
+                    .warning("Rolling back created policy as consequence of received RollbackCreatedPolicy " +
+                            "message: {}", rollback);
             final DittoHeaders dittoHeaders = DittoHeaders.newBuilder()
                     .correlationId(correlationId)
                     .putHeader(DittoHeaderDefinition.DITTO_SUDO.getKey(), "true")
@@ -358,14 +363,15 @@ private void handleRollbackCreatedPolicy(final RollbackCreatedPolicy rollback) {
             AskWithRetry.askWithRetry(policiesShardRegion, deletePolicy,
                     enforcementConfig.getAskWithRetryConfig(),
                     getContext().system(), response -> {
-                        log.withCorrelationId(dittoHeaders)
+                        log.withCorrelationId(correlationId)
                                 .info("Policy <{}> deleted after rolling back it's creation. " +
                                         "Policies shard region response: <{}>", deletePolicy.getEntityId(), response);
                         rollback.completeInitialResponse();
                         return response;
                     });
-
         } else {
+            log.withCorrelationId(correlationId)
+                    .debug("Not initiating policy rollback as none was created.");
             rollback.completeInitialResponse();
         }
         policyCreatedEvent = null;

From 5e6442e34dfe7b5ae3aa097e2c190116e7c8239a Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Mon, 27 Mar 2023 11:28:49 +0200
Subject: [PATCH 072/173] don't use WARN log level when "Target actor exception
 received"

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
---
 .../service/persistence/actors/ThingSupervisorActor.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
index c268b8806df..c22eaf7928a 100755
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
@@ -343,7 +343,8 @@ protected CompletableFuture<Object> handleTargetActorException(final Object enfo
             getSelf().tell(RollbackCreatedPolicy.of(signal, throwable, responseFuture), getSelf());
             return responseFuture;
         } else {
-            log.warning(throwable, "Target actor exception received.");
+            log.withCorrelationId(enforcedCommand instanceof WithDittoHeaders wdh ? wdh.getDittoHeaders() : null)
+                    .info("Target actor exception received: <{}>", throwable.getClass().getSimpleName());
             return CompletableFuture.failedFuture(throwable);
         }
     }

From 8bb7cd59f0a1cd0937435cc152a52a56af949d3f Mon Sep 17 00:00:00 2001
From: Aleksandar Stanchev <aleksandar.stanchev@bosch.io>
Date: Wed, 29 Mar 2023 15:45:37 +0300
Subject: [PATCH 073/173] enforcer actor ack time out handled in atomic thing
 create context (#1598)

enforcer actor ack time out handled in atomic thing create context

* Create thing is rollbacked if enforcer ask times out
* logging and refactor fixes
* logs cleanup
* supervisor configurable local ask timeout
* CachingPolicyEnforcerProvider is able to force cache invalidation
* update ConnectivitySupervisorActor ask timeout config

Signed-off-by: Stanchev Aleksandar <aleksandar.stanchev@bosch.io>
---
 .../DefaultLocalAskTimeoutConfig.java         | 79 +++++++++++++++++++
 .../supervision/DefaultSupervisorConfig.java  | 13 ++-
 .../supervision/LocalAskTimeoutConfig.java    | 66 ++++++++++++++++
 .../config/supervision/SupervisorConfig.java  |  5 ++
 .../DefaultLocalAskTimeoutConfigTest.java     | 76 ++++++++++++++++++
 .../test/resources/local-ask-timout-test.conf |  3 +
 .../ConnectionSupervisorActor.java            | 17 ++--
 .../src/main/resources/connectivity.conf      |  7 ++
 .../AskWithRetryCommandForwarder.java         |  2 +-
 .../AbstractPersistenceSupervisor.java        | 43 +++++-----
 .../AbstractPolicyLoadingEnforcerActor.java   |  2 +-
 .../CachingPolicyEnforcerProvider.java        | 26 +++++-
 .../policies/enforcement/Invalidatable.java   | 24 ++++++
 .../CachingPolicyEnforcerProviderTest.java    | 22 ++++++
 .../actors/PolicySupervisorActor.java         | 11 ++-
 .../PolicyCommandEnforcementTest.java         | 12 ++-
 .../enforcement/ThingEnforcerActor.java       | 27 ++++++-
 .../actors/ThingSupervisorActor.java          | 74 +++++++++++------
 things/service/src/main/resources/things.conf |  5 ++
 19 files changed, 449 insertions(+), 65 deletions(-)
 create mode 100644 base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/DefaultLocalAskTimeoutConfig.java
 create mode 100644 base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/LocalAskTimeoutConfig.java
 create mode 100644 base/service/src/test/java/org/eclipse/ditto/base/service/config/supervision/DefaultLocalAskTimeoutConfigTest.java
 create mode 100644 base/service/src/test/resources/local-ask-timout-test.conf
 create mode 100644 policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/Invalidatable.java

diff --git a/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/DefaultLocalAskTimeoutConfig.java b/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/DefaultLocalAskTimeoutConfig.java
new file mode 100644
index 00000000000..7df4ee807b8
--- /dev/null
+++ b/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/DefaultLocalAskTimeoutConfig.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+package org.eclipse.ditto.base.service.config.supervision;
+
+import java.time.Duration;
+import java.util.Objects;
+
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.internal.utils.config.ConfigWithFallback;
+import org.eclipse.ditto.internal.utils.config.ScopedConfig;
+
+import com.typesafe.config.Config;
+
+/**
+ * This class is the default implementation of the local ACK timeout config.
+ */
+@Immutable
+public class DefaultLocalAskTimeoutConfig implements LocalAskTimeoutConfig {
+
+    private static final String CONFIG_PATH = "local-ask";
+    private final Duration askTimeout;
+
+    private DefaultLocalAskTimeoutConfig(final ScopedConfig config) {
+        askTimeout = config.getNonNegativeAndNonZeroDurationOrThrow(LocalAskTimeoutConfigValue.ASK_TIMEOUT);
+    }
+
+    /**
+     * Returns an instance of {@code DefaultLocalAskTimeoutConfig} based on the settings of the specified Config.
+     *
+     * @param config is supposed to provide the settings of the local ASK timeout config at {@value #CONFIG_PATH}.
+     * @return the instance.
+     * @throws org.eclipse.ditto.internal.utils.config.DittoConfigError if {@code config} is invalid.
+     */
+    public static DefaultLocalAskTimeoutConfig of(final Config config) {
+        return new DefaultLocalAskTimeoutConfig(ConfigWithFallback.newInstance(config, CONFIG_PATH,
+                LocalAskTimeoutConfig.LocalAskTimeoutConfigValue.values()));
+    }
+
+    @Override
+    public Duration getLocalAckTimeout() {
+        return askTimeout;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final DefaultLocalAskTimeoutConfig that = (DefaultLocalAskTimeoutConfig) o;
+        return Objects.equals(askTimeout, that.askTimeout);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(askTimeout);
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "[" +
+                "askTimeout=" + askTimeout +
+                ']';
+    }
+}
diff --git a/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/DefaultSupervisorConfig.java b/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/DefaultSupervisorConfig.java
index 8f50cde1691..dae28521c12 100644
--- a/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/DefaultSupervisorConfig.java
+++ b/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/DefaultSupervisorConfig.java
@@ -30,9 +30,12 @@ public final class DefaultSupervisorConfig implements SupervisorConfig {
     private static final String CONFIG_PATH = "supervisor";
 
     private final ExponentialBackOffConfig exponentialBackOffConfig;
+    private final DefaultLocalAskTimeoutConfig localAskTimeoutConfig;
 
-    private DefaultSupervisorConfig(final ExponentialBackOffConfig theExponentialBackOffConfig) {
+    private DefaultSupervisorConfig(final ExponentialBackOffConfig theExponentialBackOffConfig,
+            final DefaultLocalAskTimeoutConfig theLocalAskTimeoutConfig) {
         exponentialBackOffConfig = theExponentialBackOffConfig;
+        localAskTimeoutConfig = theLocalAskTimeoutConfig;
     }
 
     /**
@@ -45,7 +48,8 @@ private DefaultSupervisorConfig(final ExponentialBackOffConfig theExponentialBac
     public static DefaultSupervisorConfig of(final Config config) {
         final ScopedConfig supervisorScopedConfig = DefaultScopedConfig.newInstance(config, CONFIG_PATH);
 
-        return new DefaultSupervisorConfig(DefaultExponentialBackOffConfig.of(supervisorScopedConfig));
+        return new DefaultSupervisorConfig(DefaultExponentialBackOffConfig.of(supervisorScopedConfig),
+                DefaultLocalAskTimeoutConfig.of(supervisorScopedConfig));
     }
 
     @Override
@@ -53,6 +57,11 @@ public ExponentialBackOffConfig getExponentialBackOffConfig() {
         return exponentialBackOffConfig;
     }
 
+    @Override
+    public LocalAskTimeoutConfig getLocalAskTimeoutConfig() {
+        return localAskTimeoutConfig;
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) {
diff --git a/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/LocalAskTimeoutConfig.java b/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/LocalAskTimeoutConfig.java
new file mode 100644
index 00000000000..c14a1b3f3d5
--- /dev/null
+++ b/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/LocalAskTimeoutConfig.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+package org.eclipse.ditto.base.service.config.supervision;
+
+import java.time.Duration;
+
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.internal.utils.config.KnownConfigValue;
+
+/**
+ * Provides configuration settings for the local ACK timeout.
+ */
+@Immutable
+public interface LocalAskTimeoutConfig {
+
+    /**
+     * Timeout for local actor invocations - a small timeout should be more than sufficient as those are just method
+     * calls.
+     * @return the duration for a local ACK timeout calls.
+     */
+    Duration getLocalAckTimeout();
+
+
+    /**
+     * An enumeration of the known config path expressions and their associated default values for
+     * {@code LocalAskTimeoutConfigValue}.
+     */
+    enum LocalAskTimeoutConfigValue implements KnownConfigValue {
+
+        /**
+         * The local ACK timeout duration.
+         */
+        ASK_TIMEOUT("timeout", Duration.ofSeconds(5L));
+
+        private final String path;
+        private final Duration defaultValue;
+
+        LocalAskTimeoutConfigValue(final String thePath, final Duration theDefaultValue) {
+
+            this.path = thePath;
+            this.defaultValue = theDefaultValue;
+        }
+
+        @Override
+        public Object getDefaultValue() {
+            return defaultValue;
+        }
+
+        @Override
+        public String getConfigPath() {
+            return path;
+        }
+    }
+}
diff --git a/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/SupervisorConfig.java b/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/SupervisorConfig.java
index 9415b69a75f..10d8521a36d 100644
--- a/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/SupervisorConfig.java
+++ b/base/service/src/main/java/org/eclipse/ditto/base/service/config/supervision/SupervisorConfig.java
@@ -27,4 +27,9 @@ public interface SupervisorConfig {
      */
     ExponentialBackOffConfig getExponentialBackOffConfig();
 
+    /** Returns the config for supervisor local ACK timeout calls.
+     * @return the config.
+     */
+    LocalAskTimeoutConfig getLocalAskTimeoutConfig();
+
 }
diff --git a/base/service/src/test/java/org/eclipse/ditto/base/service/config/supervision/DefaultLocalAskTimeoutConfigTest.java b/base/service/src/test/java/org/eclipse/ditto/base/service/config/supervision/DefaultLocalAskTimeoutConfigTest.java
new file mode 100644
index 00000000000..10edd813f2a
--- /dev/null
+++ b/base/service/src/test/java/org/eclipse/ditto/base/service/config/supervision/DefaultLocalAskTimeoutConfigTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+package org.eclipse.ditto.base.service.config.supervision;
+
+import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
+import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
+
+import java.time.Duration;
+
+import org.assertj.core.api.JUnitSoftAssertions;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Unit test for {@link DefaultLocalAskTimeoutConfigTest}.
+ */
+public class DefaultLocalAskTimeoutConfigTest {
+
+    private static Config supervisorLocalAskTimeoutConfig;
+
+    @Rule
+    public final JUnitSoftAssertions softly = new JUnitSoftAssertions();
+
+    @BeforeClass
+    public static void initTestFixture() {
+        supervisorLocalAskTimeoutConfig = ConfigFactory.load("local-ask-timout-test");
+    }
+
+    @Test
+    public void assertImmutability() {
+        assertInstancesOf(DefaultLocalAskTimeoutConfig.class,
+                areImmutable());
+    }
+
+    @Test
+    public void testHashCodeAndEquals() {
+        EqualsVerifier.forClass(DefaultLocalAskTimeoutConfig.class)
+                .usingGetClass()
+                .verify();
+    }
+
+    @Test
+    public void underTestReturnsDefaultValuesIfBaseConfigWasEmpty() {
+        final DefaultLocalAskTimeoutConfig underTest = DefaultLocalAskTimeoutConfig.of(ConfigFactory.empty());
+
+        softly.assertThat(underTest.getLocalAckTimeout())
+                .as(LocalAskTimeoutConfig.LocalAskTimeoutConfigValue.ASK_TIMEOUT.getConfigPath())
+                .isEqualTo(LocalAskTimeoutConfig.LocalAskTimeoutConfigValue.ASK_TIMEOUT.getDefaultValue());
+    }
+
+    @Test
+    public void underTestReturnsValuesOfConfigFile() {
+        final DefaultLocalAskTimeoutConfig underTest = DefaultLocalAskTimeoutConfig.of(supervisorLocalAskTimeoutConfig);
+
+        softly.assertThat(underTest.getLocalAckTimeout())
+                .as(LocalAskTimeoutConfig.LocalAskTimeoutConfigValue.ASK_TIMEOUT.getConfigPath())
+                .isEqualTo(Duration.ofSeconds(10L));
+    }
+}
\ No newline at end of file
diff --git a/base/service/src/test/resources/local-ask-timout-test.conf b/base/service/src/test/resources/local-ask-timout-test.conf
new file mode 100644
index 00000000000..110938ddc6f
--- /dev/null
+++ b/base/service/src/test/resources/local-ask-timout-test.conf
@@ -0,0 +1,3 @@
+local-ask {
+    timeout = 10s
+}
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionSupervisorActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionSupervisorActor.java
index 4e443542bc9..fc62e17cdc2 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionSupervisorActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionSupervisorActor.java
@@ -31,6 +31,7 @@
 import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.base.service.actors.ShutdownBehaviour;
 import org.eclipse.ditto.base.service.config.supervision.ExponentialBackOffConfig;
+import org.eclipse.ditto.base.service.config.supervision.LocalAskTimeoutConfig;
 import org.eclipse.ditto.connectivity.model.ConnectionId;
 import org.eclipse.ditto.connectivity.model.ConnectionType;
 import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand;
@@ -72,12 +73,6 @@ public final class ConnectionSupervisorActor
 
     private static final Duration MAX_CONFIG_RETRIEVAL_DURATION = Duration.ofSeconds(5);
 
-    /**
-     * For connectivity, this local ask timeout has to be higher as e.g. "openConnection" commands performed in a
-     * "staged" way will lead to quite some response times.
-     */
-    private static final Duration CONNECTIVITY_DEFAULT_LOCAL_ASK_TIMEOUT = Duration.ofSeconds(50);
-
     private static final SupervisorStrategy SUPERVISOR_STRATEGY =
             new OneForOneStrategy(true,
                     DeciderBuilder.match(JMSRuntimeException.class, e ->
@@ -101,7 +96,7 @@ private ConnectionSupervisorActor(final ActorRef commandForwarderActor,
             final ConnectionEnforcerActorPropsFactory enforcerActorPropsFactory,
             final MongoReadJournal mongoReadJournal) {
 
-        super(null, mongoReadJournal, CONNECTIVITY_DEFAULT_LOCAL_ASK_TIMEOUT);
+        super(null, mongoReadJournal);
         this.commandForwarderActor = commandForwarderActor;
         this.pubSubMediator = pubSubMediator;
         this.enforcerActorPropsFactory = enforcerActorPropsFactory;
@@ -205,6 +200,14 @@ protected ExponentialBackOffConfig getExponentialBackOffConfig() {
         return connectionConfig.getSupervisorConfig().getExponentialBackOffConfig();
     }
 
+    @Override
+    protected LocalAskTimeoutConfig getLocalAskTimeoutConfig() {
+        return DittoConnectivityConfig.of(DefaultScopedConfig.dittoScoped(getContext().getSystem().settings().config()))
+                .getConnectionConfig()
+                .getSupervisorConfig()
+                .getLocalAskTimeoutConfig();
+    }
+
     @Override
     protected ShutdownBehaviour getShutdownBehaviour(final ConnectionId entityId) {
         return ShutdownBehaviour.fromIdWithoutNamespace(entityId, pubSubMediator, getSelf());
diff --git a/connectivity/service/src/main/resources/connectivity.conf b/connectivity/service/src/main/resources/connectivity.conf
index b63e86477dc..5191d6e0982 100644
--- a/connectivity/service/src/main/resources/connectivity.conf
+++ b/connectivity/service/src/main/resources/connectivity.conf
@@ -205,6 +205,13 @@ ditto {
           random-factor = 1.0
           corrupted-receive-timeout = 600s
         }
+
+        # For connectivity, this local ask timeout has to be higher as e.g. "openConnection" commands performed in a
+        # "staged" way will lead to quite some response times.
+        local-ask {
+          timeout = 50s
+          timeout = ${?THINGS_SUPERVISOR_LOCAL_ASK_TIMEOUT}
+        }
       }
 
       snapshot {
diff --git a/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/AskWithRetryCommandForwarder.java b/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/AskWithRetryCommandForwarder.java
index d5a1ba1492c..368cc93bee3 100644
--- a/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/AskWithRetryCommandForwarder.java
+++ b/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/AskWithRetryCommandForwarder.java
@@ -208,7 +208,7 @@ private DittoRuntimeException reportError(final Command<?> command,
                 : throwable;
         final var dre = DittoRuntimeException.asDittoRuntimeException(
                 error, t -> reportUnexpectedError(command, t));
-        LOGGER.info(" - {}: {}", dre.getClass().getSimpleName(), dre.getMessage());
+        LOGGER.withCorrelationId(command).info("{}: {}", dre.getClass().getSimpleName(), dre.getMessage());
         return dre;
     }
 
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
index e330df7d4c3..3aadf9620a9 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
@@ -45,6 +45,7 @@
 import org.eclipse.ditto.base.service.actors.ShutdownBehaviour;
 import org.eclipse.ditto.base.service.config.supervision.ExponentialBackOff;
 import org.eclipse.ditto.base.service.config.supervision.ExponentialBackOffConfig;
+import org.eclipse.ditto.base.service.config.supervision.LocalAskTimeoutConfig;
 import org.eclipse.ditto.base.service.signaltransformer.SignalTransformer;
 import org.eclipse.ditto.base.service.signaltransformer.SignalTransformers;
 import org.eclipse.ditto.internal.utils.akka.actors.AbstractActorWithStashWithTimers;
@@ -100,12 +101,6 @@
 public abstract class AbstractPersistenceSupervisor<E extends EntityId, S extends Signal<?>>
         extends AbstractActorWithStashWithTimers {
 
-    /**
-     * Timeout for local actor invocations - a small timeout should be more than sufficient as those are just method
-     * calls.
-     */
-    protected static final Duration DEFAULT_LOCAL_ASK_TIMEOUT = Duration.ofSeconds(5);
-
     private static final String ENFORCEMENT_TIMER = "enforcement";
     private static final String ENFORCEMENT_TIMER_SEGMENT_ENFORCEMENT = "enf";
     private static final String ENFORCEMENT_TIMER_SEGMENT_PROCESSING = "process";
@@ -134,7 +129,7 @@ public abstract class AbstractPersistenceSupervisor<E extends EntityId, S extend
     @Nullable protected ActorRef persistenceActorChild;
     @Nullable protected ActorRef enforcerChild;
 
-    private final Duration defaultLocalAskTimeout;
+    private final Duration localAskTimeout;
 
     private final ExponentialBackOffConfig exponentialBackOffConfig;
     private final SignalTransformer signalTransformer;
@@ -145,16 +140,14 @@ public abstract class AbstractPersistenceSupervisor<E extends EntityId, S extend
     private int sudoOpCounter = 0;
 
     protected AbstractPersistenceSupervisor(@Nullable final BlockedNamespaces blockedNamespaces,
-            final MongoReadJournal mongoReadJournal,
-            final Duration defaultLocalAskTimeout) {
-        this(null, null, blockedNamespaces, mongoReadJournal, defaultLocalAskTimeout);
+            final MongoReadJournal mongoReadJournal) {
+        this(null, null, blockedNamespaces, mongoReadJournal);
     }
 
     protected AbstractPersistenceSupervisor(@Nullable final ActorRef persistenceActorChild,
             @Nullable final ActorRef enforcerChild,
             @Nullable final BlockedNamespaces blockedNamespaces,
-            final MongoReadJournal mongoReadJournal,
-            final Duration defaultLocalAskTimeout) {
+            final MongoReadJournal mongoReadJournal) {
 
         final ActorSystem system = context().system();
         final Config dittoExtensionsConfig = ScopedConfig.dittoExtension(system.settings().config());
@@ -163,10 +156,10 @@ protected AbstractPersistenceSupervisor(@Nullable final ActorRef persistenceActo
         this.enforcerChild = enforcerChild;
         this.blockedNamespaces = blockedNamespaces;
         this.mongoReadJournal = mongoReadJournal;
-        this.defaultLocalAskTimeout = defaultLocalAskTimeout;
-        exponentialBackOffConfig = getExponentialBackOffConfig();
-        backOff = ExponentialBackOff.initial(exponentialBackOffConfig);
-        supervisorStrategy = new OneForOneStrategy(
+        this.localAskTimeout = getLocalAskTimeoutConfig().getLocalAckTimeout();
+        this.exponentialBackOffConfig = getExponentialBackOffConfig();
+        this.backOff = ExponentialBackOff.initial(exponentialBackOffConfig);
+        this.supervisorStrategy = new OneForOneStrategy(
                 DeciderBuilder
                         .matchAny(error -> {
                             log.error(error, "Got error in child. Stopping child actor for entityID <{}>.", entityId);
@@ -206,6 +199,12 @@ protected AbstractPersistenceSupervisor(@Nullable final ActorRef persistenceActo
      */
     protected abstract ExponentialBackOffConfig getExponentialBackOffConfig();
 
+    /**
+     * Read from actor context. Called in constructor.
+     * @return local ASK timeout config;
+     */
+    protected abstract LocalAskTimeoutConfig getLocalAskTimeoutConfig();
+
     /**
      * Get the shutdown behavior appropriate for this actor.
      *
@@ -355,7 +354,8 @@ protected CompletionStage<Object> modifyTargetActorCommandResponse(final Signal<
      * @param throwable the throwable
      * @return a new {@link java.util.concurrent.CompletionStage} failed with the initial throwable.
      */
-    protected CompletionStage<Object> handleTargetActorException(final Object enforcedCommand, final Throwable throwable) {
+    protected CompletionStage<Object> handleTargetActorAndEnforcerException(final Signal<?> enforcedCommand,
+            final Throwable throwable) {
         return CompletableFuture.failedFuture(throwable);
     }
 
@@ -426,7 +426,7 @@ protected void becomeCorrupted() {
      * failed due to lacking permissions.
      */
     protected CompletionStage<Object> askEnforcerChild(final Signal<?> signal) {
-        return Patterns.ask(enforcerChild, signal, DEFAULT_LOCAL_ASK_TIMEOUT);
+        return Patterns.ask(enforcerChild, signal, localAskTimeout);
     }
 
     /**
@@ -561,7 +561,7 @@ protected <T> CompletionStage<TargetActorWithMessage> getTargetActorForSendingEn
                     new TargetActorWithMessage(
                             persistenceActorChild,
                             message,
-                            shouldSendResponse ? defaultLocalAskTimeout : Duration.ZERO,
+                            shouldSendResponse ? localAskTimeout : Duration.ZERO,
                             Function.identity()
                     ));
         } else {
@@ -783,6 +783,7 @@ private void enforceAndForwardToTargetActor(final Object message) {
                 final var syncCs = signalTransformer.apply(signal)
                         .whenComplete((result, error) -> handleOptionalTransformationException(signal, error, sender))
                         .thenCompose(transformed -> enforceSignalAndForwardToTargetActor((S) transformed, sender)
+                                .exceptionallyCompose(error -> handleTargetActorAndEnforcerException(signal, error))
                                 .whenComplete((response, throwable) ->
                                         handleSignalEnforcementResponse(response, throwable, transformed, sender)
                                 ))
@@ -904,10 +905,6 @@ protected CompletionStage<Object> enforceSignalAndForwardToTargetActor(final S s
                             dittoHeaders = tracedSignal.getDittoHeaders();
                         }
                         return enforcerResponseToTargetActor(dittoHeaders, enforcedCommand, sender)
-                                .exceptionallyCompose(error -> handleTargetActorException(enforcedCommand, error)
-                                        .thenApply(o -> new EnforcedSignalAndTargetActorResponse(null, null)))
-                                        // HandleTargetActorException will always return failed future thenApply only
-                                        // for compilation
                                 .whenComplete((result, error) -> {
                                     startedSpan.mark("processed");
                                     stopTimer(processingTimer).accept(result, error);
diff --git a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/AbstractPolicyLoadingEnforcerActor.java b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/AbstractPolicyLoadingEnforcerActor.java
index 023e6f0335d..18b3f44a438 100644
--- a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/AbstractPolicyLoadingEnforcerActor.java
+++ b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/AbstractPolicyLoadingEnforcerActor.java
@@ -34,7 +34,7 @@
 public abstract class AbstractPolicyLoadingEnforcerActor<I extends EntityId, S extends Signal<?>, R extends CommandResponse<?>,
         E extends EnforcementReloaded<S, R>> extends AbstractEnforcerActor<I, S, R, E> {
 
-    private final PolicyEnforcerProvider policyEnforcerProvider;
+    protected final PolicyEnforcerProvider policyEnforcerProvider;
 
     protected AbstractPolicyLoadingEnforcerActor(final I entityId,
             final E enforcement,
diff --git a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/CachingPolicyEnforcerProvider.java b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/CachingPolicyEnforcerProvider.java
index 9da753780d9..175b77d7a7a 100644
--- a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/CachingPolicyEnforcerProvider.java
+++ b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/CachingPolicyEnforcerProvider.java
@@ -19,6 +19,8 @@
 
 import javax.annotation.Nullable;
 
+import org.eclipse.ditto.base.model.exceptions.DittoInternalErrorException;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoDiagnosticLoggingAdapter;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
 import org.eclipse.ditto.internal.utils.cache.config.CacheConfig;
@@ -47,7 +49,7 @@
 /**
  * Transparent caching layer for {@link org.eclipse.ditto.policies.enforcement.PolicyEnforcerProvider}
  */
-final class CachingPolicyEnforcerProvider extends AbstractPolicyEnforcerProvider {
+final class CachingPolicyEnforcerProvider extends AbstractPolicyEnforcerProvider implements Invalidatable {
 
     private static final Logger LOGGER = DittoLoggerFactory.getThreadSafeLogger(CachingPolicyEnforcerProvider.class);
     private static final Duration LOCAL_POLICY_RETRIEVAL_TIMEOUT = Duration.ofSeconds(60);
@@ -107,6 +109,22 @@ public CompletionStage<Optional<PolicyEnforcer>> getPolicyEnforcer(@Nullable fin
                 });
     }
 
+    @Override
+    public CompletionStage<Boolean> invalidate(final PolicyTag policyTag, final String correlationId,
+            final Duration askTimeout) {
+        return Patterns.ask(cachingPolicyEnforcerProviderActor, new PolicyTagEnvelope(policyTag, correlationId),
+                        askTimeout)
+                .thenApply(result -> {
+                    if (result instanceof Boolean invalidated) {
+                        return invalidated;
+                    }
+                    throw DittoInternalErrorException.fromMessage(
+                            "Unexpected cachingPolicyEnforcerProviderActor response",
+                            DittoHeaders.newBuilder().correlationId(correlationId).build());
+                });
+    }
+
+    protected record PolicyTagEnvelope(PolicyTag policyTag, String correlationId){}
 
     /**
      * Actor which handles the actual cache lookup and invalidation.
@@ -145,6 +163,12 @@ public Receive createReceive() {
                     .match(PolicyId.class, this::doGetPolicyEnforcer)
                     .match(DistributedPubSubMediator.SubscribeAck.class, s -> log.debug("Got subscribeAck <{}>.", s))
                     .match(PolicyTag.class, policyTag -> policyEnforcerCache.invalidate(policyTag.getEntityId()))
+                    .match(PolicyTagEnvelope.class, policyTagEnvelope -> {
+                        log.withCorrelationId(policyTagEnvelope.correlationId()).debug(policyTagEnvelope.correlationId());
+                        final boolean invalidated =
+                                policyEnforcerCache.invalidate(policyTagEnvelope.policyTag().getEntityId());
+                        getSender().tell(invalidated, getSelf());
+                    })
                     .match(Replicator.Changed.class, this::handleChangedBlockedNamespaces)
                     .build();
         }
diff --git a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/Invalidatable.java b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/Invalidatable.java
new file mode 100644
index 00000000000..16f445802e5
--- /dev/null
+++ b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/Invalidatable.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+package org.eclipse.ditto.policies.enforcement;
+
+import java.time.Duration;
+import java.util.concurrent.CompletionStage;
+
+import org.eclipse.ditto.policies.api.PolicyTag;
+
+public interface Invalidatable {
+
+    CompletionStage<Boolean> invalidate(PolicyTag policyTag, String correlationId, final Duration askTimeout);
+}
diff --git a/policies/enforcement/src/test/java/org/eclipse/ditto/policies/enforcement/CachingPolicyEnforcerProviderTest.java b/policies/enforcement/src/test/java/org/eclipse/ditto/policies/enforcement/CachingPolicyEnforcerProviderTest.java
index 7628b15b9e5..bd81f49db26 100644
--- a/policies/enforcement/src/test/java/org/eclipse/ditto/policies/enforcement/CachingPolicyEnforcerProviderTest.java
+++ b/policies/enforcement/src/test/java/org/eclipse/ditto/policies/enforcement/CachingPolicyEnforcerProviderTest.java
@@ -20,6 +20,7 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -75,6 +76,27 @@ public void tearDown() {
         actorSystem = null;
     }
 
+    @Test
+    public void callingInvalidateReturnsCachingActorResponse() {
+        final ActorSystem system = mock(ActorSystem.class);
+        when(system.actorOf(any())).thenReturn(cachingActorTestProbe.ref());
+        final var underTest = new CachingPolicyEnforcerProvider(
+                system,
+                cache,
+                blockedNamespaces,
+                pubSubMediatorProbe.ref()
+        );
+
+        new TestKit(actorSystem) {{
+            final var policyEnforcer = underTest.invalidate(PolicyTag.of(PolicyId.of("ns:id"), 1L), "correlationId",
+                    Duration.ofSeconds(1L));
+            cachingActorTestProbe.expectMsgClass(CachingPolicyEnforcerProvider.PolicyTagEnvelope.class);
+            cachingActorTestProbe.reply(true);
+            assertThat(policyEnforcer.toCompletableFuture().join()).isTrue();
+            cachingActorTestProbe.expectNoMsg();
+        }};
+    }
+
     @Test
     public void getPolicyEnforcerWithNullIdReturnsEmptyOptional() {
         final ActorSystem system = mock(ActorSystem.class);
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicySupervisorActor.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicySupervisorActor.java
index b089a5ff9f5..b958bc9ac76 100755
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicySupervisorActor.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicySupervisorActor.java
@@ -20,6 +20,7 @@
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
 import org.eclipse.ditto.base.service.actors.ShutdownBehaviour;
 import org.eclipse.ditto.base.service.config.supervision.ExponentialBackOffConfig;
+import org.eclipse.ditto.base.service.config.supervision.LocalAskTimeoutConfig;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.internal.utils.namespaces.BlockedNamespaces;
 import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
@@ -62,7 +63,7 @@ private PolicySupervisorActor(final ActorRef pubSubMediator,
             final PolicyEnforcerProvider policyEnforcerProvider,
             final MongoReadJournal mongoReadJournal) {
 
-        super(blockedNamespaces, mongoReadJournal, DEFAULT_LOCAL_ASK_TIMEOUT);
+        super(blockedNamespaces, mongoReadJournal);
         this.policyEnforcerProvider = policyEnforcerProvider;
         this.pubSubMediator = pubSubMediator;
         final DittoPoliciesConfig policiesConfig = DittoPoliciesConfig.of(
@@ -128,6 +129,14 @@ protected ExponentialBackOffConfig getExponentialBackOffConfig() {
         return policiesConfig.getPolicyConfig().getSupervisorConfig().getExponentialBackOffConfig();
     }
 
+    @Override
+    protected LocalAskTimeoutConfig getLocalAskTimeoutConfig() {
+        return DittoPoliciesConfig.of(DefaultScopedConfig.dittoScoped(getContext().getSystem().settings().config()))
+                .getPolicyConfig()
+                .getSupervisorConfig()
+                .getLocalAskTimeoutConfig();
+    }
+
     @Override
     protected ShutdownBehaviour getShutdownBehaviour(final PolicyId entityId) {
         return ShutdownBehaviour.fromId(entityId, pubSubMediator, getSelf());
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcementTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcementTest.java
index a3a48efb88b..fcb75ae0ce7 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcementTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/enforcement/PolicyCommandEnforcementTest.java
@@ -17,7 +17,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,6 +40,7 @@
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.service.actors.ShutdownBehaviour;
 import org.eclipse.ditto.base.service.config.supervision.ExponentialBackOffConfig;
+import org.eclipse.ditto.base.service.config.supervision.LocalAskTimeoutConfig;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.streaming.MongoReadJournal;
 import org.eclipse.ditto.internal.utils.persistentactors.AbstractPersistenceSupervisor;
@@ -786,7 +786,7 @@ private class MockPolicyPersistenceSupervisor
 
         private MockPolicyPersistenceSupervisor(final ActorRef pubSubMediator, final ActorRef policyPersistenceActor,
                 final PolicyEnforcerProvider policyEnforcerProvider) {
-            super(policyPersistenceActor, null, null, Mockito.mock(MongoReadJournal.class), Duration.ofSeconds(5));
+            super(policyPersistenceActor, null, null, Mockito.mock(MongoReadJournal.class));
             this.pubSubMediator = pubSubMediator;
             this.policyEnforcerProvider = policyEnforcerProvider;
         }
@@ -814,6 +814,14 @@ protected ExponentialBackOffConfig getExponentialBackOffConfig() {
             return policiesConfig.getPolicyConfig().getSupervisorConfig().getExponentialBackOffConfig();
         }
 
+        @Override
+        protected LocalAskTimeoutConfig getLocalAskTimeoutConfig() {
+            return DittoPoliciesConfig.of(DefaultScopedConfig.dittoScoped(getContext().getSystem().settings().config()))
+                    .getPolicyConfig()
+                    .getSupervisorConfig()
+                    .getLocalAskTimeoutConfig();
+        }
+
         @Override
         protected ShutdownBehaviour getShutdownBehaviour(final PolicyId entityId) {
             return ShutdownBehaviour.fromId(entityId, pubSubMediator, getSelf());
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java
index 230b1f7232d..f6d3bc955e8 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingEnforcerActor.java
@@ -37,8 +37,10 @@
 import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.eclipse.ditto.json.JsonRuntimeException;
 import org.eclipse.ditto.policies.api.PoliciesValidator;
+import org.eclipse.ditto.policies.api.PolicyTag;
 import org.eclipse.ditto.policies.enforcement.AbstractEnforcementReloaded;
 import org.eclipse.ditto.policies.enforcement.AbstractPolicyLoadingEnforcerActor;
+import org.eclipse.ditto.policies.enforcement.Invalidatable;
 import org.eclipse.ditto.policies.enforcement.PolicyEnforcer;
 import org.eclipse.ditto.policies.enforcement.PolicyEnforcerProvider;
 import org.eclipse.ditto.policies.model.PoliciesModelFactory;
@@ -221,7 +223,24 @@ private CompletionStage<Optional<PolicyEnforcer>> loadPolicyEnforcerForCreateThi
             final Policy defaultPolicy = getDefaultPolicy(createThing.getDittoHeaders(), createThing.getEntityId());
             policyCs = createPolicy(defaultPolicy, createThing);
         }
-        return policyCs.thenCompose(policy -> providePolicyEnforcer(policy.getEntityId().orElse(null)));
+        final String correlationId =
+                createThing.getDittoHeaders().getCorrelationId().orElse("unexpected:" + UUID.randomUUID());
+        return policyCs
+                .thenCompose(policy -> {
+                    if (policyEnforcerProvider instanceof Invalidatable invalidatable &&
+                            policy.getEntityId().isPresent() && policy.getRevision().isPresent()) {
+                        return invalidatable.invalidate(PolicyTag.of(policy.getEntityId().get(),
+                                        policy.getRevision().get().toLong()), correlationId, askWithRetryConfig.getAskTimeout())
+                                .thenApply(bool -> {
+                                    log.withCorrelationId(correlationId)
+                                            .debug("PolicyEnforcerCache invalidated. Previous entity was present: {}",
+                                                    bool);
+                                    return policy;
+                                });
+                    }
+                    return CompletableFuture.completedFuture(policy);
+                })
+                .thenCompose(policy -> providePolicyEnforcer(policy.getEntityId().orElse(null)));
     }
 
     private CompletionStage<Policy> getCopiedPolicy(final String policyIdOrPlaceholder,
@@ -359,10 +378,10 @@ private CompletionStage<Policy> createPolicy(final Policy policy, final CreateTh
 
     private Policy handleCreatePolicyResponse(final CreatePolicy createPolicy, final Object policyResponse,
             final CreateThing createThing) {
-
         if (policyResponse instanceof CreatePolicyResponse createPolicyResponse) {
-            getContext().getParent().tell(new ThingPolicyCreated(createThing.getEntityId(),
-                    createPolicyResponse.getEntityId(), createPolicy.getDittoHeaders()), getSelf());
+            createPolicyResponse.getPolicyCreated()
+                    .ifPresent(policy -> getContext().getParent().tell(new ThingPolicyCreated(createThing.getEntityId(),
+                            createPolicyResponse.getEntityId(), createPolicy.getDittoHeaders()), getSelf()));
             return createPolicyResponse.getPolicyCreated().orElseThrow();
         } else {
             if (shouldReportInitialPolicyCreationFailure(policyResponse)) {
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
index c22eaf7928a..a9f3ec25dcd 100755
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingSupervisorActor.java
@@ -19,6 +19,7 @@
 import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
 
 import javax.annotation.Nullable;
@@ -36,6 +37,7 @@
 import org.eclipse.ditto.base.model.signals.events.Event;
 import org.eclipse.ditto.base.service.actors.ShutdownBehaviour;
 import org.eclipse.ditto.base.service.config.supervision.ExponentialBackOffConfig;
+import org.eclipse.ditto.base.service.config.supervision.LocalAskTimeoutConfig;
 import org.eclipse.ditto.internal.utils.cacheloaders.AskWithRetry;
 import org.eclipse.ditto.internal.utils.cluster.ShardRegionProxyActorFactory;
 import org.eclipse.ditto.internal.utils.cluster.StopShardedActor;
@@ -72,6 +74,7 @@
 import akka.actor.Props;
 import akka.japi.pf.FI;
 import akka.japi.pf.ReceiveBuilder;
+import akka.pattern.AskTimeoutException;
 import akka.stream.Materializer;
 import akka.stream.javadsl.Keep;
 import akka.stream.javadsl.Sink;
@@ -118,7 +121,7 @@ private ThingSupervisorActor(final ActorRef pubSubMediator,
             final PolicyEnforcerProvider policyEnforcerProvider,
             final MongoReadJournal mongoReadJournal) {
 
-        super(blockedNamespaces, mongoReadJournal, DEFAULT_LOCAL_ASK_TIMEOUT);
+        super(blockedNamespaces, mongoReadJournal);
 
         this.policyEnforcerProvider = policyEnforcerProvider;
         this.pubSubMediator = pubSubMediator;
@@ -319,7 +322,7 @@ protected CompletionStage<Object> modifyTargetActorCommandResponse(final Signal<
                             pair.response() instanceof RetrieveThingResponse retrieveThingResponse) {
                         return inlinePolicyEnrichment.enrichPolicy(retrieveThing, retrieveThingResponse)
                                 .map(Object.class::cast);
-                    } else if (RollbackCreatedPolicy.shouldRollback(pair.command(), pair.response())) {
+                    } else if (RollbackCreatedPolicy.shouldRollbackBasedOnTargetActorResponse(pair.command(), pair.response())) {
                         final CompletableFuture<Object> responseF = new CompletableFuture<>();
                         getSelf().tell(RollbackCreatedPolicy.of(pair.command(), pair.response(), responseF), getSelf());
                         return Source.completionStage(responseF);
@@ -332,9 +335,8 @@ protected CompletionStage<Object> modifyTargetActorCommandResponse(final Signal<
     }
 
     @Override
-    protected CompletableFuture<Object> handleTargetActorException(final Object enforcedCommand, final Throwable throwable) {
-        if (RollbackCreatedPolicy.shouldRollback(enforcedCommand, throwable) &&
-                enforcedCommand instanceof Signal<?> signal) {
+    protected CompletableFuture<Object> handleTargetActorAndEnforcerException(final Signal<?> signal, final Throwable throwable) {
+        if (RollbackCreatedPolicy.shouldRollbackBasedOnException(signal, throwable)) {
             log.withCorrelationId(signal)
                     .info("Target actor exception received: <{}>. " +
                             "Sending RollbackCreatedPolicy msg to self, potentially rolling back a created policy.",
@@ -343,8 +345,8 @@ protected CompletableFuture<Object> handleTargetActorException(final Object enfo
             getSelf().tell(RollbackCreatedPolicy.of(signal, throwable, responseFuture), getSelf());
             return responseFuture;
         } else {
-            log.withCorrelationId(enforcedCommand instanceof WithDittoHeaders wdh ? wdh.getDittoHeaders() : null)
-                    .info("Target actor exception received: <{}>", throwable.getClass().getSimpleName());
+            log.withCorrelationId(signal)
+                    .debug("Target actor exception received: <{}>", throwable.getClass().getSimpleName());
             return CompletableFuture.failedFuture(throwable);
         }
     }
@@ -369,7 +371,12 @@ private void handleRollbackCreatedPolicy(final RollbackCreatedPolicy rollback) {
                                         "Policies shard region response: <{}>", deletePolicy.getEntityId(), response);
                         rollback.completeInitialResponse();
                         return response;
-                    });
+                    }).exceptionally(throwable -> {
+                log.withCorrelationId(correlationId).error(throwable, "Failed to rollback Policy Create");
+                rollback.completeInitialResponse();
+                return null;
+            });
+
         } else {
             log.withCorrelationId(correlationId)
                     .debug("Not initiating policy rollback as none was created.");
@@ -427,6 +434,14 @@ protected ExponentialBackOffConfig getExponentialBackOffConfig() {
                 .getExponentialBackOffConfig();
     }
 
+    @Override
+    protected LocalAskTimeoutConfig getLocalAskTimeoutConfig() {
+        return DittoThingsConfig.of(DefaultScopedConfig.dittoScoped(getContext().getSystem().settings().config()))
+                .getThingConfig()
+                .getSupervisorConfig()
+                .getLocalAskTimeoutConfig();
+    }
+
     @Override
     protected void stopShardedActor(final StopShardedActor trigger) {
         super.stopShardedActor(trigger);
@@ -485,41 +500,54 @@ public static RollbackCreatedPolicy of(final Signal<?> initialCommand, final Obj
 
         /**
          * Evaluates if a failure in the creation of a thing should lead to deleting of that thing's policy.
+         * Should be used only to evaluate exceptions from the target actor not the enforcement actor.
          * @param command the initial command.
          * @param response the response from the {@link org.eclipse.ditto.things.service.persistence.actors.ThingPersistenceActor}.
          * @return if the thing's policy is to be deleted.
          */
-        public static boolean shouldRollback(final Signal<?> command, @Nullable final Object response) {
-            return shouldRollback(command, response, null);
+        private static boolean shouldRollbackBasedOnTargetActorResponse(final Signal<?> command, @Nullable final Object response) {
+            return command instanceof CreateThing && response instanceof DittoRuntimeException;
         }
 
         /**
          * Evaluates if a failure in the creation of a thing should lead to deleting of that thing's policy.
-         * @param command the initial command.
+         * @param signal the initial signal.
          * @param throwable the throwable received from the Persistence Actor
          * @return if the thing's policy is to be deleted.
          */
-        public static boolean shouldRollback(final Object command, @Nullable final Throwable throwable) {
-            if (command instanceof Signal<?> signal) {
-                return shouldRollback(signal, null, throwable);
-            } else {
-                return false;
-            }
-        }
-        private static boolean shouldRollback(final Signal<?> command, @Nullable final Object response, @Nullable final Throwable throwable) {
-            return  command instanceof CreateThing && (response instanceof DittoRuntimeException || throwable != null);
+        private static boolean shouldRollbackBasedOnException(final Signal<?> signal, @Nullable final Throwable throwable) {
+                return signal instanceof CreateThing && ((throwable instanceof CompletionException ce1 &&  ce1.getCause() instanceof ThingUnavailableException)
+                        || throwable instanceof AskTimeoutException
+                        || (throwable instanceof CompletionException ce && ce.getCause() instanceof AskTimeoutException)
+                );
         }
 
         /**
          * Completes the responseFuture with the response which in turn should send the Persistence actor response to
-         * the initial sender.
+         * the initial sender. If an additional exception occurs during policy rollback the responseFuture will be
+         * completed with that exception and adding the target actor exception as suppressed warning.
+         *
+         * @param throwable the additional optional exception occurred during the rollback process.
          */
-        void completeInitialResponse() {
+        private void completeInitialResponse(@Nullable final Throwable throwable) {
             if (response instanceof Throwable t) {
-                responseFuture.completeExceptionally(t);
+                if (throwable != null) {
+                    throwable.addSuppressed(t);
+                    responseFuture.completeExceptionally(throwable);
+                } else {
+                    responseFuture.completeExceptionally(t);
+                }
             } else {
                 responseFuture.complete(response);
             }
         }
+
+        /**
+         * Completes the responseFuture with the response which in turn should send the Persistence actor response to
+         * the initial sender.
+         */
+        private void completeInitialResponse() {
+            completeInitialResponse(null);
+        }
     }
 }
diff --git a/things/service/src/main/resources/things.conf b/things/service/src/main/resources/things.conf
index 0b3d818f8ca..ef3ca2b5b04 100755
--- a/things/service/src/main/resources/things.conf
+++ b/things/service/src/main/resources/things.conf
@@ -74,6 +74,11 @@ ditto {
           random-factor = 1.0
           corrupted-receive-timeout = 600s
         }
+
+        local-ask {
+          timeout = 5s
+          timeout = ${?THINGS_SUPERVISOR_LOCAL_ASK_TIMEOUT}
+        }
       }
 
       cleanup {

From bb97c066b8bbdb97edfff56e08d96b5f84bab597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 30 Mar 2023 16:10:47 +0200
Subject: [PATCH 074/173] fixed OverflowStrategy in SupervisedStream to
 backpressure instead of failing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../gateway/service/streaming/actors/SupervisedStream.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/SupervisedStream.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/SupervisedStream.java
index 84d7ad0a9b2..134b7f6e2e0 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/SupervisedStream.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/SupervisedStream.java
@@ -35,7 +35,7 @@ public interface SupervisedStream {
      * @return the source queue.
      */
     static Source<SessionedJsonifiable, WithQueue> sourceQueue(final int queueSize) {
-        return Source.<SessionedJsonifiable>queue(queueSize, OverflowStrategy.fail().withLogLevel(Logging.WarningLevel()))
+        return Source.<SessionedJsonifiable>queue(queueSize, OverflowStrategy.backpressure().withLogLevel(Logging.WarningLevel()))
                 .viaMat(KillSwitches.single(), Keep.both())
                 .mapMaterializedValue(pair -> {
                     final SourceQueueWithComplete<SessionedJsonifiable> sourceQueue = pair.first();

From d33da835bf150eee8b79f60aa6dca01bfe107d82 Mon Sep 17 00:00:00 2001
From: Thomas Fries <thomas.fries0@gmail.com>
Date: Thu, 30 Mar 2023 20:23:00 +0200
Subject: [PATCH 075/173] UI - New Operations tab (#1600)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* UI - New Operations tab
* added new tab
* changed way to control right auth user
* extended api to allow devops path
* utils to add table row now returns row
* crud editor returns explicit cancel action
* crud editor now with option without delete or create

Signed-off-by: thfries <thomas.fries0@gmail.com>

* UI - Operations Tab: new logger view

Signed-off-by: thfries <thomas.fries0@gmail.com>

* UI - operations tab - refresh not scrolling

* UI - change header info on new files

Signed-off-by: thfries <thomas.fries0@gmail.com>

* UI - Operations tab - make tabs optional
- fixed auth header mixing from wrong environment
- operations tab not getting right auth header

Signed-off-by: thfries <thomas.fries0@gmail.com>

* UI - added option to define new logger for each service in Operations / Logging functionality

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>

* UI - operations tab
- remove spellcheck from input
- split loggerView into smaller functions

Signed-off-by: thfries <thomas.fries0@gmail.com>

---------

Signed-off-by: thfries <thomas.fries0@gmail.com>
Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
Co-authored-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 ui/index.html                             |  12 ++-
 ui/main.js                                |   9 +-
 ui/modules/api.js                         |  11 ++-
 ui/modules/connections/connections.js     |  23 ++---
 ui/modules/connections/connectionsCRUD.js |   2 +-
 ui/modules/environments/authorization.js  |  14 ++-
 ui/modules/environments/environments.html |  17 +++-
 ui/modules/environments/environments.js   |  27 ++++--
 ui/modules/operations/operations.html     |  49 +++++++++++
 ui/modules/operations/operations.js       | 100 ++++++++++++++++++++++
 ui/modules/policies/policies.js           |  35 +++-----
 ui/modules/things/attributes.js           |   2 +-
 ui/modules/things/features.js             |   2 +-
 ui/modules/things/things.js               |  28 +-----
 ui/modules/things/thingsCRUD.js           |   2 +-
 ui/modules/utils.js                       |   2 +
 ui/modules/utils/crudToolbar.js           |  46 +++++++---
 ui/modules/utils/tabHandler.js            |  54 ++++++++++++
 ui/templates/environmentTemplates.json    |   4 +-
 19 files changed, 334 insertions(+), 105 deletions(-)
 create mode 100644 ui/modules/operations/operations.html
 create mode 100644 ui/modules/operations/operations.js
 create mode 100644 ui/modules/utils/tabHandler.js

diff --git a/ui/index.html b/ui/index.html
index 6905061c8a3..e3e40268585 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -72,11 +72,16 @@
                             Policies
                         </a>
                     </li>
-                    <li class="nav-item" id="tabConnections">
+                    <li class="nav-item" id="tabConnections" data-auth="devOps">
                         <a class="nav-link" data-bs-target="#collapseConnections:not(.show)" data-bs-toggle="collapse">
                             Connections
                         </a>
                     </li>
+                    <li class="nav-item" id="tabOperations" data-auth="devOps">
+                        <a class="nav-link" data-bs-target="#collapseOperations:not(.show)" data-bs-toggle="collapse">
+                            Operations
+                        </a>
+                    </li>
                     <li class="nav-item" id="tabEnvironments">
                         <a class="nav-link" data-bs-target="#collapseSettings:not(.show)" data-bs-toggle="collapse">
                             Environments
@@ -105,6 +110,9 @@
         <div class="collapse" id=collapseConnections data-bs-parent="#page-content">
             <div id="connectionsHTML"></div>
         </div>
+        <div class="collapse" id=collapseOperations data-bs-parent="#page-content">
+            <div id="operationsHTML"></div>
+        </div>
         <div class="collapse" id="collapseSettings" data-bs-parent="#page-content">
             <div id="environmentsHTML"></div>
         </div>
@@ -147,7 +155,7 @@
         <div class="input-group input-group-sm mb-1 mt-1 has-validation">
             <label class="input-group-text" id="label">Default</label>
             <input type="text" class="form-control" disabled id="inputIdValue">
-            <button class="btn btn-outline-primary btn-sm" id="buttonCrudEdit"
+            <button class="btn btn-outline-primary btn-sm" id="buttonEdit"
                 data-bs-toggle="tooltip" title="Edit">
                 Edit
             </button>
diff --git a/ui/main.js b/ui/main.js
index 779b9eb4c51..544cd9e40a2 100644
--- a/ui/main.js
+++ b/ui/main.js
@@ -27,8 +27,8 @@ import * as MessagesIncoming from './modules/things/messagesIncoming.js';
 import * as Connections from './modules/connections/connections.js';
 import * as ConnectionsCRUD from './modules/connections/connectionsCRUD.js';
 import * as ConnectionsMonitor from './modules/connections/connectionsMonitor.js';
+import * as Operations from './modules/operations/operations.js';
 import * as Policies from './modules/policies/policies.js';
-import * as API from './modules/api.js';
 import * as Utils from './modules/utils.js';
 import {WoTDescription} from './modules/things/wotDescription.js';
 
@@ -40,10 +40,13 @@ document.addEventListener('DOMContentLoaded', async function() {
   document.getElementById('thingsHTML').innerHTML = await (await fetch('modules/things/things.html')).text();
   document.getElementById('fieldsHTML').innerHTML = await (await fetch('modules/things/fields.html')).text();
   document.getElementById('featuresHTML').innerHTML = await (await fetch('modules/things/features.html')).text();
-  document.getElementById('messagesIncomingHTML').innerHTML = await (await fetch('modules/things/messagesIncoming.html')).text();
+  document.getElementById('messagesIncomingHTML').innerHTML =
+      await (await fetch('modules/things/messagesIncoming.html')).text();
   document.getElementById('policyHTML').innerHTML = await (await fetch('modules/policies/policies.html')).text();
   document.getElementById('connectionsHTML').innerHTML =
       await (await fetch('modules/connections/connections.html')).text();
+  document.getElementById('operationsHTML').innerHTML =
+      await (await fetch('modules/operations/operations.html')).text();
   document.getElementById('environmentsHTML').innerHTML =
       await (await fetch('modules/environments/environments.html')).text();
   document.getElementById('authorizationHTML').innerHTML =
@@ -64,6 +67,7 @@ document.addEventListener('DOMContentLoaded', async function() {
   Connections.ready();
   ConnectionsCRUD.ready();
   ConnectionsMonitor.ready();
+  Operations.ready();
   Authorization.ready();
   await Environments.ready();
 
@@ -94,7 +98,6 @@ document.addEventListener('DOMContentLoaded', async function() {
     e.addEventListener('click', (event) => {
       mainNavbar.querySelectorAll('.nav-link,.active').forEach((n) => n.classList.remove('active'));
       event.currentTarget.classList.add('active');
-      API.setAuthHeader(event.currentTarget.parentNode.id === 'tabConnections');
     });
   });
 
diff --git a/ui/modules/api.js b/ui/modules/api.js
index eb343316f2b..b9a427673df 100644
--- a/ui/modules/api.js
+++ b/ui/modules/api.js
@@ -284,6 +284,9 @@ export function setAuthHeader(forDevOps) {
     } else if (Environments.current().devopsAuth === 'bearer') {
       authHeaderKey = 'Authorization';
       authHeaderValue ='Bearer ' + Environments.current().bearerDevOps;
+    } else {
+      authHeaderKey = 'Basic';
+      authHeaderValue = '';
     }
   } else {
     if (Environments.current().mainAuth === 'basic') {
@@ -295,6 +298,9 @@ export function setAuthHeader(forDevOps) {
     } else if (Environments.current().mainAuth === 'bearer') {
       authHeaderKey = 'Authorization';
       authHeaderValue ='Bearer ' + Environments.current().bearer;
+    } else {
+      authHeaderKey = 'Basic';
+      authHeaderValue = '';
     }
   }
 }
@@ -306,12 +312,13 @@ export function setAuthHeader(forDevOps) {
  * @param {Object} body payload for the api call
  * @param {Object} additionalHeaders object with additional header fields
  * @param {boolean} returnHeaders request full response instead of json content
+ * @param {boolean} devOps default: false. Set true to avoid /api/2 path
  * @return {Object} result as json object
  */
-export async function callDittoREST(method, path, body, additionalHeaders, returnHeaders = false) {
+export async function callDittoREST(method, path, body, additionalHeaders, returnHeaders = false, devOps = false) {
   let response;
   try {
-    response = await fetch(Environments.current().api_uri + '/api/2' + path, {
+    response = await fetch(Environments.current().api_uri + (devOps ? '' : '/api/2') + path, {
       method: method,
       headers: {
         'Content-Type': 'application/json',
diff --git a/ui/modules/connections/connections.js b/ui/modules/connections/connections.js
index 4e00cb4bd23..48a3b9870e0 100644
--- a/ui/modules/connections/connections.js
+++ b/ui/modules/connections/connections.js
@@ -15,8 +15,8 @@
 /* eslint-disable no-invalid-this */
 /* eslint-disable require-jsdoc */
 import * as API from '../api.js';
-import * as Environments from '../environments/environments.js';
 import * as Utils from '../utils.js';
+import {TabHandler} from '../utils/tabHandler.js';
 
 const observers = [];
 
@@ -39,13 +39,11 @@ let dom = {
 let selectedConnectionId;
 
 export function ready() {
-  Environments.addChangeListener(onEnvironmentChanged);
-
   Utils.getAllElementsById(dom);
+  new TabHandler(dom.tabConnections, dom.collapseConnections, refreshTab, 'disableConnections');
 
   Utils.addValidatorToTable(dom.tbodyConnections, dom.tableValidationConnections);
 
-  dom.tabConnections.onclick = onTabActivated;
   dom.buttonLoadConnections.onclick = loadConnections;
   dom.tbodyConnections.addEventListener('click', onConnectionsTableClick);
 }
@@ -100,21 +98,10 @@ function onConnectionsTableClick(event) {
   }
 }
 
-let viewDirty = false;
-
-function onTabActivated() {
-  if (viewDirty) {
-    loadConnections();
-    viewDirty = false;
-  }
-}
-
-function onEnvironmentChanged() {
-  if (dom.collapseConnections.classList.contains('show')) {
+function refreshTab(otherEnvironment) {
+  if (otherEnvironment) {
     selectedConnectionId = null;
     setConnection(null);
-    loadConnections();
-  } else {
-    viewDirty = true;
   }
+  loadConnections();
 }
diff --git a/ui/modules/connections/connectionsCRUD.js b/ui/modules/connections/connectionsCRUD.js
index 731808e90f5..8fbbe18cf8e 100644
--- a/ui/modules/connections/connectionsCRUD.js
+++ b/ui/modules/connections/connectionsCRUD.js
@@ -184,7 +184,7 @@ function setConnection(connection) {
 }
 
 function onEditToggle(event) {
-  const isEditing = event.detail;
+  const isEditing = event.detail.isEditing;
   dom.buttonConnectionTemplates.disabled = !isEditing;
   connectionEditor.setReadOnly(!isEditing);
   connectionEditor.renderer.setShowGutter(isEditing);
diff --git a/ui/modules/environments/authorization.js b/ui/modules/environments/authorization.js
index 9a1752f6a0b..305eba96440 100644
--- a/ui/modules/environments/authorization.js
+++ b/ui/modules/environments/authorization.js
@@ -28,6 +28,13 @@ let dom = {
   collapseConnections: null,
 };
 
+let _forDevops = false;
+
+export function setForDevops(forDevops) {
+  _forDevops = forDevops;
+  API.setAuthHeader(_forDevops);
+}
+
 export function ready() {
   Utils.getAllElementsById(dom);
 
@@ -53,15 +60,14 @@ export function ready() {
     }
 
     const mainAuths = document.querySelectorAll('input[name="main-auth"]');
-    for(let i = 0; i < mainAuths.length; i++) {
+    for (let i = 0; i < mainAuths.length; i++) {
       mainAuths[i].checked = mainAuths[i].value === mainAuth;
     }
 
     const devopsAuths = document.querySelectorAll('input[name="devops-auth"]');
-    for(let i = 0; i < devopsAuths.length; i++) {
+    for (let i = 0; i < devopsAuths.length; i++) {
       devopsAuths[i].checked = devopsAuths[i].value === devopsAuth;
     }
-
   };
 
   document.getElementById('authorizeSubmit').onclick = () => {
@@ -94,5 +100,5 @@ export function onEnvironmentChanged() {
   dom.dittoPreAuthenticatedUsername.value = Environments.current().dittoPreAuthenticatedUsername ?
                                             Environments.current().dittoPreAuthenticatedUsername :
                                             '';
-  API.setAuthHeader(dom.collapseConnections.classList.contains('show'));
+  API.setAuthHeader(_forDevops);
 }
diff --git a/ui/modules/environments/environments.html b/ui/modules/environments/environments.html
index 907151ff786..3f8459d5f72 100644
--- a/ui/modules/environments/environments.html
+++ b/ui/modules/environments/environments.html
@@ -46,14 +46,27 @@ <h5>Environments</h5>
                             title="A comma-separated list of namespaces (e.g. com.example.namespace). The given namespaces are used as a parameter for the Things search">Search Namespaces</label>
                         <input type="text" class="form-control form-control-sm" spellcheck="false" id="inputSearchNamespaces" disabled></input>
                     </div>
-                    <div class="input-group input-group-sm mt-1">
+                    <div class="input-group input-group-sm mt-1 mb-3">
                         <label class="input-group-text">Ditto Version</label>
                         <select class="form-select form-select-sm" id="selectDittoVersion" disabled>
                             <option selecte value="3">3</option>
                             <option value="2">2</option>
                         </select>
                     </div>    
-                </crud-toolbar>
+                    <label class="form-label">Optional Tabs</label>
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch" id="inputTabPolicies" disabled>
+                        <label class="form-check-label" for="inputTabPolicies">Policies</label>
+                      </div>
+                      <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch" id="inputTabConnections" disabled>
+                        <label class="form-check-label" for="inputTabConnections">Connections</label>
+                      </div>
+                      <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch" id="inputTabOperations" disabled>
+                        <label class="form-check-label" for="inputTabOperations">Operations</label>
+                      </div>
+            </crud-toolbar>
             </div>
             <div class="tab-pane container no-margin" id="tabEnvJson">
                 <crud-toolbar label="Name" id="crudEnvironmentJson" allowIdChange>
diff --git a/ui/modules/environments/environments.js b/ui/modules/environments/environments.js
index ee51906b0d3..827d73381a1 100644
--- a/ui/modules/environments/environments.js
+++ b/ui/modules/environments/environments.js
@@ -36,6 +36,9 @@ let dom = {
   inputApiUri: null,
   inputSearchNamespaces: null,
   selectDittoVersion: null,
+  inputTabPolicies: null,
+  inputTabConnections: null,
+  inputTabOperations: null,
 };
 
 let observers = [];
@@ -170,6 +173,9 @@ function onUpdateEnvironmentClick(event) {
     environments[selectedEnvName].api_uri = dom.inputApiUri.value;
     environments[selectedEnvName].searchNamespaces = dom.inputSearchNamespaces.value;
     environments[selectedEnvName].ditto_version = dom.selectDittoVersion.value;
+    environments[selectedEnvName].disablePolicies = !dom.inputTabPolicies.checked;
+    environments[selectedEnvName].disableConnections = !dom.inputTabConnections.checked;
+    environments[selectedEnvName].disableOperations = !dom.inputTabOperations.checked;
   } else {
     environments[selectedEnvName] = JSON.parse(settingsEditor.getValue());
   }
@@ -223,6 +229,9 @@ function updateEnvEditors() {
     dom.inputApiUri.value = selectedEnvironment.api_uri;
     dom.inputSearchNamespaces.value = selectedEnvironment.searchNamespaces ?? '';
     dom.selectDittoVersion.value = selectedEnvironment.ditto_version ? selectedEnvironment.ditto_version : '3';
+    dom.inputTabPolicies.checked = !selectedEnvironment.disablePolicies;
+    dom.inputTabConnections.checked = !selectedEnvironment.disableConnections;
+    dom.inputTabOperations.checked = !selectedEnvironment.disableOperations;
   } else {
     dom.crudEnvironmentFields.idValue = null;
     dom.crudEnvironmentJson.idValue = null;
@@ -230,6 +239,9 @@ function updateEnvEditors() {
     dom.inputApiUri.value = null;
     dom.inputSearchNamespaces.value = null;
     dom.selectDittoVersion.value = 3;
+    dom.inputTabPolicies.checked = true;
+    dom.inputTabConnections.checked = true;
+    dom.inputTabOperations.checked = true;
   }
 }
 
@@ -304,12 +316,15 @@ async function loadEnvironmentTemplates() {
 }
 
 function onEditToggle(event) {
-  dom.inputApiUri.disabled = !event.detail;
-  dom.inputSearchNamespaces.disabled = !event.detail;
-  dom.selectDittoVersion.disabled = !event.detail;
-  settingsEditor.setReadOnly(!event.detail);
-  settingsEditor.renderer.setShowGutter(event.detail);
-  if (!event.detail) {
+  dom.inputApiUri.disabled = !event.detail.isEditing;
+  dom.inputSearchNamespaces.disabled = !event.detail.isEditing;
+  dom.selectDittoVersion.disabled = !event.detail.isEditing;
+  dom.inputTabPolicies.disabled = !event.detail.isEditing;
+  dom.inputTabConnections.disabled = !event.detail.isEditing;
+  dom.inputTabOperations.disabled = !event.detail.isEditing;
+  settingsEditor.setReadOnly(!event.detail.isEditing);
+  settingsEditor.renderer.setShowGutter(event.detail.isEditing);
+  if (!event.detail.isEditing) {
     updateEnvEditors();
   }
 }
diff --git a/ui/modules/operations/operations.html b/ui/modules/operations/operations.html
new file mode 100644
index 00000000000..521ade84822
--- /dev/null
+++ b/ui/modules/operations/operations.html
@@ -0,0 +1,49 @@
+<!--
+  ~ Copyright (c) 2023 Contributors to the Eclipse Foundation
+  ~
+  ~ See the NOTICE file(s) distributed with this work for additional
+  ~ information regarding copyright ownership.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License 2.0 which is available at
+  ~ http://www.eclipse.org/legal/epl-2.0
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
+<h5>Ditto Services Logging</h5>
+<hr />
+<div class="input-group input-group-sm mt-1 mb-1" role="group">
+    <div style="flex-grow: 1;"></div>
+    <button class="btn btn-outline-primary btn-sm button_round_left" id="buttonLoadAllLogLevels">
+        <i class="bi bi-arrow-clockwise"></i>
+        Refresh
+    </button>
+</div>
+<div class="row resizable_pane" style="height: 80vh">
+    <div class="col-md-12 resizable_flex_column">
+        <div id="divLoggers"></div>
+        <template id="templateLogger">
+            <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
+                integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+            <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.3/font/bootstrap-icons.min.css"
+                rel="stylesheet"
+                integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow=="
+                crossorigin="anonymous" referrerpolicy="no-referrer" />
+            <link href="index.css" rel="stylesheet" />
+    
+            <div class="input-group input-group-sm mb-1">
+                <input class="form-control" type="text" disabled id="inputLogger" spellcheck="false"></input>
+                <div class="btn-group" role="group">
+                    <input type="radio" class="btn-check" id="debug" autocomplete="off">
+                    <label class="btn btn-sm btn-outline-secondary" for="debug">DEBUG</label>
+                    <input type="radio" class="btn-check" id="info" autocomplete="off">
+                    <label class="btn btn-sm btn-outline-success" for="info">INFO</label>
+                    <input type="radio" class="btn-check" id="warn" autocomplete="off">
+                    <label class="btn btn-sm btn-outline-warning" for="warn">WARN</label>
+                    <input type="radio" class="btn-check" id="error" autocomplete="off">
+                    <label class="btn btn-sm btn-outline-danger" for="error">ERROR</label>
+                </div>
+            </div>
+        </template>
+    </div>
+</div>
\ No newline at end of file
diff --git a/ui/modules/operations/operations.js b/ui/modules/operations/operations.js
new file mode 100644
index 00000000000..ad16a6690ed
--- /dev/null
+++ b/ui/modules/operations/operations.js
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+/* eslint-disable arrow-parens */
+/* eslint-disable prefer-const */
+/* eslint-disable require-jsdoc */
+import * as API from '../api.js';
+import * as Utils from '../utils.js';
+import {TabHandler} from '../utils/tabHandler.js';
+
+let dom = {
+  buttonLoadAllLogLevels: null,
+  divLoggers: null,
+  templateLogger: null,
+  tabOperations: null,
+  collapseOperations: null,
+};
+
+export async function ready() {
+  Utils.getAllElementsById(dom);
+  new TabHandler(dom.tabOperations, dom.collapseOperations, loadAllLogLevels, 'disableOperations');
+
+  dom.buttonLoadAllLogLevels.onclick = loadAllLogLevels;
+}
+
+function onUpdateLoggingClick(service, logConfig) {
+  API.callDittoREST('PUT', '/devops/logging/' + service, logConfig, null, false, true)
+      .then(() => {
+        loadAllLogLevels();
+      });
+}
+
+function loadAllLogLevels() {
+  API.callDittoREST('GET', '/devops/logging', null, null, false, true)
+      .then((result) => createLoggerView(result))
+      .catch((error) => {
+        dom.divLoggers.innerHTML = '';
+      });
+}
+
+function createLoggerView(allLogLevels) {
+  dom.divLoggers.innerHTML = '';
+  Object.keys(allLogLevels).sort().forEach((service, i) => {
+    addHeading(service, i);
+    Object.values(allLogLevels[service])[0].loggerConfigs.forEach((logConfig) => {
+      addLoggerRowForConfig(service, logConfig);
+    });
+    addLoggerRowForNew(service);
+  });
+
+  function addHeading(service, i) {
+    let heading = document.createElement('h6');
+    heading.innerText = service;
+    if (i > 0) {
+      heading.classList.add('mt-3');
+    }
+    dom.divLoggers.append(heading);
+  }
+
+  function addLoggerRowForConfig(service, logConfig) {
+    let row = document.createElement('div');
+    row.attachShadow({mode: 'open'});
+    row.shadowRoot.append(dom.templateLogger.content.cloneNode(true));
+    row.shadowRoot.getElementById('inputLogger').value = logConfig.logger;
+    row.shadowRoot.getElementById(logConfig.level).setAttribute('checked', '');
+    Array.from(row.shadowRoot.querySelectorAll('.btn-check')).forEach((btn) => {
+      btn.addEventListener('click', (event) => onUpdateLoggingClick(service, {
+        logger: logConfig.logger,
+        level: event.target.id,
+      }));
+    });
+    dom.divLoggers.append(row);
+  }
+
+  function addLoggerRowForNew(service) {
+    let newLoggerRow = document.createElement('div');
+    newLoggerRow.attachShadow({mode: 'open'});
+    newLoggerRow.shadowRoot.append(dom.templateLogger.content.cloneNode(true));
+    let inputLoggerElement = newLoggerRow.shadowRoot.getElementById('inputLogger');
+    inputLoggerElement.disabled = false;
+    inputLoggerElement.placeholder = 'Add new logger name and choose log level';
+    Array.from(newLoggerRow.shadowRoot.querySelectorAll('.btn-check')).forEach((btn) => {
+      btn.addEventListener('click', (event) => onUpdateLoggingClick(service, {
+        logger: inputLoggerElement.value,
+        level: event.target.id,
+      }));
+    });
+    dom.divLoggers.append(newLoggerRow);
+  }
+}
diff --git a/ui/modules/policies/policies.js b/ui/modules/policies/policies.js
index d739948dd44..872da1f8359 100644
--- a/ui/modules/policies/policies.js
+++ b/ui/modules/policies/policies.js
@@ -4,8 +4,8 @@
 /* eslint-disable require-jsdoc */
 import * as Utils from '../utils.js';
 import * as API from '../api.js';
-import * as Environments from '../environments/environments.js';
 import * as Things from '../things/things.js';
+import {TabHandler} from '../utils/tabHandler.js';
 
 let thePolicy;
 let selectedEntry;
@@ -14,6 +14,8 @@ let selectedResource;
 
 let policyTemplates;
 
+let tabHandler;
+
 let dom = {
   inputPolicyId: null,
   inputPolicyEntry: null,
@@ -44,9 +46,9 @@ let subjectEditor;
 let resourceEditor;
 
 export function ready() {
-  Environments.addChangeListener(onEnvironmentChanged);
-
   Utils.getAllElementsById(dom);
+  tabHandler = new TabHandler(dom.tabPolicies, dom.collapsePolicies, refreshAll, 'disablePolicies');
+
 
   loadPolicyTemplates();
 
@@ -57,8 +59,6 @@ export function ready() {
   subjectEditor = Utils.createAceEditor('subjectEditor', 'ace/mode/json');
   resourceEditor = Utils.createAceEditor('resourceEditor', 'ace/mode/json');
 
-  dom.tabPolicies.onclick = onTabActivated;
-
   dom.buttonLoadPolicy.onclick = () => {
     Utils.assert(dom.inputPolicyId.value, 'Please enter a policyId', dom.inputPolicyId);
     refreshPolicy(dom.inputPolicyId.value);
@@ -220,7 +220,7 @@ function validations(entryFilled, entrySelected, subjectFilled, subjectSelected,
 
 function onThingChanged(thing) {
   dom.inputPolicyId.value = (thing && thing.policyId) ? thing.policyId : null;
-  viewDirty = true;
+  tabHandler.viewDirty = true;
 }
 
 function refreshWhoAmI() {
@@ -311,26 +311,13 @@ function modifyPolicyEntry(type, key, value) {
   ).then(() => refreshPolicy(thePolicy.policyId));
 };
 
-let viewDirty = false;
-
-function onTabActivated() {
-  if (viewDirty) {
-    refreshWhoAmI();
-    if (dom.inputPolicyId.value) {
-      refreshPolicy(dom.inputPolicyId.value);
-    }
-    viewDirty = false;
-  }
-}
-
-function onEnvironmentChanged(modifiedField) {
-  if (!['pinnedThings', 'filterList', 'authorization'].includes(modifiedField)) {
+function refreshAll(otherEnvironment) {
+  refreshWhoAmI();
+  if (otherEnvironment) {
     setThePolicy(null);
   }
-  if (dom.collapsePolicies.classList.contains('show')) {
-    refreshWhoAmI();
-  } else {
-    viewDirty = true;
+  if (dom.inputPolicyId.value) {
+    refreshPolicy(dom.inputPolicyId.value);
   }
 }
 
diff --git a/ui/modules/things/attributes.js b/ui/modules/things/attributes.js
index d851e73a56a..2b61dca1a34 100644
--- a/ui/modules/things/attributes.js
+++ b/ui/modules/things/attributes.js
@@ -160,7 +160,7 @@ function attributeFromString(attribute) {
 }
 
 function onEditToggle(event) {
-  const isEditing = event.detail;
+  const isEditing = event.detail.isEditing;
   dom.inputAttributeValue.disabled = !isEditing;
   if (isEditing && dom.crudAttribute.idValue && dom.crudAttribute.idValue !== '') {
     API.callDittoREST('GET', `/things/${Things.theThing.thingId}/attributes/${dom.crudAttribute.idValue}`,
diff --git a/ui/modules/things/features.js b/ui/modules/things/features.js
index b81c845c1c0..fcb7f3c3b14 100644
--- a/ui/modules/things/features.js
+++ b/ui/modules/things/features.js
@@ -230,7 +230,7 @@ function onThingChanged(thing) {
 }
 
 function onEditToggle(event) {
-  const isEditing = event.detail;
+  const isEditing = event.detail.isEditing;
   if (isEditing && dom.crudFeature.idValue && dom.crudFeature.idValue !== '') {
     API.callDittoREST('GET', `/things/${Things.theThing.thingId}/features/${dom.crudFeature.idValue}`, null, null, true)
         .then((response) => {
diff --git a/ui/modules/things/things.js b/ui/modules/things/things.js
index 2c0aaa2a487..f259369843a 100644
--- a/ui/modules/things/things.js
+++ b/ui/modules/things/things.js
@@ -1,3 +1,4 @@
+/* eslint-disable new-cap */
 /*
 * Copyright (c) 2022 Contributors to the Eclipse Foundation
 *
@@ -14,8 +15,8 @@
 // @ts-check
 import * as API from '../api.js';
 
-import * as Environments from '../environments/environments.js';
 import * as Utils from '../utils.js';
+import {TabHandler} from '../utils/tabHandler.js';
 import * as ThingsSearch from './thingsSearch.js';
 
 export let theThing;
@@ -39,11 +40,8 @@ export function addChangeListener(observer) {
  * Initializes components. Should be called after DOMContentLoaded event
  */
 export async function ready() {
-  Environments.addChangeListener(onEnvironmentChanged);
-
   Utils.getAllElementsById(dom);
-
-  dom.tabThings.onclick = onTabActivated;
+  TabHandler(dom.tabThings, dom.collapseThings, refreshView);
 }
 
 /**
@@ -73,26 +71,6 @@ export function setTheThing(thingJson) {
   observers.forEach((observer) => observer.call(null, theThing, isNewThingId));
 }
 
-let viewDirty = false;
-
-function onTabActivated() {
-  if (viewDirty) {
-    refreshView();
-    viewDirty = false;
-  }
-  // dom.searchFilterEdit.focus();
-}
-
-function onEnvironmentChanged(modifiedField) {
-  if (!['pinnedThings', 'filterList', 'messageTemplates'].includes(modifiedField)) {
-    if (dom.collapseThings.classList.contains('show')) {
-      refreshView();
-    } else {
-      viewDirty = true;
-    }
-  }
-}
-
 function refreshView() {
   ThingsSearch.performLastSearch();
 }
diff --git a/ui/modules/things/thingsCRUD.js b/ui/modules/things/thingsCRUD.js
index 4be416be9d9..5f5fdb96449 100644
--- a/ui/modules/things/thingsCRUD.js
+++ b/ui/modules/things/thingsCRUD.js
@@ -165,7 +165,7 @@ function onThingChanged(thingJson) {
 }
 
 function onEditToggle(event) {
-  const isEditing = event.detail;
+  const isEditing = event.detail.isEditing;
   if (isEditing && Things.theThing) {
     API.callDittoREST('GET', `/things/${Things.theThing.thingId}`, null, null, true)
         .then((response) => {
diff --git a/ui/modules/utils.js b/ui/modules/utils.js
index 6b69fff8eb5..7ebca92c458 100644
--- a/ui/modules/utils.js
+++ b/ui/modules/utils.js
@@ -33,6 +33,7 @@ export function ready() {
  * @param {boolean} selected if true, the new row will be marked as selected
  * @param {boolean} withClipBoardCopy add a clipboard button at the last column of the row
  * @param {array} columnValues texts for additional columns of the row
+ * @return {Element} created row
  */
 export const addTableRow = function(table, key, selected, withClipBoardCopy, ...columnValues) {
   const row = table.insertRow();
@@ -47,6 +48,7 @@ export const addTableRow = function(table, key, selected, withClipBoardCopy, ...
   if (withClipBoardCopy) {
     addClipboardCopyToRow(row);
   }
+  return row;
 };
 
 /**
diff --git a/ui/modules/utils/crudToolbar.js b/ui/modules/utils/crudToolbar.js
index 8ac04543bdd..de9939b2fab 100644
--- a/ui/modules/utils/crudToolbar.js
+++ b/ui/modules/utils/crudToolbar.js
@@ -16,10 +16,12 @@ import * as Utils from '../utils.js';
 class CrudToolbar extends HTMLElement {
   isEditing = false;
   isEditDisabled = false;
+  isCreateDisabled = false;
+  isDeleteDisabled = false;
   dom = {
     label: null,
     inputIdValue: null,
-    buttonCrudEdit: null,
+    buttonEdit: null,
     buttonCreate: null,
     buttonUpdate: null,
     buttonDelete: null,
@@ -33,7 +35,7 @@ class CrudToolbar extends HTMLElement {
 
   set idValue(newValue) {
     this.dom.inputIdValue.value = newValue;
-    if (newValue && newValue !== '') {
+    if (!this.isDeleteDisabled && newValue && newValue !== '') {
       this.dom.buttonDelete.removeAttribute('hidden');
     } else {
       this.dom.buttonDelete.setAttribute('hidden', '');
@@ -44,17 +46,30 @@ class CrudToolbar extends HTMLElement {
     return this.isEditDisabled;
   }
 
+  set createDisabled(newValue) {
+    this.isCreateDisabled = newValue;
+    this.setButtonState(this.dom.buttonCreate, newValue);
+  }
+
+  set deleteDisabled(newValue) {
+    this.isDeleteDisabled = newValue;
+    this.setButtonState(this.dom.buttonDelete, newValue);
+  }
+
   set editDisabled(newValue) {
     this.isEditDisabled = newValue;
     if (!this.isEditing) {
-      if (this.isEditDisabled) {
-        this.dom.buttonCrudEdit.setAttribute('hidden', '');
-      } else {
-        this.dom.buttonCrudEdit.removeAttribute('hidden');
-      }
+      this.setButtonState(this.dom.buttonEdit, newValue);
     }
   }
 
+  setButtonState(button, isDisabled) {
+    if (isDisabled) {
+      button.setAttribute('hidden', '');
+    } else {
+      button.removeAttribute('hidden');
+    }
+  }
   get validationElement() {
     return this.dom.inputIdValue;
   }
@@ -68,8 +83,8 @@ class CrudToolbar extends HTMLElement {
     this.shadowRoot.append(document.getElementById('templateCrudToolbar').content.cloneNode(true));
     setTimeout(() => {
       Utils.getAllElementsById(this.dom, this.shadowRoot);
-      this.dom.buttonCrudEdit.onclick = () => this.toggleEdit();
-      this.dom.buttonCancel.onclick = () => this.toggleEdit();
+      this.dom.buttonEdit.onclick = () => this.toggleEdit(false);
+      this.dom.buttonCancel.onclick = () => this.toggleEdit(true);
       this.dom.label.innerText = this.getAttribute('label') || 'Label';
       this.dom.buttonCreate.onclick = this.eventDispatcher('onCreateClick');
       this.dom.buttonUpdate.onclick = this.eventDispatcher('onUpdateClick');
@@ -85,22 +100,22 @@ class CrudToolbar extends HTMLElement {
     };
   }
 
-  toggleEdit() {
+  toggleEdit(isCancel) {
     this.isEditing = !this.isEditing;
     document.getElementById('modalCrudEdit').classList.toggle('editBackground');
     this.dom.divRoot.classList.toggle('editForground');
 
     if (this.isEditing || this.isEditDisabled) {
-      this.dom.buttonCrudEdit.setAttribute('hidden', '');
+      this.dom.buttonEdit.setAttribute('hidden', '');
     } else {
-      this.dom.buttonCrudEdit.removeAttribute('hidden');
+      this.dom.buttonEdit.removeAttribute('hidden');
     }
     this.dom.buttonCancel.toggleAttribute('hidden');
 
     if (this.isEditing) {
       if (this.dom.inputIdValue.value) {
         this.dom.buttonUpdate.toggleAttribute('hidden');
-      } else {
+      } else if (!this.isCreateDisabled) {
         this.dom.buttonCreate.toggleAttribute('hidden');
       }
     } else {
@@ -114,7 +129,10 @@ class CrudToolbar extends HTMLElement {
     this.dom.inputIdValue.disabled = !allowIdChange;
     this.dispatchEvent(new CustomEvent('onEditToggle', {
       composed: true,
-      detail: this.isEditing,
+      detail: {
+        isEditing: this.isEditing,
+        isCancel: isCancel,
+      },
     }));
   }
 }
diff --git a/ui/modules/utils/tabHandler.js b/ui/modules/utils/tabHandler.js
new file mode 100644
index 00000000000..be7b5a4f746
--- /dev/null
+++ b/ui/modules/utils/tabHandler.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+/* eslint-disable require-jsdoc */
+import * as Environments from '../environments/environments.js';
+import * as Authorization from '../environments/authorization.js';
+
+export function TabHandler(domTabItem, domTabContent, onRefreshTab, envDisabledKey) {
+  const _domTabItem = domTabItem;
+  const _domTabContent = domTabContent;
+  const _refreshTab = onRefreshTab;
+  const _envDisabledKey = envDisabledKey;
+  let viewDirty = false;
+
+  _domTabItem.addEventListener('click', onTabActivated);
+  Environments.addChangeListener(onEnvironmentChanged);
+
+  return {
+    set viewDirty(newValue) {
+      viewDirty = newValue;
+    },
+  };
+
+  function onTabActivated() {
+    Authorization.setForDevops(_domTabItem.dataset.auth === 'devOps');
+
+    if (viewDirty) {
+      _refreshTab.call(null, false);
+      viewDirty = false;
+    }
+  }
+
+  function onEnvironmentChanged(modifiedField) {
+    _domTabItem.toggleAttribute('hidden', Environments.current()[_envDisabledKey] ?? false);
+    if (!['pinnedThings', 'filterList', 'messageTemplates'].includes(modifiedField)) {
+      if (_domTabContent.classList.contains('show')) {
+        _refreshTab.call(null, true);
+      } else {
+        viewDirty = true;
+      }
+    }
+  }
+}
+
+
diff --git a/ui/templates/environmentTemplates.json b/ui/templates/environmentTemplates.json
index 5bca6192b7c..3621c71123e 100644
--- a/ui/templates/environmentTemplates.json
+++ b/ui/templates/environmentTemplates.json
@@ -30,6 +30,8 @@
     "defaultDittoPreAuthenticatedUsername": null,
     "defaultUsernamePasswordDevOps": null,
     "mainAuth": "basic",
-    "devopsAuth": null
+    "devopsAuth": null,
+    "disableConnections": true,
+    "disableOperations": true  
   }
 }
\ No newline at end of file

From 44da4ebf7f4bdbeed8b6039e7b4de7036fc00cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Sat, 1 Apr 2023 11:13:14 +0200
Subject: [PATCH 076/173] fix in UI that "bearerDevOps" token is stored to
 local storage * fallback to display connection "id" if no "name" is present
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 ui/modules/connections/connections.js   | 2 +-
 ui/modules/environments/environments.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/modules/connections/connections.js b/ui/modules/connections/connections.js
index 48a3b9870e0..e5c8179b09e 100644
--- a/ui/modules/connections/connections.js
+++ b/ui/modules/connections/connections.js
@@ -67,7 +67,7 @@ export function loadConnections() {
         },
         id);
       } else {
-        row.insertCell(0).innerHTML = connection.name;
+        row.insertCell(0).innerHTML = connection.name ? connection.name : id;
       }
       API.callConnectionsAPI('retrieveStatus', (status) => {
         row.insertCell(-1).innerHTML = status.liveStatus;
diff --git a/ui/modules/environments/environments.js b/ui/modules/environments/environments.js
index 827d73381a1..dcbb571ed59 100644
--- a/ui/modules/environments/environments.js
+++ b/ui/modules/environments/environments.js
@@ -50,6 +50,10 @@ function Environment(env) {
       enumerable: false,
       writable: true,
     },
+    bearerDevOps: {
+      enumerable: false,
+      writable: true,
+    },
     usernamePassword: {
       value: this.defaultUsernamePassword,
       enumerable: false,

From 7978a29805843c11364740838efb65f506eb7f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Sat, 1 Apr 2023 11:27:27 +0200
Subject: [PATCH 077/173] provide release notes for Ditto 3.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../_data/sidebars/ditto_sidebar.yml          | 21 ++++----
 .../pages/ditto/release_notes_321.md          | 53 +++++++++++++++++++
 2 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 documentation/src/main/resources/pages/ditto/release_notes_321.md

diff --git a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
index 2dec4961e8d..1a08a3122fa 100644
--- a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
+++ b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
@@ -23,6 +23,9 @@ entries:
       - title: Release Notes
         output: web
         folderitems:
+          - title: 3.2.1
+            url: /release_notes_321.html
+            output: web
           - title: 3.2.0
             url: /release_notes_320.html
             output: web
@@ -38,20 +41,20 @@ entries:
           - title: 3.0.0
             url: /release_notes_300.html
             output: web
-          - title: 2.4.2
-            url: /release_notes_242.html
-            output: web
-          - title: 2.4.1
-            url: /release_notes_241.html
-            output: web
-          - title: 2.4.0
-            url: /release_notes_240.html
-            output: web
 
             subfolders:
               - title: Archive
                 output: web
                 subfolderitems:
+                  - title: 2.4.2
+                    url: /release_notes_242.html
+                    output: web
+                  - title: 2.4.1
+                    url: /release_notes_241.html
+                    output: web
+                  - title: 2.4.0
+                    url: /release_notes_240.html
+                    output: web
                   - title: 2.3.2
                     url: /release_notes_232.html
                     output: web
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_321.md b/documentation/src/main/resources/pages/ditto/release_notes_321.md
new file mode 100644
index 00000000000..cb2b78547dd
--- /dev/null
+++ b/documentation/src/main/resources/pages/ditto/release_notes_321.md
@@ -0,0 +1,53 @@
+---
+title: Release notes 3.2.1
+tags: [release_notes]
+published: true
+keywords: release notes, announcements, changelog
+summary: "Version 3.2.1 of Eclipse Ditto, released on 01.04.2023"
+permalink: release_notes_321.html
+---
+
+This is a bugfix release, no new features since [3.2.0](release_notes_320.html) were added.
+
+## Changelog
+
+Compared to the latest release [3.2.0](release_notes_320.html), the following changes and bugfixes were added.
+
+### Changes
+
+#### [UI - New Operations tab](https://github.com/eclipse-ditto/ditto/pull/1600)
+
+The Ditto UI was enhanced with a new "Operation" tab where the log levels of the Ditto installation can be adjusted
+on-the-fly without restarting anything.  
+This functionality was already existing in the "devops" API and now has been exposed to the Ditto UI.
+
+
+### Bugfixes
+
+This is a complete list of the
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A3.2.1).
+
+#### [Don't use WARN log level when no policy is rolled back](https://github.com/eclipse-ditto/ditto/pull/1604)
+
+Added in Ditto 3.2.0, a policy is rolled back when it was implicitly created as part of a thing creation which failed
+for whatever reasons.  
+The `WARN` log message is however logged too many times, even if no policy was created and will be rolled back.  
+This was fixed.
+
+#### [Change notification filtering doesn't work for desired properties changes](https://github.com/eclipse-ditto/ditto/issues/1599)
+
+Desired properties were not mapped correctly when converting "thing events" to "things" and therefore filtering on 
+desired properties in e.g. connections, filtering on events, did not work.  
+This has been fixed.
+
+#### [Fix reading configured WoT TD "json template" from system property](https://github.com/eclipse-ditto/ditto/pull/1601)
+
+The system property to define a WoT TD template at property path `ditto.things.wot.to-thing-description.json-template`
+was not correctly rendered as Json Object if configured.  
+This has been fixed and can now be configured.
+
+#### [Enforcer actor ack time out handled in atomic thing create context](https://github.com/eclipse-ditto/ditto/pull/1598)
+
+Under heavy load it could happen that the policy caches in Thing "Enforcement" was misbehaving or were not correctly 
+invalidated which could lead to that creation of new things with implicit policy creation failed.  
+This has been fixed.

From b842d80be55bbaeadd2e9e8d78abbf672bbbb037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 4 Apr 2023 17:56:50 +0200
Subject: [PATCH 078/173] #1593 support removing existing fields from a JSON
 object in a merge patch using a regular expression
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../resources/pages/ditto/httpapi-concepts.md | 76 ++++++++++++++++++
 .../eclipse/ditto/json/JsonMergePatch.java    | 31 +++++++-
 .../ditto/json/JsonMergePatchTest.java        | 77 +++++++++++++++++++
 3 files changed, 183 insertions(+), 1 deletion(-)

diff --git a/documentation/src/main/resources/pages/ditto/httpapi-concepts.md b/documentation/src/main/resources/pages/ditto/httpapi-concepts.md
index b0f56375ff4..b614ecf9670 100644
--- a/documentation/src/main/resources/pages/ditto/httpapi-concepts.md
+++ b/documentation/src/main/resources/pages/ditto/httpapi-concepts.md
@@ -393,6 +393,82 @@ interpreted as delete in contrast to `PUT` requests where `null` values have no
 Like `PUT` requests, `PATCH` requests can be applied at any level of the JSON structure of a thing, e.g. patching a
 complete thing at root level or patching a single property value at property level.
 
+### Removing fields in a merge update with a regex
+
+{% include note.html content="This is an addition to the JSON merge patch (RFC-7396), enhancing using `null` values
+    for deleting certain parts of JSON objects specified with a regular expression before applying new fields to it." %}
+
+The merge patch functionality in Ditto solves a common problem to the JSON merge patch (RFC-7396): whenever a JSON object
+shall be patched, all the old json fields are merged with all the new json fields, unless the exact field names are 
+specified in the patch with `"<field>": null`.  
+This would however require to know all existing fields upfront, which for a merge patch can not be assumed.
+
+The solution is a little enhancement to Ditto's merge patch functionality: The ability to delete arbitrary parts from
+JSON objects using a regular expression **before** applying all other patch values.
+
+The syntax for this function is rather specific (so that no "normally" occurring JSON keys match the same syntax):
+```json
+{
+  "{%raw%}{{ /.*/ }}{%endraw%}": null
+}
+```
+
+When such a `{%raw%}{{ /<regex>/ }}{%endraw%}` with the value `null` is detected in the merge patch, the content between the 2 `/` is 
+interpreted as regular expression to apply for finding keys to delete from the target object.  
+As a result, using `"{%raw%}{{ /.*/ }}{%endraw%}": null` would delete all the values inside a JSON object before applying the new 
+values provided in the patch.
+
+Example:  
+Assuming that inside a JSON object every month some aggregated data is stored with the year and month:  
+```json
+{
+  "thingId": "{thingId}",
+  "policyId": "{policyId}",
+  "features": {
+    "aggregated-history": {
+      "properties": {
+        "2022-11": 42.3,
+        "2022-12": 54.3,
+        "2023-01": 80.2,
+        "2023-02": 99.9
+      }
+    }
+  }
+}
+```
+
+Then the data from "last year" could be purged with the following patch, while adding a new value to the existing ones
+of this year:
+```json
+{
+  "features": {
+    "aggregated-history": {
+      "properties": {
+        "{%raw%}{{ /2022-.*/ }}{%endraw%}": null,
+        "2023-03": 105.21
+      }
+    }
+  }
+}
+```
+
+The resulting Thing JSON after applying the patch would then look like:
+```json
+{
+  "thingId": "{thingId}",
+  "policyId": "{policyId}",
+  "features": {
+    "aggregated-history": {
+      "properties": {
+        "2023-01": 80.2,
+        "2023-02": 99.9,
+        "2023-03": 105.21
+      }
+    }
+  }
+}
+```
+
 ### Permissions required for merge update
 
 To successfully execute merge update the authorized subject needs to have *WRITE* permission on *all* resources 
diff --git a/json/src/main/java/org/eclipse/ditto/json/JsonMergePatch.java b/json/src/main/java/org/eclipse/ditto/json/JsonMergePatch.java
index d1dee2ac365..415ecfac596 100644
--- a/json/src/main/java/org/eclipse/ditto/json/JsonMergePatch.java
+++ b/json/src/main/java/org/eclipse/ditto/json/JsonMergePatch.java
@@ -12,9 +12,11 @@
  */
 package org.eclipse.ditto.json;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
@@ -165,9 +167,11 @@ private static JsonObject mergeJsonObjects(final JsonObject jsonObject1, final J
             }
         });
 
+        final List<JsonKey> toBeNulledKeysByRegex = determineToBeNulledKeysByRegex(jsonObject1, jsonObject2);
+
         // add fields of jsonObject2 not present in jsonObject1
         jsonObject2.forEach(jsonField -> {
-            if (!jsonObject1.contains(jsonField.getKey())) {
+            if (!jsonObject1.contains(jsonField.getKey()) && !toBeNulledKeysByRegex.contains(jsonField.getKey())) {
                 builder.set(jsonField);
             }
         });
@@ -175,6 +179,31 @@ private static JsonObject mergeJsonObjects(final JsonObject jsonObject1, final J
         return builder.build();
     }
 
+    private static List<JsonKey> determineToBeNulledKeysByRegex(
+            final JsonObject jsonObject1,
+            final JsonObject jsonObject2) {
+
+        final List<JsonKey> toBeNulledKeysByRegex = new ArrayList<>();
+        final List<JsonKey> keyRegexes = jsonObject1.getKeys().stream()
+                .filter(key -> key.toString().startsWith("{{") && key.toString().endsWith("}}"))
+                .collect(Collectors.toList());
+        keyRegexes.forEach(keyRegex -> {
+            final String keyRegexWithoutCurly = keyRegex.toString().substring(2, keyRegex.length() - 2).trim();
+            if (keyRegexWithoutCurly.startsWith("/") && keyRegexWithoutCurly.endsWith("/")) {
+                final String regexStr = keyRegexWithoutCurly.substring(1, keyRegexWithoutCurly.length() - 1);
+                final Pattern pattern = Pattern.compile(regexStr);
+                jsonObject1.getValue(keyRegex)
+                        .filter(JsonValue::isNull) // only support deletion via regex, so only support "null" values
+                        .ifPresent(keyRegexValue ->
+                                jsonObject2.getKeys().stream()
+                                        .filter(key -> pattern.matcher(key).matches())
+                                        .forEach(toBeNulledKeysByRegex::add)
+                );
+            }
+        });
+        return toBeNulledKeysByRegex;
+    }
+
     /**
      * Applies this merge patch on the given json value.
      *
diff --git a/json/src/test/java/org/eclipse/ditto/json/JsonMergePatchTest.java b/json/src/test/java/org/eclipse/ditto/json/JsonMergePatchTest.java
index 2e699e28ae6..f21da4bafa4 100644
--- a/json/src/test/java/org/eclipse/ditto/json/JsonMergePatchTest.java
+++ b/json/src/test/java/org/eclipse/ditto/json/JsonMergePatchTest.java
@@ -447,4 +447,81 @@ public void mergeFieldsFromBothObjectsRFC7396_TestCase13() {
         Assertions.assertThat(mergedObject).isEqualTo(expectedObject);
     }
 
+    @Test
+    public void removeFieldsUsingRegexWithNullValue() {
+        final JsonObject originalObject = JsonFactory.newObjectBuilder()
+                .set("a", JsonFactory.newObjectBuilder()
+                        .set("2023-04-01", JsonValue.of(true))
+                        .set("2023-04-02", JsonValue.of("hello"))
+                        .set("2023-04-03", JsonValue.of("darkness"))
+                        .set("2023-04-04", JsonValue.of("my"))
+                        .set("2023-04-05", JsonValue.of("old"))
+                        .set("2023-04-06", JsonValue.of("friend"))
+                        .build())
+                .set("b", JsonFactory.newObjectBuilder()
+                        .set("2023-04-01", JsonValue.of(true))
+                        .set("2023-04-02", JsonValue.of("hello"))
+                        .set("2023-04-03", JsonValue.of("darkness"))
+                        .set("2023-04-04", JsonValue.of("my"))
+                        .set("2023-04-05", JsonValue.of("old"))
+                        .set("2023-04-06", JsonValue.of("friend"))
+                        .build())
+                .set("c", JsonFactory.newObjectBuilder()
+                        .set("some", JsonValue.of(true))
+                        .set("2023-04-02", JsonValue.of("hello"))
+                        .set("totally-other", JsonValue.of("darkness"))
+                        .set("foo", JsonValue.of("my"))
+                        .build())
+                .build();
+
+        final JsonObject objectToPatch = JsonFactory.newObjectBuilder()
+                .set("a", JsonFactory.newObjectBuilder()
+                        .set("{{ /2023-04-.*/ }}", JsonValue.nullLiteral())
+                        .set("2023-05-01", JsonValue.of("new"))
+                        .set("2023-05-02", JsonValue.of("catch"))
+                        .set("2023-05-03", JsonValue.of("phrase"))
+                        .build())
+                .set("b", JsonFactory.newObjectBuilder()
+                        .set("{{ /2023-04-01/ }}", JsonValue.nullLiteral())
+                        .set("{{ /^2023-04-03$/ }}", JsonValue.nullLiteral())
+                        .set("{{ /[0-9]{4}-04-.+4/ }}", JsonValue.nullLiteral())
+                        .set("2023-05-01", JsonValue.of("new"))
+                        .set("2023-05-02", JsonValue.of("catch"))
+                        .set("2023-05-03", JsonValue.of("phrase"))
+                        .build())
+                .set("c", JsonFactory.newObjectBuilder()
+                        .set("{{ /.*/ }}", JsonValue.nullLiteral())
+                        .set("2023-05-01", JsonValue.of("new"))
+                        .set("2023-05-02", JsonValue.of("catch"))
+                        .set("2023-05-03", JsonValue.of("phrase"))
+                        .build())
+                .build();
+
+        final JsonValue expectedObject = JsonFactory.newObjectBuilder()
+                .set("a", JsonFactory.newObjectBuilder()
+                        .set("2023-05-01", JsonValue.of("new"))
+                        .set("2023-05-02", JsonValue.of("catch"))
+                        .set("2023-05-03", JsonValue.of("phrase"))
+                        .build())
+                .set("b", JsonFactory.newObjectBuilder()
+                        .set("2023-04-02", JsonValue.of("hello"))
+                        .set("2023-04-05", JsonValue.of("old"))
+                        .set("2023-04-06", JsonValue.of("friend"))
+                        .set("2023-05-01", JsonValue.of("new"))
+                        .set("2023-05-02", JsonValue.of("catch"))
+                        .set("2023-05-03", JsonValue.of("phrase"))
+                        .build())
+                .set("c", JsonFactory.newObjectBuilder()
+                        .set("2023-05-01", JsonValue.of("new"))
+                        .set("2023-05-02", JsonValue.of("catch"))
+                        .set("2023-05-03", JsonValue.of("phrase"))
+                        .build())
+                .build();
+
+        final JsonValue mergedObject = JsonMergePatch.of(objectToPatch).applyOn(originalObject);
+
+        Assertions.assertThat(mergedObject).isEqualTo(expectedObject);
+    }
+
+
 }

From 5fe739f3c6b03241fbbb6ac5f477d47282f02e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 5 Apr 2023 11:56:19 +0200
Subject: [PATCH 079/173] #1593 added special "merge command" enforcement for
 patches including a regex: in that case, unrestricted WRITE access on the
 contained JSON object is required
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../enforcement/ThingCommandEnforcement.java  | 22 +++++++++-
 .../MergeThingCommandEnforcementTest.java     | 42 ++++++++++++++++++-
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java
index 85b7dbab646..45d6b6f1572 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java
@@ -37,6 +37,7 @@
 import org.eclipse.ditto.internal.utils.cacheloaders.config.AskWithRetryConfig;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonFieldSelector;
+import org.eclipse.ditto.json.JsonKey;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.JsonPointerInvalidException;
@@ -503,7 +504,15 @@ private static boolean enforceMergeThingCommand(final Enforcer enforcer,
     private static Set<ResourceKey> calculateLeaves(final JsonPointer path, final JsonValue value) {
         if (value.isObject()) {
             return value.asObject().stream()
-                    .map(f -> calculateLeaves(path.append(f.getKey().asPointer()), f.getValue()))
+                    .map(f -> {
+                        final JsonKey key = f.getKey();
+                        if (isMergeWithNulledKeysByRegex(key, f.getValue())) {
+                            // if regex is contained, writing all below that path must be granted in the policy:
+                            return Set.of(PoliciesResourceType.thingResource(path));
+                        } else {
+                            return calculateLeaves(path.append(key.asPointer()), f.getValue());
+                        }
+                    })
                     .reduce(new HashSet<>(), ThingCommandEnforcement::addAll, ThingCommandEnforcement::addAll);
         } else {
             return Set.of(PoliciesResourceType.thingResource(path));
@@ -515,4 +524,15 @@ private static Set<ResourceKey> addAll(final Set<ResourceKey> result, final Set<
         return result;
     }
 
+    private static boolean isMergeWithNulledKeysByRegex(final JsonKey key, final JsonValue value) {
+        final String keyString = key.toString();
+        if (keyString.startsWith("{{") && keyString.endsWith("}}")) {
+            final String keyRegexWithoutCurly = keyString.substring(2, keyString.length() - 2).trim();
+            return keyRegexWithoutCurly.startsWith("/") && keyRegexWithoutCurly.endsWith("/") &&
+                    value.isNull();
+        } else {
+            return false;
+        }
+    }
+
 }
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/MergeThingCommandEnforcementTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/MergeThingCommandEnforcementTest.java
index e1dec6f3477..29d6068b885 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/MergeThingCommandEnforcementTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/MergeThingCommandEnforcementTest.java
@@ -32,6 +32,7 @@
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.policies.model.EffectedPermissions;
 import org.eclipse.ditto.policies.model.PoliciesModelFactory;
 import org.eclipse.ditto.policies.model.Policy;
@@ -41,6 +42,7 @@
 import org.eclipse.ditto.things.api.Permission;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingNotModifiableException;
 import org.eclipse.ditto.things.model.signals.commands.modify.MergeThing;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -119,6 +121,44 @@ void rejectByPolicy(final TestArgument arg) {
                 () -> ThingCommandEnforcement.authorizeByPolicyOrThrow(policyEnforcer, arg.getMergeThing()));
     }
 
+    @Test
+    void acceptUsingRegexInPolicy() {
+        final TestArgument testArgument = TestArgument.of("/",
+                Set.of("/", "/attributes/complex"),
+                Set.of("/attributes/simple")
+        );
+        final TrieBasedPolicyEnforcer policyEnforcer = TrieBasedPolicyEnforcer.newInstance(testArgument.getPolicy());
+        final JsonObject patch = JsonObject.newBuilder()
+                .set("attributes", JsonObject.newBuilder()
+                        .set("complex", JsonObject.newBuilder()
+                                .set("{{ /.*/ }}", JsonValue.nullLiteral())
+                                .build()
+                        )
+                        .set("another", 42)
+                        .build())
+                .build();
+        final MergeThing mergeThing = MergeThing.of(TestSetup.THING_ID, JsonPointer.empty(), patch, TestArgument.headers());
+        final MergeThing authorizedMergeThing =
+                ThingCommandEnforcement.authorizeByPolicyOrThrow(policyEnforcer, mergeThing);
+        assertThat(authorizedMergeThing.getDittoHeaders().getAuthorizationContext()).isNotNull();
+    }
+
+    @Test
+    void rejectUsingRegexWithRevokesInPolicy() {
+        final TestArgument testArgument = TestArgument.of("/", Set.of("/"), Set.of("/attributes/complex/nested/secret"));
+        final TrieBasedPolicyEnforcer policyEnforcer = TrieBasedPolicyEnforcer.newInstance(testArgument.getPolicy());
+        final JsonObject patch = JsonObject.newBuilder()
+                .set("attributes", JsonObject.newBuilder()
+                        .set("{{ /.*/ }}", JsonValue.nullLiteral())
+                        .set("simple", "value")
+                        .set("another", 42)
+                        .build())
+                .build();
+        final MergeThing mergeThing = MergeThing.of(TestSetup.THING_ID, JsonPointer.empty(), patch, TestArgument.headers());
+        assertThatExceptionOfType(ThingNotModifiableException.class).isThrownBy(
+                () -> ThingCommandEnforcement.authorizeByPolicyOrThrow(policyEnforcer, mergeThing));
+    }
+
     /**
      * Generates combinations of a Policy and MergeThing commands that should be <b>accepted</b> by command enforcement.
      */
@@ -244,7 +284,7 @@ private static MergeThing toMergeCommand(final JsonPointer path, final JsonObjec
             return MergeThing.of(TestSetup.THING_ID, path, patch.getValue(path).orElseThrow(), headers());
         }
 
-        private static DittoHeaders headers() {
+        static DittoHeaders headers() {
             return DittoHeaders.newBuilder()
                     .authorizationContext(
                             AuthorizationContext.newInstance(DittoAuthorizationContextType.UNSPECIFIED,

From 0adc08b8731b6be68ef7c83d435c3332ce94fd67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Fri, 14 Apr 2023 11:32:05 +0200
Subject: [PATCH 080/173] #1614 enabled creating a thing for a "MergeThing"
 when it does not yet exist
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhanced ModifyToCreateThingTransformer to also handle "MergeThing" in addition to "ModifyThing"
* adjusted ThingsRoute to also support using "_policy" and "_copyPolicyFrom"

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../endpoints/routes/things/ThingsRoute.java  |   2 +
 .../ThingMergeCommandMappingStrategies.java   |  34 +++-
 .../signals/commands/modify/MergeThing.java   | 166 ++++++++++++++++--
 .../signals/commands/modify/ModifyThing.java  |   3 +-
 .../commands/modify/MergeThingTest.java       |   2 +-
 .../pre/ModifyToCreateThingTransformer.java   |  61 ++++---
 .../pre/ThingExistenceChecker.java            |   4 +-
 .../ModifyToCreateThingTransformerTest.java   |  32 ++++
 8 files changed, 256 insertions(+), 48 deletions(-)

diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRoute.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRoute.java
index 783c0fb5107..542e87b355a 100755
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRoute.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRoute.java
@@ -352,6 +352,8 @@ private Route thingsEntry(final RequestContext ctx, final DittoHeaders dittoHead
                                 payloadSource -> handlePerRequest(ctx, dittoHeaders, payloadSource,
                                         thingJson -> MergeThing.withThing(thingId,
                                                 thingFromJsonForPatch(thingJson, thingId, dittoHeaders),
+                                                createInlinePolicyJson(thingJson),
+                                                getCopyPolicyFrom(thingJson),
                                                 dittoHeaders)))
                         ),
                         // DELETE /things/<thingId>
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/ThingMergeCommandMappingStrategies.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/ThingMergeCommandMappingStrategies.java
index 82c755572aa..54826810938 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/ThingMergeCommandMappingStrategies.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mappingstrategies/ThingMergeCommandMappingStrategies.java
@@ -16,19 +16,22 @@
 import java.util.Map;
 import java.util.Optional;
 
-import org.eclipse.ditto.json.JsonPointer;
-import org.eclipse.ditto.json.JsonValue;
+import javax.annotation.Nullable;
+
 import org.eclipse.ditto.base.model.exceptions.UnsupportedMediaTypeException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.contenttype.ContentType;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.policies.model.PolicyId;
+import org.eclipse.ditto.protocol.Adaptable;
+import org.eclipse.ditto.protocol.JsonifiableMapper;
 import org.eclipse.ditto.things.model.Attributes;
 import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.things.model.ThingDefinition;
 import org.eclipse.ditto.things.model.ThingsModelFactory;
-import org.eclipse.ditto.protocol.Adaptable;
-import org.eclipse.ditto.protocol.JsonifiableMapper;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.PolicyIdNotDeletableException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingIdNotDeletableException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingMergeInvalidException;
@@ -70,7 +73,9 @@ private static Map<String, JsonifiableMapper<MergeThing>> initMappingStrategies(
 
     private static MergeThing mergeThing(final Adaptable adaptable) {
         checkContentTypeHeader(adaptable.getDittoHeaders());
-        return MergeThing.withThing(thingIdFrom(adaptable), thingForMergeFrom(adaptable), dittoHeadersFrom(adaptable));
+        return MergeThing.withThing(thingIdFrom(adaptable), thingForMergeFrom(adaptable),
+                initialPolicyForMergeThingFrom(adaptable), policyIdOrPlaceholderForMergeThingFrom(adaptable),
+                dittoHeadersFrom(adaptable));
     }
 
     private static MergeThing mergeThingWithPolicyId(final Adaptable adaptable) {
@@ -226,4 +231,23 @@ private static void checkContentTypeHeader(final DittoHeaders dittoHeaders) {
         }
     }
 
+    @Nullable
+    private static JsonObject initialPolicyForMergeThingFrom(final Adaptable adaptable) {
+        return adaptable.getPayload()
+                .getValue()
+                .filter(JsonValue::isObject)
+                .map(JsonValue::asObject)
+                .flatMap(MergeThing::initialPolicyForMergeThingFrom)
+                .orElse(null);
+    }
+
+    @Nullable
+    private static String policyIdOrPlaceholderForMergeThingFrom(final Adaptable adaptable) {
+        return adaptable.getPayload()
+                .getValue()
+                .filter(JsonValue::isObject)
+                .map(JsonValue::asObject)
+                .flatMap(MergeThing::policyIdOrPlaceholderForMergeThingFrom)
+                .orElse(null);
+    }
 }
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThing.java b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThing.java
index c64d31644da..1ea3f1162f9 100644
--- a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThing.java
+++ b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThing.java
@@ -21,6 +21,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.common.Placeholders;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonParsableCommand;
@@ -36,6 +37,7 @@
 import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.JsonValue;
+import org.eclipse.ditto.policies.model.Policy;
 import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.things.model.Attributes;
 import org.eclipse.ditto.things.model.AttributesModelFactory;
@@ -50,6 +52,7 @@
 import org.eclipse.ditto.things.model.signals.commands.ThingCommand;
 import org.eclipse.ditto.things.model.signals.commands.ThingCommandSizeValidator;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.AttributePointerInvalidException;
+import org.eclipse.ditto.things.model.signals.commands.exceptions.PoliciesConflictingException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingIdNotExplicitlySettableException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingMergeInvalidException;
 
@@ -75,16 +78,51 @@ public final class MergeThing extends AbstractCommand<MergeThing> implements Thi
      */
     public static final String TYPE = TYPE_PREFIX + NAME;
 
+    /**
+     * Json Field definition for the optional initial "inline" policy for usage in getEntity().
+     */
+    public static final JsonFieldDefinition<JsonObject> JSON_INLINE_POLICY =
+            JsonFactory.newJsonObjectFieldDefinition(Policy.INLINED_FIELD_NAME, FieldType.REGULAR, JsonSchemaVersion.V_2);
+
+    /**
+     * Json Field definition for the optional feature to copy an existing policy.
+     */
+    public static final JsonFieldDefinition<String> JSON_COPY_POLICY_FROM =
+            JsonFactory.newStringFieldDefinition("_copyPolicyFrom", FieldType.REGULAR, JsonSchemaVersion.V_2);
+
+    private static final JsonFieldDefinition<JsonObject> JSON_INITIAL_POLICY =
+            JsonFactory.newJsonObjectFieldDefinition("initialPolicy", FieldType.REGULAR, JsonSchemaVersion.V_2);
+
+    private static final JsonFieldDefinition<String> JSON_POLICY_ID_OR_PLACEHOLDER =
+            JsonFactory.newStringFieldDefinition("policyIdOrPlaceholder", FieldType.REGULAR, JsonSchemaVersion.V_2);
+
     private final ThingId thingId;
     private final JsonPointer path;
     private final JsonValue value;
 
+    @Nullable private final JsonObject initialPolicy;
+    @Nullable private final String policyIdOrPlaceholder;
+
     private MergeThing(final ThingId thingId, final JsonPointer path, final JsonValue value,
+            @Nullable final JsonObject initialPolicy,
+            @Nullable final String policyIdOrPlaceholder,
             final DittoHeaders dittoHeaders) {
         super(TYPE, FeatureToggle.checkMergeFeatureEnabled(TYPE, dittoHeaders));
         this.thingId = checkNotNull(thingId, "thingId");
         this.path = checkNotNull(path, "path");
         this.value = checkJsonSize(checkNotNull(value, "value"), dittoHeaders);
+
+        if (policyIdOrPlaceholder != null && initialPolicy != null) {
+            throw PoliciesConflictingException.newBuilder(thingId).dittoHeaders(dittoHeaders).build();
+        }
+
+        if (policyIdOrPlaceholder != null && !Placeholders.containsAnyPlaceholder(policyIdOrPlaceholder)) {
+            PolicyId.of(policyIdOrPlaceholder); //validates
+        }
+
+        this.initialPolicy = initialPolicy;
+        this.policyIdOrPlaceholder = policyIdOrPlaceholder;
+
         checkSchemaVersion();
     }
 
@@ -100,7 +138,15 @@ private MergeThing(final ThingId thingId, final JsonPointer path, final JsonValu
      */
     public static MergeThing of(final ThingId thingId, final JsonPointer path, final JsonValue value,
             final DittoHeaders dittoHeaders) {
-        return new MergeThing(thingId, path, value, dittoHeaders);
+        if (path.isEmpty() && value.isObject()) {
+            final JsonObject object = value.asObject();
+            final Optional<JsonObject> initialPolicy = initialPolicyForMergeThingFrom(object);
+            final Optional<String> policyIdOrPlaceholder = policyIdOrPlaceholderForMergeThingFrom(object);
+            return new MergeThing(thingId, path, value, initialPolicy.orElse(null),
+                    policyIdOrPlaceholder.orElse(null), dittoHeaders);
+        } else {
+            return new MergeThing(thingId, path, value, null, null, dittoHeaders);
+        }
     }
 
     /**
@@ -115,7 +161,32 @@ public static MergeThing withThing(final ThingId thingId, final Thing thing, fin
         ensureThingIdMatches(thingId, thing);
         ensureThingIsNotNullOrEmpty(thing, dittoHeaders);
         final JsonObject mergePatch = thing.toJson();
-        return new MergeThing(thingId, JsonPointer.empty(), mergePatch, dittoHeaders);
+        return new MergeThing(thingId, JsonPointer.empty(), mergePatch, null, null, dittoHeaders);
+    }
+
+    /**
+     * Creates a command for merging the thing identified by {@code thingId} with the given {@code thing}.
+     * Only one of the arguments initialPolicy and policyIdOrPlaceholder must not be null. They are both allowed to be
+     * null, but not both to not be null at the same time.
+     *
+     * @param thingId the thing id.
+     * @param thing the thing that is merged with the existing thing.
+     * @param policyIdOrPlaceholder the policy id of the {@code Policy} to copy and set for the Thing when creating it.
+     * If it's a placeholder it will be resolved to a policy id.
+     * Placeholder must be of the syntax: {@code {{ ref:things/<theThingId>/policyId }} }.
+     * @param initialPolicy the initial {@code Policy} to set for the Thing when creating it - may be null.
+     * @param dittoHeaders the ditto headers.
+     * @return the created {@link MergeThing} command.
+     * @since 3.3.0
+     */
+    public static MergeThing withThing(final ThingId thingId, final Thing thing,
+            @Nullable final JsonObject initialPolicy, @Nullable final String policyIdOrPlaceholder,
+            final DittoHeaders dittoHeaders) {
+        ensureThingIdMatches(thingId, thing);
+        ensureThingIsNotNullOrEmpty(thing, dittoHeaders);
+        final JsonObject mergePatch = thing.toJson();
+        return new MergeThing(thingId, JsonPointer.empty(), mergePatch, initialPolicy, policyIdOrPlaceholder,
+                dittoHeaders);
     }
 
     /**
@@ -129,7 +200,8 @@ public static MergeThing withThing(final ThingId thingId, final Thing thing, fin
     public static MergeThing withPolicyId(final ThingId thingId, final PolicyId policyId,
             final DittoHeaders dittoHeaders) {
         checkNotNull(policyId, "policyId");
-        return new MergeThing(thingId, Thing.JsonFields.POLICY_ID.getPointer(), JsonValue.of(policyId), dittoHeaders);
+        return new MergeThing(thingId, Thing.JsonFields.POLICY_ID.getPointer(), JsonValue.of(policyId),
+                null, null, dittoHeaders);
     }
 
     /**
@@ -143,7 +215,7 @@ public static MergeThing withPolicyId(final ThingId thingId, final PolicyId poli
     public static MergeThing withThingDefinition(final ThingId thingId, final ThingDefinition thingDefinition,
             final DittoHeaders dittoHeaders) {
         return new MergeThing(thingId, Thing.JsonFields.DEFINITION.getPointer(), thingDefinition.toJson(),
-                dittoHeaders);
+                null, null, dittoHeaders);
     }
 
     /**
@@ -156,7 +228,8 @@ public static MergeThing withThingDefinition(final ThingId thingId, final ThingD
      */
     public static MergeThing withAttributes(final ThingId thingId, final Attributes attributes,
             final DittoHeaders dittoHeaders) {
-        return new MergeThing(thingId, Thing.JsonFields.ATTRIBUTES.getPointer(), attributes.toJson(), dittoHeaders);
+        return new MergeThing(thingId, Thing.JsonFields.ATTRIBUTES.getPointer(), attributes.toJson(),
+                null, null, dittoHeaders);
     }
 
     /**
@@ -173,7 +246,7 @@ public static MergeThing withAttribute(final ThingId thingId, final JsonPointer
             final JsonValue attributeValue, final DittoHeaders dittoHeaders) {
         final JsonPointer absolutePath =
                 Thing.JsonFields.ATTRIBUTES.getPointer().append(checkAttributePointer(attributePath, dittoHeaders));
-        return new MergeThing(thingId, absolutePath, checkAttributeValue(attributeValue), dittoHeaders);
+        return new MergeThing(thingId, absolutePath, checkAttributeValue(attributeValue), null, null, dittoHeaders);
     }
 
     /**
@@ -187,7 +260,7 @@ public static MergeThing withAttribute(final ThingId thingId, final JsonPointer
     public static MergeThing withFeatures(final ThingId thingId, final Features features,
             final DittoHeaders dittoHeaders) {
         final JsonPointer absolutePath = Thing.JsonFields.FEATURES.getPointer();
-        return new MergeThing(thingId, absolutePath, features.toJson(), dittoHeaders);
+        return new MergeThing(thingId, absolutePath, features.toJson(), null, null, dittoHeaders);
     }
 
     /**
@@ -201,7 +274,7 @@ public static MergeThing withFeatures(final ThingId thingId, final Features feat
     public static MergeThing withFeature(final ThingId thingId, final Feature feature,
             final DittoHeaders dittoHeaders) {
         final JsonPointer absolutePath = Thing.JsonFields.FEATURES.getPointer().append(JsonPointer.of(feature.getId()));
-        return new MergeThing(thingId, absolutePath, feature.toJson(), dittoHeaders);
+        return new MergeThing(thingId, absolutePath, feature.toJson(), null, null, dittoHeaders);
     }
 
     /**
@@ -220,7 +293,7 @@ public static MergeThing withFeatureDefinition(final ThingId thingId,
         final JsonPointer absolutePath = Thing.JsonFields.FEATURES.getPointer()
                 .append(JsonPointer.of(featureId))
                 .append(Feature.JsonFields.DEFINITION.getPointer());
-        return new MergeThing(thingId, absolutePath, featureDefinition.toJson(), dittoHeaders);
+        return new MergeThing(thingId, absolutePath, featureDefinition.toJson(), null, null, dittoHeaders);
     }
 
     /**
@@ -239,7 +312,7 @@ public static MergeThing withFeatureProperties(final ThingId thingId,
         final JsonPointer absolutePath = Thing.JsonFields.FEATURES.getPointer()
                 .append(JsonPointer.of(featureId))
                 .append(Feature.JsonFields.PROPERTIES.getPointer());
-        return new MergeThing(thingId, absolutePath, featureProperties.toJson(), dittoHeaders);
+        return new MergeThing(thingId, absolutePath, featureProperties.toJson(), null, null, dittoHeaders);
     }
 
     /**
@@ -260,7 +333,7 @@ public static MergeThing withFeatureProperty(final ThingId thingId,
                 .append(JsonPointer.of(featureId))
                 .append(Feature.JsonFields.PROPERTIES.getPointer())
                 .append(checkPropertyPointer(propertyPath));
-        return new MergeThing(thingId, absolutePath, checkPropertyValue(propertyValue), dittoHeaders);
+        return new MergeThing(thingId, absolutePath, checkPropertyValue(propertyValue), null, null, dittoHeaders);
     }
 
     /**
@@ -279,7 +352,7 @@ public static MergeThing withFeatureDesiredProperties(final ThingId thingId,
         final JsonPointer absolutePath = Thing.JsonFields.FEATURES.getPointer()
                 .append(JsonPointer.of(featureId))
                 .append(Feature.JsonFields.DESIRED_PROPERTIES.getPointer());
-        return new MergeThing(thingId, absolutePath, desiredFeatureProperties.toJson(), dittoHeaders);
+        return new MergeThing(thingId, absolutePath, desiredFeatureProperties.toJson(), null, null, dittoHeaders);
     }
 
     /**
@@ -300,7 +373,30 @@ public static MergeThing withFeatureDesiredProperty(final ThingId thingId,
                 .append(JsonPointer.of(featureId))
                 .append(Feature.JsonFields.DESIRED_PROPERTIES.getPointer())
                 .append(checkPropertyPointer(propertyPath));
-        return new MergeThing(thingId, absolutePath, checkPropertyValue(propertyValue), dittoHeaders);
+        return new MergeThing(thingId, absolutePath, checkPropertyValue(propertyValue), null, null, dittoHeaders);
+    }
+
+    /**
+     * Retrieves a potentially included "inline policy" from the {@link #JSON_INLINE_POLICY _policy} field of the passed
+     * {@code jsonObject}.
+     *
+     * @param jsonObject the JSON object to look for an inline policy in.
+     * @return the potentially contained inline policy as JSON object.
+     */
+    public static Optional<JsonObject> initialPolicyForMergeThingFrom(final JsonObject jsonObject) {
+        return jsonObject.getValue(JSON_INLINE_POLICY)
+                .map(JsonValue::asObject);
+    }
+
+    /**
+     * Retrieves a potentially included "policy id or placeholder" to copy a policy from the
+     * {@link #JSON_COPY_POLICY_FROM _copyPolicyFrom} field of the passed {@code jsonObject}.
+     *
+     * @param jsonObject the JSON object to look for the policy id or placeholder in.
+     * @return the potentially contained policy id or placeholder.
+     */
+    public static Optional<String> policyIdOrPlaceholderForMergeThingFrom(final JsonObject jsonObject) {
+        return jsonObject.getValue(JSON_COPY_POLICY_FROM);
     }
 
     private static JsonPointer checkPropertyPointer(final JsonPointer propertyPointer) {
@@ -379,8 +475,11 @@ public static MergeThing fromJson(final JsonObject jsonObject, final DittoHeader
             final String thingId = jsonObject.getValueOrThrow(ThingCommand.JsonFields.JSON_THING_ID);
             final String path = jsonObject.getValueOrThrow(JsonFields.JSON_PATH);
             final JsonValue jsonValue = jsonObject.getValueOrThrow(JsonFields.JSON_VALUE);
+            final JsonObject initialPolicyObject = jsonObject.getValue(JSON_INITIAL_POLICY).orElse(null);
+            final String policyIdOrPlaceholder = jsonObject.getValue(JSON_POLICY_ID_OR_PLACEHOLDER).orElse(null);
 
-            return of(ThingId.of(thingId), JsonPointer.of(path), jsonValue, dittoHeaders);
+            return new MergeThing(ThingId.of(thingId), JsonPointer.of(path), jsonValue, initialPolicyObject,
+                    policyIdOrPlaceholder, dittoHeaders);
         });
     }
 
@@ -411,6 +510,23 @@ public JsonPointer getResourcePath() {
         return path;
     }
 
+    /**
+     * @return the initial {@code Policy} if there should be one applied when creating the Thing.
+     * @since 3.3.0
+     */
+    public Optional<JsonObject> getInitialPolicy() {
+        return Optional.ofNullable(initialPolicy);
+    }
+
+    /**
+     * @return The policy id of the {@code Policy} to copy and set for the Thing when creating it.
+     * Could also be a placeholder like: {{ ref:things/theThingId/policyId }}.
+     * @since 3.3.0
+     */
+    public Optional<String> getPolicyIdOrPlaceholder() {
+        return Optional.ofNullable(policyIdOrPlaceholder);
+    }
+
     @Override
     public boolean changesAuthorization() {
         return Thing.JsonFields.POLICY_ID.getPointer().equals(path) || path.isEmpty() && value.isObject() &&
@@ -419,12 +535,12 @@ public boolean changesAuthorization() {
 
     @Override
     public Category getCategory() {
-        return Category.MODIFY;
+        return Category.MERGE;
     }
 
     @Override
     public MergeThing setDittoHeaders(final DittoHeaders dittoHeaders) {
-        return of(thingId, path, value, dittoHeaders);
+        return new MergeThing(thingId, path, value, initialPolicy, policyIdOrPlaceholder, dittoHeaders);
     }
 
     @Override
@@ -434,6 +550,12 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
         jsonObjectBuilder.set(ThingCommand.JsonFields.JSON_THING_ID, thingId.toString(), predicate);
         jsonObjectBuilder.set(JsonFields.JSON_PATH, path.toString(), predicate);
         jsonObjectBuilder.set(JsonFields.JSON_VALUE, value, predicate);
+        if (initialPolicy != null) {
+            jsonObjectBuilder.set(JSON_INITIAL_POLICY, initialPolicy, predicate);
+        }
+        if (policyIdOrPlaceholder != null) {
+            jsonObjectBuilder.set(JSON_POLICY_ID_OR_PLACEHOLDER, policyIdOrPlaceholder, predicate);
+        }
     }
 
     @Override
@@ -484,8 +606,12 @@ public boolean equals(final Object o) {
             return false;
         }
         final MergeThing that = (MergeThing) o;
-        return that.canEqual(this) && thingId.equals(that.thingId) && path.equals(that.path) &&
-                value.equals(that.value);
+        return that.canEqual(this) &&
+                Objects.equals(thingId, that.thingId) &&
+                Objects.equals(path, that.path) &&
+                Objects.equals(value, that.value) &&
+                Objects.equals(initialPolicy, that.initialPolicy) &&
+                Objects.equals(policyIdOrPlaceholder, that.policyIdOrPlaceholder);
     }
 
     @Override
@@ -495,7 +621,7 @@ protected boolean canEqual(@Nullable final Object other) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), thingId, path, value);
+        return Objects.hash(super.hashCode(), thingId, path, value, initialPolicy, policyIdOrPlaceholder);
     }
 
     @Override
@@ -505,6 +631,8 @@ public String toString() {
                 ", thingId=" + thingId +
                 ", path=" + path +
                 ", value=" + value +
+                ", initialPolicy=" + initialPolicy +
+                ", policyIdOrPlaceholder=" + policyIdOrPlaceholder +
                 "]";
     }
 }
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/ModifyThing.java b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/ModifyThing.java
index 466287d1d87..0b40da9b8df 100755
--- a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/ModifyThing.java
+++ b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/ModifyThing.java
@@ -35,6 +35,7 @@
 import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.JsonValue;
+import org.eclipse.ditto.policies.model.Policy;
 import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.things.model.ThingId;
@@ -86,7 +87,7 @@ public final class ModifyThing extends AbstractCommand<ModifyThing> implements T
      * Json Field definition for the optional initial "inline" policy for usage in getEntity().
      */
     public static final JsonFieldDefinition<JsonObject> JSON_INLINE_POLICY =
-            JsonFactory.newJsonObjectFieldDefinition("_policy", FieldType.REGULAR, JsonSchemaVersion.V_2);
+            JsonFactory.newJsonObjectFieldDefinition(Policy.INLINED_FIELD_NAME, FieldType.REGULAR, JsonSchemaVersion.V_2);
 
     private final ThingId thingId;
     private final Thing thing;
diff --git a/things/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThingTest.java b/things/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThingTest.java
index dedbb9e36c5..255da909665 100644
--- a/things/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThingTest.java
+++ b/things/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThingTest.java
@@ -62,7 +62,7 @@ public final class MergeThingTest {
     public void assertImmutability() {
         assertInstancesOf(MergeThing.class,
                 areImmutable(),
-                provided(JsonPointer.class, JsonValue.class, ThingId.class).isAlsoImmutable());
+                provided(JsonPointer.class, JsonValue.class, ThingId.class, JsonObject.class).isAlsoImmutable());
     }
 
     @Test
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/pre/ModifyToCreateThingTransformer.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/pre/ModifyToCreateThingTransformer.java
index 551fa3321c6..9c8cf53991b 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/pre/ModifyToCreateThingTransformer.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/pre/ModifyToCreateThingTransformer.java
@@ -12,21 +12,28 @@
  */
 package org.eclipse.ditto.things.service.enforcement.pre;
 
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
+import javax.annotation.Nullable;
+
 import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.base.service.signaltransformer.SignalTransformer;
 import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.things.model.Thing;
+import org.eclipse.ditto.things.model.ThingsModelFactory;
 import org.eclipse.ditto.things.model.signals.commands.modify.CreateThing;
+import org.eclipse.ditto.things.model.signals.commands.modify.MergeThing;
 import org.eclipse.ditto.things.model.signals.commands.modify.ModifyThing;
+import org.eclipse.ditto.things.model.signals.commands.modify.ThingModifyCommand;
 
 import com.typesafe.config.Config;
 
 import akka.actor.ActorSystem;
 
 /**
- * Transforms a ModifyThing into a CreateThing if the thing does not exist already.
+ * Transforms a ModifyThing and a MergeThing command into a CreateThing if the thing does not exist already.
  */
 public final class ModifyToCreateThingTransformer implements SignalTransformer {
 
@@ -42,28 +49,42 @@ public final class ModifyToCreateThingTransformer implements SignalTransformer {
 
     @Override
     public CompletionStage<Signal<?>> apply(final Signal<?> signal) {
+        return calculateInputParams(signal)
+                .map(input -> existenceChecker.checkExistence(input.thingModifyCommand())
+                        .thenApply(exists -> {
+                            if (Boolean.FALSE.equals(exists)) {
+                                final var newThing = input.thing().toBuilder()
+                                        .setId(input.thingModifyCommand().getEntityId())
+                                        .build();
+                                return CreateThing.of(newThing, input.initialPolicy(), input.policyIdOrPlaceholder(),
+                                        input.thingModifyCommand().getDittoHeaders());
+                            } else {
+                                return (Signal<?>) input.thingModifyCommand();
+                            }
+                        })
+                ).orElse(CompletableFuture.completedStage(signal));
+    }
+
+    private static Optional<InputParams> calculateInputParams(final Signal<?> signal) {
         if (signal instanceof ModifyThing modifyThing) {
-            return existenceChecker.checkExistence(modifyThing)
-                    .thenApply(exists -> {
-                        if (Boolean.FALSE.equals(exists)) {
-                            final JsonObject initialPolicy = modifyThing.getInitialPolicy().orElse(null);
-                            final String policyIdOrPlaceholder = modifyThing.getPolicyIdOrPlaceholder().orElse(null);
-                            final var newThing = modifyThing.getThing().toBuilder()
-                                    .setId(modifyThing.getEntityId())
-                                    .build();
-                            return CreateThing.of(
-                                    newThing,
-                                    initialPolicy,
-                                    policyIdOrPlaceholder,
-                                    modifyThing.getDittoHeaders()
-                            );
-                        } else {
-                            return modifyThing;
-                        }
-                    });
+            return Optional.of(new InputParams(modifyThing,
+                    modifyThing.getThing(),
+                    modifyThing.getInitialPolicy().orElse(null),
+                    modifyThing.getPolicyIdOrPlaceholder().orElse(null)
+            ));
+        } else if (signal instanceof MergeThing mergeThing && mergeThing.getPath().isEmpty()) {
+            final JsonObject mergeThingObject = mergeThing.getValue().asObject();
+            return Optional.of(new InputParams(mergeThing,
+                    ThingsModelFactory.newThing(mergeThingObject),
+                    mergeThing.getInitialPolicy().orElse(null),
+                    mergeThing.getPolicyIdOrPlaceholder().orElse(null)
+            ));
         } else {
-            return CompletableFuture.completedStage(signal);
+            return Optional.empty();
         }
     }
 
+    private record InputParams(ThingModifyCommand<?> thingModifyCommand, Thing thing,
+            @Nullable JsonObject initialPolicy,
+            @Nullable String policyIdOrPlaceholder) {}
 }
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/pre/ThingExistenceChecker.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/pre/ThingExistenceChecker.java
index 05db6712332..e368e048d06 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/pre/ThingExistenceChecker.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/pre/ThingExistenceChecker.java
@@ -23,7 +23,7 @@
 import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.things.api.ThingsMessagingConstants;
 import org.eclipse.ditto.things.model.ThingId;
-import org.eclipse.ditto.things.model.signals.commands.modify.ModifyThing;
+import org.eclipse.ditto.things.model.signals.commands.modify.ThingModifyCommand;
 
 import com.github.benmanes.caffeine.cache.AsyncCacheLoader;
 
@@ -62,7 +62,7 @@ private AsyncCacheLoader<ThingId, Entry<PolicyId>> getThingIdLoader(
                 thingsShardRegion);
     }
 
-    public CompletionStage<Boolean> checkExistence(final ModifyThing signal) {
+    public CompletionStage<Boolean> checkExistence(final ThingModifyCommand<?> signal) {
         try {
             return thingIdLoader.asyncLoad(signal.getEntityId(),
                             actorSystem.dispatchers().lookup(ENFORCEMENT_CACHE_DISPATCHER))
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/pre/ModifyToCreateThingTransformerTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/pre/ModifyToCreateThingTransformerTest.java
index 27623c153cd..b3eb91a702b 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/pre/ModifyToCreateThingTransformerTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/pre/ModifyToCreateThingTransformerTest.java
@@ -24,7 +24,9 @@
 import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.things.model.ThingId;
+import org.eclipse.ditto.things.model.ThingsModelFactory;
 import org.eclipse.ditto.things.model.signals.commands.modify.CreateThing;
+import org.eclipse.ditto.things.model.signals.commands.modify.MergeThing;
 import org.eclipse.ditto.things.model.signals.commands.modify.ModifyThing;
 import org.eclipse.ditto.things.model.signals.commands.query.RetrieveThing;
 import org.junit.Before;
@@ -58,6 +60,36 @@ public void modifyThingStaysModifyThingWhenAlreadyExisting() {
         verify(existenceChecker).checkExistence(modifyThing);
     }
 
+    @Test
+    public void mergeThingBecomesCreateThingPolicyWhenNotYetExisting() {
+        final var thingId = ThingId.generateRandom();
+        final var mergeThing = MergeThing.withThing(thingId, Thing.newBuilder().setId(thingId).build(),
+                DittoHeaders.of(Map.of("foo", "bar")));
+        when(existenceChecker.checkExistence(mergeThing)).thenReturn(CompletableFuture.completedStage(false));
+
+        final Signal<?> result = underTest.apply(mergeThing).toCompletableFuture().join();
+
+        assertThat(result).isInstanceOf(CreateThing.class);
+        final CreateThing createThing = (CreateThing) result;
+        assertThat(createThing.getEntityId().toString()).hasToString(thingId.toString());
+        assertThat(createThing.getThing()).isEqualTo(ThingsModelFactory.newThing(mergeThing.getValue().asObject()));
+        assertThat(createThing.getDittoHeaders()).isSameAs(mergeThing.getDittoHeaders());
+        verify(existenceChecker).checkExistence(mergeThing);
+    }
+
+    @Test
+    public void mergeThingStaysMergeThingWhenAlreadyExisting() {
+        final var thingId = ThingId.generateRandom();
+        final var mergeThing = MergeThing.withThing(thingId, Thing.newBuilder().setId(thingId).build(),
+                DittoHeaders.of(Map.of("foo", "bar")));
+        when(existenceChecker.checkExistence(mergeThing)).thenReturn(CompletableFuture.completedStage(true));
+
+        final Signal<?> result = underTest.apply(mergeThing).toCompletableFuture().join();
+
+        assertThat(result).isSameAs(mergeThing);
+        verify(existenceChecker).checkExistence(mergeThing);
+    }
+
     @Test
     public void modifyThingBecomesCreateThingPolicyWhenNotYetExisting() {
         final var thingId = ThingId.generateRandom();

From b4060fe61c36cf6b513a3b94745bb637d32e9bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 18 Apr 2023 18:39:09 +0200
Subject: [PATCH 081/173] #1619 adjusted monitor to use in
 OutboundMappingProcessorActor#messageDiscarded
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* to not use `responseDispatchedMonitor`, but getMonitorsForOutboundSignal() with using `responseMappedMonitor` instead for responses

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../messaging/OutboundMappingProcessorActor.java | 16 ++++++++++++----
 .../OutboundMappingProcessorActorTest.java       |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActor.java
index 96ee126d233..869909f8b5b 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActor.java
@@ -349,13 +349,21 @@ protected OutboundSignalWithSender mapMessage(final OutboundSignal message) {
     }
 
     @Override
-    protected void messageDiscarded(OutboundSignal message,  QueueOfferResult result) {
+    protected void messageDiscarded(final OutboundSignal message, final QueueOfferResult result) {
+        final Set<ConnectionMonitor> monitorsForOutboundSignal =
+                getMonitorsForOutboundSignal(message, MAPPED, LogType.MAPPED, responseMappedMonitor);
         if (QueueOfferResult.dropped().equals(result)) {
-            responseDispatchedMonitor.failure(message.getSource(), "Message is dropped as a result of backpressure strategy!");
+            monitorsForOutboundSignal.forEach(monitor ->
+                    monitor.failure(message.getSource(), "Message is dropped as a result of backpressure strategy!")
+            );
         } else if (result instanceof final QueueOfferResult.Failure failure) {
-            responseDispatchedMonitor.failure(message.getSource(), "Enqueue failed! - failure: {}", failure.cause());
+            monitorsForOutboundSignal.forEach(monitor ->
+                    monitor.failure(message.getSource(), "Enqueue failed! - failure: {}", failure.cause())
+            );
         } else {
-            responseDispatchedMonitor.failure(message.getSource(), "Enqueue failed without acknowledgement!");
+            monitorsForOutboundSignal.forEach(monitor ->
+                    monitor.failure(message.getSource(), "Enqueue failed without acknowledgement!")
+            );
         }
     }
 
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActorTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActorTest.java
index 7009ed6ff62..3ec16166e1c 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActorTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActorTest.java
@@ -63,11 +63,11 @@
 import akka.testkit.TestProbe;
 import akka.testkit.javadsl.TestKit;
 
-@FixMethodOrder(MethodSorters.DEFAULT)
 /**
  * Tests in addition to {@link MessageMappingProcessorActorTest}
  * for {@link OutboundMappingProcessorActor} only.
  */
+@FixMethodOrder(MethodSorters.DEFAULT)
 public final class OutboundMappingProcessorActorTest {
 
     @ClassRule

From ba9b8205f969c6076bd3ea4c510e1bfc6074b191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 30 Mar 2023 16:10:47 +0200
Subject: [PATCH 082/173] fixed OverflowStrategy in SupervisedStream to
 backpressure instead of failing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../gateway/service/streaming/actors/SupervisedStream.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/SupervisedStream.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/SupervisedStream.java
index 84d7ad0a9b2..134b7f6e2e0 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/SupervisedStream.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/SupervisedStream.java
@@ -35,7 +35,7 @@ public interface SupervisedStream {
      * @return the source queue.
      */
     static Source<SessionedJsonifiable, WithQueue> sourceQueue(final int queueSize) {
-        return Source.<SessionedJsonifiable>queue(queueSize, OverflowStrategy.fail().withLogLevel(Logging.WarningLevel()))
+        return Source.<SessionedJsonifiable>queue(queueSize, OverflowStrategy.backpressure().withLogLevel(Logging.WarningLevel()))
                 .viaMat(KillSwitches.single(), Keep.both())
                 .mapMaterializedValue(pair -> {
                     final SourceQueueWithComplete<SessionedJsonifiable> sourceQueue = pair.first();

From fcac9fa5095f91fe2c656694d151fe618a274dc9 Mon Sep 17 00:00:00 2001
From: Thomas Fries <thomas.fries0@gmail.com>
Date: Thu, 30 Mar 2023 20:23:00 +0200
Subject: [PATCH 083/173] UI - New Operations tab (#1600)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* UI - New Operations tab
* added new tab
* changed way to control right auth user
* extended api to allow devops path
* utils to add table row now returns row
* crud editor returns explicit cancel action
* crud editor now with option without delete or create

Signed-off-by: thfries <thomas.fries0@gmail.com>

* UI - Operations Tab: new logger view

Signed-off-by: thfries <thomas.fries0@gmail.com>

* UI - operations tab - refresh not scrolling

* UI - change header info on new files

Signed-off-by: thfries <thomas.fries0@gmail.com>

* UI - Operations tab - make tabs optional
- fixed auth header mixing from wrong environment
- operations tab not getting right auth header

Signed-off-by: thfries <thomas.fries0@gmail.com>

* UI - added option to define new logger for each service in Operations / Logging functionality

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>

* UI - operations tab
- remove spellcheck from input
- split loggerView into smaller functions

Signed-off-by: thfries <thomas.fries0@gmail.com>

---------

Signed-off-by: thfries <thomas.fries0@gmail.com>
Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
Co-authored-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 ui/index.html                             |  12 ++-
 ui/main.js                                |   9 +-
 ui/modules/api.js                         |  11 ++-
 ui/modules/connections/connections.js     |  23 ++---
 ui/modules/connections/connectionsCRUD.js |   2 +-
 ui/modules/environments/authorization.js  |  14 ++-
 ui/modules/environments/environments.html |  17 +++-
 ui/modules/environments/environments.js   |  27 ++++--
 ui/modules/operations/operations.html     |  49 +++++++++++
 ui/modules/operations/operations.js       | 100 ++++++++++++++++++++++
 ui/modules/policies/policies.js           |  35 +++-----
 ui/modules/things/attributes.js           |   2 +-
 ui/modules/things/features.js             |   2 +-
 ui/modules/things/things.js               |  28 +-----
 ui/modules/things/thingsCRUD.js           |   2 +-
 ui/modules/utils.js                       |   2 +
 ui/modules/utils/crudToolbar.js           |  46 +++++++---
 ui/modules/utils/tabHandler.js            |  54 ++++++++++++
 ui/templates/environmentTemplates.json    |   4 +-
 19 files changed, 334 insertions(+), 105 deletions(-)
 create mode 100644 ui/modules/operations/operations.html
 create mode 100644 ui/modules/operations/operations.js
 create mode 100644 ui/modules/utils/tabHandler.js

diff --git a/ui/index.html b/ui/index.html
index 6905061c8a3..e3e40268585 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -72,11 +72,16 @@
                             Policies
                         </a>
                     </li>
-                    <li class="nav-item" id="tabConnections">
+                    <li class="nav-item" id="tabConnections" data-auth="devOps">
                         <a class="nav-link" data-bs-target="#collapseConnections:not(.show)" data-bs-toggle="collapse">
                             Connections
                         </a>
                     </li>
+                    <li class="nav-item" id="tabOperations" data-auth="devOps">
+                        <a class="nav-link" data-bs-target="#collapseOperations:not(.show)" data-bs-toggle="collapse">
+                            Operations
+                        </a>
+                    </li>
                     <li class="nav-item" id="tabEnvironments">
                         <a class="nav-link" data-bs-target="#collapseSettings:not(.show)" data-bs-toggle="collapse">
                             Environments
@@ -105,6 +110,9 @@
         <div class="collapse" id=collapseConnections data-bs-parent="#page-content">
             <div id="connectionsHTML"></div>
         </div>
+        <div class="collapse" id=collapseOperations data-bs-parent="#page-content">
+            <div id="operationsHTML"></div>
+        </div>
         <div class="collapse" id="collapseSettings" data-bs-parent="#page-content">
             <div id="environmentsHTML"></div>
         </div>
@@ -147,7 +155,7 @@
         <div class="input-group input-group-sm mb-1 mt-1 has-validation">
             <label class="input-group-text" id="label">Default</label>
             <input type="text" class="form-control" disabled id="inputIdValue">
-            <button class="btn btn-outline-primary btn-sm" id="buttonCrudEdit"
+            <button class="btn btn-outline-primary btn-sm" id="buttonEdit"
                 data-bs-toggle="tooltip" title="Edit">
                 Edit
             </button>
diff --git a/ui/main.js b/ui/main.js
index 779b9eb4c51..544cd9e40a2 100644
--- a/ui/main.js
+++ b/ui/main.js
@@ -27,8 +27,8 @@ import * as MessagesIncoming from './modules/things/messagesIncoming.js';
 import * as Connections from './modules/connections/connections.js';
 import * as ConnectionsCRUD from './modules/connections/connectionsCRUD.js';
 import * as ConnectionsMonitor from './modules/connections/connectionsMonitor.js';
+import * as Operations from './modules/operations/operations.js';
 import * as Policies from './modules/policies/policies.js';
-import * as API from './modules/api.js';
 import * as Utils from './modules/utils.js';
 import {WoTDescription} from './modules/things/wotDescription.js';
 
@@ -40,10 +40,13 @@ document.addEventListener('DOMContentLoaded', async function() {
   document.getElementById('thingsHTML').innerHTML = await (await fetch('modules/things/things.html')).text();
   document.getElementById('fieldsHTML').innerHTML = await (await fetch('modules/things/fields.html')).text();
   document.getElementById('featuresHTML').innerHTML = await (await fetch('modules/things/features.html')).text();
-  document.getElementById('messagesIncomingHTML').innerHTML = await (await fetch('modules/things/messagesIncoming.html')).text();
+  document.getElementById('messagesIncomingHTML').innerHTML =
+      await (await fetch('modules/things/messagesIncoming.html')).text();
   document.getElementById('policyHTML').innerHTML = await (await fetch('modules/policies/policies.html')).text();
   document.getElementById('connectionsHTML').innerHTML =
       await (await fetch('modules/connections/connections.html')).text();
+  document.getElementById('operationsHTML').innerHTML =
+      await (await fetch('modules/operations/operations.html')).text();
   document.getElementById('environmentsHTML').innerHTML =
       await (await fetch('modules/environments/environments.html')).text();
   document.getElementById('authorizationHTML').innerHTML =
@@ -64,6 +67,7 @@ document.addEventListener('DOMContentLoaded', async function() {
   Connections.ready();
   ConnectionsCRUD.ready();
   ConnectionsMonitor.ready();
+  Operations.ready();
   Authorization.ready();
   await Environments.ready();
 
@@ -94,7 +98,6 @@ document.addEventListener('DOMContentLoaded', async function() {
     e.addEventListener('click', (event) => {
       mainNavbar.querySelectorAll('.nav-link,.active').forEach((n) => n.classList.remove('active'));
       event.currentTarget.classList.add('active');
-      API.setAuthHeader(event.currentTarget.parentNode.id === 'tabConnections');
     });
   });
 
diff --git a/ui/modules/api.js b/ui/modules/api.js
index eb343316f2b..b9a427673df 100644
--- a/ui/modules/api.js
+++ b/ui/modules/api.js
@@ -284,6 +284,9 @@ export function setAuthHeader(forDevOps) {
     } else if (Environments.current().devopsAuth === 'bearer') {
       authHeaderKey = 'Authorization';
       authHeaderValue ='Bearer ' + Environments.current().bearerDevOps;
+    } else {
+      authHeaderKey = 'Basic';
+      authHeaderValue = '';
     }
   } else {
     if (Environments.current().mainAuth === 'basic') {
@@ -295,6 +298,9 @@ export function setAuthHeader(forDevOps) {
     } else if (Environments.current().mainAuth === 'bearer') {
       authHeaderKey = 'Authorization';
       authHeaderValue ='Bearer ' + Environments.current().bearer;
+    } else {
+      authHeaderKey = 'Basic';
+      authHeaderValue = '';
     }
   }
 }
@@ -306,12 +312,13 @@ export function setAuthHeader(forDevOps) {
  * @param {Object} body payload for the api call
  * @param {Object} additionalHeaders object with additional header fields
  * @param {boolean} returnHeaders request full response instead of json content
+ * @param {boolean} devOps default: false. Set true to avoid /api/2 path
  * @return {Object} result as json object
  */
-export async function callDittoREST(method, path, body, additionalHeaders, returnHeaders = false) {
+export async function callDittoREST(method, path, body, additionalHeaders, returnHeaders = false, devOps = false) {
   let response;
   try {
-    response = await fetch(Environments.current().api_uri + '/api/2' + path, {
+    response = await fetch(Environments.current().api_uri + (devOps ? '' : '/api/2') + path, {
       method: method,
       headers: {
         'Content-Type': 'application/json',
diff --git a/ui/modules/connections/connections.js b/ui/modules/connections/connections.js
index 4e00cb4bd23..48a3b9870e0 100644
--- a/ui/modules/connections/connections.js
+++ b/ui/modules/connections/connections.js
@@ -15,8 +15,8 @@
 /* eslint-disable no-invalid-this */
 /* eslint-disable require-jsdoc */
 import * as API from '../api.js';
-import * as Environments from '../environments/environments.js';
 import * as Utils from '../utils.js';
+import {TabHandler} from '../utils/tabHandler.js';
 
 const observers = [];
 
@@ -39,13 +39,11 @@ let dom = {
 let selectedConnectionId;
 
 export function ready() {
-  Environments.addChangeListener(onEnvironmentChanged);
-
   Utils.getAllElementsById(dom);
+  new TabHandler(dom.tabConnections, dom.collapseConnections, refreshTab, 'disableConnections');
 
   Utils.addValidatorToTable(dom.tbodyConnections, dom.tableValidationConnections);
 
-  dom.tabConnections.onclick = onTabActivated;
   dom.buttonLoadConnections.onclick = loadConnections;
   dom.tbodyConnections.addEventListener('click', onConnectionsTableClick);
 }
@@ -100,21 +98,10 @@ function onConnectionsTableClick(event) {
   }
 }
 
-let viewDirty = false;
-
-function onTabActivated() {
-  if (viewDirty) {
-    loadConnections();
-    viewDirty = false;
-  }
-}
-
-function onEnvironmentChanged() {
-  if (dom.collapseConnections.classList.contains('show')) {
+function refreshTab(otherEnvironment) {
+  if (otherEnvironment) {
     selectedConnectionId = null;
     setConnection(null);
-    loadConnections();
-  } else {
-    viewDirty = true;
   }
+  loadConnections();
 }
diff --git a/ui/modules/connections/connectionsCRUD.js b/ui/modules/connections/connectionsCRUD.js
index 731808e90f5..8fbbe18cf8e 100644
--- a/ui/modules/connections/connectionsCRUD.js
+++ b/ui/modules/connections/connectionsCRUD.js
@@ -184,7 +184,7 @@ function setConnection(connection) {
 }
 
 function onEditToggle(event) {
-  const isEditing = event.detail;
+  const isEditing = event.detail.isEditing;
   dom.buttonConnectionTemplates.disabled = !isEditing;
   connectionEditor.setReadOnly(!isEditing);
   connectionEditor.renderer.setShowGutter(isEditing);
diff --git a/ui/modules/environments/authorization.js b/ui/modules/environments/authorization.js
index 9a1752f6a0b..305eba96440 100644
--- a/ui/modules/environments/authorization.js
+++ b/ui/modules/environments/authorization.js
@@ -28,6 +28,13 @@ let dom = {
   collapseConnections: null,
 };
 
+let _forDevops = false;
+
+export function setForDevops(forDevops) {
+  _forDevops = forDevops;
+  API.setAuthHeader(_forDevops);
+}
+
 export function ready() {
   Utils.getAllElementsById(dom);
 
@@ -53,15 +60,14 @@ export function ready() {
     }
 
     const mainAuths = document.querySelectorAll('input[name="main-auth"]');
-    for(let i = 0; i < mainAuths.length; i++) {
+    for (let i = 0; i < mainAuths.length; i++) {
       mainAuths[i].checked = mainAuths[i].value === mainAuth;
     }
 
     const devopsAuths = document.querySelectorAll('input[name="devops-auth"]');
-    for(let i = 0; i < devopsAuths.length; i++) {
+    for (let i = 0; i < devopsAuths.length; i++) {
       devopsAuths[i].checked = devopsAuths[i].value === devopsAuth;
     }
-
   };
 
   document.getElementById('authorizeSubmit').onclick = () => {
@@ -94,5 +100,5 @@ export function onEnvironmentChanged() {
   dom.dittoPreAuthenticatedUsername.value = Environments.current().dittoPreAuthenticatedUsername ?
                                             Environments.current().dittoPreAuthenticatedUsername :
                                             '';
-  API.setAuthHeader(dom.collapseConnections.classList.contains('show'));
+  API.setAuthHeader(_forDevops);
 }
diff --git a/ui/modules/environments/environments.html b/ui/modules/environments/environments.html
index 907151ff786..3f8459d5f72 100644
--- a/ui/modules/environments/environments.html
+++ b/ui/modules/environments/environments.html
@@ -46,14 +46,27 @@ <h5>Environments</h5>
                             title="A comma-separated list of namespaces (e.g. com.example.namespace). The given namespaces are used as a parameter for the Things search">Search Namespaces</label>
                         <input type="text" class="form-control form-control-sm" spellcheck="false" id="inputSearchNamespaces" disabled></input>
                     </div>
-                    <div class="input-group input-group-sm mt-1">
+                    <div class="input-group input-group-sm mt-1 mb-3">
                         <label class="input-group-text">Ditto Version</label>
                         <select class="form-select form-select-sm" id="selectDittoVersion" disabled>
                             <option selecte value="3">3</option>
                             <option value="2">2</option>
                         </select>
                     </div>    
-                </crud-toolbar>
+                    <label class="form-label">Optional Tabs</label>
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch" id="inputTabPolicies" disabled>
+                        <label class="form-check-label" for="inputTabPolicies">Policies</label>
+                      </div>
+                      <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch" id="inputTabConnections" disabled>
+                        <label class="form-check-label" for="inputTabConnections">Connections</label>
+                      </div>
+                      <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch" id="inputTabOperations" disabled>
+                        <label class="form-check-label" for="inputTabOperations">Operations</label>
+                      </div>
+            </crud-toolbar>
             </div>
             <div class="tab-pane container no-margin" id="tabEnvJson">
                 <crud-toolbar label="Name" id="crudEnvironmentJson" allowIdChange>
diff --git a/ui/modules/environments/environments.js b/ui/modules/environments/environments.js
index ee51906b0d3..827d73381a1 100644
--- a/ui/modules/environments/environments.js
+++ b/ui/modules/environments/environments.js
@@ -36,6 +36,9 @@ let dom = {
   inputApiUri: null,
   inputSearchNamespaces: null,
   selectDittoVersion: null,
+  inputTabPolicies: null,
+  inputTabConnections: null,
+  inputTabOperations: null,
 };
 
 let observers = [];
@@ -170,6 +173,9 @@ function onUpdateEnvironmentClick(event) {
     environments[selectedEnvName].api_uri = dom.inputApiUri.value;
     environments[selectedEnvName].searchNamespaces = dom.inputSearchNamespaces.value;
     environments[selectedEnvName].ditto_version = dom.selectDittoVersion.value;
+    environments[selectedEnvName].disablePolicies = !dom.inputTabPolicies.checked;
+    environments[selectedEnvName].disableConnections = !dom.inputTabConnections.checked;
+    environments[selectedEnvName].disableOperations = !dom.inputTabOperations.checked;
   } else {
     environments[selectedEnvName] = JSON.parse(settingsEditor.getValue());
   }
@@ -223,6 +229,9 @@ function updateEnvEditors() {
     dom.inputApiUri.value = selectedEnvironment.api_uri;
     dom.inputSearchNamespaces.value = selectedEnvironment.searchNamespaces ?? '';
     dom.selectDittoVersion.value = selectedEnvironment.ditto_version ? selectedEnvironment.ditto_version : '3';
+    dom.inputTabPolicies.checked = !selectedEnvironment.disablePolicies;
+    dom.inputTabConnections.checked = !selectedEnvironment.disableConnections;
+    dom.inputTabOperations.checked = !selectedEnvironment.disableOperations;
   } else {
     dom.crudEnvironmentFields.idValue = null;
     dom.crudEnvironmentJson.idValue = null;
@@ -230,6 +239,9 @@ function updateEnvEditors() {
     dom.inputApiUri.value = null;
     dom.inputSearchNamespaces.value = null;
     dom.selectDittoVersion.value = 3;
+    dom.inputTabPolicies.checked = true;
+    dom.inputTabConnections.checked = true;
+    dom.inputTabOperations.checked = true;
   }
 }
 
@@ -304,12 +316,15 @@ async function loadEnvironmentTemplates() {
 }
 
 function onEditToggle(event) {
-  dom.inputApiUri.disabled = !event.detail;
-  dom.inputSearchNamespaces.disabled = !event.detail;
-  dom.selectDittoVersion.disabled = !event.detail;
-  settingsEditor.setReadOnly(!event.detail);
-  settingsEditor.renderer.setShowGutter(event.detail);
-  if (!event.detail) {
+  dom.inputApiUri.disabled = !event.detail.isEditing;
+  dom.inputSearchNamespaces.disabled = !event.detail.isEditing;
+  dom.selectDittoVersion.disabled = !event.detail.isEditing;
+  dom.inputTabPolicies.disabled = !event.detail.isEditing;
+  dom.inputTabConnections.disabled = !event.detail.isEditing;
+  dom.inputTabOperations.disabled = !event.detail.isEditing;
+  settingsEditor.setReadOnly(!event.detail.isEditing);
+  settingsEditor.renderer.setShowGutter(event.detail.isEditing);
+  if (!event.detail.isEditing) {
     updateEnvEditors();
   }
 }
diff --git a/ui/modules/operations/operations.html b/ui/modules/operations/operations.html
new file mode 100644
index 00000000000..521ade84822
--- /dev/null
+++ b/ui/modules/operations/operations.html
@@ -0,0 +1,49 @@
+<!--
+  ~ Copyright (c) 2023 Contributors to the Eclipse Foundation
+  ~
+  ~ See the NOTICE file(s) distributed with this work for additional
+  ~ information regarding copyright ownership.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License 2.0 which is available at
+  ~ http://www.eclipse.org/legal/epl-2.0
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
+<h5>Ditto Services Logging</h5>
+<hr />
+<div class="input-group input-group-sm mt-1 mb-1" role="group">
+    <div style="flex-grow: 1;"></div>
+    <button class="btn btn-outline-primary btn-sm button_round_left" id="buttonLoadAllLogLevels">
+        <i class="bi bi-arrow-clockwise"></i>
+        Refresh
+    </button>
+</div>
+<div class="row resizable_pane" style="height: 80vh">
+    <div class="col-md-12 resizable_flex_column">
+        <div id="divLoggers"></div>
+        <template id="templateLogger">
+            <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
+                integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+            <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.3/font/bootstrap-icons.min.css"
+                rel="stylesheet"
+                integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow=="
+                crossorigin="anonymous" referrerpolicy="no-referrer" />
+            <link href="index.css" rel="stylesheet" />
+    
+            <div class="input-group input-group-sm mb-1">
+                <input class="form-control" type="text" disabled id="inputLogger" spellcheck="false"></input>
+                <div class="btn-group" role="group">
+                    <input type="radio" class="btn-check" id="debug" autocomplete="off">
+                    <label class="btn btn-sm btn-outline-secondary" for="debug">DEBUG</label>
+                    <input type="radio" class="btn-check" id="info" autocomplete="off">
+                    <label class="btn btn-sm btn-outline-success" for="info">INFO</label>
+                    <input type="radio" class="btn-check" id="warn" autocomplete="off">
+                    <label class="btn btn-sm btn-outline-warning" for="warn">WARN</label>
+                    <input type="radio" class="btn-check" id="error" autocomplete="off">
+                    <label class="btn btn-sm btn-outline-danger" for="error">ERROR</label>
+                </div>
+            </div>
+        </template>
+    </div>
+</div>
\ No newline at end of file
diff --git a/ui/modules/operations/operations.js b/ui/modules/operations/operations.js
new file mode 100644
index 00000000000..ad16a6690ed
--- /dev/null
+++ b/ui/modules/operations/operations.js
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+/* eslint-disable arrow-parens */
+/* eslint-disable prefer-const */
+/* eslint-disable require-jsdoc */
+import * as API from '../api.js';
+import * as Utils from '../utils.js';
+import {TabHandler} from '../utils/tabHandler.js';
+
+let dom = {
+  buttonLoadAllLogLevels: null,
+  divLoggers: null,
+  templateLogger: null,
+  tabOperations: null,
+  collapseOperations: null,
+};
+
+export async function ready() {
+  Utils.getAllElementsById(dom);
+  new TabHandler(dom.tabOperations, dom.collapseOperations, loadAllLogLevels, 'disableOperations');
+
+  dom.buttonLoadAllLogLevels.onclick = loadAllLogLevels;
+}
+
+function onUpdateLoggingClick(service, logConfig) {
+  API.callDittoREST('PUT', '/devops/logging/' + service, logConfig, null, false, true)
+      .then(() => {
+        loadAllLogLevels();
+      });
+}
+
+function loadAllLogLevels() {
+  API.callDittoREST('GET', '/devops/logging', null, null, false, true)
+      .then((result) => createLoggerView(result))
+      .catch((error) => {
+        dom.divLoggers.innerHTML = '';
+      });
+}
+
+function createLoggerView(allLogLevels) {
+  dom.divLoggers.innerHTML = '';
+  Object.keys(allLogLevels).sort().forEach((service, i) => {
+    addHeading(service, i);
+    Object.values(allLogLevels[service])[0].loggerConfigs.forEach((logConfig) => {
+      addLoggerRowForConfig(service, logConfig);
+    });
+    addLoggerRowForNew(service);
+  });
+
+  function addHeading(service, i) {
+    let heading = document.createElement('h6');
+    heading.innerText = service;
+    if (i > 0) {
+      heading.classList.add('mt-3');
+    }
+    dom.divLoggers.append(heading);
+  }
+
+  function addLoggerRowForConfig(service, logConfig) {
+    let row = document.createElement('div');
+    row.attachShadow({mode: 'open'});
+    row.shadowRoot.append(dom.templateLogger.content.cloneNode(true));
+    row.shadowRoot.getElementById('inputLogger').value = logConfig.logger;
+    row.shadowRoot.getElementById(logConfig.level).setAttribute('checked', '');
+    Array.from(row.shadowRoot.querySelectorAll('.btn-check')).forEach((btn) => {
+      btn.addEventListener('click', (event) => onUpdateLoggingClick(service, {
+        logger: logConfig.logger,
+        level: event.target.id,
+      }));
+    });
+    dom.divLoggers.append(row);
+  }
+
+  function addLoggerRowForNew(service) {
+    let newLoggerRow = document.createElement('div');
+    newLoggerRow.attachShadow({mode: 'open'});
+    newLoggerRow.shadowRoot.append(dom.templateLogger.content.cloneNode(true));
+    let inputLoggerElement = newLoggerRow.shadowRoot.getElementById('inputLogger');
+    inputLoggerElement.disabled = false;
+    inputLoggerElement.placeholder = 'Add new logger name and choose log level';
+    Array.from(newLoggerRow.shadowRoot.querySelectorAll('.btn-check')).forEach((btn) => {
+      btn.addEventListener('click', (event) => onUpdateLoggingClick(service, {
+        logger: inputLoggerElement.value,
+        level: event.target.id,
+      }));
+    });
+    dom.divLoggers.append(newLoggerRow);
+  }
+}
diff --git a/ui/modules/policies/policies.js b/ui/modules/policies/policies.js
index d739948dd44..872da1f8359 100644
--- a/ui/modules/policies/policies.js
+++ b/ui/modules/policies/policies.js
@@ -4,8 +4,8 @@
 /* eslint-disable require-jsdoc */
 import * as Utils from '../utils.js';
 import * as API from '../api.js';
-import * as Environments from '../environments/environments.js';
 import * as Things from '../things/things.js';
+import {TabHandler} from '../utils/tabHandler.js';
 
 let thePolicy;
 let selectedEntry;
@@ -14,6 +14,8 @@ let selectedResource;
 
 let policyTemplates;
 
+let tabHandler;
+
 let dom = {
   inputPolicyId: null,
   inputPolicyEntry: null,
@@ -44,9 +46,9 @@ let subjectEditor;
 let resourceEditor;
 
 export function ready() {
-  Environments.addChangeListener(onEnvironmentChanged);
-
   Utils.getAllElementsById(dom);
+  tabHandler = new TabHandler(dom.tabPolicies, dom.collapsePolicies, refreshAll, 'disablePolicies');
+
 
   loadPolicyTemplates();
 
@@ -57,8 +59,6 @@ export function ready() {
   subjectEditor = Utils.createAceEditor('subjectEditor', 'ace/mode/json');
   resourceEditor = Utils.createAceEditor('resourceEditor', 'ace/mode/json');
 
-  dom.tabPolicies.onclick = onTabActivated;
-
   dom.buttonLoadPolicy.onclick = () => {
     Utils.assert(dom.inputPolicyId.value, 'Please enter a policyId', dom.inputPolicyId);
     refreshPolicy(dom.inputPolicyId.value);
@@ -220,7 +220,7 @@ function validations(entryFilled, entrySelected, subjectFilled, subjectSelected,
 
 function onThingChanged(thing) {
   dom.inputPolicyId.value = (thing && thing.policyId) ? thing.policyId : null;
-  viewDirty = true;
+  tabHandler.viewDirty = true;
 }
 
 function refreshWhoAmI() {
@@ -311,26 +311,13 @@ function modifyPolicyEntry(type, key, value) {
   ).then(() => refreshPolicy(thePolicy.policyId));
 };
 
-let viewDirty = false;
-
-function onTabActivated() {
-  if (viewDirty) {
-    refreshWhoAmI();
-    if (dom.inputPolicyId.value) {
-      refreshPolicy(dom.inputPolicyId.value);
-    }
-    viewDirty = false;
-  }
-}
-
-function onEnvironmentChanged(modifiedField) {
-  if (!['pinnedThings', 'filterList', 'authorization'].includes(modifiedField)) {
+function refreshAll(otherEnvironment) {
+  refreshWhoAmI();
+  if (otherEnvironment) {
     setThePolicy(null);
   }
-  if (dom.collapsePolicies.classList.contains('show')) {
-    refreshWhoAmI();
-  } else {
-    viewDirty = true;
+  if (dom.inputPolicyId.value) {
+    refreshPolicy(dom.inputPolicyId.value);
   }
 }
 
diff --git a/ui/modules/things/attributes.js b/ui/modules/things/attributes.js
index d851e73a56a..2b61dca1a34 100644
--- a/ui/modules/things/attributes.js
+++ b/ui/modules/things/attributes.js
@@ -160,7 +160,7 @@ function attributeFromString(attribute) {
 }
 
 function onEditToggle(event) {
-  const isEditing = event.detail;
+  const isEditing = event.detail.isEditing;
   dom.inputAttributeValue.disabled = !isEditing;
   if (isEditing && dom.crudAttribute.idValue && dom.crudAttribute.idValue !== '') {
     API.callDittoREST('GET', `/things/${Things.theThing.thingId}/attributes/${dom.crudAttribute.idValue}`,
diff --git a/ui/modules/things/features.js b/ui/modules/things/features.js
index b81c845c1c0..fcb7f3c3b14 100644
--- a/ui/modules/things/features.js
+++ b/ui/modules/things/features.js
@@ -230,7 +230,7 @@ function onThingChanged(thing) {
 }
 
 function onEditToggle(event) {
-  const isEditing = event.detail;
+  const isEditing = event.detail.isEditing;
   if (isEditing && dom.crudFeature.idValue && dom.crudFeature.idValue !== '') {
     API.callDittoREST('GET', `/things/${Things.theThing.thingId}/features/${dom.crudFeature.idValue}`, null, null, true)
         .then((response) => {
diff --git a/ui/modules/things/things.js b/ui/modules/things/things.js
index 2c0aaa2a487..f259369843a 100644
--- a/ui/modules/things/things.js
+++ b/ui/modules/things/things.js
@@ -1,3 +1,4 @@
+/* eslint-disable new-cap */
 /*
 * Copyright (c) 2022 Contributors to the Eclipse Foundation
 *
@@ -14,8 +15,8 @@
 // @ts-check
 import * as API from '../api.js';
 
-import * as Environments from '../environments/environments.js';
 import * as Utils from '../utils.js';
+import {TabHandler} from '../utils/tabHandler.js';
 import * as ThingsSearch from './thingsSearch.js';
 
 export let theThing;
@@ -39,11 +40,8 @@ export function addChangeListener(observer) {
  * Initializes components. Should be called after DOMContentLoaded event
  */
 export async function ready() {
-  Environments.addChangeListener(onEnvironmentChanged);
-
   Utils.getAllElementsById(dom);
-
-  dom.tabThings.onclick = onTabActivated;
+  TabHandler(dom.tabThings, dom.collapseThings, refreshView);
 }
 
 /**
@@ -73,26 +71,6 @@ export function setTheThing(thingJson) {
   observers.forEach((observer) => observer.call(null, theThing, isNewThingId));
 }
 
-let viewDirty = false;
-
-function onTabActivated() {
-  if (viewDirty) {
-    refreshView();
-    viewDirty = false;
-  }
-  // dom.searchFilterEdit.focus();
-}
-
-function onEnvironmentChanged(modifiedField) {
-  if (!['pinnedThings', 'filterList', 'messageTemplates'].includes(modifiedField)) {
-    if (dom.collapseThings.classList.contains('show')) {
-      refreshView();
-    } else {
-      viewDirty = true;
-    }
-  }
-}
-
 function refreshView() {
   ThingsSearch.performLastSearch();
 }
diff --git a/ui/modules/things/thingsCRUD.js b/ui/modules/things/thingsCRUD.js
index 4be416be9d9..5f5fdb96449 100644
--- a/ui/modules/things/thingsCRUD.js
+++ b/ui/modules/things/thingsCRUD.js
@@ -165,7 +165,7 @@ function onThingChanged(thingJson) {
 }
 
 function onEditToggle(event) {
-  const isEditing = event.detail;
+  const isEditing = event.detail.isEditing;
   if (isEditing && Things.theThing) {
     API.callDittoREST('GET', `/things/${Things.theThing.thingId}`, null, null, true)
         .then((response) => {
diff --git a/ui/modules/utils.js b/ui/modules/utils.js
index 6b69fff8eb5..7ebca92c458 100644
--- a/ui/modules/utils.js
+++ b/ui/modules/utils.js
@@ -33,6 +33,7 @@ export function ready() {
  * @param {boolean} selected if true, the new row will be marked as selected
  * @param {boolean} withClipBoardCopy add a clipboard button at the last column of the row
  * @param {array} columnValues texts for additional columns of the row
+ * @return {Element} created row
  */
 export const addTableRow = function(table, key, selected, withClipBoardCopy, ...columnValues) {
   const row = table.insertRow();
@@ -47,6 +48,7 @@ export const addTableRow = function(table, key, selected, withClipBoardCopy, ...
   if (withClipBoardCopy) {
     addClipboardCopyToRow(row);
   }
+  return row;
 };
 
 /**
diff --git a/ui/modules/utils/crudToolbar.js b/ui/modules/utils/crudToolbar.js
index 8ac04543bdd..de9939b2fab 100644
--- a/ui/modules/utils/crudToolbar.js
+++ b/ui/modules/utils/crudToolbar.js
@@ -16,10 +16,12 @@ import * as Utils from '../utils.js';
 class CrudToolbar extends HTMLElement {
   isEditing = false;
   isEditDisabled = false;
+  isCreateDisabled = false;
+  isDeleteDisabled = false;
   dom = {
     label: null,
     inputIdValue: null,
-    buttonCrudEdit: null,
+    buttonEdit: null,
     buttonCreate: null,
     buttonUpdate: null,
     buttonDelete: null,
@@ -33,7 +35,7 @@ class CrudToolbar extends HTMLElement {
 
   set idValue(newValue) {
     this.dom.inputIdValue.value = newValue;
-    if (newValue && newValue !== '') {
+    if (!this.isDeleteDisabled && newValue && newValue !== '') {
       this.dom.buttonDelete.removeAttribute('hidden');
     } else {
       this.dom.buttonDelete.setAttribute('hidden', '');
@@ -44,17 +46,30 @@ class CrudToolbar extends HTMLElement {
     return this.isEditDisabled;
   }
 
+  set createDisabled(newValue) {
+    this.isCreateDisabled = newValue;
+    this.setButtonState(this.dom.buttonCreate, newValue);
+  }
+
+  set deleteDisabled(newValue) {
+    this.isDeleteDisabled = newValue;
+    this.setButtonState(this.dom.buttonDelete, newValue);
+  }
+
   set editDisabled(newValue) {
     this.isEditDisabled = newValue;
     if (!this.isEditing) {
-      if (this.isEditDisabled) {
-        this.dom.buttonCrudEdit.setAttribute('hidden', '');
-      } else {
-        this.dom.buttonCrudEdit.removeAttribute('hidden');
-      }
+      this.setButtonState(this.dom.buttonEdit, newValue);
     }
   }
 
+  setButtonState(button, isDisabled) {
+    if (isDisabled) {
+      button.setAttribute('hidden', '');
+    } else {
+      button.removeAttribute('hidden');
+    }
+  }
   get validationElement() {
     return this.dom.inputIdValue;
   }
@@ -68,8 +83,8 @@ class CrudToolbar extends HTMLElement {
     this.shadowRoot.append(document.getElementById('templateCrudToolbar').content.cloneNode(true));
     setTimeout(() => {
       Utils.getAllElementsById(this.dom, this.shadowRoot);
-      this.dom.buttonCrudEdit.onclick = () => this.toggleEdit();
-      this.dom.buttonCancel.onclick = () => this.toggleEdit();
+      this.dom.buttonEdit.onclick = () => this.toggleEdit(false);
+      this.dom.buttonCancel.onclick = () => this.toggleEdit(true);
       this.dom.label.innerText = this.getAttribute('label') || 'Label';
       this.dom.buttonCreate.onclick = this.eventDispatcher('onCreateClick');
       this.dom.buttonUpdate.onclick = this.eventDispatcher('onUpdateClick');
@@ -85,22 +100,22 @@ class CrudToolbar extends HTMLElement {
     };
   }
 
-  toggleEdit() {
+  toggleEdit(isCancel) {
     this.isEditing = !this.isEditing;
     document.getElementById('modalCrudEdit').classList.toggle('editBackground');
     this.dom.divRoot.classList.toggle('editForground');
 
     if (this.isEditing || this.isEditDisabled) {
-      this.dom.buttonCrudEdit.setAttribute('hidden', '');
+      this.dom.buttonEdit.setAttribute('hidden', '');
     } else {
-      this.dom.buttonCrudEdit.removeAttribute('hidden');
+      this.dom.buttonEdit.removeAttribute('hidden');
     }
     this.dom.buttonCancel.toggleAttribute('hidden');
 
     if (this.isEditing) {
       if (this.dom.inputIdValue.value) {
         this.dom.buttonUpdate.toggleAttribute('hidden');
-      } else {
+      } else if (!this.isCreateDisabled) {
         this.dom.buttonCreate.toggleAttribute('hidden');
       }
     } else {
@@ -114,7 +129,10 @@ class CrudToolbar extends HTMLElement {
     this.dom.inputIdValue.disabled = !allowIdChange;
     this.dispatchEvent(new CustomEvent('onEditToggle', {
       composed: true,
-      detail: this.isEditing,
+      detail: {
+        isEditing: this.isEditing,
+        isCancel: isCancel,
+      },
     }));
   }
 }
diff --git a/ui/modules/utils/tabHandler.js b/ui/modules/utils/tabHandler.js
new file mode 100644
index 00000000000..be7b5a4f746
--- /dev/null
+++ b/ui/modules/utils/tabHandler.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+/* eslint-disable require-jsdoc */
+import * as Environments from '../environments/environments.js';
+import * as Authorization from '../environments/authorization.js';
+
+export function TabHandler(domTabItem, domTabContent, onRefreshTab, envDisabledKey) {
+  const _domTabItem = domTabItem;
+  const _domTabContent = domTabContent;
+  const _refreshTab = onRefreshTab;
+  const _envDisabledKey = envDisabledKey;
+  let viewDirty = false;
+
+  _domTabItem.addEventListener('click', onTabActivated);
+  Environments.addChangeListener(onEnvironmentChanged);
+
+  return {
+    set viewDirty(newValue) {
+      viewDirty = newValue;
+    },
+  };
+
+  function onTabActivated() {
+    Authorization.setForDevops(_domTabItem.dataset.auth === 'devOps');
+
+    if (viewDirty) {
+      _refreshTab.call(null, false);
+      viewDirty = false;
+    }
+  }
+
+  function onEnvironmentChanged(modifiedField) {
+    _domTabItem.toggleAttribute('hidden', Environments.current()[_envDisabledKey] ?? false);
+    if (!['pinnedThings', 'filterList', 'messageTemplates'].includes(modifiedField)) {
+      if (_domTabContent.classList.contains('show')) {
+        _refreshTab.call(null, true);
+      } else {
+        viewDirty = true;
+      }
+    }
+  }
+}
+
+
diff --git a/ui/templates/environmentTemplates.json b/ui/templates/environmentTemplates.json
index 5bca6192b7c..3621c71123e 100644
--- a/ui/templates/environmentTemplates.json
+++ b/ui/templates/environmentTemplates.json
@@ -30,6 +30,8 @@
     "defaultDittoPreAuthenticatedUsername": null,
     "defaultUsernamePasswordDevOps": null,
     "mainAuth": "basic",
-    "devopsAuth": null
+    "devopsAuth": null,
+    "disableConnections": true,
+    "disableOperations": true  
   }
 }
\ No newline at end of file

From 9d11565e7b242d539f7f09871bc53969afc2fe15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Sat, 1 Apr 2023 11:13:14 +0200
Subject: [PATCH 084/173] fix in UI that "bearerDevOps" token is stored to
 local storage * fallback to display connection "id" if no "name" is present
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 ui/modules/connections/connections.js   | 2 +-
 ui/modules/environments/environments.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/modules/connections/connections.js b/ui/modules/connections/connections.js
index 48a3b9870e0..e5c8179b09e 100644
--- a/ui/modules/connections/connections.js
+++ b/ui/modules/connections/connections.js
@@ -67,7 +67,7 @@ export function loadConnections() {
         },
         id);
       } else {
-        row.insertCell(0).innerHTML = connection.name;
+        row.insertCell(0).innerHTML = connection.name ? connection.name : id;
       }
       API.callConnectionsAPI('retrieveStatus', (status) => {
         row.insertCell(-1).innerHTML = status.liveStatus;
diff --git a/ui/modules/environments/environments.js b/ui/modules/environments/environments.js
index 827d73381a1..dcbb571ed59 100644
--- a/ui/modules/environments/environments.js
+++ b/ui/modules/environments/environments.js
@@ -50,6 +50,10 @@ function Environment(env) {
       enumerable: false,
       writable: true,
     },
+    bearerDevOps: {
+      enumerable: false,
+      writable: true,
+    },
     usernamePassword: {
       value: this.defaultUsernamePassword,
       enumerable: false,

From 73af3f7b5f11f20b548a2f6fd6d4cbd70a7d1e95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Sat, 1 Apr 2023 11:27:27 +0200
Subject: [PATCH 085/173] provide release notes for Ditto 3.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../_data/sidebars/ditto_sidebar.yml          | 21 ++++----
 .../pages/ditto/release_notes_321.md          | 53 +++++++++++++++++++
 2 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 documentation/src/main/resources/pages/ditto/release_notes_321.md

diff --git a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
index 2dec4961e8d..1a08a3122fa 100644
--- a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
+++ b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
@@ -23,6 +23,9 @@ entries:
       - title: Release Notes
         output: web
         folderitems:
+          - title: 3.2.1
+            url: /release_notes_321.html
+            output: web
           - title: 3.2.0
             url: /release_notes_320.html
             output: web
@@ -38,20 +41,20 @@ entries:
           - title: 3.0.0
             url: /release_notes_300.html
             output: web
-          - title: 2.4.2
-            url: /release_notes_242.html
-            output: web
-          - title: 2.4.1
-            url: /release_notes_241.html
-            output: web
-          - title: 2.4.0
-            url: /release_notes_240.html
-            output: web
 
             subfolders:
               - title: Archive
                 output: web
                 subfolderitems:
+                  - title: 2.4.2
+                    url: /release_notes_242.html
+                    output: web
+                  - title: 2.4.1
+                    url: /release_notes_241.html
+                    output: web
+                  - title: 2.4.0
+                    url: /release_notes_240.html
+                    output: web
                   - title: 2.3.2
                     url: /release_notes_232.html
                     output: web
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_321.md b/documentation/src/main/resources/pages/ditto/release_notes_321.md
new file mode 100644
index 00000000000..cb2b78547dd
--- /dev/null
+++ b/documentation/src/main/resources/pages/ditto/release_notes_321.md
@@ -0,0 +1,53 @@
+---
+title: Release notes 3.2.1
+tags: [release_notes]
+published: true
+keywords: release notes, announcements, changelog
+summary: "Version 3.2.1 of Eclipse Ditto, released on 01.04.2023"
+permalink: release_notes_321.html
+---
+
+This is a bugfix release, no new features since [3.2.0](release_notes_320.html) were added.
+
+## Changelog
+
+Compared to the latest release [3.2.0](release_notes_320.html), the following changes and bugfixes were added.
+
+### Changes
+
+#### [UI - New Operations tab](https://github.com/eclipse-ditto/ditto/pull/1600)
+
+The Ditto UI was enhanced with a new "Operation" tab where the log levels of the Ditto installation can be adjusted
+on-the-fly without restarting anything.  
+This functionality was already existing in the "devops" API and now has been exposed to the Ditto UI.
+
+
+### Bugfixes
+
+This is a complete list of the
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A3.2.1).
+
+#### [Don't use WARN log level when no policy is rolled back](https://github.com/eclipse-ditto/ditto/pull/1604)
+
+Added in Ditto 3.2.0, a policy is rolled back when it was implicitly created as part of a thing creation which failed
+for whatever reasons.  
+The `WARN` log message is however logged too many times, even if no policy was created and will be rolled back.  
+This was fixed.
+
+#### [Change notification filtering doesn't work for desired properties changes](https://github.com/eclipse-ditto/ditto/issues/1599)
+
+Desired properties were not mapped correctly when converting "thing events" to "things" and therefore filtering on 
+desired properties in e.g. connections, filtering on events, did not work.  
+This has been fixed.
+
+#### [Fix reading configured WoT TD "json template" from system property](https://github.com/eclipse-ditto/ditto/pull/1601)
+
+The system property to define a WoT TD template at property path `ditto.things.wot.to-thing-description.json-template`
+was not correctly rendered as Json Object if configured.  
+This has been fixed and can now be configured.
+
+#### [Enforcer actor ack time out handled in atomic thing create context](https://github.com/eclipse-ditto/ditto/pull/1598)
+
+Under heavy load it could happen that the policy caches in Thing "Enforcement" was misbehaving or were not correctly 
+invalidated which could lead to that creation of new things with implicit policy creation failed.  
+This has been fixed.

From 75e728042a52a4c0470d21247303335759c621af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 4 Apr 2023 17:56:50 +0200
Subject: [PATCH 086/173] #1593 support removing existing fields from a JSON
 object in a merge patch using a regular expression
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../resources/pages/ditto/httpapi-concepts.md | 76 ++++++++++++++++++
 .../eclipse/ditto/json/JsonMergePatch.java    | 31 +++++++-
 .../ditto/json/JsonMergePatchTest.java        | 77 +++++++++++++++++++
 3 files changed, 183 insertions(+), 1 deletion(-)

diff --git a/documentation/src/main/resources/pages/ditto/httpapi-concepts.md b/documentation/src/main/resources/pages/ditto/httpapi-concepts.md
index b0f56375ff4..b614ecf9670 100644
--- a/documentation/src/main/resources/pages/ditto/httpapi-concepts.md
+++ b/documentation/src/main/resources/pages/ditto/httpapi-concepts.md
@@ -393,6 +393,82 @@ interpreted as delete in contrast to `PUT` requests where `null` values have no
 Like `PUT` requests, `PATCH` requests can be applied at any level of the JSON structure of a thing, e.g. patching a
 complete thing at root level or patching a single property value at property level.
 
+### Removing fields in a merge update with a regex
+
+{% include note.html content="This is an addition to the JSON merge patch (RFC-7396), enhancing using `null` values
+    for deleting certain parts of JSON objects specified with a regular expression before applying new fields to it." %}
+
+The merge patch functionality in Ditto solves a common problem to the JSON merge patch (RFC-7396): whenever a JSON object
+shall be patched, all the old json fields are merged with all the new json fields, unless the exact field names are 
+specified in the patch with `"<field>": null`.  
+This would however require to know all existing fields upfront, which for a merge patch can not be assumed.
+
+The solution is a little enhancement to Ditto's merge patch functionality: The ability to delete arbitrary parts from
+JSON objects using a regular expression **before** applying all other patch values.
+
+The syntax for this function is rather specific (so that no "normally" occurring JSON keys match the same syntax):
+```json
+{
+  "{%raw%}{{ /.*/ }}{%endraw%}": null
+}
+```
+
+When such a `{%raw%}{{ /<regex>/ }}{%endraw%}` with the value `null` is detected in the merge patch, the content between the 2 `/` is 
+interpreted as regular expression to apply for finding keys to delete from the target object.  
+As a result, using `"{%raw%}{{ /.*/ }}{%endraw%}": null` would delete all the values inside a JSON object before applying the new 
+values provided in the patch.
+
+Example:  
+Assuming that inside a JSON object every month some aggregated data is stored with the year and month:  
+```json
+{
+  "thingId": "{thingId}",
+  "policyId": "{policyId}",
+  "features": {
+    "aggregated-history": {
+      "properties": {
+        "2022-11": 42.3,
+        "2022-12": 54.3,
+        "2023-01": 80.2,
+        "2023-02": 99.9
+      }
+    }
+  }
+}
+```
+
+Then the data from "last year" could be purged with the following patch, while adding a new value to the existing ones
+of this year:
+```json
+{
+  "features": {
+    "aggregated-history": {
+      "properties": {
+        "{%raw%}{{ /2022-.*/ }}{%endraw%}": null,
+        "2023-03": 105.21
+      }
+    }
+  }
+}
+```
+
+The resulting Thing JSON after applying the patch would then look like:
+```json
+{
+  "thingId": "{thingId}",
+  "policyId": "{policyId}",
+  "features": {
+    "aggregated-history": {
+      "properties": {
+        "2023-01": 80.2,
+        "2023-02": 99.9,
+        "2023-03": 105.21
+      }
+    }
+  }
+}
+```
+
 ### Permissions required for merge update
 
 To successfully execute merge update the authorized subject needs to have *WRITE* permission on *all* resources 
diff --git a/json/src/main/java/org/eclipse/ditto/json/JsonMergePatch.java b/json/src/main/java/org/eclipse/ditto/json/JsonMergePatch.java
index d1dee2ac365..415ecfac596 100644
--- a/json/src/main/java/org/eclipse/ditto/json/JsonMergePatch.java
+++ b/json/src/main/java/org/eclipse/ditto/json/JsonMergePatch.java
@@ -12,9 +12,11 @@
  */
 package org.eclipse.ditto.json;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
@@ -165,9 +167,11 @@ private static JsonObject mergeJsonObjects(final JsonObject jsonObject1, final J
             }
         });
 
+        final List<JsonKey> toBeNulledKeysByRegex = determineToBeNulledKeysByRegex(jsonObject1, jsonObject2);
+
         // add fields of jsonObject2 not present in jsonObject1
         jsonObject2.forEach(jsonField -> {
-            if (!jsonObject1.contains(jsonField.getKey())) {
+            if (!jsonObject1.contains(jsonField.getKey()) && !toBeNulledKeysByRegex.contains(jsonField.getKey())) {
                 builder.set(jsonField);
             }
         });
@@ -175,6 +179,31 @@ private static JsonObject mergeJsonObjects(final JsonObject jsonObject1, final J
         return builder.build();
     }
 
+    private static List<JsonKey> determineToBeNulledKeysByRegex(
+            final JsonObject jsonObject1,
+            final JsonObject jsonObject2) {
+
+        final List<JsonKey> toBeNulledKeysByRegex = new ArrayList<>();
+        final List<JsonKey> keyRegexes = jsonObject1.getKeys().stream()
+                .filter(key -> key.toString().startsWith("{{") && key.toString().endsWith("}}"))
+                .collect(Collectors.toList());
+        keyRegexes.forEach(keyRegex -> {
+            final String keyRegexWithoutCurly = keyRegex.toString().substring(2, keyRegex.length() - 2).trim();
+            if (keyRegexWithoutCurly.startsWith("/") && keyRegexWithoutCurly.endsWith("/")) {
+                final String regexStr = keyRegexWithoutCurly.substring(1, keyRegexWithoutCurly.length() - 1);
+                final Pattern pattern = Pattern.compile(regexStr);
+                jsonObject1.getValue(keyRegex)
+                        .filter(JsonValue::isNull) // only support deletion via regex, so only support "null" values
+                        .ifPresent(keyRegexValue ->
+                                jsonObject2.getKeys().stream()
+                                        .filter(key -> pattern.matcher(key).matches())
+                                        .forEach(toBeNulledKeysByRegex::add)
+                );
+            }
+        });
+        return toBeNulledKeysByRegex;
+    }
+
     /**
      * Applies this merge patch on the given json value.
      *
diff --git a/json/src/test/java/org/eclipse/ditto/json/JsonMergePatchTest.java b/json/src/test/java/org/eclipse/ditto/json/JsonMergePatchTest.java
index 2e699e28ae6..f21da4bafa4 100644
--- a/json/src/test/java/org/eclipse/ditto/json/JsonMergePatchTest.java
+++ b/json/src/test/java/org/eclipse/ditto/json/JsonMergePatchTest.java
@@ -447,4 +447,81 @@ public void mergeFieldsFromBothObjectsRFC7396_TestCase13() {
         Assertions.assertThat(mergedObject).isEqualTo(expectedObject);
     }
 
+    @Test
+    public void removeFieldsUsingRegexWithNullValue() {
+        final JsonObject originalObject = JsonFactory.newObjectBuilder()
+                .set("a", JsonFactory.newObjectBuilder()
+                        .set("2023-04-01", JsonValue.of(true))
+                        .set("2023-04-02", JsonValue.of("hello"))
+                        .set("2023-04-03", JsonValue.of("darkness"))
+                        .set("2023-04-04", JsonValue.of("my"))
+                        .set("2023-04-05", JsonValue.of("old"))
+                        .set("2023-04-06", JsonValue.of("friend"))
+                        .build())
+                .set("b", JsonFactory.newObjectBuilder()
+                        .set("2023-04-01", JsonValue.of(true))
+                        .set("2023-04-02", JsonValue.of("hello"))
+                        .set("2023-04-03", JsonValue.of("darkness"))
+                        .set("2023-04-04", JsonValue.of("my"))
+                        .set("2023-04-05", JsonValue.of("old"))
+                        .set("2023-04-06", JsonValue.of("friend"))
+                        .build())
+                .set("c", JsonFactory.newObjectBuilder()
+                        .set("some", JsonValue.of(true))
+                        .set("2023-04-02", JsonValue.of("hello"))
+                        .set("totally-other", JsonValue.of("darkness"))
+                        .set("foo", JsonValue.of("my"))
+                        .build())
+                .build();
+
+        final JsonObject objectToPatch = JsonFactory.newObjectBuilder()
+                .set("a", JsonFactory.newObjectBuilder()
+                        .set("{{ /2023-04-.*/ }}", JsonValue.nullLiteral())
+                        .set("2023-05-01", JsonValue.of("new"))
+                        .set("2023-05-02", JsonValue.of("catch"))
+                        .set("2023-05-03", JsonValue.of("phrase"))
+                        .build())
+                .set("b", JsonFactory.newObjectBuilder()
+                        .set("{{ /2023-04-01/ }}", JsonValue.nullLiteral())
+                        .set("{{ /^2023-04-03$/ }}", JsonValue.nullLiteral())
+                        .set("{{ /[0-9]{4}-04-.+4/ }}", JsonValue.nullLiteral())
+                        .set("2023-05-01", JsonValue.of("new"))
+                        .set("2023-05-02", JsonValue.of("catch"))
+                        .set("2023-05-03", JsonValue.of("phrase"))
+                        .build())
+                .set("c", JsonFactory.newObjectBuilder()
+                        .set("{{ /.*/ }}", JsonValue.nullLiteral())
+                        .set("2023-05-01", JsonValue.of("new"))
+                        .set("2023-05-02", JsonValue.of("catch"))
+                        .set("2023-05-03", JsonValue.of("phrase"))
+                        .build())
+                .build();
+
+        final JsonValue expectedObject = JsonFactory.newObjectBuilder()
+                .set("a", JsonFactory.newObjectBuilder()
+                        .set("2023-05-01", JsonValue.of("new"))
+                        .set("2023-05-02", JsonValue.of("catch"))
+                        .set("2023-05-03", JsonValue.of("phrase"))
+                        .build())
+                .set("b", JsonFactory.newObjectBuilder()
+                        .set("2023-04-02", JsonValue.of("hello"))
+                        .set("2023-04-05", JsonValue.of("old"))
+                        .set("2023-04-06", JsonValue.of("friend"))
+                        .set("2023-05-01", JsonValue.of("new"))
+                        .set("2023-05-02", JsonValue.of("catch"))
+                        .set("2023-05-03", JsonValue.of("phrase"))
+                        .build())
+                .set("c", JsonFactory.newObjectBuilder()
+                        .set("2023-05-01", JsonValue.of("new"))
+                        .set("2023-05-02", JsonValue.of("catch"))
+                        .set("2023-05-03", JsonValue.of("phrase"))
+                        .build())
+                .build();
+
+        final JsonValue mergedObject = JsonMergePatch.of(objectToPatch).applyOn(originalObject);
+
+        Assertions.assertThat(mergedObject).isEqualTo(expectedObject);
+    }
+
+
 }

From 915e68b1819ddf1f7762bbbf3e79537dc02844a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 5 Apr 2023 11:56:19 +0200
Subject: [PATCH 087/173] #1593 added special "merge command" enforcement for
 patches including a regex: in that case, unrestricted WRITE access on the
 contained JSON object is required
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../enforcement/ThingCommandEnforcement.java  | 22 +++++++++-
 .../MergeThingCommandEnforcementTest.java     | 42 ++++++++++++++++++-
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java
index 85b7dbab646..45d6b6f1572 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java
@@ -37,6 +37,7 @@
 import org.eclipse.ditto.internal.utils.cacheloaders.config.AskWithRetryConfig;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonFieldSelector;
+import org.eclipse.ditto.json.JsonKey;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.JsonPointerInvalidException;
@@ -503,7 +504,15 @@ private static boolean enforceMergeThingCommand(final Enforcer enforcer,
     private static Set<ResourceKey> calculateLeaves(final JsonPointer path, final JsonValue value) {
         if (value.isObject()) {
             return value.asObject().stream()
-                    .map(f -> calculateLeaves(path.append(f.getKey().asPointer()), f.getValue()))
+                    .map(f -> {
+                        final JsonKey key = f.getKey();
+                        if (isMergeWithNulledKeysByRegex(key, f.getValue())) {
+                            // if regex is contained, writing all below that path must be granted in the policy:
+                            return Set.of(PoliciesResourceType.thingResource(path));
+                        } else {
+                            return calculateLeaves(path.append(key.asPointer()), f.getValue());
+                        }
+                    })
                     .reduce(new HashSet<>(), ThingCommandEnforcement::addAll, ThingCommandEnforcement::addAll);
         } else {
             return Set.of(PoliciesResourceType.thingResource(path));
@@ -515,4 +524,15 @@ private static Set<ResourceKey> addAll(final Set<ResourceKey> result, final Set<
         return result;
     }
 
+    private static boolean isMergeWithNulledKeysByRegex(final JsonKey key, final JsonValue value) {
+        final String keyString = key.toString();
+        if (keyString.startsWith("{{") && keyString.endsWith("}}")) {
+            final String keyRegexWithoutCurly = keyString.substring(2, keyString.length() - 2).trim();
+            return keyRegexWithoutCurly.startsWith("/") && keyRegexWithoutCurly.endsWith("/") &&
+                    value.isNull();
+        } else {
+            return false;
+        }
+    }
+
 }
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/MergeThingCommandEnforcementTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/MergeThingCommandEnforcementTest.java
index e1dec6f3477..29d6068b885 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/MergeThingCommandEnforcementTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/MergeThingCommandEnforcementTest.java
@@ -32,6 +32,7 @@
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.policies.model.EffectedPermissions;
 import org.eclipse.ditto.policies.model.PoliciesModelFactory;
 import org.eclipse.ditto.policies.model.Policy;
@@ -41,6 +42,7 @@
 import org.eclipse.ditto.things.api.Permission;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingNotModifiableException;
 import org.eclipse.ditto.things.model.signals.commands.modify.MergeThing;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -119,6 +121,44 @@ void rejectByPolicy(final TestArgument arg) {
                 () -> ThingCommandEnforcement.authorizeByPolicyOrThrow(policyEnforcer, arg.getMergeThing()));
     }
 
+    @Test
+    void acceptUsingRegexInPolicy() {
+        final TestArgument testArgument = TestArgument.of("/",
+                Set.of("/", "/attributes/complex"),
+                Set.of("/attributes/simple")
+        );
+        final TrieBasedPolicyEnforcer policyEnforcer = TrieBasedPolicyEnforcer.newInstance(testArgument.getPolicy());
+        final JsonObject patch = JsonObject.newBuilder()
+                .set("attributes", JsonObject.newBuilder()
+                        .set("complex", JsonObject.newBuilder()
+                                .set("{{ /.*/ }}", JsonValue.nullLiteral())
+                                .build()
+                        )
+                        .set("another", 42)
+                        .build())
+                .build();
+        final MergeThing mergeThing = MergeThing.of(TestSetup.THING_ID, JsonPointer.empty(), patch, TestArgument.headers());
+        final MergeThing authorizedMergeThing =
+                ThingCommandEnforcement.authorizeByPolicyOrThrow(policyEnforcer, mergeThing);
+        assertThat(authorizedMergeThing.getDittoHeaders().getAuthorizationContext()).isNotNull();
+    }
+
+    @Test
+    void rejectUsingRegexWithRevokesInPolicy() {
+        final TestArgument testArgument = TestArgument.of("/", Set.of("/"), Set.of("/attributes/complex/nested/secret"));
+        final TrieBasedPolicyEnforcer policyEnforcer = TrieBasedPolicyEnforcer.newInstance(testArgument.getPolicy());
+        final JsonObject patch = JsonObject.newBuilder()
+                .set("attributes", JsonObject.newBuilder()
+                        .set("{{ /.*/ }}", JsonValue.nullLiteral())
+                        .set("simple", "value")
+                        .set("another", 42)
+                        .build())
+                .build();
+        final MergeThing mergeThing = MergeThing.of(TestSetup.THING_ID, JsonPointer.empty(), patch, TestArgument.headers());
+        assertThatExceptionOfType(ThingNotModifiableException.class).isThrownBy(
+                () -> ThingCommandEnforcement.authorizeByPolicyOrThrow(policyEnforcer, mergeThing));
+    }
+
     /**
      * Generates combinations of a Policy and MergeThing commands that should be <b>accepted</b> by command enforcement.
      */
@@ -244,7 +284,7 @@ private static MergeThing toMergeCommand(final JsonPointer path, final JsonObjec
             return MergeThing.of(TestSetup.THING_ID, path, patch.getValue(path).orElseThrow(), headers());
         }
 
-        private static DittoHeaders headers() {
+        static DittoHeaders headers() {
             return DittoHeaders.newBuilder()
                     .authorizationContext(
                             AuthorizationContext.newInstance(DittoAuthorizationContextType.UNSPECIFIED,

From eb4773edff4a199785d74b8a4997070725361177 Mon Sep 17 00:00:00 2001
From: neottil <neot.luka.89@gmail.com>
Date: Thu, 20 Apr 2023 17:59:44 +0200
Subject: [PATCH 088/173] uniform paths using " char instead of '

---
 .../resources/openapi/sources/api-2-index.yml | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/documentation/src/main/resources/openapi/sources/api-2-index.yml b/documentation/src/main/resources/openapi/sources/api-2-index.yml
index 7d2eb650d50..bbcbd0ffe12 100644
--- a/documentation/src/main/resources/openapi/sources/api-2-index.yml
+++ b/documentation/src/main/resources/openapi/sources/api-2-index.yml
@@ -125,9 +125,9 @@ paths:
   '/policies/{policyId}/entries/{label}/resources/{resourcePath}':
     $ref: "./paths/policies/resource.yml"
   '/policies/{policyId}/imports':
-    $ref: './paths/policies/imports.yml'
+    $ref: "./paths/policies/imports.yml"
   '/policies/{policyId}/imports/{importedPolicyId}':
-    $ref: './paths/policies/import.yml'
+    $ref: "./paths/policies/import.yml"
 
   ###
   ### Who Am I
@@ -153,17 +153,17 @@ paths:
   ### Connections
   ###
   '/connections':
-    $ref: './paths/connections/connections.yml'
+    $ref: "./paths/connections/connections.yml"
   '/connections/{connectionId}':
-    $ref: './paths/connections/connectionId.yml'
+    $ref: "./paths/connections/connectionId.yml"
   '/connections/{connectionId}/command':
-    $ref: './paths/connections/command.yml'
+    $ref: "./paths/connections/command.yml"
   '/connections/{connectionId}/status':
-    $ref: './paths/connections/status.yml'
+    $ref: "./paths/connections/status.yml"
   '/connections/{connectionId}/metrics':
-    $ref: './paths/connections/metrics.yml'
+    $ref: "./paths/connections/metrics.yml"
   '/connections/{connectionId}/logs':
-    $ref: './paths/connections/logs.yml'
+    $ref: "./paths/connections/logs.yml"
 
 
 components:
@@ -272,7 +272,7 @@ components:
     TimeoutParam:
       $ref: "./parameters/timeoutParam.yml"
     ConnectionIdPathParam:
-      $ref: './parameters/connectionIdPathParam.yml'
+      $ref: "./parameters/connectionIdPathParam.yml"
     ConnectionFieldsQueryParam:
       $ref: "./parameters/connectionFieldsQueryParam.yml"
 
@@ -332,57 +332,57 @@ components:
     Features:
       $ref: "./schemas/features/features.yml"
     Connection:
-      $ref: './schemas/connections/connection.yml'
+      $ref: "./schemas/connections/connection.yml"
     NewConnection:
-      $ref: './schemas/connections/newConnection.yml'
+      $ref: "./schemas/connections/newConnection.yml"
     Sources:
-      $ref: './schemas/connections/sources.yml'
+      $ref: "./schemas/connections/sources.yml"
     Source:
-      $ref: './schemas/connections/source.yml'
+      $ref: "./schemas/connections/source.yml"
     Targets:
-      $ref: './schemas/connections/targets.yml'
+      $ref: "./schemas/connections/targets.yml"
     Target:
-      $ref: './schemas/connections/target.yml'
+      $ref: "./schemas/connections/target.yml"
     ConnectionType:
-      $ref: './schemas/connections/connectionType.yml'
+      $ref: "./schemas/connections/connectionType.yml"
     ConnectivityStatus:
-      $ref: './schemas/connections/connectivityStatus.yml'
+      $ref: "./schemas/connections/connectivityStatus.yml"
     PayloadMappingDefinitions:
-      $ref: './schemas/connections/payloadMappingDefinitions.yml'
+      $ref: "./schemas/connections/payloadMappingDefinitions.yml"
     PayloadMappingDefinition:
-      $ref: './schemas/connections/payloadMappingDefinition.yml'
+      $ref: "./schemas/connections/payloadMappingDefinition.yml"
     MappingContext:
-      $ref: './schemas/connections/mappingContext.yml'
+      $ref: "./schemas/connections/mappingContext.yml"
     ConnectionStatus:
-      $ref: './schemas/connections/connectionStatus.yml'
+      $ref: "./schemas/connections/connectionStatus.yml"
     ResourceStatus:
-      $ref: './schemas/connections/resourceStatus.yml'
+      $ref: "./schemas/connections/resourceStatus.yml"
     ConnectionMetrics:
-      $ref: './schemas/connections/connectionMetrics.yml'
+      $ref: "./schemas/connections/connectionMetrics.yml"
     OverallConnectionMetrics:
-      $ref: './schemas/connections/overallConnectionMetrics.yml'
+      $ref: "./schemas/connections/overallConnectionMetrics.yml"
     SourceMetrics:
-      $ref: './schemas/connections/sourceMetrics.yml'
+      $ref: "./schemas/connections/sourceMetrics.yml"
     TargetMetrics:
-      $ref: './schemas/connections/targetMetrics.yml'
+      $ref: "./schemas/connections/targetMetrics.yml"
     InboundMetrics:
-      $ref: './schemas/connections/inboundMetrics.yml'
+      $ref: "./schemas/connections/inboundMetrics.yml"
     OutboundMetrics:
-      $ref: './schemas/connections/outboundMetrics.yml'
+      $ref: "./schemas/connections/outboundMetrics.yml"
     TypedMetric:
-      $ref: './schemas/connections/typedMetric.yml'
+      $ref: "./schemas/connections/typedMetric.yml"
     SingleMetric:
-      $ref: './schemas/connections/singleMetric.yml'
+      $ref: "./schemas/connections/singleMetric.yml"
     ConnectionLogs:
-      $ref: './schemas/connections/connectionLogs.yml'
+      $ref: "./schemas/connections/connectionLogs.yml"
     LogEntry:
-      $ref: './schemas/connections/logEntry.yml'
+      $ref: "./schemas/connections/logEntry.yml"
     LogCategory:
-      $ref: './schemas/connections/logCategory.yml'
+      $ref: "./schemas/connections/logCategory.yml"
     LogType:
-      $ref: './schemas/connections/logType.yml'
+      $ref: "./schemas/connections/logType.yml"
     LogLevel:
-      $ref: './schemas/connections/logLevel.yml'
+      $ref: "./schemas/connections/logLevel.yml"
     WhoAmI:
       $ref: "./schemas/whoami/whoami.yml"
     WhoAmISubject:
@@ -392,12 +392,12 @@ components:
 
   securitySchemes:
     NginxBasic:
-      $ref: './security/nginxBasic.yml'
+      $ref: "./security/nginxBasic.yml"
     Bearer:
-      $ref: './security/bearerAuth.yml'
+      $ref: "./security/bearerAuth.yml"
     Google:
-      $ref: './security/google.yml'
+      $ref: "./security/google.yml"
     DevOpsBasic:
-      $ref: './security/devOpsBasic.yml'
+      $ref: "./security/devOpsBasic.yml"
     DevOpsBearer:
-      $ref: './security/devOpsBearer.yml'
+      $ref: "./security/devOpsBearer.yml"

From 3524451bea8e4b2b0c99f3eb6eafb3d7c36088bf Mon Sep 17 00:00:00 2001
From: neottil <neot.luka.89@gmail.com>
Date: Fri, 21 Apr 2023 14:58:06 +0200
Subject: [PATCH 089/173] fix openapi error Semantic error at
 paths./things/{thingId}/features.patch.parameters.1.name Path parameter
 "featureId" must have the corresponding {featureId} segment in the
 "/things/{thingId}/features" path Jump to line 2071

---
 documentation/src/main/resources/openapi/ditto-api-2.yml         | 1 -
 .../src/main/resources/openapi/sources/paths/features/index.yml  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/documentation/src/main/resources/openapi/ditto-api-2.yml b/documentation/src/main/resources/openapi/ditto-api-2.yml
index 07c36196c6c..c02cba89b74 100644
--- a/documentation/src/main/resources/openapi/ditto-api-2.yml
+++ b/documentation/src/main/resources/openapi/ditto-api-2.yml
@@ -2068,7 +2068,6 @@ paths:
         - Features
       parameters:
         - $ref: '#/components/parameters/ThingIdPathParam'
-        - $ref: '#/components/parameters/FeatureIdPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/index.yml b/documentation/src/main/resources/openapi/sources/paths/features/index.yml
index 119cf9b9a0e..03f8121a007 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/index.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/index.yml
@@ -291,7 +291,6 @@ patch:
     - Features
   parameters:
     - $ref: '../../parameters/thingIdPathParam.yml'
-    - $ref: '../../parameters/featureIdPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'

From f8545cd91cf0efdb6b6e00c8ed9718d9370539a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 24 Apr 2023 21:49:08 +0200
Subject: [PATCH 090/173] #1614 provided documentation for creating a thing
 with "merge/patch command"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../main/resources/openapi/ditto-api-2.yml    |  27 +-
 .../openapi/sources/paths/things/thing.yml    |  27 +-
 ...l-specification-things-create-or-modify.md | 465 +++++++++---------
 .../protocol-specification-things-merge.md    | 404 +++++++--------
 .../ditto/protocol-specification-things.md    |  16 +-
 .../generated/commands/merge/mergething.md    |   3 +-
 .../commands/merge/mergethingresponse.md      |   2 +-
 7 files changed, 503 insertions(+), 441 deletions(-)

diff --git a/documentation/src/main/resources/openapi/ditto-api-2.yml b/documentation/src/main/resources/openapi/ditto-api-2.yml
index 07c36196c6c..32102b08847 100644
--- a/documentation/src/main/resources/openapi/ditto-api-2.yml
+++ b/documentation/src/main/resources/openapi/ditto-api-2.yml
@@ -458,18 +458,20 @@ paths:
                       temperature: 44
         description: JSON representation of the thing to be modified.
     patch:
-      summary: Patch a thing with a specified ID
+      summary: Create or patch a thing with a specified ID
       description: |-
-        Patch an existing thing specified by the `thingId` path parameter.
+        Create or patch an existing thing specified by the `thingId` path parameter.
 
-        Patching a thing will merge the provided request body with the exisiting thing.
+        If the thing did not yet exist, it will be created.
+        For an existing thing, patching a thing will merge the provided request body with the existing thing values.
         This makes it possible to change only some parts of a thing in single request without providing the full thing
         structure in the request body.
 
 
         ### Patch a thing
 
-        With this resource it is possible to add, update or delete parts of an existing thing.
+        With this resource it is possible to add, update or delete parts of an existing thing or to create the thing if it
+        does not yet exist.
         The request body provided in *JSON merge patch* (RFC-7396) format will be merged with the existing thing.
         Notice that the `null` value in the JSON body will delete the specified JSON key from the thing.
         For further documentation of JSON merge patch see [RFC 7396](https://tools.ietf.org/html/rfc7396).
@@ -595,6 +597,23 @@ paths:
         - $ref: '#/components/parameters/ConditionParam'
         - $ref: '#/components/parameters/ChannelParam'
       responses:
+        '201':
+          description: The thing was successfully created.
+          headers:
+            ETag:
+              description: |-
+                The (current server-side) ETag for this (sub-)resource. For top-level resources it is in the format
+                "rev:[revision]", for sub-resources it has the format "hash:[calculated-hash]".
+              schema:
+                type: string
+            Location:
+              description: The location of the created thing resource
+              schema:
+                type: string
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Thing'
         '204':
           description: The thing was successfully patched.
           headers:
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/thing.yml b/documentation/src/main/resources/openapi/sources/paths/things/thing.yml
index 38a3856d423..3e551e7079d 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/thing.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/thing.yml
@@ -278,18 +278,20 @@ put:
         }
     description: JSON representation of the thing to be modified.
 patch:
-  summary: Patch a thing with a specified ID
+  summary: Create or patch a thing with a specified ID
   description: |-
-    Patch an existing thing specified by the `thingId` path parameter.
+    Create or patch an existing thing specified by the `thingId` path parameter.
 
-    Patching a thing will merge the provided request body with the exisiting thing.
+    If the thing did not yet exist, it will be created.
+    For an existing thing, patching a thing will merge the provided request body with the existing thing values.
     This makes it possible to change only some parts of a thing in single request without providing the full thing
     structure in the request body.
 
 
     ### Patch a thing
 
-    With this resource it is possible to add, update or delete parts of an existing thing.
+    With this resource it is possible to add, update or delete parts of an existing thing or to create the thing if it
+    does not yet exist.
     The request body provided in *JSON merge patch* (RFC-7396) format will be merged with the existing thing.
     Notice that the `null` value in the JSON body will delete the specified JSON key from the thing.
     For further documentation of JSON merge patch see [RFC 7396](https://tools.ietf.org/html/rfc7396).
@@ -415,6 +417,23 @@ patch:
     - $ref: '../../parameters/conditionParam.yml'
     - $ref: '../../parameters/channelParam.yml'
   responses:
+    '201':
+      description: The thing was successfully created.
+      headers:
+        ETag:
+          description: |-
+            The (current server-side) ETag for this (sub-)resource. For top-level resources it is in the format
+            "rev:[revision]", for sub-resources it has the format "hash:[calculated-hash]".
+          schema:
+            type: string
+        Location:
+          description: The location of the created thing resource
+          schema:
+            type: string
+      content:
+        application/json:
+          schema:
+            $ref: '../../schemas/things/thing.yml'
     '204':
       description: The thing was successfully patched.
       headers:
diff --git a/documentation/src/main/resources/pages/ditto/protocol-specification-things-create-or-modify.md b/documentation/src/main/resources/pages/ditto/protocol-specification-things-create-or-modify.md
index 782cf83c495..b6404862b0e 100644
--- a/documentation/src/main/resources/pages/ditto/protocol-specification-things-create-or-modify.md
+++ b/documentation/src/main/resources/pages/ditto/protocol-specification-things-create-or-modify.md
@@ -19,30 +19,30 @@ all permissions set to true will be created.
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/create`     |
-| **path**  | `/`     |
+| Field     | Value                                                                                                                     |
+|-----------|---------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/create`                                                                |
+| **path**  | `/`                                                                                                                       |
 | **value** | The complete thing as JSON object, see [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/create` |
-| **path**   |        | `/`                      |
+| Field      |        | Value                                                                                                                    |
+|------------|--------|--------------------------------------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/create`                                                               |
+| **path**   |        | `/`                                                                                                                      |
 | **value**  |        | The created Thing as JSON object, see [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
-| **status** | *code* |                          | 
-|            | `201`  | Success - the thing was created successfully.       |
+| **status** | *code* |                                                                                                                          | 
+|            | `201`  | Success - the thing was created successfully.                                                                            |
 
 ### Event
 
 The event emitted by Ditto after a thing was created.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`     |
-| **path**  | `/`     |
+| Field     | Value                                                                                                                   |
+|-----------|-------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`                                                               |
+| **path**  | `/`                                                                                                                     |
 | **value** | The created thing as JSON object, see [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload) |
 
 **Example:** [Create a Thing.](protocol-examples-creatething.html)
@@ -54,10 +54,10 @@ This command modifies the thing specified by the `<namespace>` and `<thingId>` i
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`     |
-| **path**  | `/`     |
+| Field     | Value                                                                                                                 |
+|-----------|-----------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                            |
+| **path**  | `/`                                                                                                                   |
 | **value** | The complete thing as JSON.<br/>see [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload) |
 
 For modifying an existing thing, the authorized subject needs WRITE permission.<br/>
@@ -65,23 +65,34 @@ If the thing does not yet exist, the same rules apply as described for the [crea
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
+If the Thing was created successfully: 
+
+| Field      |        | Value                                                                                                                    |
+|------------|--------|--------------------------------------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/create`                                                               |
+| **path**   |        | `/`                                                                                                                      |
+| **value**  |        | The created Thing as JSON object, see [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
+| **status** | _code_ |    
+|            | `201`  | Success - the Thing was created successfully.                                                                            |
+
+If the Thing was modified successfully:
+
+| Field      |        | Value                                                      |
+|------------|--------|------------------------------------------------------------|
 | **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify` |
-| **path**   |        | `/`                      |
-| **value**  |        | The created Thing as JSON object, see [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). This field is not available, if the Thing already existed. |
+| **path**   |        | `/`                                                        |
+| **value**  |        | This field is not available, if the Thing already existed. |
 | **status** | _code_ |    
-|            | `201`  | Success - the Thing was created successfully.       |
-|            | `204`  | Success - the Thing was modified successfully.       |
+|            | `204`  | Success - the Thing was modified successfully.             |
 
 ### Event
 
 The event emitted by Ditto after a thing was modified.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`     |
-| **path**  | `/`     |
+| Field     | Value                                                                                                                 |
+|-----------|-----------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`                                                            |
+| **path**  | `/`                                                                                                                   |
 | **value** | The modified Thing as JSON<br/>see [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Modify a Thing](protocol-examples-modifything.html)
@@ -95,42 +106,42 @@ The Attributes will be replaced by the JSON in the `value`.
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`     |
-| **path**  | `/attributes`     |
+| Field     | Value                                                                                                                                                                        |
+|-----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                                                                                   |
+| **path**  | `/attributes`                                                                                                                                                                |
 | **value** | The attributes of the thing as JSON, see property `attributes` of Things JSON schema. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify` |
-| **path**   |        | `/attributes`                      |
+| Field      |        | Value                                                                                                                                                                                                                                            |
+|------------|--------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                                                                                                                                                       |
+| **path**   |        | `/attributes`                                                                                                                                                                                                                                    |
 | **value**  |        | The created attributes as JSON, see property `attributes` of Things JSON schema. See [Ditto protocol payload (JSON).](protocol-specification.html#dittoProtocolPayload). This field is not available, if the thing already contained attributes. |
-| **status** | _code_ |                          | 
-|            | `201`  | Success - Attributes were created successfully.       |
-|            | `204`  | Success - Attributes were modified successfully.       |
+| **status** | _code_ |                                                                                                                                                                                                                                                  | 
+|            | `201`  | Success - Attributes were created successfully.                                                                                                                                                                                                  |
+|            | `204`  | Success - Attributes were modified successfully.                                                                                                                                                                                                 |
 
 ### Event
 
 If the thing already contained attributes before the command was applied and they were thus overwritten, a `modified` 
 event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`     |
-| **path**  | `/attributes`     |
+| Field     | Value                                                                                                                                                                                     |
+|-----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`                                                                                                                                |
+| **path**  | `/attributes`                                                                                                                                                                             |
 | **value** | The modified attributes of the thing as JSON, see property `attributes` of the Things JSON schema. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Modify Attributes](protocol-examples-modifyattributes.html)
 
 If the thing did not yet contain attributes before the command was applied, a `created` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`     |
-| **path**  | `/attributes`     |
+| Field     | Value                                                                                                                                                                                  |
+|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`                                                                                                                              |
+| **path**  | `/attributes`                                                                                                                                                                          |
 | **value** | The created Attributes of the Thing as JSON, see property `attributes` of the Things JSON schema at [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Create Attributes](protocol-examples-createattributes.html)
@@ -143,43 +154,43 @@ The attribute (JSON) can be referenced hierarchically by applying [JSON Pointer
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`     |
-| **path**  | `/attributes/<attributePath>`     |
-| **value** | The specific attribute of the Thing as JSON. |
+| Field     | Value                                                      |
+|-----------|------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify` |
+| **path**  | `/attributes/<attributePath>`                              |
+| **value** | The specific attribute of the Thing as JSON.               |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify` |
-| **path**   |        | `/attributes/<attributePath>`                      |
+| Field      |        | Value                                                                                         |
+|------------|--------|-----------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify`                                    |
+| **path**   |        | `/attributes/<attributePath>`                                                                 |
 | **value**  |        | The created attribute as JSON. This field is not available, if the attribute already existed. |
-| **status** | _code_ |                          | 
-|            | `201`  | Success - The Attribute was created successfully.       |
-|            | `204`  | Success - The Attribute was modified successfully.       |
+| **status** | _code_ |                                                                                               | 
+|            | `201`  | Success - The Attribute was created successfully.                                             |
+|            | `204`  | Success - The Attribute was modified successfully.                                            |
 
 ### Event
 
 If the attribute already existed before the command was applied and it was thus overwritten by the command, a 
 `modified` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`     |
-| **path**  | `/attributes/<attributePath>`     |
-| **value** | The modified Attribute of the Thing as JSON value. |
+| Field     | Value                                                      |
+|-----------|------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified` |
+| **path**  | `/attributes/<attributePath>`                              |
+| **value** | The modified Attribute of the Thing as JSON value.         |
 
 **Example:** [Modify a single Attribute](protocol-examples-modifyattribute.html)
 
 If the attribute did not yet exist before the command was applied, a `created` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`     |
-| **path**  | `/attributes/<attributePath>`     |
-| **value** | The created Attribute of the Thing as JSON value. |
+| Field     | Value                                                     |
+|-----------|-----------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/created` |
+| **path**  | `/attributes/<attributePath>`                             |
+| **value** | The created Attribute of the Thing as JSON value.         |
 
 **Example:** [Create a single Attribute](protocol-examples-createattribute.html)
 
@@ -190,42 +201,42 @@ The definition will be created in case it doesn't exist yet, otherwise the thing
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`     |
-| **path**  | `/definition`     |
+| Field     | Value                                                      |
+|-----------|------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify` |
+| **path**  | `/definition`                                              |
 | **value** | The specific definition of the Thing as JSON string value. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify` |
-| **path**   |        | `/definition`                      |
+| Field      |        | Value                                                                                                        |
+|------------|--------|--------------------------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                   |
+| **path**   |        | `/definition`                                                                                                |
 | **value**  |        | The created definition as JSON string value. This field is not available, if the definition already existed. |
-| **status** | _code_ |                          | 
-|            | `201`  | Success - The definition was created successfully.       |
-|            | `204`  | Success - The definition was modified successfully.       |
+| **status** | _code_ |                                                                                                              | 
+|            | `201`  | Success - The definition was created successfully.                                                           |
+|            | `204`  | Success - The definition was modified successfully.                                                          |
 
 ### Event
 
 If the definition already existed before the command was applied and it was thus overwritten by the command, a 
 `modified` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`     |
-| **path**  | `/definition`     |
+| Field     | Value                                                      |
+|-----------|------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified` |
+| **path**  | `/definition`                                              |
 | **value** | The modified definition of the Thing as JSON string value. |
 
 **Example:** [Modify a definition](protocol-examples-modifythingdefinition.html)
 
 If the definition did not yet exist before the command was applied, a `created` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`     |
-| **path**  | `/definition`     |
+| Field     | Value                                                     |
+|-----------|-----------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/created` |
+| **path**  | `/definition`                                             |
 | **value** | The created definition of the Thing as JSON string value. |
 
 **Example:** [Create a definition](protocol-examples-createthingdefinition.html)
@@ -237,42 +248,42 @@ The list of Features will be replaced by the JSON in the `value`.
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`     |
-| **path**  | `/features`     |
+| Field     | Value                                                                                                                                                                    |
+|-----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                                                                               |
+| **path**  | `/features`                                                                                                                                                              |
 | **value** | All Features of the Thing as JSON, see property `features` of Things JSON schema. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify` |
-| **path**   |        | `/features`                      |
+| Field      |        | Value                                                                                                                                                                                                                                   |
+|------------|--------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                                                                                                                                              |
+| **path**   |        | `/features`                                                                                                                                                                                                                             |
 | **value**  |        | The created Features as JSON, see property `features` of Things JSON schema at [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). This field is not available, if the thing already contained features. |
-| **status** | _code_ |                          | 
-|            | `201`  | Success - The Features were created successfully.       |
-|            | `204`  | Success - The Features were modified successfully.       |
+| **status** | _code_ |                                                                                                                                                                                                                                         | 
+|            | `201`  | Success - The Features were created successfully.                                                                                                                                                                                       |
+|            | `204`  | Success - The Features were modified successfully.                                                                                                                                                                                      |
 
 ### Event
 
 If the thing already contained Features before the command was applied and they were thus overwritten, a 
 `modified` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`     |
-| **path**  | `/features`     |
+| Field     | Value                                                                                                                                                                        |
+|-----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`                                                                                                                   |
+| **path**  | `/features`                                                                                                                                                                  |
 | **value** | All Features of the Thing as JSON, see property `features` of the Things JSON schema. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Modify Features](protocol-examples-modifyfeatures.html)
 
 If the thing did not yet contain Features before the command was applied, a `created` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`     |
-| **path**  | `/features`     |
+| Field     | Value                                                                                                                                                                      |
+|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`                                                                                                                  |
+| **path**  | `/features`                                                                                                                                                                |
 | **value** | All Features of the Thing as JSON, see property `features` of the Things JSON schema at [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Create Features](protocol-examples-createfeatures.html)
@@ -283,42 +294,42 @@ Create or modify a specific Feature (identified by the Feature ID in the `path`)
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`     |
-| **path**  | `/features/<featureId>`     |
+| Field     | Value                                                                                                                             |
+|-----------|-----------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                                        |
+| **path**  | `/features/<featureId>`                                                                                                           |
 | **value** | The specific Feature of the Thing as JSON. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify` |
-| **path**   |        | `/features/<featureId>`                      |
+| Field      |        | Value                                                                                                                                                                            |
+|------------|--------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                                                                                       |
+| **path**   |        | `/features/<featureId>`                                                                                                                                                          |
 | **value**  |        | The created Feature as JSON. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). This field is not available, if the Feature already existed. |
-| **status** | _code_ |                          | 
-|            | `201`  | Success - The Feature was created successfully.       |
-|            | `204`  | Success - the Feature was modified successfully.       |
+| **status** | _code_ |                                                                                                                                                                                  | 
+|            | `201`  | Success - The Feature was created successfully.                                                                                                                                  |
+|            | `204`  | Success - the Feature was modified successfully.                                                                                                                                 |
 
 ### Event
 
 If the Feature already existed before the command was applied and it was thus overwritten by the command, a 
 `modified` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`     |
-| **path**  | `/features/<featureId>`     |
+| Field     | Value                                                                                                                             |
+|-----------|-----------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`                                                                        |
+| **path**  | `/features/<featureId>`                                                                                                           |
 | **value** | The modified Feature of the Thing as JSON. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Modify a single Feature](protocol-examples-modifyfeature.html)
 
 If the Feature did not yet exist before the command was applied, a `created` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`     |
-| **path**  | `/features/<featureId>`     |
+| Field     | Value                                                                                                                                |
+|-----------|--------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`                                                                            |
+| **path**  | `/features/<featureId>`                                                                                                              |
 | **value** | The created Feature of the Thing as JSON.<br/>see [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Create a single Feature](protocol-examples-createfeature.html)
@@ -329,42 +340,42 @@ Create or modify the Definition of a Feature (identified by the Feature ID in th
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`     |
-| **path**  | `/features/<featureId>/definition`     |
+| Field     | Value                                                                                                                                                                                |
+|-----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                                                                                           |
+| **path**  | `/features/<featureId>/definition`                                                                                                                                                   |
 | **value** | The Definition of the Feature as JSON array, see property `definition` of Things JSON schema. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify` |
-| **path**   |        | `/features/<featureId>/definition`                      |
+| Field      |        | Value                                                                                                                                                                                                                                                      |
+|------------|--------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                                                                                                                                                                 |
+| **path**   |        | `/features/<featureId>/definition`                                                                                                                                                                                                                         |
 | **value**  |        | The created Definition of the Feature as JSON array, see property `definition` of Things JSON schema at [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). This field is not available, if the Definition already existed. |
-| **status** | _code_ |                          | 
-|            | `201`  | Success - the Definition was created successfully.       |
-|            | `204`  | Success - the Definition was modified successfully.       |
+| **status** | _code_ |                                                                                                                                                                                                                                                            | 
+|            | `201`  | Success - the Definition was created successfully.                                                                                                                                                                                                         |
+|            | `204`  | Success - the Definition was modified successfully.                                                                                                                                                                                                        |
 
 ### Event
 
 If the Feature Definition already existed before the command was applied and it was thus overwritten by the command, a 
 `modified` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`     |
-| **path**  | `/features/<featureId>/definition`     |
+| Field     | Value                                                                                                                                                                                             |
+|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`                                                                                                                                        |
+| **path**  | `/features/<featureId>/definition`                                                                                                                                                                |
 | **value** | The modified Definition of the Feature as JSON array, see property `properties` of the Things JSON schema. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Modify Feature Definition](protocol-examples-modifydefinition.html)
 
 If the Feature Definition did not yet exist before the command was applied, a `created` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`     |
-| **path**  | `/features/<featureId>/definition`     |
+| Field     | Value                                                                                                                                                                                          |
+|-----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`                                                                                                                                      |
+| **path**  | `/features/<featureId>/definition`                                                                                                                                                             |
 | **value** | The created Definition of the Feature as JSON array, see property `definition` of the Things JSON schema at [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Create Feature Definition](protocol-examples-createdefinition.html)
@@ -376,42 +387,42 @@ Create or modify the Properties of a Feature (identified by the Feature ID in th
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`     |
-| **path**  | `/features/<featureId>/properties`     |
+| Field     | Value                                                                                                                                                                          |
+|-----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                                                                                     |
+| **path**  | `/features/<featureId>/properties`                                                                                                                                             |
 | **value** | The Properties of the Feature as JSON, see property `properties` of Things JSON schema. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify` |
-| **path**   |        | `/features/<featureId>/properties`                      |
+| Field      |        | Value                                                                                                                                                                                                                                                             |
+|------------|--------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                                                                                                                                                                        |
+| **path**   |        | `/features/<featureId>/properties`                                                                                                                                                                                                                                |
 | **value**  |        | The created Properties of the Feature as JSON object, see property `properties` of Things JSON schema at [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). This field is not available, if Feature already contained Properties. |
-| **status** | *code* |                          | 
-|            | `201`  | Success - the Properties were created successfully.       |
-|            | `204`  | Success - the Properties were modified successfully.       |
+| **status** | *code* |                                                                                                                                                                                                                                                                   | 
+|            | `201`  | Success - the Properties were created successfully.                                                                                                                                                                                                               |
+|            | `204`  | Success - the Properties were modified successfully.                                                                                                                                                                                                              |
 
 ### Event
 
 If the Feature already contained Properties before the command was applied and they were thus overwritten by the 
 command, a `modified` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`     |
-| **path**  | `/features/<featureId>/properties`     |
+| Field     | Value                                                                                                                                                                                       |
+|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`                                                                                                                                  |
+| **path**  | `/features/<featureId>/properties`                                                                                                                                                          |
 | **value** | The modified Properties of the Feature as JSON, see property `properties` of the Things JSON schema. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Modify Feature Properties](protocol-examples-modifyproperties.html)
 
 If the Feature did not yet contain Properties before the command was applied, a `created` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`     |
-| **path**  | `/features/<featureId>/properties`     |
+| Field     | Value                                                                                                                                                                                           |
+|-----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`                                                                                                                                       |
+| **path**  | `/features/<featureId>/properties`                                                                                                                                                              |
 | **value** | The created Properties of the Feature as JSON object, see property `properties` of the Things JSON schema at [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Create Feature Properties](protocol-examples-createproperties.html)
@@ -422,41 +433,41 @@ Create or modify the desired Properties of a Feature (identified by the Feature
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`     |
-| **path**  | `/features/<featureId>/desiredProperties`     |
+| Field     | Value                                                                                                                                                                                         |
+|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                                                                                                    |
+| **path**  | `/features/<featureId>/desiredProperties`                                                                                                                                                     |
 | **value** | The desired Properties of the Feature as JSON, see property `desiredProperties` of Things JSON schema. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify` |
-| **path**   |        | `/features/<featureId>/desiredProperties`                      |
+| Field      |        | Value                                                                                                                                                                                                                                                                                    |
+|------------|--------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                                                                                                                                                                                               |
+| **path**   |        | `/features/<featureId>/desiredProperties`                                                                                                                                                                                                                                                |
 | **value**  |        | The created desired Properties of the Feature as JSON object, see property `desiredProperties` of Things JSON schema at [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). This field is not available, if Feature already contained desired Properties. |
-| **status** | *code* |                          | 
-|            | `201`  | Success - the desired Properties were created successfully.       |
-|            | `204`  | Success - the desired Properties were modified successfully.       |
+| **status** | *code* |                                                                                                                                                                                                                                                                                          | 
+|            | `201`  | Success - the desired Properties were created successfully.                                                                                                                                                                                                                              |
+|            | `204`  | Success - the desired Properties were modified successfully.                                                                                                                                                                                                                             |
 
 ### Event
 
 If the Feature already contained desired Properties before the command was applied and they were thus overwritten by the command, a `modified` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`     |
-| **path**  | `/features/<featureId>/desiredProperties`     |
+| Field     | Value                                                                                                                                                                                                      |
+|-----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`                                                                                                                                                 |
+| **path**  | `/features/<featureId>/desiredProperties`                                                                                                                                                                  |
 | **value** | The modified desired Properties of the Feature as JSON, see property `desiredProperties` of the Things JSON schema. See [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Modify Feature Desired Properties](protocol-examples-modifydesiredproperties.html)
 
 If the Feature did not yet contain desired Properties before the command was applied, a `created` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`     |
-| **path**  | `/features/<featureId>/desiredProperties`     |
+| Field     | Value                                                                                                                                                                                                          |
+|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`                                                                                                                                                      |
+| **path**  | `/features/<featureId>/desiredProperties`                                                                                                                                                                      |
 | **value** | The created desired Properties of the Feature as JSON object, see property `desiredProperties` of the Things JSON schema at [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
 
 **Example:** [Create Feature Desired Properties](protocol-examples-createdesiredproperties.html)
@@ -469,43 +480,43 @@ The Property (JSON) can be referenced hierarchically by applying [JSON Pointer n
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`     |
-| **path**  | `/features/<featureId>/properties/<propertyPath>`     |
-| **value** | The specific Property of the Feature as JSON. |
+| Field     | Value                                                      |
+|-----------|------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify` |
+| **path**  | `/features/<featureId>/properties/<propertyPath>`          |
+| **value** | The specific Property of the Feature as JSON.              |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify` |
-| **path**   |        | `/features/<featureId>/properties/<propertyPath>`                      |
+| Field      |        | Value                                                                                                      |
+|------------|--------|------------------------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                 |
+| **path**   |        | `/features/<featureId>/properties/<propertyPath>`                                                          |
 | **value**  |        | The created Property of the Feature as JSON. This field is not available, if the Property already existed. |
-| **status** | *code* |                          | 
-|            | `201`  | Success - the Property was created successfully.       |               | 
-|            | `204`  | Success - the Property was modified successfully.       |
+| **status** | *code* |                                                                                                            | 
+|            | `201`  | Success - the Property was created successfully.                                                           |               | 
+|            | `204`  | Success - the Property was modified successfully.                                                          |
 
 ### Event
 
 If the Feature Property already existed before the command was applied and it was thus overwritten by the command, a 
 `modified` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`     |
-| **path**  | `/features/<featureId>/properties/<propertyPath>`     |
-| **value** | The modified Property of the Thing as JSON. |
+| Field     | Value                                                      |
+|-----------|------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified` |
+| **path**  | `/features/<featureId>/properties/<propertyPath>`          |
+| **value** | The modified Property of the Thing as JSON.                |
 
 **Example:** [Modify a single Feature Property](protocol-examples-modifyproperty.html)
 
 If the Feature Property did not yet exist before the command was applied, a `created` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`     |
-| **path**  | `/features/<featureId>/properties/<propertyPath>`     |
-| **value** | The created Property of the Thing as JSON. |
+| Field     | Value                                                     |
+|-----------|-----------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/created` |
+| **path**  | `/features/<featureId>/properties/<propertyPath>`         |
+| **value** | The created Property of the Thing as JSON.                |
 
 **Example:** [Create a single Feature Property](protocol-examples-createproperty.html)
 
@@ -517,41 +528,41 @@ The Property (JSON) can be referenced hierarchically by applying [JSON Pointer n
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`     |
-| **path**  | `/features/<featureId>/desiredProperties/<desiredPropertyPath>`     |
-| **value** | The specific desired Property of the Feature as JSON. |
+| Field     | Value                                                           |
+|-----------|-----------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/modify`      |
+| **path**  | `/features/<featureId>/desiredProperties/<desiredPropertyPath>` |
+| **value** | The specific desired Property of the Feature as JSON.           |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify` |
-| **path**   |        | `/features/<featureId>/desiredProperties/<desiredPropertyPath>`                      |
+| Field      |        | Value                                                                                                              |
+|------------|--------|--------------------------------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/modify`                                                         |
+| **path**   |        | `/features/<featureId>/desiredProperties/<desiredPropertyPath>`                                                    |
 | **value**  |        | The created desired Property of the Feature as JSON. This field is not available, if the Property already existed. |
-| **status** | *code* |                          | 
-|            | `201`  | Success - the desired Property was created successfully.       |               | 
-|            | `204`  | Success - the desired Property was modified successfully.       |
+| **status** | *code* |                                                                                                                    | 
+|            | `201`  | Success - the desired Property was created successfully.                                                           |               | 
+|            | `204`  | Success - the desired Property was modified successfully.                                                          |
 
 ### Event
 
 If the Feature desired Property already existed before the command was applied and it was thus overwritten by the command, a `modified` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`     |
-| **path**  | `/features/<featureId>/desiredProperties/<desiredPropertyPath>`     |
-| **value** | The modified desired Property of the Thing as JSON. |
+| Field     | Value                                                           |
+|-----------|-----------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/modified`      |
+| **path**  | `/features/<featureId>/desiredProperties/<desiredPropertyPath>` |
+| **value** | The modified desired Property of the Thing as JSON.             |
 
 **Example:** [Modify a single Feature desired Property](protocol-examples-modifydesiredproperty.html)
 
 If the Feature desired Property did not yet exist before the command was applied, a `created` event will be emitted.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`     |
-| **path**  | `/features/<featureId>/desiredProperties/<desiredPropertyPath>`     |
-| **value** | The created Property of the Thing as JSON. |
+| Field     | Value                                                           |
+|-----------|-----------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/created`       |
+| **path**  | `/features/<featureId>/desiredProperties/<desiredPropertyPath>` |
+| **value** | The created Property of the Thing as JSON.                      |
 
 **Example:** [Create a single Feature desired Property](protocol-examples-createdesiredproperty.html)
diff --git a/documentation/src/main/resources/pages/ditto/protocol-specification-things-merge.md b/documentation/src/main/resources/pages/ditto/protocol-specification-things-merge.md
index f99b6d4b5b3..d2013f2809a 100644
--- a/documentation/src/main/resources/pages/ditto/protocol-specification-things-merge.md
+++ b/documentation/src/main/resources/pages/ditto/protocol-specification-things-merge.md
@@ -5,325 +5,339 @@ tags: [protocol]
 permalink: protocol-specification-things-merge.html
 ---
 
-All `topics` contain the `<channel>` which may be either `twin` or `live`.<br/>
+All `topics` contain the `<channel>` which may be either `twin` or `live`.  
 For the meaning of those two channels see [Protocol specification](protocol-specification.html).
 
 For all merge commands the `value` field is provided in [JSON merge patch](https://tools.ietf.org/html/rfc7396)
-format. In case of conflicts with the existing thing, the value provided in the patch overwrites the existing value.
+format. In case of conflicts with the existing Thing, the value provided in the patch overwrites the existing value.
 
-## Merge a thing
+## Merge a Thing
 
-This command merges the thing specified by the `<namespace>` and `<thingName>` in the topic with
+This command merges the Thing specified by the `<namespace>` and `<thingName>` in the topic with
 the [JSON merge patch](https://tools.ietf.org/html/rfc7396) defined by the JSON in the `value`.
 
+If the Thing did not yet exist, it is created.
+
 ### Command
 
 | Field     | Value                   |
 |-----------|-------------------------|
 | **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`     |
 | **path**  | `/`     |
-| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [thing](basic-thing.html#thing) referenced in the `topic`. |
+| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [Thing](basic-thing.html#thing) referenced in the `topic`. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
+If the Thing was created successfully:
+
+| Field      |        | Value                                                                                                                    |
+|------------|--------|--------------------------------------------------------------------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/create`                                                               |
+| **path**   |        | `/`                                                                                                                      |
+| **value**  |        | The created Thing as JSON object, see [Ditto protocol payload (JSON)](protocol-specification.html#dittoProtocolPayload). |
+| **status** | _code_ |
+|            | `201`  | Success - the Thing was created successfully.                                                                            |
+
+If the Thing was merged successfully:
+
+| Field      |        | Value                                                     |
+|------------|--------|-----------------------------------------------------------|
 | **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge` |
-| **path**   |        | `/`                      |
-| **status** | *code* |                          | 
-|            | `204`  | Success - the thing was merged successfully.       |
+| **path**   |        | `/`                                                       |
+| **status** | *code* |                                                           | 
+|            | `204`  | Success - the Thing was merged successfully.              |
 
 ### Event
 
-The event emitted by Ditto after a thing was merged.
+The event emitted by Ditto after a Thing was merged.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`     |
-| **path**  | `/`     |
-| **value** |  The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                |
+|-----------|----------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`                                                             |
+| **path**  | `/`                                                                                                                  |
+| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the Thing referenced in the `topic`. |
 
-**Example:** [Merge a thing.](protocol-examples-mergething.html)
+**Example:** [Merge a Thing](protocol-examples-mergething.html)
 
-## Merge all attributes of a thing
+## Merge all attributes of a Thing
 
-Merge the attributes of a thing identified by the `<namespace>` and `<thingName>` in the `topic`. The attributes will be
+Merge the attributes of a Thing identified by the `<namespace>` and `<thingName>` in the `topic`. The attributes will be
 merged with the JSON merge patch provided in the `value` field.
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`     |
-| **path**  | `/attributes`     |
-| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [attributes](basic-thing.html#attributes) of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                                                                     |
+|-----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`                                                                                                                                 |
+| **path**  | `/attributes`                                                                                                                                                                             |
+| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [attributes](basic-thing.html#attributes) of the Thing referenced in the `topic`. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
+| Field      |        | Value                                                     |
+|------------|--------|-----------------------------------------------------------|
 | **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge` |
-| **path**   |        | `/attributes`                      |
-| **status** | _code_ |                          | 
-|            | `204`  | Success - attributes were merged successfully.       |
+| **path**   |        | `/attributes`                                             |
+| **status** | _code_ |                                                           | 
+|            | `204`  | Success - attributes were merged successfully.            |
 
 ### Event
 
-The event emitted by Ditto after the attributes of a thing were merged.
+The event emitted by Ditto after the attributes of a Thing were merged.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`     |
-| **path**  | `/attributes`     |
-| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the attributes of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                  |
+|-----------|----------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`                                                                               |
+| **path**  | `/attributes`                                                                                                                          |
+| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the attributes of the Thing referenced in the `topic`. |
 
 **Example:** [Merge attributes](protocol-examples-mergeattributes.html)
 
-## Merge a single attribute of a thing
+## Merge a single attribute of a Thing
 
-Merge a specific attribute identified by the `<attributePath>` of the thing. The attribute (JSON) can be referenced
+Merge a specific attribute identified by the `<attributePath>` of the Thing. The attribute (JSON) can be referenced
 hierarchically by applying [JSON Pointer notation (RFC-6901)](https://tools.ietf.org/html/rfc6901).
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`     |
-| **path**  | `/attributes/<attributePath>`     |
-| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [attribute](basic-thing.html#attributes) identified by `path`  of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                                                                                          |
+|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`                                                                                                                                                      |
+| **path**  | `/attributes/<attributePath>`                                                                                                                                                                                  |
+| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [attribute](basic-thing.html#attributes) identified by `path`  of the Thing referenced in the `topic`. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
+| Field      |        | Value                                                     |
+|------------|--------|-----------------------------------------------------------|
 | **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge` |
-| **path**   |        | `/attributes/<attributePath>`                      |
-| **status** | _code_ |                          | 
-|            | `204`  | Success - The attribute was merged successfully.       |
+| **path**   |        | `/attributes/<attributePath>`                             |
+| **status** | _code_ |                                                           | 
+|            | `204`  | Success - The attribute was merged successfully.          |
 
 ### Event
 
 The event emitted by Ditto after a single attribute was merged.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`     |
-| **path**  | `/attributes/<attributePath>`     |
-| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the attribute identified by `path` of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                                      |
+|-----------|------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`                                                                                                   |
+| **path**  | `/attributes/<attributePath>`                                                                                                                              |
+| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the attribute identified by `path` of the Thing referenced in the `topic`. |
 
 **Example:** [Merge a single attribute](protocol-examples-mergeattribute.html)
 
-## Merge the definition of a thing
+## Merge the definition of a Thing
 
-Merge the definition of a thing.
+Merge the definition of a Thing.
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`     |
-| **path**  | `/definition`     |
-| **value** | A valid [thing definition](basic-thing.html#definition) that replaces the definition of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                        |
+|-----------|------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`                                                                    |
+| **path**  | `/definition`                                                                                                                |
+| **value** | A valid [Thing definition](basic-thing.html#definition) that replaces the definition of the Thing referenced in the `topic`. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
+| Field      |        | Value                                                     |
+|------------|--------|-----------------------------------------------------------|
 | **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge` |
-| **path**   |        | `/definition`                      |
-| **status** | _code_ |                          | 
-|            | `204`  | Success - The definition was merged successfully.       |
+| **path**   |        | `/definition`                                             |
+| **status** | _code_ |                                                           | 
+|            | `204`  | Success - The definition was merged successfully.         |
 
-## Merge the policy ID of a thing
+## Merge the policy ID of a Thing
 
-Merge the policy ID of a thing.
+Merge the policy ID of a Thing.
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`     |
-| **path**  | `/policyId`     |
-| **value** | A valid [policy ID](basic-thing.html#access-control) that replaces the policyId of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                   |
+|-----------|-------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`                                                               |
+| **path**  | `/policyId`                                                                                                             |
+| **value** | A valid [policy ID](basic-thing.html#access-control) that replaces the policyId of the Thing referenced in the `topic`. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
+| Field      |        | Value                                                     |
+|------------|--------|-----------------------------------------------------------|
 | **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge` |
-| **path**   |        | `/definition`                      |
-| **status** | _code_ |                          | 
-|            | `204`  | Success - The definition was merged successfully.       |
+| **path**   |        | `/definition`                                             |
+| **status** | _code_ |                                                           | 
+|            | `204`  | Success - The definition was merged successfully.         |
 
 ### Event
 
 The event emitted by Ditto after the definition was merged.
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`     |
-| **path**  | `/definition`     |
-| **value** |  The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the definition of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                  |
+|-----------|----------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`                                                                               |
+| **path**  | `/definition`                                                                                                                          |
+| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the definition of the Thing referenced in the `topic`. |
 
 **Example:** [Merge a definition](protocol-examples-mergethingdefinition.html)
 
-## Merge all features of a thing
+## Merge all features of a Thing
 
-Merge the features of a thing identified by the `<namespace>` and the `<thingName>` in the topic.<br/>
+Merge the features of a Thing identified by the `<namespace>` and the `<thingName>` in the topic.<br/>
 The list of features will be merged with the JSON merge patch provided in the `value`.
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`     |
-| **path**  | `/features`     |
-| **value**| The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [features](basic-thing.html#features) of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                                                                 |
+|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`                                                                                                                             |
+| **path**  | `/features`                                                                                                                                                                           |
+| **value**| The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [features](basic-thing.html#features) of the Thing referenced in the `topic`. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
+| Field      |        | Value                                                     |
+|------------|--------|-----------------------------------------------------------|
 | **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge` |
-| **path**   |        | `/features`                      |
-| **status** | _code_ |                          | 
-|            | `204`  | Success - The features were modified successfully.       |
+| **path**   |        | `/features`                                               |
+| **status** | _code_ |                                                           | 
+|            | `204`  | Success - The features were modified successfully.        |
 
 ### Event
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`     |
-| **path**  | `/features`     |
-| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the features of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                |
+|-----------|--------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`                                                                             |
+| **path**  | `/features`                                                                                                                          |
+| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the features of the Thing referenced in the `topic`. |
 
 **Example:** [Merge features](protocol-examples-mergefeatures.html)
 
-## Merge a single feature of a thing
+## Merge a single feature of a Thing
 
-Merge a specific feature (identified by the feature ID in the `path`) of the thing (identified by the `<namespace>` and
+Merge a specific feature (identified by the feature ID in the `path`) of the Thing (identified by the `<namespace>` and
 the `<thingName>` in the topic).
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`     |
-| **path**  | `/features/<featureId>`     |
-| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the specific [feature](basic-thing.html#features) identified by the feature ID in the `path` of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                                                                                                                    |
+|-----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`                                                                                                                                                                                |
+| **path**  | `/features/<featureId>`                                                                                                                                                                                                                  |
+| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the specific [feature](basic-thing.html#features) identified by the feature ID in the `path` of the Thing referenced in the `topic`. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
+| Field      |        | Value                                                     |
+|------------|--------|-----------------------------------------------------------|
 | **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge` |
-| **path**   |        | `/features/<featureId>`                      |
-| **status** | _code_ |                          | 
-|            | `201`  | Success - The feature was created successfully.       |
+| **path**   |        | `/features/<featureId>`                                   |
+| **status** | _code_ |                                                           | 
+|            | `201`  | Success - The feature was created successfully.           |
 
 ### Event
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`     |
-| **path**  | `/features/<featureId>`     |
-| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the specific feature identified by the feature ID in the `path` of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                                                                   |
+|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`                                                                                                                                |
+| **path**  | `/features/<featureId>`                                                                                                                                                                 |
+| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the specific feature identified by the feature ID in the `path` of the Thing referenced in the `topic`. |
 
 **Example:** [Merge a single feature](protocol-examples-mergefeature.html)
 
 ## Merge the definition of a feature
 
-Merge the definition of a feature (identified by the feature ID in the `path`) of the thing (identified by the
+Merge the definition of a feature (identified by the feature ID in the `path`) of the Thing (identified by the
 `<namespace>` and the `<thingName>` in the `topic`).
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`     |
-| **path**  | `/features/<featureId>/definition`     |
-| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [definition of the feature](basic-feature.html#feature-definition) identified by the feature ID in the `path` of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                                                                                                                                         |
+|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`                                                                                                                                                                                                     |
+| **path**  | `/features/<featureId>/definition`                                                                                                                                                                                                                            |
+| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [definition of the feature](basic-feature.html#feature-definition) identified by the feature ID in the `path` of the Thing referenced in the `topic`. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
+| Field      |        | Value                                                     |
+|------------|--------|-----------------------------------------------------------|
 | **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge` |
-| **path**   |        | `/features/<featureId>/definition`                      |
-| **status** | _code_ |                          | 
-|            | `204`  | Success - the definition was merged successfully.       |
+| **path**   |        | `/features/<featureId>/definition`                        |
+| **status** | _code_ |                                                           | 
+|            | `204`  | Success - the definition was merged successfully.         |
 
 ### Event
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`     |
-| **path**  | `/features/<featureId>/definition`     |
-| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the definition of the feature identified by the feature ID in the `path` of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                                                                            |
+|-----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`                                                                                                                                         |
+| **path**  | `/features/<featureId>/definition`                                                                                                                                                               |
+| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the definition of the feature identified by the feature ID in the `path` of the Thing referenced in the `topic`. |
 
 **Example:** [Merge feature definition](protocol-examples-mergefeaturedefinition.html)
 
 ## Merge all properties of a feature
 
-Merge the properties of a feature (identified by the feature ID in the `path`) of the thing (identified by the
+Merge the properties of a feature (identified by the feature ID in the `path`) of the Thing (identified by the
 `<namespace>` and the `<thingName>` in the `topic`).
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`     |
-| **path**  | `/features/<featureId>/properties`     |
-| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [properties of the feature](basic-feature.html#feature-properties) identified by the feature ID in the `path` of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                                                                                                                                         |
+|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`                                                                                                                                                                                                     |
+| **path**  | `/features/<featureId>/properties`                                                                                                                                                                                                                            |
+| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [properties of the feature](basic-feature.html#feature-properties) identified by the feature ID in the `path` of the Thing referenced in the `topic`. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
+| Field      |        | Value                                                     |
+|------------|--------|-----------------------------------------------------------|
 | **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge` |
-| **path**   |        | `/features/<featureId>/properties`                      |
-| **status** | *code* |                          | 
-|            | `204`  | Success - the properties were modified successfully.       |
+| **path**   |        | `/features/<featureId>/properties`                        |
+| **status** | *code* |                                                           | 
+|            | `204`  | Success - the properties were modified successfully.      |
 
 ### Event
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`     |
-| **path**  | `/features/<featureId>/properties`     |
-| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the properties of the feature identified by the feature ID in the `path` of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                                                                            |
+|-----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`                                                                                                                                         |
+| **path**  | `/features/<featureId>/properties`                                                                                                                                                               |
+| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the properties of the feature identified by the feature ID in the `path` of the Thing referenced in the `topic`. |
 
 **Example:** [Merge feature properties](protocol-examples-mergeproperties.html)
 
 ## Merge all desired properties of a feature
 
-Merge the desired properties of a feature (identified by the feature ID in the `path`) of the thing (identified by the
+Merge the desired properties of a feature (identified by the feature ID in the `path`) of the Thing (identified by the
 `<namespace>` and the `<thingName>` in the `topic`).
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`     |
-| **path**  | `/features/<featureId>/desiredProperties`     |
-| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [desired properties of the feature](basic-feature.html#feature-desired-properties) identified by the feature ID in the `path` of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                                                                                                                                                         |
+|-----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`                                                                                                                                                                                                                     |
+| **path**  | `/features/<featureId>/desiredProperties`                                                                                                                                                                                                                                     |
+| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [desired properties of the feature](basic-feature.html#feature-desired-properties) identified by the feature ID in the `path` of the Thing referenced in the `topic`. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge` |
-| **path**   |        | `/features/<featureId>/desiredProperties`                      |
-| **status** | *code* |                          | 
-|            | `204`  | Success - the desired properties were modified successfully.       |
+| Field      |        | Value                                                        |
+|------------|--------|--------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge`    |
+| **path**   |        | `/features/<featureId>/desiredProperties`                    |
+| **status** | *code* |                                                              | 
+|            | `204`  | Success - the desired properties were modified successfully. |
 
 ### Event
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`     |
-| **path**  | `/features/<featureId>/desiredProperties`     |
-| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the desired properties of the feature identified by the feature ID in the `path` of the thing referenced in the `topic`. |
+| Field     | Value                                                                                                                                                                                                    |
+|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`                                                                                                                                                 |
+| **path**  | `/features/<featureId>/desiredProperties`                                                                                                                                                                |
+| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the desired properties of the feature identified by the feature ID in the `path` of the Thing referenced in the `topic`. |
 
 **Example:** [Merge feature desired properties](protocol-examples-mergedesiredproperties.html)
 
@@ -335,28 +349,28 @@ applying [JSON Pointer notation (RFC-6901)](https://tools.ietf.org/html/rfc6901)
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`     |
-| **path**  | `/features/<featureId>/properties/<propertyPath>`     |
-| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [property](basic-feature.html#feature-properties) identified by the property path and the feature ID in `path` of the thing referenced in the `topic`.|
+| Field     | Value                                                                                                                                                                                                                                                          |
+|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`                                                                                                                                                                                                      |
+| **path**  | `/features/<featureId>/properties/<propertyPath>`                                                                                                                                                                                                              |
+| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [property](basic-feature.html#feature-properties) identified by the property path and the feature ID in `path` of the Thing referenced in the `topic`. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
+| Field      |        | Value                                                     |
+|------------|--------|-----------------------------------------------------------|
 | **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge` |
-| **path**   |        | `/features/<featureId>/properties/<propertyPath>`                      |
-| **status** | *code* |                          | 
-|            | `204`  | Success - the property was merged successfully.       |
+| **path**   |        | `/features/<featureId>/properties/<propertyPath>`         |
+| **status** | *code* |                                                           | 
+|            | `204`  | Success - the property was merged successfully.           |
 
 ### Event
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`     |
-| **path**  | `/features/<featureId>/properties/<propertyPath>`     |
-| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the property identified by the property path and the feature ID in `path` of the thing referenced in the `topic`.|
+| Field     | Value                                                                                                                                                                                             |
+|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`                                                                                                                                          |
+| **path**  | `/features/<featureId>/properties/<propertyPath>`                                                                                                                                                 |
+| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the property identified by the property path and the feature ID in `path` of the Thing referenced in the `topic`. |
 
 **Example:** [Merge a single feature property](protocol-examples-mergeproperty.html)
 
@@ -368,27 +382,27 @@ applying [JSON Pointer notation (RFC-6901)](https://tools.ietf.org/html/rfc6901)
 
 ### Command
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`     |
-| **path**  | `/features/<featureId>/desiredProperties/<desiredPropertyPath>`     |
-| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [desired property](basic-feature.html#feature-desired-properties) identified by the desired property path and the feature ID in `path` of the thing referenced in the `topic`.|
+| Field     | Value                                                                                                                                                                                                                                                                                  |
+|-----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/commands/merge`                                                                                                                                                                                                                              |
+| **path**  | `/features/<featureId>/desiredProperties/<desiredPropertyPath>`                                                                                                                                                                                                                        |
+| **value** | The JSON value in [JSON merge patch](https://tools.ietf.org/html/rfc7396) format that is applied to the [desired property](basic-feature.html#feature-desired-properties) identified by the desired property path and the feature ID in `path` of the Thing referenced in the `topic`. |
 
 ### Response
 
-| Field      |        | Value                    |
-|------------|--------|--------------------------|
-| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge` |
-| **path**   |        | `/features/<featureId>/desiredProperties/<desiredPropertyPath>`                      |
-| **status** | *code* |                          | 
-|            | `204`  | Success - the desired property was merged successfully.       |
+| Field      |        | Value                                                           |
+|------------|--------|-----------------------------------------------------------------|
+| **topic**  |        | `<namespace>/<thingName>/things/<channel>/commands/merge`       |
+| **path**   |        | `/features/<featureId>/desiredProperties/<desiredPropertyPath>` |
+| **status** | *code* |                                                                 | 
+|            | `204`  | Success - the desired property was merged successfully.         |
 
 ### Event
 
-| Field     | Value                   |
-|-----------|-------------------------|
-| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`     |
-| **path**  | `/features/<featureId>/desiredProperties/<desiredPropertyPath>`     |
-| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the property identified by the desired property path and the feature ID in `path` of the thing referenced in the `topic`.|
+| Field     | Value                                                                                                                                                                                                     |
+|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **topic** | `<namespace>/<thingName>/things/<channel>/events/merged`                                                                                                                                                  |
+| **path**  | `/features/<featureId>/desiredProperties/<desiredPropertyPath>`                                                                                                                                           |
+| **value** | The [JSON merge patch](https://tools.ietf.org/html/rfc7396) that was applied to the property identified by the desired property path and the feature ID in `path` of the Thing referenced in the `topic`. |
 
 **Example:** [Merge a single feature desired property](protocol-examples-mergedesiredproperty.html)
diff --git a/documentation/src/main/resources/pages/ditto/protocol-specification-things.md b/documentation/src/main/resources/pages/ditto/protocol-specification-things.md
index 5d7783f16a5..031a0c67f47 100644
--- a/documentation/src/main/resources/pages/ditto/protocol-specification-things.md
+++ b/documentation/src/main/resources/pages/ditto/protocol-specification-things.md
@@ -51,12 +51,12 @@ The `"topic"` of such errors differ from the command `"topic"` - correlation is
 
 The following table contains common error codes for Thing commands:
 
-| **status** | Value                    |
-|------------|--------------------------|
-|    `400`   | Bad Format - The request could not be completed due to malformed request syntax. |
-|    `401`   | Unauthorized - The request could not be completed due to missing authentication.       |
-|    `403`   | Forbidden - The Thing could not be modified as the requester had insufficient permissions ('WRITE' is required).          |
-|    `404`   | Not Found - The request could not be completed. The Thing with the given ID was not found in the context of the authenticated user.  |
+| **status** | Value                                                                                                                                                                                                                                                                    |
+|------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|    `400`   | Bad Format - The request could not be completed due to malformed request syntax.                                                                                                                                                                                         |
+|    `401`   | Unauthorized - The request could not be completed due to missing authentication.                                                                                                                                                                                         |
+|    `403`   | Forbidden - The Thing could not be modified as the requester had insufficient permissions ('WRITE' is required).                                                                                                                                                         |
+|    `404`   | Not Found - The request could not be completed. The Thing with the given ID was not found in the context of the authenticated user.                                                                                                                                      |
 |    `412`   | Precondition Failed - A precondition for reading or writing the (sub-)resource failed. This will happen for write requests, if you specified an `If-Match` or `If-None-Match` header, which fails the precondition check against the current ETag of the (sub-)resource. |
-|    `413`   | Request Entity Too Large - The created or modified entity is larger than the configured limit (defaults to 100 kB).  |
-|    `429`   | Too many modifying requests are already outstanding to a specific Thing. |
+|    `413`   | Request Entity Too Large - The created or modified entity is larger than the configured limit (defaults to 100 kB).                                                                                                                                                      |
+|    `429`   | Too many modifying requests are already outstanding to a specific Thing.                                                                                                                                                                                                 |
diff --git a/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/commands/merge/mergething.md b/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/commands/merge/mergething.md
index 314e4441f4b..eea06668dc8 100644
--- a/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/commands/merge/mergething.md
+++ b/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/commands/merge/mergething.md
@@ -2,7 +2,7 @@
 
 ```json
 {
-  "topic": "org.eclipse.ditto/fancy-thing/things/twin/commands/merge",
+  "topic": "org.eclipse.ditto/fancy-thing_53/things/twin/commands/merge",
   "headers": {
     "content-type": "application/merge-patch+json",
     "correlation-id": "<command-correlation-id>"
@@ -10,7 +10,6 @@
   "path": "/",
   "value": {
     "thingId": "org.eclipse.ditto:fancy-thing_53",
-    "policyId": "org.eclipse.ditto:the_policy_id",
     "definition": "org.eclipse.ditto:SomeModel:1.0.0",
     "attributes": {
       "location": {
diff --git a/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/commands/merge/mergethingresponse.md b/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/commands/merge/mergethingresponse.md
index 555d95886aa..12f1eb7c3e3 100644
--- a/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/commands/merge/mergethingresponse.md
+++ b/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/commands/merge/mergethingresponse.md
@@ -2,7 +2,7 @@
 
 ```json
 {
-  "topic": "org.eclipse.ditto/fancy-thing/things/twin/commands/merge",
+  "topic": "org.eclipse.ditto/fancy-thing_53/things/twin/commands/merge",
   "headers": {
     "correlation-id": "<preserved-command-correlation-id>"
   },

From f8fb66a7edce4ab9827c77dee260341cc343ee98 Mon Sep 17 00:00:00 2001
From: neottil <neot.luka.89@gmail.com>
Date: Fri, 28 Apr 2023 11:03:50 +0200
Subject: [PATCH 091/173] add devops swagger to openapi project

---
 .../main/resources/openapi/ditto-devops.yml   | 763 ++++++++++++++++++
 .../openapi/sources/devops-index.yml          | 120 +++
 .../resources/openapi/sources/package.json    |   5 +-
 .../sources/parameters/instanceIndexParam.yml |  16 +
 .../parameters/loggingFieldsQueryParam.yml    |  18 +
 .../parameters/moduleNamePathParam.yml        |  17 +
 .../sources/parameters/namePodParam.yml       |  17 +
 .../openapi/sources/parameters/pathParam.yml  |  17 +
 .../sources/parameters/serviceNameParam.yml   |  20 +
 .../openapi/sources/paths/config/config.yml   |  33 +
 .../openapi/sources/paths/config/podName.yml  |  97 +++
 .../openapi/sources/paths/logging/logging.yml |  60 ++
 .../sources/paths/logging/moduleName.yml      |  63 ++
 .../sources/paths/piggyback/instanceIndex.yml |  65 ++
 .../sources/paths/piggyback/piggyback.yml     | 107 +++
 .../sources/paths/piggyback/serviceName.yml   |  77 ++
 .../responses/successUpdateLogLevel.yml       |  18 +
 .../successUpdateLogLevelSinglePod.yml        |  16 +
 .../sources/schemas/config/moduleConfig.yml   |  15 +
 .../schemas/config/moduleConfigService.yml    |  16 +
 .../sources/schemas/config/resultConfig.yml   |  41 +
 .../schemas/config/resultConfigService.yml    |  43 +
 .../sources/schemas/config/retrieveConfig.yml |  14 +
 .../schemas/config/retrieveConfigService.yml  |  14 +
 .../schemas/errors/textUnauthorizeError.yml   |  13 +
 .../schemas/logging/loggingUpdateFields.yml   |  16 +
 .../sources/schemas/logging/module.yml        |  15 +
 .../schemas/logging/moduleUpdatedLogLevel.yml |  15 +
 .../schemas/logging/resultLoggingConfig.yml   |  34 +
 .../schemas/logging/resultUpdateRequest.yml   |  22 +
 .../schemas/logging/retrieveLoggingConfig.yml |  13 +
 .../schemas/logging/updatedLogLevel.yml       |  28 +
 .../basePiggybackCommandRequestSchema.yml     |  27 +
 .../piggybackManagingBackgroundCleanup.yml    |  27 +
 34 files changed, 1880 insertions(+), 2 deletions(-)
 create mode 100644 documentation/src/main/resources/openapi/ditto-devops.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/devops-index.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/parameters/instanceIndexParam.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/parameters/loggingFieldsQueryParam.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/parameters/moduleNamePathParam.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/parameters/namePodParam.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/parameters/pathParam.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/parameters/serviceNameParam.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/paths/config/config.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/paths/config/podName.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/paths/logging/logging.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevel.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevelSinglePod.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/config/moduleConfig.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/config/moduleConfigService.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/config/resultConfig.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/config/resultConfigService.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfig.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfigService.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/errors/textUnauthorizeError.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/logging/loggingUpdateFields.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/logging/module.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/logging/moduleUpdatedLogLevel.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/logging/resultLoggingConfig.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/logging/resultUpdateRequest.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/logging/retrieveLoggingConfig.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/logging/updatedLogLevel.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/piggyback/basePiggybackCommandRequestSchema.yml
 create mode 100644 documentation/src/main/resources/openapi/sources/schemas/piggyback/piggybackManagingBackgroundCleanup.yml

diff --git a/documentation/src/main/resources/openapi/ditto-devops.yml b/documentation/src/main/resources/openapi/ditto-devops.yml
new file mode 100644
index 00000000000..156f0981207
--- /dev/null
+++ b/documentation/src/main/resources/openapi/ditto-devops.yml
@@ -0,0 +1,763 @@
+openapi: 3.0.0
+info:
+  title: Eclipse Ditto™ HTTP devops API
+  version: '2'
+  description: |-
+    JSON-based, REST-like API for Eclipse Ditto
+
+    The Eclipse Ditto HTTP API uses response status codes (see [RFC 7231](https://tools.ietf.org/html/rfc7231#section-6))
+    to indicate whether a specific request has been successfully completed, or not.
+
+    The information Ditto provides additionally to the status code (e.g. in API docs, or error codes like. "things:thing.tooLarge") might change without advance notice.
+    These are not be considered as official API, and must therefore not be applied in your applications or tests.
+servers:
+  - url: 'https://ditto.eclipseprojects.io/devops'
+    description: online Ditto Sandbox
+  - url: /devops
+    description: local Ditto
+tags:
+  - name: Logging
+    description: Manage Log Levels in runtime
+  - name: Service Configuration
+    description: Manage service configuration in runtime
+  - name: Piggyback Commands
+    description: Manage Piggyback commands
+security:
+  - DevOpsBasic: []
+  - DevOpsBearer: []
+paths:
+  /logging:
+    get:
+      summary: Retrieve all currently configured log levels
+      description: Return configured log level for all ditto cluster pod
+      tags:
+        - Logging
+      parameters:
+        - $ref: '#/components/parameters/LoggingFieldsQueryParam'
+      responses:
+        '200':
+          description: Return The current value of logging level
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RetrieveLoggingConfig'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+    put:
+      summary: Update log levels
+      description: Modify log level for eatch pods menaged
+      tags:
+        - Logging
+      requestBody:
+        description: Fields to update level log for each pods
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/LoggingUpdateFields'
+            example: |-
+              {
+                "level": "info",
+                "logger": "akka.actor.CoordinatedShutdown"
+              }
+      responses:
+        '201':
+          $ref: '#/components/responses/SuccessUpdateLogLevel'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+  '/logging/{moduleName}':
+    get:
+      summary: Retrieve currently configured log levels for a specific module
+      description: Return the configured log
+      tags:
+        - Logging
+      parameters:
+        - $ref: '#/components/parameters/ModuleNamePathParam'
+        - $ref: '#/components/parameters/LoggingFieldsQueryParam'
+      responses:
+        '200':
+          description: Return The current value of logging level
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Module'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+    put:
+      summary: Update log levels for a specific module
+      description: Return outcome modify log level for a specific module
+      tags:
+        - Logging
+      parameters:
+        - $ref: '#/components/parameters/ModuleNamePathParam'
+      requestBody:
+        description: Fields to update level log for module
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/LoggingUpdateFields'
+            example: |-
+              {
+                "level": "info",
+                "logger": "akka.actor.CoordinatedShutdown"
+              }
+      responses:
+        '201':
+          $ref: '#/components/responses/SuccessUpdateLogLevelSinglePod'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+  /config:
+    get:
+      summary: Retrieve the configuration at the specified path parameter
+      description: |-
+        It is recommended to not omit the query parameter path.
+        Otherwise, the full configurations of all services are aggregated in the response, which can become megabytes big.
+      tags:
+        - Service Configuration
+      parameters:
+        - $ref: '#/components/parameters/PathParam'
+      responses:
+        '200':
+          description: Return the configuration at the path
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RetrieveConfig'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+  '/config/{moduleName}/{podName}':
+    get:
+      summary: Retrieving the configuration of a specific service instance.
+      description: Return the configuration of a specific service instance.
+      tags:
+        - Service Configuration
+      parameters:
+        - $ref: '#/components/parameters/ModuleNamePathParam'
+        - $ref: '#/components/parameters/NamePodParam'
+        - $ref: '#/components/parameters/PathParam'
+      responses:
+        '200':
+          description: Return The current value of specific service instance.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/RetrieveConfigService'
+              example: |-
+                {
+                  "gateway": {
+                    "podName": {
+                      "type": "common.responses:retrieveConfig",
+                      "status": 200,
+                      "config": {
+                        "cluster": {
+                          "cluster-status-roles-blocklist": [
+                              "cluster1",
+                              "......" ,
+                              "clusterN"
+                          ],
+                          "number-of-shards": 20
+                        },
+                        "ddata": {
+                          "vm arg1": "string",
+                          ".............": "string",
+                          "vm argn" : "string"
+                        },
+                        "devops": {
+                          "feature": {
+                            "merge-things-enabled": true
+                          },
+                          "namespace": {
+                            "block-time": "string"
+                          }
+                        },
+                        "gateway": {
+                          "authentication": {
+                            "devops": {
+                              "devops-authentication-method": "string",
+                              "password": "string",
+                              "secured": true,
+                              "status-authentication-method": "string",
+                              "statusPassword": "string"
+                            },
+                            "http": {
+                              "proxy": {
+                                "enabled": false
+                              }
+                            },
+                            "oauth": {
+                              "allowed-clock-skew": "string",
+                              "openid-connect-issuers": {
+                                "google": {
+                                  "issuer": "string"
+                                }
+                              },
+                              "protocol": "https",
+                              "token-integration-subject": "string"
+                            },
+                            "pre-authentication": {
+                              "enabled": "true"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+  /piggyback:
+    post:
+      summary: Send a piggyback command
+      description: Send a piggyback command to Akka’s pub-sub-mediator
+      tags:
+        - Piggyback Commands
+      parameters:
+        - $ref: '#/components/parameters/TimeoutParam'
+      requestBody:
+        description: Fields to send a command
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/BasePiggybackCommandRequestSchema'
+            examples:
+              blockNamespace:
+                description: Block all messages to a namespace
+                value: |-
+                  {
+                    "targetActorSelection": "/system/distributedPubSubMediator",
+                    "headers": {
+                      "aggregate": false
+                    },
+                    "piggybackCommand": {
+                      "type": "namespaces.commands:blockNamespace",
+                      "namespace": "namespaceToBlock"
+                    }
+                  }
+              shutdown:
+                description: Shutdown all actors in a namespace
+                value: |-
+                  {
+                    "targetActorSelection": "/system/distributedPubSubMediator",
+                    "piggybackCommand": {
+                      "type": "common.commands:shutdown",
+                      "reason": {
+                        "type": "purge-namespace",
+                        "details": "namespaceToShutdown"
+                      }
+                    }
+                  }
+              purgeNamespace:
+                description: Erase all data in a namespace from the persistence
+                value: |-
+                  {
+                    "targetActorSelection": "/system/distributedPubSubMediator",
+                    "headers": {
+                      "aggregate": true,
+                      "is-group-topic": true
+                    },
+                    "piggybackCommand": {
+                      "type": "namespaces.commands:purgeNamespace",
+                      "namespace": "namespaceToPurge"
+                    }
+                  }
+              unblockNamespace:
+                description: Unblock messages to a namespace
+                value: |-
+                  {
+                    "targetActorSelection": "/system/distributedPubSubMediator",
+                    "headers": {
+                      "aggregate": false
+                    },
+                    "piggybackCommand": {
+                      "type": "namespaces.commands:unblockNamespace",
+                      "namespace": "namespaceToUnblock"
+                    }
+                  }
+      responses:
+        '200':
+          description: Response of command
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PiggybackManagingBackgroundCleanup'
+              examples:
+                blockNamespace:
+                  value: |-
+                    {
+                      "type": "namespaces.responses:blockNamespace",
+                      "status": 200,
+                      "namespace": "namespaceToBlock",
+                      "resourceType": "namespaces"
+                    }
+        '400':
+          description: The request could not be completed. At least one of the defined query parameters was invalid.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AdvancedError'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+  '/piggyback/{serviceName}':
+    post:
+      summary: Send a piggyback command to a specific service
+      description: Send a piggyback command to a specific service
+      tags:
+        - Piggyback Commands
+      parameters:
+        - $ref: '#/components/parameters/ServiceNameParam'
+        - $ref: '#/components/parameters/TimeoutParam'
+      requestBody:
+        description: Fields to send a command
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/BasePiggybackCommandRequestSchema'
+            examples:
+              persistenceCleanup:
+                description: Query background cleanup coordinator state
+                value: |-
+                  {
+                    "targetActorSelection": "/user/<SERVICE_NAME>Root/persistenceCleanup",
+                    "headers": {},
+                    "piggybackCommand": {
+                      "type": "status.commands:retrieveHealth"
+                    }
+                  }
+      responses:
+        '200':
+          description: Return The current value of logging level
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PiggybackManagingBackgroundCleanup'
+              example: |-
+                {
+                  "things": {
+                    "ditto-things-65f6dd5d7-htkwt": {
+                      "type": "status.responses:retrieveHealth",
+                      "status": 200,
+                      "statusInfo": {
+                        "status": "UP",
+                        "details": [
+                          {
+                            "INFO": {
+                              "state": "IN_QUIET_PERIOD",
+                              "pid": ""
+                              }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+        '400':
+          description: The request could not be completed. At least one of the defined query parameters was invalid.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AdvancedError'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+  '/piggyback/{serviceName}/{instanceIndex}':
+    post:
+      summary: Send a piggyback command to a specific instance of service
+      description: Send a piggyback command to a specific instance of service
+      tags:
+        - Piggyback Commands
+      parameters:
+        - $ref: '#/components/parameters/ServiceNameParam'
+        - $ref: '#/components/parameters/InstanceIndex'
+        - $ref: '#/components/parameters/TimeoutParam'
+      requestBody:
+        description: Fields to send a command
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/BasePiggybackCommandRequestSchema'
+            examples:
+              cleanup:
+                description: Cleanup events and snapshots of an entity
+                value: |-
+                  {
+                    "targetActorSelection": "/system/sharding/thing",
+                    "headers": {
+                      "aggregate": false
+                    },
+                    "piggybackCommand": {
+                      "type": "cleanup.sudo.commands:cleanupPersistence",
+                      "entityId": "ditto:thing1"
+                    }
+                  }
+      responses:
+        '200':
+          description: response of command
+          content:
+            application/json:
+              example: |-
+                {
+                  "type": "cleanup.sudo.responses:cleanupPersistence",
+                  "status": 200,
+                  "entityId": "thing:ditto:thing1"
+                }
+        '400':
+          description: The request could not be completed. At least one of the defined query parameters was invalid.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AdvancedError'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+components:
+  responses:
+    SuccessUpdateLogLevel:
+      description: Return The summary of the outcome of all modified pods
+      content:
+        application/json:
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/ResultUpdateRequest'
+    SuccessUpdateLogLevelSinglePod:
+      description: Return The summary of the outcome of modified pod
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/ModuleUpdatedLogLevel'
+  parameters:
+    LoggingFieldsQueryParam:
+      name: includeDisabledLoggers
+      in: query
+      description: Include disabled loggers
+      required: false
+      schema:
+        type: boolean
+        default: false
+    TimeoutParam:
+      name: timeout
+      in: query
+      description: |-
+        Defines how long the backend should wait for completion of the request, e.g. applied when waiting for requested
+        acknowledgements via the `requested-acks` param. Can be specified without unit (then seconds are assumed) or
+        together with `s`, `ms` or `m` unit. Example: `42s`, `1m`.
+
+        The default (if omitted) and maximum timeout is `60s`. A value of `0` applies fire and forget semantics for
+        the command resulting in setting `response-required=false`.
+      required: false
+      schema:
+        type: string
+    ModuleNamePathParam:
+      name: moduleName
+      in: path
+      description: The name of module
+      required: true
+      schema:
+        type: string
+        example: gateway
+    PathParam:
+      name: path
+      in: query
+      description: 'The path points to information on service name, service instance index, JVM arguments and environment variables.'
+      schema:
+        type: string
+        example: ditto.info
+      required: false
+    NamePodParam:
+      name: podName
+      in: path
+      description: The name of pod
+      required: true
+      schema:
+        type: string
+        example: ditto-gateway-764fc5f474-qrm2r
+    ServiceNameParam:
+      name: serviceName
+      in: path
+      description: Specified service target for the command execution
+      required: true
+      schema:
+        type: string
+        enum:
+          - things
+          - policies
+          - connectivity
+    InstanceIndex:
+      name: instanceIndex
+      in: path
+      description: The index of the current instance
+      required: true
+      schema:
+        type: string
+  schemas:
+    AdvancedError:
+      properties:
+        status:
+          type: integer
+          description: The HTTP status of the error
+        error:
+          type: string
+          description: The error code of the occurred exception
+        message:
+          type: string
+          description: The message of the error - what went wrong
+        description:
+          type: string
+          description: A description how to fix the error or more details
+        href:
+          type: string
+          description: A link to further information about the error and how to fix it
+      required:
+        - status
+        - error
+        - message
+    TextUnauthorizeError:
+      type: string
+      example: The supplied authentication is invalid
+    RetrieveConfig:
+      type: object
+      properties:
+        gateway:
+          type: object
+          description: Module
+          properties:
+            pod:
+              type: object
+              description: Return the configuration at the path ditto.info
+              properties:
+                type:
+                  type: string
+                  description: 'devops.responses:ResultConfig'
+                status:
+                  type: integer
+                  description: The HTTP status
+                config:
+                  type: object
+                  description: name of service
+                  properties:
+                    env:
+                      items:
+                        type: string
+                      properties:
+                        PATH:
+                          type: string
+                    service:
+                      items:
+                        type: string
+                      properties:
+                        instance-index:
+                          type: integer
+                        service-name:
+                          type: string
+                    vm-args:
+                      items:
+                        type: string
+    RetrieveLoggingConfig:
+      properties:
+        gateway:
+          $ref: '#/components/schemas/Module'
+    Module:
+      type: object
+      description: Module
+      properties:
+        pod:
+          type: object
+          description: Details of logging configuration
+          properties:
+            type:
+              type: string
+              description: 'devops.responses:retrieveLoggerConfig'
+            status:
+              type: integer
+              description: The HTTP status
+            serviceName:
+              type: string
+              description: name of service
+            instance:
+              type: string
+              description: instance of module
+            loggerConfigs:
+              type: array
+              items:
+                type: object
+                properties:
+                  level:
+                    type: string
+                  logger:
+                    type: string
+    LoggingUpdateFields:
+      properties:
+        level:
+          type: string
+        logger:
+          type: string
+          description: class where apply logger level
+    UpdatedLogLevel:
+      type: object
+      description: Details of logging configuration
+      properties:
+        type:
+          type: string
+          description: 'devops.responses:changeLogLevel'
+        status:
+          type: integer
+          description: http code 200 for success operation
+        serviceName:
+          type: string
+          description: name of service that has been updated
+        instance:
+          type: string
+          description: identifier of pod instance
+        successfull:
+          type: boolean
+          description: outcome of the change
+    ModuleUpdatedLogLevel:
+      type: object
+      description: Module that has been updated
+      properties:
+        pod:
+          $ref: '#/components/schemas/UpdatedLogLevel'
+    ResultUpdateRequest:
+      type: object
+      properties:
+        gateway:
+          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
+        things-search:
+          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
+        policies:
+          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
+        things:
+          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
+        connectivity:
+          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
+    ModuleConfigService:
+      type: object
+      description: Module
+      properties:
+        pod:
+          $ref: '#/components/schemas/ResultConfigService'
+    ResultConfigService:
+      type: object
+      description: Details of specific service instance.
+      properties:
+        type:
+          type: string
+          description: 'devops.responses:ResultConfigService'
+        status:
+          type: integer
+          description: The HTTP status
+        config:
+          type: object
+          description: name of service
+          properties:
+            cluster:
+              items:
+                type: string
+              properties:
+                number-of-shards:
+                  type: integer
+            gateway:
+              items:
+                type: object
+              properties:
+                authentication:
+                  type: object
+                  properties:
+                    devops:
+                      type: object
+                      properties:
+                        password:
+                          type: string
+                        secured:
+                          type: boolean
+    RetrieveConfigService:
+      type: object
+      properties:
+        gateway:
+          $ref: '#/components/schemas/ModuleConfigService'
+    BasePiggybackCommandRequestSchema:
+      properties:
+        targetActorSelection:
+          type: string
+        headers:
+          type: object
+          properties:
+            aggregate:
+              type: boolean
+              default: false
+            is-group-topic:
+              type: boolean
+              default: true
+        piggybackCommand:
+          type: object
+          properties:
+            type:
+              type: string
+    PiggybackManagingBackgroundCleanup:
+      properties:
+        targetActorSelection:
+          type: string
+        headers:
+          type: object
+          properties:
+            aggregate:
+              type: boolean
+              default: false
+            is-group-topic:
+              type: boolean
+              default: true
+        piggybackCommand:
+          type: object
+          properties:
+            type:
+              type: string
+  securitySchemes:
+    DevOpsBasic:
+      type: http
+      description: Eclipse Ditto devops user (devops) + password (foobar)
+      scheme: basic
+    DevOpsBearer:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+      description: A JSON Web Token issued by a supported OAuth 2.0 Identity Provider for the Eclipse Ditto devops user.
diff --git a/documentation/src/main/resources/openapi/sources/devops-index.yml b/documentation/src/main/resources/openapi/sources/devops-index.yml
new file mode 100644
index 00000000000..b096afc0ca7
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/devops-index.yml
@@ -0,0 +1,120 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+openapi: 3.0.0
+info:
+  title: Eclipse Ditto™ HTTP devops API
+  version: "2"
+  description: |-
+    JSON-based, REST-like API for Eclipse Ditto
+
+    The Eclipse Ditto HTTP API uses response status codes (see [RFC 7231](https://tools.ietf.org/html/rfc7231#section-6))
+    to indicate whether a specific request has been successfully completed, or not.
+
+    The information Ditto provides additionally to the status code (e.g. in API docs, or error codes like. "things:thing.tooLarge") might change without advance notice.
+    These are not be considered as official API, and must therefore not be applied in your applications or tests.
+
+servers:
+  - url: https://ditto.eclipseprojects.io/devops
+    description: "online Ditto Sandbox"
+  - url: /devops
+    description: "local Ditto"
+
+tags:
+  # change tag name
+  - name: Logging
+    description: Manage Log Levels in runtime
+  - name: Service Configuration
+    description: Manage service configuration in runtime
+  - name: Piggyback Commands
+    description: Manage Piggyback commands
+
+security:
+  - DevOpsBasic: []
+  - DevOpsBearer: []
+
+paths:
+
+  ###
+  ### Logging
+  ###
+  /logging:
+    $ref: "./paths/logging/logging.yml"
+  '/logging/{moduleName}':
+    $ref: "./paths/logging/moduleName.yml"
+  /config:
+    $ref: "./paths/config/config.yml"
+  '/config/{moduleName}/{podName}':
+    $ref: "./paths/config/podName.yml"
+  /piggyback:
+    $ref: "./paths/piggyback/piggyback.yml"
+  '/piggyback/{serviceName}':
+    $ref: "./paths/piggyback/serviceName.yml"
+  '/piggyback/{serviceName}/{instanceIndex}':
+    $ref: "./paths/piggyback/instanceIndex.yml"
+
+components:
+  responses:
+    SuccessUpdateLogLevel:
+      $ref: "./responses/successUpdateLogLevel.yml"
+    SuccessUpdateLogLevelSinglePod:
+      $ref: "./responses/successUpdateLogLevelSinglePod.yml"
+
+  parameters:
+    LoggingFieldsQueryParam:
+      $ref: "./parameters/loggingFieldsQueryParam.yml"
+    TimeoutParam:
+      $ref: "./parameters/timeoutParam.yml"
+    ModuleNamePathParam:
+      $ref: "./parameters/moduleNamePathParam.yml"
+    PathParam:
+      $ref: "./parameters/pathParam.yml"
+    NamePodParam:
+      $ref: "./parameters/namePodParam.yml"
+    ServiceNameParam:
+      $ref: "./parameters/serviceNameParam.yml"
+    InstanceIndex:
+      $ref: "./parameters/instanceIndexParam.yml"
+
+  schemas:
+    AdvancedError:
+      $ref: "./schemas/errors/advancedError.yml"
+    TextUnauthorizeError:
+      $ref: "./schemas/errors/textUnauthorizeError.yml"
+    RetrieveConfig:
+      $ref: "./schemas/config/retrieveConfig.yml"
+    RetrieveLoggingConfig:
+      $ref: "./schemas/logging/retrieveLoggingConfig.yml"
+    Module:
+      $ref: "./schemas/logging/module.yml"
+    LoggingUpdateFields:
+      $ref: "./schemas/logging/loggingUpdateFields.yml"
+    UpdatedLogLevel:
+      $ref: "./schemas/logging/updatedLogLevel.yml"
+    ModuleUpdatedLogLevel:
+      $ref: "./schemas/logging/moduleUpdatedLogLevel.yml"
+    ResultUpdateRequest:
+      $ref: "./schemas/logging/resultUpdateRequest.yml"
+    ModuleConfigService:
+      $ref: "./schemas/config/moduleConfigService.yml"
+    ResultConfigService:
+      $ref: "./schemas/config/resultConfigService.yml"
+    RetrieveConfigService:
+      $ref: "./schemas/config/retrieveConfigService.yml"
+    BasePiggybackCommandRequestSchema:
+      $ref: "./schemas/piggyback/basePiggybackCommandRequestSchema.yml"
+    PiggybackManagingBackgroundCleanup:
+      $ref: "./schemas/piggyback/piggybackManagingBackgroundCleanup.yml"
+
+  securitySchemes:
+    DevOpsBasic:
+      $ref: "./security/devOpsBasic.yml"
+    DevOpsBearer:
+      $ref: "./security/devOpsBearer.yml"
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/package.json b/documentation/src/main/resources/openapi/sources/package.json
index 83d9df25978..a8b3f68acba 100644
--- a/documentation/src/main/resources/openapi/sources/package.json
+++ b/documentation/src/main/resources/openapi/sources/package.json
@@ -1,7 +1,8 @@
 {
   "scripts": {
-    "build": "npm run build-v2",
-    "build-v2": "swagger-cli bundle api-2-index.yml --outfile ../ditto-api-2.yml --type yaml"
+    "build": "npm run build-v2 & npm run build-devops",
+    "build-v2": "swagger-cli bundle api-2-index.yml --outfile ../ditto-api-2.yml --type yaml",
+    "build-devops": "swagger-cli bundle devops-index.yml --outfile ../ditto-devops.yml --type yaml"
   },
   "dependencies": {
     "swagger-cli": "^4.0.4"
diff --git a/documentation/src/main/resources/openapi/sources/parameters/instanceIndexParam.yml b/documentation/src/main/resources/openapi/sources/parameters/instanceIndexParam.yml
new file mode 100644
index 00000000000..2999ee91fdd
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/parameters/instanceIndexParam.yml
@@ -0,0 +1,16 @@
+# Copyright (c) 2020 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+name: instanceIndex
+in: path
+description: 'The index of the current instance'
+required: true
+schema:
+  type: string
diff --git a/documentation/src/main/resources/openapi/sources/parameters/loggingFieldsQueryParam.yml b/documentation/src/main/resources/openapi/sources/parameters/loggingFieldsQueryParam.yml
new file mode 100644
index 00000000000..587928897ad
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/parameters/loggingFieldsQueryParam.yml
@@ -0,0 +1,18 @@
+# Copyright (c) 2020 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+name: includeDisabledLoggers
+in: query
+description: |-
+  Include disabled loggers
+required: false
+schema:
+  type: boolean
+  default: false
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/parameters/moduleNamePathParam.yml b/documentation/src/main/resources/openapi/sources/parameters/moduleNamePathParam.yml
new file mode 100644
index 00000000000..4f879f47e11
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/parameters/moduleNamePathParam.yml
@@ -0,0 +1,17 @@
+# Copyright (c) 2020 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+name: moduleName
+in: path
+description: 'The name of module'
+required: true
+schema:
+  type: string
+  example: gateway
diff --git a/documentation/src/main/resources/openapi/sources/parameters/namePodParam.yml b/documentation/src/main/resources/openapi/sources/parameters/namePodParam.yml
new file mode 100644
index 00000000000..e0cea647192
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/parameters/namePodParam.yml
@@ -0,0 +1,17 @@
+# Copyright (c) 2020 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+name: podName
+in: path
+description: 'The name of pod'
+required: true
+schema:
+  type: string
+  example: ditto-gateway-764fc5f474-qrm2r
diff --git a/documentation/src/main/resources/openapi/sources/parameters/pathParam.yml b/documentation/src/main/resources/openapi/sources/parameters/pathParam.yml
new file mode 100644
index 00000000000..1567f4c6577
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/parameters/pathParam.yml
@@ -0,0 +1,17 @@
+# Copyright (c) 2020 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+name: path
+in: query
+description: The path points to information on service name, service instance index, JVM arguments and environment variables.
+schema:
+  type: string
+  example: ditto.info
+required: false
diff --git a/documentation/src/main/resources/openapi/sources/parameters/serviceNameParam.yml b/documentation/src/main/resources/openapi/sources/parameters/serviceNameParam.yml
new file mode 100644
index 00000000000..c50273849e0
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/parameters/serviceNameParam.yml
@@ -0,0 +1,20 @@
+# Copyright (c) 2020 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+name: serviceName
+in: path
+description: Specified service target for the command execution
+required: true
+schema:
+  type: string
+  enum:
+    - things
+    - policies
+    - connectivity
diff --git a/documentation/src/main/resources/openapi/sources/paths/config/config.yml b/documentation/src/main/resources/openapi/sources/paths/config/config.yml
new file mode 100644
index 00000000000..f71267b2452
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/paths/config/config.yml
@@ -0,0 +1,33 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+get:
+  summary: Retrieve the configuration at the specified path parameter
+  description: |-
+    It is recommended to not omit the query parameter path.
+    Otherwise, the full configurations of all services are aggregated in the response, which can become megabytes big.
+  tags:
+    - Service Configuration
+  parameters:
+    - $ref: '../../parameters/pathParam.yml'
+  responses:
+    '200':
+      description: |-
+        Return the configuration at the path
+      content:
+        application/json:
+          schema:
+            $ref: '../../schemas/config/retrieveConfig.yml'
+    '401':
+      description: The request could not be completed due to missing authentication.
+      content:
+        text/plain:
+          schema:
+            $ref: '../../schemas/errors/textUnauthorizeError.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/config/podName.yml b/documentation/src/main/resources/openapi/sources/paths/config/podName.yml
new file mode 100644
index 00000000000..1bb96b3ba07
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/paths/config/podName.yml
@@ -0,0 +1,97 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+get:
+  summary: Retrieving the configuration of a specific service instance.
+  description: |-
+    Return the configuration of a specific service instance.
+  tags:
+    - Service Configuration
+  parameters:
+    - $ref: '../../parameters/moduleNamePathParam.yml'
+    - $ref: '../../parameters/namePodParam.yml'
+    - $ref: '../../parameters/pathParam.yml'
+  responses:
+    '200':
+      description: |-
+        Return The current value of specific service instance.
+      content:
+        application/json:
+          schema:
+            type: array
+            items:
+              $ref: '../../schemas/config/retrieveConfigService.yml'
+          example: |-
+            {
+              "gateway": {
+                "podName": {
+                  "type": "common.responses:retrieveConfig",
+                  "status": 200,
+                  "config": {
+                    "cluster": {
+                      "cluster-status-roles-blocklist": [
+                          "cluster1",
+                          "......" ,
+                          "clusterN"
+                      ],
+                      "number-of-shards": 20
+                    },
+                    "ddata": {
+                      "vm arg1": "string",
+                      ".............": "string",
+                      "vm argn" : "string"
+                    },
+                    "devops": {
+                      "feature": {
+                        "merge-things-enabled": true
+                      },
+                      "namespace": {
+                        "block-time": "string"
+                      }
+                    },
+                    "gateway": {
+                      "authentication": {
+                        "devops": {
+                          "devops-authentication-method": "string",
+                          "password": "string",
+                          "secured": true,
+                          "status-authentication-method": "string",
+                          "statusPassword": "string"
+                        },
+                        "http": {
+                          "proxy": {
+                            "enabled": false
+                          }
+                        },
+                        "oauth": {
+                          "allowed-clock-skew": "string",
+                          "openid-connect-issuers": {
+                            "google": {
+                              "issuer": "string"
+                            }
+                          },
+                          "protocol": "https",
+                          "token-integration-subject": "string"
+                        },
+                        "pre-authentication": {
+                          "enabled": "true"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+    '401':
+      description: The request could not be completed due to missing authentication.
+      content:
+        text/plain:
+          schema:
+            $ref: '../../schemas/errors/textUnauthorizeError.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml b/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml
new file mode 100644
index 00000000000..f5c589ea3ba
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml
@@ -0,0 +1,60 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+get:
+  summary: Retrieve all currently configured log levels
+  description: Return configured log level for all ditto cluster pod
+  tags:
+    - Logging
+  parameters:
+    - $ref: '../../parameters/loggingFieldsQueryParam.yml'
+  responses:
+    '200':
+      description: |-
+        Return The current value of logging level
+      content:
+        application/json:
+          schema:
+            $ref: '../../schemas/logging/retrieveLoggingConfig.yml'
+    '401':
+      description: The request could not be completed due to missing authentication.
+      content:
+        text/plain:
+          schema:
+            $ref: '../../schemas/errors/textUnauthorizeError.yml'
+put:
+  summary: Update log levels
+  description: |-
+    Modify log level for eatch pods menaged
+  tags:
+    - Logging
+  requestBody:
+    description: Fields to update level log for each pods
+    required: true
+    content:
+      application/json:
+        schema:
+          $ref: '../../schemas/logging/loggingUpdateFields.yml'
+        example: |-
+          {
+            "level": "info",
+            "logger": "akka.actor.CoordinatedShutdown"
+          }
+  responses:
+    '201':
+      $ref: '../../responses/successUpdateLogLevel.yml'
+    '401':
+      description: The request could not be completed due to missing authentication.
+      content:
+        text/plain:
+          schema:
+            $ref: '../../schemas/errors/textUnauthorizeError.yml'
+
+
diff --git a/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml b/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml
new file mode 100644
index 00000000000..d2cceff3d79
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml
@@ -0,0 +1,63 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+get:
+  summary: Retrieve currently configured log levels for a specific module
+  description: |-
+    Return the configured log
+  tags:
+    - Logging
+  parameters:
+    - $ref: '../../parameters/moduleNamePathParam.yml'
+    - $ref: '../../parameters/loggingFieldsQueryParam.yml'
+  responses:
+    '200':
+      description: |-
+        Return The current value of logging level
+      content:
+        application/json:
+          schema:
+            $ref: '../../schemas/logging/module.yml'
+    '401':
+      description: The request could not be completed due to missing authentication.
+      content:
+        text/plain:
+          schema:
+            $ref: '../../schemas/errors/textUnauthorizeError.yml'
+put:
+  summary: Update log levels for a specific module
+  description: |-
+    Return outcome modify log level for a specific module
+  tags:
+    - Logging
+  parameters:
+    - $ref: '../../parameters/moduleNamePathParam.yml'
+  requestBody:
+    description: Fields to update level log for module
+    required: true
+    content:
+      application/json:
+        schema:
+          $ref: '../../schemas/logging/loggingUpdateFields.yml'
+        example: |-
+          {
+            "level": "info",
+            "logger": "akka.actor.CoordinatedShutdown"
+          }
+  responses:
+    '201':
+      $ref: '../../responses/successUpdateLogLevelSinglePod.yml'
+    '401':
+      description: The request could not be completed due to missing authentication.
+      content:
+        text/plain:
+          schema:
+            $ref: '../../schemas/errors/textUnauthorizeError.yml'
+
diff --git a/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml b/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml
new file mode 100644
index 00000000000..80944a0ae2a
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml
@@ -0,0 +1,65 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+post:
+  summary: Send a piggyback command to a specific instance of service
+  description: Send a piggyback command to a specific instance of service
+  tags:
+    - Piggyback Commands
+  parameters:
+    - $ref: '../../parameters/serviceNameParam.yml'
+    - $ref: '../../parameters/instanceIndexParam.yml'
+    - $ref: '../../parameters/timeoutParam.yml'
+  requestBody:
+    description: Fields to send a command
+    required: true
+    content:
+      application/json:
+        schema:
+          $ref: '../../schemas/piggyback/basePiggybackCommandRequestSchema.yml'
+        examples: 
+          cleanup:
+            description: Cleanup events and snapshots of an entity
+            value: |-
+              {
+                "targetActorSelection": "/system/sharding/thing",
+                "headers": {
+                  "aggregate": false
+                },
+                "piggybackCommand": {
+                  "type": "cleanup.sudo.commands:cleanupPersistence",
+                  "entityId": "ditto:thing1"
+                }
+              }
+
+  responses:
+    '200':
+      description: |-
+        response of command
+      content:
+        application/json:
+          example: |-
+            {
+              "type": "cleanup.sudo.responses:cleanupPersistence",
+              "status": 200,
+              "entityId": "thing:ditto:thing1"
+            }
+    '400':
+      description: The request could not be completed. At least one of the defined query parameters was invalid.
+      content:
+        application/json:
+          schema:
+            $ref: '../../schemas/errors/advancedError.yml'
+    '401':
+      description: The request could not be completed due to missing authentication.
+      content:
+        text/plain:
+          schema:
+            $ref: '../../schemas/errors/textUnauthorizeError.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml b/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml
new file mode 100644
index 00000000000..065349e6468
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml
@@ -0,0 +1,107 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+post:
+  summary: Send a piggyback command
+  description: Send a piggyback command to Akka’s pub-sub-mediator
+  tags:
+    - Piggyback Commands
+  parameters:
+    - $ref: '../../parameters/timeoutParam.yml'
+  requestBody:
+    description: Fields to send a command
+    required: true
+    content:
+      application/json:
+        schema:
+          $ref: '../../schemas/piggyback/basePiggybackCommandRequestSchema.yml'
+        examples:
+          blockNamespace:
+            description: Block all messages to a namespace
+            value: |-
+              {
+                "targetActorSelection": "/system/distributedPubSubMediator",
+                "headers": {
+                  "aggregate": false
+                },
+                "piggybackCommand": {
+                  "type": "namespaces.commands:blockNamespace",
+                  "namespace": "namespaceToBlock"
+                }
+              }
+          shutdown:
+            description: Shutdown all actors in a namespace
+            value: |-
+              {
+                "targetActorSelection": "/system/distributedPubSubMediator",
+                "piggybackCommand": {
+                  "type": "common.commands:shutdown",
+                  "reason": {
+                    "type": "purge-namespace",
+                    "details": "namespaceToShutdown"
+                  }
+                }
+              }
+          purgeNamespace:
+            description: Erase all data in a namespace from the persistence
+            value: |-
+              {
+                "targetActorSelection": "/system/distributedPubSubMediator",
+                "headers": {
+                  "aggregate": true,
+                  "is-group-topic": true
+                },
+                "piggybackCommand": {
+                  "type": "namespaces.commands:purgeNamespace",
+                  "namespace": "namespaceToPurge"
+                }
+              }
+          unblockNamespace:
+            description: Unblock messages to a namespace
+            value: |-
+              {
+                "targetActorSelection": "/system/distributedPubSubMediator",
+                "headers": {
+                  "aggregate": false
+                },
+                "piggybackCommand": {
+                  "type": "namespaces.commands:unblockNamespace",
+                  "namespace": "namespaceToUnblock"
+                }
+              }
+  responses:
+    '200':
+      description: |-
+        Response of command
+      content:
+        application/json:
+          schema:
+            $ref: '../../schemas/piggyback/piggybackManagingBackgroundCleanup.yml'
+          examples:
+            blockNamespace:
+              value: |-
+                {
+                  "type": "namespaces.responses:blockNamespace",
+                  "status": 200,
+                  "namespace": "namespaceToBlock",
+                  "resourceType": "namespaces"
+                }
+    '400':
+      description: The request could not be completed. At least one of the defined query parameters was invalid.
+      content:
+        application/json:
+          schema:
+            $ref: '../../schemas/errors/advancedError.yml'
+    '401':
+      description: The request could not be completed due to missing authentication.
+      content:
+        text/plain:
+          schema:
+            $ref: '../../schemas/errors/textUnauthorizeError.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml b/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml
new file mode 100644
index 00000000000..df2514ac4d8
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml
@@ -0,0 +1,77 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+post:
+  summary: Send a piggyback command to a specific service
+  description: Send a piggyback command to a specific service
+  tags:
+    - Piggyback Commands
+  parameters:
+    - $ref: '../../parameters/serviceNameParam.yml'
+    - $ref: '../../parameters/timeoutParam.yml'
+  requestBody:
+    description: Fields to send a command
+    required: true
+    content:
+      application/json:
+        schema:
+          $ref: '../../schemas/piggyback/basePiggybackCommandRequestSchema.yml'
+        examples: 
+          persistenceCleanup:
+            description: Query background cleanup coordinator state
+            value: |-
+              {
+                "targetActorSelection": "/user/<SERVICE_NAME>Root/persistenceCleanup",
+                "headers": {},
+                "piggybackCommand": {
+                  "type": "status.commands:retrieveHealth"
+                }
+              }
+
+  responses:
+    '200':
+      description: |-
+        Return The current value of logging level
+      content:
+        application/json:
+          schema:
+            $ref: '../../schemas/piggyback/piggybackManagingBackgroundCleanup.yml'
+          example: |-
+            {
+              "things": {
+                "ditto-things-65f6dd5d7-htkwt": {
+                  "type": "status.responses:retrieveHealth",
+                  "status": 200,
+                  "statusInfo": {
+                    "status": "UP",
+                    "details": [
+                      {
+                        "INFO": {
+                          "state": "IN_QUIET_PERIOD",
+                          "pid": ""
+                          }
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+    '400':
+      description: The request could not be completed. At least one of the defined query parameters was invalid.
+      content:
+        application/json:
+          schema:
+            $ref: '../../schemas/errors/advancedError.yml'
+    '401':
+      description: The request could not be completed due to missing authentication.
+      content:
+        text/plain:
+          schema:
+            $ref: '../../schemas/errors/textUnauthorizeError.yml'
diff --git a/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevel.yml b/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevel.yml
new file mode 100644
index 00000000000..5112b5ab135
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevel.yml
@@ -0,0 +1,18 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+description: |-
+    Return The summary of the outcome of all modified pods
+content:
+  application/json:
+    schema:
+      type: array
+      items:
+        $ref: '../schemas/logging/resultUpdateRequest.yml'
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevelSinglePod.yml b/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevelSinglePod.yml
new file mode 100644
index 00000000000..a6d2d74e2aa
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevelSinglePod.yml
@@ -0,0 +1,16 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+description: |-
+  Return The summary of the outcome of modified pod
+content:
+  application/json:
+    schema:
+      $ref: '../schemas/logging/moduleUpdatedLogLevel.yml'
diff --git a/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfig.yml b/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfig.yml
new file mode 100644
index 00000000000..90780f9ff6a
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfig.yml
@@ -0,0 +1,15 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: object
+description: Module
+properties:
+  pod:
+    $ref: './resultConfig.yml'
diff --git a/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfigService.yml b/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfigService.yml
new file mode 100644
index 00000000000..8374bf3e978
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfigService.yml
@@ -0,0 +1,16 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: object
+description: Module
+properties:
+  pod:
+    $ref: './resultConfigService.yml'
+    
diff --git a/documentation/src/main/resources/openapi/sources/schemas/config/resultConfig.yml b/documentation/src/main/resources/openapi/sources/schemas/config/resultConfig.yml
new file mode 100644
index 00000000000..48735f41125
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/config/resultConfig.yml
@@ -0,0 +1,41 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: object
+description:  Return the configuration at the path ditto.info
+properties:
+  type:
+    type: string
+    description: devops.responses:ResultConfig
+  status:
+    type: integer
+    description: The HTTP status
+  config:
+    type: object
+    description: name of service
+    properties:
+      env:
+        items:
+          type: string
+        properties:
+          PATH:
+            type: string
+      service:
+        items:
+          type: string
+        properties:
+          instance-index:
+            type: integer
+          service-name:
+            type: string
+      vm-args:
+        items:
+          type: string
+
diff --git a/documentation/src/main/resources/openapi/sources/schemas/config/resultConfigService.yml b/documentation/src/main/resources/openapi/sources/schemas/config/resultConfigService.yml
new file mode 100644
index 00000000000..1b245433dcd
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/config/resultConfigService.yml
@@ -0,0 +1,43 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: object
+description: Details of specific service instance.
+properties:
+  type:
+    type: string
+    description: devops.responses:ResultConfigService
+  status:
+    type: integer
+    description: The HTTP status
+  config:
+    type: object
+    description: name of service
+    properties:
+      cluster:
+        items:
+          type: string
+        properties:
+          number-of-shards:
+            type: integer
+      gateway:
+        items:
+          type: object
+        properties:
+          authentication:
+            type: object
+            properties:
+              devops:
+                type: object
+                properties:
+                  password:
+                    type: string
+                  secured:
+                    type: boolean
diff --git a/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfig.yml b/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfig.yml
new file mode 100644
index 00000000000..884a3fb1c85
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfig.yml
@@ -0,0 +1,14 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: object
+properties:
+  gateway:
+    $ref: './moduleConfig.yml'
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfigService.yml b/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfigService.yml
new file mode 100644
index 00000000000..aade800872b
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfigService.yml
@@ -0,0 +1,14 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: object
+properties:
+  gateway:
+    $ref: './moduleConfigService.yml'
diff --git a/documentation/src/main/resources/openapi/sources/schemas/errors/textUnauthorizeError.yml b/documentation/src/main/resources/openapi/sources/schemas/errors/textUnauthorizeError.yml
new file mode 100644
index 00000000000..9feebbe2bda
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/errors/textUnauthorizeError.yml
@@ -0,0 +1,13 @@
+# Copyright (c) 2020 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: string
+example: The supplied authentication is invalid
+
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/loggingUpdateFields.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/loggingUpdateFields.yml
new file mode 100644
index 00000000000..beec322d06e
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/loggingUpdateFields.yml
@@ -0,0 +1,16 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+properties:
+  level:
+    type: string
+  logger:
+    type: string
+    description: class where apply logger level
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/module.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/module.yml
new file mode 100644
index 00000000000..1a414aa7a0a
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/module.yml
@@ -0,0 +1,15 @@
+# Copyright (c) 2020 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: object
+description: Module
+properties:
+  pod:
+    $ref: './resultLoggingConfig.yml'
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/moduleUpdatedLogLevel.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/moduleUpdatedLogLevel.yml
new file mode 100644
index 00000000000..33724998a97
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/moduleUpdatedLogLevel.yml
@@ -0,0 +1,15 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: object
+description: Module that has been updated
+properties:
+  pod:
+    $ref: './updatedLogLevel.yml'
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/resultLoggingConfig.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/resultLoggingConfig.yml
new file mode 100644
index 00000000000..cf7c656306f
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/resultLoggingConfig.yml
@@ -0,0 +1,34 @@
+# Copyright (c) 2020 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: object
+description: Details of logging configuration
+properties:
+  type:
+    type: string
+    description: devops.responses:retrieveLoggerConfig
+  status:
+    type: integer
+    description: The HTTP status
+  serviceName:
+    type: string
+    description: name of service
+  instance:
+    type: string
+    description: instance of module
+  loggerConfigs:
+    type: array
+    items:
+      type: object
+      properties:
+        level:
+          type: string
+        logger:
+          type: string
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/resultUpdateRequest.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/resultUpdateRequest.yml
new file mode 100644
index 00000000000..ece9c457914
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/resultUpdateRequest.yml
@@ -0,0 +1,22 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: object
+properties:
+  gateway:
+    $ref: './moduleUpdatedLogLevel.yml'
+  things-search:
+    $ref: './moduleUpdatedLogLevel.yml'
+  policies:
+    $ref: './moduleUpdatedLogLevel.yml'
+  things:
+    $ref: './moduleUpdatedLogLevel.yml'
+  connectivity:
+    $ref: './moduleUpdatedLogLevel.yml'
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/retrieveLoggingConfig.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/retrieveLoggingConfig.yml
new file mode 100644
index 00000000000..0d40f22f145
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/retrieveLoggingConfig.yml
@@ -0,0 +1,13 @@
+# Copyright (c) 2020 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+properties:
+  gateway:
+    $ref: './module.yml'
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/updatedLogLevel.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/updatedLogLevel.yml
new file mode 100644
index 00000000000..292cae1f791
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/updatedLogLevel.yml
@@ -0,0 +1,28 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+type: object
+description: 'Details of logging configuration'
+properties:
+  type:
+    type: string
+    description: 'devops.responses:changeLogLevel'
+  status:
+    type: integer
+    description: 'http code 200 for success operation'
+  serviceName:
+    type: string
+    description: 'name of service that has been updated'
+  instance:
+    type: string
+    description: 'identifier of pod instance'
+  successfull:
+    type: boolean
+    description: 'outcome of the change'
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/schemas/piggyback/basePiggybackCommandRequestSchema.yml b/documentation/src/main/resources/openapi/sources/schemas/piggyback/basePiggybackCommandRequestSchema.yml
new file mode 100644
index 00000000000..14bdc0bbb7e
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/piggyback/basePiggybackCommandRequestSchema.yml
@@ -0,0 +1,27 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+properties:
+  targetActorSelection:
+    type: string
+  headers:
+    type: object
+    properties:
+      aggregate:
+        type: boolean
+        default: false
+      is-group-topic:
+        type: boolean
+        default: true
+  piggybackCommand:
+    type: object
+    properties:
+      type:
+        type: string
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/schemas/piggyback/piggybackManagingBackgroundCleanup.yml b/documentation/src/main/resources/openapi/sources/schemas/piggyback/piggybackManagingBackgroundCleanup.yml
new file mode 100644
index 00000000000..14bdc0bbb7e
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/schemas/piggyback/piggybackManagingBackgroundCleanup.yml
@@ -0,0 +1,27 @@
+# Copyright (c) 2017 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+properties:
+  targetActorSelection:
+    type: string
+  headers:
+    type: object
+    properties:
+      aggregate:
+        type: boolean
+        default: false
+      is-group-topic:
+        type: boolean
+        default: true
+  piggybackCommand:
+    type: object
+    properties:
+      type:
+        type: string
\ No newline at end of file

From 6c80bc53fc727b8279cdc20551a221c957e2690c Mon Sep 17 00:00:00 2001
From: neottil <neot.luka.89@gmail.com>
Date: Fri, 28 Apr 2023 17:13:46 +0200
Subject: [PATCH 092/173] fix copyright header with file creation year '2023'

---
 .../src/main/resources/openapi/sources/devops-index.yml         | 2 +-
 .../resources/openapi/sources/parameters/instanceIndexParam.yml | 2 +-
 .../openapi/sources/parameters/loggingFieldsQueryParam.yml      | 2 +-
 .../openapi/sources/parameters/moduleNamePathParam.yml          | 2 +-
 .../main/resources/openapi/sources/parameters/namePodParam.yml  | 2 +-
 .../src/main/resources/openapi/sources/parameters/pathParam.yml | 2 +-
 .../resources/openapi/sources/parameters/serviceNameParam.yml   | 2 +-
 .../src/main/resources/openapi/sources/paths/config/config.yml  | 2 +-
 .../src/main/resources/openapi/sources/paths/config/podName.yml | 2 +-
 .../main/resources/openapi/sources/paths/logging/logging.yml    | 2 +-
 .../main/resources/openapi/sources/paths/logging/moduleName.yml | 2 +-
 .../resources/openapi/sources/paths/piggyback/instanceIndex.yml | 2 +-
 .../resources/openapi/sources/paths/piggyback/piggyback.yml     | 2 +-
 .../resources/openapi/sources/paths/piggyback/serviceName.yml   | 2 +-
 .../openapi/sources/responses/successUpdateLogLevel.yml         | 2 +-
 .../sources/responses/successUpdateLogLevelSinglePod.yml        | 2 +-
 .../resources/openapi/sources/schemas/config/moduleConfig.yml   | 2 +-
 .../openapi/sources/schemas/config/moduleConfigService.yml      | 2 +-
 .../resources/openapi/sources/schemas/config/resultConfig.yml   | 2 +-
 .../openapi/sources/schemas/config/resultConfigService.yml      | 2 +-
 .../resources/openapi/sources/schemas/config/retrieveConfig.yml | 2 +-
 .../openapi/sources/schemas/config/retrieveConfigService.yml    | 2 +-
 .../openapi/sources/schemas/errors/textUnauthorizeError.yml     | 2 +-
 .../openapi/sources/schemas/logging/loggingUpdateFields.yml     | 2 +-
 .../main/resources/openapi/sources/schemas/logging/module.yml   | 2 +-
 .../openapi/sources/schemas/logging/moduleUpdatedLogLevel.yml   | 2 +-
 .../openapi/sources/schemas/logging/resultLoggingConfig.yml     | 2 +-
 .../openapi/sources/schemas/logging/resultUpdateRequest.yml     | 2 +-
 .../openapi/sources/schemas/logging/retrieveLoggingConfig.yml   | 2 +-
 .../openapi/sources/schemas/logging/updatedLogLevel.yml         | 2 +-
 .../schemas/piggyback/basePiggybackCommandRequestSchema.yml     | 2 +-
 .../schemas/piggyback/piggybackManagingBackgroundCleanup.yml    | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/documentation/src/main/resources/openapi/sources/devops-index.yml b/documentation/src/main/resources/openapi/sources/devops-index.yml
index b096afc0ca7..37ae063479a 100644
--- a/documentation/src/main/resources/openapi/sources/devops-index.yml
+++ b/documentation/src/main/resources/openapi/sources/devops-index.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/parameters/instanceIndexParam.yml b/documentation/src/main/resources/openapi/sources/parameters/instanceIndexParam.yml
index 2999ee91fdd..0ffb0b83ea2 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/instanceIndexParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/instanceIndexParam.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/parameters/loggingFieldsQueryParam.yml b/documentation/src/main/resources/openapi/sources/parameters/loggingFieldsQueryParam.yml
index 587928897ad..22a720b1d68 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/loggingFieldsQueryParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/loggingFieldsQueryParam.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/parameters/moduleNamePathParam.yml b/documentation/src/main/resources/openapi/sources/parameters/moduleNamePathParam.yml
index 4f879f47e11..46c5b9a752e 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/moduleNamePathParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/moduleNamePathParam.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/parameters/namePodParam.yml b/documentation/src/main/resources/openapi/sources/parameters/namePodParam.yml
index e0cea647192..4538d0447b7 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/namePodParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/namePodParam.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/parameters/pathParam.yml b/documentation/src/main/resources/openapi/sources/parameters/pathParam.yml
index 1567f4c6577..3df27bf545c 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/pathParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/pathParam.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/parameters/serviceNameParam.yml b/documentation/src/main/resources/openapi/sources/parameters/serviceNameParam.yml
index c50273849e0..acd8f74b3d1 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/serviceNameParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/serviceNameParam.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/paths/config/config.yml b/documentation/src/main/resources/openapi/sources/paths/config/config.yml
index f71267b2452..fd89e59148c 100644
--- a/documentation/src/main/resources/openapi/sources/paths/config/config.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/config/config.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/paths/config/podName.yml b/documentation/src/main/resources/openapi/sources/paths/config/podName.yml
index 1bb96b3ba07..3540d13658c 100644
--- a/documentation/src/main/resources/openapi/sources/paths/config/podName.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/config/podName.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml b/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml
index f5c589ea3ba..d9b71c99700 100644
--- a/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml b/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml
index d2cceff3d79..4f26ad6fccc 100644
--- a/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml b/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml
index 80944a0ae2a..276681a6df5 100644
--- a/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml b/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml
index 065349e6468..347a52029f9 100644
--- a/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml b/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml
index df2514ac4d8..6bffdbee021 100644
--- a/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevel.yml b/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevel.yml
index 5112b5ab135..2e0a693f4f5 100644
--- a/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevel.yml
+++ b/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevel.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevelSinglePod.yml b/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevelSinglePod.yml
index a6d2d74e2aa..495b5d51e6c 100644
--- a/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevelSinglePod.yml
+++ b/documentation/src/main/resources/openapi/sources/responses/successUpdateLogLevelSinglePod.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfig.yml b/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfig.yml
index 90780f9ff6a..321fdf56e56 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfig.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfig.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfigService.yml b/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfigService.yml
index 8374bf3e978..76ffed1eaa2 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfigService.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/config/moduleConfigService.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/config/resultConfig.yml b/documentation/src/main/resources/openapi/sources/schemas/config/resultConfig.yml
index 48735f41125..8bcc7f7ec0c 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/config/resultConfig.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/config/resultConfig.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/config/resultConfigService.yml b/documentation/src/main/resources/openapi/sources/schemas/config/resultConfigService.yml
index 1b245433dcd..2bd7b246add 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/config/resultConfigService.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/config/resultConfigService.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfig.yml b/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfig.yml
index 884a3fb1c85..460ad3fb583 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfig.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfig.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfigService.yml b/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfigService.yml
index aade800872b..33013a4ecbe 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfigService.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/config/retrieveConfigService.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/errors/textUnauthorizeError.yml b/documentation/src/main/resources/openapi/sources/schemas/errors/textUnauthorizeError.yml
index 9feebbe2bda..1242d9a8837 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/errors/textUnauthorizeError.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/errors/textUnauthorizeError.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/loggingUpdateFields.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/loggingUpdateFields.yml
index beec322d06e..5255b52e7e6 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/logging/loggingUpdateFields.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/loggingUpdateFields.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/module.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/module.yml
index 1a414aa7a0a..9203f43431a 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/logging/module.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/module.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/moduleUpdatedLogLevel.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/moduleUpdatedLogLevel.yml
index 33724998a97..116cb03ed92 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/logging/moduleUpdatedLogLevel.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/moduleUpdatedLogLevel.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/resultLoggingConfig.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/resultLoggingConfig.yml
index cf7c656306f..7b45e6a0796 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/logging/resultLoggingConfig.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/resultLoggingConfig.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/resultUpdateRequest.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/resultUpdateRequest.yml
index ece9c457914..20b44f8b412 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/logging/resultUpdateRequest.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/resultUpdateRequest.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/retrieveLoggingConfig.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/retrieveLoggingConfig.yml
index 0d40f22f145..ddcdbb61a2c 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/logging/retrieveLoggingConfig.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/retrieveLoggingConfig.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/logging/updatedLogLevel.yml b/documentation/src/main/resources/openapi/sources/schemas/logging/updatedLogLevel.yml
index 292cae1f791..c64aba5f4d3 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/logging/updatedLogLevel.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/logging/updatedLogLevel.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/piggyback/basePiggybackCommandRequestSchema.yml b/documentation/src/main/resources/openapi/sources/schemas/piggyback/basePiggybackCommandRequestSchema.yml
index 14bdc0bbb7e..43d408ce5fd 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/piggyback/basePiggybackCommandRequestSchema.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/piggyback/basePiggybackCommandRequestSchema.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/documentation/src/main/resources/openapi/sources/schemas/piggyback/piggybackManagingBackgroundCleanup.yml b/documentation/src/main/resources/openapi/sources/schemas/piggyback/piggybackManagingBackgroundCleanup.yml
index 14bdc0bbb7e..43d408ce5fd 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/piggyback/piggybackManagingBackgroundCleanup.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/piggyback/piggybackManagingBackgroundCleanup.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Contributors to the Eclipse Foundation
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

From 4522c0deee080ffa34f7cafe8b0a74f5073dc999 Mon Sep 17 00:00:00 2001
From: neottil <neot.luka.89@gmail.com>
Date: Mon, 1 May 2023 14:37:09 +0200
Subject: [PATCH 093/173] move all api in one file. Modify servers to point
 root path /. Modify old api entry point in /api/2. Add new devops api with
 entry point /devops and devops credentials.

---
 .../main/resources/openapi/ditto-api-2.yml    | 805 +++++++++++++++++-
 .../main/resources/openapi/ditto-devops.yml   | 763 -----------------
 .../resources/openapi/sources/api-2-index.yml | 159 +++-
 .../openapi/sources/devops-index.yml          | 120 ---
 .../resources/openapi/sources/package.json    |   5 +-
 .../parameters/loggingFieldsQueryParam.yml    |   3 +-
 .../openapi/sources/paths/config/config.yml   |   3 +
 .../openapi/sources/paths/config/podName.yml  |   3 +
 .../openapi/sources/paths/logging/logging.yml |   6 +
 .../sources/paths/logging/moduleName.yml      |   6 +
 .../sources/paths/piggyback/instanceIndex.yml |   3 +
 .../sources/paths/piggyback/piggyback.yml     |   3 +
 .../sources/paths/piggyback/serviceName.yml   |   3 +
 13 files changed, 908 insertions(+), 974 deletions(-)
 delete mode 100644 documentation/src/main/resources/openapi/ditto-devops.yml
 delete mode 100644 documentation/src/main/resources/openapi/sources/devops-index.yml

diff --git a/documentation/src/main/resources/openapi/ditto-api-2.yml b/documentation/src/main/resources/openapi/ditto-api-2.yml
index c02cba89b74..90c7cf84712 100644
--- a/documentation/src/main/resources/openapi/ditto-api-2.yml
+++ b/documentation/src/main/resources/openapi/ditto-api-2.yml
@@ -11,9 +11,9 @@ info:
     The information Ditto provides additionally to the status code (e.g. in API docs, or error codes like. "things:thing.tooLarge") might change without advance notice.
     These are not be considered as official API, and must therefore not be applied in your applications or tests.
 servers:
-  - url: 'https://ditto.eclipseprojects.io/api/2'
+  - url: 'https://ditto.eclipseprojects.io/'
     description: online Ditto Sandbox
-  - url: /api/2
+  - url: /
     description: local Ditto
 tags:
   - name: Things
@@ -30,13 +30,19 @@ tags:
     description: Process CloudEvents in Ditto
   - name: Connections
     description: Manage connections
+  - name: Logging
+    description: Manage Log Levels in runtime
+  - name: Service Configuration
+    description: Manage service configuration in runtime
+  - name: Piggyback Commands
+    description: Manage Piggyback commands
 security:
   - Google:
       - openid
   - NginxBasic: []
   - Bearer: []
 paths:
-  /things:
+  /api/2/things:
     get:
       summary: Retrieve visible things or things with specified IDs
       description: |-
@@ -199,7 +205,7 @@ paths:
                       waterAmount: 731
                       temperature: 44
         description: 'JSON representation of the thing to be created. Use ''{}'' to create an empty thing with a default policy.'
-  '/things/{thingId}':
+  '/api/2/things/{thingId}':
     get:
       summary: Retrieve a specific thing
       description: |-
@@ -716,7 +722,7 @@ paths:
           $ref: '#/components/responses/PreconditionFailed'
         '424':
           $ref: '#/components/responses/DependencyFailed'
-  '/things/{thingId}/definition':
+  '/api/2/things/{thingId}/definition':
     get:
       summary: Retrieve the definition of a specific thing
       description: Returns the definition of the thing identified by the `thingId` path parameter.
@@ -1012,7 +1018,7 @@ paths:
           $ref: '#/components/responses/PreconditionFailed'
         '424':
           $ref: '#/components/responses/DependencyFailed'
-  '/things/{thingId}/policyId':
+  '/api/2/things/{thingId}/policyId':
     get:
       summary: Retrieve the policy ID of a thing
       description: Returns the policy ID of the thing identified by the `thingId` path parameter.
@@ -1216,7 +1222,7 @@ paths:
 
           The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
         required: true
-  '/things/{thingId}/attributes':
+  '/api/2/things/{thingId}/attributes':
     get:
       summary: List all attributes of a specific thing
       description: Returns all attributes of the thing identified by the `thingId` path parameter.
@@ -1504,7 +1510,7 @@ paths:
           $ref: '#/components/responses/PreconditionFailed'
         '424':
           $ref: '#/components/responses/DependencyFailed'
-  '/things/{thingId}/attributes/{attributePath}':
+  '/api/2/things/{thingId}/attributes/{attributePath}':
     get:
       summary: Retrieve a specific attribute of a specific thing
       description: |-
@@ -1796,7 +1802,7 @@ paths:
           $ref: '#/components/responses/PreconditionFailed'
         '424':
           $ref: '#/components/responses/DependencyFailed'
-  '/things/{thingId}/features':
+  '/api/2/things/{thingId}/features':
     get:
       summary: List all features of a specific thing
       description: Returns all features of the thing identified by the `thingId` path parameter.
@@ -2198,7 +2204,7 @@ paths:
           $ref: '#/components/responses/PreconditionFailed'
         '424':
           $ref: '#/components/responses/DependencyFailed'
-  '/things/{thingId}/features/{featureId}':
+  '/api/2/things/{thingId}/features/{featureId}':
     get:
       summary: Retrieve a specific feature of a specific thing
       description: |-
@@ -2548,7 +2554,7 @@ paths:
           $ref: '#/components/responses/PreconditionFailed'
         '424':
           $ref: '#/components/responses/DependencyFailed'
-  '/things/{thingId}/features/{featureId}/definition':
+  '/api/2/things/{thingId}/features/{featureId}/definition':
     get:
       summary: List the definition of a feature
       description: Returns the complete definition field of the feature identified by the `thingId` and `featureId` path parameter.
@@ -2849,7 +2855,7 @@ paths:
           $ref: '#/components/responses/PreconditionFailed'
         '424':
           $ref: '#/components/responses/DependencyFailed'
-  '/things/{thingId}/features/{featureId}/properties':
+  '/api/2/things/{thingId}/features/{featureId}/properties':
     get:
       summary: List all properties of a feature
       description: Returns all properties of the feature identified by the `thingId` and `featureId` path parameter.
@@ -3164,7 +3170,7 @@ paths:
           $ref: '#/components/responses/PreconditionFailed'
         '424':
           $ref: '#/components/responses/DependencyFailed'
-  '/things/{thingId}/features/{featureId}/properties/{propertyPath}':
+  '/api/2/things/{thingId}/features/{featureId}/properties/{propertyPath}':
     get:
       summary: Retrieve a specific property of a feature
       description: |-
@@ -3457,7 +3463,7 @@ paths:
           $ref: '#/components/responses/PreconditionFailed'
         '424':
           $ref: '#/components/responses/DependencyFailed'
-  '/things/{thingId}/features/{featureId}/desiredProperties':
+  '/api/2/things/{thingId}/features/{featureId}/desiredProperties':
     get:
       summary: List all desired properties of a feature
       description: Returns all desired properties of the feature identified by the `thingId` and `featureId` path parameter.
@@ -3772,7 +3778,7 @@ paths:
           $ref: '#/components/responses/PreconditionFailed'
         '424':
           $ref: '#/components/responses/DependencyFailed'
-  '/things/{thingId}/features/{featureId}/desiredProperties/{propertyPath}':
+  '/api/2/things/{thingId}/features/{featureId}/desiredProperties/{propertyPath}':
     get:
       summary: Retrieve a specific desired property of a feature
       description: |-
@@ -4069,7 +4075,7 @@ paths:
           $ref: '#/components/responses/PreconditionFailed'
         '424':
           $ref: '#/components/responses/DependencyFailed'
-  '/things/{thingId}/inbox/claim':
+  '/api/2/things/{thingId}/inbox/claim':
     post:
       summary: Initiates claiming a specific thing in order to gain access
       description: |-
@@ -4166,7 +4172,7 @@ paths:
                 $ref: '#/components/schemas/AdvancedError'
       requestBody:
         $ref: '#/components/requestBodies/Payload'
-  '/things/{thingId}/inbox/messages/{messageSubject}':
+  '/api/2/things/{thingId}/inbox/messages/{messageSubject}':
     post:
       summary: Send a message TO a specific thing
       description: |-
@@ -4261,7 +4267,7 @@ paths:
           $ref: '#/components/responses/DependencyFailed'
       requestBody:
         $ref: '#/components/requestBodies/Payload'
-  '/things/{thingId}/outbox/messages/{messageSubject}':
+  '/api/2/things/{thingId}/outbox/messages/{messageSubject}':
     post:
       summary: Send a message FROM a specific thing
       description: |-
@@ -4343,7 +4349,7 @@ paths:
           $ref: '#/components/responses/DependencyFailed'
       requestBody:
         $ref: '#/components/requestBodies/Payload'
-  '/things/{thingId}/features/{featureId}/inbox/messages/{messageSubject}':
+  '/api/2/things/{thingId}/features/{featureId}/inbox/messages/{messageSubject}':
     post:
       summary: Send a message TO a specific feature of a specific thing
       description: |-
@@ -4429,7 +4435,7 @@ paths:
           $ref: '#/components/responses/DependencyFailed'
       requestBody:
         $ref: '#/components/requestBodies/Payload'
-  '/things/{thingId}/features/{featureId}/outbox/messages/{messageSubject}':
+  '/api/2/things/{thingId}/features/{featureId}/outbox/messages/{messageSubject}':
     post:
       summary: Send a message FROM a specific feature of a specific thing
       description: |-
@@ -4513,7 +4519,7 @@ paths:
           $ref: '#/components/responses/DependencyFailed'
       requestBody:
         $ref: '#/components/requestBodies/Payload'
-  '/policies/{policyId}':
+  '/api/2/policies/{policyId}':
     get:
       summary: Retrieve a specific policy
       description: |-
@@ -4810,7 +4816,7 @@ paths:
                 $ref: '#/components/schemas/AdvancedError'
         '412':
           $ref: '#/components/responses/PreconditionFailed'
-  '/policies/{policyId}/actions/activateTokenIntegration':
+  '/api/2/policies/{policyId}/actions/activateTokenIntegration':
     post:
       summary: Activate subjects for this policy derived from the token
       description: |-
@@ -4855,7 +4861,7 @@ paths:
             * containing a `READ` permission granted to a `thing:/` resource path
       requestBody:
         $ref: '#/components/requestBodies/ActivateTokenIntegration'
-  '/policies/{policyId}/actions/deactivateTokenIntegration':
+  '/api/2/policies/{policyId}/actions/deactivateTokenIntegration':
     post:
       summary: Deactivate subjects for this policy derived from the token
       description: |-
@@ -4896,7 +4902,7 @@ paths:
           description: |-
             The request could not be completed because no policy entry matched the following conditions:
             * containing a a subject ID matching the JWT's authenticated subject
-  '/policies/{policyId}/entries':
+  '/api/2/policies/{policyId}/entries':
     get:
       summary: Retrieve the entries of a specific policy
       description: |-
@@ -5047,7 +5053,7 @@ paths:
           Use the placeholder `{{ request:subjectId }}` in order to let the
           backend insert the authenticated subjectId of the HTTP request.
         required: true
-  '/policies/{policyId}/entries/{label}':
+  '/api/2/policies/{policyId}/entries/{label}':
     get:
       summary: Retrieve the entries of a specific Label of a specific policy
       description: |-
@@ -5300,7 +5306,7 @@ paths:
                 $ref: '#/components/schemas/AdvancedError'
         '412':
           $ref: '#/components/responses/PreconditionFailed'
-  '/policies/{policyId}/entries/{label}/actions/activateTokenIntegration':
+  '/api/2/policies/{policyId}/entries/{label}/actions/activateTokenIntegration':
     post:
       summary: Activate a subject for this policy entry derived from the token
       description: |-
@@ -5346,7 +5352,7 @@ paths:
             * containing a `READ` permission granted to a `thing:/` resource path
       requestBody:
         $ref: '#/components/requestBodies/ActivateTokenIntegration'
-  '/policies/{policyId}/entries/{label}/actions/deactivateTokenIntegration':
+  '/api/2/policies/{policyId}/entries/{label}/actions/deactivateTokenIntegration':
     post:
       summary: Deactivate a subject for this policy entry derived from the token
       description: |-
@@ -5386,7 +5392,7 @@ paths:
           description: |-
             The request could not be completed because this policy entry did not match the following conditions:
             * containing a a subject ID matching the JWT's authenticated subject
-  '/policies/{policyId}/entries/{label}/subjects':
+  '/api/2/policies/{policyId}/entries/{label}/subjects':
     get:
       summary: Retrieve all Subjects for a specific Label of a specific policy
       description: |-
@@ -5531,7 +5537,7 @@ paths:
           Use the placeholder `{{ request:subjectId }}` in order to let the
           backend insert the authenticated subjectId of the HTTP request.
         required: true
-  '/policies/{policyId}/entries/{label}/subjects/{subjectId}':
+  '/api/2/policies/{policyId}/entries/{label}/subjects/{subjectId}':
     get:
       summary: Retrieve one specific Subject for a specific Label of a specific policy
       description: |-
@@ -5737,7 +5743,7 @@ paths:
                 $ref: '#/components/schemas/AdvancedError'
         '412':
           $ref: '#/components/responses/PreconditionFailed'
-  '/policies/{policyId}/entries/{label}/resources':
+  '/api/2/policies/{policyId}/entries/{label}/resources':
     get:
       summary: Retrieve all Resources for a specific Label of a specific policy
       description: |-
@@ -5913,7 +5919,7 @@ paths:
               $ref: '#/components/schemas/Resources'
         description: JSON representation of the Resources
         required: true
-  '/policies/{policyId}/entries/{label}/resources/{resourcePath}':
+  '/api/2/policies/{policyId}/entries/{label}/resources/{resourcePath}':
     get:
       summary: Retrieve one specific Resource for a specific Label of a specific policy
       description: |-
@@ -6119,7 +6125,7 @@ paths:
                 $ref: '#/components/schemas/AdvancedError'
         '412':
           $ref: '#/components/responses/PreconditionFailed'
-  '/policies/{policyId}/imports':
+  '/api/2/policies/{policyId}/imports':
     get:
       summary: Retrieve the imports of a specific policy
       description: |-
@@ -6264,7 +6270,7 @@ paths:
               'com.acme:imported2': {}
         description: JSON representation of the policy imports.
         required: true
-  '/policies/{policyId}/imports/{importedPolicyId}':
+  '/api/2/policies/{policyId}/imports/{importedPolicyId}':
     get:
       summary: Retrieve a specific policy import.
       description: |-
@@ -6491,7 +6497,7 @@ paths:
                 $ref: '#/components/schemas/AdvancedError'
         '412':
           $ref: '#/components/responses/PreconditionFailed'
-  /whoami:
+  /api/2/whoami:
     get:
       summary: Retrieve information about the current caller
       description: 'Get information about the current caller, e.g. the auth subjects that are generated for the caller.'
@@ -6510,7 +6516,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/AdvancedError'
-  /search/things:
+  /api/2/search/things:
     get:
       summary: Search for things
       description: |-
@@ -6609,7 +6615,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/AdvancedError'
-  /search/things/count:
+  /api/2/search/things/count:
     get:
       summary: Count things
       description: |-
@@ -6664,7 +6670,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/AdvancedError'
-  /cloudevents:
+  /api/2/cloudevents:
     post:
       summary: Processes a CloudEvent sent in Ditto Protocol
       description: |-
@@ -6815,7 +6821,7 @@ paths:
         description: |-
           The [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html) payload defining which
           command to process.
-  /connections:
+  /api/2/connections:
     get:
       summary: Retrieve all connections
       description: Returns all connections.
@@ -6965,7 +6971,7 @@ paths:
                   headerMapping: {}
         description: The example below shows a connection to Eclipse Hono.
         required: true
-  '/connections/{connectionId}':
+  '/api/2/connections/{connectionId}':
     get:
       summary: Retrieve a specific connection
       description: Returns the connection identified by the `connectionId` path parameter.
@@ -7120,7 +7126,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/AdvancedError'
-  '/connections/{connectionId}/command':
+  '/api/2/connections/{connectionId}/command':
     post:
       summary: Send a command to a specific connection
       description: |-
@@ -7174,7 +7180,7 @@ paths:
             * `connectivity.commands:enableConnectionLogs`
             * `connectivity.commands:resetConnectionLogs`
         required: true
-  '/connections/{connectionId}/status':
+  '/api/2/connections/{connectionId}/status':
     get:
       summary: Retrieve status of a specific connection
       description: Returns the status of the connection identified by the `connectionId` path parameter.
@@ -7216,7 +7222,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/AdvancedError'
-  '/connections/{connectionId}/metrics':
+  '/api/2/connections/{connectionId}/metrics':
     get:
       summary: Retrieve metrics of a specific connection
       description: Returns the metrics of the connection identified by the `connectionId` path parameter.
@@ -7258,7 +7264,7 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/AdvancedError'
-  '/connections/{connectionId}/logs':
+  '/api/2/connections/{connectionId}/logs':
     get:
       summary: Retrieve logs of a specific connection
       description: |-
@@ -7304,6 +7310,456 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/AdvancedError'
+  /devops/logging:
+    get:
+      summary: Retrieve all currently configured log levels
+      description: Return configured log level for all ditto cluster pod
+      security:
+        - DevOpsBasic: []
+        - DevOpsBearer: []
+      tags:
+        - Logging
+      parameters:
+        - $ref: '#/components/parameters/LoggingFieldsQueryParam'
+      responses:
+        '200':
+          description: Return The current value of logging level
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RetrieveLoggingConfig'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+    put:
+      summary: Update log levels
+      description: Modify log level for eatch pods menaged
+      security:
+        - DevOpsBasic: []
+        - DevOpsBearer: []
+      tags:
+        - Logging
+      requestBody:
+        description: Fields to update level log for each pods
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/LoggingUpdateFields'
+            example: |-
+              {
+                "level": "info",
+                "logger": "akka.actor.CoordinatedShutdown"
+              }
+      responses:
+        '201':
+          $ref: '#/components/responses/SuccessUpdateLogLevel'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+  '/devops/logging/{moduleName}':
+    get:
+      summary: Retrieve currently configured log levels for a specific module
+      description: Return the configured log
+      security:
+        - DevOpsBasic: []
+        - DevOpsBearer: []
+      tags:
+        - Logging
+      parameters:
+        - $ref: '#/components/parameters/ModuleNamePathParam'
+        - $ref: '#/components/parameters/LoggingFieldsQueryParam'
+      responses:
+        '200':
+          description: Return The current value of logging level
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Module'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+    put:
+      summary: Update log levels for a specific module
+      description: Return outcome modify log level for a specific module
+      security:
+        - DevOpsBasic: []
+        - DevOpsBearer: []
+      tags:
+        - Logging
+      parameters:
+        - $ref: '#/components/parameters/ModuleNamePathParam'
+      requestBody:
+        description: Fields to update level log for module
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/LoggingUpdateFields'
+            example: |-
+              {
+                "level": "info",
+                "logger": "akka.actor.CoordinatedShutdown"
+              }
+      responses:
+        '201':
+          $ref: '#/components/responses/SuccessUpdateLogLevelSinglePod'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+  /devops/config:
+    get:
+      summary: Retrieve the configuration at the specified path parameter
+      description: |-
+        It is recommended to not omit the query parameter path.
+        Otherwise, the full configurations of all services are aggregated in the response, which can become megabytes big.
+      security:
+        - DevOpsBasic: []
+        - DevOpsBearer: []
+      tags:
+        - Service Configuration
+      parameters:
+        - $ref: '#/components/parameters/PathParam'
+      responses:
+        '200':
+          description: Return the configuration at the path
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RetrieveConfig'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+  '/devops/config/{moduleName}/{podName}':
+    get:
+      summary: Retrieving the configuration of a specific service instance.
+      description: Return the configuration of a specific service instance.
+      security:
+        - DevOpsBasic: []
+        - DevOpsBearer: []
+      tags:
+        - Service Configuration
+      parameters:
+        - $ref: '#/components/parameters/ModuleNamePathParam'
+        - $ref: '#/components/parameters/NamePodParam'
+        - $ref: '#/components/parameters/PathParam'
+      responses:
+        '200':
+          description: Return The current value of specific service instance.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/RetrieveConfigService'
+              example: |-
+                {
+                  "gateway": {
+                    "podName": {
+                      "type": "common.responses:retrieveConfig",
+                      "status": 200,
+                      "config": {
+                        "cluster": {
+                          "cluster-status-roles-blocklist": [
+                              "cluster1",
+                              "......" ,
+                              "clusterN"
+                          ],
+                          "number-of-shards": 20
+                        },
+                        "ddata": {
+                          "vm arg1": "string",
+                          ".............": "string",
+                          "vm argn" : "string"
+                        },
+                        "devops": {
+                          "feature": {
+                            "merge-things-enabled": true
+                          },
+                          "namespace": {
+                            "block-time": "string"
+                          }
+                        },
+                        "gateway": {
+                          "authentication": {
+                            "devops": {
+                              "devops-authentication-method": "string",
+                              "password": "string",
+                              "secured": true,
+                              "status-authentication-method": "string",
+                              "statusPassword": "string"
+                            },
+                            "http": {
+                              "proxy": {
+                                "enabled": false
+                              }
+                            },
+                            "oauth": {
+                              "allowed-clock-skew": "string",
+                              "openid-connect-issuers": {
+                                "google": {
+                                  "issuer": "string"
+                                }
+                              },
+                              "protocol": "https",
+                              "token-integration-subject": "string"
+                            },
+                            "pre-authentication": {
+                              "enabled": "true"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+  /devops/piggyback:
+    post:
+      summary: Send a piggyback command
+      description: Send a piggyback command to Akka’s pub-sub-mediator
+      security:
+        - DevOpsBasic: []
+        - DevOpsBearer: []
+      tags:
+        - Piggyback Commands
+      parameters:
+        - $ref: '#/components/parameters/TimeoutParam'
+      requestBody:
+        description: Fields to send a command
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/BasePiggybackCommandRequestSchema'
+            examples:
+              blockNamespace:
+                description: Block all messages to a namespace
+                value: |-
+                  {
+                    "targetActorSelection": "/system/distributedPubSubMediator",
+                    "headers": {
+                      "aggregate": false
+                    },
+                    "piggybackCommand": {
+                      "type": "namespaces.commands:blockNamespace",
+                      "namespace": "namespaceToBlock"
+                    }
+                  }
+              shutdown:
+                description: Shutdown all actors in a namespace
+                value: |-
+                  {
+                    "targetActorSelection": "/system/distributedPubSubMediator",
+                    "piggybackCommand": {
+                      "type": "common.commands:shutdown",
+                      "reason": {
+                        "type": "purge-namespace",
+                        "details": "namespaceToShutdown"
+                      }
+                    }
+                  }
+              purgeNamespace:
+                description: Erase all data in a namespace from the persistence
+                value: |-
+                  {
+                    "targetActorSelection": "/system/distributedPubSubMediator",
+                    "headers": {
+                      "aggregate": true,
+                      "is-group-topic": true
+                    },
+                    "piggybackCommand": {
+                      "type": "namespaces.commands:purgeNamespace",
+                      "namespace": "namespaceToPurge"
+                    }
+                  }
+              unblockNamespace:
+                description: Unblock messages to a namespace
+                value: |-
+                  {
+                    "targetActorSelection": "/system/distributedPubSubMediator",
+                    "headers": {
+                      "aggregate": false
+                    },
+                    "piggybackCommand": {
+                      "type": "namespaces.commands:unblockNamespace",
+                      "namespace": "namespaceToUnblock"
+                    }
+                  }
+      responses:
+        '200':
+          description: Response of command
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PiggybackManagingBackgroundCleanup'
+              examples:
+                blockNamespace:
+                  value: |-
+                    {
+                      "type": "namespaces.responses:blockNamespace",
+                      "status": 200,
+                      "namespace": "namespaceToBlock",
+                      "resourceType": "namespaces"
+                    }
+        '400':
+          description: The request could not be completed. At least one of the defined query parameters was invalid.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AdvancedError'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+  '/devops/piggyback/{serviceName}':
+    post:
+      summary: Send a piggyback command to a specific service
+      description: Send a piggyback command to a specific service
+      security:
+        - DevOpsBasic: []
+        - DevOpsBearer: []
+      tags:
+        - Piggyback Commands
+      parameters:
+        - $ref: '#/components/parameters/ServiceNameParam'
+        - $ref: '#/components/parameters/TimeoutParam'
+      requestBody:
+        description: Fields to send a command
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/BasePiggybackCommandRequestSchema'
+            examples:
+              persistenceCleanup:
+                description: Query background cleanup coordinator state
+                value: |-
+                  {
+                    "targetActorSelection": "/user/<SERVICE_NAME>Root/persistenceCleanup",
+                    "headers": {},
+                    "piggybackCommand": {
+                      "type": "status.commands:retrieveHealth"
+                    }
+                  }
+      responses:
+        '200':
+          description: Return The current value of logging level
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PiggybackManagingBackgroundCleanup'
+              example: |-
+                {
+                  "things": {
+                    "ditto-things-65f6dd5d7-htkwt": {
+                      "type": "status.responses:retrieveHealth",
+                      "status": 200,
+                      "statusInfo": {
+                        "status": "UP",
+                        "details": [
+                          {
+                            "INFO": {
+                              "state": "IN_QUIET_PERIOD",
+                              "pid": ""
+                              }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+        '400':
+          description: The request could not be completed. At least one of the defined query parameters was invalid.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AdvancedError'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
+  '/devops/piggyback/{serviceName}/{instanceIndex}':
+    post:
+      summary: Send a piggyback command to a specific instance of service
+      description: Send a piggyback command to a specific instance of service
+      security:
+        - DevOpsBasic: []
+        - DevOpsBearer: []
+      tags:
+        - Piggyback Commands
+      parameters:
+        - $ref: '#/components/parameters/ServiceNameParam'
+        - $ref: '#/components/parameters/InstanceIndex'
+        - $ref: '#/components/parameters/TimeoutParam'
+      requestBody:
+        description: Fields to send a command
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/BasePiggybackCommandRequestSchema'
+            examples:
+              cleanup:
+                description: Cleanup events and snapshots of an entity
+                value: |-
+                  {
+                    "targetActorSelection": "/system/sharding/thing",
+                    "headers": {
+                      "aggregate": false
+                    },
+                    "piggybackCommand": {
+                      "type": "cleanup.sudo.commands:cleanupPersistence",
+                      "entityId": "ditto:thing1"
+                    }
+                  }
+      responses:
+        '200':
+          description: response of command
+          content:
+            application/json:
+              example: |-
+                {
+                  "type": "cleanup.sudo.responses:cleanupPersistence",
+                  "status": 200,
+                  "entityId": "thing:ditto:thing1"
+                }
+        '400':
+          description: The request could not be completed. At least one of the defined query parameters was invalid.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AdvancedError'
+        '401':
+          description: The request could not be completed due to missing authentication.
+          content:
+            text/plain:
+              schema:
+                $ref: '#/components/schemas/TextUnauthorizeError'
 components:
   requestBodies:
     Attributes:
@@ -7489,6 +7945,20 @@ components:
               acknnowledgementLabelN:
                 status: 403
                 payload: Forbidden
+    SuccessUpdateLogLevel:
+      description: Return The summary of the outcome of all modified pods
+      content:
+        application/json:
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/ResultUpdateRequest'
+    SuccessUpdateLogLevelSinglePod:
+      description: Return The summary of the outcome of modified pod
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/ModuleUpdatedLogLevel'
   parameters:
     AllowPolicyLockoutParam:
       name: allow-policy-lockout
@@ -8222,6 +8692,55 @@ components:
       required: false
       schema:
         type: string
+    LoggingFieldsQueryParam:
+      name: includeDisabledLoggers
+      in: query
+      description: Include disabled loggers
+      required: false
+      schema:
+        type: boolean
+    ModuleNamePathParam:
+      name: moduleName
+      in: path
+      description: The name of module
+      required: true
+      schema:
+        type: string
+        example: gateway
+    PathParam:
+      name: path
+      in: query
+      description: 'The path points to information on service name, service instance index, JVM arguments and environment variables.'
+      schema:
+        type: string
+        example: ditto.info
+      required: false
+    NamePodParam:
+      name: podName
+      in: path
+      description: The name of pod
+      required: true
+      schema:
+        type: string
+        example: ditto-gateway-764fc5f474-qrm2r
+    ServiceNameParam:
+      name: serviceName
+      in: path
+      description: Specified service target for the command execution
+      required: true
+      schema:
+        type: string
+        enum:
+          - things
+          - policies
+          - connectivity
+    InstanceIndex:
+      name: instanceIndex
+      in: path
+      description: The index of the current instance
+      required: true
+      schema:
+        type: string
   schemas:
     Error:
       properties:
@@ -9584,6 +10103,206 @@ components:
         - security
         - securityDefinitions
       additionalProperties: true
+    TextUnauthorizeError:
+      type: string
+      example: The supplied authentication is invalid
+    RetrieveConfig:
+      type: object
+      properties:
+        gateway:
+          type: object
+          description: Module
+          properties:
+            pod:
+              type: object
+              description: Return the configuration at the path ditto.info
+              properties:
+                type:
+                  type: string
+                  description: 'devops.responses:ResultConfig'
+                status:
+                  type: integer
+                  description: The HTTP status
+                config:
+                  type: object
+                  description: name of service
+                  properties:
+                    env:
+                      items:
+                        type: string
+                      properties:
+                        PATH:
+                          type: string
+                    service:
+                      items:
+                        type: string
+                      properties:
+                        instance-index:
+                          type: integer
+                        service-name:
+                          type: string
+                    vm-args:
+                      items:
+                        type: string
+    RetrieveLoggingConfig:
+      properties:
+        gateway:
+          $ref: '#/components/schemas/Module'
+    Module:
+      type: object
+      description: Module
+      properties:
+        pod:
+          type: object
+          description: Details of logging configuration
+          properties:
+            type:
+              type: string
+              description: 'devops.responses:retrieveLoggerConfig'
+            status:
+              type: integer
+              description: The HTTP status
+            serviceName:
+              type: string
+              description: name of service
+            instance:
+              type: string
+              description: instance of module
+            loggerConfigs:
+              type: array
+              items:
+                type: object
+                properties:
+                  level:
+                    type: string
+                  logger:
+                    type: string
+    LoggingUpdateFields:
+      properties:
+        level:
+          type: string
+        logger:
+          type: string
+          description: class where apply logger level
+    UpdatedLogLevel:
+      type: object
+      description: Details of logging configuration
+      properties:
+        type:
+          type: string
+          description: 'devops.responses:changeLogLevel'
+        status:
+          type: integer
+          description: http code 200 for success operation
+        serviceName:
+          type: string
+          description: name of service that has been updated
+        instance:
+          type: string
+          description: identifier of pod instance
+        successfull:
+          type: boolean
+          description: outcome of the change
+    ModuleUpdatedLogLevel:
+      type: object
+      description: Module that has been updated
+      properties:
+        pod:
+          $ref: '#/components/schemas/UpdatedLogLevel'
+    ResultUpdateRequest:
+      type: object
+      properties:
+        gateway:
+          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
+        things-search:
+          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
+        policies:
+          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
+        things:
+          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
+        connectivity:
+          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
+    ModuleConfigService:
+      type: object
+      description: Module
+      properties:
+        pod:
+          $ref: '#/components/schemas/ResultConfigService'
+    ResultConfigService:
+      type: object
+      description: Details of specific service instance.
+      properties:
+        type:
+          type: string
+          description: 'devops.responses:ResultConfigService'
+        status:
+          type: integer
+          description: The HTTP status
+        config:
+          type: object
+          description: name of service
+          properties:
+            cluster:
+              items:
+                type: string
+              properties:
+                number-of-shards:
+                  type: integer
+            gateway:
+              items:
+                type: object
+              properties:
+                authentication:
+                  type: object
+                  properties:
+                    devops:
+                      type: object
+                      properties:
+                        password:
+                          type: string
+                        secured:
+                          type: boolean
+    RetrieveConfigService:
+      type: object
+      properties:
+        gateway:
+          $ref: '#/components/schemas/ModuleConfigService'
+    BasePiggybackCommandRequestSchema:
+      properties:
+        targetActorSelection:
+          type: string
+        headers:
+          type: object
+          properties:
+            aggregate:
+              type: boolean
+              default: false
+            is-group-topic:
+              type: boolean
+              default: true
+        piggybackCommand:
+          type: object
+          properties:
+            type:
+              type: string
+    PiggybackManagingBackgroundCleanup:
+      properties:
+        targetActorSelection:
+          type: string
+        headers:
+          type: object
+          properties:
+            aggregate:
+              type: boolean
+              default: false
+            is-group-topic:
+              type: boolean
+              default: true
+        piggybackCommand:
+          type: object
+          properties:
+            type:
+              type: string
   securitySchemes:
     NginxBasic:
       type: http
diff --git a/documentation/src/main/resources/openapi/ditto-devops.yml b/documentation/src/main/resources/openapi/ditto-devops.yml
deleted file mode 100644
index 156f0981207..00000000000
--- a/documentation/src/main/resources/openapi/ditto-devops.yml
+++ /dev/null
@@ -1,763 +0,0 @@
-openapi: 3.0.0
-info:
-  title: Eclipse Ditto™ HTTP devops API
-  version: '2'
-  description: |-
-    JSON-based, REST-like API for Eclipse Ditto
-
-    The Eclipse Ditto HTTP API uses response status codes (see [RFC 7231](https://tools.ietf.org/html/rfc7231#section-6))
-    to indicate whether a specific request has been successfully completed, or not.
-
-    The information Ditto provides additionally to the status code (e.g. in API docs, or error codes like. "things:thing.tooLarge") might change without advance notice.
-    These are not be considered as official API, and must therefore not be applied in your applications or tests.
-servers:
-  - url: 'https://ditto.eclipseprojects.io/devops'
-    description: online Ditto Sandbox
-  - url: /devops
-    description: local Ditto
-tags:
-  - name: Logging
-    description: Manage Log Levels in runtime
-  - name: Service Configuration
-    description: Manage service configuration in runtime
-  - name: Piggyback Commands
-    description: Manage Piggyback commands
-security:
-  - DevOpsBasic: []
-  - DevOpsBearer: []
-paths:
-  /logging:
-    get:
-      summary: Retrieve all currently configured log levels
-      description: Return configured log level for all ditto cluster pod
-      tags:
-        - Logging
-      parameters:
-        - $ref: '#/components/parameters/LoggingFieldsQueryParam'
-      responses:
-        '200':
-          description: Return The current value of logging level
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RetrieveLoggingConfig'
-        '401':
-          description: The request could not be completed due to missing authentication.
-          content:
-            text/plain:
-              schema:
-                $ref: '#/components/schemas/TextUnauthorizeError'
-    put:
-      summary: Update log levels
-      description: Modify log level for eatch pods menaged
-      tags:
-        - Logging
-      requestBody:
-        description: Fields to update level log for each pods
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/LoggingUpdateFields'
-            example: |-
-              {
-                "level": "info",
-                "logger": "akka.actor.CoordinatedShutdown"
-              }
-      responses:
-        '201':
-          $ref: '#/components/responses/SuccessUpdateLogLevel'
-        '401':
-          description: The request could not be completed due to missing authentication.
-          content:
-            text/plain:
-              schema:
-                $ref: '#/components/schemas/TextUnauthorizeError'
-  '/logging/{moduleName}':
-    get:
-      summary: Retrieve currently configured log levels for a specific module
-      description: Return the configured log
-      tags:
-        - Logging
-      parameters:
-        - $ref: '#/components/parameters/ModuleNamePathParam'
-        - $ref: '#/components/parameters/LoggingFieldsQueryParam'
-      responses:
-        '200':
-          description: Return The current value of logging level
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Module'
-        '401':
-          description: The request could not be completed due to missing authentication.
-          content:
-            text/plain:
-              schema:
-                $ref: '#/components/schemas/TextUnauthorizeError'
-    put:
-      summary: Update log levels for a specific module
-      description: Return outcome modify log level for a specific module
-      tags:
-        - Logging
-      parameters:
-        - $ref: '#/components/parameters/ModuleNamePathParam'
-      requestBody:
-        description: Fields to update level log for module
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/LoggingUpdateFields'
-            example: |-
-              {
-                "level": "info",
-                "logger": "akka.actor.CoordinatedShutdown"
-              }
-      responses:
-        '201':
-          $ref: '#/components/responses/SuccessUpdateLogLevelSinglePod'
-        '401':
-          description: The request could not be completed due to missing authentication.
-          content:
-            text/plain:
-              schema:
-                $ref: '#/components/schemas/TextUnauthorizeError'
-  /config:
-    get:
-      summary: Retrieve the configuration at the specified path parameter
-      description: |-
-        It is recommended to not omit the query parameter path.
-        Otherwise, the full configurations of all services are aggregated in the response, which can become megabytes big.
-      tags:
-        - Service Configuration
-      parameters:
-        - $ref: '#/components/parameters/PathParam'
-      responses:
-        '200':
-          description: Return the configuration at the path
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RetrieveConfig'
-        '401':
-          description: The request could not be completed due to missing authentication.
-          content:
-            text/plain:
-              schema:
-                $ref: '#/components/schemas/TextUnauthorizeError'
-  '/config/{moduleName}/{podName}':
-    get:
-      summary: Retrieving the configuration of a specific service instance.
-      description: Return the configuration of a specific service instance.
-      tags:
-        - Service Configuration
-      parameters:
-        - $ref: '#/components/parameters/ModuleNamePathParam'
-        - $ref: '#/components/parameters/NamePodParam'
-        - $ref: '#/components/parameters/PathParam'
-      responses:
-        '200':
-          description: Return The current value of specific service instance.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/RetrieveConfigService'
-              example: |-
-                {
-                  "gateway": {
-                    "podName": {
-                      "type": "common.responses:retrieveConfig",
-                      "status": 200,
-                      "config": {
-                        "cluster": {
-                          "cluster-status-roles-blocklist": [
-                              "cluster1",
-                              "......" ,
-                              "clusterN"
-                          ],
-                          "number-of-shards": 20
-                        },
-                        "ddata": {
-                          "vm arg1": "string",
-                          ".............": "string",
-                          "vm argn" : "string"
-                        },
-                        "devops": {
-                          "feature": {
-                            "merge-things-enabled": true
-                          },
-                          "namespace": {
-                            "block-time": "string"
-                          }
-                        },
-                        "gateway": {
-                          "authentication": {
-                            "devops": {
-                              "devops-authentication-method": "string",
-                              "password": "string",
-                              "secured": true,
-                              "status-authentication-method": "string",
-                              "statusPassword": "string"
-                            },
-                            "http": {
-                              "proxy": {
-                                "enabled": false
-                              }
-                            },
-                            "oauth": {
-                              "allowed-clock-skew": "string",
-                              "openid-connect-issuers": {
-                                "google": {
-                                  "issuer": "string"
-                                }
-                              },
-                              "protocol": "https",
-                              "token-integration-subject": "string"
-                            },
-                            "pre-authentication": {
-                              "enabled": "true"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-        '401':
-          description: The request could not be completed due to missing authentication.
-          content:
-            text/plain:
-              schema:
-                $ref: '#/components/schemas/TextUnauthorizeError'
-  /piggyback:
-    post:
-      summary: Send a piggyback command
-      description: Send a piggyback command to Akka’s pub-sub-mediator
-      tags:
-        - Piggyback Commands
-      parameters:
-        - $ref: '#/components/parameters/TimeoutParam'
-      requestBody:
-        description: Fields to send a command
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/BasePiggybackCommandRequestSchema'
-            examples:
-              blockNamespace:
-                description: Block all messages to a namespace
-                value: |-
-                  {
-                    "targetActorSelection": "/system/distributedPubSubMediator",
-                    "headers": {
-                      "aggregate": false
-                    },
-                    "piggybackCommand": {
-                      "type": "namespaces.commands:blockNamespace",
-                      "namespace": "namespaceToBlock"
-                    }
-                  }
-              shutdown:
-                description: Shutdown all actors in a namespace
-                value: |-
-                  {
-                    "targetActorSelection": "/system/distributedPubSubMediator",
-                    "piggybackCommand": {
-                      "type": "common.commands:shutdown",
-                      "reason": {
-                        "type": "purge-namespace",
-                        "details": "namespaceToShutdown"
-                      }
-                    }
-                  }
-              purgeNamespace:
-                description: Erase all data in a namespace from the persistence
-                value: |-
-                  {
-                    "targetActorSelection": "/system/distributedPubSubMediator",
-                    "headers": {
-                      "aggregate": true,
-                      "is-group-topic": true
-                    },
-                    "piggybackCommand": {
-                      "type": "namespaces.commands:purgeNamespace",
-                      "namespace": "namespaceToPurge"
-                    }
-                  }
-              unblockNamespace:
-                description: Unblock messages to a namespace
-                value: |-
-                  {
-                    "targetActorSelection": "/system/distributedPubSubMediator",
-                    "headers": {
-                      "aggregate": false
-                    },
-                    "piggybackCommand": {
-                      "type": "namespaces.commands:unblockNamespace",
-                      "namespace": "namespaceToUnblock"
-                    }
-                  }
-      responses:
-        '200':
-          description: Response of command
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PiggybackManagingBackgroundCleanup'
-              examples:
-                blockNamespace:
-                  value: |-
-                    {
-                      "type": "namespaces.responses:blockNamespace",
-                      "status": 200,
-                      "namespace": "namespaceToBlock",
-                      "resourceType": "namespaces"
-                    }
-        '400':
-          description: The request could not be completed. At least one of the defined query parameters was invalid.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/AdvancedError'
-        '401':
-          description: The request could not be completed due to missing authentication.
-          content:
-            text/plain:
-              schema:
-                $ref: '#/components/schemas/TextUnauthorizeError'
-  '/piggyback/{serviceName}':
-    post:
-      summary: Send a piggyback command to a specific service
-      description: Send a piggyback command to a specific service
-      tags:
-        - Piggyback Commands
-      parameters:
-        - $ref: '#/components/parameters/ServiceNameParam'
-        - $ref: '#/components/parameters/TimeoutParam'
-      requestBody:
-        description: Fields to send a command
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/BasePiggybackCommandRequestSchema'
-            examples:
-              persistenceCleanup:
-                description: Query background cleanup coordinator state
-                value: |-
-                  {
-                    "targetActorSelection": "/user/<SERVICE_NAME>Root/persistenceCleanup",
-                    "headers": {},
-                    "piggybackCommand": {
-                      "type": "status.commands:retrieveHealth"
-                    }
-                  }
-      responses:
-        '200':
-          description: Return The current value of logging level
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/PiggybackManagingBackgroundCleanup'
-              example: |-
-                {
-                  "things": {
-                    "ditto-things-65f6dd5d7-htkwt": {
-                      "type": "status.responses:retrieveHealth",
-                      "status": 200,
-                      "statusInfo": {
-                        "status": "UP",
-                        "details": [
-                          {
-                            "INFO": {
-                              "state": "IN_QUIET_PERIOD",
-                              "pid": ""
-                              }
-                          }
-                        ]
-                      }
-                    }
-                  }
-                }
-        '400':
-          description: The request could not be completed. At least one of the defined query parameters was invalid.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/AdvancedError'
-        '401':
-          description: The request could not be completed due to missing authentication.
-          content:
-            text/plain:
-              schema:
-                $ref: '#/components/schemas/TextUnauthorizeError'
-  '/piggyback/{serviceName}/{instanceIndex}':
-    post:
-      summary: Send a piggyback command to a specific instance of service
-      description: Send a piggyback command to a specific instance of service
-      tags:
-        - Piggyback Commands
-      parameters:
-        - $ref: '#/components/parameters/ServiceNameParam'
-        - $ref: '#/components/parameters/InstanceIndex'
-        - $ref: '#/components/parameters/TimeoutParam'
-      requestBody:
-        description: Fields to send a command
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/BasePiggybackCommandRequestSchema'
-            examples:
-              cleanup:
-                description: Cleanup events and snapshots of an entity
-                value: |-
-                  {
-                    "targetActorSelection": "/system/sharding/thing",
-                    "headers": {
-                      "aggregate": false
-                    },
-                    "piggybackCommand": {
-                      "type": "cleanup.sudo.commands:cleanupPersistence",
-                      "entityId": "ditto:thing1"
-                    }
-                  }
-      responses:
-        '200':
-          description: response of command
-          content:
-            application/json:
-              example: |-
-                {
-                  "type": "cleanup.sudo.responses:cleanupPersistence",
-                  "status": 200,
-                  "entityId": "thing:ditto:thing1"
-                }
-        '400':
-          description: The request could not be completed. At least one of the defined query parameters was invalid.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/AdvancedError'
-        '401':
-          description: The request could not be completed due to missing authentication.
-          content:
-            text/plain:
-              schema:
-                $ref: '#/components/schemas/TextUnauthorizeError'
-components:
-  responses:
-    SuccessUpdateLogLevel:
-      description: Return The summary of the outcome of all modified pods
-      content:
-        application/json:
-          schema:
-            type: array
-            items:
-              $ref: '#/components/schemas/ResultUpdateRequest'
-    SuccessUpdateLogLevelSinglePod:
-      description: Return The summary of the outcome of modified pod
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/ModuleUpdatedLogLevel'
-  parameters:
-    LoggingFieldsQueryParam:
-      name: includeDisabledLoggers
-      in: query
-      description: Include disabled loggers
-      required: false
-      schema:
-        type: boolean
-        default: false
-    TimeoutParam:
-      name: timeout
-      in: query
-      description: |-
-        Defines how long the backend should wait for completion of the request, e.g. applied when waiting for requested
-        acknowledgements via the `requested-acks` param. Can be specified without unit (then seconds are assumed) or
-        together with `s`, `ms` or `m` unit. Example: `42s`, `1m`.
-
-        The default (if omitted) and maximum timeout is `60s`. A value of `0` applies fire and forget semantics for
-        the command resulting in setting `response-required=false`.
-      required: false
-      schema:
-        type: string
-    ModuleNamePathParam:
-      name: moduleName
-      in: path
-      description: The name of module
-      required: true
-      schema:
-        type: string
-        example: gateway
-    PathParam:
-      name: path
-      in: query
-      description: 'The path points to information on service name, service instance index, JVM arguments and environment variables.'
-      schema:
-        type: string
-        example: ditto.info
-      required: false
-    NamePodParam:
-      name: podName
-      in: path
-      description: The name of pod
-      required: true
-      schema:
-        type: string
-        example: ditto-gateway-764fc5f474-qrm2r
-    ServiceNameParam:
-      name: serviceName
-      in: path
-      description: Specified service target for the command execution
-      required: true
-      schema:
-        type: string
-        enum:
-          - things
-          - policies
-          - connectivity
-    InstanceIndex:
-      name: instanceIndex
-      in: path
-      description: The index of the current instance
-      required: true
-      schema:
-        type: string
-  schemas:
-    AdvancedError:
-      properties:
-        status:
-          type: integer
-          description: The HTTP status of the error
-        error:
-          type: string
-          description: The error code of the occurred exception
-        message:
-          type: string
-          description: The message of the error - what went wrong
-        description:
-          type: string
-          description: A description how to fix the error or more details
-        href:
-          type: string
-          description: A link to further information about the error and how to fix it
-      required:
-        - status
-        - error
-        - message
-    TextUnauthorizeError:
-      type: string
-      example: The supplied authentication is invalid
-    RetrieveConfig:
-      type: object
-      properties:
-        gateway:
-          type: object
-          description: Module
-          properties:
-            pod:
-              type: object
-              description: Return the configuration at the path ditto.info
-              properties:
-                type:
-                  type: string
-                  description: 'devops.responses:ResultConfig'
-                status:
-                  type: integer
-                  description: The HTTP status
-                config:
-                  type: object
-                  description: name of service
-                  properties:
-                    env:
-                      items:
-                        type: string
-                      properties:
-                        PATH:
-                          type: string
-                    service:
-                      items:
-                        type: string
-                      properties:
-                        instance-index:
-                          type: integer
-                        service-name:
-                          type: string
-                    vm-args:
-                      items:
-                        type: string
-    RetrieveLoggingConfig:
-      properties:
-        gateway:
-          $ref: '#/components/schemas/Module'
-    Module:
-      type: object
-      description: Module
-      properties:
-        pod:
-          type: object
-          description: Details of logging configuration
-          properties:
-            type:
-              type: string
-              description: 'devops.responses:retrieveLoggerConfig'
-            status:
-              type: integer
-              description: The HTTP status
-            serviceName:
-              type: string
-              description: name of service
-            instance:
-              type: string
-              description: instance of module
-            loggerConfigs:
-              type: array
-              items:
-                type: object
-                properties:
-                  level:
-                    type: string
-                  logger:
-                    type: string
-    LoggingUpdateFields:
-      properties:
-        level:
-          type: string
-        logger:
-          type: string
-          description: class where apply logger level
-    UpdatedLogLevel:
-      type: object
-      description: Details of logging configuration
-      properties:
-        type:
-          type: string
-          description: 'devops.responses:changeLogLevel'
-        status:
-          type: integer
-          description: http code 200 for success operation
-        serviceName:
-          type: string
-          description: name of service that has been updated
-        instance:
-          type: string
-          description: identifier of pod instance
-        successfull:
-          type: boolean
-          description: outcome of the change
-    ModuleUpdatedLogLevel:
-      type: object
-      description: Module that has been updated
-      properties:
-        pod:
-          $ref: '#/components/schemas/UpdatedLogLevel'
-    ResultUpdateRequest:
-      type: object
-      properties:
-        gateway:
-          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
-        things-search:
-          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
-        policies:
-          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
-        things:
-          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
-        connectivity:
-          $ref: '#/components/schemas/ModuleUpdatedLogLevel'
-    ModuleConfigService:
-      type: object
-      description: Module
-      properties:
-        pod:
-          $ref: '#/components/schemas/ResultConfigService'
-    ResultConfigService:
-      type: object
-      description: Details of specific service instance.
-      properties:
-        type:
-          type: string
-          description: 'devops.responses:ResultConfigService'
-        status:
-          type: integer
-          description: The HTTP status
-        config:
-          type: object
-          description: name of service
-          properties:
-            cluster:
-              items:
-                type: string
-              properties:
-                number-of-shards:
-                  type: integer
-            gateway:
-              items:
-                type: object
-              properties:
-                authentication:
-                  type: object
-                  properties:
-                    devops:
-                      type: object
-                      properties:
-                        password:
-                          type: string
-                        secured:
-                          type: boolean
-    RetrieveConfigService:
-      type: object
-      properties:
-        gateway:
-          $ref: '#/components/schemas/ModuleConfigService'
-    BasePiggybackCommandRequestSchema:
-      properties:
-        targetActorSelection:
-          type: string
-        headers:
-          type: object
-          properties:
-            aggregate:
-              type: boolean
-              default: false
-            is-group-topic:
-              type: boolean
-              default: true
-        piggybackCommand:
-          type: object
-          properties:
-            type:
-              type: string
-    PiggybackManagingBackgroundCleanup:
-      properties:
-        targetActorSelection:
-          type: string
-        headers:
-          type: object
-          properties:
-            aggregate:
-              type: boolean
-              default: false
-            is-group-topic:
-              type: boolean
-              default: true
-        piggybackCommand:
-          type: object
-          properties:
-            type:
-              type: string
-  securitySchemes:
-    DevOpsBasic:
-      type: http
-      description: Eclipse Ditto devops user (devops) + password (foobar)
-      scheme: basic
-    DevOpsBearer:
-      type: http
-      scheme: bearer
-      bearerFormat: JWT
-      description: A JSON Web Token issued by a supported OAuth 2.0 Identity Provider for the Eclipse Ditto devops user.
diff --git a/documentation/src/main/resources/openapi/sources/api-2-index.yml b/documentation/src/main/resources/openapi/sources/api-2-index.yml
index bbcbd0ffe12..4ab91d6b15d 100644
--- a/documentation/src/main/resources/openapi/sources/api-2-index.yml
+++ b/documentation/src/main/resources/openapi/sources/api-2-index.yml
@@ -22,9 +22,9 @@ info:
     These are not be considered as official API, and must therefore not be applied in your applications or tests.
 
 servers:
-  - url: https://ditto.eclipseprojects.io/api/2
+  - url: https://ditto.eclipseprojects.io/
     description: "online Ditto Sandbox"
-  - url: /api/2
+  - url: /
     description: "local Ditto"
 
 tags:
@@ -42,6 +42,12 @@ tags:
     description: Process CloudEvents in Ditto
   - name: Connections
     description: Manage connections
+  - name: Logging
+    description: Manage Log Levels in runtime
+  - name: Service Configuration
+    description: Manage service configuration in runtime
+  - name: Piggyback Commands
+    description: Manage Piggyback commands
 
 security:
   - Google:
@@ -54,117 +60,142 @@ paths:
   ###
   ### Things
   ###
-  /things:
+  /api/2/things:
     $ref: "./paths/things/index.yml"
-  '/things/{thingId}':
+  '/api/2/things/{thingId}':
     $ref: "./paths/things/thing.yml"
-  '/things/{thingId}/definition':
+  '/api/2/things/{thingId}/definition':
     $ref: "./paths/things/definition.yml"
-  '/things/{thingId}/policyId':
+  '/api/2/things/{thingId}/policyId':
     $ref: "./paths/things/policyId.yml"
-  '/things/{thingId}/attributes':
+  '/api/2/things/{thingId}/attributes':
     $ref: "./paths/things/attributes.yml"
-  '/things/{thingId}/attributes/{attributePath}':
+  '/api/2/things/{thingId}/attributes/{attributePath}':
     $ref: "./paths/things/attribute.yml"
 
   ###
   ### Features
   ###
-  '/things/{thingId}/features':
+  '/api/2/things/{thingId}/features':
     $ref: "./paths/features/index.yml"
-  '/things/{thingId}/features/{featureId}':
+  '/api/2/things/{thingId}/features/{featureId}':
     $ref: "./paths/features/feature.yml"
-  '/things/{thingId}/features/{featureId}/definition':
+  '/api/2/things/{thingId}/features/{featureId}/definition':
     $ref: "./paths/features/definition.yml"
-  '/things/{thingId}/features/{featureId}/properties':
+  '/api/2/things/{thingId}/features/{featureId}/properties':
     $ref: "./paths/features/properties.yml"
-  '/things/{thingId}/features/{featureId}/properties/{propertyPath}':
+  '/api/2/things/{thingId}/features/{featureId}/properties/{propertyPath}':
     $ref: "./paths/features/property.yml"
-  '/things/{thingId}/features/{featureId}/desiredProperties':
+  '/api/2/things/{thingId}/features/{featureId}/desiredProperties':
     $ref: "./paths/features/desiredProperties.yml"
-  '/things/{thingId}/features/{featureId}/desiredProperties/{propertyPath}':
+  '/api/2/things/{thingId}/features/{featureId}/desiredProperties/{propertyPath}':
     $ref: "./paths/features/desiredProperty.yml"
 
   ###
   ### Messages
   ###
-  '/things/{thingId}/inbox/claim':
+  '/api/2/things/{thingId}/inbox/claim':
     $ref: "./paths/messages/inbox-claim.yml"
-  '/things/{thingId}/inbox/messages/{messageSubject}':
+  '/api/2/things/{thingId}/inbox/messages/{messageSubject}':
     $ref: "./paths/messages/inbox-message.yml"
-  '/things/{thingId}/outbox/messages/{messageSubject}':
+  '/api/2/things/{thingId}/outbox/messages/{messageSubject}':
     $ref: "./paths/messages/outbox-message.yml"
-  '/things/{thingId}/features/{featureId}/inbox/messages/{messageSubject}':
+  '/api/2/things/{thingId}/features/{featureId}/inbox/messages/{messageSubject}':
     $ref: "./paths/messages/feature-inbox-message.yml"
-  '/things/{thingId}/features/{featureId}/outbox/messages/{messageSubject}':
+  '/api/2/things/{thingId}/features/{featureId}/outbox/messages/{messageSubject}':
     $ref: "./paths/messages/feature-outbox-message.yml"
 
   ###
   ### Policies
   ###
-  '/policies/{policyId}':
+  '/api/2/policies/{policyId}':
     $ref: "./paths/policies/policy.yml"
-  '/policies/{policyId}/actions/activateTokenIntegration':
+  '/api/2/policies/{policyId}/actions/activateTokenIntegration':
     $ref: "./paths/policies/activateTokenIntegration.yml"
-  '/policies/{policyId}/actions/deactivateTokenIntegration':
+  '/api/2/policies/{policyId}/actions/deactivateTokenIntegration':
     $ref: "./paths/policies/deactivateTokenIntegration.yml"
-  '/policies/{policyId}/entries':
+  '/api/2/policies/{policyId}/entries':
     $ref: "./paths/policies/entries.yml"
-  '/policies/{policyId}/entries/{label}':
+  '/api/2/policies/{policyId}/entries/{label}':
     $ref: "./paths/policies/entry.yml"
-  '/policies/{policyId}/entries/{label}/actions/activateTokenIntegration':
+  '/api/2/policies/{policyId}/entries/{label}/actions/activateTokenIntegration':
     $ref: "./paths/policies/activateTokenIntegrationForEntry.yml"
-  '/policies/{policyId}/entries/{label}/actions/deactivateTokenIntegration':
+  '/api/2/policies/{policyId}/entries/{label}/actions/deactivateTokenIntegration':
     $ref: "./paths/policies/deactivateTokenIntegrationForEntry.yml"
-  '/policies/{policyId}/entries/{label}/subjects':
+  '/api/2/policies/{policyId}/entries/{label}/subjects':
     $ref: "./paths/policies/subjects.yml"
-  '/policies/{policyId}/entries/{label}/subjects/{subjectId}':
+  '/api/2/policies/{policyId}/entries/{label}/subjects/{subjectId}':
     $ref: "./paths/policies/subject.yml"
-  '/policies/{policyId}/entries/{label}/resources':
+  '/api/2/policies/{policyId}/entries/{label}/resources':
     $ref: "./paths/policies/resources.yml"
-  '/policies/{policyId}/entries/{label}/resources/{resourcePath}':
+  '/api/2/policies/{policyId}/entries/{label}/resources/{resourcePath}':
     $ref: "./paths/policies/resource.yml"
-  '/policies/{policyId}/imports':
+  '/api/2/policies/{policyId}/imports':
     $ref: "./paths/policies/imports.yml"
-  '/policies/{policyId}/imports/{importedPolicyId}':
+  '/api/2/policies/{policyId}/imports/{importedPolicyId}':
     $ref: "./paths/policies/import.yml"
 
   ###
   ### Who Am I
   ###
-  '/whoami':
+  '/api/2/whoami':
     $ref: "./paths/whoami/index.yml"
 
   ###
   ### Things-Search
   ###
-  /search/things:
+  /api/2/search/things:
     $ref: "./paths/search/things.yml"
-  /search/things/count:
+  /api/2/search/things/count:
     $ref: "./paths/search/things-count.yml"
 
   ###
   ### CloudEvents
   ###
-  '/cloudevents':
+  '/api/2/cloudevents':
     $ref: "./paths/cloudevents/cloudevents.yml"
 
   ###
   ### Connections
   ###
-  '/connections':
+  '/api/2/connections':
     $ref: "./paths/connections/connections.yml"
-  '/connections/{connectionId}':
+  '/api/2/connections/{connectionId}':
     $ref: "./paths/connections/connectionId.yml"
-  '/connections/{connectionId}/command':
+  '/api/2/connections/{connectionId}/command':
     $ref: "./paths/connections/command.yml"
-  '/connections/{connectionId}/status':
+  '/api/2/connections/{connectionId}/status':
     $ref: "./paths/connections/status.yml"
-  '/connections/{connectionId}/metrics':
+  '/api/2/connections/{connectionId}/metrics':
     $ref: "./paths/connections/metrics.yml"
-  '/connections/{connectionId}/logs':
+  '/api/2/connections/{connectionId}/logs':
     $ref: "./paths/connections/logs.yml"
 
+  ###
+  ### Logging
+  ###
+  /devops/logging:
+    $ref: "./paths/logging/logging.yml"
+  '/devops/logging/{moduleName}':
+    $ref: "./paths/logging/moduleName.yml"
+
+  ###
+  ### Service Configuration
+  ###
+  /devops/config:
+    $ref: "./paths/config/config.yml"
+  '/devops/config/{moduleName}/{podName}':
+    $ref: "./paths/config/podName.yml"
+
+  ###
+  ### Piggyback Commands
+  ###
+  /devops/piggyback:
+    $ref: "./paths/piggyback/piggyback.yml"
+  '/devops/piggyback/{serviceName}':
+    $ref: "./paths/piggyback/serviceName.yml"
+  '/devops/piggyback/{serviceName}/{instanceIndex}':
+    $ref: "./paths/piggyback/instanceIndex.yml"
 
 components:
 
@@ -193,6 +224,10 @@ components:
       $ref: "./responses/preconditionFailed.yml"
     DependencyFailed:
       $ref: "./responses/dependencyFailed.yml"
+    SuccessUpdateLogLevel:
+      $ref: "./responses/successUpdateLogLevel.yml"
+    SuccessUpdateLogLevelSinglePod:
+      $ref: "./responses/successUpdateLogLevelSinglePod.yml"
 
   parameters:
     AllowPolicyLockoutParam:
@@ -275,6 +310,18 @@ components:
       $ref: "./parameters/connectionIdPathParam.yml"
     ConnectionFieldsQueryParam:
       $ref: "./parameters/connectionFieldsQueryParam.yml"
+    LoggingFieldsQueryParam:
+      $ref: "./parameters/loggingFieldsQueryParam.yml"
+    ModuleNamePathParam:
+      $ref: "./parameters/moduleNamePathParam.yml"
+    PathParam:
+      $ref: "./parameters/pathParam.yml"
+    NamePodParam:
+      $ref: "./parameters/namePodParam.yml"
+    ServiceNameParam:
+      $ref: "./parameters/serviceNameParam.yml"
+    InstanceIndex:
+      $ref: "./parameters/instanceIndexParam.yml"
 
   schemas:
     Error:
@@ -389,6 +436,32 @@ components:
       $ref: "./schemas/whoami/whoamiSubject.yml"
     WotThingDescription:
       $ref: "./schemas/wot-thingDescription.yml"
+    TextUnauthorizeError:
+      $ref: "./schemas/errors/textUnauthorizeError.yml"
+    RetrieveConfig:
+      $ref: "./schemas/config/retrieveConfig.yml"
+    RetrieveLoggingConfig:
+      $ref: "./schemas/logging/retrieveLoggingConfig.yml"
+    Module:
+      $ref: "./schemas/logging/module.yml"
+    LoggingUpdateFields:
+      $ref: "./schemas/logging/loggingUpdateFields.yml"
+    UpdatedLogLevel:
+      $ref: "./schemas/logging/updatedLogLevel.yml"
+    ModuleUpdatedLogLevel:
+      $ref: "./schemas/logging/moduleUpdatedLogLevel.yml"
+    ResultUpdateRequest:
+      $ref: "./schemas/logging/resultUpdateRequest.yml"
+    ModuleConfigService:
+      $ref: "./schemas/config/moduleConfigService.yml"
+    ResultConfigService:
+      $ref: "./schemas/config/resultConfigService.yml"
+    RetrieveConfigService:
+      $ref: "./schemas/config/retrieveConfigService.yml"
+    BasePiggybackCommandRequestSchema:
+      $ref: "./schemas/piggyback/basePiggybackCommandRequestSchema.yml"
+    PiggybackManagingBackgroundCleanup:
+      $ref: "./schemas/piggyback/piggybackManagingBackgroundCleanup.yml"
 
   securitySchemes:
     NginxBasic:
diff --git a/documentation/src/main/resources/openapi/sources/devops-index.yml b/documentation/src/main/resources/openapi/sources/devops-index.yml
deleted file mode 100644
index 37ae063479a..00000000000
--- a/documentation/src/main/resources/openapi/sources/devops-index.yml
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0
-#
-# SPDX-License-Identifier: EPL-2.0
-openapi: 3.0.0
-info:
-  title: Eclipse Ditto™ HTTP devops API
-  version: "2"
-  description: |-
-    JSON-based, REST-like API for Eclipse Ditto
-
-    The Eclipse Ditto HTTP API uses response status codes (see [RFC 7231](https://tools.ietf.org/html/rfc7231#section-6))
-    to indicate whether a specific request has been successfully completed, or not.
-
-    The information Ditto provides additionally to the status code (e.g. in API docs, or error codes like. "things:thing.tooLarge") might change without advance notice.
-    These are not be considered as official API, and must therefore not be applied in your applications or tests.
-
-servers:
-  - url: https://ditto.eclipseprojects.io/devops
-    description: "online Ditto Sandbox"
-  - url: /devops
-    description: "local Ditto"
-
-tags:
-  # change tag name
-  - name: Logging
-    description: Manage Log Levels in runtime
-  - name: Service Configuration
-    description: Manage service configuration in runtime
-  - name: Piggyback Commands
-    description: Manage Piggyback commands
-
-security:
-  - DevOpsBasic: []
-  - DevOpsBearer: []
-
-paths:
-
-  ###
-  ### Logging
-  ###
-  /logging:
-    $ref: "./paths/logging/logging.yml"
-  '/logging/{moduleName}':
-    $ref: "./paths/logging/moduleName.yml"
-  /config:
-    $ref: "./paths/config/config.yml"
-  '/config/{moduleName}/{podName}':
-    $ref: "./paths/config/podName.yml"
-  /piggyback:
-    $ref: "./paths/piggyback/piggyback.yml"
-  '/piggyback/{serviceName}':
-    $ref: "./paths/piggyback/serviceName.yml"
-  '/piggyback/{serviceName}/{instanceIndex}':
-    $ref: "./paths/piggyback/instanceIndex.yml"
-
-components:
-  responses:
-    SuccessUpdateLogLevel:
-      $ref: "./responses/successUpdateLogLevel.yml"
-    SuccessUpdateLogLevelSinglePod:
-      $ref: "./responses/successUpdateLogLevelSinglePod.yml"
-
-  parameters:
-    LoggingFieldsQueryParam:
-      $ref: "./parameters/loggingFieldsQueryParam.yml"
-    TimeoutParam:
-      $ref: "./parameters/timeoutParam.yml"
-    ModuleNamePathParam:
-      $ref: "./parameters/moduleNamePathParam.yml"
-    PathParam:
-      $ref: "./parameters/pathParam.yml"
-    NamePodParam:
-      $ref: "./parameters/namePodParam.yml"
-    ServiceNameParam:
-      $ref: "./parameters/serviceNameParam.yml"
-    InstanceIndex:
-      $ref: "./parameters/instanceIndexParam.yml"
-
-  schemas:
-    AdvancedError:
-      $ref: "./schemas/errors/advancedError.yml"
-    TextUnauthorizeError:
-      $ref: "./schemas/errors/textUnauthorizeError.yml"
-    RetrieveConfig:
-      $ref: "./schemas/config/retrieveConfig.yml"
-    RetrieveLoggingConfig:
-      $ref: "./schemas/logging/retrieveLoggingConfig.yml"
-    Module:
-      $ref: "./schemas/logging/module.yml"
-    LoggingUpdateFields:
-      $ref: "./schemas/logging/loggingUpdateFields.yml"
-    UpdatedLogLevel:
-      $ref: "./schemas/logging/updatedLogLevel.yml"
-    ModuleUpdatedLogLevel:
-      $ref: "./schemas/logging/moduleUpdatedLogLevel.yml"
-    ResultUpdateRequest:
-      $ref: "./schemas/logging/resultUpdateRequest.yml"
-    ModuleConfigService:
-      $ref: "./schemas/config/moduleConfigService.yml"
-    ResultConfigService:
-      $ref: "./schemas/config/resultConfigService.yml"
-    RetrieveConfigService:
-      $ref: "./schemas/config/retrieveConfigService.yml"
-    BasePiggybackCommandRequestSchema:
-      $ref: "./schemas/piggyback/basePiggybackCommandRequestSchema.yml"
-    PiggybackManagingBackgroundCleanup:
-      $ref: "./schemas/piggyback/piggybackManagingBackgroundCleanup.yml"
-
-  securitySchemes:
-    DevOpsBasic:
-      $ref: "./security/devOpsBasic.yml"
-    DevOpsBearer:
-      $ref: "./security/devOpsBearer.yml"
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/package.json b/documentation/src/main/resources/openapi/sources/package.json
index a8b3f68acba..83d9df25978 100644
--- a/documentation/src/main/resources/openapi/sources/package.json
+++ b/documentation/src/main/resources/openapi/sources/package.json
@@ -1,8 +1,7 @@
 {
   "scripts": {
-    "build": "npm run build-v2 & npm run build-devops",
-    "build-v2": "swagger-cli bundle api-2-index.yml --outfile ../ditto-api-2.yml --type yaml",
-    "build-devops": "swagger-cli bundle devops-index.yml --outfile ../ditto-devops.yml --type yaml"
+    "build": "npm run build-v2",
+    "build-v2": "swagger-cli bundle api-2-index.yml --outfile ../ditto-api-2.yml --type yaml"
   },
   "dependencies": {
     "swagger-cli": "^4.0.4"
diff --git a/documentation/src/main/resources/openapi/sources/parameters/loggingFieldsQueryParam.yml b/documentation/src/main/resources/openapi/sources/parameters/loggingFieldsQueryParam.yml
index 22a720b1d68..30adf4ff142 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/loggingFieldsQueryParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/loggingFieldsQueryParam.yml
@@ -14,5 +14,4 @@ description: |-
   Include disabled loggers
 required: false
 schema:
-  type: boolean
-  default: false
\ No newline at end of file
+  type: boolean
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/paths/config/config.yml b/documentation/src/main/resources/openapi/sources/paths/config/config.yml
index fd89e59148c..5034145b021 100644
--- a/documentation/src/main/resources/openapi/sources/paths/config/config.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/config/config.yml
@@ -13,6 +13,9 @@ get:
   description: |-
     It is recommended to not omit the query parameter path.
     Otherwise, the full configurations of all services are aggregated in the response, which can become megabytes big.
+  security:
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Service Configuration
   parameters:
diff --git a/documentation/src/main/resources/openapi/sources/paths/config/podName.yml b/documentation/src/main/resources/openapi/sources/paths/config/podName.yml
index 3540d13658c..4517c7221c7 100644
--- a/documentation/src/main/resources/openapi/sources/paths/config/podName.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/config/podName.yml
@@ -12,6 +12,9 @@ get:
   summary: Retrieving the configuration of a specific service instance.
   description: |-
     Return the configuration of a specific service instance.
+  security:
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Service Configuration
   parameters:
diff --git a/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml b/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml
index d9b71c99700..a21e5cd915b 100644
--- a/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml
@@ -11,6 +11,9 @@
 get:
   summary: Retrieve all currently configured log levels
   description: Return configured log level for all ditto cluster pod
+  security:
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Logging
   parameters:
@@ -33,6 +36,9 @@ put:
   summary: Update log levels
   description: |-
     Modify log level for eatch pods menaged
+  security:
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Logging
   requestBody:
diff --git a/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml b/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml
index 4f26ad6fccc..16b25c75cf6 100644
--- a/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml
@@ -12,6 +12,9 @@ get:
   summary: Retrieve currently configured log levels for a specific module
   description: |-
     Return the configured log
+  security:
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Logging
   parameters:
@@ -35,6 +38,9 @@ put:
   summary: Update log levels for a specific module
   description: |-
     Return outcome modify log level for a specific module
+  security:
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Logging
   parameters:
diff --git a/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml b/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml
index 276681a6df5..823d3e61c00 100644
--- a/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml
@@ -11,6 +11,9 @@
 post:
   summary: Send a piggyback command to a specific instance of service
   description: Send a piggyback command to a specific instance of service
+  security:
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Piggyback Commands
   parameters:
diff --git a/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml b/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml
index 347a52029f9..1aa13f34a16 100644
--- a/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml
@@ -11,6 +11,9 @@
 post:
   summary: Send a piggyback command
   description: Send a piggyback command to Akka’s pub-sub-mediator
+  security:
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Piggyback Commands
   parameters:
diff --git a/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml b/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml
index 6bffdbee021..73c570a7d5c 100644
--- a/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml
@@ -11,6 +11,9 @@
 post:
   summary: Send a piggyback command to a specific service
   description: Send a piggyback command to a specific service
+  security:
+    - DevOpsBasic: []
+    - DevOpsBearer: []
   tags:
     - Piggyback Commands
   parameters:

From afd9f2be54d536f017f4da3d06e4bcfadd580d61 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Mon, 1 May 2023 15:48:56 +0200
Subject: [PATCH 094/173] UI - Build UI with esbuild

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 .gitignore                                    |  1 +
 ui/index.html                                 | 46 +------------------
 ui/main.js                                    | 18 +-------
 .../connections}/connectionTemplates.json     |  0
 ui/modules/connections/connections.js         |  3 ++
 ui/modules/connections/connectionsCRUD.js     | 14 +-----
 ui/modules/environments/authorization.js      |  3 ++
 .../environments}/environmentTemplates.json   |  0
 ui/modules/environments/environments.js       | 10 ++--
 ui/modules/operations/operations.js           |  3 ++
 ui/modules/policies/policies.js               | 19 ++------
 .../policies}/policyTemplates.json            |  0
 ui/modules/things/featureMessages.js          |  3 +-
 ui/modules/things/features.js                 |  6 ++-
 ui/modules/things/fields.js                   |  3 ++
 ui/modules/things/messagesIncoming.js         |  4 ++
 .../things}/thingTemplates.json               |  0
 ui/modules/things/things.js                   |  4 ++
 ui/modules/things/thingsCRUD.js               | 15 +-----
 ui/modules/things/thingsSSE.js                |  2 +-
 ui/modules/things/thingsSearch.js             |  2 +-
 ui/modules/things/wotDescription.js           |  3 +-
 ui/modules/utils/crudToolbar.html             | 29 ++++++++++++
 ui/modules/utils/crudToolbar.js               | 22 +++++----
 ui/readme.md                                  | 15 ++++++
 25 files changed, 109 insertions(+), 116 deletions(-)
 rename ui/{templates => modules/connections}/connectionTemplates.json (100%)
 rename ui/{templates => modules/environments}/environmentTemplates.json (100%)
 rename ui/{templates => modules/policies}/policyTemplates.json (100%)
 rename ui/{templates => modules/things}/thingTemplates.json (100%)
 create mode 100644 ui/modules/utils/crudToolbar.html
 create mode 100644 ui/readme.md

diff --git a/.gitignore b/.gitignore
index e28468ceb25..3e49d1a77c7 100755
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ deployment/helm/eclipse-ditto/requirements.lock
 deployment/helm/eclipse-ditto/charts/*
 .factorypath
 ui/node_modules
+ui/dist
 ui/package.json
 ui/package-lock.json
 
diff --git a/ui/index.html b/ui/index.html
index e3e40268585..4b71e1a041e 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -22,7 +22,6 @@
         rel="stylesheet"
         integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow=="
         crossorigin="anonymous" referrerpolicy="no-referrer" />
-    <link href="index.css" rel="stylesheet" />
     <link rel="icon" type="image/png"
         href="https://raw.githubusercontent.com/eclipse/ditto/master/documentation/src/main/resources/images/favicon-16x16.png"
         sizes="16x16">
@@ -44,10 +43,9 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ace.js"
         integrity="sha512-GZ1RIgZaSc8rnco/8CXfRdCpDxRCphenIiZ2ztLy3XQfCbQUSCuk8IudvNHxkRA3oUg6q0qejgN/qqyG1duv5Q=="
         crossorigin="anonymous" type="text/javascript" charset="utf-8"></script>
-    <script src="https://cdn.jsdelivr.net/npm/jsonpath-plus@5.0.3/dist/index-browser-esm.min.js" type="module"></script>
     <script src="https://cdn.jsdelivr.net/npm/@tarekraafat/autocomplete.js@10.2.7/dist/autoComplete.min.js"></script>
-    <script src="modules/utils/crudToolbar.js" type="module"></script>
-    <script src="main.js" type="module"></script>
+    <script type="module" src="./dist/main.js"></script>
+    <link rel="stylesheet" href="./dist/main.css" />
 </head>
 
 <body>
@@ -140,45 +138,5 @@
         </div>
     </div>
     <div id="modalCrudEdit"></div>
-
 </body>
-<template id="templateCrudToolbar">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
-        integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.3/font/bootstrap-icons.min.css"
-        rel="stylesheet"
-        integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow=="
-        crossorigin="anonymous" referrerpolicy="no-referrer" />
-    <link href="index.css" rel="stylesheet" />
-
-    <div class="resizable_flex_column px-1" id="divRoot">
-        <div class="input-group input-group-sm mb-1 mt-1 has-validation">
-            <label class="input-group-text" id="label">Default</label>
-            <input type="text" class="form-control" disabled id="inputIdValue">
-            <button class="btn btn-outline-primary btn-sm" id="buttonEdit"
-                data-bs-toggle="tooltip" title="Edit">
-                Edit
-            </button>
-            <button class="btn btn-outline-primary btn-sm" hidden id="buttonCreate"
-                data-bs-toggle="tooltip" title="Create">
-                Create
-            </button>
-            <button class="btn btn-outline-primary btn-sm" hidden id="buttonUpdate"
-                data-bs-toggle="tooltip" title="Update">
-                Update
-            </button>
-            <button class="btn btn-outline-secondary btn-sm" hidden id="buttonDelete"
-                data-bs-toggle="tooltip" title="Delete">
-                Delete
-            </button>
-            <button class="btn btn-outline-secondary btn-sm" hidden id="buttonCancel"
-                data-bs-toggle="tooltip" title="Cancel" >
-                Cancel
-            </button>
-            <div class="invalid-feedback"></div>
-        </div>
-        <slot></slot>
-    </div>
-  </template>
-  
 </html>
\ No newline at end of file
diff --git a/ui/main.js b/ui/main.js
index 544cd9e40a2..8b8f97b57dd 100644
--- a/ui/main.js
+++ b/ui/main.js
@@ -31,27 +31,11 @@ import * as Operations from './modules/operations/operations.js';
 import * as Policies from './modules/policies/policies.js';
 import * as Utils from './modules/utils.js';
 import {WoTDescription} from './modules/things/wotDescription.js';
-
-
+import './modules/utils/crudToolbar.js';
 let resized = false;
 let mainNavbar;
 
 document.addEventListener('DOMContentLoaded', async function() {
-  document.getElementById('thingsHTML').innerHTML = await (await fetch('modules/things/things.html')).text();
-  document.getElementById('fieldsHTML').innerHTML = await (await fetch('modules/things/fields.html')).text();
-  document.getElementById('featuresHTML').innerHTML = await (await fetch('modules/things/features.html')).text();
-  document.getElementById('messagesIncomingHTML').innerHTML =
-      await (await fetch('modules/things/messagesIncoming.html')).text();
-  document.getElementById('policyHTML').innerHTML = await (await fetch('modules/policies/policies.html')).text();
-  document.getElementById('connectionsHTML').innerHTML =
-      await (await fetch('modules/connections/connections.html')).text();
-  document.getElementById('operationsHTML').innerHTML =
-      await (await fetch('modules/operations/operations.html')).text();
-  document.getElementById('environmentsHTML').innerHTML =
-      await (await fetch('modules/environments/environments.html')).text();
-  document.getElementById('authorizationHTML').innerHTML =
-      await (await fetch('modules/environments/authorization.html')).text();
-
   Utils.ready();
   await Things.ready();
   ThingsSearch.ready();
diff --git a/ui/templates/connectionTemplates.json b/ui/modules/connections/connectionTemplates.json
similarity index 100%
rename from ui/templates/connectionTemplates.json
rename to ui/modules/connections/connectionTemplates.json
diff --git a/ui/modules/connections/connections.js b/ui/modules/connections/connections.js
index e5c8179b09e..31d6ab83239 100644
--- a/ui/modules/connections/connections.js
+++ b/ui/modules/connections/connections.js
@@ -17,9 +17,12 @@
 import * as API from '../api.js';
 import * as Utils from '../utils.js';
 import {TabHandler} from '../utils/tabHandler.js';
+import connectionsHTML from './connections.html';
 
 const observers = [];
 
+document.getElementById('connectionsHTML').innerHTML = connectionsHTML;
+
 export function addChangeListener(observer) {
   observers.push(observer);
 }
diff --git a/ui/modules/connections/connectionsCRUD.js b/ui/modules/connections/connectionsCRUD.js
index 8fbbe18cf8e..51362500409 100644
--- a/ui/modules/connections/connectionsCRUD.js
+++ b/ui/modules/connections/connectionsCRUD.js
@@ -14,6 +14,7 @@
 import * as API from '../api.js';
 import * as Utils from '../utils.js';
 import * as Connections from './connections.js';
+import connectionTemplates from './connectionTemplates.json';
 /* eslint-disable prefer-const */
 /* eslint-disable max-len */
 /* eslint-disable no-invalid-this */
@@ -34,14 +35,13 @@ let outgoingEditor;
 let theConnection;
 let hasErrors;
 
-let connectionTemplates;
 
 export function ready() {
   Connections.addChangeListener(setConnection);
 
   Utils.getAllElementsById(dom);
 
-  loadConnectionTemplates();
+  Utils.addDropDownEntries(dom.ulConnectionTemplates, Object.keys(connectionTemplates));
 
   connectionEditor = Utils.createAceEditor('connectionEditor', 'ace/mode/json', true);
   incomingEditor = Utils.createAceEditor('connectionIncomingScript', 'ace/mode/javascript', true);
@@ -156,16 +156,6 @@ function onConnectionTemplatesClick(event) {
   connectionEditor.session.getUndoManager().markClean();
 }
 
-function loadConnectionTemplates() {
-  fetch('templates/connectionTemplates.json')
-      .then((response) => {
-        response.json().then((loadedTemplates) => {
-          connectionTemplates = loadedTemplates;
-          Utils.addDropDownEntries(dom.ulConnectionTemplates, Object.keys(connectionTemplates));
-        });
-      });
-}
-
 function setConnection(connection) {
   theConnection = connection;
   incomingEditor.setValue('');
diff --git a/ui/modules/environments/authorization.js b/ui/modules/environments/authorization.js
index 305eba96440..72ab8f592a7 100644
--- a/ui/modules/environments/authorization.js
+++ b/ui/modules/environments/authorization.js
@@ -16,6 +16,7 @@ import * as Utils from '../utils.js';
 /* eslint-disable prefer-const */
 /* eslint-disable require-jsdoc */
 import * as Environments from './environments.js';
+import authorizationHTML from './authorization.html';
 
 let dom = {
   bearer: null,
@@ -30,6 +31,8 @@ let dom = {
 
 let _forDevops = false;
 
+document.getElementById('authorizationHTML').innerHTML = authorizationHTML;
+
 export function setForDevops(forDevops) {
   _forDevops = forDevops;
   API.setAuthHeader(_forDevops);
diff --git a/ui/templates/environmentTemplates.json b/ui/modules/environments/environmentTemplates.json
similarity index 100%
rename from ui/templates/environmentTemplates.json
rename to ui/modules/environments/environmentTemplates.json
diff --git a/ui/modules/environments/environments.js b/ui/modules/environments/environments.js
index dcbb571ed59..643def80937 100644
--- a/ui/modules/environments/environments.js
+++ b/ui/modules/environments/environments.js
@@ -16,6 +16,9 @@
 /* eslint-disable require-jsdoc */
 import * as Authorization from '../environments/authorization.js';
 import * as Utils from '../utils.js';
+import defaultTemplates from './environmentTemplates.json';
+import environmentsHTML from './environments.html';
+
 
 const URL_PRIMARY_ENVIRONMENT_NAME = 'primaryEnvironmentName';
 const URL_ENVIRONMENTS = 'environmentsURL';
@@ -43,6 +46,8 @@ let dom = {
 
 let observers = [];
 
+document.getElementById('environmentsHTML').innerHTML = environmentsHTML;
+
 function Environment(env) {
   Object.assign(this, env);
   Object.defineProperties(this, {
@@ -194,7 +199,7 @@ function onUpdateEnvironmentClick(event) {
 }
 
 export function environmentsJsonChanged(modifiedField) {
-  localStorage.setItem(STORAGE_KEY, JSON.stringify(environments));
+  environments && localStorage.setItem(STORAGE_KEY, JSON.stringify(environments));
 
   updateEnvSelector();
   updateEnvEditors();
@@ -250,7 +255,6 @@ function updateEnvEditors() {
 }
 
 async function loadEnvironmentTemplates() {
-  let fromTemplates = await (await fetch('templates/environmentTemplates.json')).json();
   let fromURL;
   let fromLocalStorage;
 
@@ -287,7 +291,7 @@ async function loadEnvironmentTemplates() {
   } else if (fromLocalStorage) {
     result = fromLocalStorage;
   } else {
-    result = fromTemplates;
+    result = defaultTemplates;
   }
 
   Object.keys(result).forEach((env) => {
diff --git a/ui/modules/operations/operations.js b/ui/modules/operations/operations.js
index ad16a6690ed..d7a3d783d85 100644
--- a/ui/modules/operations/operations.js
+++ b/ui/modules/operations/operations.js
@@ -17,6 +17,7 @@
 import * as API from '../api.js';
 import * as Utils from '../utils.js';
 import {TabHandler} from '../utils/tabHandler.js';
+import operationsHTML from './operations.html';
 
 let dom = {
   buttonLoadAllLogLevels: null,
@@ -26,6 +27,8 @@ let dom = {
   collapseOperations: null,
 };
 
+document.getElementById('operationsHTML').innerHTML = operationsHTML;
+
 export async function ready() {
   Utils.getAllElementsById(dom);
   new TabHandler(dom.tabOperations, dom.collapseOperations, loadAllLogLevels, 'disableOperations');
diff --git a/ui/modules/policies/policies.js b/ui/modules/policies/policies.js
index 872da1f8359..13e938f0173 100644
--- a/ui/modules/policies/policies.js
+++ b/ui/modules/policies/policies.js
@@ -6,14 +6,14 @@ import * as Utils from '../utils.js';
 import * as API from '../api.js';
 import * as Things from '../things/things.js';
 import {TabHandler} from '../utils/tabHandler.js';
+import policyTemplates from './policyTemplates.json';
+import policyHTML from './policies.html';
 
 let thePolicy;
 let selectedEntry;
 let selectedSubject;
 let selectedResource;
 
-let policyTemplates;
-
 let tabHandler;
 
 let dom = {
@@ -45,12 +45,13 @@ let dom = {
 let subjectEditor;
 let resourceEditor;
 
+document.getElementById('policyHTML').innerHTML = policyHTML;
+
 export function ready() {
   Utils.getAllElementsById(dom);
   tabHandler = new TabHandler(dom.tabPolicies, dom.collapsePolicies, refreshAll, 'disablePolicies');
 
-
-  loadPolicyTemplates();
+  Utils.addDropDownEntries(dom.ulResourceTemplates, Object.keys(policyTemplates.resources));
 
   Utils.addValidatorToTable(dom.tbodyPolicyEntries, dom.tableValidationEntries);
   Utils.addValidatorToTable(dom.tbodyPolicySubjects, dom.tableValidationSubjects);
@@ -321,13 +322,3 @@ function refreshAll(otherEnvironment) {
   }
 }
 
-function loadPolicyTemplates() {
-  fetch('templates/policyTemplates.json')
-      .then((response) => {
-        response.json().then((loadedTemplates) => {
-          policyTemplates = loadedTemplates;
-          Utils.addDropDownEntries(dom.ulResourceTemplates, Object.keys(policyTemplates.resources));
-        });
-      });
-}
-
diff --git a/ui/templates/policyTemplates.json b/ui/modules/policies/policyTemplates.json
similarity index 100%
rename from ui/templates/policyTemplates.json
rename to ui/modules/policies/policyTemplates.json
diff --git a/ui/modules/things/featureMessages.js b/ui/modules/things/featureMessages.js
index 53ab92a2afd..39d75ca8544 100644
--- a/ui/modules/things/featureMessages.js
+++ b/ui/modules/things/featureMessages.js
@@ -17,6 +17,7 @@ import * as Environments from '../environments/environments.js';
 import * as Utils from '../utils.js';
 import * as Things from './things.js';
 import * as Features from './features.js';
+import featureMessagesHTML from './featureMessages.html';
 
 let theFeatureId;
 
@@ -45,7 +46,7 @@ export async function ready() {
       document.getElementById('tabItemsFeatures'),
       document.getElementById('tabContentFeatures'),
       'Message to Feature',
-      await( await fetch('modules/things/featureMessages.html')).text(),
+      featureMessagesHTML,
   );
 
   Utils.getAllElementsById(dom);
diff --git a/ui/modules/things/features.js b/ui/modules/things/features.js
index fcb7f3c3b14..ba6e9d18b23 100644
--- a/ui/modules/things/features.js
+++ b/ui/modules/things/features.js
@@ -12,16 +12,20 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-import {JSONPath} from 'https://cdn.jsdelivr.net/npm/jsonpath-plus@5.0.3/dist/index-browser-esm.min.js';
+import {JSONPath} from 'jsonpath-plus';
 import * as API from '../api.js';
 /* eslint-disable comma-dangle */
 /* eslint-disable new-cap */
 import * as Utils from '../utils.js';
 import * as Fields from './fields.js';
 import * as Things from './things.js';
+import featuresHTML from './features.html';
 
 const observers = [];
 
+document.getElementById('featuresHTML').innerHTML = featuresHTML;
+
+
 export function addChangeListener(observer) {
   observers.push(observer);
 }
diff --git a/ui/modules/things/fields.js b/ui/modules/things/fields.js
index bd3a43ec20b..2fbae0209d7 100644
--- a/ui/modules/things/fields.js
+++ b/ui/modules/things/fields.js
@@ -13,6 +13,7 @@
 
 import * as Environments from '../environments/environments.js';
 import * as Utils from '../utils.js';
+import fieldsHTML from './fields.html';
 
 let theFieldIndex = -1;
 
@@ -23,6 +24,8 @@ const dom = {
   fieldsModal: null,
 };
 
+document.getElementById('fieldsHTML').innerHTML = fieldsHTML;
+
 /**
  * Create a Ditto search query parameter from the active fields
  * @return {String} The fields query parameter for Ditto search
diff --git a/ui/modules/things/messagesIncoming.js b/ui/modules/things/messagesIncoming.js
index 86dbfd0c0cd..2a917e60768 100644
--- a/ui/modules/things/messagesIncoming.js
+++ b/ui/modules/things/messagesIncoming.js
@@ -14,6 +14,7 @@
 import * as Utils from '../utils.js';
 import * as Things from './things.js';
 import * as ThingsSSE from './thingsSSE.js';
+import messagesIncomingHTML from './messagesIncoming.html';
 /* eslint-disable prefer-const */
 /* eslint-disable max-len */
 /* eslint-disable no-invalid-this */
@@ -29,6 +30,9 @@ let messages = [];
 let messageDetail;
 let currentThingId;
 
+document.getElementById('messagesIncomingHTML').innerHTML = messagesIncomingHTML;
+
+
 export function ready() {
   ThingsSSE.addChangeListener(onMessage);
   Things.addChangeListener(onThingChanged);
diff --git a/ui/templates/thingTemplates.json b/ui/modules/things/thingTemplates.json
similarity index 100%
rename from ui/templates/thingTemplates.json
rename to ui/modules/things/thingTemplates.json
diff --git a/ui/modules/things/things.js b/ui/modules/things/things.js
index f259369843a..0e58b670537 100644
--- a/ui/modules/things/things.js
+++ b/ui/modules/things/things.js
@@ -18,6 +18,7 @@ import * as API from '../api.js';
 import * as Utils from '../utils.js';
 import {TabHandler} from '../utils/tabHandler.js';
 import * as ThingsSearch from './thingsSearch.js';
+import thingsHTML from './things.html';
 
 export let theThing;
 
@@ -28,6 +29,9 @@ const dom = {
   tabThings: null,
 };
 
+document.getElementById('thingsHTML').innerHTML = thingsHTML;
+
+
 /**
  * Adds a listener function for the currently selected thing
  * @param {function} observer function that will be called if the current thing was changed
diff --git a/ui/modules/things/thingsCRUD.js b/ui/modules/things/thingsCRUD.js
index 5f5fdb96449..3ea9e4f0e42 100644
--- a/ui/modules/things/thingsCRUD.js
+++ b/ui/modules/things/thingsCRUD.js
@@ -17,11 +17,10 @@ import * as API from '../api.js';
 import * as Utils from '../utils.js';
 import * as ThingsSearch from './thingsSearch.js';
 import * as Things from './things.js';
+import thingTemplates from './thingTemplates.json';
 
 let thingJsonEditor;
 
-let thingTemplates;
-
 let eTag;
 
 const dom = {
@@ -42,7 +41,7 @@ export async function ready() {
 
   thingJsonEditor = Utils.createAceEditor('thingJsonEditor', 'ace/mode/json', true);
 
-  loadThingTemplates();
+  Utils.addDropDownEntries(dom.ulThingDefinitions, Object.keys(thingTemplates));
 
   dom.ulThingDefinitions.addEventListener('click', onThingDefinitionsClick);
   dom.crudThings.addEventListener('onCreateClick', onCreateThingClick);
@@ -111,16 +110,6 @@ function onThingDefinitionsClick(event) {
   thingJsonEditor.setValue(JSON.stringify(thingTemplates[event.target.textContent], null, 2), -1);
 }
 
-function loadThingTemplates() {
-  fetch('templates/thingTemplates.json')
-      .then((response) => {
-        response.json().then((loadedTemplates) => {
-          thingTemplates = loadedTemplates;
-          Utils.addDropDownEntries(dom.ulThingDefinitions, Object.keys(thingTemplates));
-        });
-      });
-}
-
 /**
  * Update UI components for the given Thing
  * @param {Object} thingJson Thing json
diff --git a/ui/modules/things/thingsSSE.js b/ui/modules/things/thingsSSE.js
index cafc3a99eb2..7bda7ea97f2 100644
--- a/ui/modules/things/thingsSSE.js
+++ b/ui/modules/things/thingsSSE.js
@@ -42,7 +42,7 @@ function notifyAll(thingJson) {
 
 function onThingsTableChanged(thingIds, fieldsQueryParameter) {
   stopSSE(thingsTableEventSource);
-  if (thingIds) {
+  if (thingIds && thingIds.length > 0) {
     console.log('SSE Start: THINGS TABLE');
     thingsTableEventSource = API.getEventSource(thingIds, fieldsQueryParameter);
     thingsTableEventSource.onmessage = onMessageThingsTable;
diff --git a/ui/modules/things/thingsSearch.js b/ui/modules/things/thingsSearch.js
index 0acc59f0eab..1f0726cc505 100644
--- a/ui/modules/things/thingsSearch.js
+++ b/ui/modules/things/thingsSearch.js
@@ -19,7 +19,7 @@
 // @ts-check
 
 // @ts-ignore
-import {JSONPath} from 'https://cdn.jsdelivr.net/npm/jsonpath-plus@5.0.3/dist/index-browser-esm.min.js';
+import {JSONPath} from 'jsonpath-plus';
 
 import * as API from '../api.js';
 
diff --git a/ui/modules/things/wotDescription.js b/ui/modules/things/wotDescription.js
index f483c68dda9..7b2077df19e 100644
--- a/ui/modules/things/wotDescription.js
+++ b/ui/modules/things/wotDescription.js
@@ -15,6 +15,7 @@
 import * as API from '../api.js';
 import * as Utils from '../utils.js';
 import * as Things from './things.js';
+import wotDescriptionHTML from './wotDescription.html';
 
 export function WoTDescription(targetTab, forFeature) {
   let tabLink;
@@ -28,7 +29,7 @@ export function WoTDescription(targetTab, forFeature) {
         document.getElementById(targetTab.itemsId),
         document.getElementById(targetTab.contentId),
         'WoT TD',
-        await( await fetch('modules/things/wotDescription.html')).text(),
+        wotDescriptionHTML,
         'Generated WoT Thing Description. This requires a valid reference to a WoT Thing Model in the ' +
         (forFeature ? 'Feature' : 'Thing') +
         ' definition. The Ditto environment must have WoT support enabled.'
diff --git a/ui/modules/utils/crudToolbar.html b/ui/modules/utils/crudToolbar.html
new file mode 100644
index 00000000000..5a9c3f601fd
--- /dev/null
+++ b/ui/modules/utils/crudToolbar.html
@@ -0,0 +1,29 @@
+<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
+  integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.3/font/bootstrap-icons.min.css" rel="stylesheet"
+  integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow=="
+  crossorigin="anonymous" referrerpolicy="no-referrer" />
+<link href="./dist/main.css" rel="stylesheet" />
+<div class="resizable_flex_column px-1" id="divRoot">
+  <div class="input-group input-group-sm mb-1 mt-1 has-validation">
+    <label class="input-group-text" id="label">Default</label>
+    <input type="text" class="form-control" disabled id="inputIdValue">
+    <button class="btn btn-outline-primary btn-sm" id="buttonEdit" data-bs-toggle="tooltip" title="Edit">
+      Edit
+    </button>
+    <button class="btn btn-outline-primary btn-sm" hidden id="buttonCreate" data-bs-toggle="tooltip" title="Create">
+      Create
+    </button>
+    <button class="btn btn-outline-primary btn-sm" hidden id="buttonUpdate" data-bs-toggle="tooltip" title="Update">
+      Update
+    </button>
+    <button class="btn btn-outline-secondary btn-sm" hidden id="buttonDelete" data-bs-toggle="tooltip" title="Delete">
+      Delete
+    </button>
+    <button class="btn btn-outline-secondary btn-sm" hidden id="buttonCancel" data-bs-toggle="tooltip" title="Cancel">
+      Cancel
+    </button>
+    <div class="invalid-feedback"></div>
+  </div>
+  <slot></slot>
+</div>
\ No newline at end of file
diff --git a/ui/modules/utils/crudToolbar.js b/ui/modules/utils/crudToolbar.js
index de9939b2fab..a7c300e30d4 100644
--- a/ui/modules/utils/crudToolbar.js
+++ b/ui/modules/utils/crudToolbar.js
@@ -12,6 +12,7 @@
  */
 /* eslint-disable require-jsdoc */
 import * as Utils from '../utils.js';
+import crudToolbarHTML from './crudToolbar.html';
 
 class CrudToolbar extends HTMLElement {
   isEditing = false;
@@ -34,11 +35,12 @@ class CrudToolbar extends HTMLElement {
   }
 
   set idValue(newValue) {
-    this.dom.inputIdValue.value = newValue;
+    this.shadowRoot.getElementById('inputIdValue').value = newValue;
+    const buttonDelete = this.shadowRoot.getElementById('buttonDelete');
     if (!this.isDeleteDisabled && newValue && newValue !== '') {
-      this.dom.buttonDelete.removeAttribute('hidden');
+      buttonDelete.removeAttribute('hidden');
     } else {
-      this.dom.buttonDelete.setAttribute('hidden', '');
+      buttonDelete.setAttribute('hidden', '');
     }
   }
 
@@ -48,22 +50,24 @@ class CrudToolbar extends HTMLElement {
 
   set createDisabled(newValue) {
     this.isCreateDisabled = newValue;
-    this.setButtonState(this.dom.buttonCreate, newValue);
+    this.setButtonState('buttonCreate', newValue);
   }
 
   set deleteDisabled(newValue) {
     this.isDeleteDisabled = newValue;
-    this.setButtonState(this.dom.buttonDelete, newValue);
+    this.setButtonState('buttonDelete', newValue);
   }
 
   set editDisabled(newValue) {
     this.isEditDisabled = newValue;
     if (!this.isEditing) {
-      this.setButtonState(this.dom.buttonEdit, newValue);
+      this.setButtonState('buttonEdit', newValue);
     }
   }
 
-  setButtonState(button, isDisabled) {
+  setButtonState(buttonId, isDisabled) {
+    const button = this.shadowRoot.getElementById(buttonId);
+
     if (isDisabled) {
       button.setAttribute('hidden', '');
     } else {
@@ -80,9 +84,11 @@ class CrudToolbar extends HTMLElement {
   }
 
   connectedCallback() {
-    this.shadowRoot.append(document.getElementById('templateCrudToolbar').content.cloneNode(true));
+    this.shadowRoot.innerHTML = crudToolbarHTML;
+
     setTimeout(() => {
       Utils.getAllElementsById(this.dom, this.shadowRoot);
+
       this.dom.buttonEdit.onclick = () => this.toggleEdit(false);
       this.dom.buttonCancel.onclick = () => this.toggleEdit(true);
       this.dom.label.innerText = this.getAttribute('label') || 'Label';
diff --git a/ui/readme.md b/ui/readme.md
new file mode 100644
index 00000000000..943d8447629
--- /dev/null
+++ b/ui/readme.md
@@ -0,0 +1,15 @@
+# Getting started
+
+## Development
+
+To start development server use
+
+`npm run start`
+
+Browse to the UI
+
+`http://localhost:8000/`
+
+## Build for production
+
+`npm run build`
\ No newline at end of file

From 8b67f61af448b41677bc51e921d764f64cefa87c Mon Sep 17 00:00:00 2001
From: neottil <neot.luka.89@gmail.com>
Date: Wed, 3 May 2023 11:07:03 +0200
Subject: [PATCH 095/173] group Devops APIs iin unique tag

---
 .../main/resources/openapi/ditto-api-2.yml    | 26 ++++++++-----------
 .../resources/openapi/sources/api-2-index.yml |  8 ++----
 .../openapi/sources/paths/config/config.yml   |  2 +-
 .../openapi/sources/paths/config/podName.yml  |  2 +-
 .../openapi/sources/paths/logging/logging.yml |  4 +--
 .../sources/paths/logging/moduleName.yml      |  4 +--
 .../sources/paths/piggyback/instanceIndex.yml |  2 +-
 .../sources/paths/piggyback/piggyback.yml     |  2 +-
 .../sources/paths/piggyback/serviceName.yml   |  2 +-
 9 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/documentation/src/main/resources/openapi/ditto-api-2.yml b/documentation/src/main/resources/openapi/ditto-api-2.yml
index 90c7cf84712..2abae592dd9 100644
--- a/documentation/src/main/resources/openapi/ditto-api-2.yml
+++ b/documentation/src/main/resources/openapi/ditto-api-2.yml
@@ -30,12 +30,8 @@ tags:
     description: Process CloudEvents in Ditto
   - name: Connections
     description: Manage connections
-  - name: Logging
-    description: Manage Log Levels in runtime
-  - name: Service Configuration
-    description: Manage service configuration in runtime
-  - name: Piggyback Commands
-    description: Manage Piggyback commands
+  - name: Devops
+    description: Devops APIs to manage log levels and configuration in runtime and send piggyback command
 security:
   - Google:
       - openid
@@ -7318,7 +7314,7 @@ paths:
         - DevOpsBasic: []
         - DevOpsBearer: []
       tags:
-        - Logging
+        - Devops
       parameters:
         - $ref: '#/components/parameters/LoggingFieldsQueryParam'
       responses:
@@ -7341,7 +7337,7 @@ paths:
         - DevOpsBasic: []
         - DevOpsBearer: []
       tags:
-        - Logging
+        - Devops
       requestBody:
         description: Fields to update level log for each pods
         required: true
@@ -7371,7 +7367,7 @@ paths:
         - DevOpsBasic: []
         - DevOpsBearer: []
       tags:
-        - Logging
+        - Devops
       parameters:
         - $ref: '#/components/parameters/ModuleNamePathParam'
         - $ref: '#/components/parameters/LoggingFieldsQueryParam'
@@ -7395,7 +7391,7 @@ paths:
         - DevOpsBasic: []
         - DevOpsBearer: []
       tags:
-        - Logging
+        - Devops
       parameters:
         - $ref: '#/components/parameters/ModuleNamePathParam'
       requestBody:
@@ -7429,7 +7425,7 @@ paths:
         - DevOpsBasic: []
         - DevOpsBearer: []
       tags:
-        - Service Configuration
+        - Devops
       parameters:
         - $ref: '#/components/parameters/PathParam'
       responses:
@@ -7453,7 +7449,7 @@ paths:
         - DevOpsBasic: []
         - DevOpsBearer: []
       tags:
-        - Service Configuration
+        - Devops
       parameters:
         - $ref: '#/components/parameters/ModuleNamePathParam'
         - $ref: '#/components/parameters/NamePodParam'
@@ -7542,7 +7538,7 @@ paths:
         - DevOpsBasic: []
         - DevOpsBearer: []
       tags:
-        - Piggyback Commands
+        - Devops
       parameters:
         - $ref: '#/components/parameters/TimeoutParam'
       requestBody:
@@ -7642,7 +7638,7 @@ paths:
         - DevOpsBasic: []
         - DevOpsBearer: []
       tags:
-        - Piggyback Commands
+        - Devops
       parameters:
         - $ref: '#/components/parameters/ServiceNameParam'
         - $ref: '#/components/parameters/TimeoutParam'
@@ -7711,7 +7707,7 @@ paths:
         - DevOpsBasic: []
         - DevOpsBearer: []
       tags:
-        - Piggyback Commands
+        - Devops
       parameters:
         - $ref: '#/components/parameters/ServiceNameParam'
         - $ref: '#/components/parameters/InstanceIndex'
diff --git a/documentation/src/main/resources/openapi/sources/api-2-index.yml b/documentation/src/main/resources/openapi/sources/api-2-index.yml
index 4ab91d6b15d..2dcd5a5542b 100644
--- a/documentation/src/main/resources/openapi/sources/api-2-index.yml
+++ b/documentation/src/main/resources/openapi/sources/api-2-index.yml
@@ -42,12 +42,8 @@ tags:
     description: Process CloudEvents in Ditto
   - name: Connections
     description: Manage connections
-  - name: Logging
-    description: Manage Log Levels in runtime
-  - name: Service Configuration
-    description: Manage service configuration in runtime
-  - name: Piggyback Commands
-    description: Manage Piggyback commands
+  - name: Devops
+    description: Devops APIs to manage log levels and configuration in runtime and send piggyback command
 
 security:
   - Google:
diff --git a/documentation/src/main/resources/openapi/sources/paths/config/config.yml b/documentation/src/main/resources/openapi/sources/paths/config/config.yml
index 5034145b021..54ea37598e4 100644
--- a/documentation/src/main/resources/openapi/sources/paths/config/config.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/config/config.yml
@@ -17,7 +17,7 @@ get:
     - DevOpsBasic: []
     - DevOpsBearer: []
   tags:
-    - Service Configuration
+    - Devops
   parameters:
     - $ref: '../../parameters/pathParam.yml'
   responses:
diff --git a/documentation/src/main/resources/openapi/sources/paths/config/podName.yml b/documentation/src/main/resources/openapi/sources/paths/config/podName.yml
index 4517c7221c7..e909586e4bc 100644
--- a/documentation/src/main/resources/openapi/sources/paths/config/podName.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/config/podName.yml
@@ -16,7 +16,7 @@ get:
     - DevOpsBasic: []
     - DevOpsBearer: []
   tags:
-    - Service Configuration
+    - Devops
   parameters:
     - $ref: '../../parameters/moduleNamePathParam.yml'
     - $ref: '../../parameters/namePodParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml b/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml
index a21e5cd915b..32de39fff03 100644
--- a/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/logging/logging.yml
@@ -15,7 +15,7 @@ get:
     - DevOpsBasic: []
     - DevOpsBearer: []
   tags:
-    - Logging
+    - Devops
   parameters:
     - $ref: '../../parameters/loggingFieldsQueryParam.yml'
   responses:
@@ -40,7 +40,7 @@ put:
     - DevOpsBasic: []
     - DevOpsBearer: []
   tags:
-    - Logging
+    - Devops
   requestBody:
     description: Fields to update level log for each pods
     required: true
diff --git a/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml b/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml
index 16b25c75cf6..a1c1ad92b4e 100644
--- a/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/logging/moduleName.yml
@@ -16,7 +16,7 @@ get:
     - DevOpsBasic: []
     - DevOpsBearer: []
   tags:
-    - Logging
+    - Devops
   parameters:
     - $ref: '../../parameters/moduleNamePathParam.yml'
     - $ref: '../../parameters/loggingFieldsQueryParam.yml'
@@ -42,7 +42,7 @@ put:
     - DevOpsBasic: []
     - DevOpsBearer: []
   tags:
-    - Logging
+    - Devops
   parameters:
     - $ref: '../../parameters/moduleNamePathParam.yml'
   requestBody:
diff --git a/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml b/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml
index 823d3e61c00..692246f1a52 100644
--- a/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/piggyback/instanceIndex.yml
@@ -15,7 +15,7 @@ post:
     - DevOpsBasic: []
     - DevOpsBearer: []
   tags:
-    - Piggyback Commands
+    - Devops
   parameters:
     - $ref: '../../parameters/serviceNameParam.yml'
     - $ref: '../../parameters/instanceIndexParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml b/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml
index 1aa13f34a16..55fe413a23f 100644
--- a/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/piggyback/piggyback.yml
@@ -15,7 +15,7 @@ post:
     - DevOpsBasic: []
     - DevOpsBearer: []
   tags:
-    - Piggyback Commands
+    - Devops
   parameters:
     - $ref: '../../parameters/timeoutParam.yml'
   requestBody:
diff --git a/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml b/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml
index 73c570a7d5c..1e2235f5250 100644
--- a/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/piggyback/serviceName.yml
@@ -15,7 +15,7 @@ post:
     - DevOpsBasic: []
     - DevOpsBearer: []
   tags:
-    - Piggyback Commands
+    - Devops
   parameters:
     - $ref: '../../parameters/serviceNameParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'

From f57e41fb0a15f25f453cc4d5590a490ab1808747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 18 Apr 2023 18:39:09 +0200
Subject: [PATCH 096/173] #1619 adjusted monitor to use in
 OutboundMappingProcessorActor#messageDiscarded
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* to not use `responseDispatchedMonitor`, but getMonitorsForOutboundSignal() with using `responseMappedMonitor` instead for responses

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../messaging/OutboundMappingProcessorActor.java | 16 ++++++++++++----
 .../OutboundMappingProcessorActorTest.java       |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActor.java
index 96ee126d233..869909f8b5b 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActor.java
@@ -349,13 +349,21 @@ protected OutboundSignalWithSender mapMessage(final OutboundSignal message) {
     }
 
     @Override
-    protected void messageDiscarded(OutboundSignal message,  QueueOfferResult result) {
+    protected void messageDiscarded(final OutboundSignal message, final QueueOfferResult result) {
+        final Set<ConnectionMonitor> monitorsForOutboundSignal =
+                getMonitorsForOutboundSignal(message, MAPPED, LogType.MAPPED, responseMappedMonitor);
         if (QueueOfferResult.dropped().equals(result)) {
-            responseDispatchedMonitor.failure(message.getSource(), "Message is dropped as a result of backpressure strategy!");
+            monitorsForOutboundSignal.forEach(monitor ->
+                    monitor.failure(message.getSource(), "Message is dropped as a result of backpressure strategy!")
+            );
         } else if (result instanceof final QueueOfferResult.Failure failure) {
-            responseDispatchedMonitor.failure(message.getSource(), "Enqueue failed! - failure: {}", failure.cause());
+            monitorsForOutboundSignal.forEach(monitor ->
+                    monitor.failure(message.getSource(), "Enqueue failed! - failure: {}", failure.cause())
+            );
         } else {
-            responseDispatchedMonitor.failure(message.getSource(), "Enqueue failed without acknowledgement!");
+            monitorsForOutboundSignal.forEach(monitor ->
+                    monitor.failure(message.getSource(), "Enqueue failed without acknowledgement!")
+            );
         }
     }
 
diff --git a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActorTest.java b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActorTest.java
index 7009ed6ff62..3ec16166e1c 100644
--- a/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActorTest.java
+++ b/connectivity/service/src/test/java/org/eclipse/ditto/connectivity/service/messaging/OutboundMappingProcessorActorTest.java
@@ -63,11 +63,11 @@
 import akka.testkit.TestProbe;
 import akka.testkit.javadsl.TestKit;
 
-@FixMethodOrder(MethodSorters.DEFAULT)
 /**
  * Tests in addition to {@link MessageMappingProcessorActorTest}
  * for {@link OutboundMappingProcessorActor} only.
  */
+@FixMethodOrder(MethodSorters.DEFAULT)
 public final class OutboundMappingProcessorActorTest {
 
     @ClassRule

From 4d53afccf23d57d5353a4c7d2bfe9d5584e52b8c Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Sat, 13 May 2023 11:35:10 +0200
Subject: [PATCH 097/173] UI - build with esbuild - removed package.json from
 gitignore - included everything except icons and ace in the build process -
 updated all to latest incl. bootstrap 5.3

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 .gitignore                     |    2 -
 ui/build.mjs                   |   29 +
 ui/index.html                  |   18 +-
 ui/main.js                     |    5 +-
 ui/{index.css => main.scss}    |    4 +
 ui/modules/api.js              |    2 +
 ui/modules/things/thingsSSE.js |    3 +-
 ui/modules/utils.js            |    1 +
 ui/package-lock.json           | 3008 ++++++++++++++++++++++++++++++++
 ui/package.json                |   31 +
 10 files changed, 3084 insertions(+), 19 deletions(-)
 create mode 100644 ui/build.mjs
 rename ui/{index.css => main.scss} (98%)
 create mode 100644 ui/package-lock.json
 create mode 100644 ui/package.json

diff --git a/.gitignore b/.gitignore
index 3e49d1a77c7..bb0a6751374 100755
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,4 @@ deployment/helm/eclipse-ditto/charts/*
 .factorypath
 ui/node_modules
 ui/dist
-ui/package.json
-ui/package-lock.json
 
diff --git a/ui/build.mjs b/ui/build.mjs
new file mode 100644
index 00000000000..dd12376c81d
--- /dev/null
+++ b/ui/build.mjs
@@ -0,0 +1,29 @@
+import {argv} from 'node:process';
+import * as esbuild from 'esbuild';
+import {sassPlugin} from 'esbuild-sass-plugin';
+
+const config = {
+  entryPoints: ['main.js'],
+  bundle: true,
+  outdir: 'dist',
+  loader: {
+    '.html': 'text',
+  },
+  plugins: [sassPlugin()],
+};
+
+if (argv[2] === 'serve') {
+  config.sourcemap = true;
+
+  const ctx = await esbuild.context(config);
+
+  let {host, port} = await ctx.serve({
+    servedir: '.',
+  });
+} else {
+  config.minify = true;
+
+  await esbuild.build(config);
+}
+
+
diff --git a/ui/index.html b/ui/index.html
index 4b71e1a041e..813efd48036 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -16,8 +16,6 @@
     <title>Eclipse Ditto™ explorer</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
-        integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
     <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.3/font/bootstrap-icons.min.css"
         rel="stylesheet"
         integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow=="
@@ -31,19 +29,9 @@
     <link rel="icon" type="image/png"
         href="https://raw.githubusercontent.com/eclipse/ditto/master/documentation/src/main/resources/images/favicon-96x96.png"
         sizes="96x96">
-    <script src="https://cdn.jsdelivr.net/npm/event-source-polyfill@1.0.31/src/eventsource.min.js"
-        integrity="sha256-JBw2DF7FFaUo0jG/NptzuAmOVSFJz+Z86wxbKIHK4yc="
-        crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js"
-        integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k="
-        crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"
-        integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p"
-        crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ace.js"
-        integrity="sha512-GZ1RIgZaSc8rnco/8CXfRdCpDxRCphenIiZ2ztLy3XQfCbQUSCuk8IudvNHxkRA3oUg6q0qejgN/qqyG1duv5Q=="
-        crossorigin="anonymous" type="text/javascript" charset="utf-8"></script>
-    <script src="https://cdn.jsdelivr.net/npm/@tarekraafat/autocomplete.js@10.2.7/dist/autoComplete.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.19.0/ace.min.js"
+        integrity="sha512-7ar5DoGr5xiRstr9B0e9BkQAc42juvRXosAEAXuOKZSL/4C93WpIFthgzZibRAau0kB0NJszECL02exq3IPc/w=="
+        crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script type="module" src="./dist/main.js"></script>
     <link rel="stylesheet" href="./dist/main.css" />
 </head>
diff --git a/ui/main.js b/ui/main.js
index 8b8f97b57dd..7d0181258fa 100644
--- a/ui/main.js
+++ b/ui/main.js
@@ -11,6 +11,9 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 /* eslint-disable new-cap */
+import 'bootstrap/dist/css/bootstrap.min.css';
+import './main.scss';
+import {Dropdown} from 'bootstrap';
 
 import * as Authorization from './modules/environments/authorization.js';
 import * as Environments from './modules/environments/environments.js';
@@ -70,7 +73,7 @@ document.addEventListener('DOMContentLoaded', async function() {
   featureDescription.ready();
 
   // make dropdowns not cutting off
-  new bootstrap.Dropdown(document.querySelector('.dropdown-toggle'), {
+  new Dropdown(document.querySelector('.dropdown-toggle'), {
     popperConfig: {
       strategy: 'fixed',
     },
diff --git a/ui/index.css b/ui/main.scss
similarity index 98%
rename from ui/index.css
rename to ui/main.scss
index 347968dbfe0..76285482414 100644
--- a/ui/index.css
+++ b/ui/main.scss
@@ -12,6 +12,10 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
+@import "bootstrap/scss/bootstrap";
+
+// $body-bg: #fff;
+
 .table {
     --bs-table-active-bg: #3a8c9a;
     --bs-table-active-color: white;
diff --git a/ui/modules/api.js b/ui/modules/api.js
index b9a427673df..1ef2a1f0f52 100644
--- a/ui/modules/api.js
+++ b/ui/modules/api.js
@@ -14,6 +14,8 @@
 
 import * as Environments from './environments/environments.js';
 import * as Utils from './utils.js';
+import {EventSourcePolyfill} from 'event-source-polyfill';
+
 
 const config = {
   things: {
diff --git a/ui/modules/things/thingsSSE.js b/ui/modules/things/thingsSSE.js
index 7bda7ea97f2..b4145e95dc1 100644
--- a/ui/modules/things/thingsSSE.js
+++ b/ui/modules/things/thingsSSE.js
@@ -18,6 +18,7 @@ import * as Environments from '../environments/environments.js';
 
 import * as Things from './things.js';
 import * as ThingsSearch from './thingsSearch.js';
+import merge from 'lodash/merge';
 
 let selectedThingEventSource;
 let thingsTableEventSource;
@@ -77,7 +78,7 @@ function onEnvironmentChanged(modifiedField) {
 
 function onMessageSelectedThing(event) {
   if (event.data && event.data !== '') {
-    const merged = _.merge(Things.theThing, JSON.parse(event.data));
+    const merged = merge(Things.theThing, JSON.parse(event.data));
     Things.setTheThing(merged);
     notifyAll(JSON.parse(event.data));
   }
diff --git a/ui/modules/utils.js b/ui/modules/utils.js
index 7ebca92c458..ed3e4f5e36f 100644
--- a/ui/modules/utils.js
+++ b/ui/modules/utils.js
@@ -12,6 +12,7 @@
  */
 
 /* eslint-disable quotes */
+import autoComplete from "@tarekraafat/autocomplete.js";
 
 const dom = {
   modalBodyConfirm: null,
diff --git a/ui/package-lock.json b/ui/package-lock.json
new file mode 100644
index 00000000000..def1fa08483
--- /dev/null
+++ b/ui/package-lock.json
@@ -0,0 +1,3008 @@
+{
+  "name": "ui",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "ui",
+      "version": "1.0.0",
+      "license": "EPL-2.0",
+      "dependencies": {
+        "@popperjs/core": "^2.11.7",
+        "@tarekraafat/autocomplete.js": "^10.2.7",
+        "bootstrap": "^5.2.3",
+        "bootstrap-icons": "^1.10.5",
+        "event-source-polyfill": "^1.0.31",
+        "jsonpath-plus": "^7.2.0",
+        "lodash": "^4.17.21"
+      },
+      "devDependencies": {
+        "esbuild": "^0.17.18",
+        "esbuild-sass-plugin": "^2.9.0",
+        "eslint": "^8.40.0",
+        "eslint-config-google": "^0.14.0",
+        "eslint-config-standard": "^17.0.0",
+        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-n": "^15.7.0",
+        "eslint-plugin-promise": "^6.1.1"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.18.tgz",
+      "integrity": "sha512-EmwL+vUBZJ7mhFCs5lA4ZimpUH3WMAoqvOIYhVQwdIgSpHC8ImHdsRyhHAVxpDYUSm0lWvd63z0XH1IlImS2Qw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.18.tgz",
+      "integrity": "sha512-/iq0aK0eeHgSC3z55ucMAHO05OIqmQehiGay8eP5l/5l+iEr4EIbh4/MI8xD9qRFjqzgkc0JkX0LculNC9mXBw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.18.tgz",
+      "integrity": "sha512-x+0efYNBF3NPW2Xc5bFOSFW7tTXdAcpfEg2nXmxegm4mJuVeS+i109m/7HMiOQ6M12aVGGFlqJX3RhNdYM2lWg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.18.tgz",
+      "integrity": "sha512-6tY+djEAdF48M1ONWnQb1C+6LiXrKjmqjzPNPWXhu/GzOHTHX2nh8Mo2ZAmBFg0kIodHhciEgUBtcYCAIjGbjQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.18.tgz",
+      "integrity": "sha512-Qq84ykvLvya3dO49wVC9FFCNUfSrQJLbxhoQk/TE1r6MjHo3sFF2tlJCwMjhkBVq3/ahUisj7+EpRSz0/+8+9A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.18.tgz",
+      "integrity": "sha512-fw/ZfxfAzuHfaQeMDhbzxp9mc+mHn1Y94VDHFHjGvt2Uxl10mT4CDavHm+/L9KG441t1QdABqkVYwakMUeyLRA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.18.tgz",
+      "integrity": "sha512-FQFbRtTaEi8ZBi/A6kxOC0V0E9B/97vPdYjY9NdawyLd4Qk5VD5g2pbWN2VR1c0xhzcJm74HWpObPszWC+qTew==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.18.tgz",
+      "integrity": "sha512-jW+UCM40LzHcouIaqv3e/oRs0JM76JfhHjCavPxMUti7VAPh8CaGSlS7cmyrdpzSk7A+8f0hiedHqr/LMnfijg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.18.tgz",
+      "integrity": "sha512-R7pZvQZFOY2sxUG8P6A21eq6q+eBv7JPQYIybHVf1XkQYC+lT7nDBdC7wWKTrbvMXKRaGudp/dzZCwL/863mZQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.18.tgz",
+      "integrity": "sha512-ygIMc3I7wxgXIxk6j3V00VlABIjq260i967Cp9BNAk5pOOpIXmd1RFQJQX9Io7KRsthDrQYrtcx7QCof4o3ZoQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.18.tgz",
+      "integrity": "sha512-bvPG+MyFs5ZlwYclCG1D744oHk1Pv7j8psF5TfYx7otCVmcJsEXgFEhQkbhNW8otDHL1a2KDINW20cfCgnzgMQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.18.tgz",
+      "integrity": "sha512-oVqckATOAGuiUOa6wr8TXaVPSa+6IwVJrGidmNZS1cZVx0HqkTMkqFGD2HIx9H1RvOwFeWYdaYbdY6B89KUMxA==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.18.tgz",
+      "integrity": "sha512-3dLlQO+b/LnQNxgH4l9rqa2/IwRJVN9u/bK63FhOPB4xqiRqlQAU0qDU3JJuf0BmaH0yytTBdoSBHrb2jqc5qQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.18.tgz",
+      "integrity": "sha512-/x7leOyDPjZV3TcsdfrSI107zItVnsX1q2nho7hbbQoKnmoeUWjs+08rKKt4AUXju7+3aRZSsKrJtaRmsdL1xA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.18.tgz",
+      "integrity": "sha512-cX0I8Q9xQkL/6F5zWdYmVf5JSQt+ZfZD2bJudZrWD+4mnUvoZ3TDDXtDX2mUaq6upMFv9FlfIh4Gfun0tbGzuw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.18.tgz",
+      "integrity": "sha512-66RmRsPlYy4jFl0vG80GcNRdirx4nVWAzJmXkevgphP1qf4dsLQCpSKGM3DUQCojwU1hnepI63gNZdrr02wHUA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.18.tgz",
+      "integrity": "sha512-95IRY7mI2yrkLlTLb1gpDxdC5WLC5mZDi+kA9dmM5XAGxCME0F8i4bYH4jZreaJ6lIZ0B8hTrweqG1fUyW7jbg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.18.tgz",
+      "integrity": "sha512-WevVOgcng+8hSZ4Q3BKL3n1xTv5H6Nb53cBrtzzEjDbbnOmucEVcZeGCsCOi9bAOcDYEeBZbD2SJNBxlfP3qiA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.18.tgz",
+      "integrity": "sha512-Rzf4QfQagnwhQXVBS3BYUlxmEbcV7MY+BH5vfDZekU5eYpcffHSyjU8T0xucKVuOcdCsMo+Ur5wmgQJH2GfNrg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.18.tgz",
+      "integrity": "sha512-Kb3Ko/KKaWhjeAm2YoT/cNZaHaD1Yk/pa3FTsmqo9uFh1D1Rfco7BBLIPdDOozrObj2sahslFuAQGvWbgWldAg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.18.tgz",
+      "integrity": "sha512-0/xUMIdkVHwkvxfbd5+lfG7mHOf2FRrxNbPiKWg9C4fFrB8H0guClmaM3BFiRUYrznVoyxTIyC/Ou2B7QQSwmw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.18.tgz",
+      "integrity": "sha512-qU25Ma1I3NqTSHJUOKi9sAH1/Mzuvlke0ioMJRthLXKm7JiSKVwFghlGbDLOO2sARECGhja4xYfRAZNPAkooYg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
+      "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
+      "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.5.2",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.40.0.tgz",
+      "integrity": "sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@popperjs/core": {
+      "version": "2.11.7",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
+      "integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
+    "node_modules/@tarekraafat/autocomplete.js": {
+      "version": "10.2.7",
+      "resolved": "https://registry.npmjs.org/@tarekraafat/autocomplete.js/-/autocomplete.js-10.2.7.tgz",
+      "integrity": "sha512-iE+dnXI8/LrTaSORrnNdSyXg/bFCbCpz/R5GUdB3ioW+9PVEhglxNcSDQNeCXtrbRG0kOBFUd4unEiwcmqyn8A==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/autocompletejs"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/TarekRaafat"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/TarekRaafat"
+        }
+      ]
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bootstrap": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz",
+      "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/twbs"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/bootstrap"
+        }
+      ],
+      "peerDependencies": {
+        "@popperjs/core": "^2.11.6"
+      }
+    },
+    "node_modules/bootstrap-icons": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.10.5.tgz",
+      "integrity": "sha512-oSX26F37V7QV7NCE53PPEL45d7EGXmBgHG3pDpZvcRaKVzWMqIRL9wcqJUyEha1esFtM3NJzvmxFXDxjJYD0jQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/twbs"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/bootstrap"
+        }
+      ]
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/builtins": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
+      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.0.0"
+      }
+    },
+    "node_modules/builtins/node_modules/semver": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
+      "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chokidar/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+      "dev": true,
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.21.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz",
+      "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.0",
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.1",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.2.0",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.3",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.7",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.17.18",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.18.tgz",
+      "integrity": "sha512-z1lix43jBs6UKjcZVKOw2xx69ffE2aG0PygLL5qJ9OS/gy0Ewd1gW/PUQIOIQGXBHWNywSc0floSKoMFF8aK2w==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/android-arm": "0.17.18",
+        "@esbuild/android-arm64": "0.17.18",
+        "@esbuild/android-x64": "0.17.18",
+        "@esbuild/darwin-arm64": "0.17.18",
+        "@esbuild/darwin-x64": "0.17.18",
+        "@esbuild/freebsd-arm64": "0.17.18",
+        "@esbuild/freebsd-x64": "0.17.18",
+        "@esbuild/linux-arm": "0.17.18",
+        "@esbuild/linux-arm64": "0.17.18",
+        "@esbuild/linux-ia32": "0.17.18",
+        "@esbuild/linux-loong64": "0.17.18",
+        "@esbuild/linux-mips64el": "0.17.18",
+        "@esbuild/linux-ppc64": "0.17.18",
+        "@esbuild/linux-riscv64": "0.17.18",
+        "@esbuild/linux-s390x": "0.17.18",
+        "@esbuild/linux-x64": "0.17.18",
+        "@esbuild/netbsd-x64": "0.17.18",
+        "@esbuild/openbsd-x64": "0.17.18",
+        "@esbuild/sunos-x64": "0.17.18",
+        "@esbuild/win32-arm64": "0.17.18",
+        "@esbuild/win32-ia32": "0.17.18",
+        "@esbuild/win32-x64": "0.17.18"
+      }
+    },
+    "node_modules/esbuild-sass-plugin": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/esbuild-sass-plugin/-/esbuild-sass-plugin-2.9.0.tgz",
+      "integrity": "sha512-D7c8Ub+C4RfaqhOoo9EEWprYmP5ZCmpmcodmYDtpvCfPZLgsSbLaLHPXdul4TUWUMH5eJ6POw+aes/s42ffwrA==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.22.2",
+        "sass": "^1.62.0"
+      },
+      "peerDependencies": {
+        "esbuild": "^0.17.17"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.40.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.40.0.tgz",
+      "integrity": "sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.0.3",
+        "@eslint/js": "8.40.0",
+        "@humanwhocodes/config-array": "^0.11.8",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.0",
+        "eslint-visitor-keys": "^3.4.1",
+        "espree": "^9.5.2",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-google": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz",
+      "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=5.16.0"
+      }
+    },
+    "node_modules/eslint-config-standard": {
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
+      "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "peerDependencies": {
+        "eslint": "^8.0.1",
+        "eslint-plugin-import": "^2.25.2",
+        "eslint-plugin-n": "^15.0.0",
+        "eslint-plugin-promise": "^6.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.11.0",
+        "resolve": "^1.22.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-es": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
+      "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+      "dev": true,
+      "dependencies": {
+        "eslint-utils": "^2.0.0",
+        "regexpp": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=4.19.1"
+      }
+    },
+    "node_modules/eslint-plugin-es/node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.27.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
+      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.7.4",
+        "has": "^1.0.3",
+        "is-core-module": "^2.11.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.1",
+        "semver": "^6.3.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-n": {
+      "version": "15.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
+      "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==",
+      "dev": true,
+      "dependencies": {
+        "builtins": "^5.0.1",
+        "eslint-plugin-es": "^4.1.0",
+        "eslint-utils": "^3.0.0",
+        "ignore": "^5.1.1",
+        "is-core-module": "^2.11.0",
+        "minimatch": "^3.1.2",
+        "resolve": "^1.22.1",
+        "semver": "^7.3.8"
+      },
+      "engines": {
+        "node": ">=12.22.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-n/node_modules/semver": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
+      "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-promise": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz",
+      "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.5.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
+      "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/event-source-polyfill": {
+      "version": "1.0.31",
+      "resolved": "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.31.tgz",
+      "integrity": "sha512-4IJSItgS/41IxN5UVAVuAyczwZF7ZIEsM1XAoUzIHA6A+xzusEZUutdXz2Nr+MQPLxfTiCvqE79/C8HT8fKFvA=="
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/immutable": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz",
+      "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==",
+      "dev": true
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "is-typed-array": "^1.1.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
+      "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
+      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/js-sdsl": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",
+      "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/jsonpath-plus": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-7.2.0.tgz",
+      "integrity": "sha512-zBfiUPM5nD0YZSBT/o/fbCUlCcepMIdP0CJZxM1+KgA4f2T206f6VAg9e7mX35+KlMaIc5qXW34f3BnwJ3w+RA==",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.11.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/sass": {
+      "version": "1.62.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz",
+      "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "is-typed-array": "^1.1.9"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
+      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/ui/package.json b/ui/package.json
new file mode 100644
index 00000000000..496619fc1ce
--- /dev/null
+++ b/ui/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "ui",
+  "version": "1.0.0",
+  "description": "",
+  "private": true,
+  "scripts": {
+    "start": "node build.mjs serve",
+    "build": "node build.mjs"
+  },
+  "author": "",
+  "license": "EPL-2.0",
+  "devDependencies": {
+    "esbuild": "^0.17.18",
+    "esbuild-sass-plugin": "^2.9.0",
+    "eslint": "^8.40.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-config-standard": "^17.0.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-n": "^15.7.0",
+    "eslint-plugin-promise": "^6.1.1"
+  },
+  "dependencies": {
+    "@popperjs/core": "^2.11.7",
+    "@tarekraafat/autocomplete.js": "^10.2.7",
+    "bootstrap": "^5.2.3",
+    "bootstrap-icons": "^1.10.5",
+    "event-source-polyfill": "^1.0.31",
+    "jsonpath-plus": "^7.2.0",
+    "lodash": "^4.17.21"
+  }
+}

From c8f890779ab40928ca569424d5315e2686c472e2 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Sun, 14 May 2023 15:45:30 +0200
Subject: [PATCH 098/173] UI with esbuild: added missing bootstrap imports

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/modules/things/fields.js | 3 ++-
 ui/modules/utils.js         | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/modules/things/fields.js b/ui/modules/things/fields.js
index 2fbae0209d7..172e45fe962 100644
--- a/ui/modules/things/fields.js
+++ b/ui/modules/things/fields.js
@@ -10,6 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
+import {Modal} from 'bootstrap';
 
 import * as Environments from '../environments/environments.js';
 import * as Utils from '../utils.js';
@@ -48,7 +49,7 @@ export function proposeNewField(fieldPath) {
   dom.fieldPath.value = fieldPath;
   dom.fieldLabel.value = null;
   if (!bsFieldsModal) {
-    bsFieldsModal = new bootstrap.Modal(dom.fieldsModal);
+    bsFieldsModal = new Modal(dom.fieldsModal);
   }
   bsFieldsModal.show();
 }
diff --git a/ui/modules/utils.js b/ui/modules/utils.js
index ed3e4f5e36f..d1f286e9b7e 100644
--- a/ui/modules/utils.js
+++ b/ui/modules/utils.js
@@ -13,6 +13,8 @@
 
 /* eslint-disable quotes */
 import autoComplete from "@tarekraafat/autocomplete.js";
+import {Toast, Modal} from 'bootstrap';
+
 
 const dom = {
   modalBodyConfirm: null,
@@ -228,7 +230,7 @@ export function showError(message, header, status = '') {
   domToast.addEventListener("hidden.bs.toast", () => {
     domToast.remove();
   });
-  const bsToast = new bootstrap.Toast(domToast);
+  const bsToast = new Toast(domToast);
   bsToast.show();
 }
 
@@ -286,7 +288,7 @@ let modalConfirm;
  * @param {function} callback true if confirmed
  */
 export function confirm(message, action, callback) {
-  modalConfirm = modalConfirm ?? new bootstrap.Modal('#modalConfirm');
+  modalConfirm = modalConfirm ?? new Modal('#modalConfirm');
   dom.modalBodyConfirm.innerHTML = message;
   dom.buttonConfirmed.innerText = action;
   dom.buttonConfirmed.onclick = callback;

From 2961f34379455f4f63d560ad7e87ba025d3a2358 Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Sun, 14 May 2023 20:07:46 +0200
Subject: [PATCH 099/173] UI with esbuild - prepared dockerfile - fixed
 stylesheet in operations.html

Signed-off-by: thfries <thomas.fries0@gmail.com>
---
 ui/Dockerfile                         | 5 +----
 ui/modules/operations/operations.html | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ui/Dockerfile b/ui/Dockerfile
index 608321e6650..aae579baa67 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -14,7 +14,4 @@ FROM nginxinc/nginx-unprivileged:alpine
 WORKDIR /usr/share/nginx/html
 
 COPY ./index.html           .
-COPY ./index.css            .
-COPY ./main.js              .
-COPY ./modules              ./modules
-COPY ./templates            ./templates
+COPY ./dist                 ./dist
diff --git a/ui/modules/operations/operations.html b/ui/modules/operations/operations.html
index 521ade84822..215bf4d11aa 100644
--- a/ui/modules/operations/operations.html
+++ b/ui/modules/operations/operations.html
@@ -29,7 +29,7 @@ <h5>Ditto Services Logging</h5>
                 rel="stylesheet"
                 integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow=="
                 crossorigin="anonymous" referrerpolicy="no-referrer" />
-            <link href="index.css" rel="stylesheet" />
+            <link href="./dist/main.css" rel="stylesheet" />
     
             <div class="input-group input-group-sm mb-1">
                 <input class="form-control" type="text" disabled id="inputLogger" spellcheck="false"></input>

From 55086cb2bcfb86590192715a0239dafac1b790cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 2 May 2023 20:29:54 +0200
Subject: [PATCH 100/173] Provide Helm chart in Ditto repository
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* initially migrated from IoT Packages project
* however enhanced with a lot more configuration options in order to be the basis for a productive Helm chart
* also added quite advanced ingress configuration

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .github/workflows/license-check.yml           |    2 +-
 deployment/docker/nginx.conf                  |    6 +-
 deployment/docker/sandbox/nginx.conf          |    6 +-
 deployment/helm/.gitignore                    |    2 +
 deployment/helm/.helmignore                   |   19 +
 deployment/helm/Chart.yaml                    |   36 +
 deployment/helm/README.md                     |   30 +-
 deployment/helm/local-values.yaml             |  154 ++
 .../helm/logback-config/connectivity.xml      |   41 +
 deployment/helm/logback-config/gateway.xml    |   37 +
 deployment/helm/logback-config/policies.xml   |   37 +
 deployment/helm/logback-config/things.xml     |   37 +
 .../helm/logback-config/thingssearch.xml      |   37 +
 deployment/helm/nginx-config/ditto-down.svg   |   78 +
 deployment/helm/nginx-config/ditto-up.svg     |   67 +
 deployment/helm/nginx-config/index.html       |  174 ++
 deployment/helm/nginx-config/nginx-cors.conf  |   39 +
 deployment/helm/swaggerui-config/index.html   |   74 +
 deployment/helm/templates/NOTES.txt           |   33 +
 deployment/helm/templates/_helpers.tpl        |   72 +
 .../templates/connectivity-deployment.yaml    |  323 ++++
 .../templates/connectivity-networkpolicy.yaml |   42 +
 .../helm/templates/connectivity-pdb.yaml      |   26 +
 .../templates/connectivity-podmonitor.yaml    |   38 +
 .../helm/templates/dittoui-deployment.yaml    |   66 +
 .../helm/templates/dittoui-networkpolicy.yaml |   36 +
 deployment/helm/templates/dittoui-pdb.yaml    |   26 +
 .../helm/templates/dittoui-service.yaml       |   33 +
 .../helm/templates/gateway-deployment.yaml    |  293 +++
 .../helm/templates/gateway-networkpolicy.yaml |   51 +
 deployment/helm/templates/gateway-pdb.yaml    |   26 +
 .../helm/templates/gateway-podmonitor.yaml    |   38 +
 deployment/helm/templates/gateway-secret.yaml |   32 +
 .../helm/templates/gateway-service.yaml       |   33 +
 deployment/helm/templates/logback-config.yaml |   31 +
 deployment/helm/templates/mongodb-secret.yaml |   27 +
 deployment/helm/templates/nginx-auth.yaml     |   36 +
 deployment/helm/templates/nginx-config.yaml   |   30 +
 .../helm/templates/nginx-configmap.yaml       |  242 +++
 .../helm/templates/nginx-deployment.yaml      |  149 ++
 .../helm/templates/nginx-ingress-api.yaml     |   62 +
 .../helm/templates/nginx-ingress-root.yaml    |   62 +
 .../helm/templates/nginx-ingress-ui.yaml      |   62 +
 .../helm/templates/nginx-ingress-ws.yaml      |   62 +
 .../helm/templates/nginx-networkpolicy.yaml   |   32 +
 deployment/helm/templates/nginx-route.yaml    |   35 +
 deployment/helm/templates/nginx-service.yaml  |   37 +
 .../helm/templates/policies-deployment.yaml   |  292 +++
 .../templates/policies-networkpolicy.yaml     |   42 +
 deployment/helm/templates/policies-pdb.yaml   |   26 +
 .../helm/templates/policies-podmonitor.yaml   |   38 +
 deployment/helm/templates/role.yaml           |   24 +
 deployment/helm/templates/rolebinding.yaml    |   27 +
 deployment/helm/templates/serviceaccount.yaml |   20 +
 .../helm/templates/swaggerui-config.yaml      |   30 +
 .../helm/templates/swaggerui-deployment.yaml  |  114 ++
 .../templates/swaggerui-networkpolicy.yaml    |   36 +
 deployment/helm/templates/swaggerui-pdb.yaml  |   26 +
 .../helm/templates/swaggerui-service.yaml     |   33 +
 .../helm/templates/things-deployment.yaml     |  296 ++++
 .../helm/templates/things-networkpolicy.yaml  |   42 +
 deployment/helm/templates/things-pdb.yaml     |   26 +
 .../helm/templates/things-podmonitor.yaml     |   38 +
 .../templates/thingssearch-deployment.yaml    |  294 +++
 .../templates/thingssearch-networkpolicy.yaml |   42 +
 .../helm/templates/thingssearch-pdb.yaml      |   26 +
 .../templates/thingssearch-podmonitor.yaml    |   38 +
 deployment/helm/values.yaml                   | 1572 +++++++++++++++++
 deployment/openshift/nginx/nginx.conf         |    6 +-
 69 files changed, 5991 insertions(+), 8 deletions(-)
 create mode 100644 deployment/helm/.gitignore
 create mode 100644 deployment/helm/.helmignore
 create mode 100644 deployment/helm/Chart.yaml
 create mode 100644 deployment/helm/local-values.yaml
 create mode 100644 deployment/helm/logback-config/connectivity.xml
 create mode 100755 deployment/helm/logback-config/gateway.xml
 create mode 100755 deployment/helm/logback-config/policies.xml
 create mode 100755 deployment/helm/logback-config/things.xml
 create mode 100755 deployment/helm/logback-config/thingssearch.xml
 create mode 100644 deployment/helm/nginx-config/ditto-down.svg
 create mode 100644 deployment/helm/nginx-config/ditto-up.svg
 create mode 100644 deployment/helm/nginx-config/index.html
 create mode 100644 deployment/helm/nginx-config/nginx-cors.conf
 create mode 100644 deployment/helm/swaggerui-config/index.html
 create mode 100644 deployment/helm/templates/NOTES.txt
 create mode 100644 deployment/helm/templates/_helpers.tpl
 create mode 100644 deployment/helm/templates/connectivity-deployment.yaml
 create mode 100644 deployment/helm/templates/connectivity-networkpolicy.yaml
 create mode 100644 deployment/helm/templates/connectivity-pdb.yaml
 create mode 100644 deployment/helm/templates/connectivity-podmonitor.yaml
 create mode 100644 deployment/helm/templates/dittoui-deployment.yaml
 create mode 100644 deployment/helm/templates/dittoui-networkpolicy.yaml
 create mode 100644 deployment/helm/templates/dittoui-pdb.yaml
 create mode 100644 deployment/helm/templates/dittoui-service.yaml
 create mode 100644 deployment/helm/templates/gateway-deployment.yaml
 create mode 100644 deployment/helm/templates/gateway-networkpolicy.yaml
 create mode 100644 deployment/helm/templates/gateway-pdb.yaml
 create mode 100644 deployment/helm/templates/gateway-podmonitor.yaml
 create mode 100644 deployment/helm/templates/gateway-secret.yaml
 create mode 100644 deployment/helm/templates/gateway-service.yaml
 create mode 100644 deployment/helm/templates/logback-config.yaml
 create mode 100644 deployment/helm/templates/mongodb-secret.yaml
 create mode 100644 deployment/helm/templates/nginx-auth.yaml
 create mode 100644 deployment/helm/templates/nginx-config.yaml
 create mode 100644 deployment/helm/templates/nginx-configmap.yaml
 create mode 100644 deployment/helm/templates/nginx-deployment.yaml
 create mode 100644 deployment/helm/templates/nginx-ingress-api.yaml
 create mode 100644 deployment/helm/templates/nginx-ingress-root.yaml
 create mode 100644 deployment/helm/templates/nginx-ingress-ui.yaml
 create mode 100644 deployment/helm/templates/nginx-ingress-ws.yaml
 create mode 100644 deployment/helm/templates/nginx-networkpolicy.yaml
 create mode 100644 deployment/helm/templates/nginx-route.yaml
 create mode 100644 deployment/helm/templates/nginx-service.yaml
 create mode 100644 deployment/helm/templates/policies-deployment.yaml
 create mode 100644 deployment/helm/templates/policies-networkpolicy.yaml
 create mode 100644 deployment/helm/templates/policies-pdb.yaml
 create mode 100644 deployment/helm/templates/policies-podmonitor.yaml
 create mode 100644 deployment/helm/templates/role.yaml
 create mode 100644 deployment/helm/templates/rolebinding.yaml
 create mode 100644 deployment/helm/templates/serviceaccount.yaml
 create mode 100644 deployment/helm/templates/swaggerui-config.yaml
 create mode 100644 deployment/helm/templates/swaggerui-deployment.yaml
 create mode 100644 deployment/helm/templates/swaggerui-networkpolicy.yaml
 create mode 100644 deployment/helm/templates/swaggerui-pdb.yaml
 create mode 100644 deployment/helm/templates/swaggerui-service.yaml
 create mode 100644 deployment/helm/templates/things-deployment.yaml
 create mode 100644 deployment/helm/templates/things-networkpolicy.yaml
 create mode 100644 deployment/helm/templates/things-pdb.yaml
 create mode 100644 deployment/helm/templates/things-podmonitor.yaml
 create mode 100644 deployment/helm/templates/thingssearch-deployment.yaml
 create mode 100644 deployment/helm/templates/thingssearch-networkpolicy.yaml
 create mode 100644 deployment/helm/templates/thingssearch-pdb.yaml
 create mode 100644 deployment/helm/templates/thingssearch-podmonitor.yaml
 create mode 100644 deployment/helm/values.yaml

diff --git a/.github/workflows/license-check.yml b/.github/workflows/license-check.yml
index a6e7224e006..1254d09eb1d 100644
--- a/.github/workflows/license-check.yml
+++ b/.github/workflows/license-check.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Ensure license year for added files is the file's creation year
         shell: bash
         run: |
-          included_file_endings=".*\.(java|xml|yml)"
+          included_file_endings=".*\.(java|xml|yml|yaml)"
           current_year=$(date +'%Y')
           missing_counter=0
           for file in ${{ steps.the-files.outputs.added }}; do
diff --git a/deployment/docker/nginx.conf b/deployment/docker/nginx.conf
index 54586d8f8b1..1efa8b9a1f6 100755
--- a/deployment/docker/nginx.conf
+++ b/deployment/docker/nginx.conf
@@ -1,6 +1,8 @@
-worker_processes 1;
+worker_processes auto;
 
-events {worker_connections 1024;}
+events {
+  worker_connections 1024;
+}
 
 http {
   include /etc/nginx/mime.types;
diff --git a/deployment/docker/sandbox/nginx.conf b/deployment/docker/sandbox/nginx.conf
index 66a854e8050..2cc9ce73cf8 100644
--- a/deployment/docker/sandbox/nginx.conf
+++ b/deployment/docker/sandbox/nginx.conf
@@ -1,6 +1,8 @@
-worker_processes 1;
+worker_processes auto;
 
-events {worker_connections 1024;}
+events {
+  worker_connections 1024;
+}
 
 http {
   charset utf-8;
diff --git a/deployment/helm/.gitignore b/deployment/helm/.gitignore
new file mode 100644
index 00000000000..f791801bcae
--- /dev/null
+++ b/deployment/helm/.gitignore
@@ -0,0 +1,2 @@
+charts/
+Chart.lock
diff --git a/deployment/helm/.helmignore b/deployment/helm/.helmignore
new file mode 100644
index 00000000000..d8882204716
--- /dev/null
+++ b/deployment/helm/.helmignore
@@ -0,0 +1,19 @@
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml
new file mode 100644
index 00000000000..0e196dd8f00
--- /dev/null
+++ b/deployment/helm/Chart.yaml
@@ -0,0 +1,36 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+---
+apiVersion: v2
+name: ditto
+description: |
+  Eclipse Ditto™ is a technology in the IoT implementing a software pattern called “digital twins”.
+  A digital twin is a virtual, cloud based, representation of his real world counterpart
+  (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
+type: application
+version: 3.3.0
+appVersion: 3.2.1
+keywords:
+  - iot-chart
+  - digital-twin
+  - IoT
+home: https://www.eclipse.org/ditto
+sources:
+  - https://github.com/eclipse-ditto/ditto
+icon: https://www.eclipse.org/ditto/images/ditto.svg
+maintainers:
+  - name: thjaeckle
+    email: thomas.jaeckle@beyonnex.io
+dependencies:
+  - name: mongodb
+    repository: https://charts.bitnami.com/bitnami
+    version: ^12.x
+    condition: mongodb.enabled
diff --git a/deployment/helm/README.md b/deployment/helm/README.md
index 7a15958ac0f..07943d65a9a 100644
--- a/deployment/helm/README.md
+++ b/deployment/helm/README.md
@@ -1,6 +1,6 @@
 # Eclipse Ditto :: Helm
 
-The Ditto Helm chart is managed at the [Eclipse IoT Packages](https://github.com/eclipse/packages/tree/master/charts/ditto) project.
+The Ditto Helm chart sources are managed here.
 
 ## Install Ditto via Helm Chart
 
@@ -19,3 +19,31 @@ To uninstall/delete the eclipse-ditto deployment:
 ```shell script
 helm delete eclipse-ditto
 ```
+
+# Working locally with the chart
+
+In order to test / develop the chart locally, this section should be of help.
+
+## Testing templating
+For that, no running k8s cluster is necessary - the output will be the rendered k8s deployment descriptors:
+
+```shell
+helm template my-ditto . -f values.yaml -f local-values.yaml --debug
+```
+
+## Installation
+To install the Ditto chart with the name `"my-ditto"`, perform:
+
+```shell
+helm install -f values.yaml -f local-values.yaml my-ditto . --wait
+kubectl port-forward svc/my-ditto-nginx 8080:8080
+```
+
+Now, you can access Ditto on [http://localhost:8080](http://localhost:8080) - have fun.
+
+## Uninstallation
+To uninstall the chart again, perform:
+
+```shell
+helm uninstall my-ditto
+```
diff --git a/deployment/helm/local-values.yaml b/deployment/helm/local-values.yaml
new file mode 100644
index 00000000000..c58ad3f1c86
--- /dev/null
+++ b/deployment/helm/local-values.yaml
@@ -0,0 +1,154 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+---
+# Default values for ditto.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+global:
+  jwtOnly: false
+  basicAuthUsers:
+    ditto:
+      user: ditto
+      password: ditto
+  logging:
+    customConfigFile:
+      enabled: true
+
+## ----------------------------------------------------------------------------
+## policies configuration
+## ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+policies:
+  resources:
+    cpu: 0.2
+    memoryMi: 512
+  jvm:
+    activeProcessorCount: 2
+    heapRamPercentage: 50
+  config:
+    persistence:
+      events:
+        historicalHeadersToPersist:
+        - "ditto-originator"
+        - "ditto-origin"
+        - "correlation-id"
+
+## ----------------------------------------------------------------------------
+## things configuration
+## ref: https://www.eclipse.org/ditto/architecture-services-things.html
+things:
+  resources:
+    cpu: 0.2
+    memoryMi: 512
+  jvm:
+    activeProcessorCount: 2
+    heapRamPercentage: 50
+  config:
+    persistence:
+      events:
+        historicalHeadersToPersist:
+          - "ditto-originator"
+          - "ditto-origin"
+          - "correlation-id"
+
+## ----------------------------------------------------------------------------
+## things-search configuration
+## ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+thingsSearch:
+  resources:
+    cpu: 0.2
+    memoryMi: 512
+  jvm:
+    activeProcessorCount: 2
+    heapRamPercentage: 50
+
+## ----------------------------------------------------------------------------
+## connectivity configuration
+## ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+connectivity:
+  resources:
+    cpu: 0.2
+    memoryMi: 768
+  jvm:
+    activeProcessorCount: 2
+    heapRamPercentage: 55
+
+## ----------------------------------------------------------------------------
+## gateway configuration
+## ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+gateway:
+  resources:
+    cpu: 0.2
+    memoryMi: 512
+  jvm:
+    activeProcessorCount: 2
+    heapRamPercentage: 50
+  config:
+    authentication:
+      enablePreAuthentication: true
+      oauth:
+        openidConnectIssuers:
+         example:
+           issuer: "example.com"
+           authSubjects:
+           - "{{ jwt:sub }}"
+           - "{{ jwt:groups }}"
+      devops:
+        ## this controls whether /devops resource is secured or not
+        secured: true
+        authMethod: "basic"
+        oauth:
+          # configure the amount of clock skew in seconds to tolerate when verifying the local time against the exp and nbf claims
+          allowedClockSkew: 20s
+          openidConnectIssuers:
+           example-ops:
+             issuer: "example.com"
+             authSubjects:
+             - "{{ jwt:sub }}"
+             - "{{ jwt:groups }}"
+        oauthSubjects:
+        - "example-ops:devops-admin"
+        ## this controls whether /status resource is secured or not
+        statusSecured: true
+        statusAuthMethod: "basic"
+        # array of strings for subjects authorized to use "/status" API
+        statusOauthSubjects:
+        - "example-ops:devops-admin"
+
+## ----------------------------------------------------------------------------
+## nginx configuration
+nginx:
+  resources:
+    cpu: 0.1
+    memoryMi: 64
+  initContainers:
+    waitForGateway:
+      enabled: false
+
+## ----------------------------------------------------------------------------
+## mongodb dependency chart configuration
+mongodb:
+  enabled: false
+  resources:
+    limits:
+      cpu: 100m
+      memory: 256Mi
+    requests:
+      cpu: 100m
+      memory: 256Mi
+  readinessProbe:
+    enabled: false
+  livenessProbe:
+    enabled: false
+  auth:
+    enabled: false
+  persistence:
+    enabled: false
diff --git a/deployment/helm/logback-config/connectivity.xml b/deployment/helm/logback-config/connectivity.xml
new file mode 100644
index 00000000000..0d22766ad5c
--- /dev/null
+++ b/deployment/helm/logback-config/connectivity.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023 Contributors to the Eclipse Foundation
+  ~
+  ~ See the NOTICE file(s) distributed with this work for additional
+  ~ information regarding copyright ownership.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License 2.0 which is available at
+  ~ http://www.eclipse.org/legal/epl-2.0
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
+<configuration>
+    <appender name="jsonConsoleAppender" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <excludeMdcKeyName>sourceActorSystem</excludeMdcKeyName>
+            <excludeMdcKeyName>akkaUid</excludeMdcKeyName>
+            <excludeMdcKeyName>akkaTimestamp</excludeMdcKeyName>
+            <mdcKeyFieldName>x-correlation-id=correlation-id</mdcKeyFieldName>
+            <mdcKeyFieldName>connection-id=ditto-connection-id</mdcKeyFieldName>
+            <mdcKeyFieldName>connection-type=ditto-connection-type</mdcKeyFieldName>
+        </encoder>
+    </appender>
+
+    <!-- Do not print INFO cluster messages of mongo driver: -->
+    <logger name="org.mongodb.driver" level="WARN"/>
+
+    <logger name="akka.management.cluster.bootstrap.contactpoint.HttpClusterBootstrapRoutes" level="WARN"/>
+    <logger name="akka.management.cluster.bootstrap.internal.BootstrapCoordinator" level="WARN"/>
+    <logger name="akka.actor.CoordinatedShutdown" level="INFO"/>
+
+    <logger name="org.apache.kafka" level="WARN"/>
+
+    <!-- Log level for the application -->
+    <logger name="org.eclipse.ditto" level="${LOG_LEVEL_APPLICATION:-INFO}"/>
+
+    <root level="${LOG_LEVEL:-INFO}">
+        <appender-ref ref="jsonConsoleAppender"/>
+    </root>
+</configuration>
diff --git a/deployment/helm/logback-config/gateway.xml b/deployment/helm/logback-config/gateway.xml
new file mode 100755
index 00000000000..348e3a63875
--- /dev/null
+++ b/deployment/helm/logback-config/gateway.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023 Contributors to the Eclipse Foundation
+  ~
+  ~ See the NOTICE file(s) distributed with this work for additional
+  ~ information regarding copyright ownership.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License 2.0 which is available at
+  ~ http://www.eclipse.org/legal/epl-2.0
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
+<configuration>
+    <appender name="jsonConsoleAppender" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <excludeMdcKeyName>sourceActorSystem</excludeMdcKeyName>
+            <excludeMdcKeyName>akkaUid</excludeMdcKeyName>
+            <excludeMdcKeyName>akkaTimestamp</excludeMdcKeyName>
+            <mdcKeyFieldName>x-correlation-id=correlation-id</mdcKeyFieldName>
+        </encoder>
+    </appender>
+
+    <!-- Do not print INFO cluster messages of mongo driver: -->
+    <logger name="org.mongodb.driver" level="WARN"/>
+
+    <logger name="akka.management.cluster.bootstrap.contactpoint.HttpClusterBootstrapRoutes" level="WARN"/>
+    <logger name="akka.management.cluster.bootstrap.internal.BootstrapCoordinator" level="WARN"/>
+    <logger name="akka.actor.CoordinatedShutdown" level="INFO"/>
+
+    <!-- Log level for the application -->
+    <logger name="org.eclipse.ditto" level="${LOG_LEVEL_APPLICATION:-INFO}"/>
+
+    <root level="${LOG_LEVEL:-INFO}">
+        <appender-ref ref="jsonConsoleAppender"/>
+    </root>
+</configuration>
diff --git a/deployment/helm/logback-config/policies.xml b/deployment/helm/logback-config/policies.xml
new file mode 100755
index 00000000000..348e3a63875
--- /dev/null
+++ b/deployment/helm/logback-config/policies.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023 Contributors to the Eclipse Foundation
+  ~
+  ~ See the NOTICE file(s) distributed with this work for additional
+  ~ information regarding copyright ownership.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License 2.0 which is available at
+  ~ http://www.eclipse.org/legal/epl-2.0
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
+<configuration>
+    <appender name="jsonConsoleAppender" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <excludeMdcKeyName>sourceActorSystem</excludeMdcKeyName>
+            <excludeMdcKeyName>akkaUid</excludeMdcKeyName>
+            <excludeMdcKeyName>akkaTimestamp</excludeMdcKeyName>
+            <mdcKeyFieldName>x-correlation-id=correlation-id</mdcKeyFieldName>
+        </encoder>
+    </appender>
+
+    <!-- Do not print INFO cluster messages of mongo driver: -->
+    <logger name="org.mongodb.driver" level="WARN"/>
+
+    <logger name="akka.management.cluster.bootstrap.contactpoint.HttpClusterBootstrapRoutes" level="WARN"/>
+    <logger name="akka.management.cluster.bootstrap.internal.BootstrapCoordinator" level="WARN"/>
+    <logger name="akka.actor.CoordinatedShutdown" level="INFO"/>
+
+    <!-- Log level for the application -->
+    <logger name="org.eclipse.ditto" level="${LOG_LEVEL_APPLICATION:-INFO}"/>
+
+    <root level="${LOG_LEVEL:-INFO}">
+        <appender-ref ref="jsonConsoleAppender"/>
+    </root>
+</configuration>
diff --git a/deployment/helm/logback-config/things.xml b/deployment/helm/logback-config/things.xml
new file mode 100755
index 00000000000..348e3a63875
--- /dev/null
+++ b/deployment/helm/logback-config/things.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023 Contributors to the Eclipse Foundation
+  ~
+  ~ See the NOTICE file(s) distributed with this work for additional
+  ~ information regarding copyright ownership.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License 2.0 which is available at
+  ~ http://www.eclipse.org/legal/epl-2.0
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
+<configuration>
+    <appender name="jsonConsoleAppender" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <excludeMdcKeyName>sourceActorSystem</excludeMdcKeyName>
+            <excludeMdcKeyName>akkaUid</excludeMdcKeyName>
+            <excludeMdcKeyName>akkaTimestamp</excludeMdcKeyName>
+            <mdcKeyFieldName>x-correlation-id=correlation-id</mdcKeyFieldName>
+        </encoder>
+    </appender>
+
+    <!-- Do not print INFO cluster messages of mongo driver: -->
+    <logger name="org.mongodb.driver" level="WARN"/>
+
+    <logger name="akka.management.cluster.bootstrap.contactpoint.HttpClusterBootstrapRoutes" level="WARN"/>
+    <logger name="akka.management.cluster.bootstrap.internal.BootstrapCoordinator" level="WARN"/>
+    <logger name="akka.actor.CoordinatedShutdown" level="INFO"/>
+
+    <!-- Log level for the application -->
+    <logger name="org.eclipse.ditto" level="${LOG_LEVEL_APPLICATION:-INFO}"/>
+
+    <root level="${LOG_LEVEL:-INFO}">
+        <appender-ref ref="jsonConsoleAppender"/>
+    </root>
+</configuration>
diff --git a/deployment/helm/logback-config/thingssearch.xml b/deployment/helm/logback-config/thingssearch.xml
new file mode 100755
index 00000000000..348e3a63875
--- /dev/null
+++ b/deployment/helm/logback-config/thingssearch.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023 Contributors to the Eclipse Foundation
+  ~
+  ~ See the NOTICE file(s) distributed with this work for additional
+  ~ information regarding copyright ownership.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License 2.0 which is available at
+  ~ http://www.eclipse.org/legal/epl-2.0
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
+<configuration>
+    <appender name="jsonConsoleAppender" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <excludeMdcKeyName>sourceActorSystem</excludeMdcKeyName>
+            <excludeMdcKeyName>akkaUid</excludeMdcKeyName>
+            <excludeMdcKeyName>akkaTimestamp</excludeMdcKeyName>
+            <mdcKeyFieldName>x-correlation-id=correlation-id</mdcKeyFieldName>
+        </encoder>
+    </appender>
+
+    <!-- Do not print INFO cluster messages of mongo driver: -->
+    <logger name="org.mongodb.driver" level="WARN"/>
+
+    <logger name="akka.management.cluster.bootstrap.contactpoint.HttpClusterBootstrapRoutes" level="WARN"/>
+    <logger name="akka.management.cluster.bootstrap.internal.BootstrapCoordinator" level="WARN"/>
+    <logger name="akka.actor.CoordinatedShutdown" level="INFO"/>
+
+    <!-- Log level for the application -->
+    <logger name="org.eclipse.ditto" level="${LOG_LEVEL_APPLICATION:-INFO}"/>
+
+    <root level="${LOG_LEVEL:-INFO}">
+        <appender-ref ref="jsonConsoleAppender"/>
+    </root>
+</configuration>
diff --git a/deployment/helm/nginx-config/ditto-down.svg b/deployment/helm/nginx-config/ditto-down.svg
new file mode 100644
index 00000000000..679cf25b967
--- /dev/null
+++ b/deployment/helm/nginx-config/ditto-down.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="64px"
+        height="64px"
+        viewBox="0 0 64 64"
+        version="1.1"
+        id="SVGRoot"
+        inkscape:version="0.92.1 r15371"
+        sodipodi:docname="ditto-sandbox-down.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="36.5"
+     inkscape:cy="32"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1600"
+     inkscape:window-height="1137"
+     inkscape:window-x="3832"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true" />
+  <defs
+     id="defs4485" />
+  <metadata
+     id="metadata4488">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <circle
+       style="opacity:1;fill:#3a8c9a;fill-opacity:1;stroke:none;stroke-width:5.99148989;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="path5283"
+       cx="32.187649"
+       cy="32"
+       r="31.999998" />
+    <g
+       id="g6928-2-3"
+       transform="matrix(0.4753937,0,0,0.4753937,-13.450147,-13.637795)"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <g
+         id="g6926-1-4"
+         style="fill:#ffffff;fill-opacity:1">
+        <path
+           id="path6924-2-3"
+           d="m 103.1,128.9 c 0,3.9 -3.2,7.1 -7.1,7.1 -4,0 -7.1,-3.1 -7.1,-7.1 0,-4 3.1,-7.1 7.1,-7.1 3.9,0 7.1,3.2 7.1,7.1 z M 90.9,80.9 V 56 h 10.2 v 24.9 l -2.7,30.7 h -4.9 z"
+           inkscape:connector-curvature="0"
+           style="fill:#ffffff;fill-opacity:1" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/deployment/helm/nginx-config/ditto-up.svg b/deployment/helm/nginx-config/ditto-up.svg
new file mode 100644
index 00000000000..33b074ba859
--- /dev/null
+++ b/deployment/helm/nginx-config/ditto-up.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="64px"
+        height="64px"
+        viewBox="0 0 64 64"
+        version="1.1"
+        id="SVGRoot"
+        inkscape:version="0.92.1 r15371"
+        sodipodi:docname="ditto-sandbox-up.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="36.5"
+     inkscape:cy="32"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1600"
+     inkscape:window-height="1137"
+     inkscape:window-x="3832"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true" />
+  <defs
+     id="defs4485" />
+  <metadata
+     id="metadata4488">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <circle
+       style="opacity:1;fill:#3a8c9a;fill-opacity:1;stroke:none;stroke-width:5.99148989;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="path5283"
+       cx="32.25"
+       cy="32.25"
+       r="31.999998" />
+    <polygon
+       points="129.2,69.2 84,114.3 62.8,93.2 57.2,98.8 84,125.7 134.8,74.8 "
+       id="polygon2339-8-2-8-5-2"
+       style="fill:#ffffff;fill-opacity:1;stroke:#008ecf;stroke-opacity:1"
+       transform="matrix(0.39751555,0,0,0.39751555,-5.911566,-6.488167)" />
+  </g>
+</svg>
diff --git a/deployment/helm/nginx-config/index.html b/deployment/helm/nginx-config/index.html
new file mode 100644
index 00000000000..abed686cd52
--- /dev/null
+++ b/deployment/helm/nginx-config/index.html
@@ -0,0 +1,174 @@
+<!doctype html>
+<html>
+<head>
+  <title>Eclipse Ditto</title>
+
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+
+  <style>
+    body {
+      text-align: center;
+      padding: 150px;
+    }
+
+    h1 {
+      font-size: 50px;
+    }
+
+    body {
+      font: 20px Helvetica, sans-serif;
+      color: #333;
+    }
+
+    article {
+      display: block;
+      text-align: left;
+      width: 750px;
+      margin: 0 auto;
+    }
+
+    a {
+      color: #dc8100;
+      text-decoration: none;
+    }
+
+    a:hover {
+      color: #333;
+      text-decoration: none;
+    }
+
+    .stats {
+      line-height: 3em;
+    }
+
+    .stats-count {
+      font: normal 2em Abel;
+      color: #3a8c9a;
+      font-weight: bold;
+      text-align: center;
+      margin: 5px;
+      clear: left;
+      float: left;
+      width: 5em;
+      background-color: lightgray;
+    }
+
+    .stats-count-text {
+      padding-left: 1em;
+      vertical-align: middle;
+    }
+
+    .health {
+      background-size: contain;
+      height: 30px;
+      width: 30px;
+      float: left;
+    }
+
+    .health-up {
+      background-image: url(ditto-up.svg);
+    }
+
+    .health-down {
+      background-image: url(ditto-down.svg);
+    }
+
+    .health-list li {
+      clear: both;
+      line-height: 30px;
+      padding-bottom: 5px;
+    }
+
+    .health-key {
+      float: left;
+      width: 9em;
+    }
+
+    .health-status {
+      line-height: 30px;
+      padding-left: 1em;
+    }
+  </style>
+</head>
+<body>
+
+<article>
+  <h1>Eclipse Ditto</h1>
+  <div>
+    <p>From here, you can:
+    <ul>
+      <li><a href="./ui/">visit the Eclipse Ditto™ UI to administer Ditto</a></li>
+      <li><a href="./apidoc/">interactively explore the Eclipse Ditto™ OpenAPI documentation</a></li>
+    </ul>
+  </div>
+  <h2 style="clear: both">Health</h2>
+  <div id="health-content">
+  </div>
+  <h2>Statistics</h2>
+  <div>
+    <div class="stats">
+      <span id="total-things-count" class="stats-count"></span><span
+      class="stats-count-text"> persisted <em>Things</em></span>
+    </div>
+    <div class="stats">
+      <span id="hot-things-count" class="stats-count"></span><span class="stats-count-text"> currently "hot" <em>Things</em> (loaded in memory)</span>
+    </div>
+  </div>
+</article>
+
+<script>
+  function update_count(selector, count) {
+    $(selector).animate({
+                          counter: count
+                        }, {
+                          duration: 3000,
+                          easing: 'swing',
+                          step: function (now) {
+                            $(this).text(Math.ceil(now));
+                          }
+                        });
+  }
+
+  function calcHealthStatusClass(status) {
+    let healthStatusClass;
+    if (status === "UP") {
+      healthStatusClass = "health-up";
+    } else if (status === "DOWN") {
+      healthStatusClass = "health-down";
+    } else {
+      healthStatusClass = "health-down";
+    }
+    return healthStatusClass;
+  }
+
+  function calculateHealth(data) {
+    let overallStatus = data.status;
+    $(`<p>
+            <span class="health-key"></span>
+            <span class="health ${calcHealthStatusClass(overallStatus)}"></span>
+            <span class="health-status">${overallStatus}</span>
+        </p>`).appendTo("#health-content");
+  }
+
+  $.getJSON("./stats/search", function (data) {
+    let allThingsCount = data.allThingsCount;
+    update_count('#total-things-count', allThingsCount);
+  }).fail(function () {
+    update_count('#total-things-count', 0);
+  });
+  $.getJSON("./stats/things", function (data) {
+    let hotThings = data.hotThings;
+    update_count('#hot-things-count', hotThings);
+  }).fail(function () {
+    update_count('#hot-things-count', 0);
+  });
+  $.getJSON("./health", function (data) {
+    calculateHealth(data);
+  }).fail(function (jqXHR, textStatus, errorThrown) {
+    calculateHealth(jqXHR.responseJSON);
+  })
+</script>
+
+</body>
+</html>
+
diff --git a/deployment/helm/nginx-config/nginx-cors.conf b/deployment/helm/nginx-config/nginx-cors.conf
new file mode 100644
index 00000000000..f9ed9330776
--- /dev/null
+++ b/deployment/helm/nginx-config/nginx-cors.conf
@@ -0,0 +1,39 @@
+#
+# CORS header support
+#
+# As of Nginx 1.7.5, add_header supports an "always" parameter which
+# allows CORS to work if the backend returns 4xx or 5xx status code.
+#
+# For more information on CORS, please see: http://enable-cors.org/
+# From this Gist: https://gist.github.com/Stanback/7145487
+# And this: https://gist.github.com/pauloricardomg/7084524
+#
+
+set $cors '1';
+
+# OPTIONS indicates a CORS pre-flight request
+if ($request_method = 'OPTIONS') {
+  set $cors "${cors}o";
+}
+
+if ($cors = '1') {
+  add_header 'Access-Control-Allow-Origin' '$http_origin' always;
+  add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, DELETE, OPTIONS' always;
+  add_header 'Access-Control-Allow-Credentials' 'true' always;
+  add_header 'Access-Control-Allow-Headers' '$http_access_control_request_headers' always;
+  add_header 'Access-Control-Expose-Headers' '*' always;
+}
+
+# OPTIONS (pre-flight) request from allowed CORS domain. return response directly
+if ($cors = '1o') {
+  # Tell client that this pre-flight info is valid for 20 days
+  add_header 'Access-Control-Max-Age' 1728000;
+  add_header 'Access-Control-Allow-Origin' '$http_origin' always;
+  add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, DELETE, OPTIONS' always;
+  add_header 'Access-Control-Allow-Credentials' 'true' always;
+  add_header 'Access-Control-Allow-Headers' '$http_access_control_request_headers' always;
+  add_header 'Access-Control-Expose-Headers' '*' always;
+  add_header 'Content-Type' 'text/plain charset=UTF-8';
+  add_header 'Content-Length' 0;
+  return 200;
+}
diff --git a/deployment/helm/swaggerui-config/index.html b/deployment/helm/swaggerui-config/index.html
new file mode 100644
index 00000000000..460d0fe7bc6
--- /dev/null
+++ b/deployment/helm/swaggerui-config/index.html
@@ -0,0 +1,74 @@
+<!-- HTML for static distribution bundle build -->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Eclipse Ditto - HTTP API</title>
+    <link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
+    <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
+    <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
+    <style>
+        html
+        {
+            box-sizing: border-box;
+            overflow: -moz-scrollbars-vertical;
+            overflow-y: scroll;
+        }
+        *,
+        *:before,
+        *:after
+        {
+            box-sizing: inherit;
+        }
+
+        body {
+            margin:0;
+            background: #fafafa;
+        }
+
+        #swagger-ui .swagger-ui.swagger-container .topbar {
+        }
+
+        #swagger-ui .swagger-ui.swagger-container .topbar .topbar-wrapper a {
+            display: none;
+        }
+    </style>
+</head>
+
+<body>
+
+<div id="swagger-ui"></div>
+
+<script src="./swagger-ui-bundle.js"> </script>
+<script src="./swagger-ui-standalone-preset.js"> </script>
+<script>
+    window.onload = function() {
+
+        const ui = SwaggerUIBundle({
+                                       urls: [
+                                           {url: "./openapi/ditto-api-2.yml", name:"Ditto API v2"}
+                                       ],
+                                       "urls.primaryName": "Ditto API v2",
+                                       validatorUrl: null,
+                                       docExpansion: "none",
+                                       dom_id: '#swagger-ui',
+                                       deepLinking: true,
+                                       presets: [
+                                           SwaggerUIBundle.presets.apis,
+                                           SwaggerUIStandalonePreset
+                                       ],
+                                       plugins: [
+                                           SwaggerUIBundle.plugins.DownloadUrl
+                                       ],
+                                       layout: "StandaloneLayout",
+                                       oauth2RedirectUrl: window.location.origin + "./oauth2-redirect.html",
+                                       onComplete: function () {
+                                       }
+                                   });
+        window.ui = ui;
+    }
+</script>
+</body>
+
+</html>
+
diff --git a/deployment/helm/templates/NOTES.txt b/deployment/helm/templates/NOTES.txt
new file mode 100644
index 00000000000..1b2fcbce4be
--- /dev/null
+++ b/deployment/helm/templates/NOTES.txt
@@ -0,0 +1,33 @@
+Eclipse Ditto successfully installed!
+
+{{- if ( not .Values.openshift.routes.enabled ) }}
+Access Ditto in your browser (http://localhost:8080) by running:
+
+    kubectl --namespace {{ .Release.Namespace }} port-forward svc/{{ include "ditto.fullname" . }}-nginx 8080:8080
+
+The /status resource can be accessed by:
+
+    export STATUS_PWD=$(kubectl --namespace {{ .Release.Namespace }} get secret {{ include "ditto.fullname" . }}-gateway-secret -o jsonpath="{.data.status-password}" | base64 --decode)
+    curl -i -X GET "http://devops:${STATUS_PWD}@localhost:8080/status"
+
+The /devops resource can be accessed by:
+
+    export DEVOPS_PWD=$(kubectl --namespace {{ .Release.Namespace }} get secret {{ include "ditto.fullname" . }}-gateway-secret -o jsonpath="{.data.devops-password}" | base64 --decode)
+    curl -i -X GET "http://devops:${DEVOPS_PWD}@localhost:8080/devops"
+{{- else -}}
+Access Ditto in your browser, get the URL with:
+
+    echo https://$(kubectl --namespace {{ .Release.Namespace }} get route {{ include "ditto.fullname" . }} -o jsonpath="{.status.ingress[0].host}")
+
+The /status resource can be accessed by:
+
+    export STATUS_PWD=$(kubectl --namespace {{ .Release.Namespace }} get secret {{ include "ditto.fullname" . }}-gateway-secret -o jsonpath="{.data.status-password}" | base64 --decode)
+    export URL=https://devops:${STATUS_PWD}@$(kubectl --namespace {{ .Release.Namespace }} get route {{ include "ditto.fullname" . }} -o jsonpath="{.status.ingress[0].host}")
+    curl -i -X GET "$URL/status"
+
+The /devops resource can be accessed by:
+
+    export DEVOPS_PWD=$(kubectl --namespace {{ .Release.Namespace }} get secret {{ include "ditto.fullname" . }}-gateway-secret -o jsonpath="{.data.devops-password}" | base64 --decode)
+    export URL=https://devops:${DEVOPS_PWD}@$(kubectl --namespace {{ .Release.Namespace }} get route {{ include "ditto.fullname" . }} -o jsonpath="{.status.ingress[0].host}")
+    curl -i -X GET "$URL/devops"
+{{- end }}
diff --git a/deployment/helm/templates/_helpers.tpl b/deployment/helm/templates/_helpers.tpl
new file mode 100644
index 00000000000..8ba1d57081f
--- /dev/null
+++ b/deployment/helm/templates/_helpers.tpl
@@ -0,0 +1,72 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "ditto.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "ditto.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "ditto.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "ditto.labels" -}}
+helm.sh/chart: {{ include "ditto.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "ditto.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "ditto.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create a fully qualified MongoDB server name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "ditto.mongodb.fullname" -}}
+{{- if .Values.mongodb.fullnameOverride -}}
+{{- .Values.mongodb.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default "mongodb" .Values.mongodb.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/deployment/helm/templates/connectivity-deployment.yaml b/deployment/helm/templates/connectivity-deployment.yaml
new file mode 100644
index 00000000000..b644969b478
--- /dev/null
+++ b/deployment/helm/templates/connectivity-deployment.yaml
@@ -0,0 +1,323 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.connectivity.enabled -}}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "ditto.fullname" . }}-connectivity
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.connectivity.replicaCount }}
+  strategy:
+  {{- with .Values.connectivity.updateStrategy }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  minReadySeconds: {{ .Values.connectivity.minReadySeconds }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        actorSystemName: {{ .Values.akka.actorSystemName }}
+        {{- with .Values.connectivity.additionalLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- if .Values.global.prometheus.enabled }}
+        prometheus.io/scrape: "true"
+        prometheus.io/path: "{{ .Values.global.prometheus.path }}"
+        prometheus.io/port: "{{ .Values.global.prometheus.port }}"
+        {{- end }}
+        checksum/mongodb-config: {{ include (print $.Template.BasePath "/mongodb-secret.yaml") . | sha256sum }}
+        {{- with .Values.connectivity.additionalAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- if .Values.rbac.enabled }}
+      serviceAccountName: {{ template "ditto.serviceAccountName" . }}
+      {{- end }}
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      securityContext:
+        fsGroup: 1000
+      initContainers:
+        {{- if .Values.global.logging.logFiles.enabled }}
+        - name: change-volume-owner
+          image: busybox
+          securityContext:
+            runAsUser: 0
+          command: [ "sh", "-c", "chown -R 1000:1000 /var/log/ditto && echo 'changed ownership of /var/log/ditto to 1000:1000'" ]
+          volumeMounts:
+            - name: ditto-log-files-directory
+              mountPath: /var/log/ditto
+        {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}-connectivity
+          image: {{ printf "%s:%s" .Values.connectivity.image.repository ( default .Chart.AppVersion ( default .Values.dittoTag .Values.connectivity.image.tag ) ) }}
+          imagePullPolicy: {{ .Values.connectivity.image.pullPolicy }}
+          env:
+            {{- if not .Values.global.logging.customConfigFile.enabled }}
+            - name: DITTO_LOGGING_DISABLE_SYSOUT_LOG
+              value: "{{ if .Values.global.logging.sysout.enabled }}false{{ else }}true{{ end }}"
+            - name: DITTO_LOGGING_FILE_APPENDER
+              value: "{{ if .Values.global.logging.logFiles.enabled }}true{{ else }}false{{ end }}"
+            {{- end }}
+            - name: DITTO_TRACING_ENABLED
+              value: "{{ .Values.global.tracing.enabled }}"
+            - name: OTEL_EXPORTER_OTLP_ENDPOINT
+              value: "{{ .Values.global.tracing.otelExporterOtlpEndpoint }}"
+            - name: DITTO_TRACING_SAMPLER
+              value: "{{ .Values.global.tracing.sampler }}"
+            - name: DITTO_TRACING_RANDOM_SAMPLER_PROBABILITY
+              value: "{{ .Values.global.tracing.randomSampler.probability }}"
+            - name: DITTO_TRACING_ADAPTIVE_SAMPLER_THROUGHPUT
+              value: "{{ .Values.global.tracing.adaptiveSampler.throughput }}"
+            {{- if .Values.global.logging.logstash.enabled }}
+            - name: DITTO_LOGGING_LOGSTASH_SERVER
+              value: "{{ .Values.global.logging.logstash.endpoint }}"
+            {{- end }}
+            - name: POD_LABEL_SELECTOR
+              value: "app.kubernetes.io/name=%s"
+            - name: POD_NAMESPACE
+              value: {{ .Release.Namespace }}
+            - name: INSTANCE_INDEX
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.name
+            - name: HOSTNAME
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: DISCOVERY_METHOD
+              value: "kubernetes-api"
+            - name: TZ
+              value: "{{ .Values.global.timezone }}"
+            - name: JAVA_TOOL_OPTIONS
+              value: >
+                {{ .Values.global.jvmOptions }}
+                -XX:ActiveProcessorCount={{ .Values.connectivity.jvm.activeProcessorCount }}
+                -XX:MaxRAMPercentage={{ .Values.connectivity.jvm.heapRamPercentage }}
+                -XX:InitialRAMPercentage={{ .Values.connectivity.jvm.heapRamPercentage }}
+                -XX:MaxGCPauseMillis={{ .Values.connectivity.jvm.maxGcPauseMillis }}
+                {{ .Values.connectivity.additionalJvmOptions }}
+                {{- .Values.global.akkaOptions }}
+                {{- if .Values.global.logging.customConfigFile.enabled }}
+                -Dlogback.configurationFile=/opt/ditto/{{ .Values.global.logging.customConfigFile.fileName }}
+                {{- end }}
+                {{- range $index, $header := .Values.connectivity.config.persistence.events.historicalHeadersToPersist }}
+                "{{ printf "%s%d=%s" "-Dditto.connectivity.connection.event.historical-headers-to-persist." $index $header }}"
+                {{- end }}
+                {{ join " " .Values.connectivity.systemProps }}
+            - name: MONGO_DB_SSL_ENABLED
+              value: "{{ if .Values.dbconfig.connectivity.ssl }}true{{ else }}false{{ end }}"
+            - name: MONGO_DB_URI
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.dbconfig.uriSecret | default ( printf "%s-mongodb-secret" ( include "ditto.fullname" . )) }}
+                  key: connectivity-uri
+            - name: MONGO_DB_CONNECTION_MIN_POOL_SIZE
+              value: "{{ .Values.connectivity.config.mongodb.minPoolSize }}"
+            - name: MONGO_DB_CONNECTION_POOL_SIZE
+              value: "{{ .Values.connectivity.config.mongodb.maxPoolSize }}"
+            - name: MONGO_DB_CONNECTION_POOL_IDLE_TIME
+              value: "{{ .Values.connectivity.config.mongodb.maxPoolIdleTime }}"
+            - name: CLUSTER_BS_REQUIRED_CONTACTS
+              value: "{{ .Values.global.cluster.requiredContactPoints }}"
+            - name: DITTO_DDATA_NUMBER_OF_SHARDS
+              value: "{{ .Values.global.cluster.ddata.numberOfShards }}"
+            - name: DITTO_DDATA_MAX_DELTA_ELEMENTS
+              value: "{{ .Values.global.cluster.ddata.maxDeltaElements }}"
+            - name: CLUSTER_NUMBER_OF_SHARDS
+              value: "{{ .Values.global.cluster.numberOfShards }}"
+            - name: CLUSTER_DOWNING_STABLE_AFTER
+              value: "{{ .Values.global.cluster.downingStableAfter }}"
+            - name: CLUSTER_DOWNING_DOWN_ALL_WHEN_UNSTABLE
+              value: "{{ .Values.global.cluster.downAllWhenUnstable }}"
+            {{- if .Values.global.prometheus.enabled }}
+            - name: PROMETHEUS_PORT
+              value: "{{ .Values.global.prometheus.port }}"
+            {{- end }}
+            - name: AKKA_PERSISTENCE_MONGO_JOURNAL_WRITE_CONCERN
+              value: "{{ .Values.connectivity.config.mongodb.journalWriteConcern }}"
+            - name: AKKA_PERSISTENCE_MONGO_SNAPS_WRITE_CONCERN
+              value: "{{ .Values.connectivity.config.mongodb.snapsWriteConcern }}"
+            - name: BREAKER_MAXTRIES
+              value: "{{ .Values.connectivity.config.mongodb.journalCircuitBreaker.maxTries }}"
+            - name: BREAKER_TIMEOUT
+              value: "{{ .Values.connectivity.config.mongodb.journalCircuitBreaker.timeout }}"
+            - name: BREAKER_RESET
+              value: "{{ .Values.connectivity.config.mongodb.journalCircuitBreaker.reset }}"
+            - name: SNAPSHOT_BREAKER_MAXTRIES
+              value: "{{ .Values.connectivity.config.mongodb.snapsCircuitBreaker.maxTries }}"
+            - name: SNAPSHOT_BREAKER_TIMEOUT
+              value: "{{ .Values.connectivity.config.mongodb.snapsCircuitBreaker.timeout }}"
+            - name: SNAPSHOT_BREAKER_RESET
+              value: "{{ .Values.connectivity.config.mongodb.snapsCircuitBreaker.reset }}"
+            - name: CONNECTION_ACTIVITY_CHECK_INTERVAL
+              value: "{{ .Values.connectivity.config.persistence.activityCheckInterval }}"
+            - name: HEALTH_CHECK_METRICS_REPORTER_RESOLUTION
+              value: "{{ .Values.connectivity.config.cleanup.metricsReporter.resolution }}"
+            - name: HEALTH_CHECK_METRICS_REPORTER_HISTORY
+              value: "{{ .Values.connectivity.config.cleanup.metricsReporter.history }}"
+            - name: CLEANUP_ENABLED
+              value: "{{ .Values.connectivity.config.cleanup.enabled }}"
+            - name: CLEANUP_QUIET_PERIOD
+              value: "{{ .Values.connectivity.config.cleanup.quietPeriod }}"
+            - name: CLEANUP_HISTORY_RETENTION_DURATION
+              value: "{{ .Values.connectivity.config.cleanup.history.retentionDuration }}"
+            - name: CLEANUP_INTERVAL
+              value: "{{ .Values.connectivity.config.cleanup.interval }}"
+            - name: CLEANUP_TIMER_THRESHOLD
+              value: "{{ .Values.connectivity.config.cleanup.timerThreshold }}"
+            - name: CLEANUP_CREDITS_PER_BATCH
+              value: "{{ .Values.connectivity.config.cleanup.creditsPerBatch }}"
+            - name: CONNECTION_SNAPSHOT_INTERVAL
+              value: "{{ .Values.connectivity.config.persistence.snapshots.interval }}"
+            - name: CONNECTION_SNAPSHOT_THRESHOLD
+              value: "{{ .Values.connectivity.config.persistence.snapshots.threshold }}"
+            - name: DITTO_POLICIES_ENFORCER_CACHE_ENABLED
+              value: "{{ .Values.connectivity.config.policiesEnforcer.cache.enabled }}"
+            - name: DITTO_POLICIES_ENFORCER_CACHE_MAX_SIZE
+              value: "{{ .Values.connectivity.config.policiesEnforcer.cache.maxSize }}"
+            - name: DITTO_POLICIES_ENFORCER_CACHE_EXPIRE_AFTER_WRITE
+              value: "{{ .Values.connectivity.config.policiesEnforcer.cache.expireAfterWrite }}"
+            - name: DITTO_POLICIES_ENFORCER_CACHE_EXPIRE_AFTER_ACCESS
+              value: "{{ .Values.connectivity.config.policiesEnforcer.cache.expireAfterAccess }}"
+            - name: RECONNECT_RATE_FREQUENCY
+              value: "{{ .Values.connectivity.config.connections.reconnect.rate.frequency }}"
+            - name: RECONNECT_RATE_ENTITIES
+              value: "{{ .Values.connectivity.config.connections.reconnect.rate.entities }}"
+            - name: CONNECTIVITY_CONNECTION_ALLOWED_HOSTNAMES
+              value: "{{ .Values.connectivity.config.connections.allowedHostnames }}"
+            - name: CONNECTIVITY_CONNECTION_BLOCKED_HOSTNAMES
+              value: "{{ .Values.connectivity.config.connections.blockedHostnames }}"
+            - name: CONNECTIVITY_CONNECTION_BLOCKED_SUBNETS
+              value: "{{ .Values.connectivity.config.connections.blockedSubnets }}"
+            - name: CONNECTIVITY_CONNECTION_BLOCKED_HOST_REGEX
+              value: "{{ .Values.connectivity.config.connections.blockedHostRegex }}"
+            - name: CONNECTION_SOURCE_NUMBER
+              value: "{{ .Values.connectivity.config.connections.limits.maxSources }}"
+            - name: CONNECTION_TARGET_NUMBER
+              value: "{{ .Values.connectivity.config.connections.limits.maxTargets }}"
+            - name: CONNECTIVITY_SIGNAL_ENRICHMENT_BUFFER_SIZE
+              value: "{{ .Values.connectivity.config.connections.enrichment.bufferSize }}"
+            - name: KAFKA_CONSUMER_THROTTLING_ENABLED
+              value: "{{ .Values.connectivity.config.connections.kafka.consumer.throttling.enabled }}"
+            - name: KAFKA_CONSUMER_THROTTLING_INTERVAL
+              value: "{{ .Values.connectivity.config.connections.kafka.consumer.throttling.interval }}"
+            - name: KAFKA_CONSUMER_THROTTLING_LIMIT
+              value: "{{ .Values.connectivity.config.connections.kafka.consumer.throttling.limit }}"
+            - name: KAFKA_CONSUMER_THROTTLING_MAX_IN_FLIGHT_FACTOR
+              value: "{{ .Values.connectivity.config.connections.kafka.consumer.throttling.maxInflightFactor }}"
+            - name: KAFKA_PRODUCER_QUEUE_SIZE
+              value: "{{ .Values.connectivity.config.connections.kafka.producer.queueSize }}"
+            - name: KAFKA_PRODUCER_PARALLELISM
+              value: "{{ .Values.connectivity.config.connections.kafka.producer.parallelism }}"
+            {{- if .Values.connectivity.extraEnv }}
+              {{- toYaml .Values.connectivity.extraEnv | nindent 12 }}
+            {{- end }}
+          ports:
+            - name: remoting
+              containerPort: {{ .Values.akka.remoting.port }}
+              protocol: TCP
+            - name: management
+              containerPort: {{ .Values.akka.mgmthttp.port }}
+              protocol: TCP
+            {{- if .Values.global.prometheus.enabled }}
+            - name: prometheus
+              protocol: TCP
+              containerPort: {{ .Values.global.prometheus.port }}
+            {{- end }}
+          readinessProbe:
+            httpGet:
+              port: management
+              path: /ready
+            initialDelaySeconds: {{ .Values.connectivity.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.connectivity.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.connectivity.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.connectivity.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.connectivity.readinessProbe.failureThreshold }}
+          livenessProbe:
+            httpGet:
+              port: management
+              path: /alive
+            initialDelaySeconds: {{ .Values.connectivity.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.connectivity.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.connectivity.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.connectivity.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.connectivity.livenessProbe.failureThreshold }}
+          volumeMounts:
+            {{- if .Values.global.logging.customConfigFile.enabled }}
+            - name: ditto-custom-log-config
+              mountPath: /opt/ditto/{{ .Values.global.logging.customConfigFile.fileName }}
+              subPath: {{ .Values.global.logging.customConfigFile.fileName }}
+            {{- end }}
+            {{- if .Values.global.logging.logFiles.enabled }}
+            - name: ditto-log-files-directory
+              mountPath: /var/log/ditto
+            {{- end }}
+          resources:
+            requests:
+              cpu: {{ mulf .Values.connectivity.resources.cpu 1000 }}m
+              memory: {{ .Values.connectivity.resources.memoryMi }}Mi
+            limits:
+              # ## no cpu limit to avoid CFS scheduler limits
+              # ref: https://doc.akka.io/docs/akka/snapshot/additional/deploy.html#in-kubernetes
+              # cpu: ""
+              memory: {{ .Values.connectivity.resources.memoryMi }}Mi
+          {{- if .Values.openshift.enabled }}
+          {{- with .Values.openshift.securityContext }}
+          securityContext:
+            {{- toYaml . | nindent 8 }}
+          {{- end }}
+          {{- else }}
+          securityContext:
+            runAsNonRoot: true
+            runAsUser: 1000
+            runAsGroup: 1000
+            allowPrivilegeEscalation: false
+          {{- end }}
+      {{- with .Values.connectivity.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.connectivity.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.connectivity.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+        {{- if .Values.global.logging.customConfigFile.enabled }}
+        - name: ditto-custom-log-config
+          configMap:
+            name: {{ .Release.Name }}-logback-config-connectivity-xml
+        {{- end }}
+        {{- if .Values.global.logging.logFiles.enabled }}
+        - name: ditto-log-files-directory
+          hostPath:
+            path: /var/log/ditto
+            type: DirectoryOrCreate
+        {{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/connectivity-networkpolicy.yaml b/deployment/helm/templates/connectivity-networkpolicy.yaml
new file mode 100644
index 00000000000..81c57ee2bd5
--- /dev/null
+++ b/deployment/helm/templates/connectivity-networkpolicy.yaml
@@ -0,0 +1,42 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.connectivity.networkPolicy.enabled }}
+---
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-connectivity
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  policyTypes:
+  - Ingress
+  - Egress
+  ingress:
+  # Allow inner cluster communication
+  - from:
+    - podSelector:
+        matchLabels:
+          actorSystemName: {{ .Values.akka.actorSystemName }}
+    ports:
+    - protocol: TCP
+      port: {{ .Values.akka.remoting.port }}
+    - protocol: TCP
+      port: {{ .Values.akka.mgmthttp.port }}
+  # Open all egress
+  egress:
+  - {}
+{{- end }}
diff --git a/deployment/helm/templates/connectivity-pdb.yaml b/deployment/helm/templates/connectivity-pdb.yaml
new file mode 100644
index 00000000000..c33ebbdee52
--- /dev/null
+++ b/deployment/helm/templates/connectivity-pdb.yaml
@@ -0,0 +1,26 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if and .Values.connectivity.podDisruptionBudget.enabled (gt .Values.connectivity.replicaCount 1.0) -}}
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "ditto.fullname" . }}-connectivity
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  minAvailable: {{ .Values.connectivity.podDisruptionBudget.minAvailable }}
+{{- end }}
diff --git a/deployment/helm/templates/connectivity-podmonitor.yaml b/deployment/helm/templates/connectivity-podmonitor.yaml
new file mode 100644
index 00000000000..d133f138215
--- /dev/null
+++ b/deployment/helm/templates/connectivity-podmonitor.yaml
@@ -0,0 +1,38 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if and .Values.connectivity.podMonitor.enabled .Values.global.prometheus.port -}}
+{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" -}}
+---
+kind: PodMonitor
+apiVersion: monitoring.coreos.com/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-connectivity
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podMetricsEndpoints:
+  - targetPort: {{ .Values.global.prometheus.port }}
+    path: "/"
+    {{- if .Values.connectivity.podMonitor.interval }}
+    interval: {{ .Values.connectivity.podMonitor.interval }}
+    {{- end }}
+    {{- if .Values.connectivity.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ .Values.connectivity.podMonitor.scrapeTimeout }}
+    {{- end }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
+  namespaceSelector:
+    matchNames:
+      - {{ $.Release.Namespace | quote }}
+{{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/dittoui-deployment.yaml b/deployment/helm/templates/dittoui-deployment.yaml
new file mode 100644
index 00000000000..6cace32316a
--- /dev/null
+++ b/deployment/helm/templates/dittoui-deployment.yaml
@@ -0,0 +1,66 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.dittoui.enabled -}}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "ditto.fullname" . }}-dittoui
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.dittoui.replicaCount }}
+  strategy:
+  {{- with .Values.dittoui.updateStrategy }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        {{- with .Values.dittoui.additionalLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- with .Values.dittoui.additionalAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}-dittoui
+          image: {{ printf "%s:%s" .Values.dittoui.image.repository ( default .Chart.AppVersion ( default .Values.dittoTag .Values.dittoui.image.tag ) ) }}
+          imagePullPolicy: {{ .Values.dittoui.image.pullPolicy }}
+          env:
+            {{- if .Values.dittoui.extraEnv }}
+              {{- toYaml .Values.dittoui.extraEnv | nindent 12 }}
+            {{- end }}
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+          resources:
+            requests:
+              cpu: {{ mulf .Values.dittoui.resources.cpu 1000 }}m
+              memory: {{ .Values.dittoui.resources.memoryMi }}Mi
+            limits:
+              # cpu: ""
+              memory: {{ .Values.dittoui.resources.memoryMi }}Mi
+{{- end }}
diff --git a/deployment/helm/templates/dittoui-networkpolicy.yaml b/deployment/helm/templates/dittoui-networkpolicy.yaml
new file mode 100644
index 00000000000..98010824eeb
--- /dev/null
+++ b/deployment/helm/templates/dittoui-networkpolicy.yaml
@@ -0,0 +1,36 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.dittoui.networkPolicy.enabled -}}
+---
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-dittoui
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  policyTypes:
+  - Ingress
+  ingress:
+  - from:
+    - podSelector:
+        matchLabels:
+          app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+          app.kubernetes.io/instance: {{ .Release.Name }}
+    ports:
+    - protocol: TCP
+      port: 8080
+{{- end }}
diff --git a/deployment/helm/templates/dittoui-pdb.yaml b/deployment/helm/templates/dittoui-pdb.yaml
new file mode 100644
index 00000000000..e3a5a6e52bf
--- /dev/null
+++ b/deployment/helm/templates/dittoui-pdb.yaml
@@ -0,0 +1,26 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if and .Values.dittoui.podDisruptionBudget.enabled (gt .Values.dittoui.replicaCount 1.0) -}}
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "ditto.fullname" . }}-dittoui
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  minAvailable: {{ .Values.dittoui.podDisruptionBudget.minAvailable }}
+{{- end }}
diff --git a/deployment/helm/templates/dittoui-service.yaml b/deployment/helm/templates/dittoui-service.yaml
new file mode 100644
index 00000000000..f640c4a8c15
--- /dev/null
+++ b/deployment/helm/templates/dittoui-service.yaml
@@ -0,0 +1,33 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.dittoui.enabled -}}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "ditto.fullname" . }}-dittoui
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
+{{ include "ditto.labels" . | indent 4 }}
+  {{- with .Values.dittoui.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  ports:
+    - port: {{ .Values.dittoui.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
+    app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
diff --git a/deployment/helm/templates/gateway-deployment.yaml b/deployment/helm/templates/gateway-deployment.yaml
new file mode 100644
index 00000000000..51f6536124d
--- /dev/null
+++ b/deployment/helm/templates/gateway-deployment.yaml
@@ -0,0 +1,293 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.gateway.enabled -}}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "ditto.fullname" . }}-gateway
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.gateway.replicaCount }}
+  strategy:
+  {{- with .Values.gateway.updateStrategy }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  minReadySeconds: {{ .Values.gateway.minReadySeconds }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        actorSystemName: {{ .Values.akka.actorSystemName }}
+        {{- with .Values.gateway.additionalLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- if .Values.global.prometheus.enabled }}
+        prometheus.io/scrape: "true"
+        prometheus.io/path: "{{ .Values.global.prometheus.path }}"
+        prometheus.io/port: "{{ .Values.global.prometheus.port }}"
+        {{- end }}
+        checksum/password-config: {{ include (print $.Template.BasePath "/gateway-secret.yaml") . | sha256sum }}
+        checksum/mongodb-config: {{ include (print $.Template.BasePath "/mongodb-secret.yaml") . | sha256sum }}
+        {{- with .Values.gateway.additionalAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- if .Values.rbac.enabled }}
+      serviceAccountName: {{ template "ditto.serviceAccountName" . }}
+      {{- end }}
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      securityContext:
+        fsGroup: 1000
+      initContainers:
+        {{- if .Values.global.logging.logFiles.enabled }}
+        - name: change-volume-owner
+          image: busybox
+          securityContext:
+            runAsUser: 0
+          command: [ "sh", "-c", "chown -R 1000:1000 /var/log/ditto && echo 'changed ownership of /var/log/ditto to 1000:1000'" ]
+          volumeMounts:
+            - name: ditto-log-files-directory
+              mountPath: /var/log/ditto
+        {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}-gateway
+          image: {{ printf "%s:%s" .Values.gateway.image.repository ( default .Chart.AppVersion ( default .Values.dittoTag .Values.gateway.image.tag ) ) }}
+          imagePullPolicy: {{ .Values.gateway.image.pullPolicy }}
+          env:
+            {{- if not .Values.global.logging.customConfigFile.enabled }}
+            - name: DITTO_LOGGING_DISABLE_SYSOUT_LOG
+              value: "{{ if .Values.global.logging.sysout.enabled }}false{{ else }}true{{ end }}"
+            - name: DITTO_LOGGING_FILE_APPENDER
+              value: "{{ if .Values.global.logging.logFiles.enabled }}true{{ else }}false{{ end }}"
+            {{- end }}
+            - name: DITTO_TRACING_ENABLED
+              value: "{{ .Values.global.tracing.enabled }}"
+            - name: OTEL_EXPORTER_OTLP_ENDPOINT
+              value: "{{ .Values.global.tracing.otelExporterOtlpEndpoint }}"
+            - name: DITTO_TRACING_SAMPLER
+              value: "{{ .Values.global.tracing.sampler }}"
+            - name: DITTO_TRACING_RANDOM_SAMPLER_PROBABILITY
+              value: "{{ .Values.global.tracing.randomSampler.probability }}"
+            - name: DITTO_TRACING_ADAPTIVE_SAMPLER_THROUGHPUT
+              value: "{{ .Values.global.tracing.adaptiveSampler.throughput }}"
+            {{- if .Values.global.logging.logstash.enabled }}
+            - name: DITTO_LOGGING_LOGSTASH_SERVER
+              value: "{{ .Values.global.logging.logstash.endpoint }}"
+            {{- end }}
+            - name: POD_LABEL_SELECTOR
+              value: "app.kubernetes.io/name=%s"
+            - name: POD_NAMESPACE
+              value: {{ .Release.Namespace }}
+            - name: INSTANCE_INDEX
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.name
+            - name: HOSTNAME
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: DISCOVERY_METHOD
+              value: "kubernetes-api"
+            - name: TZ
+              value: "{{ .Values.global.timezone }}"
+            - name: JAVA_TOOL_OPTIONS
+              value: >
+                {{ .Values.global.jvmOptions }}
+                -XX:ActiveProcessorCount={{ .Values.gateway.jvm.activeProcessorCount }}
+                -XX:MaxRAMPercentage={{ .Values.gateway.jvm.heapRamPercentage }}
+                -XX:InitialRAMPercentage={{ .Values.gateway.jvm.heapRamPercentage }}
+                -XX:MaxGCPauseMillis={{ .Values.gateway.jvm.maxGcPauseMillis }}
+                {{ .Values.gateway.additionalJvmOptions }}
+                {{- .Values.global.akkaOptions }}
+                {{- if .Values.global.logging.customConfigFile.enabled }}
+                -Dlogback.configurationFile=/opt/ditto/{{ .Values.global.logging.customConfigFile.fileName }}
+                {{- end }}
+                {{- range $key, $value := .Values.gateway.config.authentication.oauth.openidConnectIssuers }}
+                "{{ printf "%s%s%s=%s" "-Dditto.gateway.authentication.oauth.openid-connect-issuers." $key ".issuer" $value.issuer }}"
+                {{- range $index, $subject := $value.authSubjects }}
+                "{{ printf "%s%s%s%d=%s" "-Dditto.gateway.authentication.oauth.openid-connect-issuers." $key ".auth-subjects." $index $subject }}"
+                {{- end }}
+                {{- end }}
+                {{- range $key, $value := .Values.gateway.config.authentication.devops.oauth.openidConnectIssuers }}
+                "{{ printf "%s%s%s=%s" "-Dditto.gateway.authentication.devops.oauth.openid-connect-issuers." $key ".issuer" $value.issuer }}"
+                {{- range $index, $subject := $value.authSubjects }}
+                "{{ printf "%s%s%s%d=%s" "-Dditto.gateway.authentication.devops.oauth.openid-connect-issuers." $key ".auth-subjects." $index $subject }}"
+                {{- end }}
+                {{- end }}
+                {{ join " " .Values.gateway.systemProps }}
+            - name: CLUSTER_BS_REQUIRED_CONTACTS
+              value: "{{ .Values.global.cluster.requiredContactPoints }}"
+            - name: DITTO_DDATA_NUMBER_OF_SHARDS
+              value: "{{ .Values.global.cluster.ddata.numberOfShards }}"
+            - name: DITTO_DDATA_MAX_DELTA_ELEMENTS
+              value: "{{ .Values.global.cluster.ddata.maxDeltaElements }}"
+            - name: CLUSTER_NUMBER_OF_SHARDS
+              value: "{{ .Values.global.cluster.numberOfShards }}"
+            - name: CLUSTER_DOWNING_STABLE_AFTER
+              value: "{{ .Values.global.cluster.downingStableAfter }}"
+            - name: CLUSTER_DOWNING_DOWN_ALL_WHEN_UNSTABLE
+              value: "{{ .Values.global.cluster.downAllWhenUnstable }}"
+            {{- if .Values.global.prometheus.enabled }}
+            - name: PROMETHEUS_PORT
+              value: "{{ .Values.global.prometheus.port }}"
+            {{- end }}
+            - name: ENABLE_PRE_AUTHENTICATION
+              value: "{{ .Values.gateway.config.authentication.enablePreAuthentication }}"
+            - name: DEVOPS_SECURED
+              value: "{{ .Values.gateway.config.authentication.devops.secured }}"
+            - name: DEVOPS_AUTHENTICATION_METHOD
+              value: "{{ .Values.gateway.config.authentication.devops.authMethod }}"
+            - name: DEVOPS_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.gateway.config.authentication.devops.existingSecret | default ( printf "%s-gateway-secret" ( include "ditto.fullname" . )) }}
+                  key: devops-password
+            {{- range $index, $oauthSubject := .Values.gateway.config.authentication.devops.oauthSubjects }}
+            - name: DEVOPS_OAUTH2_SUBJECTS.{{ $index }}
+              value: "{{ $oauthSubject }}"
+            {{- end }}
+            - name: DEVOPS_STATUS_SECURED
+              value: "{{ .Values.gateway.config.authentication.devops.statusSecured }}"
+            - name: STATUS_AUTHENTICATION_METHOD
+              value: "{{ .Values.gateway.config.authentication.devops.statusAuthMethod }}"
+            - name: STATUS_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.gateway.config.authentication.devops.existingSecret | default ( printf "%s-gateway-secret" ( include "ditto.fullname" . )) }}
+                  key: status-password
+            {{- range $index, $oauthSubject := .Values.gateway.config.authentication.devops.statusOauthSubjects }}
+            - name: STATUS_OAUTH2_SUBJECTS.{{ $index }}
+              value: "{{ $oauthSubject }}"
+            {{- end }}
+            - name: WS_SUBSCRIBER_BACKPRESSURE
+              value: "{{ .Values.gateway.config.websocket.subscriber.backpressureQueueSize }}"
+            - name: WS_PUBLISHER_BACKPRESSURE
+              value: "{{ .Values.gateway.config.websocket.publisher.backpressureBufferSize }}"
+            - name: GATEWAY_WEBSOCKET_THROTTLING_ENABLED
+              value: "{{ .Values.gateway.config.websocket.throttling.enabled }}"
+            - name: GATEWAY_WEBSOCKET_THROTTLING_INTERVAL
+              value: "{{ .Values.gateway.config.websocket.throttling.interval }}"
+            - name: GATEWAY_WEBSOCKET_THROTTLING_LIMIT
+              value: "{{ .Values.gateway.config.websocket.throttling.limit }}"
+            - name: GATEWAY_SSE_THROTTLING_ENABLED
+              value: "{{ .Values.gateway.config.sse.throttling.enabled }}"
+            - name: GATEWAY_SSE_THROTTLING_INTERVAL
+              value: "{{ .Values.gateway.config.sse.throttling.interval }}"
+            - name: GATEWAY_SSE_THROTTLING_LIMIT
+              value: "{{ .Values.gateway.config.sse.throttling.limit }}"
+            - name: OAUTH_ALLOWED_CLOCK_SKEW
+              value: "{{ .Values.gateway.config.authentication.oauth.allowedClockSkew }}"
+            {{- if .Values.gateway.extraEnv }}
+              {{- toYaml .Values.gateway.extraEnv | nindent 12 }}
+            {{- end }}
+          ports:
+            - name: http
+              containerPort: {{ .Values.gateway.service.port }}
+              protocol: TCP
+            - name: remoting
+              containerPort: {{ .Values.akka.remoting.port }}
+              protocol: TCP
+            - name: management
+              containerPort: {{ .Values.akka.mgmthttp.port }}
+              protocol: TCP
+            {{- if .Values.global.prometheus.enabled }}
+            - name: prometheus
+              protocol: TCP
+              containerPort: {{ .Values.global.prometheus.port }}
+            {{- end }}
+          readinessProbe:
+            httpGet:
+              port: management
+              path: /ready
+            initialDelaySeconds: {{ .Values.gateway.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.gateway.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.gateway.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.gateway.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.gateway.readinessProbe.failureThreshold }}
+          livenessProbe:
+            httpGet:
+              port: management
+              path: /alive
+            initialDelaySeconds: {{ .Values.gateway.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.gateway.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.gateway.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.gateway.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.gateway.livenessProbe.failureThreshold }}
+          volumeMounts:
+            {{- if .Values.global.logging.customConfigFile.enabled }}
+            - name: ditto-custom-log-config
+              mountPath: /opt/ditto/{{ .Values.global.logging.customConfigFile.fileName }}
+              subPath: {{ .Values.global.logging.customConfigFile.fileName }}
+            {{- end }}
+            {{- if .Values.global.logging.logFiles.enabled }}
+            - name: ditto-log-files-directory
+              mountPath: /var/log/ditto
+            {{- end }}
+          resources:
+            requests:
+              cpu: {{ mulf .Values.gateway.resources.cpu 1000 }}m
+              memory: {{ .Values.gateway.resources.memoryMi }}Mi
+            limits:
+              # ## no cpu limit to avoid CFS scheduler limits
+              # ref: https://doc.akka.io/docs/akka/snapshot/additional/deploy.html#in-kubernetes
+              # cpu: ""
+              memory: {{ .Values.gateway.resources.memoryMi }}Mi
+          {{- if .Values.openshift.enabled }}
+          {{- with .Values.openshift.securityContext }}
+          securityContext:
+            {{- toYaml . | nindent 8 }}
+          {{- end }}
+          {{- else }}
+          securityContext:
+            runAsNonRoot: true
+            runAsUser: 1000
+            runAsGroup: 1000
+            allowPrivilegeEscalation: false
+          {{- end }}
+      {{- with .Values.gateway.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.gateway.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.gateway.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+        {{- if .Values.global.logging.customConfigFile.enabled }}
+        - name: ditto-custom-log-config
+          configMap:
+            name: {{ .Release.Name }}-logback-config-gateway-xml
+        {{- end }}
+        {{- if .Values.global.logging.logFiles.enabled }}
+        - name: ditto-log-files-directory
+          hostPath:
+            path: /var/log/ditto
+            type: DirectoryOrCreate
+        {{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/gateway-networkpolicy.yaml b/deployment/helm/templates/gateway-networkpolicy.yaml
new file mode 100644
index 00000000000..7072f92548e
--- /dev/null
+++ b/deployment/helm/templates/gateway-networkpolicy.yaml
@@ -0,0 +1,51 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.gateway.networkPolicy.enabled -}}
+---
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-gateway
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  policyTypes:
+  - Ingress
+  - Egress
+  ingress:
+  # Allow access from Nginx
+  - from:
+    - podSelector:
+        matchLabels:
+          app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+          app.kubernetes.io/instance: {{ .Release.Name }}
+    ports:
+    - protocol: TCP
+      port: http
+  # Allow inner cluster communication
+  - from:
+    - podSelector:
+        matchLabels:
+          actorSystemName: {{ .Values.akka.actorSystemName }}
+    ports:
+    - protocol: TCP
+      port: {{ .Values.akka.remoting.port }}
+    - protocol: TCP
+      port: {{ .Values.akka.mgmthttp.port }}
+  # Open all egress
+  egress:
+  - {}
+{{- end }}
diff --git a/deployment/helm/templates/gateway-pdb.yaml b/deployment/helm/templates/gateway-pdb.yaml
new file mode 100644
index 00000000000..1be894d9e5f
--- /dev/null
+++ b/deployment/helm/templates/gateway-pdb.yaml
@@ -0,0 +1,26 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if and .Values.gateway.podDisruptionBudget.enabled (gt .Values.gateway.replicaCount 1.0) -}}
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "ditto.fullname" . }}-gateway
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  minAvailable: {{ .Values.gateway.podDisruptionBudget.minAvailable }}
+{{- end }}
diff --git a/deployment/helm/templates/gateway-podmonitor.yaml b/deployment/helm/templates/gateway-podmonitor.yaml
new file mode 100644
index 00000000000..b57a9b65de4
--- /dev/null
+++ b/deployment/helm/templates/gateway-podmonitor.yaml
@@ -0,0 +1,38 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if and .Values.gateway.podMonitor.enabled .Values.global.prometheus.port -}}
+{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" -}}
+---
+kind: PodMonitor
+apiVersion: monitoring.coreos.com/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-gateway
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podMetricsEndpoints:
+  - targetPort: {{ .Values.global.prometheus.port }}
+    path: "/"
+    {{- if .Values.gateway.podMonitor.interval }}
+    interval: {{ .Values.gateway.podMonitor.interval }}
+    {{- end }}
+    {{- if .Values.gateway.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ .Values.gateway.podMonitor.scrapeTimeout }}
+    {{- end }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
+  namespaceSelector:
+    matchNames:
+      - {{ $.Release.Namespace | quote }}
+{{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/gateway-secret.yaml b/deployment/helm/templates/gateway-secret.yaml
new file mode 100644
index 00000000000..fab1708b8c1
--- /dev/null
+++ b/deployment/helm/templates/gateway-secret.yaml
@@ -0,0 +1,32 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if not .Values.gateway.existingSecret }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "ditto.fullname" . }}-gateway-secret
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway-secret
+{{ include "ditto.labels" . | indent 4 }}
+type: Opaque
+data:
+  {{- if .Values.gateway.devopsPassword }}
+  devops-password: {{ .Values.gateway.devopsPassword | b64enc | quote }}
+  {{- else }}
+  devops-password: {{ randAlphaNum 12 | b64enc | quote }}
+  {{- end }}
+  {{- if .Values.gateway.statusPassword }}
+  status-password: {{ .Values.gateway.statusPassword | b64enc | quote }}
+  {{- else }}
+  status-password: {{ randAlphaNum 12 | b64enc | quote }}
+  {{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/gateway-service.yaml b/deployment/helm/templates/gateway-service.yaml
new file mode 100644
index 00000000000..c4549ee7c00
--- /dev/null
+++ b/deployment/helm/templates/gateway-service.yaml
@@ -0,0 +1,33 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.gateway.enabled -}}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "ditto.fullname" . }}-gateway
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
+{{ include "ditto.labels" . | indent 4 }}
+  {{- with .Values.gateway.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  ports:
+    - port: {{ .Values.gateway.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
+    app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
diff --git a/deployment/helm/templates/logback-config.yaml b/deployment/helm/templates/logback-config.yaml
new file mode 100644
index 00000000000..029cf98467a
--- /dev/null
+++ b/deployment/helm/templates/logback-config.yaml
@@ -0,0 +1,31 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.global.logging.customConfigFile.enabled -}}
+{{- $releaseName := .Release.Name -}}
+{{- $name := include "ditto.name" . -}}
+{{- $labels := include "ditto.labels" . -}}
+{{- $logbackFileName := .Values.global.logging.customConfigFile.fileName -}}
+{{ $root := . }}
+{{ range $path, $bytes := .Files.Glob "logback-config/**" }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $releaseName }}-{{ $path | replace "/" "-" | replace "." "-" }}
+  labels:
+    app.kubernetes.io/name: {{ $name }}-logback-config
+{{ $labels | indent 4 }}
+data:
+  {{ $logbackFileName }}: |-
+{{ $root.Files.Get $path | indent 4 }}
+---
+{{- end -}}
+{{- end -}}
diff --git a/deployment/helm/templates/mongodb-secret.yaml b/deployment/helm/templates/mongodb-secret.yaml
new file mode 100644
index 00000000000..06584e605e5
--- /dev/null
+++ b/deployment/helm/templates/mongodb-secret.yaml
@@ -0,0 +1,27 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if not .Values.dbconfig.uriSecret -}}
+{{- $mongoName := include "ditto.mongodb.fullname" . -}}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "ditto.fullname" . }}-mongodb-secret
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-mongodb-secret
+{{ include "ditto.labels" . | indent 4 }}
+type: Opaque
+data:
+  connectivity-uri: {{ .Values.dbconfig.connectivity.uri | replace "#{PLACEHOLDER_MONGODB_HOSTNAME}#" $mongoName | b64enc | quote}}
+  things-uri: {{ .Values.dbconfig.things.uri | replace "#{PLACEHOLDER_MONGODB_HOSTNAME}#" $mongoName | b64enc | quote}}
+  thingsSearch-uri: {{ .Values.dbconfig.thingsSearch.uri | replace "#{PLACEHOLDER_MONGODB_HOSTNAME}#" $mongoName | b64enc | quote}}
+  policies-uri: {{ .Values.dbconfig.policies.uri | replace "#{PLACEHOLDER_MONGODB_HOSTNAME}#" $mongoName | b64enc | quote}}
+{{- end }}
diff --git a/deployment/helm/templates/nginx-auth.yaml b/deployment/helm/templates/nginx-auth.yaml
new file mode 100644
index 00000000000..582cf89e8c5
--- /dev/null
+++ b/deployment/helm/templates/nginx-auth.yaml
@@ -0,0 +1,36 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.nginx.enabled -}}
+{{- $releaseName := .Release.Name -}}
+{{- $name := include "ditto.name" . -}}
+{{- $labels := include "ditto.labels" . -}}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ $releaseName }}-nginx-config-nginx-htpasswd
+  labels:
+    app.kubernetes.io/name: {{ $name }}-nginx-config
+{{ $labels | indent 4 }}
+type: Opaque
+stringData:
+  nginx.htpasswd: |-
+{{- if .Values.global.hashedBasicAuthUsers }}
+{{ range .Values.global.hashedBasicAuthUsers }}
+{{- . | indent 4 }}
+{{ end }}
+{{- else }}
+{{ range $key, $value := .Values.global.basicAuthUsers }}
+{{- (htpasswd $value.user $value.password) | indent 4 }}
+{{ end }}
+{{ end }}
+---
+{{- end }}
diff --git a/deployment/helm/templates/nginx-config.yaml b/deployment/helm/templates/nginx-config.yaml
new file mode 100644
index 00000000000..0d6e51a47f4
--- /dev/null
+++ b/deployment/helm/templates/nginx-config.yaml
@@ -0,0 +1,30 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.nginx.enabled -}}
+{{- $releaseName := .Release.Name -}}
+{{- $name := include "ditto.name" . -}}
+{{- $labels := include "ditto.labels" . -}}
+{{ $root := . }}
+{{ range $path, $bytes := .Files.Glob "nginx-config/**" }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $releaseName }}-{{ $path | replace "/" "-" | replace "." "-" }}
+  labels:
+    app.kubernetes.io/name: {{ $name }}-nginx-config
+{{ $labels | indent 4 }}
+data:
+  {{ $path | replace "nginx-config/" ""}}: |-
+{{ $root.Files.Get $path | indent 4 }}
+---
+{{- end -}}
+{{- end -}}
diff --git a/deployment/helm/templates/nginx-configmap.yaml b/deployment/helm/templates/nginx-configmap.yaml
new file mode 100644
index 00000000000..4430b7a5a6b
--- /dev/null
+++ b/deployment/helm/templates/nginx-configmap.yaml
@@ -0,0 +1,242 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.nginx.enabled -}}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-nginx-conf
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx-conf
+{{ include "ditto.labels" . | indent 4 }}
+data:
+  nginx.conf: |-
+    worker_processes auto;
+
+    events {
+      worker_connections 1024;
+    }
+    
+    http {
+      charset utf-8;
+      default_type application/json;
+      include mime.types;
+    
+      # timeouts are configured slightly higher than ditto-eclipse-ditto-gateway read-timeout of 60 seconds
+      proxy_connect_timeout 70; # seconds, default: 60
+      proxy_send_timeout 70; # seconds, default: 60
+      proxy_read_timeout 70; # seconds, default: 60
+      # will try another upstream if an error or timeout occurred during the connection
+      # or if the upstream returns 502 response
+      proxy_next_upstream error timeout http_502;
+      # will retry up to 3 times to find another upstream to connect to
+      proxy_next_upstream_tries 3;
+      # will try for max. 20s to find another upstream to connect to
+      proxy_next_upstream_timeout 20;
+
+      send_timeout 70; # seconds, default: 60
+    
+      client_header_buffer_size 8k; # allow longer URIs + headers (default: 1k)
+      large_client_header_buffers 4 16k;
+    
+      merge_slashes off; # allow multiple slashes for CRS Authentication
+
+      map $http_authorization $authentication {
+        default "Authentication required";
+        "~Bearer" "off";
+        # the above means: if we get a request containing an "Authorization: Bearer ..." header, set "off" to $authentication
+      }
+
+      map $http_authorization $nginx_auth_user {
+        default "nginx:${remote_user}";
+        "~Bearer" "";
+      }
+    
+      upstream {{ include "ditto.fullname" . }}-gateway {
+        server {{ include "ditto.fullname" . }}-gateway:8080;
+      }
+
+      {{ if .Values.dittoui.enabled -}}
+      upstream {{ include "ditto.fullname" . }}-dittoui {
+        server {{ include "ditto.fullname" . }}-dittoui:8080;
+      }
+      {{- end }}
+
+      {{ if .Values.swaggerui.enabled -}}
+      upstream {{ include "ditto.fullname" . }}-swaggerui {
+        server {{ include "ditto.fullname" . }}-swaggerui:8080;
+      }
+      {{- end }}
+
+      log_format jsonlog escape=json '{'
+        '"@timestamp":"$time_iso8601",'
+        '"remote_addr":"$remote_addr",'
+        '"remote_user":"$remote_user",'
+        '"request":"$request",'
+        '"status": "$status",'
+        '"body_bytes_sent":"$body_bytes_sent",'
+        '"request_time":"$request_time",'
+        '"upstream_response_time":"$upstream_response_time",'
+        '"http_referrer":"$http_referer",'
+        '"http_user_agent":"$http_user_agent",'
+        '"correlation-id":"$http_correlation_id"'
+      '}';
+      access_log /var/log/nginx/access.log jsonlog;
+
+      server {
+        listen 8080;
+        server_name localhost;
+
+        location / {
+          index index.html;
+        }
+    
+        # api
+        location /api {
+          include nginx-cors.conf;
+
+          {{ if .Values.global.jwtOnly -}}
+          proxy_pass_request_headers    on;
+          proxy_set_header              Authorization             $http_authorization;
+          {{ else }}
+          auth_basic                    $authentication;
+          auth_basic_user_file          nginx.htpasswd;
+          proxy_set_header              X-Forwarded-User          $remote_user;
+          proxy_set_header              x-ditto-pre-authenticated $nginx_auth_user;
+          {{- end }}
+        
+          proxy_pass                    http://{{ include "ditto.fullname" . }}-gateway;
+          proxy_http_version            1.1;
+          proxy_set_header              Host                      $http_host;
+          proxy_set_header              X-Real-IP                 $remote_addr;
+          proxy_set_header              X-Forwarded-For           $proxy_add_x_forwarded_for;
+    
+          proxy_set_header Connection  '';
+          chunked_transfer_encoding    off;
+          proxy_buffering              off;
+          proxy_cache                  off;
+        }
+    
+        # ws
+        location /ws {
+
+          {{ if .Values.global.jwtOnly -}}
+          proxy_pass_request_headers    on;
+          proxy_set_header              Authorization             $http_authorization;
+          {{ else }}
+          auth_basic                    $authentication;
+          auth_basic_user_file          nginx.htpasswd;
+          proxy_set_header              X-Forwarded-User          $remote_user;
+          proxy_set_header              x-ditto-pre-authenticated $nginx_auth_user;
+          {{- end }}
+          
+          proxy_pass                    http://{{ include "ditto.fullname" . }}-gateway;
+          proxy_http_version            1.1;
+          proxy_set_header              Host                      $http_host;
+          proxy_set_header              X-Real-IP                 $remote_addr;
+          proxy_set_header              X-Forwarded-For           $proxy_add_x_forwarded_for;
+    
+          proxy_set_header              Upgrade                   $http_upgrade;
+          proxy_set_header              Connection                "upgrade";
+          proxy_read_timeout            1d;
+          proxy_send_timeout            1d;
+        }
+    
+        # health
+        location /health {
+          include nginx-cors.conf;
+
+          # exclude health checks from being logged in access log:
+          access_log off;
+    
+          proxy_pass                    http://{{ include "ditto.fullname" . }}-gateway/health;
+          proxy_http_version            1.1;
+          proxy_set_header              Host                      $http_host;
+          proxy_set_header              X-Real-IP                 $remote_addr;
+          proxy_set_header              X-Forwarded-For           $proxy_add_x_forwarded_for;
+          proxy_set_header              X-Forwarded-User          $remote_user;
+        }
+    
+        # status
+        location /status {
+          include nginx-cors.conf;
+
+          # exclude status access from being logged in access log:
+          access_log off;
+    
+          proxy_pass                    http://{{ include "ditto.fullname" . }}-gateway/overall/status;
+          proxy_http_version            1.1;
+          proxy_set_header              Host                      $http_host;
+          proxy_set_header              X-Real-IP                 $remote_addr;
+          proxy_set_header              X-Forwarded-For           $proxy_add_x_forwarded_for;
+          proxy_set_header              X-Forwarded-User          $remote_user;
+        }
+
+        # stats
+        location /stats {
+          include nginx-cors.conf;
+
+          # exclude stats access from being logged in access log:
+          access_log off;
+
+          proxy_pass                    http://{{ include "ditto.fullname" . }}-gateway/stats;
+          proxy_http_version            1.1;
+          proxy_set_header              Host                      $http_host;
+          proxy_set_header              X-Real-IP                 $remote_addr;
+          proxy_set_header              X-Forwarded-For           $proxy_add_x_forwarded_for;
+          proxy_set_header              X-Forwarded-User          $remote_user;
+        }
+    
+        # devops
+        location /devops {
+          include nginx-cors.conf;
+
+          proxy_pass                    http://{{ include "ditto.fullname" . }}-gateway/devops;
+          proxy_http_version            1.1;
+          proxy_set_header              Host                      $http_host;
+          proxy_set_header              X-Real-IP                 $remote_addr;
+          proxy_set_header              X-Forwarded-For           $proxy_add_x_forwarded_for;
+          proxy_set_header              X-Forwarded-User          $remote_user;
+        }
+
+        # connections api using devops user configured in Ditto
+        location /api/2/connections {
+          include nginx-cors.conf;
+
+          proxy_pass                    http://{{ include "ditto.fullname" . }}-gateway;
+          proxy_http_version            1.1;
+          proxy_set_header              Host                $http_host;
+          proxy_set_header              X-Real-IP           $remote_addr;
+          proxy_set_header              X-Forwarded-For     $proxy_add_x_forwarded_for;
+          proxy_set_header              X-Forwarded-User    $remote_user;
+        }
+
+        {{ if .Values.dittoui.enabled -}}
+        location /ui/ {
+          proxy_pass                    http://{{ include "ditto.fullname" . }}-dittoui/;
+          proxy_http_version            1.1;
+          proxy_set_header              Host                $http_host;
+        }
+        {{- end }}
+
+        {{ if .Values.swaggerui.enabled -}}
+        # swagger
+        # access API doc on: /apidoc/
+        location /apidoc/ {
+          proxy_pass                    http://{{ include "ditto.fullname" . }}-swaggerui/;
+          proxy_http_version            1.1;
+          proxy_set_header              Host                $http_host;
+        }
+        {{- end }}
+      }
+    }
+
+{{- end }}
diff --git a/deployment/helm/templates/nginx-deployment.yaml b/deployment/helm/templates/nginx-deployment.yaml
new file mode 100644
index 00000000000..3fa88faec5a
--- /dev/null
+++ b/deployment/helm/templates/nginx-deployment.yaml
@@ -0,0 +1,149 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.nginx.enabled -}}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "ditto.fullname" . }}-nginx
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.nginx.replicaCount }}
+  strategy:
+  {{- with .Values.nginx.updateStrategy }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        {{- with .Values.nginx.additionalLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        checksum/nginx-conf: {{ include (print $.Template.BasePath "/nginx-configmap.yaml") . | sha256sum }}
+        checksum/nginx-config: {{ include (print $.Template.BasePath "/nginx-config.yaml") . | sha256sum }}
+        checksum/nginx-auth: {{ include (print $.Template.BasePath "/nginx-auth.yaml") . | sha256sum }}
+        {{- with .Values.nginx.additionalAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.nginx.initContainers.waitForGateway.enabled }}
+      initContainers:
+        - name: {{ .Values.nginx.initContainers.waitForGateway.name }}
+          image: {{ .Values.nginx.initContainers.waitForGateway.image }}
+          args:
+            - /bin/sh
+            - -c
+            - >
+              set -x;
+              while [[ "$(curl -sL -w "%{http_code}\n" http://{{ include "ditto.fullname" . }}-gateway:8080/health -o /dev/null)" != "200" ]]; do
+                echo '.'
+                sleep 1;
+              done
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}-nginx
+          image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}"
+          imagePullPolicy: {{ .Values.nginx.image.pullPolicy }}
+          env:
+          {{- if .Values.nginx.extraEnv }}
+            {{- toYaml .Values.nginx.extraEnv | nindent 12 }}
+          {{- end }}
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+          {{- if .Values.nginx.readinessProbe }}
+          readinessProbe:
+            {{- toYaml .Values.nginx.readinessProbe | nindent 12 }}
+          {{- end }}
+          {{- if .Values.nginx.livenessProbe }}
+          livenessProbe:
+            {{- toYaml .Values.nginx.livenessProbe | nindent 12 }}
+          {{- end }}
+          resources:
+            requests:
+              cpu: {{ mulf .Values.nginx.resources.cpu 1000 }}m
+              memory: {{ .Values.nginx.resources.memoryMi }}Mi
+            limits:
+              # cpu: ""
+              memory: {{ .Values.nginx.resources.memoryMi }}Mi
+          volumeMounts:
+            - name: nginx-conf
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
+            - name: nginx-htpasswd
+              mountPath: /etc/nginx/nginx.htpasswd
+              subPath: nginx.htpasswd
+            - name: nginx-cors
+              mountPath: /etc/nginx/nginx-cors.conf
+              subPath: nginx-cors.conf
+            - name: nginx-index
+              mountPath: /etc/nginx/html/index.html
+              subPath: index.html
+            - name: nginx-ditto-down
+              mountPath: /etc/nginx/html/ditto-down.svg
+              subPath: ditto-down.svg
+            - name: nginx-ditto-up
+              mountPath: /etc/nginx/html/ditto-up.svg
+              subPath: ditto-up.svg
+            - name: nginx-cache
+              mountPath: /var/cache/nginx
+            - name: nginx-run
+              mountPath: /run/nginx
+      volumes:
+        - name: nginx-conf
+          configMap:
+            name: {{ .Release.Name }}-nginx-conf
+        - name: nginx-htpasswd
+          secret:
+            secretName: {{ .Release.Name }}-nginx-config-nginx-htpasswd
+        - name: nginx-cors
+          configMap:
+            name: {{ .Release.Name }}-nginx-config-nginx-cors-conf
+        - name: nginx-index
+          configMap:
+            name: {{ .Release.Name }}-nginx-config-index-html
+        - name: nginx-ditto-down
+          configMap:
+            name: {{ .Release.Name }}-nginx-config-ditto-down-svg
+        - name: nginx-ditto-up
+          configMap:
+            name: {{ .Release.Name }}-nginx-config-ditto-up-svg
+        - name: nginx-cache
+          emptyDir: {}
+        - name: nginx-run
+          emptyDir: {}
+      {{- with .Values.nginx.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nginx.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nginx.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/nginx-ingress-api.yaml b/deployment/helm/templates/nginx-ingress-api.yaml
new file mode 100644
index 00000000000..d1900b7ab8f
--- /dev/null
+++ b/deployment/helm/templates/nginx-ingress-api.yaml
@@ -0,0 +1,62 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "ditto.fullname" . -}}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-api
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+{{ include "ditto.labels" . | indent 4 }}
+  annotations:
+  {{- with .Values.ingress.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.ingress.api.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  ingressClassName: {{ .Values.ingress.className }}
+  defaultBackend:
+    service:
+      name: {{ $fullName }}-{{ .Values.ingress.defaultBackendSuffix }}
+      port:
+        name: http
+{{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+    - host: {{ .Values.ingress.host | quote }}
+      http:
+        paths:
+          {{- range .Values.ingress.api.paths }}
+          - path: {{ .path }}
+            {{- if .pathType }}
+            pathType: {{ .pathType }}
+            {{- else }}
+            pathType: Prefix
+            {{- end }}
+            backend:
+              service:
+                name: {{ $fullName }}-{{ .backendSuffix }}
+                port:
+                  name: http
+          {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/deployment/helm/templates/nginx-ingress-root.yaml b/deployment/helm/templates/nginx-ingress-root.yaml
new file mode 100644
index 00000000000..655af5a6160
--- /dev/null
+++ b/deployment/helm/templates/nginx-ingress-root.yaml
@@ -0,0 +1,62 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "ditto.fullname" . -}}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-root
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+{{ include "ditto.labels" . | indent 4 }}
+  annotations:
+  {{- with .Values.ingress.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.ingress.root.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  ingressClassName: {{ .Values.ingress.className }}
+  defaultBackend:
+    service:
+      name: {{ $fullName }}-{{ .Values.ingress.defaultBackendSuffix }}
+      port:
+        name: http
+{{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+    - host: {{ .Values.ingress.host | quote }}
+      http:
+        paths:
+          {{- range .Values.ingress.root.paths }}
+          - path: {{ .path }}
+            {{- if .pathType }}
+            pathType: {{ .pathType }}
+            {{- else }}
+            pathType: Prefix
+            {{- end }}
+            backend:
+              service:
+                name: {{ $fullName }}-{{ .backendSuffix }}
+                port:
+                  name: http
+          {{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/nginx-ingress-ui.yaml b/deployment/helm/templates/nginx-ingress-ui.yaml
new file mode 100644
index 00000000000..b16d6b324a2
--- /dev/null
+++ b/deployment/helm/templates/nginx-ingress-ui.yaml
@@ -0,0 +1,62 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "ditto.fullname" . -}}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-ui
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+{{ include "ditto.labels" . | indent 4 }}
+  annotations:
+  {{- with .Values.ingress.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.ingress.ui.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  ingressClassName: {{ .Values.ingress.className }}
+  defaultBackend:
+    service:
+      name: {{ $fullName }}-{{ .Values.ingress.defaultBackendSuffix }}
+      port:
+        name: http
+{{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+    - host: {{ .Values.ingress.host | quote }}
+      http:
+        paths:
+          {{- range .Values.ingress.ui.paths }}
+          - path: {{ .path }}
+            {{- if .pathType }}
+            pathType: {{ .pathType }}
+            {{- else }}
+            pathType: Prefix
+            {{- end }}
+            backend:
+              service:
+                name: {{ $fullName }}-{{ .backendSuffix }}
+                port:
+                  name: http
+          {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/deployment/helm/templates/nginx-ingress-ws.yaml b/deployment/helm/templates/nginx-ingress-ws.yaml
new file mode 100644
index 00000000000..d0a425919ef
--- /dev/null
+++ b/deployment/helm/templates/nginx-ingress-ws.yaml
@@ -0,0 +1,62 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "ditto.fullname" . -}}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-ws
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+{{ include "ditto.labels" . | indent 4 }}
+  annotations:
+  {{- with .Values.ingress.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.ingress.ws.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  ingressClassName: {{ .Values.ingress.className }}
+  defaultBackend:
+    service:
+      name: {{ $fullName }}-{{ .Values.ingress.defaultBackendSuffix }}
+      port:
+        name: http
+{{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+    - host: {{ .Values.ingress.host | quote }}
+      http:
+        paths:
+          {{- range .Values.ingress.ws.paths }}
+          - path: {{ .path }}
+            {{- if .pathType }}
+            pathType: {{ .pathType }}
+            {{- else }}
+            pathType: Prefix
+            {{- end }}
+            backend:
+              service:
+                name: {{ $fullName }}-{{ .backendSuffix }}
+                port:
+                  name: http
+          {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/deployment/helm/templates/nginx-networkpolicy.yaml b/deployment/helm/templates/nginx-networkpolicy.yaml
new file mode 100644
index 00000000000..e194772310f
--- /dev/null
+++ b/deployment/helm/templates/nginx-networkpolicy.yaml
@@ -0,0 +1,32 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.nginx.networkPolicy.enabled -}}
+---
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-nginx
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  policyTypes:
+  - Ingress
+  ingress:
+  # Allow access from OpenShift Router
+  - ports:
+    - protocol: TCP
+      port: 8080
+{{- end }}
diff --git a/deployment/helm/templates/nginx-route.yaml b/deployment/helm/templates/nginx-route.yaml
new file mode 100644
index 00000000000..dff36831c6b
--- /dev/null
+++ b/deployment/helm/templates/nginx-route.yaml
@@ -0,0 +1,35 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.openshift.routes.enabled -}}
+---
+kind: Route
+apiVersion: route.openshift.io/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+{{ include "ditto.labels" . | indent 4 }}
+  {{- with .Values.openshift.routes.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  host: {{ .Values.openshift.routes.host | default "" }}
+  to:
+    kind: Service
+    name: {{ include "ditto.fullname" . }}-nginx
+    weight: 100
+  port:
+    targetPort: {{ .Values.openshift.routes.targetPort }}
+  tls:
+    termination: {{ .Values.openshift.routes.tlsTermination | default "edge" }}
+    insecureEdgeTerminationPolicy: {{ .Values.openshift.routes.tlsInsecurePolicy | default "Redirect" }}
+{{- end }}
diff --git a/deployment/helm/templates/nginx-service.yaml b/deployment/helm/templates/nginx-service.yaml
new file mode 100644
index 00000000000..7e711056315
--- /dev/null
+++ b/deployment/helm/templates/nginx-service.yaml
@@ -0,0 +1,37 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.nginx.enabled -}}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "ditto.fullname" . }}-nginx
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+{{ include "ditto.labels" . | indent 4 }}
+  {{- with .Values.nginx.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  type: {{ .Values.nginx.service.type }}
+  ports:
+    - port: {{ .Values.nginx.service.port }}
+      {{- if (and (eq .Values.nginx.service.type "NodePort") (not (empty .Values.nginx.service.nodePort))) }}
+      nodePort: {{ .Values.nginx.service.nodePort }}
+      {{- end }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+    app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
diff --git a/deployment/helm/templates/policies-deployment.yaml b/deployment/helm/templates/policies-deployment.yaml
new file mode 100644
index 00000000000..8fc365b063c
--- /dev/null
+++ b/deployment/helm/templates/policies-deployment.yaml
@@ -0,0 +1,292 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.policies.enabled -}}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "ditto.fullname" . }}-policies
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.policies.replicaCount }}
+  strategy:
+  {{- with .Values.policies.updateStrategy }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  minReadySeconds: {{ .Values.policies.minReadySeconds }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        actorSystemName: {{ .Values.akka.actorSystemName }}
+        {{- with .Values.policies.additionalLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- if .Values.global.prometheus.enabled }}
+        prometheus.io/scrape: "true"
+        prometheus.io/path: "{{ .Values.global.prometheus.path }}"
+        prometheus.io/port: "{{ .Values.global.prometheus.port }}"
+        {{- end }}
+        checksum/mongodb-config: {{ include (print $.Template.BasePath "/mongodb-secret.yaml") . | sha256sum }}
+        {{- with .Values.policies.additionalAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- if .Values.rbac.enabled }}
+      serviceAccountName: {{ template "ditto.serviceAccountName" . }}
+      {{- end }}
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      securityContext:
+        fsGroup: 1000
+      initContainers:
+        {{- if .Values.global.logging.logFiles.enabled }}
+        - name: change-volume-owner
+          image: busybox
+          securityContext:
+            runAsUser: 0
+          command: [ "sh", "-c", "chown -R 1000:1000 /var/log/ditto && echo 'changed ownership of /var/log/ditto to 1000:1000'" ]
+          volumeMounts:
+            - name: ditto-log-files-directory
+              mountPath: /var/log/ditto
+        {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}-policies
+          image: {{ printf "%s:%s" .Values.policies.image.repository ( default .Chart.AppVersion ( default .Values.dittoTag .Values.policies.image.tag ) ) }}
+          imagePullPolicy: {{ .Values.policies.image.pullPolicy }}
+          env:
+            {{- if not .Values.global.logging.customConfigFile.enabled }}
+            - name: DITTO_LOGGING_DISABLE_SYSOUT_LOG
+              value: "{{ if .Values.global.logging.sysout.enabled }}false{{ else }}true{{ end }}"
+            - name: DITTO_LOGGING_FILE_APPENDER
+              value: "{{ if .Values.global.logging.logFiles.enabled }}true{{ else }}false{{ end }}"
+            {{- end }}
+            - name: DITTO_TRACING_ENABLED
+              value: "{{ .Values.global.tracing.enabled }}"
+            - name: OTEL_EXPORTER_OTLP_ENDPOINT
+              value: "{{ .Values.global.tracing.otelExporterOtlpEndpoint }}"
+            - name: DITTO_TRACING_SAMPLER
+              value: "{{ .Values.global.tracing.sampler }}"
+            - name: DITTO_TRACING_RANDOM_SAMPLER_PROBABILITY
+              value: "{{ .Values.global.tracing.randomSampler.probability }}"
+            - name: DITTO_TRACING_ADAPTIVE_SAMPLER_THROUGHPUT
+              value: "{{ .Values.global.tracing.adaptiveSampler.throughput }}"
+            {{- if .Values.global.logging.logstash.enabled }}
+            - name: DITTO_LOGGING_LOGSTASH_SERVER
+              value: "{{ .Values.global.logging.logstash.endpoint }}"
+            {{- end }}
+            - name: POD_LABEL_SELECTOR
+              value: "app.kubernetes.io/name=%s"
+            - name: POD_NAMESPACE
+              value: {{.Release.Namespace}}
+            - name: INSTANCE_INDEX
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.name
+            - name: HOSTNAME
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: DISCOVERY_METHOD
+              value: "kubernetes-api"
+            - name: TZ
+              value: "{{ .Values.global.timezone }}"
+            - name: JAVA_TOOL_OPTIONS
+              value: >
+                {{ .Values.global.jvmOptions }}
+                -XX:ActiveProcessorCount={{ .Values.policies.jvm.activeProcessorCount }}
+                -XX:MaxRAMPercentage={{ .Values.policies.jvm.heapRamPercentage }}
+                -XX:InitialRAMPercentage={{ .Values.policies.jvm.heapRamPercentage }}
+                -XX:MaxGCPauseMillis={{ .Values.policies.jvm.maxGcPauseMillis }}
+                {{ .Values.policies.additionalJvmOptions }}
+                {{- .Values.global.akkaOptions }}
+                {{- if .Values.global.logging.customConfigFile.enabled }}
+                -Dlogback.configurationFile=/opt/ditto/{{ .Values.global.logging.customConfigFile.fileName }}
+                {{- end }}
+                {{- range $index, $header := .Values.policies.config.persistence.events.historicalHeadersToPersist }}
+                "{{ printf "%s%d=%s" "-Dditto.policies.policy.event.historical-headers-to-persist." $index $header }}"
+                {{- end }}
+                {{ join " " .Values.policies.systemProps }}
+            - name: MONGO_DB_SSL_ENABLED
+              value: "{{ if .Values.dbconfig.policies.ssl }}true{{ else }}false{{ end }}"
+            - name: MONGO_DB_URI
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.dbconfig.uriSecret | default ( printf "%s-mongodb-secret" ( include "ditto.fullname" . )) }}
+                  key: policies-uri
+            - name: MONGO_DB_CONNECTION_MIN_POOL_SIZE
+              value: "{{ .Values.policies.config.mongodb.minPoolSize }}"
+            - name: MONGO_DB_CONNECTION_POOL_SIZE
+              value: "{{ .Values.policies.config.mongodb.maxPoolSize }}"
+            - name: MONGO_DB_CONNECTION_POOL_IDLE_TIME
+              value: "{{ .Values.policies.config.mongodb.maxPoolIdleTime }}"
+            {{- if .Values.global.prometheus.enabled }}
+            - name: PROMETHEUS_PORT
+              value: "{{ .Values.global.prometheus.port }}"
+            {{- end }}
+            - name: CLUSTER_BS_REQUIRED_CONTACTS
+              value: "{{ .Values.global.cluster.requiredContactPoints }}"
+            - name: DITTO_DDATA_NUMBER_OF_SHARDS
+              value: "{{ .Values.global.cluster.ddata.numberOfShards }}"
+            - name: DITTO_DDATA_MAX_DELTA_ELEMENTS
+              value: "{{ .Values.global.cluster.ddata.maxDeltaElements }}"
+            - name: CLUSTER_NUMBER_OF_SHARDS
+              value: "{{ .Values.global.cluster.numberOfShards }}"
+            - name: CLUSTER_DOWNING_STABLE_AFTER
+              value: "{{ .Values.global.cluster.downingStableAfter }}"
+            - name: CLUSTER_DOWNING_DOWN_ALL_WHEN_UNSTABLE
+              value: "{{ .Values.global.cluster.downAllWhenUnstable }}"
+            - name: AKKA_PERSISTENCE_MONGO_JOURNAL_WRITE_CONCERN
+              value: "{{ .Values.policies.config.mongodb.journalWriteConcern }}"
+            - name: AKKA_PERSISTENCE_MONGO_SNAPS_WRITE_CONCERN
+              value: "{{ .Values.policies.config.mongodb.snapsWriteConcern }}"
+            - name: BREAKER_MAXTRIES
+              value: "{{ .Values.policies.config.mongodb.journalCircuitBreaker.maxTries }}"
+            - name: BREAKER_TIMEOUT
+              value: "{{ .Values.policies.config.mongodb.journalCircuitBreaker.timeout }}"
+            - name: BREAKER_RESET
+              value: "{{ .Values.policies.config.mongodb.journalCircuitBreaker.reset }}"
+            - name: SNAPSHOT_BREAKER_MAXTRIES
+              value: "{{ .Values.policies.config.mongodb.snapsCircuitBreaker.maxTries }}"
+            - name: SNAPSHOT_BREAKER_TIMEOUT
+              value: "{{ .Values.policies.config.mongodb.snapsCircuitBreaker.timeout }}"
+            - name: SNAPSHOT_BREAKER_RESET
+              value: "{{ .Values.policies.config.mongodb.snapsCircuitBreaker.reset }}"
+            - name: POLICY_ACTIVITY_CHECK_INTERVAL
+              value: "{{ .Values.policies.config.persistence.activityCheckInterval }}"
+            - name: HEALTH_CHECK_METRICS_REPORTER_RESOLUTION
+              value: "{{ .Values.policies.config.cleanup.metricsReporter.resolution }}"
+            - name: HEALTH_CHECK_METRICS_REPORTER_HISTORY
+              value: "{{ .Values.policies.config.cleanup.metricsReporter.history }}"
+            - name: CLEANUP_ENABLED
+              value: "{{ .Values.policies.config.cleanup.enabled }}"
+            - name: CLEANUP_QUIET_PERIOD
+              value: "{{ .Values.policies.config.cleanup.quietPeriod }}"
+            - name: CLEANUP_HISTORY_RETENTION_DURATION
+              value: "{{ .Values.policies.config.cleanup.history.retentionDuration }}"
+            - name: CLEANUP_INTERVAL
+              value: "{{ .Values.policies.config.cleanup.interval }}"
+            - name: CLEANUP_TIMER_THRESHOLD
+              value: "{{ .Values.policies.config.cleanup.timerThreshold }}"
+            - name: CLEANUP_CREDITS_PER_BATCH
+              value: "{{ .Values.policies.config.cleanup.creditsPerBatch }}"
+            - name: POLICIES_PERSISTENCE_PING_RATE_FREQUENCY
+              value: "{{ .Values.policies.config.persistence.pingRate.frequency }}"
+            - name: POLICIES_PERSISTENCE_PING_RATE_ENTITIES
+              value: "{{ .Values.policies.config.persistence.pingRate.entities }}"
+            - name: POLICY_SNAPSHOT_INTERVAL
+              value: "{{ .Values.policies.config.persistence.snapshots.interval }}"
+            - name: POLICY_SNAPSHOT_THRESHOLD
+              value: "{{ .Values.policies.config.persistence.snapshots.threshold }}"
+            {{- if .Values.policies.extraEnv }}
+              {{- toYaml .Values.policies.extraEnv | nindent 12 }}
+            {{- end }}
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+            - name: remoting
+              containerPort: {{ .Values.akka.remoting.port }}
+              protocol: TCP
+            - name: management
+              containerPort: {{ .Values.akka.mgmthttp.port }}
+              protocol: TCP
+            {{- if .Values.global.prometheus.enabled }}
+            - name: prometheus
+              protocol: TCP
+              containerPort: {{ .Values.global.prometheus.port }}
+            {{- end }}
+          readinessProbe:
+            httpGet:
+              port: management
+              path: /ready
+            initialDelaySeconds: {{ .Values.policies.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.policies.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.policies.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.policies.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.policies.readinessProbe.failureThreshold }}
+          livenessProbe:
+            httpGet:
+              port: management
+              path: /alive
+            initialDelaySeconds: {{ .Values.policies.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.policies.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.policies.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.policies.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.policies.livenessProbe.failureThreshold }}
+          volumeMounts:
+            {{- if .Values.global.logging.customConfigFile.enabled }}
+            - name: ditto-custom-log-config
+              mountPath: /opt/ditto/{{ .Values.global.logging.customConfigFile.fileName }}
+              subPath: {{ .Values.global.logging.customConfigFile.fileName }}
+            {{- end }}
+            {{- if .Values.global.logging.logFiles.enabled }}
+            - name: ditto-log-files-directory
+              mountPath: /var/log/ditto
+            {{- end }}
+          resources:
+            requests:
+              cpu: {{ mulf .Values.policies.resources.cpu 1000 }}m
+              memory: {{ .Values.policies.resources.memoryMi }}Mi
+            limits:
+              # ## no cpu limit to avoid CFS scheduler limits
+              # ref: https://doc.akka.io/docs/akka/snapshot/additional/deploy.html#in-kubernetes
+              # cpu: ""
+              memory: {{ .Values.policies.resources.memoryMi }}Mi
+          {{- if .Values.openshift.enabled }}
+          {{- with .Values.openshift.securityContext }}
+          securityContext:
+            {{- toYaml . | nindent 8 }}
+          {{- end }}
+          {{- else }}
+          securityContext:
+            runAsNonRoot: true
+            runAsUser: 1000
+            runAsGroup: 1000
+            allowPrivilegeEscalation: false
+          {{- end }}
+      {{- with .Values.policies.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.policies.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.policies.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+        {{- if .Values.global.logging.customConfigFile.enabled }}
+        - name: ditto-custom-log-config
+          configMap:
+            name: {{ .Release.Name }}-logback-config-policies-xml
+        {{- end }}
+        {{- if .Values.global.logging.logFiles.enabled }}
+        - name: ditto-log-files-directory
+          hostPath:
+            path: /var/log/ditto
+            type: DirectoryOrCreate
+        {{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/policies-networkpolicy.yaml b/deployment/helm/templates/policies-networkpolicy.yaml
new file mode 100644
index 00000000000..e73f8c31459
--- /dev/null
+++ b/deployment/helm/templates/policies-networkpolicy.yaml
@@ -0,0 +1,42 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.policies.networkPolicy.enabled -}}
+---
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-policies
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  policyTypes:
+  - Ingress
+  - Egress
+  ingress:
+  # Allow inner cluster communication
+  - from:
+    - podSelector:
+        matchLabels:
+          actorSystemName: {{ .Values.akka.actorSystemName }}
+    ports:
+    - protocol: TCP
+      port: {{ .Values.akka.remoting.port }}
+    - protocol: TCP
+      port: {{ .Values.akka.mgmthttp.port }}
+  # Open all egress
+  egress:
+  - {}
+{{- end }}
diff --git a/deployment/helm/templates/policies-pdb.yaml b/deployment/helm/templates/policies-pdb.yaml
new file mode 100644
index 00000000000..e15dd6bd5aa
--- /dev/null
+++ b/deployment/helm/templates/policies-pdb.yaml
@@ -0,0 +1,26 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if and .Values.policies.podDisruptionBudget.enabled (gt .Values.policies.replicaCount 1.0) -}}
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "ditto.fullname" . }}-policies
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  minAvailable: {{ .Values.policies.podDisruptionBudget.minAvailable }}
+{{- end }}
diff --git a/deployment/helm/templates/policies-podmonitor.yaml b/deployment/helm/templates/policies-podmonitor.yaml
new file mode 100644
index 00000000000..0069a617310
--- /dev/null
+++ b/deployment/helm/templates/policies-podmonitor.yaml
@@ -0,0 +1,38 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if and .Values.policies.podMonitor.enabled .Values.global.prometheus.port -}}
+{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" -}}
+---
+kind: PodMonitor
+apiVersion: monitoring.coreos.com/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-policies
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podMetricsEndpoints:
+  - targetPort: {{ .Values.global.prometheus.port }}
+    path: "/"
+    {{- if .Values.policies.podMonitor.interval }}
+    interval: {{ .Values.policies.podMonitor.interval }}
+    {{- end }}
+    {{- if .Values.policies.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ .Values.policies.podMonitor.scrapeTimeout }}
+    {{- end }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
+  namespaceSelector:
+    matchNames:
+      - {{ $.Release.Namespace | quote }}
+{{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/role.yaml b/deployment/helm/templates/role.yaml
new file mode 100644
index 00000000000..623ea685b72
--- /dev/null
+++ b/deployment/helm/templates/role.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.rbac.enabled -}}
+---
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}
+{{ include "ditto.labels" . | indent 4 }}
+rules:
+- apiGroups: [""]
+  resources: ["pods"]
+  verbs: ["get", "watch", "list"]
+{{- end -}}
diff --git a/deployment/helm/templates/rolebinding.yaml b/deployment/helm/templates/rolebinding.yaml
new file mode 100644
index 00000000000..3fdece1eb9f
--- /dev/null
+++ b/deployment/helm/templates/rolebinding.yaml
@@ -0,0 +1,27 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.rbac.enabled -}}
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}
+{{ include "ditto.labels" . | indent 4 }}
+roleRef:
+  kind: Role
+  name: {{ include "ditto.fullname" . }}
+  apiGroup: rbac.authorization.k8s.io
+subjects:
+- kind: ServiceAccount
+  name: {{ template "ditto.serviceAccountName" . }}
+{{- end -}}
diff --git a/deployment/helm/templates/serviceaccount.yaml b/deployment/helm/templates/serviceaccount.yaml
new file mode 100644
index 00000000000..04f60c2146a
--- /dev/null
+++ b/deployment/helm/templates/serviceaccount.yaml
@@ -0,0 +1,20 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.serviceAccount.create -}}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "ditto.serviceAccountName" . }}
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}
+{{ include "ditto.labels" . | indent 4 }}
+{{- end -}}
diff --git a/deployment/helm/templates/swaggerui-config.yaml b/deployment/helm/templates/swaggerui-config.yaml
new file mode 100644
index 00000000000..3f035ae4a7a
--- /dev/null
+++ b/deployment/helm/templates/swaggerui-config.yaml
@@ -0,0 +1,30 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.swaggerui.enabled -}}
+{{- $releaseName := .Release.Name -}}
+{{- $name := include "ditto.name" . -}}
+{{- $labels := include "ditto.labels" . -}}
+{{ $root := . }}
+{{ range $path, $bytes := .Files.Glob "swaggerui-config/**" }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $releaseName }}-{{ $path | replace "/" "-" | replace "." "-" }}
+  labels:
+    app.kubernetes.io/name: {{ $name }}-swaggerui-config
+{{ $labels | indent 4 }}
+data:
+  {{ $path | replace "swaggerui-config/" ""}}: |-
+{{ $root.Files.Get $path | indent 4 }}
+---
+{{- end -}}
+{{- end -}}
diff --git a/deployment/helm/templates/swaggerui-deployment.yaml b/deployment/helm/templates/swaggerui-deployment.yaml
new file mode 100644
index 00000000000..e6854da2dfa
--- /dev/null
+++ b/deployment/helm/templates/swaggerui-deployment.yaml
@@ -0,0 +1,114 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.swaggerui.enabled -}}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "ditto.fullname" . }}-swaggerui
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.swaggerui.replicaCount }}
+  strategy:
+  {{- with .Values.swaggerui.updateStrategy }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        {{- with .Values.swaggerui.additionalLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- with .Values.swaggerui.additionalAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      initContainers:
+        - name: {{ .Chart.Name }}-swaggerui-init
+          image: "docker.io/boky/alpine-bootstrap:latest"
+          imagePullPolicy: {{ .Values.swaggerui.image.pullPolicy }}
+          command:
+            - sh
+            - -ec
+            - |
+               mkdir -p /usr/share/nginx/html/openapi
+               curl -sL https://raw.githubusercontent.com/eclipse/ditto/{{ .Chart.AppVersion }}/documentation/src/main/resources/openapi/ditto-api-2.yml -o /usr/share/nginx/html/openapi/ditto-api-2.yml
+               sed --in-place "\=- url: 'https://ditto.eclipseprojects.io/api/2'=d" /usr/share/nginx/html/openapi/ditto-api-2.yml
+               sed --in-place "/description: online Ditto Sandbox/d" /usr/share/nginx/html/openapi/ditto-api-2.yml
+               echo "removing Google auth from ditto-api-2.yml"
+               sed --in-place "/- Google:/,+1d" /usr/share/nginx/html/openapi/ditto-api-2.yml
+               sed --in-place "/    Google:/,+9d" /usr/share/nginx/html/openapi/ditto-api-2.yml
+               {{- if not .Values.gateway.config.authentication.enablePreAuthentication }}
+               echo "removing NginxBasic auth from ditto-api-2.yml"
+               sed --in-place "/- NginxBasic: \[]/d" /usr/share/nginx/html/openapi/ditto-api-2.yml
+               sed --in-place "/    NginxBasic:/,+3d" /usr/share/nginx/html/openapi/ditto-api-2.yml
+               {{- end }}
+               {{- if eq .Values.gateway.config.authentication.devops.authMethod "oauth2" }}
+               echo "removing DevOpsBasic auth from ditto-api-2.yml"
+               sed --in-place "/- DevOpsBasic: \[]/d" /usr/share/nginx/html/openapi/ditto-api-2.yml
+               sed --in-place "/    DevOpsBasic:/,+3d" /usr/share/nginx/html/openapi/ditto-api-2.yml
+               {{- else }}
+               echo "removing DevOpsBearer auth from ditto-api-2.yml"
+               sed --in-place "/- DevOpsBearer: \[]/d" /usr/share/nginx/html/openapi/ditto-api-2.yml
+               sed --in-place "/    DevOpsBearer:/,+4d" /usr/share/nginx/html/openapi/ditto-api-2.yml
+               {{- end }}
+               sed --in-place "s=- url: /api/2=- url: {{ .Values.global.proxyPart }}/api/2=g" /usr/share/nginx/html/openapi/ditto-api-2.yml
+               cp -rv /usr/share/nginx/html/openapi/. /init-config/
+          volumeMounts:
+            - name: swagger-ui-init-config
+              mountPath: /init-config
+      containers:
+        - name: {{ .Chart.Name }}-swaggerui
+          image: "{{ .Values.swaggerui.image.repository }}:{{ .Values.swaggerui.image.tag }}"
+          imagePullPolicy: {{ .Values.swaggerui.image.pullPolicy }}
+          env:
+            - name: QUERY_CONFIG_ENABLED
+              value: "true"
+            {{- if .Values.swaggerui.extraEnv }}
+              {{- toYaml .Values.swaggerui.extraEnv | nindent 12 }}
+            {{- end }}
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+          resources:
+            requests:
+              cpu: {{ mulf .Values.swaggerui.resources.cpu 1000 }}m
+              memory: {{ .Values.swaggerui.resources.memoryMi }}Mi
+            limits:
+              # cpu: ""
+              memory: {{ .Values.swaggerui.resources.memoryMi }}Mi
+          volumeMounts:
+            - name: swagger-ui-init-config
+              mountPath: /usr/share/nginx/html/openapi
+            - name: swaggerui-index
+              mountPath: /usr/share/nginx/html/index.html
+              subPath: index.html
+      volumes:
+        - name: swagger-ui-init-config
+          emptyDir: {}
+        - name: swaggerui-index
+          configMap:
+            name: {{ .Release.Name }}-swaggerui-config-index-html
+{{- end }}
diff --git a/deployment/helm/templates/swaggerui-networkpolicy.yaml b/deployment/helm/templates/swaggerui-networkpolicy.yaml
new file mode 100644
index 00000000000..102c206100a
--- /dev/null
+++ b/deployment/helm/templates/swaggerui-networkpolicy.yaml
@@ -0,0 +1,36 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.swaggerui.networkPolicy.enabled -}}
+---
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-swaggerui
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  policyTypes:
+  - Ingress
+  ingress:
+  - from:
+    - podSelector:
+        matchLabels:
+          app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
+          app.kubernetes.io/instance: {{ .Release.Name }}
+    ports:
+    - protocol: TCP
+      port: 8080
+{{- end }}
diff --git a/deployment/helm/templates/swaggerui-pdb.yaml b/deployment/helm/templates/swaggerui-pdb.yaml
new file mode 100644
index 00000000000..43abca8abc2
--- /dev/null
+++ b/deployment/helm/templates/swaggerui-pdb.yaml
@@ -0,0 +1,26 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if and .Values.swaggerui.podDisruptionBudget.enabled (gt .Values.swaggerui.replicaCount 1.0) -}}
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "ditto.fullname" . }}-swaggerui
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  minAvailable: {{ .Values.swaggerui.podDisruptionBudget.minAvailable }}
+{{- end }}
diff --git a/deployment/helm/templates/swaggerui-service.yaml b/deployment/helm/templates/swaggerui-service.yaml
new file mode 100644
index 00000000000..bb330b57059
--- /dev/null
+++ b/deployment/helm/templates/swaggerui-service.yaml
@@ -0,0 +1,33 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.swaggerui.enabled -}}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "ditto.fullname" . }}-swaggerui
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
+{{ include "ditto.labels" . | indent 4 }}
+  {{- with .Values.swaggerui.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  ports:
+    - port: {{ .Values.swaggerui.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
+    app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
diff --git a/deployment/helm/templates/things-deployment.yaml b/deployment/helm/templates/things-deployment.yaml
new file mode 100644
index 00000000000..50a4284fa32
--- /dev/null
+++ b/deployment/helm/templates/things-deployment.yaml
@@ -0,0 +1,296 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.things.enabled -}}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "ditto.fullname" . }}-things
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-things
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.things.replicaCount }}
+  strategy:
+  {{- with .Values.things.updateStrategy }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  minReadySeconds: {{ .Values.things.minReadySeconds }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-things
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "ditto.name" . }}-things
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        actorSystemName: {{ .Values.akka.actorSystemName }}
+        {{- with .Values.things.additionalLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- if .Values.global.prometheus.enabled }}
+        prometheus.io/scrape: "true"
+        prometheus.io/path: "{{ .Values.global.prometheus.path }}"
+        prometheus.io/port: "{{ .Values.global.prometheus.port }}"
+        {{- end }}
+        checksum/mongodb-config: {{ include (print $.Template.BasePath "/mongodb-secret.yaml") . | sha256sum }}
+        {{- with .Values.things.additionalAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- if .Values.rbac.enabled }}
+      serviceAccountName: {{ template "ditto.serviceAccountName" . }}
+      {{- end }}
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      securityContext:
+        fsGroup: 1000
+      initContainers:
+        {{- if .Values.global.logging.logFiles.enabled }}
+        - name: change-volume-owner
+          image: busybox
+          securityContext:
+            runAsUser: 0
+          command: [ "sh", "-c", "chown -R 1000:1000 /var/log/ditto && echo 'changed ownership of /var/log/ditto to 1000:1000'" ]
+          volumeMounts:
+            - name: ditto-log-files-directory
+              mountPath: /var/log/ditto
+        {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}-things
+          image: {{ printf "%s:%s" .Values.things.image.repository ( default .Chart.AppVersion ( default .Values.dittoTag .Values.things.image.tag ) ) }}
+          imagePullPolicy: {{ .Values.things.image.pullPolicy }}
+          env:
+            {{- if not .Values.global.logging.customConfigFile.enabled }}
+            - name: DITTO_LOGGING_DISABLE_SYSOUT_LOG
+              value: "{{ if .Values.global.logging.sysout.enabled }}false{{ else }}true{{ end }}"
+            - name: DITTO_LOGGING_FILE_APPENDER
+              value: "{{ if .Values.global.logging.logFiles.enabled }}true{{ else }}false{{ end }}"
+            {{- end }}
+            - name: DITTO_TRACING_ENABLED
+              value: "{{ .Values.global.tracing.enabled }}"
+            - name: OTEL_EXPORTER_OTLP_ENDPOINT
+              value: "{{ .Values.global.tracing.otelExporterOtlpEndpoint }}"
+            - name: DITTO_TRACING_SAMPLER
+              value: "{{ .Values.global.tracing.sampler }}"
+            - name: DITTO_TRACING_RANDOM_SAMPLER_PROBABILITY
+              value: "{{ .Values.global.tracing.randomSampler.probability }}"
+            - name: DITTO_TRACING_ADAPTIVE_SAMPLER_THROUGHPUT
+              value: "{{ .Values.global.tracing.adaptiveSampler.throughput }}"
+            {{- if .Values.global.logging.logstash.enabled }}
+            - name: DITTO_LOGGING_LOGSTASH_SERVER
+              value: "{{ .Values.global.logging.logstash.endpoint }}"
+            {{- end }}
+            - name: POD_LABEL_SELECTOR
+              value: "app.kubernetes.io/name=%s"
+            - name: POD_NAMESPACE
+              value: {{.Release.Namespace}}
+            - name: INSTANCE_INDEX
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.name
+            - name: HOSTNAME
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: DISCOVERY_METHOD
+              value: "kubernetes-api"
+            - name: TZ
+              value: "{{ .Values.global.timezone }}"
+            - name: JAVA_TOOL_OPTIONS
+              value: >
+                {{ .Values.global.jvmOptions }}
+                -XX:ActiveProcessorCount={{ .Values.things.jvm.activeProcessorCount }}
+                -XX:MaxRAMPercentage={{ .Values.things.jvm.heapRamPercentage }}
+                -XX:InitialRAMPercentage={{ .Values.things.jvm.heapRamPercentage }}
+                -XX:MaxGCPauseMillis={{ .Values.things.jvm.maxGcPauseMillis }}
+                {{ .Values.things.additionalJvmOptions }}
+                {{- .Values.global.akkaOptions }}
+                {{- if .Values.global.logging.customConfigFile.enabled }}
+                -Dlogback.configurationFile=/opt/ditto/{{ .Values.global.logging.customConfigFile.fileName }}
+                {{- end }}
+                {{- range $index, $header := .Values.things.config.persistence.events.historicalHeadersToPersist }}
+                "{{ printf "%s%d=%s" "-Dditto.things.thing.event.historical-headers-to-persist." $index $header }}"
+                {{- end }}
+                '-Dditto.things.wot.to-thing-description.json-template={{ .Values.things.config.wot.tdJsonTemplate | replace "\n" "" | replace "\\\"" "\"" }}'
+                {{ join " " .Values.things.systemProps }}
+            - name: MONGO_DB_SSL_ENABLED
+              value: "{{ if .Values.dbconfig.things.ssl }}true{{ else }}false{{ end }}"
+            - name: MONGO_DB_URI
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.dbconfig.uriSecret | default ( printf "%s-mongodb-secret" ( include "ditto.fullname" . )) }}
+                  key: things-uri
+            - name: MONGO_DB_CONNECTION_MIN_POOL_SIZE
+              value: "{{ .Values.things.config.mongodb.minPoolSize }}"
+            - name: MONGO_DB_CONNECTION_POOL_SIZE
+              value: "{{ .Values.things.config.mongodb.maxPoolSize }}"
+            - name: MONGO_DB_CONNECTION_POOL_IDLE_TIME
+              value: "{{ .Values.things.config.mongodb.maxPoolIdleTime }}"
+            {{- if .Values.global.prometheus.enabled }}
+            - name: PROMETHEUS_PORT
+              value: "{{ .Values.global.prometheus.port }}"
+            {{- end }}
+            - name: CLUSTER_BS_REQUIRED_CONTACTS
+              value: "{{ .Values.global.cluster.requiredContactPoints }}"
+            - name: DITTO_DDATA_NUMBER_OF_SHARDS
+              value: "{{ .Values.global.cluster.ddata.numberOfShards }}"
+            - name: DITTO_DDATA_MAX_DELTA_ELEMENTS
+              value: "{{ .Values.global.cluster.ddata.maxDeltaElements }}"
+            - name: CLUSTER_NUMBER_OF_SHARDS
+              value: "{{ .Values.global.cluster.numberOfShards }}"
+            - name: CLUSTER_DOWNING_STABLE_AFTER
+              value: "{{ .Values.global.cluster.downingStableAfter }}"
+            - name: CLUSTER_DOWNING_DOWN_ALL_WHEN_UNSTABLE
+              value: "{{ .Values.global.cluster.downAllWhenUnstable }}"
+            - name: AKKA_PERSISTENCE_MONGO_JOURNAL_WRITE_CONCERN
+              value: "{{ .Values.things.config.mongodb.journalWriteConcern }}"
+            - name: AKKA_PERSISTENCE_MONGO_SNAPS_WRITE_CONCERN
+              value: "{{ .Values.things.config.mongodb.snapsWriteConcern }}"
+            - name: BREAKER_MAXTRIES
+              value: "{{ .Values.things.config.mongodb.journalCircuitBreaker.maxTries }}"
+            - name: BREAKER_TIMEOUT
+              value: "{{ .Values.things.config.mongodb.journalCircuitBreaker.timeout }}"
+            - name: BREAKER_RESET
+              value: "{{ .Values.things.config.mongodb.journalCircuitBreaker.reset }}"
+            - name: SNAPSHOT_BREAKER_MAXTRIES
+              value: "{{ .Values.things.config.mongodb.snapsCircuitBreaker.maxTries }}"
+            - name: SNAPSHOT_BREAKER_TIMEOUT
+              value: "{{ .Values.things.config.mongodb.snapsCircuitBreaker.timeout }}"
+            - name: SNAPSHOT_BREAKER_RESET
+              value: "{{ .Values.things.config.mongodb.snapsCircuitBreaker.reset }}"
+            - name: THING_ACTIVITY_CHECK_INTERVAL
+              value: "{{ .Values.things.config.persistence.activityCheckInterval }}"
+            - name: HEALTH_CHECK_METRICS_REPORTER_RESOLUTION
+              value: "{{ .Values.things.config.cleanup.metricsReporter.resolution }}"
+            - name: HEALTH_CHECK_METRICS_REPORTER_HISTORY
+              value: "{{ .Values.things.config.cleanup.metricsReporter.history }}"
+            - name: CLEANUP_ENABLED
+              value: "{{ .Values.things.config.cleanup.enabled }}"
+            - name: CLEANUP_QUIET_PERIOD
+              value: "{{ .Values.things.config.cleanup.quietPeriod }}"
+            - name: CLEANUP_HISTORY_RETENTION_DURATION
+              value: "{{ .Values.things.config.cleanup.history.retentionDuration }}"
+            - name: CLEANUP_INTERVAL
+              value: "{{ .Values.things.config.cleanup.interval }}"
+            - name: CLEANUP_TIMER_THRESHOLD
+              value: "{{ .Values.things.config.cleanup.timerThreshold }}"
+            - name: CLEANUP_CREDITS_PER_BATCH
+              value: "{{ .Values.things.config.cleanup.creditsPerBatch }}"
+            - name: THING_SNAPSHOT_INTERVAL
+              value: "{{ .Values.things.config.persistence.snapshots.interval }}"
+            - name: THING_SNAPSHOT_THRESHOLD
+              value: "{{ .Values.things.config.persistence.snapshots.threshold }}"
+            - name: DITTO_POLICIES_ENFORCER_CACHE_ENABLED
+              value: "{{ .Values.things.config.policiesEnforcer.cache.enabled }}"
+            - name: DITTO_POLICIES_ENFORCER_CACHE_MAX_SIZE
+              value: "{{ .Values.things.config.policiesEnforcer.cache.maxSize }}"
+            - name: DITTO_POLICIES_ENFORCER_CACHE_EXPIRE_AFTER_WRITE
+              value: "{{ .Values.things.config.policiesEnforcer.cache.expireAfterWrite }}"
+            - name: DITTO_POLICIES_ENFORCER_CACHE_EXPIRE_AFTER_ACCESS
+              value: "{{ .Values.things.config.policiesEnforcer.cache.expireAfterAccess }}"
+            - name: THINGS_WOT_TO_THING_DESCRIPTION_BASE_PREFIX
+              value: "{{ .Values.things.config.wot.tdBasePrefix }}"
+            {{- if .Values.things.extraEnv }}
+              {{- toYaml .Values.things.extraEnv | nindent 12 }}
+            {{- end }}
+          ports:
+            - name: remoting
+              containerPort: {{ .Values.akka.remoting.port }}
+              protocol: TCP
+            - name: management
+              containerPort: {{ .Values.akka.mgmthttp.port }}
+              protocol: TCP
+            {{- if .Values.global.prometheus.enabled }}
+            - name: prometheus
+              protocol: TCP
+              containerPort: {{ .Values.global.prometheus.port }}
+            {{- end }}
+          readinessProbe:
+            httpGet:
+              port: management
+              path: /ready
+            initialDelaySeconds: {{ .Values.things.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.things.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.things.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.things.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.things.readinessProbe.failureThreshold }}
+          livenessProbe:
+            httpGet:
+              port: management
+              path: /alive
+            initialDelaySeconds: {{ .Values.things.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.things.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.things.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.things.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.things.livenessProbe.failureThreshold }}
+          volumeMounts:
+            {{- if .Values.global.logging.customConfigFile.enabled }}
+            - name: ditto-custom-log-config
+              mountPath: /opt/ditto/{{ .Values.global.logging.customConfigFile.fileName }}
+              subPath: {{ .Values.global.logging.customConfigFile.fileName }}
+            {{- end }}
+            {{- if .Values.global.logging.logFiles.enabled }}
+            - name: ditto-log-files-directory
+              mountPath: /var/log/ditto
+            {{- end }}
+          resources:
+            requests:
+              cpu: {{ mulf .Values.things.resources.cpu 1000 }}m
+              memory: {{ .Values.things.resources.memoryMi }}Mi
+            limits:
+              # ## no cpu limit to avoid CFS scheduler limits
+              # ref: https://doc.akka.io/docs/akka/snapshot/additional/deploy.html#in-kubernetes
+              # cpu: ""
+              memory: {{ .Values.things.resources.memoryMi }}Mi
+          {{- if .Values.openshift.enabled }}
+          {{- with .Values.openshift.securityContext }}
+          securityContext:
+            {{- toYaml . | nindent 8 }}
+          {{- end }}
+          {{- else }}
+          securityContext:
+            runAsNonRoot: true
+            runAsUser: 1000
+            runAsGroup: 1000
+            allowPrivilegeEscalation: false
+          {{- end }}
+      {{- with .Values.things.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.things.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.things.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+        {{- if .Values.global.logging.customConfigFile.enabled }}
+        - name: ditto-custom-log-config
+          configMap:
+            name: {{ .Release.Name }}-logback-config-things-xml
+        {{- end }}
+        {{- if .Values.global.logging.logFiles.enabled }}
+        - name: ditto-log-files-directory
+          hostPath:
+            path: /var/log/ditto
+            type: DirectoryOrCreate
+        {{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/things-networkpolicy.yaml b/deployment/helm/templates/things-networkpolicy.yaml
new file mode 100644
index 00000000000..86b8d0c6c3a
--- /dev/null
+++ b/deployment/helm/templates/things-networkpolicy.yaml
@@ -0,0 +1,42 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.things.networkPolicy.enabled -}}
+---
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-things
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-things
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-things
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  policyTypes:
+  - Ingress
+  - Egress
+  ingress:
+  # Allow inner cluster communication
+  - from:
+    - podSelector:
+        matchLabels:
+          actorSystemName: {{ .Values.akka.actorSystemName }}
+    ports:
+    - protocol: TCP
+      port: {{ .Values.akka.remoting.port }}
+    - protocol: TCP
+      port: {{ .Values.akka.mgmthttp.port }}
+  # Open all egress
+  egress:
+  - {}
+{{- end }}
diff --git a/deployment/helm/templates/things-pdb.yaml b/deployment/helm/templates/things-pdb.yaml
new file mode 100644
index 00000000000..8f73693f60d
--- /dev/null
+++ b/deployment/helm/templates/things-pdb.yaml
@@ -0,0 +1,26 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if and .Values.things.podDisruptionBudget.enabled (gt .Values.things.replicaCount 1.0) -}}
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "ditto.fullname" . }}-things
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-things
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-things
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  minAvailable: {{ .Values.things.podDisruptionBudget.minAvailable }}
+{{- end }}
diff --git a/deployment/helm/templates/things-podmonitor.yaml b/deployment/helm/templates/things-podmonitor.yaml
new file mode 100644
index 00000000000..e9816d72801
--- /dev/null
+++ b/deployment/helm/templates/things-podmonitor.yaml
@@ -0,0 +1,38 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if and .Values.things.podMonitor.enabled .Values.global.prometheus.port -}}
+{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" -}}
+---
+kind: PodMonitor
+apiVersion: monitoring.coreos.com/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-things
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-things
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podMetricsEndpoints:
+  - targetPort: {{ .Values.global.prometheus.port }}
+    path: "/"
+    {{- if .Values.things.podMonitor.interval }}
+    interval: {{ .Values.things.podMonitor.interval }}
+    {{- end }}
+    {{- if .Values.things.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ .Values.things.podMonitor.scrapeTimeout }}
+    {{- end }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-things
+  namespaceSelector:
+    matchNames:
+      - {{ $.Release.Namespace | quote }}
+{{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/thingssearch-deployment.yaml b/deployment/helm/templates/thingssearch-deployment.yaml
new file mode 100644
index 00000000000..7c32d457ebf
--- /dev/null
+++ b/deployment/helm/templates/thingssearch-deployment.yaml
@@ -0,0 +1,294 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.thingsSearch.enabled -}}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "ditto.fullname" . }}-thingssearch
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.thingsSearch.replicaCount }}
+  strategy:
+  {{- with .Values.thingsSearch.updateStrategy }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  minReadySeconds: {{ .Values.thingsSearch.minReadySeconds }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        actorSystemName: {{ .Values.akka.actorSystemName }}
+        {{- with .Values.thingsSearch.additionalLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- if .Values.global.prometheus.enabled }}
+        prometheus.io/scrape: "true"
+        prometheus.io/path: "{{ .Values.global.prometheus.path }}"
+        prometheus.io/port: "{{ .Values.global.prometheus.port }}"
+        {{- end }}
+        checksum/mongodb-config: {{ include (print $.Template.BasePath "/mongodb-secret.yaml") . | sha256sum }}
+        {{- with .Values.thingsSearch.additionalAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- if .Values.rbac.enabled }}
+      serviceAccountName: {{ template "ditto.serviceAccountName" . }}
+      {{- end }}
+      {{- with .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      securityContext:
+        fsGroup: 1000
+      initContainers:
+        {{- if .Values.global.logging.logFiles.enabled }}
+        - name: change-volume-owner
+          image: busybox
+          securityContext:
+            runAsUser: 0
+          command: [ "sh", "-c", "chown -R 1000:1000 /var/log/ditto && echo 'changed ownership of /var/log/ditto to 1000:1000'" ]
+          volumeMounts:
+            - name: ditto-log-files-directory
+              mountPath: /var/log/ditto
+        {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}-thingssearch
+          image: {{ printf "%s:%s" .Values.thingsSearch.image.repository ( default .Chart.AppVersion ( default .Values.dittoTag .Values.thingsSearch.image.tag ) ) }}
+          imagePullPolicy: {{ .Values.thingsSearch.image.pullPolicy }}
+          env:
+            {{- if not .Values.global.logging.customConfigFile.enabled }}
+            - name: DITTO_LOGGING_DISABLE_SYSOUT_LOG
+              value: "{{ if .Values.global.logging.sysout.enabled }}false{{ else }}true{{ end }}"
+            - name: DITTO_LOGGING_FILE_APPENDER
+              value: "{{ if .Values.global.logging.logFiles.enabled }}true{{ else }}false{{ end }}"
+            {{- end }}
+            - name: DITTO_TRACING_ENABLED
+              value: "{{ .Values.global.tracing.enabled }}"
+            - name: OTEL_EXPORTER_OTLP_ENDPOINT
+              value: "{{ .Values.global.tracing.otelExporterOtlpEndpoint }}"
+            - name: DITTO_TRACING_SAMPLER
+              value: "{{ .Values.global.tracing.sampler }}"
+            - name: DITTO_TRACING_RANDOM_SAMPLER_PROBABILITY
+              value: "{{ .Values.global.tracing.randomSampler.probability }}"
+            - name: DITTO_TRACING_ADAPTIVE_SAMPLER_THROUGHPUT
+              value: "{{ .Values.global.tracing.adaptiveSampler.throughput }}"
+            {{- if .Values.global.logging.logstash.enabled }}
+            - name: DITTO_LOGGING_LOGSTASH_SERVER
+              value: "{{ .Values.global.logging.logstash.endpoint }}"
+            {{- end }}
+            - name: POD_LABEL_SELECTOR
+              value: "app.kubernetes.io/name=%s"
+            - name: POD_NAMESPACE
+              value: {{.Release.Namespace}}
+            - name: INSTANCE_INDEX
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.name
+            - name: HOSTNAME
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: status.podIP
+            - name: DISCOVERY_METHOD
+              value: "kubernetes-api"
+            - name: TZ
+              value: "{{ .Values.global.timezone }}"
+            - name: JAVA_TOOL_OPTIONS
+              value: >
+                {{ .Values.global.jvmOptions }}
+                -XX:ActiveProcessorCount={{ .Values.thingsSearch.jvm.activeProcessorCount }}
+                -XX:MaxRAMPercentage={{ .Values.thingsSearch.jvm.heapRamPercentage }}
+                -XX:InitialRAMPercentage={{ .Values.thingsSearch.jvm.heapRamPercentage }}
+                -XX:MaxGCPauseMillis={{ .Values.thingsSearch.jvm.maxGcPauseMillis }}
+                {{ .Values.thingsSearch.additionalJvmOptions }}
+                {{- .Values.global.akkaOptions }}
+                {{- if .Values.global.logging.customConfigFile.enabled }}
+                -Dlogback.configurationFile=/opt/ditto/{{ .Values.global.logging.customConfigFile.fileName }}
+                {{- end }}
+                {{ join " " .Values.thingsSearch.systemProps }}
+            - name: MONGO_DB_SSL_ENABLED
+              value: "{{ if .Values.dbconfig.thingsSearch.ssl }}true{{ else }}false{{ end }}"
+            - name: MONGO_DB_URI
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.dbconfig.uriSecret | default ( printf "%s-mongodb-secret" ( include "ditto.fullname" . )) }}
+                  key: thingsSearch-uri
+            - name: MONGO_DB_CONNECTION_MIN_POOL_SIZE
+              value: "{{ .Values.thingsSearch.config.mongodb.minPoolSize }}"
+            - name: MONGO_DB_CONNECTION_POOL_SIZE
+              value: "{{ .Values.thingsSearch.config.mongodb.maxPoolSize }}"
+            - name: MONGO_DB_CONNECTION_POOL_IDLE_TIME
+              value: "{{ .Values.thingsSearch.config.mongodb.maxPoolIdleTime }}"
+            {{- if .Values.global.prometheus.enabled }}
+            - name: PROMETHEUS_PORT
+              value: "{{ .Values.global.prometheus.port }}"
+            {{- end }}
+            - name: CLUSTER_BS_REQUIRED_CONTACTS
+              value: "{{ .Values.global.cluster.requiredContactPoints }}"
+            - name: DITTO_DDATA_NUMBER_OF_SHARDS
+              value: "{{ .Values.global.cluster.ddata.numberOfShards }}"
+            - name: DITTO_DDATA_MAX_DELTA_ELEMENTS
+              value: "{{ .Values.global.cluster.ddata.maxDeltaElements }}"
+            - name: CLUSTER_NUMBER_OF_SHARDS
+              value: "{{ .Values.global.cluster.numberOfShards }}"
+            - name: CLUSTER_DOWNING_STABLE_AFTER
+              value: "{{ .Values.global.cluster.downingStableAfter }}"
+            - name: CLUSTER_DOWNING_DOWN_ALL_WHEN_UNSTABLE
+              value: "{{ .Values.global.cluster.downAllWhenUnstable }}"
+            - name: MONGO_DB_READ_PREFERENCE
+              value: "{{ .Values.thingsSearch.config.mongodb.searchReadPreference }}"
+            - name: QUERY_PERSISTENCE_MONGO_DB_READ_CONCERN
+              value: "{{ .Values.thingsSearch.config.mongodb.queryReadConcern }}"
+            - name: MONGO_DB_WRITE_CONCERN
+              value: "{{ .Values.thingsSearch.config.mongodb.searchWriteConcern }}"
+            - name: UPDATER_PERSISTENCE_MONGO_DB_READ_CONCERN
+              value: "{{ .Values.thingsSearch.config.mongodb.updaterPersistenceReadConcern }}"
+            - name: UPDATER_PERSISTENCE_MONGO_DB_READ_PREFERENCE
+              value: "{{ .Values.thingsSearch.config.mongodb.updaterPersistenceReadPreference }}"
+            - name: THINGS_SEARCH_UPDATER_STREAM_PERSISTENCE_WITH_ACKS_WRITE_CONCERN
+              value: "{{ .Values.thingsSearch.config.mongodb.searchWithAcksWriteConcern }}"
+            - name: THINGS_SEARCH_UPDATER_STREAM_POLICY_CACHE_SIZE
+              value: "{{ .Values.thingsSearch.config.updater.stream.policiesEnforcer.cache.maxSize }}"
+            - name: THINGS_SEARCH_UPDATER_STREAM_POLICY_CACHE_EXPIRY
+              value: "{{ .Values.thingsSearch.config.updater.stream.policiesEnforcer.cache.expireAfterWrite }}"
+            - name: THINGS_SEARCH_UPDATER_STREAM_POLICY_CACHE_EXPIRY_AFTER_ACCESS
+              value: "{{ .Values.thingsSearch.config.updater.stream.policiesEnforcer.cache.expireAfterAccess }}"
+            - name: THINGS_SEARCH_UPDATER_STREAM_THING_CACHE_SIZE
+              value: "{{ .Values.thingsSearch.config.updater.stream.thingCache.maxSize }}"
+            - name: THINGS_SEARCH_UPDATER_STREAM_THING_CACHE_EXPIRY
+              value: "{{ .Values.thingsSearch.config.updater.stream.thingCache.expireAfterWrite }}"
+            - name: THINGS_SEARCH_UPDATER_STREAM_THING_CACHE_EXPIRY_AFTER_ACCESS
+              value: "{{ .Values.thingsSearch.config.updater.stream.thingCache.expireAfterAccess }}"
+            - name: THINGS_SEARCH_UPDATER_STREAM_RETRIEVAL_PARALLELISM
+              value: "{{ .Values.thingsSearch.config.updater.stream.retrievalParallelism }}"
+            - name: THINGS_SEARCH_UPDATER_STREAM_PERSISTENCE_PARALLELISM
+              value: "{{ .Values.thingsSearch.config.updater.stream.persistence.parallelism }}"
+            - name: ACTIVITY_CHECK_INTERVAL
+              value: "{{ .Values.thingsSearch.config.updater.activityCheckInterval }}"
+            - name: BACKGROUND_SYNC_ENABLED
+              value: "{{ .Values.thingsSearch.config.updater.backgroundSync.enabled }}"
+            - name: BACKGROUND_SYNC_QUIET_PERIOD
+              value: "{{ .Values.thingsSearch.config.updater.backgroundSync.quietPeriod }}"
+            - name: BACKGROUND_SYNC_IDLE_TIMEOUT
+              value: "{{ .Values.thingsSearch.config.updater.backgroundSync.idleTimeout }}"
+            - name: BACKGROUND_SYNC_TOLERANCE_WINDOW
+              value: "{{ .Values.thingsSearch.config.updater.backgroundSync.toleranceWindow }}"
+            - name: BACKGROUND_SYNC_KEEP_EVENTS
+              value: "{{ .Values.thingsSearch.config.updater.backgroundSync.keepEvents }}"
+            - name: BACKGROUND_SYNC_THROTTLE_THROUGHPUT
+              value: "{{ .Values.thingsSearch.config.updater.backgroundSync.throttle.throughput }}"
+            - name: BACKGROUND_SYCN_THROTTLE_PERIOD
+              value: "{{ .Values.thingsSearch.config.updater.backgroundSync.throttle.period }}"
+            - name: DITTO_POLICIES_ENFORCER_CACHE_MAX_SIZE
+              value: "{{ .Values.thingsSearch.config.updater.stream.policiesEnforcer.cache.maxSize }}"
+            - name: DITTO_POLICIES_ENFORCER_CACHE_EXPIRE_AFTER_WRITE
+              value: "{{ .Values.thingsSearch.config.updater.stream.policiesEnforcer.cache.expireAfterWrite }}"
+            - name: DITTO_POLICIES_ENFORCER_CACHE_EXPIRE_AFTER_ACCESS
+              value: "{{ .Values.thingsSearch.config.updater.stream.policiesEnforcer.cache.expireAfterAccess }}"
+            {{- if .Values.thingsSearch.extraEnv }}
+              {{- toYaml .Values.thingsSearch.extraEnv | nindent 12 }}
+            {{- end }}
+          ports:
+            - name: remoting
+              containerPort: {{ .Values.akka.remoting.port }}
+              protocol: TCP
+            - name: management
+              containerPort: {{ .Values.akka.mgmthttp.port }}
+              protocol: TCP
+            {{- if .Values.global.prometheus.enabled }}
+            - name: prometheus
+              protocol: TCP
+              containerPort: {{ .Values.global.prometheus.port }}
+            {{- end }}
+          readinessProbe:
+            httpGet:
+              port: management
+              path: /ready
+            initialDelaySeconds: {{ .Values.thingsSearch.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.thingsSearch.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.thingsSearch.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.thingsSearch.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.thingsSearch.readinessProbe.failureThreshold }}
+          livenessProbe:
+            httpGet:
+              port: management
+              path: /alive
+            initialDelaySeconds: {{ .Values.thingsSearch.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.thingsSearch.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.thingsSearch.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.thingsSearch.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.thingsSearch.livenessProbe.failureThreshold }}
+          volumeMounts:
+            {{- if .Values.global.logging.customConfigFile.enabled }}
+            - name: ditto-custom-log-config
+              mountPath: /opt/ditto/{{ .Values.global.logging.customConfigFile.fileName }}
+              subPath: {{ .Values.global.logging.customConfigFile.fileName }}
+            {{- end }}
+            {{- if .Values.global.logging.logFiles.enabled }}
+            - name: ditto-log-files-directory
+              mountPath: /var/log/ditto
+            {{- end }}
+          resources:
+            requests:
+              cpu: {{ mulf .Values.thingsSearch.resources.cpu 1000 }}m
+              memory: {{ .Values.thingsSearch.resources.memoryMi }}Mi
+            limits:
+              # ## no cpu limit to avoid CFS scheduler limits
+              # ref: https://doc.akka.io/docs/akka/snapshot/additional/deploy.html#in-kubernetes
+              # cpu: ""
+              memory: {{ .Values.thingsSearch.resources.memoryMi }}Mi
+          {{- if .Values.openshift.enabled }}
+          {{- with .Values.openshift.securityContext }}
+          securityContext:
+            {{- toYaml . | nindent 8 }}
+          {{- end }}
+          {{- else }}
+          securityContext:
+            runAsNonRoot: true
+            runAsUser: 1000
+            runAsGroup: 1000
+            allowPrivilegeEscalation: false
+          {{- end }}
+      {{- with .Values.thingsSearch.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.thingsSearch.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.thingsSearch.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+        {{- if .Values.global.logging.customConfigFile.enabled }}
+        - name: ditto-custom-log-config
+          configMap:
+            name: {{ .Release.Name }}-logback-config-thingssearch-xml
+        {{- end }}
+        {{- if .Values.global.logging.logFiles.enabled }}
+        - name: ditto-log-files-directory
+          hostPath:
+            path: /var/log/ditto
+            type: DirectoryOrCreate
+        {{- end }}
+{{- end }}
diff --git a/deployment/helm/templates/thingssearch-networkpolicy.yaml b/deployment/helm/templates/thingssearch-networkpolicy.yaml
new file mode 100644
index 00000000000..607616e42b2
--- /dev/null
+++ b/deployment/helm/templates/thingssearch-networkpolicy.yaml
@@ -0,0 +1,42 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.thingsSearch.networkPolicy.enabled -}}
+---
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-thingssearch
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  policyTypes:
+  - Ingress
+  - Egress
+  ingress:
+  # Allow inner cluster communication
+  - from:
+    - podSelector:
+        matchLabels:
+          actorSystemName: {{ .Values.akka.actorSystemName }}
+    ports:
+    - protocol: TCP
+      port: {{ .Values.akka.remoting.port }}
+    - protocol: TCP
+      port: {{ .Values.akka.mgmthttp.port }}
+  # Open all egress
+  egress:
+  - {}
+{{- end }}
diff --git a/deployment/helm/templates/thingssearch-pdb.yaml b/deployment/helm/templates/thingssearch-pdb.yaml
new file mode 100644
index 00000000000..c7651415a06
--- /dev/null
+++ b/deployment/helm/templates/thingssearch-pdb.yaml
@@ -0,0 +1,26 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if and .Values.things.podDisruptionBudget.enabled (gt .Values.things.replicaCount 1.0) -}}
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "ditto.fullname" . }}-thingssearch
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  minAvailable: {{ .Values.things.podDisruptionBudget.minAvailable }}
+{{- end }}
diff --git a/deployment/helm/templates/thingssearch-podmonitor.yaml b/deployment/helm/templates/thingssearch-podmonitor.yaml
new file mode 100644
index 00000000000..7f83efb6a58
--- /dev/null
+++ b/deployment/helm/templates/thingssearch-podmonitor.yaml
@@ -0,0 +1,38 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if and .Values.thingsSearch.podMonitor.enabled .Values.global.prometheus.port -}}
+{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" -}}
+---
+kind: PodMonitor
+apiVersion: monitoring.coreos.com/v1
+metadata:
+  name: {{ include "ditto.fullname" . }}-thingssearch
+  labels:
+    app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
+{{ include "ditto.labels" . | indent 4 }}
+spec:
+  podMetricsEndpoints:
+  - targetPort: {{ .Values.global.prometheus.port }}
+    path: "/"
+    {{- if .Values.thingsSearch.podMonitor.interval }}
+    interval: {{ .Values.thingsSearch.podMonitor.interval }}
+    {{- end }}
+    {{- if .Values.thingsSearch.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ .Values.thingsSearch.podMonitor.scrapeTimeout }}
+    {{- end }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
+  namespaceSelector:
+    matchNames:
+      - {{ $.Release.Namespace | quote }}
+{{- end }}
+{{- end }}
diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml
new file mode 100644
index 00000000000..aae389e29e3
--- /dev/null
+++ b/deployment/helm/values.yaml
@@ -0,0 +1,1572 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+---
+# Default values for ditto.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+serviceAccount:
+  # create controls whether a service account should be created
+  create: true
+  # name is the name of the service account to use
+  #  If not set and create is true, a name is generated using the fullname template
+  name:
+
+rbac:
+  # enabled controls whether RBAC resources will be created
+  enabled: true
+
+nameOverride: ""
+fullnameOverride: ""
+
+## ----------------------------------------------------------------------------
+## global configuration shared by all components
+global:
+  # cluster holds the configuration for the Ditto/Akka cluster
+  cluster:
+    # requiredContactPoints defines the total amount of replicas in the Ditto cluster
+    #  only if this amount is "seen" during cluster formation, the cluster can form itself
+    requiredContactPoints: 5
+    # ddata holds the "Distributed Data" configuration:
+    ddata:
+      # numberOfShards defines whether ddata structures should be shared (if >1)
+      #  this is needed in case a lot of event subscribers (thousands) are connected simultaneously
+      numberOfShards: 1
+      # maxDeltaElements defines how many elements should be synced with a single cluster message
+      #  if numberOfShards is > 1, it makes sense to keep maxDeltaElements lower
+      #  so that the message size for remoting is not exceeding the configured max message size
+      maxDeltaElements: 1
+    # numberOfShards configures the sharding applied for things/policies/connections based on their ID
+    #  as a rule of thumb: should be factor ten of the amount of cluster replicas for an entity
+    numberOfShards: 50
+    # downingStableAfter is a configuration of the Akka SBR (split brain resolver)
+    #  how to find the right value: https://doc.akka.io/docs/akka/current/split-brain-resolver.html
+    downingStableAfter: 15s
+    # downAllWhenUnstable is a configuration of the Akka SBR (split brain resolver)
+    downAllWhenUnstable: "on"
+  # basicAuthUsers configures (as a map) several user/password combinations which the nginx of the Ditto chart will authenticate
+  basicAuthUsers: {}
+  # ditto:
+  #   user: ditto
+  #   password: ditto
+  # hashedBasicAuthUsers configures a list of hashed .htpasswd username/password entries
+  hashedBasicAuthUsers: []
+  # jwtOnly controls whether only OpenID-Connect authentication is supported
+  #  if false, both OpenID-Connect and basicAuth via nginx (see above "basicAuthUsers" and "hashedBasicAuthUsers") is used
+  #  ref: https://www.eclipse.org/ditto/installation-operating.html#openid-connect
+  jwtOnly: true
+  # jvmOptions defines the JVM options applied to all Ditto services running in the JVM, it is put in JAVA_TOOL_OPTIONS
+  jvmOptions: >
+    -XX:+ExitOnOutOfMemoryError
+    -XX:+UseContainerSupport
+    -XX:+UseStringDeduplication
+    -Xss512k
+    -XX:MaxMetaspaceSize=256m
+    -XX:+UseG1GC
+    -Djava.net.preferIPv4Stack=true
+  akkaOptions: >
+    -Dakka.management.cluster.bootstrap.contact-point-discovery.port-name=management
+    -Dakka.cluster.failure-detector.threshold=15.0
+    -Dakka.cluster.failure-detector.expected-response-after=3s
+    -Dakka.cluster.failure-detector.acceptable-heartbeat-pause=7s
+    -Dakka.persistence.journal-plugin-fallback.recovery-event-timeout=30s
+    -Dakka.persistence.max-concurrent-recoveries=100
+    -Dakka.cluster.sharding.updating-state-timeout=20s
+    -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
+  # timezone defines the timezone to configure the JVM with
+  timezone: Europe/Berlin
+  # imagePullSecrets will be added to every deployment
+  imagePullSecrets: []
+  # proxyPart configures a reverse proxy part to be added in front of the Ditto API endpoints:
+  proxyPart: ""
+  # prometheus holds the Prometheus specific configuration
+  prometheus:
+    # enabled controls whether scrape config annotation will be added to pod templates
+    enabled: true
+    # path where prometheus metric will be provided
+    path: "/"
+    # port where prometheus metrics will be provided
+    port: 9095
+  # logging the logging configuration for Ditto
+  logging:
+    # sysout holds the logging to SYSOUT config
+    sysout:
+      # enabled defines whether to log to SYSOUT
+      enabled: true
+    # logstash configures if logs should be pushed to a logstash endpoint
+    logstash:
+      # enabled defines whether to log to logstash
+      enabled: false
+      # endpoint configures the logstash endpoint to send logs to
+      endpoint: ""
+    # logFiles defines logging to log files config
+    logFiles:
+      # enabled whether to write logs to log files
+      #  log files can be found on the host under /var/log/ditto
+      enabled: false
+    # customConfigFile configures that a custom "Logback" config file should be used instead of the one bundled
+    #  with Ditto on the classpath
+    customConfigFile:
+      # enabled if enabled, a custom logback.xml file added to the Ditto containers will be used for logging configuration
+      enabled: true
+      # fileName passed as Java system property "-Dlogback.configurationFile"
+      fileName: logback.xml
+  # tracing configuration for Ditto
+  tracing:
+    # enabled whether tracing (via OpenTelemetry) is enabled
+    enabled: false
+    # otelExporterOtlpEndpoint the OTLP endpoint to report traces to
+    otelExporterOtlpEndpoint: "http://localhost:4317"
+    # sampler the tracing sampler to use
+    #  can be one of:
+    #   - always: report all traces.
+    #   - never:  don't report any trace.
+    #   - random: randomly decide using the probability defined in the random-sampler.probability setting.
+    #   - adaptive: keeps dynamic samplers for each operation while trying to achieve a set throughput goal.
+    sampler: never
+    # randomSampler configures the 'random' sampler
+    randomSampler:
+      # probability configures the probability of a span being sampled, must be a value between 0 and 1
+      probability: 0.01
+    # adaptiveSampler configures the 'adaptive' sampler
+    adaptiveSampler:
+      # throughput the throughput goal trying to achieve with the adaptive sampler
+      throughput: 600
+
+## ----------------------------------------------------------------------------
+## dbconfig for mongodb connections
+##  will be handled as k8s secret as connection uri might contain auth credentials
+dbconfig:
+  # policies the MongoDB configuration for Ditto "policies" service
+  policies:
+    uri: mongodb://#{PLACEHOLDER_MONGODB_HOSTNAME}#:27017/ditto
+    ssl: false
+  # things the MongoDB configuration for Ditto "things" service
+  things:
+    uri: mongodb://#{PLACEHOLDER_MONGODB_HOSTNAME}#:27017/ditto
+    ssl: false
+  # connectivity the MongoDB configuration for Ditto "connectivity" service
+  connectivity:
+    uri: mongodb://#{PLACEHOLDER_MONGODB_HOSTNAME}#:27017/ditto
+    ssl: false
+  # thingsSearch the MongoDB configuration for Ditto "things-search" service
+  thingsSearch:
+    uri: mongodb://#{PLACEHOLDER_MONGODB_HOSTNAME}#:27017/ditto
+    ssl: false
+  ## If following property is set, an existing secret will be used to retrieve the mongodb connectionUris from.
+  # uriSecret: my-uri-secret
+
+## ----------------------------------------------------------------------------
+## ingress configures the Ingress
+ingress:
+  # enabled whether Ingress should be enabled as alternative to the contained nginx
+  enabled: false
+  # className is the 'ingressClassName' to configure in the Ingress spec
+  className: nginx
+  # host the hostname of the Ingress shared for all: api, ws and ui
+  host: localhost
+  # defaultBackendSuffix the suffix to add to the internal fullname to use as Ingress "defaultBackend"
+  defaultBackendSuffix: nginx
+  # annotations common annotations for all 3 Ingresses of Ditto
+  annotations:
+    nginx.ingress.kubernetes.io/service-upstream: "true"
+    nginx.ingress.kubernetes.io/server-snippet: |
+      charset utf-8;
+      default_type application/json;
+      chunked_transfer_encoding off;
+      
+      send_timeout 70; # seconds, default: 60
+      client_header_buffer_size 8k; # allow longer URIs + headers (default: 1k)
+      large_client_header_buffers 4 16k;
+      
+      proxy_http_version 1.1;
+      proxy_set_header X-Forwarded-Host $http_host;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header X-Forwarded-For $remote_addr;
+      proxy_set_header Host $host;
+  # api the /api, /devops, /status, /overall and /health Ingress configuration
+  api:
+    # paths configures ingress paths
+    paths:
+      - path: /api
+        backendSuffix: gateway
+      - path: /devops
+        backendSuffix: gateway
+      - path: /status
+        backendSuffix: gateway
+      - path: /stats
+        backendSuffix: gateway
+      - path: /overall
+        backendSuffix: gateway
+      - path: /health
+        backendSuffix: gateway
+    # annotations defines k8s annotations to add to the Ingress
+    annotations:
+      nginx.ingress.kubernetes.io/proxy-connect-timeout: "10" # seconds, default: 60
+      nginx.ingress.kubernetes.io/proxy-send-timeout: "70" # seconds, default: 60
+      nginx.ingress.kubernetes.io/proxy-read-timeout: "70" # seconds, default: 60
+      nginx.ingress.kubernetes.io/proxy-next-upstream: "error timeout http_502"
+      nginx.ingress.kubernetes.io/proxy-next-upstream-tries: "4"
+      nginx.ingress.kubernetes.io/proxy-next-upstream-timeout: "50"
+      nginx.ingress.kubernetes.io/proxy-buffer-size: "16k"
+      nginx.ingress.kubernetes.io/configuration-snippet: |
+        set $cors '1';
+        
+        if ($request_method = 'OPTIONS') {
+          set $cors "${cors}o";
+        }
+        
+        if ($cors = '1') {
+          add_header 'Access-Control-Allow-Origin' '$http_origin' always;
+          add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, DELETE, OPTIONS' always;
+          add_header 'Access-Control-Allow-Credentials' 'true' always;
+          add_header 'Access-Control-Allow-Headers' '$http_access_control_request_headers' always;
+          add_header 'Access-Control-Expose-Headers' '*' always;
+        }
+        
+        if ($cors = '1o') {
+          # Tell client that this pre-flight info is valid for 20 days
+          add_header 'Access-Control-Max-Age' 1728000;
+          add_header 'Access-Control-Allow-Origin' '$http_origin' always;
+          add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, DELETE, OPTIONS' always;
+          add_header 'Access-Control-Allow-Credentials' 'true' always;
+          add_header 'Access-Control-Allow-Headers' '$http_access_control_request_headers' always;
+          add_header 'Access-Control-Expose-Headers' '*' always;
+          add_header 'Content-Type' 'text/plain charset=UTF-8';
+          add_header 'Content-Length' 0;
+          return 200;
+        }
+        
+        if ($request_method = 'OPTIONS') {
+          add_header 'Content-Type' 'text/plain charset=UTF-8';
+          return 405 "Origin $http_origin is not in CORS allow-list, contact your admin to get it added";
+        }
+        
+        # security relevant headers:
+        add_header "Content-Security-Policy" "default-src 'none'; frame-ancestors 'none'" always;
+        add_header "Strict-Transport-Security" "max-age=63072000; includeSubdomains;" always;
+        add_header "Cache-Control" "no-cache" always;
+        add_header "X-Content-Type-Options" "nosniff" always;
+        add_header "X-Frame-Options" "SAMEORIGIN" always;
+        add_header "X-XSS-Protection" "1; mode=block" always;
+  # ws the /ws (WebSocket) Ingress configuration
+  ws:
+    # paths configures ingress paths
+    paths:
+      - path: /ws
+        backendSuffix: gateway
+    # annotations defines k8s annotations to add to the Ingress
+    annotations:
+      nginx.ingress.kubernetes.io/proxy-send-timeout: "86400" # seconds, default: 60
+      nginx.ingress.kubernetes.io/proxy-read-timeout: "86400" # seconds, default: 60
+      nginx.ingress.kubernetes.io/proxy-next-upstream: "error timeout http_502"
+      nginx.ingress.kubernetes.io/proxy-next-upstream-tries: "4"
+      nginx.ingress.kubernetes.io/proxy-next-upstream-timeout: "50"
+      nginx.ingress.kubernetes.io/proxy-buffering: "off"
+  # the / Ingress configuration for serving the landing page and static resources
+  root:
+    # paths configures ingress paths
+    paths:
+      - path: /
+        pathType: Exact
+        backendSuffix: nginx
+      - path: /index.html
+        pathType: Exact
+        backendSuffix: nginx
+      - path: /ditto-up.svg
+        pathType: Exact
+        backendSuffix: nginx
+      - path: /ditto-down.svg
+        pathType: Exact
+        backendSuffix: nginx
+    # annotations defines k8s annotations to add to the Ingress
+    annotations:
+      nginx.ingress.kubernetes.io/proxy-connect-timeout: "10"
+      nginx.ingress.kubernetes.io/configuration-snippet: |
+        # security relevant headers:
+        add_header "Content-Security-Policy" "default-src 'self'; script-src-elem 'self' 'sha256-Kq9eqc/CtX2tgHPLJUEf8vDO9eNiGaRBrwAYYXTroVc='  https://cdnjs.cloudflare.com https://cdn.jsdelivr.net; style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://cdnjs.cloudflare.com; worker-src 'self' blob:; object-src 'none';" always;
+        add_header "Strict-Transport-Security" "max-age=63072000; includeSubdomains;" always;
+        add_header "Cache-Control" "no-cache" always;
+        add_header "X-Content-Type-Options" "nosniff" always;
+        add_header "X-Frame-Options" "SAMEORIGIN" always;
+        add_header "X-XSS-Protection" "1; mode=block" always;
+  # ui the /ui and /apidoc Ingress configuration
+  ui:
+    # paths configures ingress paths
+    paths:
+      - path: /
+        pathType: Exact
+        backendSuffix: nginx
+      - path: /apidoc(/|$)(.*)
+        backendSuffix: swaggerui
+      - path: /ui(/|$)(.*)
+        backendSuffix: dittoui
+    # annotations defines k8s annotations to add to the Ingress
+    annotations:
+      nginx.ingress.kubernetes.io/use-regex: "true"
+      nginx.ingress.kubernetes.io/rewrite-target: /$2
+      nginx.ingress.kubernetes.io/proxy-connect-timeout: "10"
+      nginx.ingress.kubernetes.io/configuration-snippet: |
+        # security relevant headers:
+        add_header "Content-Security-Policy" "default-src 'self'; script-src-elem 'self' 'sha256-Ve/Ec/6YDEeTc+9y+QCJ+e9OhyGWAj3bYxCzNGfOn6U=' 'sha256-Kq9eqc/CtX2tgHPLJUEf8vDO9eNiGaRBrwAYYXTroVc=' https://cdnjs.cloudflare.com https://cdn.jsdelivr.net; style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://cdnjs.cloudflare.com; img-src 'self' data: https://raw.githubusercontent.com; font-src 'self' https://cdnjs.cloudflare.com; worker-src 'self' blob:; connect-src 'self' localhost http://localhost:8080; object-src 'none';" always;
+        add_header "Strict-Transport-Security" "max-age=63072000; includeSubdomains;" always;
+        add_header "Cache-Control" "no-cache" always;
+        add_header "X-Content-Type-Options" "nosniff" always;
+        add_header "X-Frame-Options" "SAMEORIGIN" always;
+        add_header "X-XSS-Protection" "1; mode=block" always;
+  # tls configures the TLS for ingress
+  tls: []
+  #  - secretName: ditto-tls
+  #    hosts:
+  #      - localhost
+
+
+## ----------------------------------------------------------------------------
+## openshift configures the OpenShift deployment
+openshift:
+  # enabled whether to deploy to OpenShift
+  enabled: false
+  # routes the OpenShift Routes
+  routes:
+    # enabled whether OpenShift routes are enabled
+    enabled: false
+    # annotations define k8s annotations to apply for the routes
+    annotations: {}
+    # host: ""
+    # targetPort configures the target port
+    targetPort: http
+    # tlsTermination: "edge"
+    # tlsInsecurePolicy: "Redirect"
+  # securityContext the security context for OpenShift
+  securityContext: {}
+
+## ----------------------------------------------------------------------------
+## akka holds the Akka actor configuration
+##  ref: https://doc.akka.io/docs/akka/current/typed/index.html
+akka:
+  # actorSystemName defines the actor/cluster name of the Ditto cluster
+  actorSystemName: ditto-cluster
+  # remoting holds configuration for the Akka cluster remoting
+  remoting:
+    # port defines the Port to use for remoting
+    port: 2551
+  # mgmthttp holds configuration for the Akka cluster management
+  mgmthttp:
+    # port defines the Port to use for akka http management
+    port: 8558
+
+# Set "dittoTag" in order to specify another Ditto version to use for all Ditto services:
+# you may also use "1" (for latest Ditto 1.x.x) or "1.5" (for latest Ditto 1.5.x)
+# dittoTag: 3.2.0
+
+
+## ----------------------------------------------------------------------------
+## policies configuration
+##  ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+policies:
+  # enabled controls whether policies related resources should be created
+  enabled: true
+  # replicaCount configuration for policies
+  replicaCount: 1
+  # updateStrategy configuration for policies
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  # minReadySeconds configures the minimum number of seconds for which a newly created Pod should be ready without any
+  #  of its containers crashing, for it to be considered available
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#min-ready-seconds
+  minReadySeconds: 10
+  # additionalLabels configuration for policies
+  additionalLabels: {}
+  # additionalAnnotations configuration for policies
+  additionalAnnotations: {}
+  image:
+    # repository for the policies docker image
+    repository: docker.io/eclipse/ditto-policies
+    # tag for the policies docker image - overwrite to specify something else than Chart.AppVersion
+    # tag: 3.2.0
+    # pullPolicy for the policies docker image
+    pullPolicy: IfNotPresent
+  # additionalJvmOptions JVM options to put into JAVA_TOOL_OPTIONS
+  additionalJvmOptions: ""
+  # systemProps used to define arbitrary system properties for policies service
+  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  systemProps:
+  # extraEnv to add arbitrary environment variable to policies container
+  extraEnv:
+  # - name: LOG_LEVEL_APPLICATION
+  #   value: "DEBUG"
+  # resources configures the resources available/to use for the policies service
+  resources:
+    # cpu defines the "required" CPU of a node so that the service is placed there
+    cpu: 0.5
+    # memoryMi defines the memory in mebibyte (MiB) used as "required" and "limit" in k8s
+    memoryMi: 1024
+  # jvm contains JVM specific scaling/tuning configuration of e.g. processors and garbage collector settings
+  jvm:
+    # activeProcessorCount defines how many processors the JVM should be configured to use
+    #  this is e.g. relevant for the GC which calculates the amount of asynchronous threads for GC based on the processor count
+    activeProcessorCount: 2
+    # heapRamPercentage defines how much memory of the configured "resources.memoryMi" can be used by the JVM heap space
+    #  be aware that the JVM also requires memory for "off heap" (and also stack) space + the container needs memory as well
+    heapRamPercentage: 60
+    # maxGcPauseMillis configures the used G1 GC "target for the maximum GC pause time"
+    #  default (by JVM if not set): 200
+    maxGcPauseMillis: 150
+  # readinessProbe configuration for policies
+  #  ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+  readinessProbe:
+    initialDelaySeconds: 30
+    periodSeconds: 10
+    timeoutSeconds: 3
+    successThreshold: 1
+    failureThreshold: 3
+  # livenessProbe configuration for policies
+  #  ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+  livenessProbe:
+    initialDelaySeconds: 160
+    periodSeconds: 10
+    timeoutSeconds: 5
+    successThreshold: 1
+    failureThreshold: 4
+  # networkPolicy configuration for policies
+  #  ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
+  networkPolicy:
+    # enabled controls whether policies related NetworkPolicy should be created
+    enabled: true
+  # podDisruptionBudget configuration for policies
+  #  ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+  podDisruptionBudget:
+    # enabled controls whether policies related PodDisruptionBudget should be created
+    enabled: true
+    # minAvailable number of replicas during voluntary disruptions
+    minAvailable: 1
+  # nodeSelector configuration for policies
+  #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+  nodeSelector: {}
+  # tolerations configuration for policies
+  #  ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
+  # affinity configuration for policies
+  #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  affinity: {}
+  # podMonitor configuration for policies
+  podMonitor:
+    # enabled configures whether Pod Monitor is enabled, then a resource to scrape policies metrics will be created
+    enabled: false
+    # interval: 30s
+    # scrapeTimeout: 15s
+  # config holds policies specific configuration
+  config:
+    # mongodb holds mongodb specific configuration of policies
+    mongodb:
+      # minPoolSize configures the minimum number of connections in the connection pool
+      minPoolSize: 10
+      # maxPoolSize configures the minimum number of connections in the connection pool
+      maxPoolSize: 200
+      # maxPoolIdleTime configures the maximum amount of time a pooled connection is allowed to idle before closing the connection
+      maxPoolIdleTime: 10m
+      # journalWriteConcern the MongoDB write concern to apply for writing operations on the event journal
+      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged
+      journalWriteConcern: "Journaled"
+      # snapsWriteConcern the MongoDB write concern to apply for writing operations on the snapshots persistence
+      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged
+      snapsWriteConcern: "Journaled"
+      # journalCircuitBreaker configures the circuit breaker for MongoDB operations on the event journal
+      journalCircuitBreaker:
+        # maxTries opens the circuit breaker if an exception during persisting an event occurs this often
+        #  a successful write resets the counter
+        maxTries: 10
+        # timeout configures the MongoDB write timeouts also causing the circuit breaker to open
+        timeout: 10s
+        # reset after this time in "Open" state, the circuit breaker is "Half-opened" again
+        reset: 5s
+      # snapsCircuitBreaker configures the circuit breaker for MongoDB operations on the snapshots persistence
+      snapsCircuitBreaker:
+        # maxTries opens the circuit breaker if an exception during persisting a snapshot occurs this often
+        #  a successful write resets the counter
+        maxTries: 10
+        # timeout configures the MongoDB write timeouts also causing the circuit breaker to open
+        timeout: 20s
+        # reset after this time in "Open" state, the circuit breaker is "Half-opened" again
+        reset: 8s
+    # cleanup contains the configuration for the background cleanup of stale snapshots and events
+    cleanup:
+      # enabled configures whether background cleanup is enabled or not
+      #  if enabled, stale "snapshot" and "journal" entries will be cleaned up from the MongoDB by a background process:
+      enabled: false
+      # quietPeriod defines how long to stay in a state where the background cleanup is not yet started
+      quietPeriod: 5m
+      # history contains configuration regarding the event history
+      history:
+        # retentionDuration configures the duration of how long to "keep" events and snapshots before being allowed to remove them in scope of cleanup
+        retentionDuration: 30d
+      # metricsReporter config of MongoMetricsReporter which is used by policies in order to report current persistence
+      #  roundtrip times in order to determine credits to cleanup stale data (journal entries, snapshots)
+      metricsReporter:
+        # resolution configures how far apart each measurement should be done
+        resolution: 1s
+        # history configures how many historical items to keep
+        history: 5
+      # interval configures how often a "credit decision" is made
+      interval: 1s
+      # timerThreshold configures the maximum database latency to give out credit for cleanup actions
+      timerThreshold: 100ms
+      # creditsPerBatch configures how many "cleanup credits" should be generated per "interval" as long as the
+      creditsPerBatch: 5
+    # persistence holds configuration regarding (akka) persistence of policies (event journal and snapshots)
+    persistence:
+      # activityCheckInterval configures to keep policies for that amount of time in memory when no other use did happen:
+      activityCheckInterval: 2d
+      # pingRate used to throttle pinging of PolicyPersistenceActors, so that not all PolicyPersistenceActors are recovered at the same time:
+      pingRate:
+        # frequency the frequency of sent "pings" to PolicyPersistenceActors
+        frequency: 1s
+        # entities the amount of entities to wake up per "frequency" interval
+        entities: 50
+      # events contains event journal specific configuration
+      events:
+        # historicalHeadersToPersist define the DittoHeaders to persist when persisting events to the journal
+        # those can e.g. be retrieved as additional "audit log" information when accessing a historical Policy revision
+        historicalHeadersToPersist:
+        # - "ditto-originator"
+        # - "ditto-origin"
+        # - "correlation-id"
+      # snapshots contains snapshots persistence specific configuration
+      snapshots:
+        # interval configures the interval when to do snapshot for a Policy which had changes to it
+        interval: 15m
+        # threshold configures the threshold after how many changes to a Policy to do a snapshot
+        threshold: 5
+
+## ----------------------------------------------------------------------------
+## things configuration
+##  ref: https://www.eclipse.org/ditto/architecture-services-things.html
+things:
+  # enabled controls whether things related resources should be created
+  enabled: true
+  # replicaCount configuration for things
+  replicaCount: 1
+  # updateStrategy configuration for things
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  # minReadySeconds configures the minimum number of seconds for which a newly created Pod should be ready without any
+  #  of its containers crashing, for it to be considered available
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#min-ready-seconds
+  minReadySeconds: 10
+  # additionalLabels configuration for things
+  additionalLabels: {}
+  # additionalAnnotations configuration for things
+  additionalAnnotations: {}
+  image:
+    # repository for the things docker image
+    repository: docker.io/eclipse/ditto-things
+    # tag for the things docker image - overwrite to specify something else than Chart.AppVersion
+    # tag: 3.2.0
+    # pullPolicy for the things docker image
+    pullPolicy: IfNotPresent
+  # additionalJvmOptions JVM options to put into JAVA_TOOL_OPTIONS
+  additionalJvmOptions: ""
+  # systemProps used to define arbitrary system properties for things service
+  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  systemProps:
+  # extraEnv to add arbitrary environment variable to things container
+  extraEnv:
+  # - name: LOG_LEVEL_APPLICATION
+  #   value: "DEBUG"
+  # resources configures the resources available/to use for the things service
+  resources:
+    # cpu defines the "required" CPU of a node so that the service is placed there
+    cpu: 0.5
+    # memoryMi defines the memory in mebibyte (MiB) used as "required" and "limit" in k8s
+    memoryMi: 1024
+  # jvm contains JVM specific scaling/tuning configuration of e.g. processors and garbage collector settings
+  jvm:
+    # activeProcessorCount defines how many processors the JVM should be configured to use
+    #  this is e.g. relevant for the GC which calculates the amount of asynchronous threads for GC based on the processor count
+    activeProcessorCount: 2
+    # heapRamPercentage defines how much memory of the configured "resources.memoryMi" can be used by the JVM heap space
+    #  be aware that the JVM also requires memory for "off heap" (and also stack) space + the container needs memory as well
+    heapRamPercentage: 60
+    # maxGcPauseMillis configures the used G1 GC "target for the maximum GC pause time"
+    #  default (by JVM if not set): 200
+    maxGcPauseMillis: 150
+  # readinessProbe configuration for things
+  #  ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+  readinessProbe:
+    initialDelaySeconds: 30
+    periodSeconds: 10
+    timeoutSeconds: 3
+    successThreshold: 1
+    failureThreshold: 3
+  # livenessProbe configuration for things
+  #  ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+  livenessProbe:
+    initialDelaySeconds: 160
+    periodSeconds: 10
+    timeoutSeconds: 5
+    successThreshold: 1
+    failureThreshold: 4
+  # networkPolicy configuration for things
+  #  ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
+  networkPolicy:
+    # enabled controls whether things related NetworkPolicy should be created
+    enabled: true
+  # podDisruptionBudget configuration for things
+  #  ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+  podDisruptionBudget:
+    # enabled controls whether things related PodDisruptionBudget should be created
+    enabled: true
+    # minAvailable number of replicas during voluntary disruptions
+    minAvailable: 1
+  # nodeSelector configuration for things
+  #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+  nodeSelector: {}
+  # tolerations configuration for things
+  #  ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
+  # affinity configuration for things
+  #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  affinity: {}
+  # podMonitor configuration for things
+  podMonitor:
+    # enabled configures whether Pod Monitor is enabled, then a resource to scrape things metrics will be created
+    enabled: false
+    # interval: 30s
+    # scrapeTimeout: 15s
+  # config holds things specific configuration
+  config:
+    # mongodb holds mongodb specific configuration of things
+    mongodb:
+      # minPoolSize configures the minimum number of connections in the connection pool
+      minPoolSize: 10
+      # maxPoolSize configures the minimum number of connections in the connection pool
+      maxPoolSize: 200
+      # maxPoolIdleTime configures the maximum amount of time a pooled connection is allowed to idle before closing the connection
+      maxPoolIdleTime: 10m
+      # journalWriteConcern the MongoDB write concern to apply for writing operations on the event journal
+      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged
+      journalWriteConcern: "Acknowledged"
+      # snapsWriteConcern the MongoDB write concern to apply for writing operations on the snapshots persistence
+      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged
+      snapsWriteConcern: "Acknowledged"
+      # journalCircuitBreaker configures the circuit breaker for MongoDB operations on the event journal
+      journalCircuitBreaker:
+        # maxTries opens the circuit breaker if an exception during persisting an event occurs this often
+        #  a successful write resets the counter
+        maxTries: 10
+        # timeout configures the MongoDB write timeouts also causing the circuit breaker to open
+        timeout: 10s
+        # reset after this time in "Open" state, the circuit breaker is "Half-opened" again
+        reset: 5s
+      # snapsCircuitBreaker configures the circuit breaker for MongoDB operations on the snapshots persistence
+      snapsCircuitBreaker:
+        # maxTries opens the circuit breaker if an exception during persisting a snapshot occurs this often
+        #  a successful write resets the counter
+        maxTries: 10
+        # timeout configures the MongoDB write timeouts also causing the circuit breaker to open
+        timeout: 20s
+        # reset after this time in "Open" state, the circuit breaker is "Half-opened" again
+        reset: 8s
+    # cleanup contains the configuration for the background cleanup of stale snapshots and events
+    cleanup:
+      # enabled configures whether background cleanup is enabled or not
+      #  if enabled, stale "snapshot" and "journal" entries will be cleaned up from the MongoDB by a background process:
+      enabled: true
+      # quietPeriod defines how long to stay in a state where the background cleanup is not yet started
+      quietPeriod: 5m
+      # history contains configuration regarding the event history
+      history:
+        # retentionDuration configures the duration of how long to "keep" events and snapshots before being allowed to remove them in scope of cleanup
+        retentionDuration: 30d
+      # metricsReporter config of MongoMetricsReporter which is used by policies in order to report current persistence
+      #  roundtrip times in order to determine credits to cleanup stale data (journal entries, snapshots)
+      metricsReporter:
+        # resolution configures how far apart each measurement should be done
+        resolution: 1s
+        # history configures how many historical items to keep
+        history: 5
+      # interval configures how often a "credit decision" is made
+      interval: 1s
+      # timerThreshold configures the maximum database latency to give out credit for cleanup actions
+      timerThreshold: 100ms
+      # creditsPerBatch configures how many "cleanup credits" should be generated per "interval" as long as the
+      creditsPerBatch: 5
+    # persistence holds configuration regarding (akka) persistence of things (event journal and snapshots)
+    persistence:
+      # activityCheckInterval configures to keep things for that amount of time in memory when no other use did happen
+      activityCheckInterval: 2d
+      # events contains event journal specific configuration
+      events:
+        # historicalHeadersToPersist define the DittoHeaders to persist when persisting events to the journal
+        #  those can e.g. be retrieved as additional "audit log" information when accessing a historical Thing revision
+        historicalHeadersToPersist:
+        # - "ditto-originator"
+        # - "ditto-origin"
+        # - "correlation-id"
+      # snapshots contains snapshots persistence specific configuration
+      snapshots:
+        # the interval when to do snapshot for a Thing which had changes to it
+        interval: 15m
+        # the threshold after how many changes to a Thing to do a snapshot
+        threshold: 50
+    # policiesEnforcer contains configuration for Ditto "Policy Enforcers", e.g. regarding caching
+    policiesEnforcer:
+      # cache holds the configuration of policy enforcer caching
+      cache:
+        # enabled whether caching of policy enforcers should be enabled
+        enabled: true
+        # maxSize the maximum size of policy enforcers to keep in the cache
+        maxSize: 50000
+        # expireAfterWrite the maximum duration of inconsistency after losing a cache invalidation
+        expireAfterWrite: 8h
+        # expireAfterAccess prolonged on each cache access by that duration
+        expireAfterAccess: 4h
+    # wot contains Web of Things (WoT) specific configuration
+    wot:
+      # tdBasePrefix is the base to use where the Ditto endpoint is located in order to be injected into TDs:
+      tdBasePrefix: "http://localhost:8080"
+      # tdJsonTemplate contains a json template added to generated TDs, e.g. containing security information:
+      tdJsonTemplate: >-
+        {
+          "securityDefinitions": {
+            "basic_sc": {
+              "scheme": "basic",
+              "in": "header"
+            }
+          },
+          "security": "basic_sc",
+          "support": "https://www.eclipse.org/ditto/"
+        }
+
+## ----------------------------------------------------------------------------
+## things-search configuration
+##  ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+thingsSearch:
+  # enabled controls whether things-search related resources should be created
+  enabled: true
+  # replicaCount configuration for things-search
+  replicaCount: 1
+  # updateStrategy configuration for things-search
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  # minReadySeconds configures the minimum number of seconds for which a newly created Pod should be ready without any
+  #  of its containers crashing, for it to be considered available
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#min-ready-seconds
+  minReadySeconds: 10
+  # additionalLabels configuration for things-search
+  additionalLabels: {}
+  # additionalAnnotations configuration for things-search
+  additionalAnnotations: {}
+  image:
+    # repository for the things-search docker image
+    repository: docker.io/eclipse/ditto-things-search
+    # tag for the things-search docker image - overwrite to specify something else than Chart.AppVersion
+    # tag: 3.2.0
+    # pullPolicy for the things-search docker image
+    pullPolicy: IfNotPresent
+  # additional JVM options to put into JAVA_TOOL_OPTIONS
+  additionalJvmOptions: ""
+  # systemProps used to define arbitrary system properties for things-search service
+  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  systemProps:
+  # extraEnv to add arbitrary environment variable to things-search container
+  extraEnv:
+  # - name: LOG_LEVEL_APPLICATION
+  #   value: "DEBUG"
+  # resources configures the resources available/to use for the things search service
+  resources:
+    # cpu defines the "required" CPU of a node so that the service is placed there
+    cpu: 0.5
+    # memoryMi defines the memory in mebibyte (MiB) used as "required" and "limit" in k8s
+    memoryMi: 1024
+  # jvm contains JVM specific scaling/tuning configuration of e.g. processors and garbage collector settings
+  jvm:
+    # activeProcessorCount defines how many processors the JVM should be configured to use
+    #  this is e.g. relevant for the GC which calculates the amount of asynchronous threads for GC based on the processor count
+    activeProcessorCount: 2
+    # heapRamPercentage defines how much memory of the configured "resources.memoryMi" can be used by the JVM heap space
+    #  be aware that the JVM also requires memory for "off heap" (and also stack) space + the container needs memory as well
+    heapRamPercentage: 60
+    # maxGcPauseMillis configures the used G1 GC "target for the maximum GC pause time"
+    #  default (by JVM if not set): 200
+    maxGcPauseMillis: 150
+  # readinessProbe configuration for things-search
+  #  ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+  readinessProbe:
+    initialDelaySeconds: 30
+    periodSeconds: 10
+    timeoutSeconds: 3
+    successThreshold: 1
+    failureThreshold: 3
+  # livenessProbe configuration for things-search
+  #  ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+  livenessProbe:
+    initialDelaySeconds: 160
+    periodSeconds: 10
+    timeoutSeconds: 5
+    successThreshold: 1
+    failureThreshold: 4
+  # networkPolicy configuration for things-search
+  #  ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
+  networkPolicy:
+    # enabled controls whether things-search related NetworkPolicy should be created
+    enabled: true
+  # podDisruptionBudget configuration for things-search
+  #  ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+  podDisruptionBudget:
+    # enabled controls whether things-search related PodDisruptionBudget should be created
+    enabled: true
+    # minAvailable number of replicas during voluntary disruptions
+    minAvailable: 1
+  # nodeSelector configuration for things-search
+  #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+  nodeSelector: {}
+  # tolerations configuration for things-search
+  #  ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
+  # affinity configuration for things-search
+  #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  affinity: {}
+  # podMonitor configuration for things-search
+  podMonitor:
+    # enabled configures whether Pod Monitor is enabled, then a resource to scrape things search metrics will be created
+    enabled: false
+    # interval: 30s
+    # scrapeTimeout: 15s
+  # config holds things-search specific configuration
+  config:
+    # mongodb holds mongodb specific configuration of things-search
+    mongodb:
+      # minPoolSize configures the minimum number of connections in the connection pool
+      minPoolSize: 10
+      # maxPoolSize configures the minimum number of connections in the connection pool
+      maxPoolSize: 100
+      # maxPoolIdleTime configures the maximum amount of time a pooled connection is allowed to idle before closing the connection
+      maxPoolIdleTime: 10m
+      # searchReadPreference configures the overall MongoDB read preference
+      #  one of: primary | primaryPreferred | secondary | secondaryPreferred | nearest
+      searchReadPreference: "primary"
+      # searchWriteConcern configures the overall MongoDB write concern
+      #  one of: unacknowledged | acknowledged | majority | journaled | w1 | w2 | w3
+      searchWriteConcern: "acknowledged"
+      # searchWithAcksWriteConcern configures the MongoDB write concern for commands sent with "search-persisted" ACK
+      #  ref: https://www.eclipse.org/ditto/basic-acknowledgements.html#built-in-acknowledgement-labels
+      #  one of: unacknowledged | acknowledged | majority | journaled | w1 | w2 | w3
+      searchWithAcksWriteConcern: "majority"
+      # queryReadConcern configures the MongoDB read concern for doing queries / performing searches
+      #  only if this is "linearizable" in combination with the searchWithAcksWriteConcern: "majority" a strong consistency
+      #  for commands using the "search-persisted" requested ACK is guaranteed
+      #  one of: default | local | majority | linearizable | snapshot | available
+      queryReadConcern: "linearizable"
+      # updaterPersistenceReadConcern configures the MongoDB read concern for the "ThingUpdater"
+      #  one of: default | local | majority | linearizable | snapshot | available
+      updaterPersistenceReadConcern: "local"
+      # updaterPersistenceReadPreference configures the MongoDB read preference for the "ThingUpdater"
+      updaterPersistenceReadPreference: "primaryPreferred"
+    # updater contains configuration for the "Things Updater" of things-search service
+    updater:
+      # activityCheckInterval configures to keep thing updaters for that amount of time in memory when no update did happen:
+      activityCheckInterval: 2h
+      # stream contains streaming configuration settings of the things-search service
+      stream:
+        # retrievalParallelism configures the upper bound of parallel SudoRetrieveThing commands
+        #  (by extension, parallel loads of policy enforcer cache)
+        retrievalParallelism: 64
+        persistence:
+          # parallelism configures how much bulk writes to request in parallel - must be a power of 2
+          parallelism: 16
+        # policiesEnforcer contains configuration for Ditto "Policy Enforcers", e.g. regarding caching
+        policiesEnforcer:
+          # cache holds the configuration of policy enforcer caching
+          cache:
+            # maxSize the maximum size of policy enforcers to keep in the cache
+            maxSize: 30000
+            # expireAfterWrite the maximum duration of inconsistency after losing a cache invalidation
+            expireAfterWrite: 12h
+            # expireAfterAccess prolonged on each cache access by that duration
+            expireAfterAccess: 6h
+        # thingCache configures the cache configuration for caching of things in things-search
+        thingCache:
+          # maxSize defines how many things to cache
+          maxSize: 30000
+          # expireAfterWrite defines how long at most to keep things in the cache after loading them into the cache
+          expireAfterWrite: 12h
+          # expireAfterWrite defines how long at most to keep things in the cache after last accessing them from the cache
+          expireAfterAccess: 6h
+      # backgroundSync contains the configuration for the "background sync" responsible for continuously streaming
+      #  over snapshot entries of things to ensure the eventual consistency of the search index
+      backgroundSync:
+        # enabled whether background sync is turned on
+        enabled: true
+        # quietPeriod the duration between service start-up and the beginning of background sync
+        quietPeriod: 5m
+        # idleTimeout how soon to close the remote stream if no element passed through it
+        idleTimeout: 5m
+        # toleranceWindow how long to wait before reacting to out-of-date search index entries
+        toleranceWindow: 20m
+        # keepEvents how many events to keep in the actor state
+        keepEvents: 2
+        # throttle contains the background sync throttling configuration
+        throttle:
+          # throughput how many things to update per throttle period
+          throughput: 100
+          # period the throttle period
+          period: 30s
+
+
+## ----------------------------------------------------------------------------
+## connectivity configuration
+##  ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+connectivity:
+  # enabled controls whether connectivity related resources should be created
+  enabled: true
+  # replicaCount configuration for connectivity
+  replicaCount: 1
+  # updateStrategy configuration for connectivity
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  # minReadySeconds configures the minimum number of seconds for which a newly created Pod should be ready without any
+  #  of its containers crashing, for it to be considered available
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#min-ready-seconds
+  minReadySeconds: 10
+  # additionalLabels configuration for connectivity
+  additionalLabels: {}
+  # additionalAnnotations configuration for connectivity
+  additionalAnnotations: {}
+  image:
+    # repository for the connectivity docker image
+    repository: docker.io/eclipse/ditto-connectivity
+    # tag for the connectivity docker image - overwrite to specify something else than Chart.AppVersion
+    # tag: 3.2.0
+    # pullPolicy for the connectivity docker image
+    pullPolicy: IfNotPresent
+  # additional JVM options to put into JAVA_TOOL_OPTIONS
+  additionalJvmOptions: ""
+  # systemProps used to define arbitrary system properties for connectivity service
+  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  systemProps:
+  # extraEnv to add arbitrary environment variable to connectivity container
+  extraEnv:
+  # - name: LOG_LEVEL_APPLICATION
+  #   value: "DEBUG"
+  # resources configures the resources available/to use for the connectivity service
+  resources:
+    # cpu defines the "required" CPU of a node so that the service is placed there
+    cpu: 0.5
+    # memoryMi defines the memory in mebibyte (MiB) used as "required" and "limit" in k8s
+    memoryMi: 1024
+  # jvm contains JVM specific scaling/tuning configuration of e.g. processors and garbage collector settings
+  jvm:
+    # activeProcessorCount defines how many processors the JVM should be configured to use
+    #  this is e.g. relevant for the GC which calculates the amount of asynchronous threads for GC based on the processor count
+    activeProcessorCount: 2
+    # heapRamPercentage defines how much memory of the configured "resources.memoryMi" can be used by the JVM heap space
+    #  be aware that the JVM also requires memory for "off heap" (and also stack) space + the container needs memory as well
+    heapRamPercentage: 60
+    # maxGcPauseMillis configures the used G1 GC "target for the maximum GC pause time"
+    #  default (by JVM if not set): 200
+    maxGcPauseMillis: 150
+  # readinessProbe configuration for connectivity
+  #  ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+  readinessProbe:
+    initialDelaySeconds: 30
+    periodSeconds: 10
+    timeoutSeconds: 3
+    successThreshold: 1
+    failureThreshold: 3
+  # livenessProbe configuration for connectivity
+  #  ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+  livenessProbe:
+    initialDelaySeconds: 160
+    periodSeconds: 10
+    timeoutSeconds: 5
+    successThreshold: 1
+    failureThreshold: 4
+  # networkPolicy configuration for connectivity
+  #  ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
+  networkPolicy:
+    # enabled controls whether connectivity related NetworkPolicy should be created
+    enabled: true
+  # podDisruptionBudget configuration for connectivity
+  #  ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+  podDisruptionBudget:
+    # enabled controls whether connectivity related PodDisruptionBudget should be created
+    enabled: true
+    # minAvailable number of replicas during voluntary disruptions
+    minAvailable: 1
+  # nodeSelector configuration for connectivity
+  #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+  nodeSelector: {}
+  # tolerations configuration for connectivity
+  #  ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
+  # affinity configuration for connectivity
+  #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  affinity: {}
+  # podMonitor configuration for connectivity
+  podMonitor:
+    # enabled configures whether Pod Monitor is enabled, then a resource to scrape connectivity metrics will be created
+    enabled: false
+    # interval: 30s
+    # scrapeTimeout: 15s
+  # config holds connectivity specific configuration
+  config:
+    # mongodb holds mongodb specific configuration of connectivity
+    mongodb:
+      # minPoolSize configures the minimum number of connections in the connection pool
+      minPoolSize: 10
+      # maxPoolSize configures the minimum number of connections in the connection pool
+      maxPoolSize: 50
+      # maxPoolIdleTime configures the maximum amount of time a pooled connection is allowed to idle before closing the connection
+      maxPoolIdleTime: 10m
+      # journalWriteConcern the MongoDB write concern to apply for writing operations on the event journal
+      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged
+      journalWriteConcern: "Journaled"
+      # snapsWriteConcern the MongoDB write concern to apply for writing operations on the snapshots persistence
+      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged
+      snapsWriteConcern: "Journaled"
+      # journalCircuitBreaker configures the circuit breaker for MongoDB operations on the event journal
+      journalCircuitBreaker:
+        # maxTries opens the circuit breaker if an exception during persisting an event occurs this often
+        #  a successful write resets the counter
+        maxTries: 10
+        # timeout configures the MongoDB write timeouts also causing the circuit breaker to open
+        timeout: 10s
+        # reset after this time in "Open" state, the circuit breaker is "Half-opened" again
+        reset: 5s
+      # snapsCircuitBreaker configures the circuit breaker for MongoDB operations on the snapshots persistence
+      snapsCircuitBreaker:
+        # maxTries opens the circuit breaker if an exception during persisting a snapshot occurs this often
+        #  a successful write resets the counter
+        maxTries: 10
+        # timeout configures the MongoDB write timeouts also causing the circuit breaker to open
+        timeout: 20s
+        # reset after this time in "Open" state, the circuit breaker is "Half-opened" again
+        reset: 8s
+    # policiesEnforcer contains configuration for Ditto "Policy Enforcers", e.g. regarding caching
+    policiesEnforcer:
+      # cache holds the configuration of policy enforcer caching
+      cache:
+        # enabled whether caching of policy enforcers should be enabled
+        enabled: true
+        # maxSize the maximum size of policy enforcers to keep in the cache
+        maxSize: 1000
+        # expireAfterWrite the maximum duration of inconsistency after losing a cache invalidation
+        expireAfterWrite: 8h
+        # expireAfterAccess prolonged on each cache access by that duration
+        expireAfterAccess: 4h
+    # cleanup contains the configuration for the background cleanup of stale snapshots and events
+    cleanup:
+      # enabled configures whether background cleanup is enabled or not
+      #  if enabled, stale "snapshot" and "journal" entries will be cleaned up from the MongoDB by a background process:
+      enabled: false
+      # quietPeriod defines how long to stay in a state where the background cleanup is not yet started
+      quietPeriod: 5m
+      # history contains configuration regarding the event history
+      history:
+        # retentionDuration configures the duration of how long to "keep" events and snapshots before being allowed to remove them in scope of cleanup
+        retentionDuration: 30d
+      # metricsReporter config of MongoMetricsReporter which is used by policies in order to report current persistence
+      #  roundtrip times in order to determine credits to cleanup stale data (journal entries, snapshots)
+      metricsReporter:
+        # resolution configures how far apart each measurement should be done
+        resolution: 1s
+        # history configures how many historical items to keep
+        history: 5
+      # interval configures how often a "credit decision" is made
+      interval: 10s
+      # timerThreshold configures the maximum database latency to give out credit for cleanup actions
+      timerThreshold: 100ms
+      # creditsPerBatch configures how many "cleanup credits" should be generated per "interval" as long as the
+      creditsPerBatch: 5
+    # persistence holds configuration regarding (akka) persistence of connections (event journal and snapshots)
+    persistence:
+      # keep closed, inactive connections for that amount of time in memory when no other use did happen:
+      activityCheckInterval: 45m
+      # events contains event journal specific configuration
+      events:
+        # historicalHeadersToPersist define the DittoHeaders to persist when persisting events to the journal
+        # those can e.g. be retrieved as additional "audit log" information when accessing a historical Connection revision
+        historicalHeadersToPersist:
+        # - "ditto-originator"
+        # - "ditto-origin"
+        # - "correlation-id"
+      # snapshots contains snapshots persistence specific configuration
+      snapshots:
+        # interval the interval when to do snapshot for a Connection which had changes to it
+        interval: 15m
+        # threshold the threshold after how many changes to a Connection to do a snapshot
+        threshold: 5
+    # connections holds configuration regarding connections
+    connections:
+      # reconnect configures pinging of connections, so that not all connections are recovered at the same time
+      reconnect:
+        # rate configures the rate in which frequency to ping/wake up how many entities (connections)
+        rate:
+          # frequency the frequency of how often to wake up connections after restart
+          frequency: 1s
+          # entities the amount of entities to wake up per "frequency" interval
+          entities: 10
+      # allowedHostnames contains a comma separated list of explicitly allowed hostnames
+      allowedHostnames: ""
+      # blockedHostnames contains a comma separated list of blocked hostnames
+      blockedHostnames: "localhost"
+      # blockedSubnets holds a comma separated string of blocked subnets
+      #  specify subnets to block in CIDR format e.g. "11.1.0.0/16"
+      blockedSubnets: ""
+      # blockedHostRegex contains the regex for blocked hostnames
+      blockedHostRegex: ^.*\\.svc.cluster.local$
+      limits:
+        # maxSources contains the max number of sources per connection
+        maxSources: 5
+        # maxTargets contains the max number of targets per connection
+        maxTargets: 5
+      enrichment:
+        # the buffer size used for the queue in the message mapping processor actor
+        bufferSize: 200
+      # kafka contains the configuration specific to Ditto connections to Apache Kafka
+      kafka:
+        # consumer contains configuration for consuming messages from Kafka
+        consumer:
+          # throttling contains configuration for applying throttling when consuming from a single Kafka connection
+          throttling:
+            # enabled defines whether throttling should be applied when consuming messages from a Kafka source
+            enabled: true
+            # interval the interval at which the consumer is throttled - must be > 0s
+            interval: 1s
+            # limit defines the maximum number of messages the consumer is allowed to receive within the configured
+            #  throttling "interval" e.g. 100 msgs/s - must be > 0
+            limit: 500
+            # maxInflightFactor configures how many unacknowledged messages are allowed at any time as factor of
+            #  ${limit} - must be >= 1.0
+            #  This limit couples latency with throughput (long latency before ack -> lower throughput)
+            maxInflightFactor: 2.0
+        # producer contains configuration for publishing messages to Kafka
+        producer:
+          # If a message can't be published it is put in a queue. Further messages are dropped when the queue is full.
+          queueSize: 1000
+          # Messages to publish in parallel per Kafka-Publisher (one per connectivity client)
+          parallelism: 10
+
+## ----------------------------------------------------------------------------
+## gateway configuration
+##  ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+gateway:
+  # enabled controls whether gateway related resources should be created
+  enabled: true
+  # replicaCount configuration for gateway
+  replicaCount: 1
+  # updateStrategy configuration for gateway
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  # minReadySeconds configures the minimum number of seconds for which a newly created Pod should be ready without any
+  #  of its containers crashing, for it to be considered available
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#min-ready-seconds
+  minReadySeconds: 10
+  # additionalLabels configuration for gateway
+  additionalLabels: {}
+  # additionalAnnotations configuration for gateway
+  additionalAnnotations: {}
+  # additional JVM options to put into JAVA_TOOL_OPTIONS
+  additionalJvmOptions: ""
+  image:
+    # repository for the gateway docker image
+    repository: docker.io/eclipse/ditto-gateway
+    # tag for the gateway docker image - overwrite to specify something else than Chart.AppVersion
+    # tag: 3.2.0
+    # pullPolicy for the gateway docker image
+    pullPolicy: IfNotPresent
+  # systemProps used to define arbitrary system properties configuration for gateway
+  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  systemProps:
+    - "-Dditto.protocol.blocklist.0=raw-request-uri"
+    - "-Dditto.protocol.blocklist.1=cache-control"
+    - "-Dditto.protocol.blocklist.2=connection"
+    - "-Dditto.protocol.blocklist.3=timeout-access"
+    - "-Dditto.protocol.blocklist.4=accept-encoding"
+    - "-Dditto.protocol.blocklist.5=x-forwarded-scheme"
+    - "-Dditto.protocol.blocklist.6=x-forwarded-port"
+    - "-Dditto.protocol.blocklist.7=x-forwarded-for"
+    - "-Dditto.protocol.blocklist.8=forwarded=for"
+    - "-Dditto.protocol.blocklist.9=sec-fetch-mode"
+    - "-Dditto.protocol.blocklist.10=sec-fetch-site"
+    - "-Dditto.protocol.blocklist.11=authorization"
+    - "-Dditto.protocol.blocklist.12=accept-language"
+    - "-Dditto.protocol.blocklist.13=host"
+    - "-Dditto.protocol.blocklist.14=via"
+    - "-Dditto.protocol.blocklist.15=sec-ch-ua"
+    - "-Dditto.protocol.blocklist.16=sec-ch-ua-mobile"
+    - "-Dditto.protocol.blocklist.17=sec-ch-ua-platform"
+    - "-Dditto.protocol.blocklist.18=sec-fetch-dest"
+    - "-Dditto.protocol.blocklist.19=user-agent"
+  # extraEnv to add arbitrary environment variables to gateway container
+  extraEnv:
+  # - name: LOG_LEVEL_APPLICATION
+  #   value: "DEBUG"
+  # resources configures the resources available/to use for the gateway service
+  resources:
+    # cpu defines the "required" CPU of a node so that the service is placed there
+    cpu: 0.5
+    # memoryMi defines the memory in mebibyte (MiB) used as "required" and "limit" in k8s
+    memoryMi: 1024
+  # jvm contains JVM specific scaling/tuning configuration of e.g. processors and garbage collector settings
+  jvm:
+    # activeProcessorCount defines how many processors the JVM should be configured to use
+    #  this is e.g. relevant for the GC which calculates the amount of asynchronous threads for GC based on the processor count
+    activeProcessorCount: 2
+    # heapRamPercentage defines how much memory of the configured "resources.memoryMi" can be used by the JVM heap space
+    #  be aware that the JVM also requires memory for "off heap" (and also stack) space + the container needs memory as well
+    heapRamPercentage: 60
+    # maxGcPauseMillis configures the used G1 GC "target for the maximum GC pause time"
+    #  default (by JVM if not set): 200
+    maxGcPauseMillis: 150
+  # readinessProbe configuration for gateway
+  # ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+  readinessProbe:
+    initialDelaySeconds: 30
+    periodSeconds: 10
+    timeoutSeconds: 3
+    successThreshold: 1
+    failureThreshold: 3
+  # livenessProbe configuration for gateway
+  #  ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+  livenessProbe:
+    initialDelaySeconds: 160
+    periodSeconds: 10
+    timeoutSeconds: 5
+    successThreshold: 1
+    failureThreshold: 4
+  # service configuration of the k8s service of the gateway
+  service:
+    # port number configuration for gateway
+    port: 8080
+    # annotations to add arbitrary annotations to nginx service
+    annotations: {}
+  # networkPolicy configuration for gateway
+  #  ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
+  networkPolicy:
+    # enabled controls whether gateway related NetworkPolicy should be created
+    enabled: true
+  # podDisruptionBudget configuration for gateway
+  #  ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+  podDisruptionBudget:
+    # enabled controls whether gateway related PodDisruptionBudget should be created
+    enabled: true
+    # minAvailable number of replicas during voluntary disruptions
+    minAvailable: 1
+  # nodeSelector configuration for gateway
+  #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+  nodeSelector: {}
+  # tolerations configuration for gateway
+  #  ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
+  # affinity configuration for gateway
+  #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  affinity: {}
+  # podMonitor configuration for gateway
+  podMonitor:
+    # enabled configures whether Pod Monitor is enabled, then a resource to scrape gateway metrics will be created
+    enabled: false
+    # interval: 30s
+    # scrapeTimeout: 15s
+  # config holds gateway specific configuration
+  config:
+    # authentication contains the settings regarding authentication against the gateway
+    authentication:
+      # enablePreAuthentication whether Ditto "pre-authentication" should be enabled
+      #  ref: https://www.eclipse.org/ditto/installation-operating.html#pre-authentication
+      enablePreAuthentication: false
+      # oauth contains the OAuth2.0 / OpenID Connect related configuration
+      oauth:
+        # allowedClockSkew configures the amount of clock skew in seconds to tolerate when verifying the local time against the exp and nbf claims
+        allowedClockSkew: 20s
+        # openidConnectIssuers holds a map of issuer-prefixes as key (e.g. "example")
+        #  and OAuth "issuer" and "authSubjects" list containing which claims to extract from a JWT issued by the issuer
+        openidConnectIssuers:
+        #  example:
+        #    issuer: "example.com"
+        #    authSubjects:
+        #    - "{{ jwt:sub }}"
+        #    - "{{ jwt:groups }}"
+      # devops contains the configuration of the gateway's "/devops" API, e.g. access to it
+      devops:
+        # secured this controls whether "/devops" and "/api/2/connections" resources are secured or not
+        secured: true
+        # authMethod declares the authentication method to apply for authenticating the "/devops" and "/api/2/connections" resources
+        #  one of: "basic" | "oauth2"
+        authMethod: "basic"
+        # oauth contains the OAuth2.0 / OpenID Connect related configuration applied when "authMethod" above is "oauth2"
+        oauth:
+          # allowedClockSkew configures the amount of clock skew in seconds to tolerate when verifying the local time against the exp and nbf claims
+          allowedClockSkew: 20s
+          # openidConnectIssuers holds a map of issuer-prefixes as key (e.g. "example")
+          #  and OAuth "issuer" and "authSubjects" list containing which claims to extract from a JWT issued by the issuer
+          openidConnectIssuers:
+          #  example-ops:
+          #    issuer: "example.com"
+          #    authSubjects:
+          #    - "{{ jwt:sub }}"
+          #    - "{{ jwt:groups }}"
+        # oauthSubjects contains list of subjects authorized to use "/devops" and "/api/2/connections" resources
+        oauthSubjects:
+        # - "example-ops:devops-admin"
+        # statusSecured controls whether the "/status" and "/status/health" resources are secured or not
+        statusSecured: true
+        # statusAuthMethod declares the authentication method to apply for authenticating the "/status" and "/status/health" resources
+        #  one of: "basic" | "oauth2"
+        statusAuthMethod: "basic"
+        # statusOauthSubjects contains list of subjects authorized to use "/status" API
+        statusOauthSubjects:
+        # - "example-ops:devops-admin"
+        # existingSecret contains the name of existing secret containing status and devops passwords
+        #  if not set then default secret is created - useful for managing secrets with external secrets manager
+        existingSecret:
+        # devopsPassword the password to use for accessing "/devops" and "/api/2/connections" resources
+        #  when "authMethod": "basic" (with username: devops)
+        #  if not set a random password will be generated and used
+        devopsPassword:
+        # statusPassword will be used for accessing "/status" and "/status/health" resources
+        #  when "statusAuthMethod": "basic" (with username: devops)
+        #  if not set a random password will be set
+        statusPassword:
+    # websocket contains the gateway websocket configuration
+    websocket:
+      # subscriber contains the configuration for receiving data via the websocket
+      subscriber:
+        # backpressureQueueSize is the max queue size of how many inflight commands a single websocket client can have
+        backpressureQueueSize: 100
+      # publisher contains the configuration for sending/publishing data via the websocket
+      publisher:
+        # backpressureBufferSize is the max buffer size of how many outstanding CommandResponses and Events a single
+        #  websocket client can have - additional CommandResponses and Events are dropped if this size is reached
+        backpressureBufferSize: 200
+      # throttling contains the throttling configuration of a single websocket session
+      throttling:
+        # enabled whether throttling message consumption via a single websocket session is enabled
+        enabled: true
+        # interval is the interval at which a single websocket session is rate-limited - must be > 0s
+        interval: 1s
+        # limit is the maximum number of messages the websocket session is allowed to receive within the configured
+        #  throttling interval e.g. 100 msgs/s
+        limit: 100
+    # websocket contains the gateway SSE (server sent events) configuration
+    sse:
+      # throttling contains the throttling configuration of a single SSE session (only applies for search via SSE)
+      throttling:
+        # enabled whether throttling message publishing via a single websocket session is enabled
+        enabled: true
+        # interval is the interval at which a single SSE session is rate-limited - must be > 0s
+        interval: 1s
+        # limit is the maximum number of messages the SSE session is allowed to receive within the configured
+        #  throttling interval e.g. 100 msgs/s
+        limit: 100
+
+## ----------------------------------------------------------------------------
+## nginx configuration
+nginx:
+  # enabled controls whether nginx related resources should be created
+  enabled: true
+  # replicaCount for nginx
+  replicaCount: 1
+  # updateStrategy for nginx
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  # additionalLabels on nginx pods
+  additionalLabels: {}
+  # additionalAnnotations on nginx pods
+  additionalAnnotations: {}
+  image:
+    # repository for the nginx docker image
+    repository: docker.io/nginx
+    # tag for the nginx docker image
+    tag: 1.23
+    # pullPolicy for the nginx docker image
+    pullPolicy: IfNotPresent
+  # extraEnv to add arbitrary environment variables to nginx container
+  extraEnv: []
+  # resources configures the resources available/to use for nginx
+  resources:
+    # cpu defines the "required" CPU of a node so that the service is placed there
+    cpu: 0.2
+    # memoryMi defines the memory in mebibyte (MiB) used as "required" and "limit" in k8s
+    memoryMi: 64
+  # readinessProbe configuration for nginx
+  #  ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+  readinessProbe: {}
+  # livenessProbe configuration for nginx
+  #  ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
+  livenessProbe: {}
+  # service configuration of the k8s service of the nginx
+  service:
+    # type of the nginx service
+    type: ClusterIP
+    # port of the nginx service
+    port: 8080
+    # in case of <type> NodePort the <nodePort> may additionally be set
+    #  type: NodePort
+    #  nodePort: 30080
+    # annotations to add arbitrary annotations to nginx service
+    annotations: {}
+  # networkPolicy ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
+  networkPolicy:
+    # enabled controls whether policies related NetworkPolicy should be created
+    enabled: true
+  # nodeSelector configuration for nginx
+  #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+  nodeSelector: {}
+  # tolerations configuration for nginx
+  #  ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
+  # affinity configuration for nginx
+  #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  affinity: {}
+  # init containers for nginx
+  initContainers:
+    waitForGateway:
+      enabled: true
+      name: wait-for-gateway
+      image: curlimages/curl:latest
+
+## ----------------------------------------------------------------------------
+## Ditto UI configuration
+dittoui:
+  enabled: true
+  # replicaCount for Ditto UI service
+  replicaCount: 1
+  # updateStrategy for Ditto UI service
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  # additionalLabels on Ditto UI pods
+  additionalLabels: { }
+  # additionalAnnotations on Ditto UI pods
+  additionalAnnotations: { }
+  image:
+    # repository for the Ditto UI docker image
+    repository: docker.io/eclipse/ditto-ui
+    # tag for the Ditto UI image - overwrite to specify something else than Chart.AppVersion
+    # tag: 3.2.0
+    # pullPolicy for the Ditto UI docker image
+    pullPolicy: IfNotPresent
+  # extraEnv to add arbitrary environment variable to Ditto UI container
+  extraEnv: []
+  # resources configures the resources available/to use for the Ditto UI container
+  resources:
+    # cpu defines the "required" CPU of a node so that the service is placed there
+    cpu: 0.1
+    # memoryMi defines the memory in mebibyte (MiB) used as "required" and "limit" in k8s
+    memoryMi: 64
+  # networkPolicy ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
+  networkPolicy:
+    # enabled controls whether Ditto UI related NetworkPolicy should be created
+    enabled: true
+  # podDisruptionBudget ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+  podDisruptionBudget:
+    # enabled controls whether Ditto UI related PodDisruptionBudget should be created
+    enabled: true
+    # minAvailable number of replicas during voluntary disruptions
+    minAvailable: 1
+  # service configuration of the k8s service of the Ditto UI
+  service:
+    # port of the Ditto UI service
+    port: 8080
+    # annotations to add arbitrary annotations to Ditto UI service
+    annotations: { }
+
+## ----------------------------------------------------------------------------
+## swaggerui configuration
+swaggerui:
+  # enabled controls whether swagger ui related resources should be created
+  enabled: true
+  # replicaCount for swagger ui service
+  replicaCount: 1
+  # updateStrategy for swagger ui service
+  #  ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
+  # additionalLabels on swagger ui pods
+  additionalLabels: {}
+  # additionalAnnotations on swagger ui pods
+  additionalAnnotations: {}
+  image:
+    # repository for the swagger ui docker image
+    repository: docker.io/swaggerapi/swagger-ui
+    # tag for the swagger ui docker image
+    tag: v4.15.5
+    # pullPolicy for the swagger ui docker image
+    pullPolicy: IfNotPresent
+  # extraEnv to add arbitrary environment variable to swagger ui container
+  extraEnv: []
+  # resources configures the resources available/to use for the swagger ui container
+  resources:
+    # cpu defines the "required" CPU of a node so that the service is placed there
+    cpu: 0.1
+    # memoryMi defines the memory in mebibyte (MiB) used as "required" and "limit" in k8s
+    memoryMi: 64
+  # networkPolicy ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
+  networkPolicy:
+    # enabled controls whether swagger ui related NetworkPolicy should be created
+    enabled: true
+  # podDisruptionBudget ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+  podDisruptionBudget:
+    # enabled controls whether swagger ui related PodDisruptionBudget should be created
+    enabled: true
+    # minAvailable number of replicas during voluntary disruptions
+    minAvailable: 1
+  # service configuration of the k8s service of the swagger ui
+  service:
+    # port of the swagger ui service
+    port: 8080
+    # annotations to add arbitrary annotations to swagger ui service
+    annotations: {}
+
+## ----------------------------------------------------------------------------
+## mongodb dependency chart configuration
+mongodb:
+  # enabled controls whether mongodb should be started as part of the Helm chart or not
+  enabled: true
+  # fullnameOverride: ditto-mongodb
+  auth:
+    enabled: false
+  securityContext:
+    enabled: false
+  persistence:
+    enabled: false
diff --git a/deployment/openshift/nginx/nginx.conf b/deployment/openshift/nginx/nginx.conf
index c33bc6b3a8b..8bd6cc45b01 100644
--- a/deployment/openshift/nginx/nginx.conf
+++ b/deployment/openshift/nginx/nginx.conf
@@ -1,6 +1,8 @@
-worker_processes 1;
+worker_processes auto;
 
-events {worker_connections 1024;}
+events {
+  worker_connections 1024;
+}
 
 http {
   charset utf-8;

From 8c5499caa9b7a7ad0205f03df319de1ecf892819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 18 May 2023 21:24:33 +0200
Subject: [PATCH 101/173] added initial GitHub actions CI files for
 linting/installing Ditto helm chart on Helm chart changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .github/ct.yml                   |  20 +++++
 .github/kubeval.sh               |  37 +++++++++
 .github/workflows/helm-chart.yml | 127 +++++++++++++++++++++++++++++++
 3 files changed, 184 insertions(+)
 create mode 100644 .github/ct.yml
 create mode 100755 .github/kubeval.sh
 create mode 100644 .github/workflows/helm-chart.yml

diff --git a/.github/ct.yml b/.github/ct.yml
new file mode 100644
index 00000000000..53c9c3d3f17
--- /dev/null
+++ b/.github/ct.yml
@@ -0,0 +1,20 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+
+# consider helm install to be failed after 10 minutes
+helm-extra-args: --timeout 10m
+check-version-increment: true
+debug: true
+chart-dirs:
+  - deployment/helm
+chart-repos:
+  - stable=https://charts.helm.sh/stable
+  - bitnami=https://charts.bitnami.com/bitnami
diff --git a/.github/kubeval.sh b/.github/kubeval.sh
new file mode 100755
index 00000000000..478fcb4916f
--- /dev/null
+++ b/.github/kubeval.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+
+#
+# use kubeval to validate helm generated kubernetes manifest
+#
+
+set -o errexit
+set -o pipefail
+
+CHART_DIR=deployment/helm
+KUBEVAL_VERSION="v0.16.1"
+SCHEMA_LOCATION="https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/"
+
+# install kubeval
+curl --silent --show-error --fail --location --output /tmp/kubeval.tar.gz https://github.com/instrumenta/kubeval/releases/download/"${KUBEVAL_VERSION}"/kubeval-linux-amd64.tar.gz
+sudo tar -C /usr/local/bin -xf /tmp/kubeval.tar.gz kubeval
+
+# add helm repos to resolve dependencies
+helm repo add stable https://charts.helm.sh/stable
+helm repo add bitnami https://charts.bitnami.com/bitnami
+
+# validate chart
+echo "helm dependency build..."
+helm dependency build "${CHART_DIR}"
+
+echo "kubeval(idating) ${CHART_DIR} chart..."
+helm template "${CHART_DIR}" | kubeval --strict --ignore-missing-schemas --kubernetes-version "${KUBERNETES_VERSION#v}" --schema-location "${SCHEMA_LOCATION}"
diff --git a/.github/workflows/helm-chart.yml b/.github/workflows/helm-chart.yml
new file mode 100644
index 00000000000..d0d269b6d89
--- /dev/null
+++ b/.github/workflows/helm-chart.yml
@@ -0,0 +1,127 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+name: Lint and test Helm chart
+
+env:
+  CONFIG_OPTION_CHART_TESTING: "--config .github/ct.yml"
+  VERSION_CHART_TESTING: "v3.8.0"
+  VERSION_HELM: "v3.11.2"
+  VERSION_PYTHON: "3.9"
+on:
+  pull_request:
+    paths:
+      - 'deployment/helm/**'
+      - '.github/workflows/helm-chart.yml'
+
+jobs:
+  lint-chart:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set up Helm
+        uses: azure/setup-helm@v3
+        with:
+          version: ${{ env.VERSION_HELM }}
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.VERSION_PYTHON }}
+          check-latest: true
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.4.0
+        with:
+          version: ${{ env.VERSION_CHART_TESTING }}
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed ${{ env.CONFIG_OPTION_CHART_TESTING }} --target-branch ${{ github.event.repository.default_branch }})
+          if [[ -n "$changed" ]]; then
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Run chart-testing (lint)
+        if: steps.list-changed.outputs.changed == 'true'
+        run: ct lint ${{ env.CONFIG_OPTION_CHART_TESTING }} --target-branch ${{ github.event.repository.default_branch }}
+
+  kubeval-chart:
+    runs-on: ubuntu-latest
+    needs: lint-chart
+    strategy:
+      matrix:
+        # the versions supported by kubeval are the ones for
+        # which a folder exists at
+        # https://github.com/yannh/kubernetes-json-schema/
+        k8s:
+          - v1.25.2
+          - v1.26.4
+          - v1.27.1
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Fetch history for chart testing
+        run: git fetch --prune --unshallow
+      - name: Set up Helm
+        uses: azure/setup-helm@v3
+        with:
+          version: ${{ env.VERSION_HELM }}
+      - name: Run kubeval
+        env:
+          KUBERNETES_VERSION: ${{ matrix.k8s }}
+        run: .github/kubeval.sh
+
+  install-chart:
+    name: install-chart
+    runs-on: ubuntu-latest
+    needs:
+      - lint-chart
+      - kubeval-chart
+    strategy:
+      matrix:
+        # the versions supported by chart-testing are the tags
+        # available for the docker.io/kindest/node image
+        # https://hub.docker.com/r/kindest/node/tags
+        k8s:
+          - v1.25.2
+          - v1.26.4
+          - v1.27.1
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Fetch history for chart testing
+        run: git fetch --prune --unshallow
+      - name: Set up Helm
+        uses: azure/setup-helm@v3
+        with:
+          version: ${{ env.VERSION_HELM }}
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.VERSION_PYTHON }}
+          check-latest: true
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.4.0
+        with:
+          version: ${{ env.VERSION_CHART_TESTING }}
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed ${{ env.CONFIG_OPTION_CHART_TESTING }} --target-branch ${{ github.event.repository.default_branch }})
+          if [[ -n "$changed" ]]; then
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Create kind ${{ matrix.k8s }} cluster
+        if: steps.list-changed.outputs.changed == 'true'
+        uses: helm/kind-action@v1.4.0
+        with:
+          node_image: kindest/node:${{ matrix.k8s }}
+      - name: Run chart-testing (install)
+        if: steps.list-changed.outputs.changed == 'true'
+        run: ct install ${{ env.CONFIG_OPTION_CHART_TESTING }} --target-branch ${{ github.event.repository.default_branch }}

From 6bebb8eb993b05efa27e62236787001a39f38615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 18 May 2023 21:35:38 +0200
Subject: [PATCH 102/173] moved Helm chart into directory "ditto"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .github/workflows/helm-chart.yml                           | 2 ++
 .github/workflows/maven.yml                                | 7 +++++++
 deployment/helm/{ => ditto}/.gitignore                     | 0
 deployment/helm/{ => ditto}/.helmignore                    | 0
 deployment/helm/{ => ditto}/Chart.yaml                     | 0
 deployment/helm/{ => ditto}/README.md                      | 0
 deployment/helm/{ => ditto}/local-values.yaml              | 0
 .../helm/{ => ditto}/logback-config/connectivity.xml       | 0
 deployment/helm/{ => ditto}/logback-config/gateway.xml     | 0
 deployment/helm/{ => ditto}/logback-config/policies.xml    | 0
 deployment/helm/{ => ditto}/logback-config/things.xml      | 0
 .../helm/{ => ditto}/logback-config/thingssearch.xml       | 0
 deployment/helm/{ => ditto}/nginx-config/ditto-down.svg    | 0
 deployment/helm/{ => ditto}/nginx-config/ditto-up.svg      | 0
 deployment/helm/{ => ditto}/nginx-config/index.html        | 0
 deployment/helm/{ => ditto}/nginx-config/nginx-cors.conf   | 0
 deployment/helm/{ => ditto}/swaggerui-config/index.html    | 0
 deployment/helm/{ => ditto}/templates/NOTES.txt            | 0
 deployment/helm/{ => ditto}/templates/_helpers.tpl         | 0
 .../{ => ditto}/templates/connectivity-deployment.yaml     | 0
 .../{ => ditto}/templates/connectivity-networkpolicy.yaml  | 0
 .../helm/{ => ditto}/templates/connectivity-pdb.yaml       | 0
 .../{ => ditto}/templates/connectivity-podmonitor.yaml     | 0
 .../helm/{ => ditto}/templates/dittoui-deployment.yaml     | 0
 .../helm/{ => ditto}/templates/dittoui-networkpolicy.yaml  | 0
 deployment/helm/{ => ditto}/templates/dittoui-pdb.yaml     | 0
 deployment/helm/{ => ditto}/templates/dittoui-service.yaml | 0
 .../helm/{ => ditto}/templates/gateway-deployment.yaml     | 0
 .../helm/{ => ditto}/templates/gateway-networkpolicy.yaml  | 0
 deployment/helm/{ => ditto}/templates/gateway-pdb.yaml     | 0
 .../helm/{ => ditto}/templates/gateway-podmonitor.yaml     | 0
 deployment/helm/{ => ditto}/templates/gateway-secret.yaml  | 0
 deployment/helm/{ => ditto}/templates/gateway-service.yaml | 0
 deployment/helm/{ => ditto}/templates/logback-config.yaml  | 0
 deployment/helm/{ => ditto}/templates/mongodb-secret.yaml  | 0
 deployment/helm/{ => ditto}/templates/nginx-auth.yaml      | 0
 deployment/helm/{ => ditto}/templates/nginx-config.yaml    | 0
 deployment/helm/{ => ditto}/templates/nginx-configmap.yaml | 0
 .../helm/{ => ditto}/templates/nginx-deployment.yaml       | 0
 .../helm/{ => ditto}/templates/nginx-ingress-api.yaml      | 0
 .../helm/{ => ditto}/templates/nginx-ingress-root.yaml     | 0
 .../helm/{ => ditto}/templates/nginx-ingress-ui.yaml       | 0
 .../helm/{ => ditto}/templates/nginx-ingress-ws.yaml       | 0
 .../helm/{ => ditto}/templates/nginx-networkpolicy.yaml    | 0
 deployment/helm/{ => ditto}/templates/nginx-route.yaml     | 0
 deployment/helm/{ => ditto}/templates/nginx-service.yaml   | 0
 .../helm/{ => ditto}/templates/policies-deployment.yaml    | 0
 .../helm/{ => ditto}/templates/policies-networkpolicy.yaml | 0
 deployment/helm/{ => ditto}/templates/policies-pdb.yaml    | 0
 .../helm/{ => ditto}/templates/policies-podmonitor.yaml    | 0
 deployment/helm/{ => ditto}/templates/role.yaml            | 0
 deployment/helm/{ => ditto}/templates/rolebinding.yaml     | 0
 deployment/helm/{ => ditto}/templates/serviceaccount.yaml  | 0
 .../helm/{ => ditto}/templates/swaggerui-config.yaml       | 0
 .../helm/{ => ditto}/templates/swaggerui-deployment.yaml   | 0
 .../{ => ditto}/templates/swaggerui-networkpolicy.yaml     | 0
 deployment/helm/{ => ditto}/templates/swaggerui-pdb.yaml   | 0
 .../helm/{ => ditto}/templates/swaggerui-service.yaml      | 0
 .../helm/{ => ditto}/templates/things-deployment.yaml      | 0
 .../helm/{ => ditto}/templates/things-networkpolicy.yaml   | 0
 deployment/helm/{ => ditto}/templates/things-pdb.yaml      | 0
 .../helm/{ => ditto}/templates/things-podmonitor.yaml      | 0
 .../{ => ditto}/templates/thingssearch-deployment.yaml     | 0
 .../{ => ditto}/templates/thingssearch-networkpolicy.yaml  | 0
 .../helm/{ => ditto}/templates/thingssearch-pdb.yaml       | 0
 .../{ => ditto}/templates/thingssearch-podmonitor.yaml     | 0
 deployment/helm/{ => ditto}/values.yaml                    | 0
 67 files changed, 9 insertions(+)
 rename deployment/helm/{ => ditto}/.gitignore (100%)
 rename deployment/helm/{ => ditto}/.helmignore (100%)
 rename deployment/helm/{ => ditto}/Chart.yaml (100%)
 rename deployment/helm/{ => ditto}/README.md (100%)
 rename deployment/helm/{ => ditto}/local-values.yaml (100%)
 rename deployment/helm/{ => ditto}/logback-config/connectivity.xml (100%)
 rename deployment/helm/{ => ditto}/logback-config/gateway.xml (100%)
 rename deployment/helm/{ => ditto}/logback-config/policies.xml (100%)
 rename deployment/helm/{ => ditto}/logback-config/things.xml (100%)
 rename deployment/helm/{ => ditto}/logback-config/thingssearch.xml (100%)
 rename deployment/helm/{ => ditto}/nginx-config/ditto-down.svg (100%)
 rename deployment/helm/{ => ditto}/nginx-config/ditto-up.svg (100%)
 rename deployment/helm/{ => ditto}/nginx-config/index.html (100%)
 rename deployment/helm/{ => ditto}/nginx-config/nginx-cors.conf (100%)
 rename deployment/helm/{ => ditto}/swaggerui-config/index.html (100%)
 rename deployment/helm/{ => ditto}/templates/NOTES.txt (100%)
 rename deployment/helm/{ => ditto}/templates/_helpers.tpl (100%)
 rename deployment/helm/{ => ditto}/templates/connectivity-deployment.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/connectivity-networkpolicy.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/connectivity-pdb.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/connectivity-podmonitor.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/dittoui-deployment.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/dittoui-networkpolicy.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/dittoui-pdb.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/dittoui-service.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/gateway-deployment.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/gateway-networkpolicy.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/gateway-pdb.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/gateway-podmonitor.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/gateway-secret.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/gateway-service.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/logback-config.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/mongodb-secret.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/nginx-auth.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/nginx-config.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/nginx-configmap.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/nginx-deployment.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/nginx-ingress-api.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/nginx-ingress-root.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/nginx-ingress-ui.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/nginx-ingress-ws.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/nginx-networkpolicy.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/nginx-route.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/nginx-service.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/policies-deployment.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/policies-networkpolicy.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/policies-pdb.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/policies-podmonitor.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/role.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/rolebinding.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/serviceaccount.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/swaggerui-config.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/swaggerui-deployment.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/swaggerui-networkpolicy.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/swaggerui-pdb.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/swaggerui-service.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/things-deployment.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/things-networkpolicy.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/things-pdb.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/things-podmonitor.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/thingssearch-deployment.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/thingssearch-networkpolicy.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/thingssearch-pdb.yaml (100%)
 rename deployment/helm/{ => ditto}/templates/thingssearch-podmonitor.yaml (100%)
 rename deployment/helm/{ => ditto}/values.yaml (100%)

diff --git a/.github/workflows/helm-chart.yml b/.github/workflows/helm-chart.yml
index d0d269b6d89..ef472e9597f 100644
--- a/.github/workflows/helm-chart.yml
+++ b/.github/workflows/helm-chart.yml
@@ -20,6 +20,8 @@ on:
     paths:
       - 'deployment/helm/**'
       - '.github/workflows/helm-chart.yml'
+      - '.github/ct.yml'
+      - '.github/kubeval.sh'
 
 jobs:
   lint-chart:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 716c7e506d5..d51ab5d3516 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -18,6 +18,13 @@ on:
 
   # Run build for any PR
   pull_request:
+    paths-ignore:
+      - 'README.md'
+      - 'RELEASE.md'
+      - 'CONTRIBUTING.md'
+      - 'SECURITY.md'
+      - 'deployment/**'
+      - 'documentation/**'
 
 jobs:
   build:
diff --git a/deployment/helm/.gitignore b/deployment/helm/ditto/.gitignore
similarity index 100%
rename from deployment/helm/.gitignore
rename to deployment/helm/ditto/.gitignore
diff --git a/deployment/helm/.helmignore b/deployment/helm/ditto/.helmignore
similarity index 100%
rename from deployment/helm/.helmignore
rename to deployment/helm/ditto/.helmignore
diff --git a/deployment/helm/Chart.yaml b/deployment/helm/ditto/Chart.yaml
similarity index 100%
rename from deployment/helm/Chart.yaml
rename to deployment/helm/ditto/Chart.yaml
diff --git a/deployment/helm/README.md b/deployment/helm/ditto/README.md
similarity index 100%
rename from deployment/helm/README.md
rename to deployment/helm/ditto/README.md
diff --git a/deployment/helm/local-values.yaml b/deployment/helm/ditto/local-values.yaml
similarity index 100%
rename from deployment/helm/local-values.yaml
rename to deployment/helm/ditto/local-values.yaml
diff --git a/deployment/helm/logback-config/connectivity.xml b/deployment/helm/ditto/logback-config/connectivity.xml
similarity index 100%
rename from deployment/helm/logback-config/connectivity.xml
rename to deployment/helm/ditto/logback-config/connectivity.xml
diff --git a/deployment/helm/logback-config/gateway.xml b/deployment/helm/ditto/logback-config/gateway.xml
similarity index 100%
rename from deployment/helm/logback-config/gateway.xml
rename to deployment/helm/ditto/logback-config/gateway.xml
diff --git a/deployment/helm/logback-config/policies.xml b/deployment/helm/ditto/logback-config/policies.xml
similarity index 100%
rename from deployment/helm/logback-config/policies.xml
rename to deployment/helm/ditto/logback-config/policies.xml
diff --git a/deployment/helm/logback-config/things.xml b/deployment/helm/ditto/logback-config/things.xml
similarity index 100%
rename from deployment/helm/logback-config/things.xml
rename to deployment/helm/ditto/logback-config/things.xml
diff --git a/deployment/helm/logback-config/thingssearch.xml b/deployment/helm/ditto/logback-config/thingssearch.xml
similarity index 100%
rename from deployment/helm/logback-config/thingssearch.xml
rename to deployment/helm/ditto/logback-config/thingssearch.xml
diff --git a/deployment/helm/nginx-config/ditto-down.svg b/deployment/helm/ditto/nginx-config/ditto-down.svg
similarity index 100%
rename from deployment/helm/nginx-config/ditto-down.svg
rename to deployment/helm/ditto/nginx-config/ditto-down.svg
diff --git a/deployment/helm/nginx-config/ditto-up.svg b/deployment/helm/ditto/nginx-config/ditto-up.svg
similarity index 100%
rename from deployment/helm/nginx-config/ditto-up.svg
rename to deployment/helm/ditto/nginx-config/ditto-up.svg
diff --git a/deployment/helm/nginx-config/index.html b/deployment/helm/ditto/nginx-config/index.html
similarity index 100%
rename from deployment/helm/nginx-config/index.html
rename to deployment/helm/ditto/nginx-config/index.html
diff --git a/deployment/helm/nginx-config/nginx-cors.conf b/deployment/helm/ditto/nginx-config/nginx-cors.conf
similarity index 100%
rename from deployment/helm/nginx-config/nginx-cors.conf
rename to deployment/helm/ditto/nginx-config/nginx-cors.conf
diff --git a/deployment/helm/swaggerui-config/index.html b/deployment/helm/ditto/swaggerui-config/index.html
similarity index 100%
rename from deployment/helm/swaggerui-config/index.html
rename to deployment/helm/ditto/swaggerui-config/index.html
diff --git a/deployment/helm/templates/NOTES.txt b/deployment/helm/ditto/templates/NOTES.txt
similarity index 100%
rename from deployment/helm/templates/NOTES.txt
rename to deployment/helm/ditto/templates/NOTES.txt
diff --git a/deployment/helm/templates/_helpers.tpl b/deployment/helm/ditto/templates/_helpers.tpl
similarity index 100%
rename from deployment/helm/templates/_helpers.tpl
rename to deployment/helm/ditto/templates/_helpers.tpl
diff --git a/deployment/helm/templates/connectivity-deployment.yaml b/deployment/helm/ditto/templates/connectivity-deployment.yaml
similarity index 100%
rename from deployment/helm/templates/connectivity-deployment.yaml
rename to deployment/helm/ditto/templates/connectivity-deployment.yaml
diff --git a/deployment/helm/templates/connectivity-networkpolicy.yaml b/deployment/helm/ditto/templates/connectivity-networkpolicy.yaml
similarity index 100%
rename from deployment/helm/templates/connectivity-networkpolicy.yaml
rename to deployment/helm/ditto/templates/connectivity-networkpolicy.yaml
diff --git a/deployment/helm/templates/connectivity-pdb.yaml b/deployment/helm/ditto/templates/connectivity-pdb.yaml
similarity index 100%
rename from deployment/helm/templates/connectivity-pdb.yaml
rename to deployment/helm/ditto/templates/connectivity-pdb.yaml
diff --git a/deployment/helm/templates/connectivity-podmonitor.yaml b/deployment/helm/ditto/templates/connectivity-podmonitor.yaml
similarity index 100%
rename from deployment/helm/templates/connectivity-podmonitor.yaml
rename to deployment/helm/ditto/templates/connectivity-podmonitor.yaml
diff --git a/deployment/helm/templates/dittoui-deployment.yaml b/deployment/helm/ditto/templates/dittoui-deployment.yaml
similarity index 100%
rename from deployment/helm/templates/dittoui-deployment.yaml
rename to deployment/helm/ditto/templates/dittoui-deployment.yaml
diff --git a/deployment/helm/templates/dittoui-networkpolicy.yaml b/deployment/helm/ditto/templates/dittoui-networkpolicy.yaml
similarity index 100%
rename from deployment/helm/templates/dittoui-networkpolicy.yaml
rename to deployment/helm/ditto/templates/dittoui-networkpolicy.yaml
diff --git a/deployment/helm/templates/dittoui-pdb.yaml b/deployment/helm/ditto/templates/dittoui-pdb.yaml
similarity index 100%
rename from deployment/helm/templates/dittoui-pdb.yaml
rename to deployment/helm/ditto/templates/dittoui-pdb.yaml
diff --git a/deployment/helm/templates/dittoui-service.yaml b/deployment/helm/ditto/templates/dittoui-service.yaml
similarity index 100%
rename from deployment/helm/templates/dittoui-service.yaml
rename to deployment/helm/ditto/templates/dittoui-service.yaml
diff --git a/deployment/helm/templates/gateway-deployment.yaml b/deployment/helm/ditto/templates/gateway-deployment.yaml
similarity index 100%
rename from deployment/helm/templates/gateway-deployment.yaml
rename to deployment/helm/ditto/templates/gateway-deployment.yaml
diff --git a/deployment/helm/templates/gateway-networkpolicy.yaml b/deployment/helm/ditto/templates/gateway-networkpolicy.yaml
similarity index 100%
rename from deployment/helm/templates/gateway-networkpolicy.yaml
rename to deployment/helm/ditto/templates/gateway-networkpolicy.yaml
diff --git a/deployment/helm/templates/gateway-pdb.yaml b/deployment/helm/ditto/templates/gateway-pdb.yaml
similarity index 100%
rename from deployment/helm/templates/gateway-pdb.yaml
rename to deployment/helm/ditto/templates/gateway-pdb.yaml
diff --git a/deployment/helm/templates/gateway-podmonitor.yaml b/deployment/helm/ditto/templates/gateway-podmonitor.yaml
similarity index 100%
rename from deployment/helm/templates/gateway-podmonitor.yaml
rename to deployment/helm/ditto/templates/gateway-podmonitor.yaml
diff --git a/deployment/helm/templates/gateway-secret.yaml b/deployment/helm/ditto/templates/gateway-secret.yaml
similarity index 100%
rename from deployment/helm/templates/gateway-secret.yaml
rename to deployment/helm/ditto/templates/gateway-secret.yaml
diff --git a/deployment/helm/templates/gateway-service.yaml b/deployment/helm/ditto/templates/gateway-service.yaml
similarity index 100%
rename from deployment/helm/templates/gateway-service.yaml
rename to deployment/helm/ditto/templates/gateway-service.yaml
diff --git a/deployment/helm/templates/logback-config.yaml b/deployment/helm/ditto/templates/logback-config.yaml
similarity index 100%
rename from deployment/helm/templates/logback-config.yaml
rename to deployment/helm/ditto/templates/logback-config.yaml
diff --git a/deployment/helm/templates/mongodb-secret.yaml b/deployment/helm/ditto/templates/mongodb-secret.yaml
similarity index 100%
rename from deployment/helm/templates/mongodb-secret.yaml
rename to deployment/helm/ditto/templates/mongodb-secret.yaml
diff --git a/deployment/helm/templates/nginx-auth.yaml b/deployment/helm/ditto/templates/nginx-auth.yaml
similarity index 100%
rename from deployment/helm/templates/nginx-auth.yaml
rename to deployment/helm/ditto/templates/nginx-auth.yaml
diff --git a/deployment/helm/templates/nginx-config.yaml b/deployment/helm/ditto/templates/nginx-config.yaml
similarity index 100%
rename from deployment/helm/templates/nginx-config.yaml
rename to deployment/helm/ditto/templates/nginx-config.yaml
diff --git a/deployment/helm/templates/nginx-configmap.yaml b/deployment/helm/ditto/templates/nginx-configmap.yaml
similarity index 100%
rename from deployment/helm/templates/nginx-configmap.yaml
rename to deployment/helm/ditto/templates/nginx-configmap.yaml
diff --git a/deployment/helm/templates/nginx-deployment.yaml b/deployment/helm/ditto/templates/nginx-deployment.yaml
similarity index 100%
rename from deployment/helm/templates/nginx-deployment.yaml
rename to deployment/helm/ditto/templates/nginx-deployment.yaml
diff --git a/deployment/helm/templates/nginx-ingress-api.yaml b/deployment/helm/ditto/templates/nginx-ingress-api.yaml
similarity index 100%
rename from deployment/helm/templates/nginx-ingress-api.yaml
rename to deployment/helm/ditto/templates/nginx-ingress-api.yaml
diff --git a/deployment/helm/templates/nginx-ingress-root.yaml b/deployment/helm/ditto/templates/nginx-ingress-root.yaml
similarity index 100%
rename from deployment/helm/templates/nginx-ingress-root.yaml
rename to deployment/helm/ditto/templates/nginx-ingress-root.yaml
diff --git a/deployment/helm/templates/nginx-ingress-ui.yaml b/deployment/helm/ditto/templates/nginx-ingress-ui.yaml
similarity index 100%
rename from deployment/helm/templates/nginx-ingress-ui.yaml
rename to deployment/helm/ditto/templates/nginx-ingress-ui.yaml
diff --git a/deployment/helm/templates/nginx-ingress-ws.yaml b/deployment/helm/ditto/templates/nginx-ingress-ws.yaml
similarity index 100%
rename from deployment/helm/templates/nginx-ingress-ws.yaml
rename to deployment/helm/ditto/templates/nginx-ingress-ws.yaml
diff --git a/deployment/helm/templates/nginx-networkpolicy.yaml b/deployment/helm/ditto/templates/nginx-networkpolicy.yaml
similarity index 100%
rename from deployment/helm/templates/nginx-networkpolicy.yaml
rename to deployment/helm/ditto/templates/nginx-networkpolicy.yaml
diff --git a/deployment/helm/templates/nginx-route.yaml b/deployment/helm/ditto/templates/nginx-route.yaml
similarity index 100%
rename from deployment/helm/templates/nginx-route.yaml
rename to deployment/helm/ditto/templates/nginx-route.yaml
diff --git a/deployment/helm/templates/nginx-service.yaml b/deployment/helm/ditto/templates/nginx-service.yaml
similarity index 100%
rename from deployment/helm/templates/nginx-service.yaml
rename to deployment/helm/ditto/templates/nginx-service.yaml
diff --git a/deployment/helm/templates/policies-deployment.yaml b/deployment/helm/ditto/templates/policies-deployment.yaml
similarity index 100%
rename from deployment/helm/templates/policies-deployment.yaml
rename to deployment/helm/ditto/templates/policies-deployment.yaml
diff --git a/deployment/helm/templates/policies-networkpolicy.yaml b/deployment/helm/ditto/templates/policies-networkpolicy.yaml
similarity index 100%
rename from deployment/helm/templates/policies-networkpolicy.yaml
rename to deployment/helm/ditto/templates/policies-networkpolicy.yaml
diff --git a/deployment/helm/templates/policies-pdb.yaml b/deployment/helm/ditto/templates/policies-pdb.yaml
similarity index 100%
rename from deployment/helm/templates/policies-pdb.yaml
rename to deployment/helm/ditto/templates/policies-pdb.yaml
diff --git a/deployment/helm/templates/policies-podmonitor.yaml b/deployment/helm/ditto/templates/policies-podmonitor.yaml
similarity index 100%
rename from deployment/helm/templates/policies-podmonitor.yaml
rename to deployment/helm/ditto/templates/policies-podmonitor.yaml
diff --git a/deployment/helm/templates/role.yaml b/deployment/helm/ditto/templates/role.yaml
similarity index 100%
rename from deployment/helm/templates/role.yaml
rename to deployment/helm/ditto/templates/role.yaml
diff --git a/deployment/helm/templates/rolebinding.yaml b/deployment/helm/ditto/templates/rolebinding.yaml
similarity index 100%
rename from deployment/helm/templates/rolebinding.yaml
rename to deployment/helm/ditto/templates/rolebinding.yaml
diff --git a/deployment/helm/templates/serviceaccount.yaml b/deployment/helm/ditto/templates/serviceaccount.yaml
similarity index 100%
rename from deployment/helm/templates/serviceaccount.yaml
rename to deployment/helm/ditto/templates/serviceaccount.yaml
diff --git a/deployment/helm/templates/swaggerui-config.yaml b/deployment/helm/ditto/templates/swaggerui-config.yaml
similarity index 100%
rename from deployment/helm/templates/swaggerui-config.yaml
rename to deployment/helm/ditto/templates/swaggerui-config.yaml
diff --git a/deployment/helm/templates/swaggerui-deployment.yaml b/deployment/helm/ditto/templates/swaggerui-deployment.yaml
similarity index 100%
rename from deployment/helm/templates/swaggerui-deployment.yaml
rename to deployment/helm/ditto/templates/swaggerui-deployment.yaml
diff --git a/deployment/helm/templates/swaggerui-networkpolicy.yaml b/deployment/helm/ditto/templates/swaggerui-networkpolicy.yaml
similarity index 100%
rename from deployment/helm/templates/swaggerui-networkpolicy.yaml
rename to deployment/helm/ditto/templates/swaggerui-networkpolicy.yaml
diff --git a/deployment/helm/templates/swaggerui-pdb.yaml b/deployment/helm/ditto/templates/swaggerui-pdb.yaml
similarity index 100%
rename from deployment/helm/templates/swaggerui-pdb.yaml
rename to deployment/helm/ditto/templates/swaggerui-pdb.yaml
diff --git a/deployment/helm/templates/swaggerui-service.yaml b/deployment/helm/ditto/templates/swaggerui-service.yaml
similarity index 100%
rename from deployment/helm/templates/swaggerui-service.yaml
rename to deployment/helm/ditto/templates/swaggerui-service.yaml
diff --git a/deployment/helm/templates/things-deployment.yaml b/deployment/helm/ditto/templates/things-deployment.yaml
similarity index 100%
rename from deployment/helm/templates/things-deployment.yaml
rename to deployment/helm/ditto/templates/things-deployment.yaml
diff --git a/deployment/helm/templates/things-networkpolicy.yaml b/deployment/helm/ditto/templates/things-networkpolicy.yaml
similarity index 100%
rename from deployment/helm/templates/things-networkpolicy.yaml
rename to deployment/helm/ditto/templates/things-networkpolicy.yaml
diff --git a/deployment/helm/templates/things-pdb.yaml b/deployment/helm/ditto/templates/things-pdb.yaml
similarity index 100%
rename from deployment/helm/templates/things-pdb.yaml
rename to deployment/helm/ditto/templates/things-pdb.yaml
diff --git a/deployment/helm/templates/things-podmonitor.yaml b/deployment/helm/ditto/templates/things-podmonitor.yaml
similarity index 100%
rename from deployment/helm/templates/things-podmonitor.yaml
rename to deployment/helm/ditto/templates/things-podmonitor.yaml
diff --git a/deployment/helm/templates/thingssearch-deployment.yaml b/deployment/helm/ditto/templates/thingssearch-deployment.yaml
similarity index 100%
rename from deployment/helm/templates/thingssearch-deployment.yaml
rename to deployment/helm/ditto/templates/thingssearch-deployment.yaml
diff --git a/deployment/helm/templates/thingssearch-networkpolicy.yaml b/deployment/helm/ditto/templates/thingssearch-networkpolicy.yaml
similarity index 100%
rename from deployment/helm/templates/thingssearch-networkpolicy.yaml
rename to deployment/helm/ditto/templates/thingssearch-networkpolicy.yaml
diff --git a/deployment/helm/templates/thingssearch-pdb.yaml b/deployment/helm/ditto/templates/thingssearch-pdb.yaml
similarity index 100%
rename from deployment/helm/templates/thingssearch-pdb.yaml
rename to deployment/helm/ditto/templates/thingssearch-pdb.yaml
diff --git a/deployment/helm/templates/thingssearch-podmonitor.yaml b/deployment/helm/ditto/templates/thingssearch-podmonitor.yaml
similarity index 100%
rename from deployment/helm/templates/thingssearch-podmonitor.yaml
rename to deployment/helm/ditto/templates/thingssearch-podmonitor.yaml
diff --git a/deployment/helm/values.yaml b/deployment/helm/ditto/values.yaml
similarity index 100%
rename from deployment/helm/values.yaml
rename to deployment/helm/ditto/values.yaml

From 9e72ded09542e65287709d20a432bbfc1fa2016b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 18 May 2023 21:42:08 +0200
Subject: [PATCH 103/173] fixed Helm linting errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/values.yaml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index aae389e29e3..1dead4470f7 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -182,11 +182,11 @@ ingress:
       charset utf-8;
       default_type application/json;
       chunked_transfer_encoding off;
-      
+
       send_timeout 70; # seconds, default: 60
       client_header_buffer_size 8k; # allow longer URIs + headers (default: 1k)
       large_client_header_buffers 4 16k;
-      
+
       proxy_http_version 1.1;
       proxy_set_header X-Forwarded-Host $http_host;
       proxy_set_header X-Forwarded-Proto $scheme;
@@ -210,20 +210,20 @@ ingress:
         backendSuffix: gateway
     # annotations defines k8s annotations to add to the Ingress
     annotations:
-      nginx.ingress.kubernetes.io/proxy-connect-timeout: "10" # seconds, default: 60
-      nginx.ingress.kubernetes.io/proxy-send-timeout: "70" # seconds, default: 60
-      nginx.ingress.kubernetes.io/proxy-read-timeout: "70" # seconds, default: 60
+      nginx.ingress.kubernetes.io/proxy-connect-timeout: "10"
+      nginx.ingress.kubernetes.io/proxy-send-timeout: "70"
+      nginx.ingress.kubernetes.io/proxy-read-timeout: "70"
       nginx.ingress.kubernetes.io/proxy-next-upstream: "error timeout http_502"
       nginx.ingress.kubernetes.io/proxy-next-upstream-tries: "4"
       nginx.ingress.kubernetes.io/proxy-next-upstream-timeout: "50"
       nginx.ingress.kubernetes.io/proxy-buffer-size: "16k"
       nginx.ingress.kubernetes.io/configuration-snippet: |
         set $cors '1';
-        
+
         if ($request_method = 'OPTIONS') {
           set $cors "${cors}o";
         }
-        
+
         if ($cors = '1') {
           add_header 'Access-Control-Allow-Origin' '$http_origin' always;
           add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, DELETE, OPTIONS' always;
@@ -231,7 +231,7 @@ ingress:
           add_header 'Access-Control-Allow-Headers' '$http_access_control_request_headers' always;
           add_header 'Access-Control-Expose-Headers' '*' always;
         }
-        
+
         if ($cors = '1o') {
           # Tell client that this pre-flight info is valid for 20 days
           add_header 'Access-Control-Max-Age' 1728000;
@@ -244,12 +244,12 @@ ingress:
           add_header 'Content-Length' 0;
           return 200;
         }
-        
+
         if ($request_method = 'OPTIONS') {
           add_header 'Content-Type' 'text/plain charset=UTF-8';
           return 405 "Origin $http_origin is not in CORS allow-list, contact your admin to get it added";
         }
-        
+
         # security relevant headers:
         add_header "Content-Security-Policy" "default-src 'none'; frame-ancestors 'none'" always;
         add_header "Strict-Transport-Security" "max-age=63072000; includeSubdomains;" always;
@@ -265,8 +265,8 @@ ingress:
         backendSuffix: gateway
     # annotations defines k8s annotations to add to the Ingress
     annotations:
-      nginx.ingress.kubernetes.io/proxy-send-timeout: "86400" # seconds, default: 60
-      nginx.ingress.kubernetes.io/proxy-read-timeout: "86400" # seconds, default: 60
+      nginx.ingress.kubernetes.io/proxy-send-timeout: "86400"
+      nginx.ingress.kubernetes.io/proxy-read-timeout: "86400"
       nginx.ingress.kubernetes.io/proxy-next-upstream: "error timeout http_502"
       nginx.ingress.kubernetes.io/proxy-next-upstream-tries: "4"
       nginx.ingress.kubernetes.io/proxy-next-upstream-timeout: "50"
@@ -1473,9 +1473,9 @@ dittoui:
       maxSurge: 1
       maxUnavailable: 0
   # additionalLabels on Ditto UI pods
-  additionalLabels: { }
+  additionalLabels: {}
   # additionalAnnotations on Ditto UI pods
-  additionalAnnotations: { }
+  additionalAnnotations: {}
   image:
     # repository for the Ditto UI docker image
     repository: docker.io/eclipse/ditto-ui
@@ -1506,7 +1506,7 @@ dittoui:
     # port of the Ditto UI service
     port: 8080
     # annotations to add arbitrary annotations to Ditto UI service
-    annotations: { }
+    annotations: {}
 
 ## ----------------------------------------------------------------------------
 ## swaggerui configuration

From a8208a90b04e6f6761393a025b650ede7df77195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 18 May 2023 21:44:34 +0200
Subject: [PATCH 104/173] fixed kubeval chart dir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .github/kubeval.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/kubeval.sh b/.github/kubeval.sh
index 478fcb4916f..105cdece542 100755
--- a/.github/kubeval.sh
+++ b/.github/kubeval.sh
@@ -17,7 +17,7 @@
 set -o errexit
 set -o pipefail
 
-CHART_DIR=deployment/helm
+CHART_DIR=deployment/helm/ditto
 KUBEVAL_VERSION="v0.16.1"
 SCHEMA_LOCATION="https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/"
 

From 615fc537c501b248da336aa11c848b5a95cdef8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 18 May 2023 22:07:11 +0200
Subject: [PATCH 105/173] added ci customization for lower resources
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../helm/ditto/ci/ci-workflow-values.yaml     | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 deployment/helm/ditto/ci/ci-workflow-values.yaml

diff --git a/deployment/helm/ditto/ci/ci-workflow-values.yaml b/deployment/helm/ditto/ci/ci-workflow-values.yaml
new file mode 100644
index 00000000000..1ce5fc30fd5
--- /dev/null
+++ b/deployment/helm/ditto/ci/ci-workflow-values.yaml
@@ -0,0 +1,51 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+---
+
+# profile for installing Ditto
+# - with Ingress enabled and low cpu requests
+
+## ingress configuration
+ingress:
+  enabled: true
+  host: ditto.example.com
+  annotations:
+    # kubernetes.io/tls-acme: "true"
+  tls:
+    - secretName: ditto-tls
+      hosts:
+        - ditto.example.com
+
+connectivity:
+  resources:
+    requests:
+      cpu: 150m
+
+gateway:
+  resources:
+    requests:
+      cpu: 150m
+
+policies:
+  resources:
+    requests:
+      cpu: 150m
+
+things:
+  resources:
+    requests:
+      cpu: 150m
+
+thingsSearch:
+  resources:
+    requests:
+      cpu: 150m

From 89ac39608f01ba63ee65aa24b4270ee79adace49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Fri, 19 May 2023 07:37:37 +0200
Subject: [PATCH 106/173] configured ci customization for lower resources
 correctly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../helm/ditto/ci/ci-workflow-values.yaml     | 88 ++++++++++++++++---
 1 file changed, 74 insertions(+), 14 deletions(-)

diff --git a/deployment/helm/ditto/ci/ci-workflow-values.yaml b/deployment/helm/ditto/ci/ci-workflow-values.yaml
index 1ce5fc30fd5..bad3d2b5f3f 100644
--- a/deployment/helm/ditto/ci/ci-workflow-values.yaml
+++ b/deployment/helm/ditto/ci/ci-workflow-values.yaml
@@ -25,27 +25,87 @@ ingress:
       hosts:
         - ditto.example.com
 
-connectivity:
+## ----------------------------------------------------------------------------
+## policies configuration
+## ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+policies:
   resources:
-    requests:
-      cpu: 150m
+    cpu: 0.15
+    memoryMi: 512
+  jvm:
+    activeProcessorCount: 2
+    heapRamPercentage: 50
 
-gateway:
+## ----------------------------------------------------------------------------
+## things configuration
+## ref: https://www.eclipse.org/ditto/architecture-services-things.html
+things:
   resources:
-    requests:
-      cpu: 150m
+    cpu: 0.2
+    memoryMi: 512
+  jvm:
+    activeProcessorCount: 2
+    heapRamPercentage: 50
 
-policies:
+## ----------------------------------------------------------------------------
+## things-search configuration
+## ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+thingsSearch:
   resources:
-    requests:
-      cpu: 150m
+    cpu: 0.15
+    memoryMi: 512
+  jvm:
+    activeProcessorCount: 2
+    heapRamPercentage: 50
 
-things:
+## ----------------------------------------------------------------------------
+## connectivity configuration
+## ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+connectivity:
   resources:
-    requests:
-      cpu: 150m
+    cpu: 0.15
+    memoryMi: 768
+  jvm:
+    activeProcessorCount: 2
+    heapRamPercentage: 55
 
-thingsSearch:
+## ----------------------------------------------------------------------------
+## gateway configuration
+## ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+gateway:
+  resources:
+    cpu: 0.15
+    memoryMi: 512
+  jvm:
+    activeProcessorCount: 2
+    heapRamPercentage: 50
+
+## ----------------------------------------------------------------------------
+## nginx configuration
+nginx:
+  resources:
+    cpu: 0.1
+    memoryMi: 64
+  initContainers:
+    waitForGateway:
+      enabled: false
+
+## ----------------------------------------------------------------------------
+## mongodb dependency chart configuration
+mongodb:
+  enabled: true
   resources:
+    limits:
+      cpu: 100m
+      memory: 256Mi
     requests:
-      cpu: 150m
+      cpu: 100m
+      memory: 256Mi
+  readinessProbe:
+    enabled: false
+  livenessProbe:
+    enabled: false
+  auth:
+    enabled: false
+  persistence:
+    enabled: false

From 086db150ebf43c0ef6415ec3b59eb8e88d88343b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Fri, 19 May 2023 08:01:28 +0200
Subject: [PATCH 107/173] reduce CPU requests for testing chart
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/ci/ci-workflow-values.yaml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/deployment/helm/ditto/ci/ci-workflow-values.yaml b/deployment/helm/ditto/ci/ci-workflow-values.yaml
index bad3d2b5f3f..6e1b99504cf 100644
--- a/deployment/helm/ditto/ci/ci-workflow-values.yaml
+++ b/deployment/helm/ditto/ci/ci-workflow-values.yaml
@@ -41,7 +41,7 @@ policies:
 ## ref: https://www.eclipse.org/ditto/architecture-services-things.html
 things:
   resources:
-    cpu: 0.2
+    cpu: 0.15
     memoryMi: 512
   jvm:
     activeProcessorCount: 2
@@ -84,12 +84,24 @@ gateway:
 ## nginx configuration
 nginx:
   resources:
-    cpu: 0.1
+    cpu: 0.05
     memoryMi: 64
   initContainers:
     waitForGateway:
       enabled: false
 
+## ----------------------------------------------------------------------------
+## swaggerui configuration
+swaggerui:
+  resources:
+    cpu: 0.05
+
+## ----------------------------------------------------------------------------
+## dittoui configuration
+dittoui:
+  resources:
+    cpu: 0.05
+
 ## ----------------------------------------------------------------------------
 ## mongodb dependency chart configuration
 mongodb:

From 3fe3e1122ed8048217684ee9043612df6a198ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 22 May 2023 17:23:24 +0200
Subject: [PATCH 108/173] added GH action for publishing Ditto Helm chart to
 Docker Hub
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .github/workflows/helm-chart-release.yml | 34 ++++++++++++++++++++++++
 deployment/helm/ditto/Chart.yaml         |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/helm-chart-release.yml

diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml
new file mode 100644
index 00000000000..0ec6232dbf2
--- /dev/null
+++ b/.github/workflows/helm-chart-release.yml
@@ -0,0 +1,34 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+name: Release and publish Helm chart
+
+on:
+  workflow_dispatch:
+    inputs:
+      chartVersion:
+        description: 'Helm chart version'
+        required: true
+        type: string
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Package and push Ditto Helm chart to Docker Hub
+        uses: appany/helm-oci-chart-releaser@v0.3.0
+        with:
+          repository: eclipse
+          name: ditto
+          tag: ${{ inputs.chartVersion }}
+          path: deployment/helm/ditto
+          registry: registry-1.docker.io
+          registry_username: eclipsedittobot
+          registry_password: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index 0e196dd8f00..334f5527f97 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.3.0
+version: 0.0.1  # chart version is set by release-job
 appVersion: 3.2.1
 keywords:
   - iot-chart

From bdb0c364c0f56905b8a9ffeca3a578a506700e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 22 May 2023 18:17:40 +0200
Subject: [PATCH 109/173] added README.md for new Ditto Helm chart specifying
 configuration options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/README.md       |  20 +++++
 deployment/helm/ditto/README.md | 144 +++++++++++++++++++++++++-------
 2 files changed, 136 insertions(+), 28 deletions(-)
 create mode 100644 deployment/helm/README.md

diff --git a/deployment/helm/README.md b/deployment/helm/README.md
new file mode 100644
index 00000000000..85020b4a66a
--- /dev/null
+++ b/deployment/helm/README.md
@@ -0,0 +1,20 @@
+# Eclipse Ditto :: Helm
+
+The official Ditto Helm chart is managed here, in folder [ditto](ditto/).  
+It is deployed as "OCI artifact" to Docker Hub at: https://hub.docker.com/r/eclipse/ditto
+
+## Install Ditto via Helm Chart
+
+To install the chart with the release name eclipse-ditto, run the following commands:
+
+```shell script
+helm install -n ditto my-ditto oci://registry-1.docker.io/eclipse/ditto --version <version> --wait
+```
+
+# Uninstall the Helm Chart
+
+To uninstall/delete the `my-ditto` deployment:
+
+```shell script
+helm uninstall my-ditto
+```
diff --git a/deployment/helm/ditto/README.md b/deployment/helm/ditto/README.md
index 07943d65a9a..26b1434193f 100644
--- a/deployment/helm/ditto/README.md
+++ b/deployment/helm/ditto/README.md
@@ -1,49 +1,137 @@
-# Eclipse Ditto :: Helm
+# Eclipse Ditto
 
-The Ditto Helm chart sources are managed here.
+## Introduction
 
-## Install Ditto via Helm Chart
+[Eclipse Ditto™](https://www.eclipse.org/ditto/) is a technology in the IoT implementing a software pattern
+called “digital twins”. A digital twin is a virtual, cloud based, representation of his real world counterpart
+(real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations, …).
 
-To install the chart with the release name eclipse-ditto, run the following commands:
+This chart uses `eclipse/ditto-XXX` containers to run Ditto inside Kubernetes.
 
-```shell script
-helm repo add eclipse-iot https://www.eclipse.org/packages/charts/
-helm repo update
-helm install eclipse-ditto eclipse-iot/ditto
+## Prerequisites
+
+Installing Ditto using the chart requires the Helm tool to be installed as described on the
+[IoT Packages chart repository prerequisites](https://www.eclipse.org/packages/prereqs/) page.
+
+TL;DR:
+
+* have a correctly configured [`kubectl`](https://kubernetes.io/docs/tasks/tools/#kubectl) (either against a local or remote k8s cluster)
+* have [Helm installed](https://helm.sh/docs/intro/)
+
+The Helm chart is being tested to successfully install on the three most recent Kubernetes versions.
+
+## Installing the Chart
+
+The instructions below illustrate how Ditto can be installed to the `ditto` namespace in a Kubernetes cluster using
+release name `eclipse-ditto`.  
+The commands can easily be adapted to use a different name space or release name.
+
+The target name space in Kubernetes only needs to be created if it doesn't exist yet:
+
+```bash
+kubectl create namespace ditto
 ```
 
-# Uninstall the Helm Chart
+The chart can then be installed to name space `ditto` using release name `my-ditto`:
 
-To uninstall/delete the eclipse-ditto deployment:
+```bash
+helm install --dependency-update -n ditto my-ditto oci://registry-1.docker.io/eclipse/ditto --version <version> --wait
+```
+
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-ditto` release:
 
-```shell script
-helm delete eclipse-ditto
+```bash
+helm uninstall -n ditto my-ditto
 ```
 
-# Working locally with the chart
+The command removes all the Kubernetes components associated with the chart and deletes the release.
 
-In order to test / develop the chart locally, this section should be of help.
+## Configuration
 
-## Testing templating
-For that, no running k8s cluster is necessary - the output will be the rendered k8s deployment descriptors:
+Please view the `values.yaml` for the list of possible configuration values with its documentation.
 
-```shell
-helm template my-ditto . -f values.yaml -f local-values.yaml --debug
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example:
+
+```bash
+helm install -n ditto my-ditto oci://registry-1.docker.io/eclipse/ditto --version <version> --set swaggerui.enabled=false
 ```
 
-## Installation
-To install the Ditto chart with the name `"my-ditto"`, perform:
+Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart.
+
+## Chart configuration options
+
+Please consult the [values.yaml](https://github.com/eclipse-ditto/ditto/blob/master/deployment/helm/ditto/values.yaml) 
+for all available configuration options of the Ditto Helm chart.  
+
+### Scaling options
 
-```shell
-helm install -f values.yaml -f local-values.yaml my-ditto . --wait
-kubectl port-forward svc/my-ditto-nginx 8080:8080
+Please note the defaults the chart comes with:
+* the default deploy 1 instance per Ditto service
+* each Ditto service is configured to require:
+  * 0.5 CPUs
+  * 1024 MiB of memory
+
+Adjust this to your requirements, e.g. scale horizontally by configuring a higher `replicaCount` or vertically by 
+configuring more resources.
+
+## Advanced configuration options
+
+Even more configuration options, not exposed to the `values.yaml`, can be configured using either environment variables
+or Java "System properties".  
+To inspect all available configuration options, please inspect Ditto's service configurations:
+
+* [policies.conf](https://github.com/eclipse-ditto/ditto/blob/master/policies/service/src/main/resources/policies.conf)
+* [things.conf](https://github.com/eclipse-ditto/ditto/blob/master/things/service/src/main/resources/things.conf)
+* [things-search.conf](https://github.com/eclipse-ditto/ditto/blob/master/thingsearch/service/src/main/resources/search.conf)
+* [connectivity.conf](https://github.com/eclipse-ditto/ditto/blob/master/connectivity/service/src/main/resources/connectivity.conf)
+* [gateway.conf](https://github.com/eclipse-ditto/ditto/blob/master/gateway/service/src/main/resources/gateway.conf)
+
+
+### Configuration via environment variables
+
+In order to provide an environment variable config overwrite, simply put the environment variable in the `extraEnv` 
+of the Ditto service you want to specify the configuration for.
+
+E.g. if you want to configure the `LOG_INCOMING_MESSAGES` for the `things` service to be disabled:  
+```yaml
+things:
+  # ...
+  extraEnv:
+    - name: LOG_INCOMING_MESSAGES
+      value: "false"
 ```
 
-Now, you can access Ditto on [http://localhost:8080](http://localhost:8080) - have fun.
+### Configuration via system properties
+
+Not all Ditto/Akka configuration options have an environment variable overwrite defined in the configuration.  
+For configurations without such an environment variable overwrite, the option can be configured via Java system property.  
+The documentation on how this works can be found in the 
+[HOCON documentation](https://github.com/lightbend/config/blob/main/HOCON.md#conventional-override-by-system-properties),
+which is the configuration format Ditto uses.
+
+E.g. if you want to would like to adjust the `journal-collection` name which the `things` service uses to write its
+journal entries to MongoDB (which can be found [here](https://github.com/eclipse-ditto/ditto/blob/33a38bc04b47d0167ba0e99fe76d96a54aa3d162/things/service/src/main/resources/things.conf#L268)),
+simply configure:
+
+
+```yaml
+things:
+  # ...
+  systemProps:
+    - "-Dakka-contrib-mongodb-persistence-things-journal.overrides.journal-collection=another_fancy_name"
+```
+
+
+## Troubleshooting
 
-## Uninstallation
-To uninstall the chart again, perform:
+If you experience high resource consumption (either CPU or RAM or both), you can limit the resource usage by
+specifying resource limits.
+This can be done individually for each single component.
+Here is an example how to limit CPU to 0.25 Cores and RAM to 512 MiB for the `connectivity` service:
 
-```shell
-helm uninstall my-ditto
+```bash
+helm upgrade -n ditto eclipse-ditto . --install --set connectivity.resources.limits.cpu=0.25 --set connectivity.resources.limits.memory=512Mi
 ```

From b7d619d26649c98703ba63d0e4cdf3aaf653b1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 22 May 2023 18:33:11 +0200
Subject: [PATCH 110/173] added build steps for UI for: * GH pages * nightly
 job * release jobs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .github/workflows/docker-nightly.yml           | 11 ++++++++++-
 .github/workflows/gh-pages.yml                 |  7 +++++++
 .github/workflows/push-dockerhub-on-demand.yml |  9 +++++++++
 .github/workflows/push-dockerhub.yml           |  9 +++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-nightly.yml b/.github/workflows/docker-nightly.yml
index 49163666e37..e620f2b5e5c 100644
--- a/.github/workflows/docker-nightly.yml
+++ b/.github/workflows/docker-nightly.yml
@@ -129,7 +129,16 @@ jobs:
           tags: |
             eclipse/ditto-connectivity:${{ env.IMAGE_TAG }}
       -
-        name: Build and push ditto-ui
+        name: Use Node.js 18.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      -
+        name: Build UI with node
+        run: npm run build
+        working-directory: ./ui
+      -
+        name: Build and push ditto-ui image
         uses: docker/build-push-action@v3
         with:
           context: ./ui
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index d507c2ecf97..e2ea1f12476 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -30,6 +30,13 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}
     steps:
       - uses: actions/checkout@v3
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: Build UI with node
+        run: npm run build
+        working-directory: ./ui
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with:
diff --git a/.github/workflows/push-dockerhub-on-demand.yml b/.github/workflows/push-dockerhub-on-demand.yml
index 91c0f382aa1..46bebf6d4ce 100644
--- a/.github/workflows/push-dockerhub-on-demand.yml
+++ b/.github/workflows/push-dockerhub-on-demand.yml
@@ -170,6 +170,15 @@ jobs:
             eclipse/ditto-connectivity:${{ env.IMAGE_MINOR_TAG }}
             eclipse/ditto-connectivity:${{ env.IMAGE_MAJOR_TAG }}
             eclipse/ditto-connectivity:latest
+      -
+        name: Use Node.js 18.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      -
+        name: Build UI with node
+        run: npm run build
+        working-directory: ./ui
       -
         name: Build and push ditto-ui
         if: env.MILESTONE_OR_RC_SUFFIX == env.IMAGE_TAG && inputs.dittoImage == 'ditto-ui'
diff --git a/.github/workflows/push-dockerhub.yml b/.github/workflows/push-dockerhub.yml
index 0b2930c89b7..adc95db098c 100644
--- a/.github/workflows/push-dockerhub.yml
+++ b/.github/workflows/push-dockerhub.yml
@@ -155,6 +155,15 @@ jobs:
             eclipse/ditto-connectivity:${{ env.IMAGE_MINOR_TAG }}
             eclipse/ditto-connectivity:${{ env.IMAGE_MAJOR_TAG }}
             eclipse/ditto-connectivity:latest
+      -
+        name: Use Node.js 18.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      -
+        name: Build UI with node
+        run: npm run build
+        working-directory: ./ui
       -
         name: Build and push ditto-ui
         if: env.MILESTONE_OR_RC_SUFFIX == env.IMAGE_TAG

From 5789e6d117e07745eeacd498037c6f2e3f869e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 23 May 2023 09:00:59 +0200
Subject: [PATCH 111/173] fixed README typos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/deployment/helm/ditto/README.md b/deployment/helm/ditto/README.md
index 26b1434193f..4212a7c4f82 100644
--- a/deployment/helm/ditto/README.md
+++ b/deployment/helm/ditto/README.md
@@ -18,21 +18,21 @@ TL;DR:
 * have a correctly configured [`kubectl`](https://kubernetes.io/docs/tasks/tools/#kubectl) (either against a local or remote k8s cluster)
 * have [Helm installed](https://helm.sh/docs/intro/)
 
-The Helm chart is being tested to successfully install on the three most recent Kubernetes versions.
+The Helm chart is being tested to successfully install on the most recent Kubernetes versions.
 
 ## Installing the Chart
 
 The instructions below illustrate how Ditto can be installed to the `ditto` namespace in a Kubernetes cluster using
 release name `eclipse-ditto`.  
-The commands can easily be adapted to use a different name space or release name.
+The commands can easily be adapted to use a different namespace or release name.
 
-The target name space in Kubernetes only needs to be created if it doesn't exist yet:
+The target namespace in Kubernetes only needs to be created if it doesn't exist yet:
 
 ```bash
 kubectl create namespace ditto
 ```
 
-The chart can then be installed to name space `ditto` using release name `my-ditto`:
+The chart can then be installed to namespace `ditto` using release name `my-ditto`:
 
 ```bash
 helm install --dependency-update -n ditto my-ditto oci://registry-1.docker.io/eclipse/ditto --version <version> --wait
@@ -112,7 +112,7 @@ The documentation on how this works can be found in the
 [HOCON documentation](https://github.com/lightbend/config/blob/main/HOCON.md#conventional-override-by-system-properties),
 which is the configuration format Ditto uses.
 
-E.g. if you want to would like to adjust the `journal-collection` name which the `things` service uses to write its
+E.g. if you want to adjust the `journal-collection` name which the `things` service uses to write its
 journal entries to MongoDB (which can be found [here](https://github.com/eclipse-ditto/ditto/blob/33a38bc04b47d0167ba0e99fe76d96a54aa3d162/things/service/src/main/resources/things.conf#L268)),
 simply configure:
 

From 9e28834467af5f29e0ee841ea30dbf7c2c8c9d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 23 May 2023 09:06:00 +0200
Subject: [PATCH 112/173] add npm install for gh-pages build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .github/workflows/gh-pages.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index e2ea1f12476..0a6aff80868 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -34,6 +34,9 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
+      - name: Install npm dependencies
+        run: npm install
+        working-directory: ./ui
       - name: Build UI with node
         run: npm run build
         working-directory: ./ui

From 432e65c39c7596767546050ab3980ac99d9caf20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 23 May 2023 10:15:43 +0200
Subject: [PATCH 113/173] add npm install for all other GH builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .github/workflows/docker-nightly.yml           | 4 ++++
 .github/workflows/push-dockerhub-on-demand.yml | 4 ++++
 .github/workflows/push-dockerhub.yml           | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/.github/workflows/docker-nightly.yml b/.github/workflows/docker-nightly.yml
index e620f2b5e5c..e251c08e235 100644
--- a/.github/workflows/docker-nightly.yml
+++ b/.github/workflows/docker-nightly.yml
@@ -133,6 +133,10 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
+      -
+        name: Install npm dependencies
+        run: npm install
+        working-directory: ./ui
       -
         name: Build UI with node
         run: npm run build
diff --git a/.github/workflows/push-dockerhub-on-demand.yml b/.github/workflows/push-dockerhub-on-demand.yml
index 46bebf6d4ce..173394fc299 100644
--- a/.github/workflows/push-dockerhub-on-demand.yml
+++ b/.github/workflows/push-dockerhub-on-demand.yml
@@ -175,6 +175,10 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
+      -
+        name: Install npm dependencies
+        run: npm install
+        working-directory: ./ui
       -
         name: Build UI with node
         run: npm run build
diff --git a/.github/workflows/push-dockerhub.yml b/.github/workflows/push-dockerhub.yml
index adc95db098c..47189cb50d6 100644
--- a/.github/workflows/push-dockerhub.yml
+++ b/.github/workflows/push-dockerhub.yml
@@ -160,6 +160,10 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
+      -
+        name: Install npm dependencies
+        run: npm install
+        working-directory: ./ui
       -
         name: Build UI with node
         run: npm run build

From 673f95eb5c7c40dfac05bbeacf2e14734a2a10aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Fri, 14 Apr 2023 18:03:13 +0200
Subject: [PATCH 114/173] #1524 added "if-equal" header to define whether to
 "skip" and update of an equal value
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* default is "update" (which is the current behavior), always overwriting the value, even if it is equal to the one before
* return a "*PreconditionNotModifiedException" (HTTP 304) when "skip" is provided and value is equal
* work on logic is still in progress

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../model/headers/AbstractDittoHeaders.java   |   6 +
 .../headers/AbstractDittoHeadersBuilder.java  |   6 +
 .../model/headers/DittoHeaderDefinition.java  |  15 ++
 .../base/model/headers/DittoHeaders.java      |   9 +
 .../model/headers/DittoHeadersBuilder.java    |  10 +
 .../base/model/headers/IfEqualOption.java     |  59 ++++++
 .../headers/ImmutableDittoHeadersTest.java    |   4 +
 ...ctionPreconditionNotModifiedException.java |  10 +
 ...nsConditionalHeadersValidatorProvider.java |   7 +
 .../ConditionalHeadersValidator.java          |  51 ++++-
 .../IfEqualPreconditionHeader.java            | 187 ++++++++++++++++++
 .../conditional/PreconditionHeader.java       |   2 +-
 ...onditionHeaderCheckingCommandStrategy.java |   7 +-
 ...olicyPreconditionNotModifiedException.java |  18 +-
 ...esConditionalHeadersValidatorProvider.java |   7 +
 ...ThingPreconditionNotModifiedException.java |  12 +-
 ...gsConditionalHeadersValidatorProvider.java |   7 +
 17 files changed, 405 insertions(+), 12 deletions(-)
 create mode 100644 base/model/src/main/java/org/eclipse/ditto/base/model/headers/IfEqualOption.java
 create mode 100644 internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfEqualPreconditionHeader.java

diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeaders.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeaders.java
index aaa6b176a0e..8dee251e7fc 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeaders.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeaders.java
@@ -313,6 +313,12 @@ public Optional<EntityTagMatchers> getIfNoneMatch() {
                 .map(EntityTagMatchers::fromCommaSeparatedString);
     }
 
+    @Override
+    public Optional<IfEqualOption> getIfEqual() {
+        return getStringForDefinition(DittoHeaderDefinition.IF_EQUAL)
+                .flatMap(IfEqualOption::forOption);
+    }
+
     @Override
     public Optional<String> getInboundPayloadMapper() {
         return getStringForDefinition(DittoHeaderDefinition.INBOUND_PAYLOAD_MAPPER);
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeadersBuilder.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeadersBuilder.java
index 3dde80d8717..ff9df12d26e 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeadersBuilder.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeadersBuilder.java
@@ -410,6 +410,12 @@ public S ifNoneMatch(final EntityTagMatchers entityTags) {
         return myself;
     }
 
+    @Override
+    public S ifEqual(final IfEqualOption ifEqualOption) {
+        putCharSequence(DittoHeaderDefinition.IF_EQUAL, ifEqualOption.toString());
+        return myself;
+    }
+
     @Override
     public S inboundPayloadMapper(@Nullable final String inboundPayloadMapperId) {
         putCharSequence(DittoHeaderDefinition.INBOUND_PAYLOAD_MAPPER, inboundPayloadMapperId);
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaderDefinition.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaderDefinition.java
index c01d45e9b01..bff06aefb7c 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaderDefinition.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaderDefinition.java
@@ -195,6 +195,21 @@ public enum DittoHeaderDefinition implements HeaderDefinition {
             false,
             HeaderValueValidators.getEntityTagMatchersValidator()),
 
+    /**
+     * Header definition for "If-Equal".
+     * Can hold one of the values: {@code update}, {@code skip}, {@code update-metadata-only}.
+     * <p>
+     * Key: {@code "If-Equal"}, Java type: {@link String}.
+     * </p>
+     * @since 3.3.0
+     */
+    IF_EQUAL("if-equal",
+            IfEqualOption.class,
+            String.class,
+            true,
+            false,
+            HeaderValueValidators.getEnumValidator(IfEqualOption.values())),
+
     /**
      * Header definition for the internal header "ditto-reply-target". This header is evaluated for responses to be
      * published.
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaders.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaders.java
index 0e48413c85d..d97cd8dd4e4 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaders.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaders.java
@@ -266,6 +266,15 @@ static DittoHeadersBuilder newBuilder(final JsonObject jsonObject) {
      */
     Optional<EntityTagMatchers> getIfNoneMatch();
 
+    /**
+     * Returns the "If-Equal" option header defining whether to update a value if it was equal to the previous value
+     * or not.
+     *
+     * @return the if-equal option header.
+     * @since 3.3.0
+     */
+    Optional<IfEqualOption> getIfEqual();
+
     /**
      * Returns the inbound {@code MessageMapper} ID which mapped incoming arbitrary payload from external sources.
      *
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeadersBuilder.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeadersBuilder.java
index 1ded962e980..c2d3f29782e 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeadersBuilder.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeadersBuilder.java
@@ -189,6 +189,16 @@ default B randomCorrelationId() {
      */
     B ifNoneMatch(EntityTagMatchers entityTags);
 
+    /**
+     * Sets the If-Equal option.
+     *
+     * @param ifEqualOption The if-equal option to set defining what to do with a value to update which is equal to
+     * its previous value.
+     * @return this builder for Method Chaining
+     * @since 3.3.0
+     */
+    B ifEqual(IfEqualOption ifEqualOption);
+
     /**
      * Sets the inbound {@code MessageMapper} ID value.
      *
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/IfEqualOption.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/IfEqualOption.java
new file mode 100644
index 00000000000..11d9f85d906
--- /dev/null
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/IfEqualOption.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.model.headers;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * Possible options for Ditto's {@code if-equal} header.
+ *
+ * @since 3.3.0
+ */
+public enum IfEqualOption {
+
+    /**
+     * Option which updates a value, even if the value is the same (via {@code equal()}) than the value before.
+     * This is the default if omitted and for backwards compatibility.
+     */
+    UPDATE("update"),
+
+    /**
+     * Option which will skip the update of a twin if the new value is the same (via {@code equal()}) than the value
+     * before.
+     */
+    SKIP("skip");
+
+    private final String option;
+
+    IfEqualOption(final String option) {
+        this.option = option;
+    }
+
+    @Override
+    public String toString() {
+        return option;
+    }
+
+    /**
+     * Find an If-Equal option by a provided option string.
+     *
+     * @param option the option.
+     * @return the option with the given option string if any exists.
+     */
+    public static Optional<IfEqualOption> forOption(final String option) {
+        return Arrays.stream(values())
+                .filter(strategy -> strategy.toString().equals(option))
+                .findAny();
+    }
+}
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java
index 6685dd2873e..7b768151cec 100755
--- a/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java
@@ -79,6 +79,7 @@ public final class ImmutableDittoHeadersTest {
             EntityTagMatchers.fromCommaSeparatedString("\"oneValue\",\"anotherValue\"");
     private static final EntityTagMatchers KNOWN_IF_NONE_MATCH =
             EntityTagMatchers.fromCommaSeparatedString("\"notOneValue\",\"notAnotherValue\"");
+    private static final IfEqualOption KNOWN_IF_EQUAL_OPTION = IfEqualOption.SKIP;
     private static final EntityTag KNOWN_ETAG = EntityTag.fromString("\"-12124212\"");
     private static final Collection<AuthorizationSubject> KNOWN_READ_GRANTED_SUBJECTS =
             Lists.list(AuthorizationModelFactory.newAuthSubject("knownGrantedSubject1"),
@@ -172,6 +173,7 @@ public void settingAllKnownHeadersWorksAsExpected() {
                 .eTag(KNOWN_ETAG)
                 .ifMatch(KNOWN_IF_MATCH)
                 .ifNoneMatch(KNOWN_IF_NONE_MATCH)
+                .ifEqual(KNOWN_IF_EQUAL_OPTION)
                 .origin(KNOWN_ORIGIN)
                 .contentType(KNOWN_CONTENT_TYPE)
                 .replyTarget(Integer.valueOf(KNOWN_REPLY_TARGET))
@@ -502,6 +504,7 @@ public void toJsonReturnsExpected() {
                         authorizationSubjectsToJsonArray(KNOWN_READ_REVOKED_SUBJECTS))
                 .set(DittoHeaderDefinition.IF_MATCH.getKey(), KNOWN_IF_MATCH.toString())
                 .set(DittoHeaderDefinition.IF_NONE_MATCH.getKey(), KNOWN_IF_NONE_MATCH.toString())
+                .set(DittoHeaderDefinition.IF_EQUAL.getKey(), KNOWN_IF_EQUAL_OPTION.toString())
                 .set(DittoHeaderDefinition.ETAG.getKey(), KNOWN_ETAG.toString())
                 .set(DittoHeaderDefinition.ORIGIN.getKey(), KNOWN_ORIGIN)
                 .set(DittoHeaderDefinition.CONTENT_TYPE.getKey(), KNOWN_CONTENT_TYPE)
@@ -739,6 +742,7 @@ private static Map<String, String> createMapContainingAllKnownHeaders() {
                 authorizationSubjectsToJsonArray(KNOWN_READ_REVOKED_SUBJECTS).toString());
         result.put(DittoHeaderDefinition.IF_MATCH.getKey(), KNOWN_IF_MATCH.toString());
         result.put(DittoHeaderDefinition.IF_NONE_MATCH.getKey(), KNOWN_IF_NONE_MATCH.toString());
+        result.put(DittoHeaderDefinition.IF_EQUAL.getKey(), KNOWN_IF_EQUAL_OPTION.toString());
         result.put(DittoHeaderDefinition.ETAG.getKey(), KNOWN_ETAG.toString());
         result.put(DittoHeaderDefinition.CONTENT_TYPE.getKey(), KNOWN_CONTENT_TYPE);
         result.put(DittoHeaderDefinition.ACCEPT.getKey(), KNOWN_ACCEPT);
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionPreconditionNotModifiedException.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionPreconditionNotModifiedException.java
index ecb5143274b..dfaeaf5e828 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionPreconditionNotModifiedException.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/signals/commands/exceptions/ConnectionPreconditionNotModifiedException.java
@@ -57,6 +57,16 @@ private ConnectionPreconditionNotModifiedException(final DittoHeaders dittoHeade
         super(ERROR_CODE, HttpStatus.NOT_MODIFIED, dittoHeaders, message, description, cause, href);
     }
 
+    /**
+     * A mutable builder for a {@link ConnectionPreconditionNotModifiedException}.
+     *
+     * @return the builder.
+     * @since 3.3.0
+     */
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
     /**
      * A mutable builder for a {@link ConnectionPreconditionNotModifiedException}.
      *
diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionsConditionalHeadersValidatorProvider.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionsConditionalHeadersValidatorProvider.java
index d83645f573e..f4dcca5b163 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionsConditionalHeadersValidatorProvider.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/strategies/commands/ConnectionsConditionalHeadersValidatorProvider.java
@@ -58,6 +58,13 @@ public DittoRuntimeExceptionBuilder<?> createPreconditionNotModifiedExceptionBui
                 final String expectedNotToMatch, final String matched) {
             return ConnectionPreconditionNotModifiedException.newBuilder(expectedNotToMatch, matched);
         }
+
+        @Override
+        public DittoRuntimeExceptionBuilder<?> createPreconditionNotModifiedForEqualityExceptionBuilder() {
+            return ConnectionPreconditionNotModifiedException.newBuilder()
+                    .message("The previous value was equal to the new value and the 'if-equal' header was set to 'skip'.")
+                    .description("Your changes were not applied, which is probably the expected outcome.");
+        }
     }
 
     private static final ConditionalHeadersValidator INSTANCE = createInstance();
diff --git a/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/ConditionalHeadersValidator.java b/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/ConditionalHeadersValidator.java
index 04eb3f0c04f..47d4bf3c2ed 100644
--- a/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/ConditionalHeadersValidator.java
+++ b/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/ConditionalHeadersValidator.java
@@ -19,6 +19,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.entity.Entity;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
@@ -47,8 +48,8 @@ public interface ValidationSettings {
          * @param actual the actual ETag value.
          * @return the builder.
          */
-        DittoRuntimeExceptionBuilder<?> createPreconditionFailedExceptionBuilder(final String conditionalHeaderName,
-                final String expected, final String actual);
+        DittoRuntimeExceptionBuilder<?> createPreconditionFailedExceptionBuilder(String conditionalHeaderName,
+                String expected, String actual);
 
         /**
          * Returns a builder for a {@link DittoRuntimeException} in case status {@code 304 (Not Modified)} should be
@@ -58,8 +59,18 @@ DittoRuntimeExceptionBuilder<?> createPreconditionFailedExceptionBuilder(final S
          * @param matched the matched value.
          * @return the builder.
          */
-        DittoRuntimeExceptionBuilder<?> createPreconditionNotModifiedExceptionBuilder(final String expectedNotToMatch,
-                final String matched);
+        DittoRuntimeExceptionBuilder<?> createPreconditionNotModifiedExceptionBuilder(String expectedNotToMatch,
+                String matched);
+
+        /**
+         * Returns a builder for a {@link DittoRuntimeException} in case status {@code 304 (Not Modified)} should be
+         * returned for when an updated value was equal to its previous value and the {@code if-equal} condition was
+         * set to "skip".
+         *
+         * @return the builder.
+         * @since 3.3.0
+         */
+        DittoRuntimeExceptionBuilder<?> createPreconditionNotModifiedForEqualityExceptionBuilder();
     }
 
     private final ValidationSettings validationSettings;
@@ -118,6 +129,26 @@ public void checkConditionalHeaders(final Command<?> command,
         checkIfNoneMatch(command, currentETagValue);
     }
 
+    /**
+     * Checks if the in the given {@code command} contained
+     * {@link org.eclipse.ditto.base.model.headers.DittoHeaderDefinition#IF_EQUAL if-equal header} defines whether to
+     * skip an update for when the value to update is the same as before.
+     * Throws a "*PreconditionNotModifiedException" for the respective entity.
+     *
+     * @param command The command that potentially contains the if-equal header.
+     * @param currentEntity the current entity targeted by the given {@code command}.
+     * @throws org.eclipse.ditto.base.model.exceptions.DittoRuntimeException when a condition fails (the concrete
+     * subclass is defined by {@link ValidationSettings}).
+     */
+    public <C extends Command<?>> C applyIfEqualHeader(final C command, @Nullable final Entity<?> currentEntity) {
+
+        if (skipPreconditionHeaderCheck(command, null)) {
+            return command;
+        }
+
+        return applyIfEqual(command, currentEntity);
+    }
+
     private boolean skipPreconditionHeaderCheck(final Command<?> command, @Nullable final EntityTag
             currentETagValue) {
         return (currentETagValue == null &&
@@ -150,6 +181,12 @@ private void checkIfNoneMatch(final Command<?> command, @Nullable final EntityTa
         });
     }
 
+    private <C extends Command<?>> C applyIfEqual(final C command, @Nullable final Entity<?> entity) {
+        return IfEqualPreconditionHeader.fromDittoHeaders(command, validationSettings)
+                .map(ifEqual -> ifEqual.handleCommand(() -> ifEqual.meetsConditionFor(entity)))
+                .orElse(command);
+    }
+
     private DittoRuntimeException buildPreconditionFailedException(
             final PreconditionHeader<?> preconditionHeader,
             final DittoHeaders dittoHeaders, @Nullable final EntityTag currentETagValue) {
@@ -171,6 +208,12 @@ private DittoRuntimeException buildNotModifiedException(final PreconditionHeader
                 .build();
     }
 
+    private DittoRuntimeException buildNotModifiedForEqualityException() {
+        return validationSettings
+                .createPreconditionNotModifiedForEqualityExceptionBuilder()
+                .build();
+    }
+
     private DittoHeaders appendETagIfNotNull(final DittoHeaders dittoHeaders, @Nullable final EntityTag entityTag) {
         if (entityTag == null) {
             return dittoHeaders;
diff --git a/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfEqualPreconditionHeader.java b/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfEqualPreconditionHeader.java
new file mode 100644
index 00000000000..a8640d7e8b7
--- /dev/null
+++ b/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfEqualPreconditionHeader.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.internal.utils.headers.conditional;
+
+import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
+
+import java.util.Comparator;
+import java.util.Optional;
+import java.util.function.BooleanSupplier;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+import org.eclipse.ditto.base.model.entity.Entity;
+import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
+import org.eclipse.ditto.base.model.headers.IfEqualOption;
+import org.eclipse.ditto.base.model.signals.WithOptionalEntity;
+import org.eclipse.ditto.base.model.signals.commands.Command;
+import org.eclipse.ditto.json.JsonCollectors;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonValue;
+
+/**
+ * Custom Ditto {@code if-equal} precondition header supporting available strategies defined in {@link IfEqualOption}.
+ * The default is to always {@link IfEqualOption#UPDATE update} the entity, no matter if the update will lead to the
+ * same state. Another option is to {@link IfEqualOption#SKIP skip} updating an entity when it would be {@code equal}
+ * after the change.
+ *
+ * @param <C> the type of the handled {@link Command}.
+ */
+@Immutable
+public final class IfEqualPreconditionHeader<C extends Command<?>> implements PreconditionHeader<Entity<?>> {
+
+    private static final String IF_EQUAL_KEY = DittoHeaderDefinition.IF_EQUAL.getKey();
+
+    private final C command;
+    private final IfEqualOption ifEqualOption;
+    private final ConditionalHeadersValidator.ValidationSettings validationSettings;
+
+    private IfEqualPreconditionHeader(final C command, final IfEqualOption ifEqualOption,
+            final ConditionalHeadersValidator.ValidationSettings validationSettings) {
+        this.command = checkNotNull(command, "command");
+        this.ifEqualOption = checkNotNull(ifEqualOption, "ifEqualOption");
+        this.validationSettings = checkNotNull(validationSettings, "validationSettings");
+    }
+
+    /**
+     * Extracts an {@link IfEqualPreconditionHeader} from the given {@code command} if present.
+     *
+     * @param command The command containing potentially the {@code if-equal} and the value to modify
+     * @param validationSettings the settings.
+     * @param <C> the type of the handled {@link Command}.
+     * @return Optional of {@link IfEqualPreconditionHeader}. Empty if the given {@code command} don't contain an
+     * {@code if-equal} or if it is not a modifying command.
+     */
+    public static <C extends Command<?>> Optional<IfEqualPreconditionHeader<C>> fromDittoHeaders(
+            final C command,
+            final ConditionalHeadersValidator.ValidationSettings validationSettings) {
+
+        final Command.Category category = command.getCategory();
+        if (category == Command.Category.MODIFY || category == Command.Category.MERGE) {
+            return command.getDittoHeaders().getIfEqual()
+                    .map(ifEqual -> new IfEqualPreconditionHeader<>(command, ifEqual, validationSettings));
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public String getKey() {
+        return IF_EQUAL_KEY;
+    }
+
+    @Override
+    public String getValue() {
+        return ifEqualOption.toString();
+    }
+
+    /**
+     * Indicates whether this {@link IfEqualPreconditionHeader} passes for the given {@code entity}.
+     * This means that the {@code command} field which is currently processed would not change the passed {@code entity},
+     * so the targeted desired state change indicated by the command is already present.
+     *
+     * @param entity The entity for which the equality condition should be met.
+     * @return True if the equality condition is met. False if not.
+     */
+    @Override
+    public boolean meetsConditionFor(@Nullable final Entity<?> entity) {
+
+        if (entity == null) {
+            return false;
+        }
+
+        if (ifEqualOption == IfEqualOption.SKIP) {
+            if (command.getCategory() == Command.Category.MODIFY &&
+                    command instanceof WithOptionalEntity withOptionalEntity) {
+                return withOptionalEntity.getEntity()
+                        .map(newValue -> {
+                            final Optional<JsonValue> previousValue = entity.toJson()
+                                    .getValue(command.getResourcePath());
+                            return previousValue.filter(jsonValue -> jsonValue.equals(newValue))
+                                    .isPresent();
+                        })
+                        .orElse(false);
+            } else if (command.getCategory() == Command.Category.MERGE &&
+                    command instanceof WithOptionalEntity withOptionalEntity) {
+                return withOptionalEntity.getEntity()
+                        .map(newValue -> {
+                            final Optional<JsonValue> previousValue = entity.toJson()
+                                    .getValue(command.getResourcePath());
+                            if (newValue.isObject()) {
+                                return previousValue.filter(JsonValue::isObject)
+                                        .map(JsonValue::asObject)
+                                        .filter(previousObject -> {
+                                            final JsonObject patchedAndSortedNewObject =
+                                                    JsonFactory.mergeJsonValues(newValue.asObject(), previousObject)
+                                                            .asObject().stream()
+                                                            .sorted(Comparator.comparing(j -> j.getKey().toString()))
+                                                            .collect(JsonCollectors.fieldsToObject());
+                                            final JsonObject sortedOldObject = previousObject.stream()
+                                                    .sorted(Comparator.comparing(j -> j.getKey().toString()))
+                                                    .collect(JsonCollectors.fieldsToObject());
+                                            return patchedAndSortedNewObject.equals(sortedOldObject);
+                                        }).isPresent();
+                            } else {
+                                return previousValue.filter(jsonValue -> jsonValue.equals(newValue))
+                                        .isPresent();
+                            }
+                        })
+                        .orElse(false);
+            } else {
+                // other commands to "MODIFY" and "MERGE" do never match the "if-equal" precondition header
+                return false;
+            }
+        } else {
+            // for previous default behavior, "if-equal: update", don't match:
+            return false;
+        }
+    }
+
+    /**
+     * Handles the {@link #command} field of this class by invoking the passed {@code isCompletelyEqualSupplier} to
+     * check whether the affected entity would be completely equal after applying the {@link #command}.
+     *
+     * @return the potentially adjusted Command.
+     */
+    C handleCommand(final BooleanSupplier isCompletelyEqualSupplier) {
+
+        final C potentiallyAdjustedCommand;
+        if (ifEqualOption == IfEqualOption.UPDATE) {
+            // default behavior - no change, just use the complete modify command, not matter what:
+            potentiallyAdjustedCommand = command;
+        } else if (ifEqualOption == IfEqualOption.SKIP) {
+            // lazily check for equality as this might be expensive to do:
+            final boolean completelyEqual = isCompletelyEqualSupplier.getAsBoolean();
+            final Command.Category category = command.getCategory();
+            if (completelyEqual &&
+                    (category == Command.Category.MODIFY || category == Command.Category.MERGE)) {
+                potentiallyAdjustedCommand = respondWithNotModified();
+            } else {
+                potentiallyAdjustedCommand = command;
+            }
+        } else {
+            potentiallyAdjustedCommand = command;
+        }
+        return potentiallyAdjustedCommand;
+    }
+
+    private C respondWithNotModified() {
+        throw validationSettings
+                .createPreconditionNotModifiedForEqualityExceptionBuilder()
+                .dittoHeaders(command.getDittoHeaders())
+                .build();
+    }
+
+}
diff --git a/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/PreconditionHeader.java b/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/PreconditionHeader.java
index e016033ea55..8f6e32b2283 100644
--- a/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/PreconditionHeader.java
+++ b/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/PreconditionHeader.java
@@ -41,5 +41,5 @@ public interface PreconditionHeader<T> {
      * @param objectToCheck The object for which this {@link PreconditionHeader} should meet the condition.
      * @return True if this {@link PreconditionHeader} meets the condition. False if not.
      */
-    boolean meetsConditionFor(@Nullable final T objectToCheck);
+    boolean meetsConditionFor(@Nullable T objectToCheck);
 }
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/etags/AbstractConditionHeaderCheckingCommandStrategy.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/etags/AbstractConditionHeaderCheckingCommandStrategy.java
index 93092c65e2c..c38ade2a634 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/etags/AbstractConditionHeaderCheckingCommandStrategy.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/etags/AbstractConditionHeaderCheckingCommandStrategy.java
@@ -82,9 +82,12 @@ public Result<E> apply(final Context<K> context, @Nullable final S entity, final
         context.getLog().withCorrelationId(command)
                 .debug("Validating conditional headers with currentETagValue <{}> on command <{}>.",
                         currentETagValue, command);
+
+        final C adjustedCommand;
         try {
             getValidator().checkConditionalHeaders(command, currentETagValue);
-            context.getLog().withCorrelationId(command)
+            adjustedCommand = getValidator().applyIfEqualHeader(command, entity);
+            context.getLog().withCorrelationId(adjustedCommand)
                     .debug("Validating conditional headers succeeded.");
         } catch (final DittoRuntimeException dre) {
             context.getLog().withCorrelationId(command)
@@ -92,7 +95,7 @@ public Result<E> apply(final Context<K> context, @Nullable final S entity, final
             return ResultFactory.newErrorResult(dre, command);
         }
 
-        return super.apply(context, entity, nextRevision, command);
+        return super.apply(context, entity, nextRevision, adjustedCommand);
     }
 
     @Override
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/exceptions/PolicyPreconditionNotModifiedException.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/exceptions/PolicyPreconditionNotModifiedException.java
index 453e3c7c2fd..7e190e4c69f 100644
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/exceptions/PolicyPreconditionNotModifiedException.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/commands/exceptions/PolicyPreconditionNotModifiedException.java
@@ -19,12 +19,12 @@
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.NotThreadSafe;
 
-import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.policies.model.PolicyException;
 
 
@@ -58,7 +58,17 @@ private PolicyPreconditionNotModifiedException(final DittoHeaders dittoHeaders,
     }
 
     /**
-     * A mutable builder for a {@link org.eclipse.ditto.policies.model.signals.commands.exceptions.PolicyPreconditionNotModifiedException}.
+     * A mutable builder for a {@link PolicyPreconditionNotModifiedException}.
+     *
+     * @return the builder.
+     * @since 3.3.0
+     */
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+    
+    /**
+     * A mutable builder for a {@link PolicyPreconditionNotModifiedException}.
      *
      * @param expectedNotToMatch the value which was expected not to match {@code matched} value.
      * @param matched the matched value.
@@ -82,7 +92,7 @@ public static PolicyPreconditionNotModifiedException fromMessage(@Nullable final
     }
 
     /**
-     * Constructs a new {@link org.eclipse.ditto.policies.model.signals.commands.exceptions.PolicyPreconditionNotModifiedException} object with the exception message extracted from
+     * Constructs a new {@link PolicyPreconditionNotModifiedException} object with the exception message extracted from
      * the given JSON object.
      *
      * @param jsonObject the JSON to read the
@@ -111,7 +121,7 @@ public DittoRuntimeException setDittoHeaders(final DittoHeaders dittoHeaders) {
     }
 
     /**
-     * A mutable builder with a fluent API for a {@link org.eclipse.ditto.policies.model.signals.commands.exceptions.PolicyPreconditionNotModifiedException}.
+     * A mutable builder with a fluent API for a {@link PolicyPreconditionNotModifiedException}.
      */
     @NotThreadSafe
     public static final class Builder extends DittoRuntimeExceptionBuilder<PolicyPreconditionNotModifiedException> {
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PoliciesConditionalHeadersValidatorProvider.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PoliciesConditionalHeadersValidatorProvider.java
index b5b65142a3e..158cbadf57a 100644
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PoliciesConditionalHeadersValidatorProvider.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PoliciesConditionalHeadersValidatorProvider.java
@@ -56,6 +56,13 @@ public DittoRuntimeExceptionBuilder<?> createPreconditionNotModifiedExceptionBui
                 final String expectedNotToMatch, final String matched) {
             return PolicyPreconditionNotModifiedException.newBuilder(expectedNotToMatch, matched);
         }
+
+        @Override
+        public DittoRuntimeExceptionBuilder<?> createPreconditionNotModifiedForEqualityExceptionBuilder() {
+            return PolicyPreconditionNotModifiedException.newBuilder()
+                    .message("The previous value was equal to the new value and the 'if-equal' header was set to 'skip'.")
+                    .description("Your changes were not applied, which is probably the expected outcome.");
+        }
     }
 
     private static final ConditionalHeadersValidator INSTANCE = createInstance();
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/exceptions/ThingPreconditionNotModifiedException.java b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/exceptions/ThingPreconditionNotModifiedException.java
index 178a5b3c6b4..f5a0c093d04 100644
--- a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/exceptions/ThingPreconditionNotModifiedException.java
+++ b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/exceptions/ThingPreconditionNotModifiedException.java
@@ -19,12 +19,12 @@
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.NotThreadSafe;
 
-import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.things.model.ThingException;
 
 
@@ -57,6 +57,16 @@ private ThingPreconditionNotModifiedException(final DittoHeaders dittoHeaders,
         super(ERROR_CODE, HttpStatus.NOT_MODIFIED, dittoHeaders, message, description, cause, href);
     }
 
+    /**
+     * A mutable builder for a {@link ThingPreconditionNotModifiedException}.
+     *
+     * @return the builder.
+     * @since 3.3.0
+     */
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
     /**
      * A mutable builder for a {@link ThingPreconditionNotModifiedException}.
      *
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingsConditionalHeadersValidatorProvider.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingsConditionalHeadersValidatorProvider.java
index 534061e25ee..486f12937c6 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingsConditionalHeadersValidatorProvider.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingsConditionalHeadersValidatorProvider.java
@@ -68,6 +68,13 @@ public DittoRuntimeExceptionBuilder<?> createPreconditionNotModifiedExceptionBui
                 final String expectedNotToMatch, final String matched) {
             return ThingPreconditionNotModifiedException.newBuilder(expectedNotToMatch, matched);
         }
+
+        @Override
+        public DittoRuntimeExceptionBuilder<?> createPreconditionNotModifiedForEqualityExceptionBuilder() {
+            return ThingPreconditionNotModifiedException.newBuilder()
+                    .message("The previous value was equal to the new value and the 'if-equal' header was set to 'skip'.")
+                    .description("Your changes were not applied, which is probably the expected outcome.");
+        }
     }
 
     private static final Set<JsonPointer> EXEMPTED_FIELDS = Collections.singleton(JsonPointer.of("_policy"));

From 65baf43212138800af9beb6496f1d31ad39174f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 23 May 2023 22:29:42 +0200
Subject: [PATCH 115/173] #1524 provided unit tests for policies and things
 conditional "if-equal" header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../IfEqualPreconditionHeader.java            | 11 ++-
 ...liciesConditionalHeadersValidatorTest.java | 60 +++++++++++++++
 ...ThingsConditionalHeadersValidatorTest.java | 77 +++++++++++++++++++
 3 files changed, 147 insertions(+), 1 deletion(-)

diff --git a/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfEqualPreconditionHeader.java b/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfEqualPreconditionHeader.java
index a8640d7e8b7..9ddf8d88a87 100644
--- a/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfEqualPreconditionHeader.java
+++ b/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfEqualPreconditionHeader.java
@@ -17,6 +17,7 @@
 import java.util.Comparator;
 import java.util.Optional;
 import java.util.function.BooleanSupplier;
+import java.util.function.Predicate;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
@@ -24,10 +25,14 @@
 import org.eclipse.ditto.base.model.entity.Entity;
 import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
 import org.eclipse.ditto.base.model.headers.IfEqualOption;
+import org.eclipse.ditto.base.model.json.FieldType;
+import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.base.model.signals.WithOptionalEntity;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonCollectors;
 import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonField;
+import org.eclipse.ditto.json.JsonKey;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonValue;
 
@@ -38,6 +43,7 @@
  * after the change.
  *
  * @param <C> the type of the handled {@link Command}.
+ * @since 3.3.0
  */
 @Immutable
 public final class IfEqualPreconditionHeader<C extends Command<?>> implements PreconditionHeader<Entity<?>> {
@@ -107,7 +113,10 @@ public boolean meetsConditionFor(@Nullable final Entity<?> entity) {
                     command instanceof WithOptionalEntity withOptionalEntity) {
                 return withOptionalEntity.getEntity()
                         .map(newValue -> {
-                            final Optional<JsonValue> previousValue = entity.toJson()
+                            final Predicate<JsonField> nonHiddenAndNamespace =
+                                    FieldType.notHidden()
+                                            .or(jsonField -> jsonField.getKey().equals(JsonKey.of("_namespace")));
+                            final Optional<JsonValue> previousValue = entity.toJson(JsonSchemaVersion.LATEST, nonHiddenAndNamespace)
                                     .getValue(command.getResourcePath());
                             return previousValue.filter(jsonValue -> jsonValue.equals(newValue))
                                     .isPresent();
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PoliciesConditionalHeadersValidatorTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PoliciesConditionalHeadersValidatorTest.java
index e51c2af81d2..fa538bf00b1 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PoliciesConditionalHeadersValidatorTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PoliciesConditionalHeadersValidatorTest.java
@@ -15,6 +15,7 @@
 import static java.text.MessageFormat.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.eclipse.ditto.base.model.signals.commands.Command.Category.DELETE;
 import static org.eclipse.ditto.base.model.signals.commands.Command.Category.MODIFY;
 import static org.eclipse.ditto.base.model.signals.commands.Command.Category.QUERY;
@@ -23,6 +24,7 @@
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
+import java.util.List;
 import java.util.Optional;
 
 import javax.annotation.Nullable;
@@ -30,14 +32,21 @@
 import org.assertj.core.api.ThrowableAssertAlternative;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.headers.IfEqualOption;
 import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.base.model.headers.entitytag.EntityTagMatchers;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.commands.Command.Category;
 import org.eclipse.ditto.internal.utils.headers.conditional.ConditionalHeadersValidator;
 import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.policies.model.EffectedImports;
+import org.eclipse.ditto.policies.model.Label;
+import org.eclipse.ditto.policies.model.Policy;
+import org.eclipse.ditto.policies.model.PolicyId;
+import org.eclipse.ditto.policies.model.PolicyImport;
 import org.eclipse.ditto.policies.model.signals.commands.exceptions.PolicyPreconditionFailedException;
 import org.eclipse.ditto.policies.model.signals.commands.exceptions.PolicyPreconditionNotModifiedException;
+import org.eclipse.ditto.policies.model.signals.commands.modify.ModifyPolicyImport;
 import org.junit.Test;
 
 /**
@@ -130,6 +139,57 @@ public void throwsPolicyPreconditionNotModifiedExceptionWhenIfNoneMatchFailsAndC
         assertNotModified(ifMatchHeaderValue, ifNoneMatchHeaderValue, actualEntityTag, expectedMessage, null);
     }
 
+    @Test
+    public void ifEqualDoesThrowExceptionWhenIfEqualSkipAndValueIsEqual() {
+        final PolicyId policyId = PolicyId.generateRandom();
+        final PolicyImport policyImport = PolicyImport.newInstance(PolicyId.of("some.policy:one"), EffectedImports.newInstance(
+                List.of(Label.of("SOME"))));
+        final Policy policy = Policy.newBuilder()
+                .setId(policyId)
+                .setPolicyImport(policyImport)
+                .build();
+        final ModifyPolicyImport command = ModifyPolicyImport.of(policyId, policyImport,
+                DittoHeaders.newBuilder().ifEqual(IfEqualOption.SKIP).build());
+
+        assertThatExceptionOfType(PolicyPreconditionNotModifiedException.class)
+                .isThrownBy(() -> SUT.applyIfEqualHeader(command, policy))
+                .withMessage("The previous value was equal to the new value and the 'if-equal' header was set to 'skip'.");
+    }
+
+    @Test
+    public void ifEqualDoesNotThrowExceptionWhenIfEqualSkipAndValueIsNotEqual() {
+        final PolicyId policyId = PolicyId.generateRandom();
+        final PolicyImport policyImport = PolicyImport.newInstance(PolicyId.of("some.policy:one"), EffectedImports.newInstance(
+                List.of(Label.of("SOME"))));
+        final Policy policy = Policy.newBuilder()
+                .setId(policyId)
+                .setPolicyImport(policyImport)
+                .build();
+        final ModifyPolicyImport command = ModifyPolicyImport.of(policyId,  PolicyImport.newInstance(PolicyId.of("some.policy:one"), EffectedImports.newInstance(
+                        List.of(Label.of("OTHER")))),
+                DittoHeaders.newBuilder().ifEqual(IfEqualOption.SKIP).build());
+
+        assertThatNoException()
+                .isThrownBy(() -> SUT.applyIfEqualHeader(command, policy));
+    }
+
+    @Test
+    public void ifEqualDoesNotThrowExceptionWhenIfEqualUpdateAndValueIsEqual() {
+        final PolicyId policyId = PolicyId.generateRandom();
+        final PolicyImport policyImport = PolicyImport.newInstance(PolicyId.of("some.policy:one"), EffectedImports.newInstance(
+                List.of(Label.of("SOME"))));
+        final Policy policy = Policy.newBuilder()
+                .setId(policyId)
+                .setPolicyImport(policyImport)
+                .build();
+        final ModifyPolicyImport command = ModifyPolicyImport.of(policyId,  policyImport,
+                DittoHeaders.newBuilder().ifEqual(IfEqualOption.UPDATE).build());
+
+        assertThatNoException()
+                .isThrownBy(() -> SUT.applyIfEqualHeader(command, policy));
+    }
+
+
     private Command createCommandMock(final Category commandCategory, final String ifMatchHeaderValue,
             final String ifNoneMatchHeaderValue, final @Nullable JsonObject selectedFields) {
         final DittoHeaders dittoHeaders = DittoHeaders.newBuilder()
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingsConditionalHeadersValidatorTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingsConditionalHeadersValidatorTest.java
index 1067979d098..f251743c654 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingsConditionalHeadersValidatorTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingsConditionalHeadersValidatorTest.java
@@ -15,6 +15,7 @@
 import static java.text.MessageFormat.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.eclipse.ditto.base.model.signals.commands.Command.Category.DELETE;
 import static org.eclipse.ditto.base.model.signals.commands.Command.Category.MODIFY;
 import static org.eclipse.ditto.base.model.signals.commands.Command.Category.QUERY;
@@ -30,15 +31,22 @@
 import org.assertj.core.api.ThrowableAssertAlternative;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.headers.IfEqualOption;
 import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.base.model.headers.entitytag.EntityTagMatchers;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.commands.Command.Category;
 import org.eclipse.ditto.internal.utils.headers.conditional.ConditionalHeadersValidator;
 import org.eclipse.ditto.json.JsonFieldSelector;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.json.JsonValue;
+import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingPreconditionFailedException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingPreconditionNotModifiedException;
+import org.eclipse.ditto.things.model.signals.commands.modify.MergeThing;
+import org.eclipse.ditto.things.model.signals.commands.modify.ModifyAttribute;
 import org.eclipse.ditto.things.model.signals.commands.query.RetrieveThing;
 import org.junit.Test;
 
@@ -159,6 +167,75 @@ public void assertThrowingNotModifiedWhenSelectedFieldDoesNotContainPolicy() {
         assertion.satisfies(exception -> assertETagHeaderInDre(exception, actualEntityTag));
     }
 
+    @Test
+    public void ifEqualDoesThrowExceptionWhenIfEqualSkipAndValueIsEqual() {
+        final ThingId thingId = ThingId.generateRandom();
+        final JsonPointer attributePath = JsonPointer.of("foo/bar");
+        final JsonValue attributeValue = JsonValue.of(false);
+        final Thing thing = Thing.newBuilder()
+                .setId(thingId)
+                .setAttribute(attributePath, attributeValue)
+                .build();
+        final ModifyAttribute command = ModifyAttribute.of(thingId, attributePath, attributeValue,
+                DittoHeaders.newBuilder().ifEqual(IfEqualOption.SKIP).build());
+
+        assertThatExceptionOfType(ThingPreconditionNotModifiedException.class)
+                .isThrownBy(() -> SUT.applyIfEqualHeader(command, thing))
+                .withMessage("The previous value was equal to the new value and the 'if-equal' header was set to 'skip'.");
+    }
+
+    @Test
+    public void ifEqualDoesThrowExceptionWhenIfEqualSkipAndValueIsEqualUsingMerge() {
+        final ThingId thingId = ThingId.generateRandom();
+        final JsonPointer attributePath = JsonPointer.of("foo/bar");
+        final JsonValue attributeValue = JsonValue.of(false);
+        final Thing thing = Thing.newBuilder()
+                .setId(thingId)
+                .setAttribute(attributePath, attributeValue)
+                .build();
+        final MergeThing command = MergeThing.of(thingId, JsonPointer.empty(), thing.toJson(),
+                DittoHeaders.newBuilder().ifEqual(IfEqualOption.SKIP).build());
+
+        assertThatExceptionOfType(ThingPreconditionNotModifiedException.class)
+                .isThrownBy(() -> SUT.applyIfEqualHeader(command, thing))
+                .withMessage("The previous value was equal to the new value and the 'if-equal' header was set to 'skip'.");
+    }
+
+    @Test
+    public void ifEqualDoesNotThrowExceptionWhenIfEqualSkipAndValueIsNotEqual() {
+        final ThingId thingId = ThingId.generateRandom();
+        final JsonPointer attributePath = JsonPointer.of("foo/bar");
+        final JsonValue attributeValue = JsonValue.of(false);
+        final Thing thing = Thing.newBuilder()
+                .setId(thingId)
+                .setAttribute(attributePath, attributeValue)
+                .build();
+        final ModifyAttribute command = ModifyAttribute.of(thingId, attributePath, JsonValue.of(true),
+                DittoHeaders.newBuilder().ifEqual(IfEqualOption.SKIP).build());
+
+        assertThatNoException()
+                .isThrownBy(() -> SUT.applyIfEqualHeader(command, thing));
+    }
+
+    @Test
+    public void ifEqualDoesNotThrowExceptionWhenIfEqualUpdateAndValueIsEqual() {
+        final ThingId thingId = ThingId.generateRandom();
+        final JsonPointer attributePath = JsonPointer.of("foo/bar");
+        final JsonValue attributeValue = JsonObject.newBuilder()
+                .set("foo", false)
+                .set("bar", "yeesss")
+                .build();
+        final Thing thing = Thing.newBuilder()
+                .setId(thingId)
+                .setAttribute(attributePath, attributeValue)
+                .build();
+        final ModifyAttribute command = ModifyAttribute.of(thingId, attributePath, attributeValue,
+                DittoHeaders.newBuilder().ifEqual(IfEqualOption.UPDATE).build());
+
+        assertThatNoException()
+                .isThrownBy(() -> SUT.applyIfEqualHeader(command, thing));
+    }
+
     private RetrieveThing createRetrieveThingCommand(final String ifNoneMatchHeaderValue, final String selectedFields) {
 
         final JsonFieldSelector fieldSelector = JsonFieldSelector.newInstance(selectedFields);

From 0f477b16b5d062ed8b8ff08328165b13d961e347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 24 May 2023 14:12:26 +0200
Subject: [PATCH 116/173] improve DittoProtocol `MessagePath` to be aware of
 message subject
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* this was very cumbersome to determine before when using the `MessagePath` API
* also added `boolean isInboxOutboxMessage()` for determining if the message path represents an inbox/outbox message

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../ditto/protocol/ImmutableMessagePath.java  | 21 +++++++++++++++
 .../eclipse/ditto/protocol/MessagePath.java   | 19 ++++++++++++++
 .../protocol/ImmutableMessagePathTest.java    | 26 +++++++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/ImmutableMessagePath.java b/protocol/src/main/java/org/eclipse/ditto/protocol/ImmutableMessagePath.java
index cb30d319146..6c932733629 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/ImmutableMessagePath.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/ImmutableMessagePath.java
@@ -71,6 +71,27 @@ public Optional<MessageDirection> getDirection() {
                         .flatMap(MessagePath::jsonKeyToDirection));
     }
 
+    @Override
+    public Optional<String> getMessageSubject() {
+        if (isInboxOutboxMessage()) {
+            return Optional.ofNullable(
+                    jsonPointer.getRoot()
+                        .flatMap(MessagePath::jsonKeyToDirection)
+                        .flatMap(direction -> jsonPointer.getSubPointer(2))
+                        .orElseGet(() -> jsonPointer.getRoot()
+                                .filter(FEATURES::equals)
+                                .flatMap(features -> jsonPointer.get(2))
+                                .flatMap(MessagePath::jsonKeyToDirection)
+                                .flatMap(direction -> jsonPointer.getSubPointer(4))
+                                .orElse(null)
+                        )
+            ).map(JsonPointer::toString)
+                    .map(s -> s.startsWith("/") ? s.substring(1) : s);
+        } else {
+            return Optional.empty();
+        }
+    }
+
     @Override
     public JsonPointer addLeaf(final JsonKey key) {
         return jsonPointer.addLeaf(key);
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/MessagePath.java b/protocol/src/main/java/org/eclipse/ditto/protocol/MessagePath.java
index 62d7ee446cf..32d4888f0de 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/MessagePath.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/MessagePath.java
@@ -37,6 +37,25 @@ public interface MessagePath extends JsonPointer {
      */
     Optional<MessageDirection> getDirection();
 
+    /**
+     * Retrieves the "Message" subject in case the path is a message FROM/TO a thing
+     * (meaning that also {@link #getDirection()} is present).
+     *
+     * @return the "Message" subject in case the path is a message FROM/TO a thing.
+     * @since 3.3.0
+     */
+    Optional<String> getMessageSubject();
+
+    /**
+     * Determines whether this instance represents a path for a Ditto inbox/outbox "message" or not.
+     *
+     * @return whether this instance represents a path for a Ditto inbox/outbox "message" or not.
+     * @since 3.3.0
+     */
+    default boolean isInboxOutboxMessage() {
+        return getDirection().isPresent();
+    }
+
     static Optional<MessageDirection> jsonKeyToDirection(final JsonKey jsonKey) {
         switch (jsonKey.toString()) {
             case "inbox":
diff --git a/protocol/src/test/java/org/eclipse/ditto/protocol/ImmutableMessagePathTest.java b/protocol/src/test/java/org/eclipse/ditto/protocol/ImmutableMessagePathTest.java
index 10071f659b2..9aa90053850 100644
--- a/protocol/src/test/java/org/eclipse/ditto/protocol/ImmutableMessagePathTest.java
+++ b/protocol/src/test/java/org/eclipse/ditto/protocol/ImmutableMessagePathTest.java
@@ -20,6 +20,7 @@
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
+import org.assertj.core.api.AbstractBooleanAssert;
 import org.assertj.core.api.OptionalAssert;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.messages.model.MessageDirection;
@@ -68,6 +69,23 @@ public void parseFeatureId() {
         assertFeatureId("features/water-tank/inbox/messages/heatUp").contains("water-tank");
     }
 
+    @Test
+    public void parseMessageSubject() {
+        assertMessageSubject("/outbox/message/ask").contains("ask");
+        assertMessageSubject("/attributes/hello").isEmpty();
+        assertMessageSubject("/features/water-tank/properties/temperature").isEmpty();
+        assertMessageSubject("features/water-tank/inbox/messages/heatUp").contains("heatUp");
+        assertMessageSubject("/features/water-tank/inbox/messages/heatUp/subMsg").contains("heatUp/subMsg");
+    }
+
+    @Test
+    public void parseIsInboxOutboxMessage() {
+        assertIsInboxOutboxMessage("/outbox/message/ask").isTrue();
+        assertIsInboxOutboxMessage("/attributes/hello").isFalse();
+        assertIsInboxOutboxMessage("/features/water-tank/properties/temperature").isFalse();
+        assertIsInboxOutboxMessage("features/water-tank/inbox/messages/heatUp").isTrue();
+    }
+
     private static OptionalAssert<MessageDirection> assertDirection(final String jsonPointer) {
         return assertThat(ImmutableMessagePath.of(JsonPointer.of(jsonPointer)).getDirection());
     }
@@ -75,4 +93,12 @@ private static OptionalAssert<MessageDirection> assertDirection(final String jso
     private static OptionalAssert<String> assertFeatureId(final String jsonPointer) {
         return assertThat(ImmutableMessagePath.of(JsonPointer.of(jsonPointer)).getFeatureId());
     }
+
+    private static OptionalAssert<String> assertMessageSubject(final String jsonPointer) {
+        return assertThat(ImmutableMessagePath.of(JsonPointer.of(jsonPointer)).getMessageSubject());
+    }
+
+    private static AbstractBooleanAssert<?> assertIsInboxOutboxMessage(final String jsonPointer) {
+        return assertThat(ImmutableMessagePath.of(JsonPointer.of(jsonPointer)).isInboxOutboxMessage());
+    }
 }

From 03b84713ed8d2acc07cfbbe97fdc00e30b20bf9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 24 May 2023 14:47:50 +0200
Subject: [PATCH 117/173] #1524 provided documentation for new `if-equal`
 header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* OpenAPI
* protocol
* httpapi-concepts.md

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../jsonschema/protocol-envelope.json         |  4 ++
 .../main/resources/openapi/ditto-api-2.yml    | 46 +++++++++++++++++++
 .../resources/openapi/sources/api-2-index.yml |  2 +
 .../sources/parameters/ifEqualHeaderParam.yml | 23 ++++++++++
 .../sources/paths/features/definition.yml     |  3 ++
 .../paths/features/desiredProperties.yml      |  2 +
 .../paths/features/desiredProperty.yml        |  2 +
 .../sources/paths/features/feature.yml        |  3 ++
 .../openapi/sources/paths/features/index.yml  |  2 +
 .../sources/paths/features/properties.yml     |  2 +
 .../sources/paths/features/property.yml       |  2 +
 .../sources/paths/policies/entries.yml        |  1 +
 .../openapi/sources/paths/policies/entry.yml  |  1 +
 .../openapi/sources/paths/policies/import.yml |  2 +
 .../sources/paths/policies/imports.yml        |  1 +
 .../openapi/sources/paths/policies/policy.yml |  1 +
 .../sources/paths/policies/resource.yml       |  1 +
 .../sources/paths/policies/resources.yml      |  1 +
 .../sources/paths/policies/subject.yml        |  1 +
 .../sources/paths/policies/subjects.yml       |  1 +
 .../sources/paths/things/attribute.yml        |  2 +
 .../sources/paths/things/attributes.yml       |  2 +
 .../sources/paths/things/definition.yml       |  2 +
 .../openapi/sources/paths/things/policyId.yml |  2 +
 .../openapi/sources/paths/things/thing.yml    |  2 +
 .../resources/pages/ditto/httpapi-concepts.md |  6 +++
 .../pages/ditto/protocol-specification.md     |  1 +
 27 files changed, 118 insertions(+)
 create mode 100644 documentation/src/main/resources/openapi/sources/parameters/ifEqualHeaderParam.yml

diff --git a/documentation/src/main/resources/jsonschema/protocol-envelope.json b/documentation/src/main/resources/jsonschema/protocol-envelope.json
index 0e23f1e950a..ba66b736ff1 100644
--- a/documentation/src/main/resources/jsonschema/protocol-envelope.json
+++ b/documentation/src/main/resources/jsonschema/protocol-envelope.json
@@ -32,6 +32,10 @@
           "type": "string",
           "description": "The `If-None-Match` header which has to conform to RFC-7232 (Conditional Requests)."
         },
+        "if-equal": {
+          "type": "string",
+          "description": "The `if-equal` header can take the values 'update' (which is the default if omitted) or 'skip'.\nIf 'update' is defined, the entity will always be updated, even if it will be equal than before the update.\nIf 'skip' is defined, the entity not be updated if it will be equal than before the update. In this case a 'Not Modified' 304 status is returned."
+        },
         "response-required": {
           "type": "boolean",
           "description": "Whether a response to a command is required or if it may be omitted (fire and forget semantics)."
diff --git a/documentation/src/main/resources/openapi/ditto-api-2.yml b/documentation/src/main/resources/openapi/ditto-api-2.yml
index c51a36e8142..b091e7a1001 100644
--- a/documentation/src/main/resources/openapi/ditto-api-2.yml
+++ b/documentation/src/main/resources/openapi/ditto-api-2.yml
@@ -351,6 +351,7 @@ paths:
         - $ref: '#/components/parameters/ThingIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParam'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -591,6 +592,7 @@ paths:
         - $ref: '#/components/parameters/ThingIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParam'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -821,6 +823,7 @@ paths:
         - $ref: '#/components/parameters/ThingIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -911,6 +914,7 @@ paths:
         - $ref: '#/components/parameters/ThingIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -1109,6 +1113,7 @@ paths:
         - $ref: '#/components/parameters/ThingIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -1181,6 +1186,7 @@ paths:
         - $ref: '#/components/parameters/ThingIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -1313,6 +1319,7 @@ paths:
         - $ref: '#/components/parameters/ThingIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -1402,6 +1409,7 @@ paths:
         - $ref: '#/components/parameters/ThingIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -1615,6 +1623,7 @@ paths:
         - $ref: '#/components/parameters/AttributesPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -1705,6 +1714,7 @@ paths:
         - $ref: '#/components/parameters/AttributesPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -1944,6 +1954,7 @@ paths:
         - $ref: '#/components/parameters/ThingIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ResponseRequiredParam'
@@ -2091,6 +2102,7 @@ paths:
         - $ref: '#/components/parameters/ThingIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ResponseRequiredParam'
@@ -2322,6 +2334,7 @@ paths:
         - $ref: '#/components/parameters/FeatureIdPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -2445,6 +2458,7 @@ paths:
         - $ref: '#/components/parameters/FeatureIdPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -2528,6 +2542,7 @@ paths:
         - $ref: '#/components/parameters/FeatureIdPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ResponseRequiredParam'
@@ -2580,6 +2595,7 @@ paths:
         - $ref: '#/components/parameters/FeatureIdPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/GetMetadataParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ConditionParam'
@@ -2649,6 +2665,7 @@ paths:
         - $ref: '#/components/parameters/FeatureIdPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -2750,6 +2767,7 @@ paths:
         - $ref: '#/components/parameters/FeatureIdPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -2950,6 +2968,7 @@ paths:
         - $ref: '#/components/parameters/FeatureIdPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -3057,6 +3076,7 @@ paths:
         - $ref: '#/components/parameters/FeatureIdPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -3274,6 +3294,7 @@ paths:
         - $ref: '#/components/parameters/PropertyPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -3362,6 +3383,7 @@ paths:
         - $ref: '#/components/parameters/PropertyPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -3558,6 +3580,7 @@ paths:
         - $ref: '#/components/parameters/FeatureIdPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -3665,6 +3688,7 @@ paths:
         - $ref: '#/components/parameters/FeatureIdPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -3884,6 +3908,7 @@ paths:
         - $ref: '#/components/parameters/PropertyPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -3971,6 +3996,7 @@ paths:
         - $ref: '#/components/parameters/PropertyPathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/PutMetadataParam'
         - $ref: '#/components/parameters/DeleteMetadataParam'
         - $ref: '#/components/parameters/RequestedAcksParam'
@@ -4673,6 +4699,7 @@ paths:
         - $ref: '#/components/parameters/PolicyIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParam'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ResponseRequiredParam'
         - $ref: '#/components/parameters/AllowPolicyLockoutParam'
@@ -4987,6 +5014,7 @@ paths:
         - $ref: '#/components/parameters/PolicyIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ResponseRequiredParam'
       responses:
@@ -5142,6 +5170,7 @@ paths:
         - $ref: '#/components/parameters/LabelPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ResponseRequiredParam'
       responses:
@@ -5490,6 +5519,7 @@ paths:
         - $ref: '#/components/parameters/LabelPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ResponseRequiredParam'
       responses:
@@ -5624,6 +5654,7 @@ paths:
         - $ref: '#/components/parameters/SubjectIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ResponseRequiredParam'
       responses:
@@ -5876,6 +5907,7 @@ paths:
         - $ref: '#/components/parameters/LabelPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ResponseRequiredParam'
       responses:
@@ -6008,6 +6040,7 @@ paths:
         - $ref: '#/components/parameters/ResourcePathPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ResponseRequiredParam'
       responses:
@@ -6215,6 +6248,7 @@ paths:
         - $ref: '#/components/parameters/PolicyIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ResponseRequiredParam'
       responses:
@@ -6298,6 +6332,7 @@ paths:
         - $ref: '#/components/parameters/ImportedPolicyIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/TimeoutParam'
       responses:
         '200':
@@ -6368,6 +6403,7 @@ paths:
         - $ref: '#/components/parameters/ImportedPolicyIdPathParam'
         - $ref: '#/components/parameters/IfMatchHeaderParamHash'
         - $ref: '#/components/parameters/IfNoneMatchHeaderParam'
+        - $ref: '#/components/parameters/IfEqualHeaderParam'
         - $ref: '#/components/parameters/TimeoutParam'
         - $ref: '#/components/parameters/ResponseRequiredParam'
       responses:
@@ -8227,6 +8263,16 @@ components:
       required: false
       schema:
         type: string
+    IfEqualHeaderParam:
+      name: if-equal
+      in: header
+      description: 'The `if-equal` header can take the values ''update'' (which is the default if omitted) or ''skip''. If ''update'' is defined, the entity will always be updated, even if it will be equal than before the update. If ''skip'' is defined, the entity not be updated if it will be equal than before the update.  In this case a ''Not Modified'' 304 status is returned.'
+      required: false
+      schema:
+        type: string
+        enum:
+          - update
+          - skip
     ImportedPolicyIdPathParam:
       name: importedPolicyId
       in: path
diff --git a/documentation/src/main/resources/openapi/sources/api-2-index.yml b/documentation/src/main/resources/openapi/sources/api-2-index.yml
index 2dcd5a5542b..34909328e06 100644
--- a/documentation/src/main/resources/openapi/sources/api-2-index.yml
+++ b/documentation/src/main/resources/openapi/sources/api-2-index.yml
@@ -256,6 +256,8 @@ components:
       $ref: "./parameters/ifMatchHeaderParamHash.yml"
     IfNoneMatchHeaderParam:
       $ref: "./parameters/ifNoneMatchHeaderParam.yml"
+    IfEqualHeaderParam:
+      $ref: "./parameters/ifEqualHeaderParam.yml"
     ImportedPolicyIdPathParam:
       $ref: "./parameters/importedPolicyIdPathParam.yml"
     LabelPathParam:
diff --git a/documentation/src/main/resources/openapi/sources/parameters/ifEqualHeaderParam.yml b/documentation/src/main/resources/openapi/sources/parameters/ifEqualHeaderParam.yml
new file mode 100644
index 00000000000..93144c65922
--- /dev/null
+++ b/documentation/src/main/resources/openapi/sources/parameters/ifEqualHeaderParam.yml
@@ -0,0 +1,23 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+name: if-equal
+in: header
+description: >-
+  The `if-equal` header can take the values 'update' (which is the default if omitted) or 'skip'.
+  If 'update' is defined, the entity will always be updated, even if it will be equal than before the update.
+  If 'skip' is defined, the entity not be updated if it will be equal than before the update. 
+  In this case a 'Not Modified' 304 status is returned.
+required: false
+schema:
+  type: string
+  enum:
+    - update
+    - skip
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/definition.yml b/documentation/src/main/resources/openapi/sources/paths/features/definition.yml
index 799083be898..d86e5571d32 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/definition.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/definition.yml
@@ -19,6 +19,7 @@ get:
     - $ref: '../../parameters/featureIdPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/getMetadataParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/conditionParam.yml'
@@ -90,6 +91,7 @@ put:
     - $ref: '../../parameters/featureIdPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
@@ -190,6 +192,7 @@ patch:
     - $ref: '../../parameters/featureIdPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/desiredProperties.yml b/documentation/src/main/resources/openapi/sources/paths/features/desiredProperties.yml
index 19027932f21..8b2bf34577e 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/desiredProperties.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/desiredProperties.yml
@@ -90,6 +90,7 @@ put:
     - $ref: '../../parameters/featureIdPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
@@ -202,6 +203,7 @@ patch:
     - $ref: '../../parameters/featureIdPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/desiredProperty.yml b/documentation/src/main/resources/openapi/sources/paths/features/desiredProperty.yml
index 7596496b0b5..c091efb15ce 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/desiredProperty.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/desiredProperty.yml
@@ -100,6 +100,7 @@ put:
     - $ref: '../../parameters/propertyPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
@@ -188,6 +189,7 @@ patch:
     - $ref: '../../parameters/propertyPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/feature.yml b/documentation/src/main/resources/openapi/sources/paths/features/feature.yml
index 4122d540dff..706983cce93 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/feature.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/feature.yml
@@ -112,6 +112,7 @@ put:
     - $ref: '../../parameters/featureIdPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
@@ -236,6 +237,7 @@ patch:
     - $ref: '../../parameters/featureIdPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
@@ -320,6 +322,7 @@ delete:
     - $ref: '../../parameters/featureIdPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/responseRequiredParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/index.yml b/documentation/src/main/resources/openapi/sources/paths/features/index.yml
index 03f8121a007..ee473c370df 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/index.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/index.yml
@@ -137,6 +137,7 @@ put:
     - $ref: '../../parameters/thingIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/responseRequiredParam.yml'
@@ -293,6 +294,7 @@ patch:
     - $ref: '../../parameters/thingIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/responseRequiredParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/properties.yml b/documentation/src/main/resources/openapi/sources/paths/features/properties.yml
index 7be56c51e7c..b9b97ddd21c 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/properties.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/properties.yml
@@ -90,6 +90,7 @@ put:
     - $ref: '../../parameters/featureIdPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
@@ -201,6 +202,7 @@ patch:
     - $ref: '../../parameters/featureIdPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/property.yml b/documentation/src/main/resources/openapi/sources/paths/features/property.yml
index 92a06c65940..29c772ea275 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/property.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/property.yml
@@ -98,6 +98,7 @@ put:
     - $ref: '../../parameters/propertyPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
@@ -188,6 +189,7 @@ patch:
     - $ref: '../../parameters/propertyPathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/entries.yml b/documentation/src/main/resources/openapi/sources/paths/policies/entries.yml
index 1d250d078ae..333369f967f 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/entries.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/entries.yml
@@ -77,6 +77,7 @@ put:
     - $ref: '../../parameters/policyIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/responseRequiredParam.yml'
   responses:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/entry.yml b/documentation/src/main/resources/openapi/sources/paths/policies/entry.yml
index 66ef774d76c..63758c28214 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/entry.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/entry.yml
@@ -81,6 +81,7 @@ put:
     - $ref: '../../parameters/labelPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/responseRequiredParam.yml'
   responses:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/import.yml b/documentation/src/main/resources/openapi/sources/paths/policies/import.yml
index 304c23af776..ca4d6301bf9 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/import.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/import.yml
@@ -20,6 +20,7 @@ get:
     - $ref: '../../parameters/importedPolicyIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
   responses:
     '200':
@@ -91,6 +92,7 @@ put:
     - $ref: '../../parameters/importedPolicyIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/responseRequiredParam.yml'
   responses:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/imports.yml b/documentation/src/main/resources/openapi/sources/paths/policies/imports.yml
index c20034d6ea5..e7389096e70 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/imports.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/imports.yml
@@ -84,6 +84,7 @@ put:
     - $ref: '../../parameters/policyIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/responseRequiredParam.yml'
   responses:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/policy.yml b/documentation/src/main/resources/openapi/sources/paths/policies/policy.yml
index 173a5637a41..12eb9309fab 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/policy.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/policy.yml
@@ -146,6 +146,7 @@ put:
     - $ref: '../../parameters/policyIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParam.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/responseRequiredParam.yml'
     - $ref: '../../parameters/allowPolicyLockoutParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/resource.yml b/documentation/src/main/resources/openapi/sources/paths/policies/resource.yml
index 60dae827650..a304b118882 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/resource.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/resource.yml
@@ -81,6 +81,7 @@ put:
     - $ref: '../../parameters/resourcePathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/responseRequiredParam.yml'
   responses:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/resources.yml b/documentation/src/main/resources/openapi/sources/paths/policies/resources.yml
index 144902717a4..37506c69f90 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/resources.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/resources.yml
@@ -125,6 +125,7 @@ put:
     - $ref: '../../parameters/labelPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/responseRequiredParam.yml'
   responses:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/subject.yml b/documentation/src/main/resources/openapi/sources/paths/policies/subject.yml
index dc07ee2249f..71b2ebd8e4a 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/subject.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/subject.yml
@@ -79,6 +79,7 @@ put:
     - $ref: '../../parameters/subjectIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/responseRequiredParam.yml'
   responses:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/subjects.yml b/documentation/src/main/resources/openapi/sources/paths/policies/subjects.yml
index 56e7ce935a4..01c6fbba26b 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/subjects.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/subjects.yml
@@ -90,6 +90,7 @@ put:
     - $ref: '../../parameters/labelPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/timeoutParam.yml'
     - $ref: '../../parameters/responseRequiredParam.yml'
   responses:
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/attribute.yml b/documentation/src/main/resources/openapi/sources/paths/things/attribute.yml
index aa3f2c144ba..7e171539109 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/attribute.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/attribute.yml
@@ -99,6 +99,7 @@ put:
     - $ref: '../../parameters/attributePathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
@@ -190,6 +191,7 @@ patch:
     - $ref: '../../parameters/attributePathPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/attributes.yml b/documentation/src/main/resources/openapi/sources/paths/things/attributes.yml
index 39365b55772..b1d4c7d878e 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/attributes.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/attributes.yml
@@ -87,6 +87,7 @@ put:
     - $ref: '../../parameters/thingIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
@@ -177,6 +178,7 @@ patch:
     - $ref: '../../parameters/thingIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/definition.yml b/documentation/src/main/resources/openapi/sources/paths/things/definition.yml
index 391fb988e5a..97f228b9e27 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/definition.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/definition.yml
@@ -95,6 +95,7 @@ put:
     - $ref: '../../parameters/thingIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
@@ -186,6 +187,7 @@ patch:
     - $ref: '../../parameters/thingIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/policyId.yml b/documentation/src/main/resources/openapi/sources/paths/things/policyId.yml
index 99fa73720fc..3ba267d24fb 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/policyId.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/policyId.yml
@@ -86,6 +86,7 @@ put:
     - $ref: '../../parameters/thingIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
@@ -158,6 +159,7 @@ patch:
     - $ref: '../../parameters/thingIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParamHash.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/thing.yml b/documentation/src/main/resources/openapi/sources/paths/things/thing.yml
index 3e551e7079d..0a968cf9c8e 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/thing.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/thing.yml
@@ -161,6 +161,7 @@ put:
     - $ref: '../../parameters/thingIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParam.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
@@ -409,6 +410,7 @@ patch:
     - $ref: '../../parameters/thingIdPathParam.yml'
     - $ref: '../../parameters/ifMatchHeaderParam.yml'
     - $ref: '../../parameters/ifNoneMatchHeaderParam.yml'
+    - $ref: '../../parameters/ifEqualHeaderParam.yml'
     - $ref: '../../parameters/putMetadataParam.yml'
     - $ref: '../../parameters/deleteMetadataParam.yml'
     - $ref: '../../parameters/requestedAcksParam.yml'
diff --git a/documentation/src/main/resources/pages/ditto/httpapi-concepts.md b/documentation/src/main/resources/pages/ditto/httpapi-concepts.md
index b614ecf9670..07f3af85be5 100644
--- a/documentation/src/main/resources/pages/ditto/httpapi-concepts.md
+++ b/documentation/src/main/resources/pages/ditto/httpapi-concepts.md
@@ -621,6 +621,12 @@ The following request headers can be used to issue a conditional request:
               information and the current entity-tag of the resource as `ETag` header
             * for read requests, status `304 (Not Modified)` without response body, with the current entity-tag of the
               resource as `ETag` header
+* `if-equal`:
+   * The `if-equal` header can take the values `'update'` (which is the default if omitted) or `'skip'`
+   * Write the resource only
+      * in case `if-equal: 'update'` is defined - even if the entity will be equal than before the update.
+      * in case `if-equal: 'skip'` is defined, the entity will not be updated if it will be equal than before the update.  
+        In this case a 'Not Modified' 304 status is returned.
 
 Note that the Ditto HTTP API always provides a `strong` entity-tag in the `ETag` header, thus you will never receive a
 `weak` entity-tag (see [RFC-7232 Section 2.1](https://tools.ietf.org/html/rfc7232#section-2.1)). If you convert this
diff --git a/documentation/src/main/resources/pages/ditto/protocol-specification.md b/documentation/src/main/resources/pages/ditto/protocol-specification.md
index 28cc5266416..c99d137e9e3 100644
--- a/documentation/src/main/resources/pages/ditto/protocol-specification.md
+++ b/documentation/src/main/resources/pages/ditto/protocol-specification.md
@@ -93,6 +93,7 @@ There are some pre-defined headers, which have a special meaning for Ditto:
 | `ditto-originator`              | Contains the first authorization subject of the command that caused the sending of this message. Set by Ditto.                               | `String`                                                                                                                  |
 | `if-match`                      | Has the same semantics as defined for the [HTTP API](httpapi-concepts.html#conditional-requests).                                            | `String`                                                                                                                  |
 | `if-none-match`                 | Has the same semantics as defined for the [HTTP API](httpapi-concepts.html#conditional-requests).                                            | `String`                                                                                                                  |
+| `if-equal`                      | Has the same semantics as defined for the [HTTP API](httpapi-concepts.html#conditional-requests).                                            | `String` - currently possible: \['update','skip'\] - default: `'update'`                                                  |
 | `response-required`             | Configures for a **command** whether or not a **response** should be sent back.                                                              | `Boolean` - default: `true`                                                                                               |
 | `requested-acks`                | Defines which [acknowledgements](basic-acknowledgements.html) are requested for a command processed by Ditto.                                | `JsonArray` of `String` - default: `["twin-persisted"]`                                                                   |
 | `ditto-weak-ack`                | Marks [weak acknowledgements](basic-acknowledgements.html) issued by Ditto.                                                                  | `Boolean` - default: `false`                                                                                              |

From 28ad0b238b34898fc456305d677a03f2fa54903d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 25 May 2023 11:54:12 +0200
Subject: [PATCH 118/173] #1524 renamed IfEqualOption enum
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../model/headers/AbstractDittoHeaders.java   |  4 ++--
 .../headers/AbstractDittoHeadersBuilder.java  |  4 ++--
 .../model/headers/DittoHeaderDefinition.java  |  6 ++---
 .../base/model/headers/DittoHeaders.java      |  7 +++---
 .../model/headers/DittoHeadersBuilder.java    |  6 ++---
 .../{IfEqualOption.java => IfEqual.java}      |  6 ++---
 .../headers/ImmutableDittoHeadersTest.java    |  2 +-
 .../IfEqualPreconditionHeader.java            | 22 +++++++++----------
 ...liciesConditionalHeadersValidatorTest.java |  8 +++----
 ...ThingsConditionalHeadersValidatorTest.java | 10 ++++-----
 10 files changed, 37 insertions(+), 38 deletions(-)
 rename base/model/src/main/java/org/eclipse/ditto/base/model/headers/{IfEqualOption.java => IfEqual.java} (91%)

diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeaders.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeaders.java
index 8dee251e7fc..f7c32d086fe 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeaders.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeaders.java
@@ -314,9 +314,9 @@ public Optional<EntityTagMatchers> getIfNoneMatch() {
     }
 
     @Override
-    public Optional<IfEqualOption> getIfEqual() {
+    public Optional<IfEqual> getIfEqual() {
         return getStringForDefinition(DittoHeaderDefinition.IF_EQUAL)
-                .flatMap(IfEqualOption::forOption);
+                .flatMap(IfEqual::forOption);
     }
 
     @Override
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeadersBuilder.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeadersBuilder.java
index ff9df12d26e..f91f8737923 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeadersBuilder.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/AbstractDittoHeadersBuilder.java
@@ -411,8 +411,8 @@ public S ifNoneMatch(final EntityTagMatchers entityTags) {
     }
 
     @Override
-    public S ifEqual(final IfEqualOption ifEqualOption) {
-        putCharSequence(DittoHeaderDefinition.IF_EQUAL, ifEqualOption.toString());
+    public S ifEqual(final IfEqual ifEqual) {
+        putCharSequence(DittoHeaderDefinition.IF_EQUAL, ifEqual.toString());
         return myself;
     }
 
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaderDefinition.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaderDefinition.java
index bff06aefb7c..438418c524a 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaderDefinition.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaderDefinition.java
@@ -197,18 +197,18 @@ public enum DittoHeaderDefinition implements HeaderDefinition {
 
     /**
      * Header definition for "If-Equal".
-     * Can hold one of the values: {@code update}, {@code skip}, {@code update-metadata-only}.
+     * Can hold one of the values: {@code update}, {@code skip}.
      * <p>
      * Key: {@code "If-Equal"}, Java type: {@link String}.
      * </p>
      * @since 3.3.0
      */
     IF_EQUAL("if-equal",
-            IfEqualOption.class,
+            IfEqual.class,
             String.class,
             true,
             false,
-            HeaderValueValidators.getEnumValidator(IfEqualOption.values())),
+            HeaderValueValidators.getEnumValidator(IfEqual.values())),
 
     /**
      * Header definition for the internal header "ditto-reply-target". This header is evaluated for responses to be
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaders.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaders.java
index d97cd8dd4e4..5bc4497cfad 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaders.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeaders.java
@@ -267,13 +267,12 @@ static DittoHeadersBuilder newBuilder(final JsonObject jsonObject) {
     Optional<EntityTagMatchers> getIfNoneMatch();
 
     /**
-     * Returns the "If-Equal" option header defining whether to update a value if it was equal to the previous value
-     * or not.
+     * Returns the "If-Equal" header defining whether to update a value if it was equal to the previous value or not.
      *
-     * @return the if-equal option header.
+     * @return the if-equal header.
      * @since 3.3.0
      */
-    Optional<IfEqualOption> getIfEqual();
+    Optional<IfEqual> getIfEqual();
 
     /**
      * Returns the inbound {@code MessageMapper} ID which mapped incoming arbitrary payload from external sources.
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeadersBuilder.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeadersBuilder.java
index c2d3f29782e..6fac2c3c2c3 100755
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeadersBuilder.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/DittoHeadersBuilder.java
@@ -190,14 +190,14 @@ default B randomCorrelationId() {
     B ifNoneMatch(EntityTagMatchers entityTags);
 
     /**
-     * Sets the If-Equal option.
+     * Sets the If-Equal value.
      *
-     * @param ifEqualOption The if-equal option to set defining what to do with a value to update which is equal to
+     * @param ifEqual The if-equal value to set defining what to do with a value to update which is equal to
      * its previous value.
      * @return this builder for Method Chaining
      * @since 3.3.0
      */
-    B ifEqual(IfEqualOption ifEqualOption);
+    B ifEqual(IfEqual ifEqual);
 
     /**
      * Sets the inbound {@code MessageMapper} ID value.
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/IfEqualOption.java b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/IfEqual.java
similarity index 91%
rename from base/model/src/main/java/org/eclipse/ditto/base/model/headers/IfEqualOption.java
rename to base/model/src/main/java/org/eclipse/ditto/base/model/headers/IfEqual.java
index 11d9f85d906..90e833a8a59 100644
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/headers/IfEqualOption.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/headers/IfEqual.java
@@ -20,7 +20,7 @@
  *
  * @since 3.3.0
  */
-public enum IfEqualOption {
+public enum IfEqual {
 
     /**
      * Option which updates a value, even if the value is the same (via {@code equal()}) than the value before.
@@ -36,7 +36,7 @@ public enum IfEqualOption {
 
     private final String option;
 
-    IfEqualOption(final String option) {
+    IfEqual(final String option) {
         this.option = option;
     }
 
@@ -51,7 +51,7 @@ public String toString() {
      * @param option the option.
      * @return the option with the given option string if any exists.
      */
-    public static Optional<IfEqualOption> forOption(final String option) {
+    public static Optional<IfEqual> forOption(final String option) {
         return Arrays.stream(values())
                 .filter(strategy -> strategy.toString().equals(option))
                 .findAny();
diff --git a/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java b/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java
index 7b768151cec..474b7ca73da 100755
--- a/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java
+++ b/base/model/src/test/java/org/eclipse/ditto/base/model/headers/ImmutableDittoHeadersTest.java
@@ -79,7 +79,7 @@ public final class ImmutableDittoHeadersTest {
             EntityTagMatchers.fromCommaSeparatedString("\"oneValue\",\"anotherValue\"");
     private static final EntityTagMatchers KNOWN_IF_NONE_MATCH =
             EntityTagMatchers.fromCommaSeparatedString("\"notOneValue\",\"notAnotherValue\"");
-    private static final IfEqualOption KNOWN_IF_EQUAL_OPTION = IfEqualOption.SKIP;
+    private static final IfEqual KNOWN_IF_EQUAL_OPTION = IfEqual.SKIP;
     private static final EntityTag KNOWN_ETAG = EntityTag.fromString("\"-12124212\"");
     private static final Collection<AuthorizationSubject> KNOWN_READ_GRANTED_SUBJECTS =
             Lists.list(AuthorizationModelFactory.newAuthSubject("knownGrantedSubject1"),
diff --git a/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfEqualPreconditionHeader.java b/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfEqualPreconditionHeader.java
index 9ddf8d88a87..98d673c57a5 100644
--- a/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfEqualPreconditionHeader.java
+++ b/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/IfEqualPreconditionHeader.java
@@ -24,7 +24,7 @@
 
 import org.eclipse.ditto.base.model.entity.Entity;
 import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
-import org.eclipse.ditto.base.model.headers.IfEqualOption;
+import org.eclipse.ditto.base.model.headers.IfEqual;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.base.model.signals.WithOptionalEntity;
@@ -37,9 +37,9 @@
 import org.eclipse.ditto.json.JsonValue;
 
 /**
- * Custom Ditto {@code if-equal} precondition header supporting available strategies defined in {@link IfEqualOption}.
- * The default is to always {@link IfEqualOption#UPDATE update} the entity, no matter if the update will lead to the
- * same state. Another option is to {@link IfEqualOption#SKIP skip} updating an entity when it would be {@code equal}
+ * Custom Ditto {@code if-equal} precondition header supporting available strategies defined in {@link org.eclipse.ditto.base.model.headers.IfEqual}.
+ * The default is to always {@link IfEqual#UPDATE update} the entity, no matter if the update will lead to the
+ * same state. Another option is to {@link IfEqual#SKIP skip} updating an entity when it would be {@code equal}
  * after the change.
  *
  * @param <C> the type of the handled {@link Command}.
@@ -51,13 +51,13 @@ public final class IfEqualPreconditionHeader<C extends Command<?>> implements Pr
     private static final String IF_EQUAL_KEY = DittoHeaderDefinition.IF_EQUAL.getKey();
 
     private final C command;
-    private final IfEqualOption ifEqualOption;
+    private final IfEqual ifEqual;
     private final ConditionalHeadersValidator.ValidationSettings validationSettings;
 
-    private IfEqualPreconditionHeader(final C command, final IfEqualOption ifEqualOption,
+    private IfEqualPreconditionHeader(final C command, final IfEqual ifEqual,
             final ConditionalHeadersValidator.ValidationSettings validationSettings) {
         this.command = checkNotNull(command, "command");
-        this.ifEqualOption = checkNotNull(ifEqualOption, "ifEqualOption");
+        this.ifEqual = checkNotNull(ifEqual, "ifEqual");
         this.validationSettings = checkNotNull(validationSettings, "validationSettings");
     }
 
@@ -90,7 +90,7 @@ public String getKey() {
 
     @Override
     public String getValue() {
-        return ifEqualOption.toString();
+        return ifEqual.toString();
     }
 
     /**
@@ -108,7 +108,7 @@ public boolean meetsConditionFor(@Nullable final Entity<?> entity) {
             return false;
         }
 
-        if (ifEqualOption == IfEqualOption.SKIP) {
+        if (ifEqual == IfEqual.SKIP) {
             if (command.getCategory() == Command.Category.MODIFY &&
                     command instanceof WithOptionalEntity withOptionalEntity) {
                 return withOptionalEntity.getEntity()
@@ -167,10 +167,10 @@ public boolean meetsConditionFor(@Nullable final Entity<?> entity) {
     C handleCommand(final BooleanSupplier isCompletelyEqualSupplier) {
 
         final C potentiallyAdjustedCommand;
-        if (ifEqualOption == IfEqualOption.UPDATE) {
+        if (ifEqual == IfEqual.UPDATE) {
             // default behavior - no change, just use the complete modify command, not matter what:
             potentiallyAdjustedCommand = command;
-        } else if (ifEqualOption == IfEqualOption.SKIP) {
+        } else if (ifEqual == IfEqual.SKIP) {
             // lazily check for equality as this might be expensive to do:
             final boolean completelyEqual = isCompletelyEqualSupplier.getAsBoolean();
             final Command.Category category = command.getCategory();
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PoliciesConditionalHeadersValidatorTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PoliciesConditionalHeadersValidatorTest.java
index fa538bf00b1..cbf4820d0df 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PoliciesConditionalHeadersValidatorTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PoliciesConditionalHeadersValidatorTest.java
@@ -32,7 +32,7 @@
 import org.assertj.core.api.ThrowableAssertAlternative;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.base.model.headers.IfEqualOption;
+import org.eclipse.ditto.base.model.headers.IfEqual;
 import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.base.model.headers.entitytag.EntityTagMatchers;
 import org.eclipse.ditto.base.model.signals.commands.Command;
@@ -149,7 +149,7 @@ public void ifEqualDoesThrowExceptionWhenIfEqualSkipAndValueIsEqual() {
                 .setPolicyImport(policyImport)
                 .build();
         final ModifyPolicyImport command = ModifyPolicyImport.of(policyId, policyImport,
-                DittoHeaders.newBuilder().ifEqual(IfEqualOption.SKIP).build());
+                DittoHeaders.newBuilder().ifEqual(IfEqual.SKIP).build());
 
         assertThatExceptionOfType(PolicyPreconditionNotModifiedException.class)
                 .isThrownBy(() -> SUT.applyIfEqualHeader(command, policy))
@@ -167,7 +167,7 @@ public void ifEqualDoesNotThrowExceptionWhenIfEqualSkipAndValueIsNotEqual() {
                 .build();
         final ModifyPolicyImport command = ModifyPolicyImport.of(policyId,  PolicyImport.newInstance(PolicyId.of("some.policy:one"), EffectedImports.newInstance(
                         List.of(Label.of("OTHER")))),
-                DittoHeaders.newBuilder().ifEqual(IfEqualOption.SKIP).build());
+                DittoHeaders.newBuilder().ifEqual(IfEqual.SKIP).build());
 
         assertThatNoException()
                 .isThrownBy(() -> SUT.applyIfEqualHeader(command, policy));
@@ -183,7 +183,7 @@ public void ifEqualDoesNotThrowExceptionWhenIfEqualUpdateAndValueIsEqual() {
                 .setPolicyImport(policyImport)
                 .build();
         final ModifyPolicyImport command = ModifyPolicyImport.of(policyId,  policyImport,
-                DittoHeaders.newBuilder().ifEqual(IfEqualOption.UPDATE).build());
+                DittoHeaders.newBuilder().ifEqual(IfEqual.UPDATE).build());
 
         assertThatNoException()
                 .isThrownBy(() -> SUT.applyIfEqualHeader(command, policy));
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingsConditionalHeadersValidatorTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingsConditionalHeadersValidatorTest.java
index f251743c654..536cc1f0c80 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingsConditionalHeadersValidatorTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingsConditionalHeadersValidatorTest.java
@@ -31,7 +31,7 @@
 import org.assertj.core.api.ThrowableAssertAlternative;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.base.model.headers.IfEqualOption;
+import org.eclipse.ditto.base.model.headers.IfEqual;
 import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.base.model.headers.entitytag.EntityTagMatchers;
 import org.eclipse.ditto.base.model.signals.commands.Command;
@@ -177,7 +177,7 @@ public void ifEqualDoesThrowExceptionWhenIfEqualSkipAndValueIsEqual() {
                 .setAttribute(attributePath, attributeValue)
                 .build();
         final ModifyAttribute command = ModifyAttribute.of(thingId, attributePath, attributeValue,
-                DittoHeaders.newBuilder().ifEqual(IfEqualOption.SKIP).build());
+                DittoHeaders.newBuilder().ifEqual(IfEqual.SKIP).build());
 
         assertThatExceptionOfType(ThingPreconditionNotModifiedException.class)
                 .isThrownBy(() -> SUT.applyIfEqualHeader(command, thing))
@@ -194,7 +194,7 @@ public void ifEqualDoesThrowExceptionWhenIfEqualSkipAndValueIsEqualUsingMerge()
                 .setAttribute(attributePath, attributeValue)
                 .build();
         final MergeThing command = MergeThing.of(thingId, JsonPointer.empty(), thing.toJson(),
-                DittoHeaders.newBuilder().ifEqual(IfEqualOption.SKIP).build());
+                DittoHeaders.newBuilder().ifEqual(IfEqual.SKIP).build());
 
         assertThatExceptionOfType(ThingPreconditionNotModifiedException.class)
                 .isThrownBy(() -> SUT.applyIfEqualHeader(command, thing))
@@ -211,7 +211,7 @@ public void ifEqualDoesNotThrowExceptionWhenIfEqualSkipAndValueIsNotEqual() {
                 .setAttribute(attributePath, attributeValue)
                 .build();
         final ModifyAttribute command = ModifyAttribute.of(thingId, attributePath, JsonValue.of(true),
-                DittoHeaders.newBuilder().ifEqual(IfEqualOption.SKIP).build());
+                DittoHeaders.newBuilder().ifEqual(IfEqual.SKIP).build());
 
         assertThatNoException()
                 .isThrownBy(() -> SUT.applyIfEqualHeader(command, thing));
@@ -230,7 +230,7 @@ public void ifEqualDoesNotThrowExceptionWhenIfEqualUpdateAndValueIsEqual() {
                 .setAttribute(attributePath, attributeValue)
                 .build();
         final ModifyAttribute command = ModifyAttribute.of(thingId, attributePath, attributeValue,
-                DittoHeaders.newBuilder().ifEqual(IfEqualOption.UPDATE).build());
+                DittoHeaders.newBuilder().ifEqual(IfEqual.UPDATE).build());
 
         assertThatNoException()
                 .isThrownBy(() -> SUT.applyIfEqualHeader(command, thing));

From d8e4b2bc85bb46f54c38d99843903b3193fb5a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Fri, 26 May 2023 08:40:29 +0200
Subject: [PATCH 119/173] #1524 addressed review comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../src/main/resources/jsonschema/protocol-envelope.json    | 2 +-
 documentation/src/main/resources/openapi/ditto-api-2.yml    | 2 +-
 .../openapi/sources/parameters/ifEqualHeaderParam.yml       | 4 ++--
 .../src/main/resources/pages/ditto/httpapi-concepts.md      | 4 ++--
 .../headers/conditional/ConditionalHeadersValidator.java    | 6 ------
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/documentation/src/main/resources/jsonschema/protocol-envelope.json b/documentation/src/main/resources/jsonschema/protocol-envelope.json
index ba66b736ff1..a8812a07e0f 100644
--- a/documentation/src/main/resources/jsonschema/protocol-envelope.json
+++ b/documentation/src/main/resources/jsonschema/protocol-envelope.json
@@ -34,7 +34,7 @@
         },
         "if-equal": {
           "type": "string",
-          "description": "The `if-equal` header can take the values 'update' (which is the default if omitted) or 'skip'.\nIf 'update' is defined, the entity will always be updated, even if it will be equal than before the update.\nIf 'skip' is defined, the entity not be updated if it will be equal than before the update. In this case a 'Not Modified' 304 status is returned."
+          "description": "The `if-equal` header can take the values 'update' (which is the default if omitted) or 'skip'.\nIf 'update' is defined, the entity will always be updated, even if it is equal before the update.\nIf 'skip' is defined, the entity not be updated if it is equal before the update. In this case a 'Not Modified' 304 status is returned."
         },
         "response-required": {
           "type": "boolean",
diff --git a/documentation/src/main/resources/openapi/ditto-api-2.yml b/documentation/src/main/resources/openapi/ditto-api-2.yml
index b091e7a1001..a62645111b5 100644
--- a/documentation/src/main/resources/openapi/ditto-api-2.yml
+++ b/documentation/src/main/resources/openapi/ditto-api-2.yml
@@ -8266,7 +8266,7 @@ components:
     IfEqualHeaderParam:
       name: if-equal
       in: header
-      description: 'The `if-equal` header can take the values ''update'' (which is the default if omitted) or ''skip''. If ''update'' is defined, the entity will always be updated, even if it will be equal than before the update. If ''skip'' is defined, the entity not be updated if it will be equal than before the update.  In this case a ''Not Modified'' 304 status is returned.'
+      description: 'The `if-equal` header can take the values ''update'' (which is the default if omitted) or ''skip''. If ''update'' is defined, the entity will always be updated, even if it is equal before the update. If ''skip'' is defined, the entity not be updated if it is equal before the update.  In this case a ''Not Modified'' 304 status is returned.'
       required: false
       schema:
         type: string
diff --git a/documentation/src/main/resources/openapi/sources/parameters/ifEqualHeaderParam.yml b/documentation/src/main/resources/openapi/sources/parameters/ifEqualHeaderParam.yml
index 93144c65922..a8ad4ab832d 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/ifEqualHeaderParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/ifEqualHeaderParam.yml
@@ -12,8 +12,8 @@ name: if-equal
 in: header
 description: >-
   The `if-equal` header can take the values 'update' (which is the default if omitted) or 'skip'.
-  If 'update' is defined, the entity will always be updated, even if it will be equal than before the update.
-  If 'skip' is defined, the entity not be updated if it will be equal than before the update. 
+  If 'update' is defined, the entity will always be updated, even if it is equal before the update.
+  If 'skip' is defined, the entity not be updated if it is equal before the update. 
   In this case a 'Not Modified' 304 status is returned.
 required: false
 schema:
diff --git a/documentation/src/main/resources/pages/ditto/httpapi-concepts.md b/documentation/src/main/resources/pages/ditto/httpapi-concepts.md
index 07f3af85be5..e0782be0152 100644
--- a/documentation/src/main/resources/pages/ditto/httpapi-concepts.md
+++ b/documentation/src/main/resources/pages/ditto/httpapi-concepts.md
@@ -624,8 +624,8 @@ The following request headers can be used to issue a conditional request:
 * `if-equal`:
    * The `if-equal` header can take the values `'update'` (which is the default if omitted) or `'skip'`
    * Write the resource only
-      * in case `if-equal: 'update'` is defined - even if the entity will be equal than before the update.
-      * in case `if-equal: 'skip'` is defined, the entity will not be updated if it will be equal than before the update.  
+      * in case `if-equal: 'update'` is defined - even if the entity is equal before the update.
+      * in case `if-equal: 'skip'` is defined, the entity will not be updated if it is equal before the update.  
         In this case a 'Not Modified' 304 status is returned.
 
 Note that the Ditto HTTP API always provides a `strong` entity-tag in the `ETag` header, thus you will never receive a
diff --git a/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/ConditionalHeadersValidator.java b/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/ConditionalHeadersValidator.java
index 47d4bf3c2ed..2cc0ca4a451 100644
--- a/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/ConditionalHeadersValidator.java
+++ b/internal/utils/conditional-headers/src/main/java/org/eclipse/ditto/internal/utils/headers/conditional/ConditionalHeadersValidator.java
@@ -208,12 +208,6 @@ private DittoRuntimeException buildNotModifiedException(final PreconditionHeader
                 .build();
     }
 
-    private DittoRuntimeException buildNotModifiedForEqualityException() {
-        return validationSettings
-                .createPreconditionNotModifiedForEqualityExceptionBuilder()
-                .build();
-    }
-
     private DittoHeaders appendETagIfNotNull(final DittoHeaders dittoHeaders, @Nullable final EntityTag entityTag) {
         if (entityTag == null) {
             return dittoHeaders;

From ba0f73956b3fa53ede0c1d36f2acf2502893e336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 25 May 2023 10:00:17 +0200
Subject: [PATCH 120/173] #1644 support query params in the style where not
 comma separation is used, but duplicated keys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* e.g.: `?fields=thingId&fields=policyId`

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../endpoints/routes/AbstractRoute.java       | 11 +++-
 .../routes/connections/ConnectionsRoute.java  |  8 +--
 .../routes/policies/PoliciesRoute.java        |  4 +-
 .../routes/sse/ThingsSseRouteBuilder.java     |  2 +-
 .../routes/things/FeaturesRoute.java          | 22 +++----
 .../endpoints/routes/things/ThingsRoute.java  | 64 +++++++++++--------
 .../routes/thingsearch/ThingSearchRoute.java  | 52 +++++++++------
 .../routes/things/ThingsRouteTest.java        |  4 +-
 .../org/eclipse/ditto/json/JsonFactory.java   | 40 ++++++++++++
 .../eclipse/ditto/json/JsonFactoryTest.java   | 10 ++-
 .../commands/query/RetrieveThingsTest.java    |  2 +-
 11 files changed, 147 insertions(+), 72 deletions(-)

diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/AbstractRoute.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/AbstractRoute.java
index 43c2f5bcf81..2ad53e14bfd 100755
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/AbstractRoute.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/AbstractRoute.java
@@ -17,6 +17,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.time.Duration;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
@@ -136,11 +137,15 @@ private static Attributes createSupervisionStrategy() {
     /**
      * Calculates a JsonFieldSelector from the passed {@code fieldsString}.
      *
-     * @param fieldsString the fields as string.
+     * @param fields the fields as potentially comma separated strings.
      * @return the Optional JsonFieldSelector
      */
-    protected static Optional<JsonFieldSelector> calculateSelectedFields(final Optional<String> fieldsString) {
-        return fieldsString.map(fs -> JsonFactory.newFieldSelector(fs, JSON_FIELD_SELECTOR_PARSE_OPTIONS));
+    protected static Optional<JsonFieldSelector> calculateSelectedFields(final List<String> fields) {
+        if (fields.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(JsonFactory.newFieldSelector(fields, JSON_FIELD_SELECTOR_PARSE_OPTIONS));
+        }
     }
 
     /**
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/connections/ConnectionsRoute.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/connections/ConnectionsRoute.java
index b2f26de0ced..5b29f630f8e 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/connections/ConnectionsRoute.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/connections/ConnectionsRoute.java
@@ -145,10 +145,10 @@ private Route connections(final RequestContext ctx, final DittoHeaders dittoHead
                 concat(
                         get(() -> // GET /connections?ids-only=false
                                 parameterOptional(ConnectionsParameter.IDS_ONLY.toString(), idsOnly ->
-                                        parameterOptional(ConnectionsParameter.FIELDS.toString(), fieldsString ->
+                                        parameterList(ConnectionsParameter.FIELDS.toString(), fields ->
                                                 {
                                                     final Optional<JsonFieldSelector> selectedFields =
-                                                            calculateSelectedFields(fieldsString);
+                                                            calculateSelectedFields(fields);
                                                     return handlePerRequest(ctx, RetrieveConnections.newInstance(
                                                             idsOnly.map(Boolean::valueOf).orElseGet(() -> selectedFields
                                                                     .filter(sf -> sf.getPointers().size() == 1 &&
@@ -219,9 +219,9 @@ private Route connectionsEntry(final RequestContext ctx,
                                 )
                         ),
                         get(() -> // GET /connections/<connectionId>
-                                parameterOptional(ConnectionsParameter.FIELDS.toString(), fieldsString ->
+                                parameterList(ConnectionsParameter.FIELDS.toString(), fields ->
                                         handlePerRequest(ctx, RetrieveConnection.of(connectionId,
-                                                calculateSelectedFields(fieldsString).orElse(null),
+                                                calculateSelectedFields(fields).orElse(null),
                                                 dittoHeaders)
                                         )
                                 )
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/policies/PoliciesRoute.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/policies/PoliciesRoute.java
index 1a0a06065b7..8b8d345bc04 100755
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/policies/PoliciesRoute.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/policies/PoliciesRoute.java
@@ -150,9 +150,9 @@ private Route policyId(final RequestContext ctx, final DittoHeaders dittoHeaders
         return pathEndOrSingleSlash(() ->
                 concat(
                         // GET /policies/<policyId>?fields=<fieldsString>
-                        get(() -> parameterOptional(PoliciesParameter.FIELDS.toString(), fieldsString ->
+                        get(() -> parameterList(PoliciesParameter.FIELDS.toString(), fields ->
                                 handlePerRequest(ctx, RetrievePolicy.of(policyId, dittoHeaders,
-                                        calculateSelectedFields(fieldsString).orElse(null)))
+                                        calculateSelectedFields(fields).orElse(null)))
                         )),
                         put(() -> // PUT /policies/<policyId>
                                 ensureMediaTypeJsonWithFallbacksThenExtractDataBytes(ctx, dittoHeaders,
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/ThingsSseRouteBuilder.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/ThingsSseRouteBuilder.java
index ea85d33eda3..cea73da80ee 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/ThingsSseRouteBuilder.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/ThingsSseRouteBuilder.java
@@ -267,7 +267,7 @@ private Route buildThingsSseRoute(final RequestContext ctx,
                     // /things/<thingId>
                     rawPathPrefix(PathMatchers.slash().concat(PathMatchers.segment()), thingId ->
                             parameterMap(parameters -> {
-                                final HashMap<String, String> params = new HashMap<>(parameters);
+                                final Map<String, String> params = new HashMap<>(parameters);
                                 params.put(ThingsParameter.IDS.toString(), thingId);
 
                                 return concat(
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/FeaturesRoute.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/FeaturesRoute.java
index 200e7835f4e..62495f22262 100755
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/FeaturesRoute.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/FeaturesRoute.java
@@ -105,9 +105,9 @@ private Route features(final RequestContext ctx, final DittoHeaders dittoHeaders
         return pathEndOrSingleSlash(() ->
                 concat(
                         // GET /features?fields=<fieldsString>
-                        get(() -> parameterOptional(ThingsParameter.FIELDS.toString(), fieldsString ->
+                        get(() -> parameterList(ThingsParameter.FIELDS.toString(), fields ->
                                         handlePerRequest(ctx, RetrieveFeatures.of(thingId,
-                                                calculateSelectedFields(fieldsString).orElse(null),
+                                                calculateSelectedFields(fields).orElse(null),
                                                 dittoHeaders))
                                 )
                         ),
@@ -143,9 +143,9 @@ private Route featuresEntry(final RequestContext ctx, final DittoHeaders dittoHe
                 pathEndOrSingleSlash(() ->
                         concat(
                                 // GET /features/{featureId}?fields=<fieldsString>
-                                get(() -> parameterOptional(ThingsParameter.FIELDS.toString(),
-                                                fieldsString -> handlePerRequest(ctx, RetrieveFeature.of(thingId, featureId,
-                                                        calculateSelectedFields(fieldsString).orElse(null),
+                                get(() -> parameterList(ThingsParameter.FIELDS.toString(), fields ->
+                                                handlePerRequest(ctx, RetrieveFeature.of(thingId, featureId,
+                                                        calculateSelectedFields(fields).orElse(null),
                                                         dittoHeaders))
                                         )
                                 ),
@@ -235,10 +235,10 @@ private Route featuresEntryProperties(final RequestContext ctx, final DittoHeade
                         pathEndOrSingleSlash(() ->
                                 concat(
                                         // GET /features/{featureId}/properties?fields=<fieldsString>
-                                        get(() -> parameterOptional(ThingsParameter.FIELDS.toString(),
-                                                        fieldsString -> handlePerRequest(ctx,
+                                        get(() -> parameterList(ThingsParameter.FIELDS.toString(), fields ->
+                                                        handlePerRequest(ctx,
                                                                 RetrieveFeatureProperties.of(thingId, featureId,
-                                                                        calculateSelectedFields(fieldsString).orElse(null),
+                                                                        calculateSelectedFields(fields).orElse(null),
                                                                         dittoHeaders))
                                                 )
                                         ),
@@ -334,10 +334,10 @@ private Route featuresEntryDesiredProperties(final RequestContext ctx, final Dit
                         pathEndOrSingleSlash(() ->
                                 concat(
                                         // GET /features/{featureId}/desiredProperties?fields=<fieldsString>
-                                        get(() -> parameterOptional(ThingsParameter.FIELDS.toString(),
-                                                        fieldsString -> handlePerRequest(ctx,
+                                        get(() -> parameterList(ThingsParameter.FIELDS.toString(), fields ->
+                                                        handlePerRequest(ctx,
                                                                 RetrieveFeatureDesiredProperties.of(thingId, featureId,
-                                                                        calculateSelectedFields(fieldsString).orElse(null),
+                                                                        calculateSelectedFields(fields).orElse(null),
                                                                         dittoHeaders))
                                                 )
                                         ),
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRoute.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRoute.java
index 542e87b355a..27f95b08d9c 100755
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRoute.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRoute.java
@@ -14,12 +14,12 @@
 
 import static org.eclipse.ditto.base.model.exceptions.DittoJsonException.wrapJsonRuntimeException;
 
+import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
@@ -177,23 +177,29 @@ private Route things(final RequestContext ctx, final DittoHeaders dittoHeaders)
     }
 
     private Route buildRetrieveThingsRoute(final RequestContext ctx, final DittoHeaders dittoHeaders) {
-        // GET /things?ids=...
-        return parameter(ThingsParameter.IDS.toString(), idsString ->
-                parameterOptional(ThingsParameter.FIELDS.toString(), fieldsString ->
-                        handlePerRequest(ctx, RetrieveThings.getBuilder(splitThingIdString(idsString))
-                                        .selectedFields(calculateSelectedFields(fieldsString))
+
+        return parameterList(ThingsParameter.IDS.toString(), idsStrings -> {
+            if (!idsStrings.isEmpty()) {
+                // GET /things?ids=...
+                return parameterList(ThingsParameter.FIELDS.toString(), fields ->
+                        handlePerRequest(ctx, RetrieveThings.getBuilder(splitThingIdStrings(idsStrings))
+                                        .selectedFields(calculateSelectedFields(fields))
                                         .dittoHeaders(dittoHeaders)
                                         .build(),
                                 (responseValue, response) ->
-                                        response.withEntity(determineResponseContentType(ctx), responseValue.toString())
+                                        response.withEntity(determineResponseContentType(ctx),
+                                                responseValue.toString())
                         )
-                )
-        ).orElse( // GET /things
-                thingSearchParameterOptional(params ->
-                        parameterOptional(ThingsParameter.FIELDS.toString(), fieldsString ->
-                                handlePerRequest(ctx, QueryThings.of(null, // allow filter only on /search/things but not here
-                                                ThingSearchRoute.calculateOptions(params.get(ThingSearchParameter.OPTION)),
-                                                calculateSelectedFields(fieldsString).orElse(null),
+                );
+            } else {
+                // GET /things
+                return thingSearchParameterOptional(params ->
+                        parameterList(ThingsParameter.FIELDS.toString(), fields ->
+                                handlePerRequest(ctx,
+                                        QueryThings.of(null, // allow filter only on /search/things but not here
+                                                ThingSearchRoute.calculateOptions(
+                                                        params.get(ThingSearchParameter.OPTION)),
+                                                calculateSelectedFields(fields).orElse(null),
                                                 ThingSearchRoute.calculateNamespaces(
                                                         params.get(ThingSearchParameter.NAMESPACES)),
                                                 dittoHeaders),
@@ -201,25 +207,26 @@ private Route buildRetrieveThingsRoute(final RequestContext ctx, final DittoHead
                                                 transformQueryThingsResult(ctx, responseValue, response)
                                 )
                         )
-                )
-        );
+                );
+            }
+        });
     }
 
     private Route thingSearchParameterOptional(
-            final Function<EnumMap<ThingSearchParameter, Optional<String>>, Route> inner) {
+            final Function<EnumMap<ThingSearchParameter, List<String>>, Route> inner) {
         return thingSearchParameterOptionalImpl(ThingSearchParameter.values(),
                 new EnumMap<>(ThingSearchParameter.class), inner);
     }
 
     private Route thingSearchParameterOptionalImpl(final ThingSearchParameter[] values,
-            final EnumMap<ThingSearchParameter, Optional<String>> accumulator,
-            final Function<EnumMap<ThingSearchParameter, Optional<String>>, Route> inner) {
+            final EnumMap<ThingSearchParameter, List<String>> accumulator,
+            final Function<EnumMap<ThingSearchParameter, List<String>>, Route> inner) {
         if (accumulator.size() >= values.length) {
             return inner.apply(accumulator);
         } else {
             final ThingSearchParameter parameter = values[accumulator.size()];
-            return parameterOptional(parameter.toString(), parameterValueOptional -> {
-                accumulator.put(parameter, parameterValueOptional);
+            return parameterList(parameter.toString(), parameterValues -> {
+                accumulator.put(parameter, parameterValues);
                 return thingSearchParameterOptionalImpl(values, accumulator, inner);
             });
         }
@@ -271,12 +278,13 @@ private static akka.http.javadsl.model.ContentType.NonBinary determineResponseCo
         return contentType;
     }
 
-    private static List<ThingId> splitThingIdString(final String thingIdString) {
+    private static List<ThingId> splitThingIdStrings(final List<String> thingIdStrings) {
         final List<ThingId> result;
-        if (thingIdString.isEmpty()) {
+        if (thingIdStrings.isEmpty()) {
             result = List.of();
         } else {
-            result = Stream.of(thingIdString.split(","))
+            result = thingIdStrings.stream()
+                    .flatMap(tid -> Arrays.stream(tid.split(",")))
                     .map(ThingId::of)
                     .toList();
         }
@@ -329,9 +337,9 @@ private Route thingsEntry(final RequestContext ctx, final DittoHeaders dittoHead
         return pathEndOrSingleSlash(() ->
                 concat(
                         // GET /things/<thingId>?fields=<fieldsString>
-                        get(() -> parameterOptional(ThingsParameter.FIELDS.toString(), fieldsString ->
+                        get(() -> parameterList(ThingsParameter.FIELDS.toString(), fields ->
                                         handlePerRequest(ctx, RetrieveThing.getBuilder(thingId, dittoHeaders)
-                                                .withSelectedFields(calculateSelectedFields(fieldsString)
+                                                .withSelectedFields(calculateSelectedFields(fields)
                                                         .orElse(null))
                                                 .build())
                                 )
@@ -433,9 +441,9 @@ private Route thingsEntryAttributes(final RequestContext ctx, final DittoHeaders
                 pathEndOrSingleSlash(() ->
                         concat(
                                 // GET /things/<thingId>/attributes?fields=<fieldsString>
-                                get(() -> parameterOptional(ThingsParameter.FIELDS.toString(), fieldsString ->
+                                get(() -> parameterList(ThingsParameter.FIELDS.toString(), fields ->
                                                 handlePerRequest(ctx, RetrieveAttributes.of(thingId,
-                                                        calculateSelectedFields(fieldsString).orElse(null),
+                                                        calculateSelectedFields(fields).orElse(null),
                                                         dittoHeaders))
                                         )
                                 ),
diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/thingsearch/ThingSearchRoute.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/thingsearch/ThingSearchRoute.java
index 5998ad37abc..d69430355fa 100755
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/thingsearch/ThingSearchRoute.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/thingsearch/ThingSearchRoute.java
@@ -15,10 +15,12 @@
 import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.gateway.service.endpoints.routes.AbstractRoute;
@@ -104,47 +106,59 @@ private Route searchThings(final RequestContext ctx, final DittoHeaders dittoHea
     }
 
     private Route thingSearchParameterOptional(
-            final Function<EnumMap<ThingSearchParameter, Optional<String>>, Route> inner) {
+            final Function<EnumMap<ThingSearchParameter, List<String>>, Route> inner) {
         return thingSearchParameterOptionalImpl(ThingSearchParameter.values(),
                 new EnumMap<>(ThingSearchParameter.class), inner);
     }
 
     private Route thingSearchParameterOptionalImpl(final ThingSearchParameter[] values,
-            final EnumMap<ThingSearchParameter, Optional<String>> accumulator,
-            final Function<EnumMap<ThingSearchParameter, Optional<String>>, Route> inner) {
+            final EnumMap<ThingSearchParameter, List<String>> accumulator,
+            final Function<EnumMap<ThingSearchParameter, List<String>>, Route> inner) {
         if (accumulator.size() >= values.length) {
             return inner.apply(accumulator);
         } else {
             final ThingSearchParameter parameter = values[accumulator.size()];
-            return parameterOptional(parameter.toString(), parameterValueOptional -> {
-                accumulator.put(parameter, parameterValueOptional);
+            return parameterList(parameter.toString(), parameterValues -> {
+                accumulator.put(parameter, parameterValues);
                 return thingSearchParameterOptionalImpl(values, accumulator, inner);
             });
         }
     }
 
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private static String calculateFilter(final Optional<String> filterString) {
-        return filterString.orElse(null);
+    @Nullable
+    private static String calculateFilter(final List<String> filterString) {
+        if (filterString.isEmpty()) {
+            return null;
+        }
+        return filterString.stream()
+                .collect(Collectors.joining(",", "and(", ")"));
     }
 
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    public static Set<String> calculateNamespaces(final Optional<String> namespacesString) {
-        final Function<String, Set<String>> splitAndRemoveEmpty =
+    @Nullable
+    public static Set<String> calculateNamespaces(final List<String> namespacesStrings) {
+        final Function<String, Stream<String>> splitAndRemoveEmpty =
                 s -> Arrays.stream(s.split(","))
-                        .filter(segment -> !segment.isEmpty())
-                        .collect(Collectors.toSet());
+                        .filter(segment -> !segment.isEmpty());
 
         // if no namespaces are given explicitly via query parameter,
         // return null to signify the lack of namespace restriction
-        return namespacesString.map(splitAndRemoveEmpty).orElse(null);
+        if (namespacesStrings.isEmpty()) {
+            return null;
+        }
+        return namespacesStrings.stream()
+                .flatMap(splitAndRemoveEmpty)
+                .collect(Collectors.toSet());
     }
 
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    public static List<String> calculateOptions(final Optional<String> optionsString) {
+    @Nullable
+    public static List<String> calculateOptions(final List<String> optionsString) {
+        if (optionsString.isEmpty()) {
+            return null;
+        }
         return optionsString
-                .map(s -> Arrays.asList(s.split(",")))
-                .orElse(null);
+                .stream()
+                .flatMap(s -> Arrays.stream(s.split(",")))
+                .toList();
     }
 
 }
diff --git a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRouteTest.java b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRouteTest.java
index cc153945d4c..fddd9483eec 100755
--- a/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRouteTest.java
+++ b/gateway/service/src/test/java/org/eclipse/ditto/gateway/service/endpoints/routes/things/ThingsRouteTest.java
@@ -19,8 +19,8 @@
 import org.eclipse.ditto.gateway.service.endpoints.EndpointTestConstants;
 import org.eclipse.ditto.json.JsonKey;
 import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.things.model.ThingIdInvalidException;
 import org.eclipse.ditto.things.model.ThingsModelFactory;
-import org.eclipse.ditto.things.model.signals.commands.exceptions.MissingThingIdsException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingNotCreatableException;
 import org.eclipse.ditto.things.model.signals.commands.modify.MergeThing;
 import org.eclipse.ditto.things.model.signals.commands.modify.ModifyPolicyId;
@@ -158,7 +158,7 @@ public void putAndRetrieveNullDefinition() {
     public void getThingsWithEmptyIdsList() {
         final var result = underTest.run(HttpRequest.GET("/things?ids="));
         result.assertStatusCode(StatusCodes.BAD_REQUEST);
-        final var expectedEx = MissingThingIdsException.newBuilder()
+        final var expectedEx = ThingIdInvalidException.newBuilder("")
                 .dittoHeaders(dittoHeaders)
                 .build();
         result.assertEntity(expectedEx.toJsonString());
diff --git a/json/src/main/java/org/eclipse/ditto/json/JsonFactory.java b/json/src/main/java/org/eclipse/ditto/json/JsonFactory.java
index d3b3d5527ed..2dd5868b8da 100755
--- a/json/src/main/java/org/eclipse/ditto/json/JsonFactory.java
+++ b/json/src/main/java/org/eclipse/ditto/json/JsonFactory.java
@@ -27,6 +27,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
@@ -614,6 +616,44 @@ public static JsonFieldSelector newFieldSelector(@Nullable final String fieldSel
         return result;
     }
 
+    /**
+     * Returns a new JSON field selector by parsing the given string. If the JSON field selector string is {@code null}
+     * or empty this means that no fields were selected thus this method returns an empty JSON field selector.
+     * <p>
+     * For example, the field selector string
+     * </p>
+     * <pre>
+     * "thingId,attributes(acceleration,someData(foo,bar/baz)),features/key"
+     * </pre>
+     * would lead to a JSON field selector which consists of the following JSON pointers:
+     * <ul>
+     * <li>{@code "thingId"},</li>
+     * <li>{@code "attributes/acceleration"},</li>
+     * <li>{@code "attributes/someData/foo"},</li>
+     * <li>{@code "attributes/someData/bar/baz"},</li>
+     * <li>{@code "features/key"}.</li>
+     * </ul>
+     *
+     * @param fieldSelectorStrings strings to be transformed into a JSON field selector object.
+     * @param options the JsonParseOptions to apply when parsing the {@code fieldSelectorString}.
+     * @return a new JSON field selector.
+     * @throws JsonFieldSelectorInvalidException if {@code fieldSelectorString} is empty or if
+     * {@code fieldSelectorString} does not contain a closing parenthesis ({@code )}) for each opening parenthesis
+     * ({@code (}).
+     * @throws IllegalStateException if {@code fieldSelectorStrings} cannot be decoded as UTF-8.
+     * @since 3.3.0
+     */
+    public static JsonFieldSelector newFieldSelector(final Iterable<String> fieldSelectorStrings,
+            final JsonParseOptions options) {
+
+        final Collection<JsonPointer> selectors = StreamSupport.stream(fieldSelectorStrings.spliterator(), false)
+                .map(fieldSelectorString -> ImmutableJsonFieldSelectorFactory.newInstance(fieldSelectorString, options))
+                .map(ImmutableJsonFieldSelectorFactory::newJsonFieldSelector)
+                .flatMap(foo -> foo.getPointers().stream())
+                .collect(Collectors.toList());
+        return newFieldSelector(selectors);
+    }
+
     /**
      * Returns a new JSON field selector which is based on the given set of {@link JsonPointer}s.
      * If the set of JSON pointers string is empty this means that no fields were selected thus this method returns an
diff --git a/json/src/test/java/org/eclipse/ditto/json/JsonFactoryTest.java b/json/src/test/java/org/eclipse/ditto/json/JsonFactoryTest.java
index 73775e11a1f..23624da8e8a 100755
--- a/json/src/test/java/org/eclipse/ditto/json/JsonFactoryTest.java
+++ b/json/src/test/java/org/eclipse/ditto/json/JsonFactoryTest.java
@@ -381,7 +381,15 @@ public void newFieldSelectorFromPointerStringsReturnsExpected() {
 
     @Test
     public void newFieldSelectorFromNullStringIsEmpty() {
-        final JsonFieldSelector fieldSelector = JsonFactory.newFieldSelector(null,
+        final JsonFieldSelector fieldSelector = JsonFactory.newFieldSelector((String) null,
+                JsonFactory.newParseOptionsBuilder().withoutUrlDecoding().build());
+
+        assertThat(fieldSelector).isEmpty();
+    }
+
+    @Test
+    public void newFieldSelectorFromEmptyStringListIsEmpty() {
+        final JsonFieldSelector fieldSelector = JsonFactory.newFieldSelector(Collections.emptyList(),
                 JsonFactory.newParseOptionsBuilder().withoutUrlDecoding().build());
 
         assertThat(fieldSelector).isEmpty();
diff --git a/things/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/query/RetrieveThingsTest.java b/things/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/query/RetrieveThingsTest.java
index 2c42c167df4..a3b2668a3b0 100755
--- a/things/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/query/RetrieveThingsTest.java
+++ b/things/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/query/RetrieveThingsTest.java
@@ -183,7 +183,7 @@ public void createInstanceWithInvalidNamespacesThrowsException() {
 
     @Test
     public void checkRetrieveThingsWithEmptyJsonFieldSelectorBehavesEquallyAsOmittingFields() {
-        final JsonFieldSelector selectedFields = JsonFactory.newFieldSelector(null, JSON_PARSE_OPTIONS);
+        final JsonFieldSelector selectedFields = JsonFactory.newFieldSelector((String) null, JSON_PARSE_OPTIONS);
         final RetrieveThings retrieveThings = RetrieveThings
                 .getBuilder(TestConstants.Thing.THING_ID, ThingId.inDefaultNamespace("AnotherThingId"))
                 .selectedFields(selectedFields)

From 23a051b8acaa529829b6b9540ff3bb5e42a2900c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 13 Jun 2023 14:58:06 +0200
Subject: [PATCH 121/173] fix helm chart release GH action
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .github/workflows/helm-chart-release.yml      |   2 +-
 .../main/resources/jsonschema/connection.json | 202 +++++++++---------
 2 files changed, 101 insertions(+), 103 deletions(-)

diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml
index 0ec6232dbf2..cf1adcb2c2e 100644
--- a/.github/workflows/helm-chart-release.yml
+++ b/.github/workflows/helm-chart-release.yml
@@ -28,7 +28,7 @@ jobs:
           repository: eclipse
           name: ditto
           tag: ${{ inputs.chartVersion }}
-          path: deployment/helm/ditto
+          path: ./deployment/helm/ditto
           registry: registry-1.docker.io
           registry_username: eclipsedittobot
           registry_password: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/documentation/src/main/resources/jsonschema/connection.json b/documentation/src/main/resources/jsonschema/connection.json
index ce9f1c7642c..5903781fdc8 100644
--- a/documentation/src/main/resources/jsonschema/connection.json
+++ b/documentation/src/main/resources/jsonschema/connection.json
@@ -601,7 +601,7 @@
             "$id": "/properties/targets/items/properties/authorizationContext",
             "type": "array",
             "title": "The authorization context",
-            "description": "The authorization context defines all authorization subjects associated for this target. ",
+            "description": "The authorization context defines all authorization subjects associated for this target.",
             "uniqueItems": true,
             "items": {
               "$id": "/properties/authorizationContext/items",
@@ -617,7 +617,7 @@
             "$id": "/properties/targets/items/properties/issuedAcknowledgementLabel",
             "type": "string",
             "title": "Issued acknowledgement label for this target",
-            "description": "the optional label of an acknowledgement which should automatically be issued by this target based on the technical settlement/ACK the connection channel provides."
+            "description": "The optional label of an acknowledgement which should automatically be issued by this target based on the technical settlement/ACK the connection channel provides."
           },
           "payloadMapping": {
             "$id": "/properties/targets/items/properties/payloadMapping",
@@ -732,114 +732,113 @@
         },
         "additionalProperties": false,
         "required": [
-          "mappingEngine"
+          "mappingEngine",
+          "options"
         ]
       }
     },
     "sshTunnel": {
       "$id": "/properties/sshTunnel",
       "type": "object",
-      "additionalProperties": {
-        "type": "object",
-        "description": "The configuration of a local SSH port forwarding used to tunnel the connection to the actual endpoint.",
-        "properties": {
-          "enabled": {
-            "$id": "/properties/sshTunnel/properties/enabled",
-            "type": "boolean",
-            "title": "Whether the tunnel is enabled.",
-            "description": "This flag controls whether Ditto establishes an SSH tunnel before connecting to the actual endpoint."
-          },
-          "uri": {
-            "$id": "/properties/sshTunnel/properties/uri",
-            "type": "string",
-            "title": "SSH host",
-            "description": "The URI of the SSH host."
-          },
-          "credentials": {
-            "$id": "/properties/sshTunnel/properties/credentials",
-            "type": "object",
-            "title": "Credentials",
-            "description": "Credentials with which Ditto authenticates itself at the SSH host.",
-            "properties": {
-              "type": {
-                "$id": "/properties/sshTunnel/properties/credentials/properties/type",
-                "type": "string",
-                "enum": [
-                  "password",
-                  "public-key"
-                ],
-                "title": "Type of credentials",
-                "description": "Type of credentials",
-                "examples": [
-                  "password",
-                  "public-key"
-                ]
-              },
-              "username": {
-                "$id": "/properties/sshTunnel/properties/credentials/properties/username",
-                "type": "string",
-                "title": "The username for authentication.",
-                "description": "A valid username.",
-                "examples": [
-                  "tunnel-user"
-                ]
-              },
-              "password": {
-                "$id": "/properties/sshTunnel/properties/credentials/properties/password",
-                "type": "string",
-                "title": "The password for authentication.",
-                "description": "A valid password. Only required for type `plain`.",
-                "examples": [
-                  "*****"
-                ]
-              },
-              "publicKey": {
-                "$id": "/properties/sshTunnel/properties/credentials/properties/publicKey",
-                "type": "string",
-                "title": "Public key for credentials type `public-key`.",
-                "description": "Public key for type `public-key` in PEM-format.",
-                "examples": [
-                  "-----BEGIN PUBLIC KEY-----\n...\n-----END PUBLIC KEY-----\n"
-                ]
-              },
-              "privateKey": {
-                "$id": "/properties/sshTunnel/properties/credentials/properties/privateKey",
-                "type": "string",
-                "title": "Private key for credentials type `public-key`.",
-                "description": "Unencrypted private key for type `public-key` as PKCS8 in PEM-format.",
-                "examples": [
-                  "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----\n"
-                ]
-              }
-            }
-          },
-          "validateHost": {
-            "$id": "/properties/sshTunnel/properties/validateHost",
-            "type": "boolean",
-            "title": "Whether the SSH host is verified.",
-            "description": "This flag controls whether Ditto verifies the SSH host used for tunneling by checking the public key provided by the host against the given public key fingerprints."
-          },
-          "knownHosts": {
-            "$id": "/properties/sshTunnel/properties/knownHosts",
-            "type": "array",
-            "title": "A list of accepted fingerprints.",
-            "description": "One of these fingerprints must match the fingerprint of the public key the SSH host provides.",
-            "uniqueItems": true,
-            "items": {
-              "$id": "/properties/sshTunnel/properties/knownHosts/items",
+      "description": "The configuration of a local SSH port forwarding used to tunnel the connection to the actual endpoint.",
+      "properties": {
+        "enabled": {
+          "$id": "/properties/sshTunnel/properties/enabled",
+          "type": "boolean",
+          "title": "Whether the tunnel is enabled.",
+          "description": "This flag controls whether Ditto establishes an SSH tunnel before connecting to the actual endpoint."
+        },
+        "uri": {
+          "$id": "/properties/sshTunnel/properties/uri",
+          "type": "string",
+          "title": "SSH host",
+          "description": "The URI of the SSH host."
+        },
+        "credentials": {
+          "$id": "/properties/sshTunnel/properties/credentials",
+          "type": "object",
+          "title": "Credentials",
+          "description": "Credentials with which Ditto authenticates itself at the SSH host.",
+          "properties": {
+            "type": {
+              "$id": "/properties/sshTunnel/properties/credentials/properties/type",
+              "type": "string",
+              "enum": [
+                "password",
+                "public-key"
+              ],
+              "title": "Type of credentials",
+              "description": "Type of credentials",
+              "examples": [
+                "password",
+                "public-key"
+              ]
+            },
+            "username": {
+              "$id": "/properties/sshTunnel/properties/credentials/properties/username",
               "type": "string",
-              "title": "Fingerprint",
-              "description": "A public key fingerprint in the format the command line tool `ssh-keygen` produces, e.g. `MD5:e0:3a:34:1c:68:ed:c6:bc:7c:ca:a8:67:c7:45:2b:19`. The fingerprint is prefixed with the hash algorithm used to calculate the fingerprint. Supported algorithms are `MD5`, `SHA1`, `SHA224`, `SHA256`, `SHA384` and `SHA512`"
+              "title": "The username for authentication.",
+              "description": "A valid username.",
+              "examples": [
+                "tunnel-user"
+              ]
             },
-            "additionalProperties": false,
-            "required": [
-              "enabled",
-              "uri",
-              "credentials"
-            ]
+            "password": {
+              "$id": "/properties/sshTunnel/properties/credentials/properties/password",
+              "type": "string",
+              "title": "The password for authentication.",
+              "description": "A valid password. Only required for type `plain`.",
+              "examples": [
+                "*****"
+              ]
+            },
+            "publicKey": {
+              "$id": "/properties/sshTunnel/properties/credentials/properties/publicKey",
+              "type": "string",
+              "title": "Public key for credentials type `public-key`.",
+              "description": "Public key for type `public-key` in PEM-format.",
+              "examples": [
+                "-----BEGIN PUBLIC KEY-----\n...\n-----END PUBLIC KEY-----\n"
+              ]
+            },
+            "privateKey": {
+              "$id": "/properties/sshTunnel/properties/credentials/properties/privateKey",
+              "type": "string",
+              "title": "Private key for credentials type `public-key`.",
+              "description": "Unencrypted private key for type `public-key` as PKCS8 in PEM-format.",
+              "examples": [
+                "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----\n"
+              ]
+            }
+          }
+        },
+        "validateHost": {
+          "$id": "/properties/sshTunnel/properties/validateHost",
+          "type": "boolean",
+          "title": "Whether the SSH host is verified.",
+          "description": "This flag controls whether Ditto verifies the SSH host used for tunneling by checking the public key provided by the host against the given public key fingerprints."
+        },
+        "knownHosts": {
+          "$id": "/properties/sshTunnel/properties/knownHosts",
+          "type": "array",
+          "title": "A list of accepted fingerprints.",
+          "description": "One of these fingerprints must match the fingerprint of the public key the SSH host provides.",
+          "uniqueItems": true,
+          "items": {
+            "$id": "/properties/sshTunnel/properties/knownHosts/items",
+            "type": "string",
+            "title": "Fingerprint",
+            "description": "A public key fingerprint in the format the command line tool `ssh-keygen` produces, e.g. `MD5:e0:3a:34:1c:68:ed:c6:bc:7c:ca:a8:67:c7:45:2b:19`. The fingerprint is prefixed with the hash algorithm used to calculate the fingerprint. Supported algorithms are `MD5`, `SHA1`, `SHA224`, `SHA256`, `SHA384` and `SHA512`"
           }
         }
-      }
+      },
+      "additionalProperties": false,
+      "required": [
+        "enabled",
+        "uri",
+        "credentials",
+        "validateHost"
+      ]
     },
     "_revision": {
       "type": "integer",
@@ -861,7 +860,6 @@
     "id",
     "connectionType",
     "connectionStatus",
-    "uri",
-    "authorizationContext"
+    "uri"
   ]
 }

From f1e189406bad5dfeeb6943987d7efadb30e1e9e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 13 Jun 2023 15:00:17 +0200
Subject: [PATCH 122/173] fix helm chart release GH action, added checkout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .github/workflows/helm-chart-release.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml
index cf1adcb2c2e..994f70ee99c 100644
--- a/.github/workflows/helm-chart-release.yml
+++ b/.github/workflows/helm-chart-release.yml
@@ -22,13 +22,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Package and push Ditto Helm chart to Docker Hub
         uses: appany/helm-oci-chart-releaser@v0.3.0
         with:
           repository: eclipse
           name: ditto
           tag: ${{ inputs.chartVersion }}
-          path: ./deployment/helm/ditto
+          path: deployment/helm/ditto
           registry: registry-1.docker.io
           registry_username: eclipsedittobot
           registry_password: ${{ secrets.DOCKER_HUB_TOKEN }}

From 35418dbc4439366c3ada660009fad723917cdced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 13 Jun 2023 17:42:12 +0200
Subject: [PATCH 123/173] fix errors in connection JSON schema
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* make connection parsing more tolerant to handle `null` values for expected JsonObjects

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../model/AbstractConnection.java             |  7 ++++-
 .../model/ImmutableMappingContext.java        | 10 ++++--
 .../model/ImmutableReplyTarget.java           |  2 ++
 .../connectivity/model/ImmutableSource.java   | 13 ++++++--
 .../connectivity/model/ImmutableTarget.java   |  2 ++
 .../main/resources/jsonschema/connection.json | 31 ++++++++++++++-----
 6 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/AbstractConnection.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/AbstractConnection.java
index 5a7a284bbfe..bb8dc0f8e31 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/AbstractConnection.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/AbstractConnection.java
@@ -128,13 +128,16 @@ static void buildFromJson(final JsonObject jsonObject, final AbstractConnectionB
                 .map(AbstractConnection::tryToParseInstant).ifPresent(builder::modified);
         jsonObject.getValue(JsonFields.CREATED)
                 .map(AbstractConnection::tryToParseInstant).ifPresent(builder::created);
-        jsonObject.getValue(JsonFields.CREDENTIALS).ifPresent(builder::credentialsFromJson);
+        jsonObject.getValue(JsonFields.CREDENTIALS)
+                .filter(f -> !f.isNull())
+                .ifPresent(builder::credentialsFromJson);
         jsonObject.getValue(JsonFields.CLIENT_COUNT).ifPresent(builder::clientCount);
         jsonObject.getValue(JsonFields.FAILOVER_ENABLED).ifPresent(builder::failoverEnabled);
         jsonObject.getValue(JsonFields.VALIDATE_CERTIFICATES).ifPresent(builder::validateCertificate);
         jsonObject.getValue(JsonFields.PROCESSOR_POOL_SIZE).ifPresent(builder::processorPoolSize);
         jsonObject.getValue(JsonFields.TRUSTED_CERTIFICATES).ifPresent(builder::trustedCertificates);
         jsonObject.getValue(JsonFields.SSH_TUNNEL)
+                .filter(f -> !f.isNull())
                 .ifPresent(jsonFields -> builder.sshTunnel(ImmutableSshTunnel.fromJson(jsonFields)));
     }
 
@@ -175,6 +178,7 @@ private static List<Target> getTargets(final JsonObject jsonObject) {
 
     private static Map<String, String> getSpecificConfiguration(final JsonObject jsonObject) {
         return jsonObject.getValue(JsonFields.SPECIFIC_CONFIG)
+                .filter(f -> !f.isNull())
                 .filter(JsonValue::isObject)
                 .map(JsonValue::asObject)
                 .map(JsonObject::stream)
@@ -185,6 +189,7 @@ private static Map<String, String> getSpecificConfiguration(final JsonObject jso
 
     private static Set<String> getTags(final JsonObject jsonObject) {
         return jsonObject.getValue(JsonFields.TAGS)
+                .filter(f -> !f.isNull())
                 .map(array -> array.stream()
                         .filter(JsonValue::isString)
                         .map(JsonValue::asString)
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableMappingContext.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableMappingContext.java
index 286063a76d9..5cac0bef77e 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableMappingContext.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableMappingContext.java
@@ -25,13 +25,13 @@
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.NotThreadSafe;
 
+import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.json.JsonCollectors;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.eclipse.ditto.json.JsonValue;
-import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 
 /**
  * Immutable implementation of {@link MappingContext}.
@@ -69,14 +69,18 @@ public static MappingContext fromJson(final JsonObject jsonObject) {
         final Builder builder = new Builder(mappingEngine, options);
 
         builder.incomingConditions(
-                jsonObject.getValue(JsonFields.INCOMING_CONDITIONS).orElse(JsonObject.empty()).stream()
+                jsonObject.getValue(JsonFields.INCOMING_CONDITIONS)
+                        .filter(f -> !f.isNull())
+                        .orElse(JsonObject.empty()).stream()
                         .collect(Collectors.toMap(
                                 e -> e.getKey().toString(),
                                 e -> e.getValue().isString() ? e.getValue().asString() : e.getValue().toString())
                         ));
 
         builder.outgoingConditions(
-                jsonObject.getValue(JsonFields.OUTGOING_CONDITIONS).orElse(JsonObject.empty()).stream()
+                jsonObject.getValue(JsonFields.OUTGOING_CONDITIONS)
+                        .filter(f -> !f.isNull())
+                        .orElse(JsonObject.empty()).stream()
                         .collect(Collectors.toMap(
                                 e -> e.getKey().toString(),
                                 e -> e.getValue().isString() ? e.getValue().asString() : e.getValue().toString())
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableReplyTarget.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableReplyTarget.java
index a8ac462faad..e8c009505c7 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableReplyTarget.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableReplyTarget.java
@@ -121,9 +121,11 @@ static Optional<ReplyTarget> fromJsonOptional(final JsonObject jsonObject) {
         return jsonObject.getValue(JsonFields.ADDRESS).map(address -> new Builder()
                 .address(address)
                 .headerMapping(jsonObject.getValue(JsonFields.HEADER_MAPPING)
+                        .filter(f -> !f.isNull())
                         .map(ConnectivityModelFactory::newHeaderMapping)
                         .orElse(null))
                 .expectedResponseTypes(jsonObject.getValue(JsonFields.EXPECTED_RESPONSE_TYPES)
+                        .filter(f -> !f.isNull())
                         .map(jsonArray -> jsonArray.stream()
                                 .map(JsonValue::asString)
                                 .map(ResponseType::fromName)
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableSource.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableSource.java
index 1ef25b6783c..b1b3ef15d1c 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableSource.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableSource.java
@@ -253,18 +253,26 @@ public static Source fromJson(final JsonObject jsonObject, final int index) {
                         authorizationSubjects);
 
         final Enforcement readEnforcement =
-                jsonObject.getValue(JsonFields.ENFORCEMENT).map(ImmutableEnforcement::fromJson).orElse(null);
+                jsonObject.getValue(JsonFields.ENFORCEMENT)
+                        .filter(f -> !f.isNull())
+                        .map(ImmutableEnforcement::fromJson)
+                        .orElse(null);
 
         final FilteredAcknowledgementRequest readAcknowledgementRequests =
                 jsonObject.getValue(JsonFields.ACKNOWLEDGEMENT_REQUESTS)
+                        .filter(f -> !f.isNull())
                         .map(FilteredAcknowledgementRequest::fromJson)
                         .orElse(null);
 
         final HeaderMapping readHeaderMapping =
-                jsonObject.getValue(JsonFields.HEADER_MAPPING).map(ImmutableHeaderMapping::fromJson).orElse(null);
+                jsonObject.getValue(JsonFields.HEADER_MAPPING)
+                        .filter(f -> !f.isNull())
+                        .map(ImmutableHeaderMapping::fromJson)
+                        .orElse(null);
 
         final PayloadMapping readPayloadMapping =
                 jsonObject.getValue(JsonFields.PAYLOAD_MAPPING)
+                        .filter(f -> !f.isNull())
                         .map(ImmutablePayloadMapping::fromJson)
                         .orElse(ConnectivityModelFactory.emptyPayloadMapping());
 
@@ -273,6 +281,7 @@ public static Source fromJson(final JsonObject jsonObject, final int index) {
 
         final ReplyTarget readReplyTarget =
                 jsonObject.getValue(JsonFields.REPLY_TARGET)
+                        .filter(f -> !f.isNull())
                         .flatMap(ImmutableReplyTarget::fromJsonOptional)
                         .orElse(null);
 
diff --git a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableTarget.java b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableTarget.java
index e81329e7a43..6f3be41d147 100644
--- a/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableTarget.java
+++ b/connectivity/model/src/main/java/org/eclipse/ditto/connectivity/model/ImmutableTarget.java
@@ -193,11 +193,13 @@ public static Target fromJson(final JsonObject jsonObject) {
 
         final HeaderMapping readHeaderMapping =
                 jsonObject.getValue(JsonFields.HEADER_MAPPING)
+                        .filter(f -> !f.isNull())
                         .map(ImmutableHeaderMapping::fromJson)
                         .orElse(null);
 
         final PayloadMapping readMapping =
                 jsonObject.getValue(JsonFields.PAYLOAD_MAPPING)
+                        .filter(f -> !f.isNull())
                         .map(ImmutablePayloadMapping::fromJson)
                         .orElse(ConnectivityModelFactory.emptyPayloadMapping());
 
diff --git a/documentation/src/main/resources/jsonschema/connection.json b/documentation/src/main/resources/jsonschema/connection.json
index 5903781fdc8..9611751057d 100644
--- a/documentation/src/main/resources/jsonschema/connection.json
+++ b/documentation/src/main/resources/jsonschema/connection.json
@@ -9,7 +9,7 @@
       "title": "Connection ID",
       "description": "The self assigned unique identifier of the connection",
       "examples": [
-        "myConnection"
+        "my-connection"
       ]
     },
     "name": {
@@ -36,7 +36,7 @@
       "title": "Connection type",
       "description": "The type determining the connection's underlying transport protocol",
       "examples": [
-        "amqp-10"
+        "kafka"
       ]
     },
     "connectionStatus": {
@@ -427,14 +427,17 @@
                   "description": "A filter that must match the input value for a message to be accepted. You can use the placeholders `{{ thing:id }}`, `{{ thing:name }}` or `{{ thing:namespace }}` in a filter."
                 }
               }
-            }
+            },
+            "additionalProperties": false,
+            "required": [
+              "input"
+            ]
           },
           "acknowledgementRequests": {
             "$id": "/properties/sources/items/properties/acknowledgementRequests",
             "type": "object",
             "title": "Acknowledgement requests configuration",
             "description": "Contains requests to acknowledgements which must be fulfilled before a message consumed from this source is technically settled/ACKed at the e.g. message broker.",
-            "additionalProperties": false,
             "properties": {
               "includes": {
                 "$id": "/properties/sources/items/properties/acknowledgementRequests/includes",
@@ -456,6 +459,7 @@
                 ]
               }
             },
+            "additionalProperties": false,
             "required": [
               "includes"
             ]
@@ -546,11 +550,18 @@
                 }
               }
             },
+            "additionalProperties": false,
             "required": [
+              "enabled",
               "address"
             ]
           }
-        }
+        },
+        "additionalProperties": false,
+        "required": [
+          "addresses",
+          "authorizationContext"
+        ]
       }
     },
     "targets": {
@@ -642,7 +653,13 @@
               }
             }
           }
-        }
+        },
+        "additionalProperties": false,
+        "required": [
+          "address",
+          "authorizationContext",
+          "topics"
+        ]
       }
     },
     "clientCount": {
@@ -652,7 +669,7 @@
       "description": "The client count defines how many clients are instantiated for this connection. Each client opens a separate 'physical' connection and thus raises the overall availability and throughput of the connection. Clients are always instantiated on separate AKKA cluster nodes while having only a single client per node. Therefore the max client count is limited by the number of cluster nodes.",
       "default": 1,
       "minimum": 1,
-      "maximum": "#clusterNodes",
+      "maximum": 9,
       "examples": [
         1,
         2,

From bd99030f105f937f92bf8c876a2d869a68b45029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 13 Jun 2023 17:54:30 +0200
Subject: [PATCH 124/173] fix helm chart release GH action, completely
 specified helm commands by our own
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .github/workflows/helm-chart-release.yml | 36 ++++++++++++++++++------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml
index 994f70ee99c..decdbf3f82e 100644
--- a/.github/workflows/helm-chart-release.yml
+++ b/.github/workflows/helm-chart-release.yml
@@ -10,6 +10,8 @@
 # SPDX-License-Identifier: EPL-2.0
 name: Release and publish Helm chart
 
+env:
+  VERSION_HELM: "v3.11.2"
 on:
   workflow_dispatch:
     inputs:
@@ -26,13 +28,29 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Package and push Ditto Helm chart to Docker Hub
-        uses: appany/helm-oci-chart-releaser@v0.3.0
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v3
         with:
-          repository: eclipse
-          name: ditto
-          tag: ${{ inputs.chartVersion }}
-          path: deployment/helm/ditto
-          registry: registry-1.docker.io
-          registry_username: eclipsedittobot
-          registry_password: ${{ secrets.DOCKER_HUB_TOKEN }}
+          version: ${{ env.VERSION_HELM }}
+
+      - name: Helm | Login
+        shell: bash
+        run: echo ${{ secrets.DOCKER_HUB_TOKEN }} | helm registry login -u eclipsedittobot --password-stdin registry-1.docker.io
+
+      - name: Helm | Package
+        shell: bash
+        run: helm package deployment/helm/ditto --dependency-update --version ${{ inputs.chartVersion }}
+
+      - name: Helm | Push
+        shell: bash
+        run: helm push ditto-${{ inputs.chartVersion }}.tgz oci://registry-1.docker.io/eclipse
+
+      - name: Helm | Logout
+        shell: bash
+        run: helm registry logout registry-1.docker.io
+
+      - name: Helm | Output
+        id: output
+        shell: bash
+        run: echo "image=registry-1.docker.io/eclipse/ditto:${{ inputs.chartVersion }}" >> $GITHUB_OUTPUT

From 824d700a98269800228e8066c1cae33540bae40b Mon Sep 17 00:00:00 2001
From: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
Date: Tue, 13 Jun 2023 20:28:25 +0200
Subject: [PATCH 125/173] Update README.md

---
 deployment/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/README.md b/deployment/README.md
index 92fdf572fdf..944fa99dc7a 100644
--- a/deployment/README.md
+++ b/deployment/README.md
@@ -2,11 +2,11 @@
 
 In order to deploy/start Ditto, you have the following options:
 
+- [starting via Kubernetes and Helm](helm/README.md) (* preferred way for productive setup)
 - [starting via Docker and docker-compose](docker/README.md)
 - [starting via Kubernetes with k3s](kubernetes/k3s/README.md)
 - [starting via Kubernetes with minikube](kubernetes/minikube/README.md)
 - [starting via OpenShift](openshift/README.md)
-- [starting via Kubernetes and Helm](helm/README.md)
 - [starting via Microsoft Azure](azure/README.md)
 
 ### Resource requirements

From 30da6a660ca16339cf527fcfbd47ee890a453071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 13 Jun 2023 21:04:54 +0200
Subject: [PATCH 126/173] exhange Ditto Helm chart curl version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* with arm64 compatible one - used for healthcheck

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/Chart.yaml  | 2 +-
 deployment/helm/ditto/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index 334f5527f97..e743c2776d3 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 0.0.1  # chart version is set by release-job
+version: 0.0.2  # chart version is set by release-job
 appVersion: 3.2.1
 keywords:
   - iot-chart
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index 1dead4470f7..f3beb5ad686 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -1457,7 +1457,7 @@ nginx:
     waitForGateway:
       enabled: true
       name: wait-for-gateway
-      image: curlimages/curl:latest
+      image: rancher/curlimages-curl:7.73.0
 
 ## ----------------------------------------------------------------------------
 ## Ditto UI configuration

From 3ce5df6880b5bea35804f9f9b3aee5204d821eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 15 Jun 2023 17:39:30 +0200
Subject: [PATCH 127/173] fix that redeliveries for acknowledgable connectivity
 messages were issued to often * removed generic
 `acknowledgeableMessage.reject(true)` on encountered exceptions * the logic
 where the status code of the DittoRuntimeException is handled did not even
 take a part in the redelivery
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../service/messaging/BaseConsumerActor.java       | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseConsumerActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseConsumerActor.java
index fe46ef752b7..bf45d23cc4c 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseConsumerActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseConsumerActor.java
@@ -186,18 +186,8 @@ private void prepareResponseHandler(final AcknowledgeableMessage acknowledgeable
             } else {
                 // don't count this as "failure" in the "source consumed" metric as the consumption
                 // itself was successful
-                final var dittoRuntimeException = DittoRuntimeException.asDittoRuntimeException(error, rootCause -> {
-
-                    // Redeliver and pray this unexpected error goes away
-                    log().debug("Rejecting [redeliver=true] due to error <{}>. " +
-                            "ResponseCollector=<{}>", rootCause, responseCollector);
-                    ackTimer.tag(getAckSuccessTag(false));
-                    ackTimer.tag(getAckRedeliverTag(true));
-                    ackTimer.stop();
-                    ackCounter.decrement();
-                    acknowledgeableMessage.reject(true);
-                    return null;
-                });
+                final var dittoRuntimeException = DittoRuntimeException
+                        .asDittoRuntimeException(error, rootCause -> null);
                 if (dittoRuntimeException != null) {
                     if (isConsideredSuccess(dittoRuntimeException)) {
                         ackTimer.tag(getAckSuccessTag(true));

From a6fc08e251d88d160cd0e305092d5d6b431001ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Fri, 16 Jun 2023 07:44:58 +0200
Subject: [PATCH 128/173] fix WoT dispatcher starvation by adding timeouts to
 fetch models
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 things/service/src/main/resources/things.conf  |  4 ++++
 things/service/src/test/resources/test.conf    |  4 ++++
 .../DefaultWotThingModelExtensionResolver.java | 18 ++++++++++++++----
 .../DefaultWotThingSkeletonGenerator.java      | 10 +++++++++-
 .../provider/DefaultWotThingModelFetcher.java  |  2 +-
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/things/service/src/main/resources/things.conf b/things/service/src/main/resources/things.conf
index ef3ca2b5b04..1e200edd979 100755
--- a/things/service/src/main/resources/things.conf
+++ b/things/service/src/main/resources/things.conf
@@ -349,6 +349,10 @@ wot-dispatcher {
   type = Dispatcher
   executor = "org.eclipse.ditto.internal.utils.metrics.executor.InstrumentedThreadPoolExecutorServiceConfigurator"
 }
+wot-dispatcher-cache-loader {
+  type = Dispatcher
+  executor = "org.eclipse.ditto.internal.utils.metrics.executor.InstrumentedThreadPoolExecutorServiceConfigurator"
+}
 
 blocked-namespaces-dispatcher {
   type = Dispatcher
diff --git a/things/service/src/test/resources/test.conf b/things/service/src/test/resources/test.conf
index 48e080c843b..db4f32dd8a9 100755
--- a/things/service/src/test/resources/test.conf
+++ b/things/service/src/test/resources/test.conf
@@ -170,6 +170,10 @@ wot-dispatcher {
   type = Dispatcher
   executor = "thread-pool-executor"
 }
+wot-dispatcher-cache-loader {
+  type = Dispatcher
+  executor = "thread-pool-executor"
+}
 
 blocked-namespaces-dispatcher {
   type = Dispatcher
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java
index 6763c0b2b8a..657ccd9b95b 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java
@@ -14,10 +14,12 @@
 
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.json.JsonCollectors;
@@ -39,6 +41,8 @@ final class DefaultWotThingModelExtensionResolver implements WotThingModelExtens
     private static final String TM_EXTENDS = "tm:extends";
     private static final String TM_REF = "tm:ref";
 
+    private static final Duration MAX_FETCH_MODEL_DURATION = Duration.ofSeconds(30);
+
     private final WotThingModelFetcher thingModelFetcher;
     private final Executor executor;
 
@@ -57,12 +61,14 @@ public ThingModel resolveThingModelExtensions(final ThingModel thingModel, final
                                     .filter(baseLink -> baseLink.getRel().filter(TM_EXTENDS::equals).isPresent())
                                     .map(extendsLink -> thingModelFetcher.fetchThingModel(extendsLink.getHref(), dittoHeaders))
                                     .map(CompletionStage::toCompletableFuture)
+                                    .map(cf -> cf.orTimeout(MAX_FETCH_MODEL_DURATION.toSeconds(), TimeUnit.SECONDS))
                                     .toList();
                             final CompletableFuture<Void> allModelFuture =
                                     CompletableFuture.allOf(fetchedModelFutures.toArray(new CompletableFuture[0]));
-                            return allModelFuture.thenApplyAsync(aVoid -> fetchedModelFutures.stream()
-                                            .map(CompletableFuture::join) // joining does not block anything here as "allOf" already guaranteed that all futures are ready
-                                            .toList(), executor)
+                            return allModelFuture
+                                    .thenApplyAsync(aVoid -> fetchedModelFutures.stream()
+                                        .map(CompletableFuture::join) // joining does not block anything here as "allOf" already guaranteed that all futures are ready
+                                        .toList(), executor)
                                     .join();
                         }
                 )
@@ -111,13 +117,17 @@ private JsonValue resolveRefs(final JsonObject objectWithTmRef, final DittoHeade
             throw WotThingModelRefInvalidException.newBuilder(tmRef).dittoHeaders(dittoHeaders).build();
         }
         final JsonObject refObject = thingModelFetcher.fetchThingModel(IRI.of(urlAndPointer[0]), dittoHeaders)
+                .toCompletableFuture()
+                .orTimeout(MAX_FETCH_MODEL_DURATION.toSeconds(), TimeUnit.SECONDS)
                 .thenApply(thingModel -> thingModel.getValue(JsonPointer.of(urlAndPointer[1])))
                 .thenComposeAsync(optJsonValue -> optJsonValue
                                 .filter(JsonValue::isObject)
                                 .map(JsonValue::asObject)
                                 .map(CompletableFuture::completedStage)
                                 .orElseGet(() -> CompletableFuture.completedStage(null))
-                        , executor).toCompletableFuture().join();
+                        , executor)
+                .toCompletableFuture()
+                .join();
 
         return JsonFactory.mergeJsonValues(objectWithTmRef.remove(TM_REF), refObject).asObject();
     }
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java
index 72d7f330e73..f8acf4e148f 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java
@@ -16,6 +16,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -24,6 +25,7 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
@@ -84,6 +86,7 @@ final class DefaultWotThingSkeletonGenerator implements WotThingSkeletonGenerato
     private static final String TM_SUBMODEL = "tm:submodel";
     private static final String TM_SUBMODEL_INSTANCE_NAME = "instanceName";
 
+    private static final Duration MAX_FETCH_MODEL_DURATION = Duration.ofSeconds(30);
 
 
     private final WotThingModelFetcher thingModelFetcher;
@@ -192,11 +195,14 @@ private Optional<Features> createFeaturesFromSubmodels(final ThingModel thingMod
                 )
                 .orElseGet(Stream::empty)
                 .map(submodel -> thingModelFetcher.fetchThingModel(submodel.href, dittoHeaders)
+                        .toCompletableFuture()
+                        .orTimeout(MAX_FETCH_MODEL_DURATION.toSeconds(), TimeUnit.SECONDS)
                         .thenApplyAsync(subThingModel ->
                                 generateFeatureSkeleton(submodel.instanceName,
                                         subThingModel,
                                         submodel.href,
-                                        dittoHeaders), executor)
+                                        dittoHeaders
+                                ), executor)
                         .toCompletableFuture()
                 )
                 .toList();
@@ -447,6 +453,8 @@ private List<DefinitionIdentifier> determineFurtherFeatureDefinitionIdentifiers(
                 final BaseLink<?> link = extendsLink.get();
                 final List<DefinitionIdentifier> recursedSubmodels =
                         thingModelFetcher.fetchThingModel(link.getHref(), dittoHeaders)
+                                .toCompletableFuture()
+                                .orTimeout(MAX_FETCH_MODEL_DURATION.toSeconds(), TimeUnit.SECONDS)
                                 .thenApplyAsync(subThingModel ->
                                         determineFurtherFeatureDefinitionIdentifiers( // recurse!
                                                 subThingModel,
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingModelFetcher.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingModelFetcher.java
index 365e750ee33..cce98ff243a 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingModelFetcher.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingModelFetcher.java
@@ -79,7 +79,7 @@ final class DefaultWotThingModelFetcher implements WotThingModelFetcher {
         thingModelCache = CacheFactory.createCache(loader,
                 wotConfig.getCacheConfig(),
                 "ditto_wot_thing_model_cache",
-                actorSystem.dispatchers().lookup("wot-dispatcher"));
+                actorSystem.dispatchers().lookup("wot-dispatcher-cache-loader"));
     }
 
     @Override

From 8904f7e0a57e56b5aa7991a472f11c0f7e585a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 20 Jun 2023 17:10:31 +0200
Subject: [PATCH 129/173] filter out tm:optional in WoT TMs from being created
 as JSON skeleton elements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* bump Jackson version to fix known CVEs

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 bom/pom.xml                                   |  4 +-
 .../DefaultWotThingSkeletonGenerator.java     | 49 +++++++++++++------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index d7ff2b70b1b..6b59efa521b 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -34,7 +34,7 @@
 
         <!-- ### Compile dependencies versions -->
         <minimal-json.version>0.9.5</minimal-json.version>
-        <jackson-bom.version>2.13.4.20221013</jackson-bom.version>
+        <jackson-bom.version>2.14.3</jackson-bom.version>
         <typesafe-config.version>1.4.2</typesafe-config.version>
         <ssl-config-core.version>0.6.1</ssl-config-core.version>
         <akka-bom.version>2.6.20</akka-bom.version>
@@ -85,7 +85,7 @@
         -->
         <js.long.version>3.2.0</js.long.version>
 
-        <caffeine.version>3.1.1</caffeine.version>
+        <caffeine.version>3.1.6</caffeine.version>
         <classindex.version>3.11</classindex.version>
 
         <!-- ### Testing dependencies versions -->
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java
index 72d7f330e73..78ebb8904a0 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java
@@ -67,6 +67,7 @@
 import org.eclipse.ditto.wot.model.StringSchema;
 import org.eclipse.ditto.wot.model.ThingDefinitionInvalidException;
 import org.eclipse.ditto.wot.model.ThingModel;
+import org.eclipse.ditto.wot.model.TmOptional;
 import org.eclipse.ditto.wot.model.WotThingModelInvalidException;
 
 import akka.actor.ActorSystem;
@@ -120,7 +121,11 @@ public Optional<Thing> generateThingSkeleton(final ThingId thingId,
                     final JsonObjectBuilder jsonObjectBuilder = JsonObject.newBuilder();
                     final Map<String, JsonObjectBuilder> attributesCategories = new LinkedHashMap<>();
 
-                    fillPropertiesInOptionalCategories(properties, jsonObjectBuilder, attributesCategories,
+                    fillPropertiesInOptionalCategories(
+                            properties,
+                            thingModelWithExtensionsAndImports.getTmOptional().orElse(null),
+                            jsonObjectBuilder,
+                            attributesCategories,
                             property -> dittoExtensionPrefix.flatMap(prefix ->
                                     property.getValue(prefix + ":" + DittoWotExtension.DITTO_WOT_EXTENSION_CATEGORY)
                             )
@@ -145,25 +150,35 @@ public Optional<Thing> generateThingSkeleton(final ThingId thingId,
     }
 
     private static void fillPropertiesInOptionalCategories(final Properties properties,
+            @Nullable final TmOptional tmOptionalElements,
             final JsonObjectBuilder jsonObjectBuilder,
             final Map<String, JsonObjectBuilder> propertiesCategories,
             final Function<Property, Optional<String>> propertyCategoryExtractor) {
 
-        properties.values().forEach(property ->
-                determineInitialPropertyValue(property).ifPresent(val ->
-                                propertyCategoryExtractor.apply(property)
-                                .ifPresentOrElse(attributeCategory -> {
-                                        if (!propertiesCategories.containsKey(attributeCategory)) {
-                                            propertiesCategories.put(attributeCategory,
-                                                    JsonObject.newBuilder());
-                                        }
-                                        propertiesCategories.get(attributeCategory)
-                                                .set(property.getPropertyName(), val);
-                                }, () ->
-                                        jsonObjectBuilder.set(property.getPropertyName(), val)
+        properties.values().stream()
+                // filter out optional elements - don't create skeleton values for those:
+                .filter(property -> Optional.ofNullable(tmOptionalElements)
+                        .stream()
+                        .noneMatch(optionals -> optionals.stream()
+                                .anyMatch(optionalEl ->
+                                        optionalEl.toString().equals("/properties/" + property.getPropertyName())
                                 )
+                        )
                 )
-        );
+                .forEach(property -> determineInitialPropertyValue(property).ifPresent(val ->
+                                propertyCategoryExtractor.apply(property)
+                                        .ifPresentOrElse(attributeCategory -> {
+                                                    if (!propertiesCategories.containsKey(attributeCategory)) {
+                                                        propertiesCategories.put(attributeCategory,
+                                                                JsonObject.newBuilder());
+                                                    }
+                                                    propertiesCategories.get(attributeCategory)
+                                                            .set(property.getPropertyName(), val);
+                                                }, () ->
+                                                        jsonObjectBuilder.set(property.getPropertyName(), val)
+                                        )
+                        )
+                );
     }
 
     private Optional<Features> createFeaturesFromSubmodels(final ThingModel thingModel,
@@ -254,7 +269,11 @@ public Optional<Feature> generateFeatureSkeleton(final String featureId,
                     final JsonObjectBuilder jsonObjectBuilder = JsonObject.newBuilder();
                     final Map<String, JsonObjectBuilder> propertiesCategories = new LinkedHashMap<>();
 
-                    fillPropertiesInOptionalCategories(properties, jsonObjectBuilder, propertiesCategories,
+                    fillPropertiesInOptionalCategories(
+                            properties,
+                            thingModelWithExtensionsAndImports.getTmOptional().orElse(null),
+                            jsonObjectBuilder,
+                            propertiesCategories,
                             property -> dittoExtensionPrefix.flatMap(prefix ->
                                             property.getValue(prefix + ":" + DittoWotExtension.DITTO_WOT_EXTENSION_CATEGORY)
                                     )

From bb33747bfcb2a9808ea9bf2afe50726eb933846c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 20 Jun 2023 20:55:21 +0200
Subject: [PATCH 130/173] #1649 remove network policies from Ditto Helm Chart
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/Chart.yaml              |  2 +-
 .../templates/connectivity-networkpolicy.yaml | 42 ---------------
 .../templates/dittoui-networkpolicy.yaml      | 36 -------------
 .../templates/gateway-networkpolicy.yaml      | 51 -------------------
 .../ditto/templates/nginx-networkpolicy.yaml  | 32 ------------
 .../templates/policies-networkpolicy.yaml     | 42 ---------------
 .../templates/swaggerui-networkpolicy.yaml    | 36 -------------
 .../ditto/templates/things-networkpolicy.yaml | 42 ---------------
 .../templates/thingssearch-networkpolicy.yaml | 42 ---------------
 deployment/helm/ditto/values.yaml             | 37 --------------
 10 files changed, 1 insertion(+), 361 deletions(-)
 delete mode 100644 deployment/helm/ditto/templates/connectivity-networkpolicy.yaml
 delete mode 100644 deployment/helm/ditto/templates/dittoui-networkpolicy.yaml
 delete mode 100644 deployment/helm/ditto/templates/gateway-networkpolicy.yaml
 delete mode 100644 deployment/helm/ditto/templates/nginx-networkpolicy.yaml
 delete mode 100644 deployment/helm/ditto/templates/policies-networkpolicy.yaml
 delete mode 100644 deployment/helm/ditto/templates/swaggerui-networkpolicy.yaml
 delete mode 100644 deployment/helm/ditto/templates/things-networkpolicy.yaml
 delete mode 100644 deployment/helm/ditto/templates/thingssearch-networkpolicy.yaml

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index e743c2776d3..cf615c1aa29 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 0.0.2  # chart version is set by release-job
+version: 0.0.3  # chart version is set by release-job
 appVersion: 3.2.1
 keywords:
   - iot-chart
diff --git a/deployment/helm/ditto/templates/connectivity-networkpolicy.yaml b/deployment/helm/ditto/templates/connectivity-networkpolicy.yaml
deleted file mode 100644
index 81c57ee2bd5..00000000000
--- a/deployment/helm/ditto/templates/connectivity-networkpolicy.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0
-#
-# SPDX-License-Identifier: EPL-2.0
-{{- if .Values.connectivity.networkPolicy.enabled }}
----
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "ditto.fullname" . }}-connectivity
-  labels:
-    app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
-{{ include "ditto.labels" . | indent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "ditto.name" . }}-connectivity
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  policyTypes:
-  - Ingress
-  - Egress
-  ingress:
-  # Allow inner cluster communication
-  - from:
-    - podSelector:
-        matchLabels:
-          actorSystemName: {{ .Values.akka.actorSystemName }}
-    ports:
-    - protocol: TCP
-      port: {{ .Values.akka.remoting.port }}
-    - protocol: TCP
-      port: {{ .Values.akka.mgmthttp.port }}
-  # Open all egress
-  egress:
-  - {}
-{{- end }}
diff --git a/deployment/helm/ditto/templates/dittoui-networkpolicy.yaml b/deployment/helm/ditto/templates/dittoui-networkpolicy.yaml
deleted file mode 100644
index 98010824eeb..00000000000
--- a/deployment/helm/ditto/templates/dittoui-networkpolicy.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0
-#
-# SPDX-License-Identifier: EPL-2.0
-{{- if .Values.dittoui.networkPolicy.enabled -}}
----
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "ditto.fullname" . }}-dittoui
-  labels:
-    app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
-{{ include "ditto.labels" . | indent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "ditto.name" . }}-dittoui
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  policyTypes:
-  - Ingress
-  ingress:
-  - from:
-    - podSelector:
-        matchLabels:
-          app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
-          app.kubernetes.io/instance: {{ .Release.Name }}
-    ports:
-    - protocol: TCP
-      port: 8080
-{{- end }}
diff --git a/deployment/helm/ditto/templates/gateway-networkpolicy.yaml b/deployment/helm/ditto/templates/gateway-networkpolicy.yaml
deleted file mode 100644
index 7072f92548e..00000000000
--- a/deployment/helm/ditto/templates/gateway-networkpolicy.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0
-#
-# SPDX-License-Identifier: EPL-2.0
-{{- if .Values.gateway.networkPolicy.enabled -}}
----
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "ditto.fullname" . }}-gateway
-  labels:
-    app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
-{{ include "ditto.labels" . | indent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "ditto.name" . }}-gateway
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  policyTypes:
-  - Ingress
-  - Egress
-  ingress:
-  # Allow access from Nginx
-  - from:
-    - podSelector:
-        matchLabels:
-          app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
-          app.kubernetes.io/instance: {{ .Release.Name }}
-    ports:
-    - protocol: TCP
-      port: http
-  # Allow inner cluster communication
-  - from:
-    - podSelector:
-        matchLabels:
-          actorSystemName: {{ .Values.akka.actorSystemName }}
-    ports:
-    - protocol: TCP
-      port: {{ .Values.akka.remoting.port }}
-    - protocol: TCP
-      port: {{ .Values.akka.mgmthttp.port }}
-  # Open all egress
-  egress:
-  - {}
-{{- end }}
diff --git a/deployment/helm/ditto/templates/nginx-networkpolicy.yaml b/deployment/helm/ditto/templates/nginx-networkpolicy.yaml
deleted file mode 100644
index e194772310f..00000000000
--- a/deployment/helm/ditto/templates/nginx-networkpolicy.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0
-#
-# SPDX-License-Identifier: EPL-2.0
-{{- if .Values.nginx.networkPolicy.enabled -}}
----
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "ditto.fullname" . }}-nginx
-  labels:
-    app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
-{{ include "ditto.labels" . | indent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  policyTypes:
-  - Ingress
-  ingress:
-  # Allow access from OpenShift Router
-  - ports:
-    - protocol: TCP
-      port: 8080
-{{- end }}
diff --git a/deployment/helm/ditto/templates/policies-networkpolicy.yaml b/deployment/helm/ditto/templates/policies-networkpolicy.yaml
deleted file mode 100644
index e73f8c31459..00000000000
--- a/deployment/helm/ditto/templates/policies-networkpolicy.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0
-#
-# SPDX-License-Identifier: EPL-2.0
-{{- if .Values.policies.networkPolicy.enabled -}}
----
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "ditto.fullname" . }}-policies
-  labels:
-    app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
-{{ include "ditto.labels" . | indent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "ditto.name" . }}-policies
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  policyTypes:
-  - Ingress
-  - Egress
-  ingress:
-  # Allow inner cluster communication
-  - from:
-    - podSelector:
-        matchLabels:
-          actorSystemName: {{ .Values.akka.actorSystemName }}
-    ports:
-    - protocol: TCP
-      port: {{ .Values.akka.remoting.port }}
-    - protocol: TCP
-      port: {{ .Values.akka.mgmthttp.port }}
-  # Open all egress
-  egress:
-  - {}
-{{- end }}
diff --git a/deployment/helm/ditto/templates/swaggerui-networkpolicy.yaml b/deployment/helm/ditto/templates/swaggerui-networkpolicy.yaml
deleted file mode 100644
index 102c206100a..00000000000
--- a/deployment/helm/ditto/templates/swaggerui-networkpolicy.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0
-#
-# SPDX-License-Identifier: EPL-2.0
-{{- if .Values.swaggerui.networkPolicy.enabled -}}
----
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "ditto.fullname" . }}-swaggerui
-  labels:
-    app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
-{{ include "ditto.labels" . | indent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "ditto.name" . }}-swaggerui
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  policyTypes:
-  - Ingress
-  ingress:
-  - from:
-    - podSelector:
-        matchLabels:
-          app.kubernetes.io/name: {{ include "ditto.name" . }}-nginx
-          app.kubernetes.io/instance: {{ .Release.Name }}
-    ports:
-    - protocol: TCP
-      port: 8080
-{{- end }}
diff --git a/deployment/helm/ditto/templates/things-networkpolicy.yaml b/deployment/helm/ditto/templates/things-networkpolicy.yaml
deleted file mode 100644
index 86b8d0c6c3a..00000000000
--- a/deployment/helm/ditto/templates/things-networkpolicy.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0
-#
-# SPDX-License-Identifier: EPL-2.0
-{{- if .Values.things.networkPolicy.enabled -}}
----
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "ditto.fullname" . }}-things
-  labels:
-    app.kubernetes.io/name: {{ include "ditto.name" . }}-things
-{{ include "ditto.labels" . | indent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "ditto.name" . }}-things
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  policyTypes:
-  - Ingress
-  - Egress
-  ingress:
-  # Allow inner cluster communication
-  - from:
-    - podSelector:
-        matchLabels:
-          actorSystemName: {{ .Values.akka.actorSystemName }}
-    ports:
-    - protocol: TCP
-      port: {{ .Values.akka.remoting.port }}
-    - protocol: TCP
-      port: {{ .Values.akka.mgmthttp.port }}
-  # Open all egress
-  egress:
-  - {}
-{{- end }}
diff --git a/deployment/helm/ditto/templates/thingssearch-networkpolicy.yaml b/deployment/helm/ditto/templates/thingssearch-networkpolicy.yaml
deleted file mode 100644
index 607616e42b2..00000000000
--- a/deployment/helm/ditto/templates/thingssearch-networkpolicy.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2023 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# http://www.eclipse.org/legal/epl-2.0
-#
-# SPDX-License-Identifier: EPL-2.0
-{{- if .Values.thingsSearch.networkPolicy.enabled -}}
----
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "ditto.fullname" . }}-thingssearch
-  labels:
-    app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
-{{ include "ditto.labels" . | indent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "ditto.name" . }}-thingssearch
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  policyTypes:
-  - Ingress
-  - Egress
-  ingress:
-  # Allow inner cluster communication
-  - from:
-    - podSelector:
-        matchLabels:
-          actorSystemName: {{ .Values.akka.actorSystemName }}
-    ports:
-    - protocol: TCP
-      port: {{ .Values.akka.remoting.port }}
-    - protocol: TCP
-      port: {{ .Values.akka.mgmthttp.port }}
-  # Open all egress
-  egress:
-  - {}
-{{- end }}
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index f3beb5ad686..317abe2d22e 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -440,11 +440,6 @@ policies:
     timeoutSeconds: 5
     successThreshold: 1
     failureThreshold: 4
-  # networkPolicy configuration for policies
-  #  ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
-  networkPolicy:
-    # enabled controls whether policies related NetworkPolicy should be created
-    enabled: true
   # podDisruptionBudget configuration for policies
   #  ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
   podDisruptionBudget:
@@ -622,11 +617,6 @@ things:
     timeoutSeconds: 5
     successThreshold: 1
     failureThreshold: 4
-  # networkPolicy configuration for things
-  #  ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
-  networkPolicy:
-    # enabled controls whether things related NetworkPolicy should be created
-    enabled: true
   # podDisruptionBudget configuration for things
   #  ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
   podDisruptionBudget:
@@ -826,11 +816,6 @@ thingsSearch:
     timeoutSeconds: 5
     successThreshold: 1
     failureThreshold: 4
-  # networkPolicy configuration for things-search
-  #  ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
-  networkPolicy:
-    # enabled controls whether things-search related NetworkPolicy should be created
-    enabled: true
   # podDisruptionBudget configuration for things-search
   #  ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
   podDisruptionBudget:
@@ -1006,11 +991,6 @@ connectivity:
     timeoutSeconds: 5
     successThreshold: 1
     failureThreshold: 4
-  # networkPolicy configuration for connectivity
-  #  ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
-  networkPolicy:
-    # enabled controls whether connectivity related NetworkPolicy should be created
-    enabled: true
   # podDisruptionBudget configuration for connectivity
   #  ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
   podDisruptionBudget:
@@ -1270,11 +1250,6 @@ gateway:
     port: 8080
     # annotations to add arbitrary annotations to nginx service
     annotations: {}
-  # networkPolicy configuration for gateway
-  #  ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
-  networkPolicy:
-    # enabled controls whether gateway related NetworkPolicy should be created
-    enabled: true
   # podDisruptionBudget configuration for gateway
   #  ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
   podDisruptionBudget:
@@ -1439,10 +1414,6 @@ nginx:
     #  nodePort: 30080
     # annotations to add arbitrary annotations to nginx service
     annotations: {}
-  # networkPolicy ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
-  networkPolicy:
-    # enabled controls whether policies related NetworkPolicy should be created
-    enabled: true
   # nodeSelector configuration for nginx
   #  ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
   nodeSelector: {}
@@ -1491,10 +1462,6 @@ dittoui:
     cpu: 0.1
     # memoryMi defines the memory in mebibyte (MiB) used as "required" and "limit" in k8s
     memoryMi: 64
-  # networkPolicy ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
-  networkPolicy:
-    # enabled controls whether Ditto UI related NetworkPolicy should be created
-    enabled: true
   # podDisruptionBudget ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
   podDisruptionBudget:
     # enabled controls whether Ditto UI related PodDisruptionBudget should be created
@@ -1541,10 +1508,6 @@ swaggerui:
     cpu: 0.1
     # memoryMi defines the memory in mebibyte (MiB) used as "required" and "limit" in k8s
     memoryMi: 64
-  # networkPolicy ref: https://kubernetes.io/docs/concepts/services-networking/network-policies/
-  networkPolicy:
-    # enabled controls whether swagger ui related NetworkPolicy should be created
-    enabled: true
   # podDisruptionBudget ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
   podDisruptionBudget:
     # enabled controls whether swagger ui related PodDisruptionBudget should be created

From 9c9d4ae73042bdf51564272c0e435933f31f0419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 20 Jun 2023 21:04:51 +0200
Subject: [PATCH 131/173] updated dependencies and NOTICE-THIRD-PARTY.md

---
 legal/3rd-party-dependencies/compile.txt | 18 +++----
 legal/NOTICE-THIRD-PARTY.md              | 62 ++++++++++++------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/legal/3rd-party-dependencies/compile.txt b/legal/3rd-party-dependencies/compile.txt
index af3c9eaa74b..fb51bfe11e1 100644
--- a/legal/3rd-party-dependencies/compile.txt
+++ b/legal/3rd-party-dependencies/compile.txt
@@ -1,15 +1,15 @@
 ch.qos.logback:logback-classic:jar:1.2.11:compile
 ch.qos.logback:logback-core:jar:1.2.11:compile
 com.eclipsesource.minimal-json:minimal-json:jar:0.9.5:compile
-com.fasterxml.jackson.core:jackson-annotations:jar:2.13.4:compile
-com.fasterxml.jackson.core:jackson-core:jar:2.13.4:compile
-com.fasterxml.jackson.core:jackson-databind:jar:2.13.4.2:compile
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar:2.13.4:compile
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.13.4:compile
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.13.4:compile
-com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.13.4:compile
-com.fasterxml.jackson.module:jackson-module-scala_2.13:jar:2.13.4:compile
-com.github.ben-manes.caffeine:caffeine:jar:3.1.1:compile
+com.fasterxml.jackson.core:jackson-annotations:jar:2.14.3:compile
+com.fasterxml.jackson.core:jackson-core:jar:2.14.3:compile
+com.fasterxml.jackson.core:jackson-databind:jar:2.14.3:compile
+com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar:2.14.3:compile
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.14.3:compile
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.14.3:compile
+com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.14.3:compile
+com.fasterxml.jackson.module:jackson-module-scala_2.13:jar:2.14.3:compile
+com.github.ben-manes.caffeine:caffeine:jar:3.1.6:compile
 com.github.jnr:jffi:jar:1.2.18:compile
 com.github.jnr:jffi:jar:native:1.2.18:compile
 com.github.jnr:jnr-a64asm:jar:1.0.0:compile
diff --git a/legal/NOTICE-THIRD-PARTY.md b/legal/NOTICE-THIRD-PARTY.md
index 0deb8d7efea..c3f06bc3879 100644
--- a/legal/NOTICE-THIRD-PARTY.md
+++ b/legal/NOTICE-THIRD-PARTY.md
@@ -30,94 +30,94 @@
    * Maven sources: https://search.maven.org/remotecontent?filepath=com/eclipsesource/minimal-json/minimal-json/0.9.5/minimal-json-0.9.5-sources.jar
 
 
-## Jackson-annotations (2.13.4)
+## Jackson-annotations (2.14.3)
 
-* Maven coordinates: `com.fasterxml.jackson.core:jackson-annotations:2.13.4`
+* Maven coordinates: `com.fasterxml.jackson.core:jackson-annotations:2.14.3`
 * License: [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html)
-* Project: http://github.com/FasterXML/jackson
+* Project: https://github.com/FasterXML/jackson
 * Sources: 
    * declared as SCM: https://github.com/FasterXML/jackson-annotations
-   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/core/jackson-annotations/2.13.4/jackson-annotations-2.13.4-sources.jar
+   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/core/jackson-annotations/2.14.3/jackson-annotations-2.14.3-sources.jar
 
 
-## Jackson-core (2.13.4)
+## Jackson-core (2.14.3)
 
-* Maven coordinates: `com.fasterxml.jackson.core:jackson-core:2.13.4`
+* Maven coordinates: `com.fasterxml.jackson.core:jackson-core:2.14.3`
 * License: [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html)
 * Project: https://github.com/FasterXML/jackson-core
 * Sources: 
    * declared as SCM: https://github.com/FasterXML/jackson-core
-   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/core/jackson-core/2.13.4/jackson-core-2.13.4-sources.jar
+   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/core/jackson-core/2.14.3/jackson-core-2.14.3-sources.jar
 
 
-## jackson-databind (2.13.4.2)
+## jackson-databind (2.14.3)
 
-* Maven coordinates: `com.fasterxml.jackson.core:jackson-databind:2.13.4.2`
+* Maven coordinates: `com.fasterxml.jackson.core:jackson-databind:2.14.3`
 * License: [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html)
-* Project: http://github.com/FasterXML/jackson
+* Project: https://github.com/FasterXML/jackson
 * Sources: 
    * declared as SCM: https://github.com/FasterXML/jackson-databind
-   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/core/jackson-databind/2.13.4.2/jackson-databind-2.13.4.2-sources.jar
+   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/core/jackson-databind/2.14.3/jackson-databind-2.14.3-sources.jar
 
 
-## Jackson dataformat: CBOR (2.13.4)
+## Jackson dataformat: CBOR (2.14.3)
 
-* Maven coordinates: `com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.4`
+* Maven coordinates: `com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.14.3`
 * License: [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html)
-* Project: http://github.com/FasterXML/jackson-dataformats-binary
+* Project: https://github.com/FasterXML/jackson-dataformats-binary
 * Sources: 
    * declared as SCM: https://github.com/FasterXML/jackson-dataformats-binary/jackson-dataformat-cbor
-   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.13.4/jackson-dataformat-cbor-2.13.4-sources.jar
+   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.14.3/jackson-dataformat-cbor-2.14.3-sources.jar
 
 
-## Jackson datatype: jdk8 (2.13.4)
+## Jackson datatype: jdk8 (2.14.3)
 
-* Maven coordinates: `com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4`
+* Maven coordinates: `com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.3`
 * License: [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html)
 * Project: https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8
 * Sources: 
    * declared as SCM: https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8
-   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.13.4/jackson-datatype-jdk8-2.13.4-sources.jar
+   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.14.3/jackson-datatype-jdk8-2.14.3-sources.jar
 
 
-## Jackson datatype: JSR310 (2.13.4)
+## Jackson datatype: JSR310 (2.14.3)
 
-* Maven coordinates: `com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4`
+* Maven coordinates: `com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.3`
 * License: [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html)
 * Project: https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310
 * Sources: 
    * declared as SCM: https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310
-   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.13.4/jackson-datatype-jsr310-2.13.4-sources.jar
+   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.14.3/jackson-datatype-jsr310-2.14.3-sources.jar
 
 
-## Jackson-module-parameter-names (2.13.4)
+## Jackson-module-parameter-names (2.14.3)
 
-* Maven coordinates: `com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.4`
+* Maven coordinates: `com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.3`
 * License: [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html)
 * Project: https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names
 * Sources: 
    * declared as SCM: https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names
-   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/module/jackson-module-parameter-names/2.13.4/jackson-module-parameter-names-2.13.4-sources.jar
+   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/module/jackson-module-parameter-names/2.14.3/jackson-module-parameter-names-2.14.3-sources.jar
 
 
-## jackson-module-scala (2.13.4)
+## jackson-module-scala (2.14.3)
 
-* Maven coordinates: `com.fasterxml.jackson.module:jackson-module-scala_2.13:2.13.4`
+* Maven coordinates: `com.fasterxml.jackson.module:jackson-module-scala_2.13:2.14.3`
 * License: [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html)
-* Project: http://wiki.fasterxml.com/JacksonModuleScala
+* Project: https://github.com/FasterXML/jackson-module-scala
 * Sources: 
    * declared as SCM: https://github.com/FasterXML/jackson-module-scala
-   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/module/jackson-module-scala_2.13/2.13.4/jackson-module-scala_2.13-2.13.4-sources.jar
+   * Maven sources: https://search.maven.org/remotecontent?filepath=com/fasterxml/jackson/module/jackson-module-scala_2.13/2.14.3/jackson-module-scala_2.13-2.14.3-sources.jar
 
 
-## Caffeine cache (3.1.1)
+## Caffeine cache (3.1.6)
 
-* Maven coordinates: `com.github.ben-manes.caffeine:caffeine:3.1.1`
+* Maven coordinates: `com.github.ben-manes.caffeine:caffeine:3.1.6`
 * License: [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html)
 * Project: https://github.com/ben-manes/caffeine
 * Sources: 
    * declared as SCM: https://github.com/ben-manes/caffeine
-   * Maven sources: https://search.maven.org/remotecontent?filepath=com/github/ben-manes/caffeine/caffeine/3.1.1/caffeine-3.1.1-sources.jar
+   * Maven sources: https://search.maven.org/remotecontent?filepath=com/github/ben-manes/caffeine/caffeine/3.1.6/caffeine-3.1.6-sources.jar
 
 
 ## jffi (1.2.18)

From 2da1497ec25a1f5a72a7965c707f053b968e5152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 21 Jun 2023 09:26:47 +0200
Subject: [PATCH 132/173] prepare Ditto 3.3.0 release

---
 SECURITY.md                                   |   6 +-
 documentation/src/main/resources/_config.yml  |  10 +-
 .../_data/sidebars/ditto_sidebar.yml          |  27 +--
 .../2023-06-23-release-announcement-330.md    |  80 ++++++++
 .../pages/ditto/release_notes_330.md          | 177 ++++++++++++++++++
 5 files changed, 277 insertions(+), 23 deletions(-)
 create mode 100644 documentation/src/main/resources/_posts/2023-06-23-release-announcement-330.md
 create mode 100644 documentation/src/main/resources/pages/ditto/release_notes_330.md

diff --git a/SECURITY.md b/SECURITY.md
index ead6f09625e..14caa8332fe 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -9,9 +9,9 @@ These versions of Eclipse Ditto are currently being supported with security upda
 
 | Version | Supported          |
 |---------| ------------------ |
-| 3.2x    | :white_check_mark: |
-| 3.1.x   | :white_check_mark: |
-| < 3.1.0 | :x:                |
+| 3.3.x   | :white_check_mark: |
+| 3.2.x   | :white_check_mark: |
+| < 3.2.0 | :x:                |
 
 ## Reporting a Vulnerability
 
diff --git a/documentation/src/main/resources/_config.yml b/documentation/src/main/resources/_config.yml
index e87bf431546..8d6b64a8c08 100644
--- a/documentation/src/main/resources/_config.yml
+++ b/documentation/src/main/resources/_config.yml
@@ -114,6 +114,8 @@ plugins:
 docVersions:
   - label: "development"
     basePath: ""
+  - label: "3.3"
+    basePath: "3.3"
   - label: "3.2"
     basePath: "3.2"
   - label: "3.1"
@@ -122,11 +124,3 @@ docVersions:
     basePath: "3.0"
   - label: "2.4"
     basePath: "2.4"
-  - label: "2.3"
-    basePath: "2.3"
-  - label: "2.2"
-    basePath: "2.2"
-  - label: "2.1"
-    basePath: "2.1"
-  - label: "2.0"
-    basePath: "2.0"
diff --git a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
index 1a08a3122fa..b0a6ddeef0d 100644
--- a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
+++ b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
@@ -23,29 +23,32 @@ entries:
       - title: Release Notes
         output: web
         folderitems:
+          - title: 3.3.0
+            url: /release_notes_330.html
+            output: web
           - title: 3.2.1
             url: /release_notes_321.html
             output: web
           - title: 3.2.0
             url: /release_notes_320.html
             output: web
-          - title: 3.1.2
-            url: /release_notes_312.html
-            output: web
-          - title: 3.1.1
-            url: /release_notes_311.html
-            output: web
-          - title: 3.1.0
-            url: /release_notes_310.html
-            output: web
-          - title: 3.0.0
-            url: /release_notes_300.html
-            output: web
 
             subfolders:
               - title: Archive
                 output: web
                 subfolderitems:
+                  - title: 3.1.2
+                    url: /release_notes_312.html
+                    output: web
+                  - title: 3.1.1
+                    url: /release_notes_311.html
+                    output: web
+                  - title: 3.1.0
+                    url: /release_notes_310.html
+                    output: web
+                  - title: 3.0.0
+                    url: /release_notes_300.html
+                    output: web
                   - title: 2.4.2
                     url: /release_notes_242.html
                     output: web
diff --git a/documentation/src/main/resources/_posts/2023-06-23-release-announcement-330.md b/documentation/src/main/resources/_posts/2023-06-23-release-announcement-330.md
new file mode 100644
index 00000000000..07a6b2d9b78
--- /dev/null
+++ b/documentation/src/main/resources/_posts/2023-06-23-release-announcement-330.md
@@ -0,0 +1,80 @@
+---
+title: "Announcing Eclipse Ditto Release 3.3.0"
+published: true
+permalink: 2023-06-23-release-announcement-330.html
+layout: post
+author: thomas_jaeckle
+tags: [blog]
+hide_sidebar: true
+sidebar: false
+toc: false
+---
+
+The Eclipse Ditto teams is proud to announce the availability of Eclipse Ditto 
+[3.3.0](https://projects.eclipse.org/projects/iot.ditto/releases/3.3.0).
+
+Version 3.3.0 contains features improving **merge/PATCH** commands, **skipping modifications** of a twin if the
+value would be equal after the modification and a more production ready Ditto Helm chart.
+
+
+## Adoption
+
+Companies are willing to show their adoption of Eclipse Ditto publicly: 
+[https://iot.eclipse.org/adopters/?#iot.ditto](https://iot.eclipse.org/adopters/?#iot.ditto)
+
+When you use Eclipse Ditto it would be great to support the project by putting your logo there.  
+
+
+## Changelog
+
+The main improvements and additions of Ditto 3.3.0 are:
+
+* Support **replacing certain json objects** in a **merge/PATCH command** instead of merging their fields
+* Implicitly **convert a merge/PATCH command** to a **"Create Thing"** if thing is **not yet existing**
+* Provide option to **skip a modification** in the "twin" **if the value "is equal"** to the previous value
+* Addition of the **DevOps API endpoints** to Ditto's **OpenAPI** definition
+* Improve DittoProtocol MessagePath to be aware of message subject
+* Support alternative way of specifying **"list" query parameters**
+* UI enhancements:
+  * Enhance Ditto-UI to dynamically configure log levels of Ditto
+  * Building and packaging the UI with esbuild
+
+The following non-functional enhancements are also included:
+
+* Provide **official Eclipse Ditto Helm chart** via **Docker Hub** and move its sources to Ditto Git repository
+  * In addition, provide a lot more configuration options and hardening of the chart to make it more feasible
+    for productive use
+
+The following notable fixes are included:
+
+* Fix that redeliveries for acknowledgeable connectivity messages were issued too often
+* Fix WoT dispatcher starvation by adding timeouts to fetch models
+
+Please have a look at the [3.3.0 release notes](release_notes_330.html) for a more detailed information on the release.
+
+
+## Artifacts
+
+The new Java artifacts have been published at the [Eclipse Maven repository](https://repo.eclipse.org/content/repositories/ditto/)
+as well as [Maven central](https://repo1.maven.org/maven2/org/eclipse/ditto/).
+
+The Ditto JavaScript client release was published on [npmjs.com](https://www.npmjs.com/~eclipse_ditto):
+* [@eclipse-ditto/ditto-javascript-client-dom](https://www.npmjs.com/package/@eclipse-ditto/ditto-javascript-client-dom)
+* [@eclipse-ditto/ditto-javascript-client-node](https://www.npmjs.com/package/@eclipse-ditto/ditto-javascript-client-node)
+
+
+The Docker images have been pushed to Docker Hub:
+* [eclipse/ditto-policies](https://hub.docker.com/r/eclipse/ditto-policies/)
+* [eclipse/ditto-things](https://hub.docker.com/r/eclipse/ditto-things/)
+* [eclipse/ditto-things-search](https://hub.docker.com/r/eclipse/ditto-things-search/)
+* [eclipse/ditto-gateway](https://hub.docker.com/r/eclipse/ditto-gateway/)
+* [eclipse/ditto-connectivity](https://hub.docker.com/r/eclipse/ditto-connectivity/)
+
+The Ditto Helm chart has been published to Docker Hub:
+* [eclipse/ditto](https://hub.docker.com/r/eclipse/ditto/)
+
+<br/>
+<br/>
+{% include image.html file="ditto.svg" alt="Ditto" max-width=500 %}
+--<br/>
+The Eclipse Ditto team
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_330.md b/documentation/src/main/resources/pages/ditto/release_notes_330.md
new file mode 100644
index 00000000000..974265ede21
--- /dev/null
+++ b/documentation/src/main/resources/pages/ditto/release_notes_330.md
@@ -0,0 +1,177 @@
+---
+title: Release notes 3.3.0
+tags: [release_notes]
+published: true
+keywords: release notes, announcements, changelog
+summary: "Version 3.3.0 of Eclipse Ditto, released on 23.06.2023"
+permalink: release_notes_330.html
+---
+
+Eclipse Ditto version 3.3.0 is here, continuing on adding features while keeping APIs backwards compatible.
+
+This release is completely [IP (intellectual property) checked by the Eclipse Foundation](https://www.eclipse.org/projects/handbook/#ip)
+meaning that project code as well as all used dependencies were "[...] reviewed to ensure that the copyrights
+expressed are correct, licensing is valid and compatible, and that other issues have been uncovered and properly
+investigated."
+
+## Changelog
+
+Eclipse Ditto 3.3.0 focuses on the following areas:
+
+* Support **replacing certain json objects** in a **merge/PATCH command** instead of merging their fields
+* Implicitly **convert a merge/PATCH command** to a **"Create Thing"** if thing is **not yet existing**
+* Provide option to **skip a modification** in the "twin" **if the value "is equal"** to the previous value
+* Addition of the **DevOps API endpoints** to Ditto's **OpenAPI** definition
+* Improve DittoProtocol MessagePath to be aware of message subject
+* Support alternative way of specifying **"list" query parameters**
+* UI enhancements:
+  * Enhance Ditto-UI to dynamically configure log levels of Ditto
+  * Building and packaging the UI with esbuild
+
+The following non-functional work is also included:
+
+* Provide **official Eclipse Ditto Helm chart** via **Docker Hub** and move its sources to Ditto Git repository
+  * In addition, provide a lot more configuration options and hardening of the chart to make it more feasible
+    for productive use
+
+The following notable fixes are included:
+
+* Fix that redeliveries for acknowledgeable connectivity messages were issued too often
+* Fix WoT dispatcher starvation by adding timeouts to fetch models
+
+### New features
+
+#### [Support replacing certain json objects in a merge/PATCH command instead of merging their fields](https://github.com/eclipse-ditto/ditto/issues/1593)
+
+Previously, when updating a thing using merge commands, any encountered json object is merged with the fields of the 
+provided json object.  
+The old values are not deleted, which often is needed and expected.
+
+In this enhancement an option is provided to define that for a certain json object the existing content should be 
+completely replaced with the new object.
+
+More details can be found in the [added documentation about "Removing fields in a merge update with a regex"](httpapi-concepts.html#removing-fields-in-a-merge-update-with-a-regex).
+
+#### [Implicitly convert a merge/PATCH command to a "Create Thing" if thing is not yet existing](https://github.com/eclipse-ditto/ditto/issues/1614)
+
+This new feature creates a thing implicitly if it did not yet exist when using a merge/PATCH command trying to modify 
+it partially.
+
+#### [Provide option to skip a modification in the "twin" if the value "is equal" to the previous value](https://github.com/eclipse-ditto/ditto/issues/1524)
+
+The default behaviour until now in Ditto is for each "ModifyCommand" to apply the modification and also the twin in the 
+MongoDB.  
+
+Using a new header `if-equal: skip`, a modification of a "thing" will only be performed when its value would be changed
+as a result of that modification.  
+The default behavior (if not specified as `skip`) is: `if-equal: update` - which will update the thing for each
+modification, even if the value did not change.
+
+Using this feature, it e.g. is possible to reduce database I/O operations and also prevent events from being published
+when in fact nothing in the twin was changed.
+
+This is documented in the [HTTP API concepts - Conditional Headers](httpapi-concepts.html#conditional-headers), but is
+also usable via [Ditto Protocol headers](protocol-specification.html#headers).
+
+#### [Addition of the DevOps API endpoints to Ditto's OpenAPI definition](https://github.com/eclipse-ditto/ditto/issues/1623)
+
+Ditto's OpenAPI definition now also includes the HTTP endpoints for the 
+[DevOps commands](installation-operating.html#devops-commands).
+
+This was a contribution from [Luca Neotti](https://github.com/neottil) - many thanks for that.
+
+#### [Improve DittoProtocol MessagePath to be aware of message subject](https://github.com/eclipse-ditto/ditto/pull/1641)
+
+This was a small addition to the Java API of `MessagePath` in the ditto-protocol module which lets the user of the SDK
+access more easily the `subject` of a Ditto "Message".
+
+#### [Support alternative way of specifying "list" query parameters](https://github.com/eclipse-ditto/ditto/issues/1644)
+
+Supports an alternative syntax of specifying a list of a certain HTTP query parameter in the form:
+```
+GET /thing/my:thing-123?fields=thingId&fields=policyId&fields=attributes
+```
+
+#### Enhancements in Ditto explorer UI
+
+We again received contributions by [Thomas Fries](https://github.com/thfries),
+who contributed the Ditto explorer UI.  
+The latest live version of the UI can be found here:  
+[https://eclipse-ditto.github.io/ditto/](https://eclipse-ditto.github.io/ditto/)
+
+You can use it in order to e.g. connect to your Ditto installation to manage things, policies and even connections and 
+DevOps related commands.
+
+Contributions in this release:
+* [UI: Enhance Ditto-UI to configure log levels of Ditto](https://github.com/eclipse-ditto/ditto/issues/1590)
+* [Building and packaging the UI with esbuild](https://github.com/eclipse-ditto/ditto/pull/1630)
+
+
+### Changes
+
+#### [Provide official Eclipse Ditto Helm chart via Docker Hub and move its sources to Ditto Git repository](https://github.com/eclipse-ditto/ditto/pull/1635)
+
+The official Ditto Helm chart was migrated from being maintained at the [Eclipse IoT Packages](https://github.com/eclipse/packages)
+project to being maintained as part of the Ditto Git repository.  
+The old [Helm chart was deprecated](https://artifacthub.io/packages/helm/eclipse-iot/ditto), the new chart is now hosted 
+via [Docker Hub](https://hub.docker.com/r/eclipse/ditto).
+
+The official chart was also enhanced a lot:
+* with a lot more configuration options in order to be the basis for a productive Helm chart
+* also added quite advanced Ingress configuration
+
+
+### Bugfixes
+
+
+#### [Fix that redeliveries for acknowledgeable connectivity messages were issued too often](https://github.com/eclipse-ditto/ditto/pull/1657)
+
+Messages processed via a Ditto connection which required QoS 1 ("at least once") were ask for being redelivered too often
+and too early.  
+The existing logic which took the status code in account in order to ask for a redelivery was never executed.  
+As a result, e.g. a command resulting in status code `400` (bad request) would have been redelivered over and over again
+without the chance of ever being successful.
+
+This was fixed.
+
+#### [Fix WoT dispatcher starvation by adding timeouts to fetch models](https://github.com/eclipse-ditto/ditto/pull/1658)
+
+When fetching WoT TMs there was no timeout defined and potentially a thread could be blocked forever.
+
+This was fixed.
+
+
+#### Enhancements in Ditto Clients
+
+None in this release.
+
+### Changes
+
+None in this release
+
+### Bugfixes
+
+None in this release
+
+## Migration notes
+
+There are no migration steps required when updating from Ditto 3.2.x to Ditto 3.3.0.  
+When updating from Ditto 2.x version to 3.3.0, the migration notes of 
+[Ditto 3.0.0](release_notes_300.html#migration-notes) and [Ditto 3.1.0](release_notes_310.html#migration-notes)
+and [Ditto 3.2.0](release_notes_320.html#migration-notes) apply.
+
+
+## Roadmap
+
+Looking forward, the (current) ideas for Ditto 3.4.0 are:
+
+* Enforcing linked WoT ThingModels in Things/Features by validating JsonSchema of model elements
+  * Ensuring that a Ditto Thing is ensured to always follow its WoT ThingModel and also message payloads are always 
+    provided in the specified format
+* Search in history of a thing using an RQL filter
+* Perform a benchmark of Ditto and provide a "tuning" chapter in the documentation as a reference to the commonly 
+  asked questions 
+  * how many Things Ditto can manage
+  * how many updates/second can be done
+  * whether Ditto can scale horizontally
+  * how many resources (e.g. machines) are required at which scale

From d4c9cbbe88ab1ad03e076878932d4a774410dbf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 21 Jun 2023 10:11:14 +0200
Subject: [PATCH 133/173] adjusted Eclipse Ditto domain to eclipse.dev/ditto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 NOTICE.md                                     |   2 +-
 README.md                                     |   6 +-
 RELEASE.md                                    |   4 +-
 .../AcknowledgementLabelInvalidException.java |   4 +-
 .../NamespacedEntityIdInvalidException.java   |   2 +-
 .../resources/javascript/incoming-mapping.js  |   2 +-
 deployment/docker/README.md                   |   2 +-
 deployment/docker/sandbox/html/index.html     |   2 +-
 deployment/helm/ditto/Chart.yaml              |   4 +-
 deployment/helm/ditto/README.md               |   2 +-
 .../helm/ditto/ci/ci-workflow-values.yaml     |  10 +-
 deployment/helm/ditto/local-values.yaml       |  10 +-
 deployment/helm/ditto/values.yaml             |  28 +--
 deployment/kubernetes/README.md               |   2 +-
 deployment/openshift/nginx/index.html         |   2 +-
 documentation/README.md                       |   2 +-
 .../src/main/resources/_includes/head.html    |   4 +-
 ...example-demonstrating-rest-to-websocket.md |   4 +-
 .../2018-10-16-example-mqtt-bidirectional.md  |   2 +-
 .../2021-03-22-azure-iot-hub-integration.md   |   6 +-
 .../src/main/resources/jsonschema/policy.json |   2 +-
 .../protocol-search-subscribe-payload.json    |   4 +-
 .../main/resources/jsonschema/thing_v2.json   |   4 +-
 .../main/resources/openapi/ditto-api-2.yml    | 170 +++++++++---------
 .../parameters/importedPolicyIdPathParam.yml  |   2 +-
 .../sources/parameters/policyIdPathParam.yml  |   2 +-
 .../sources/parameters/thingIdPathParam.yml   |   2 +-
 .../sources/paths/cloudevents/cloudevents.yml |   6 +-
 .../sources/paths/features/definition.yml     |   8 +-
 .../paths/features/desiredProperties.yml      |   8 +-
 .../paths/features/desiredProperty.yml        |   8 +-
 .../sources/paths/features/feature.yml        |   8 +-
 .../openapi/sources/paths/features/index.yml  |   8 +-
 .../sources/paths/features/properties.yml     |   8 +-
 .../sources/paths/features/property.yml       |   8 +-
 .../paths/messages/feature-inbox-message.yml  |   2 +-
 .../paths/messages/feature-outbox-message.yml |   2 +-
 .../sources/paths/messages/inbox-claim.yml    |   4 +-
 .../sources/paths/messages/inbox-message.yml  |   2 +-
 .../sources/paths/messages/outbox-message.yml |   2 +-
 .../sources/paths/policies/entries.yml        |   4 +-
 .../openapi/sources/paths/policies/entry.yml  |   6 +-
 .../openapi/sources/paths/policies/import.yml |   6 +-
 .../sources/paths/policies/imports.yml        |   4 +-
 .../openapi/sources/paths/policies/policy.yml |   6 +-
 .../sources/paths/policies/resource.yml       |   6 +-
 .../sources/paths/policies/resources.yml      |   4 +-
 .../sources/paths/policies/subject.yml        |   6 +-
 .../sources/paths/policies/subjects.yml       |   4 +-
 .../sources/paths/things/attribute.yml        |   8 +-
 .../sources/paths/things/attributes.yml       |   8 +-
 .../sources/paths/things/definition.yml       |   8 +-
 .../openapi/sources/paths/things/policyId.yml |  10 +-
 .../openapi/sources/paths/things/thing.yml    |   6 +-
 .../sources/requests/dittoProtocol.yml        |   2 +-
 .../sources/schemas/wot-thingDescription.yml  |   2 +-
 .../resources/pages/ditto/basic-errors.md     |   2 +-
 .../ditto/basic-wot-integration-example.md    |   4 +-
 .../resources/pages/ditto/client-sdk-java.md  |  12 +-
 .../exceptions/policies_id_invalid.md         |   2 +-
 .../generated/exceptions/things_id_invalid.md |   2 +-
 .../pages/ditto/release_notes_080M2.md        |   2 +-
 .../pages/ditto/release_notes_100M1a.md       |   2 +-
 .../2018_02_07-virtualiot-meetup/index.html   |  20 +--
 .../2018_05_23-meetup-iot-hessen/index.html   |  20 +--
 .../index.html                                |   2 +-
 .../index.html                                |   2 +-
 .../index.html                                |  12 +-
 .../index.html                                |   4 +-
 .../index.html                                |   4 +-
 .../index.html                                |  14 +-
 .../2021_06_ditto-20-overview/index.html      |   2 +-
 .../slides/2021_06_ditto-in-20-min/index.html |  12 +-
 .../index.html                                |   2 +-
 .../index.html                                |   2 +-
 .../slides/2022_10_ditto-and-wot/index.html   |  16 +-
 .../slides/2023_01_ditto-in-30-min/index.html |  16 +-
 .../main/resources/wot/ditto-extension.html   |   2 +-
 legal/NOTICE.md                               |   2 +-
 .../model/ThingIdInvalidException.java        |   2 +-
 .../model/PolicyIdInvalidException.java       |   2 +-
 pom.xml                                       |   4 +-
 .../things/model/ThingIdInvalidException.java |   2 +-
 things/service/src/main/resources/things.conf |   4 +-
 .../connections/connectionTemplates.json      |   2 +-
 wot/model/README.md                           |   2 +-
 .../ditto/wot/model/ThingDescriptionTest.java |   8 +-
 .../test/resources/tds/some-example.td.json   |   4 +-
 88 files changed, 319 insertions(+), 319 deletions(-)

diff --git a/NOTICE.md b/NOTICE.md
index 0f7d66929c6..d53c4ca9742 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1,6 +1,6 @@
 This content is produced and maintained by the Eclipse Ditto project.
 
-* Project home: https://www.eclipse.org/ditto
+* Project home: https://www.eclipse.dev/ditto
 
 # Trademarks
 
diff --git a/README.md b/README.md
index cc627a66e31..b5f5169f07d 100755
--- a/README.md
+++ b/README.md
@@ -13,14 +13,14 @@
 [![License](https://img.shields.io/badge/License-EPL%202.0-green.svg)](https://opensource.org/licenses/EPL-2.0)
 [![Lines of code](https://img.shields.io/badge/dynamic/xml.svg?label=Lines%20of%20code&url=https%3A%2F%2Fwww.openhub.net%2Fprojects%2Feclipse-ditto.xml%3Fapi_key%3D11ac3aa12a364fd87b461559a7eedcc53e18fb5a4cf1e43e02cb7a615f1f3d4f&query=%2Fresponse%2Fresult%2Fproject%2Fanalysis%2Ftotal_code_lines&colorB=lightgrey)](https://www.openhub.net/p/eclipse-ditto)
 
-[Eclipse Ditto](https://www.eclipse.org/ditto/)™ is a technology in the IoT implementing a software pattern called “digital twins”.  
+[Eclipse Ditto](https://www.eclipse.dev/ditto/)™ is a technology in the IoT implementing a software pattern called “digital twins”.  
 A digital twin is a virtual, cloud based, representation of his real world counterpart (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations, …).
 
 An ever growing list of [adopters](https://iot.eclipse.org/adopters/?#iot.ditto) makes use of Ditto as part of their IoT platforms - if you're as well using it, it would be super nice to show your [adoption here](https://iot.eclipse.org/adopters/how-to-be-listed-as-an-adopter/).
 
 ## Documentation
 
-Find the documentation on the project site: [https://www.eclipse.org/ditto/](https://www.eclipse.org/ditto/)
+Find the documentation on the project site: [https://www.eclipse.dev/ditto/](https://www.eclipse.dev/ditto/)
 
 ## Eclipse Ditto™ explorer UI
 
@@ -58,7 +58,7 @@ docker-compose logs -f
 ```
 
 Open following URL to get started: [http://localhost:8080](http://localhost:8080)<br/>
-Or have a look at the ["Hello World"](https://www.eclipse.org/ditto/intro-hello-world.html)
+Or have a look at the ["Hello World"](https://www.eclipse.dev/ditto/intro-hello-world.html)
 
 Additional [deployment options](deployment/) are also available, if Docker Compose is not what you want to use.
 
diff --git a/RELEASE.md b/RELEASE.md
index 406b6573eba..cc93d5667b0 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -14,10 +14,10 @@ Ditto releases are tracked and planned here: https://projects.eclipse.org/projec
       * First close the staging repo (after all artifacts are there, e.g. also the client artifacts)
       * Then release the staging repo
       * Then it will take a few hours until those changes are synced successfully to Maven central
-* Write Release notes, e.g. like for 3.1.0: https://www.eclipse.org/ditto/release_notes_310.html
+* Write Release notes, e.g. like for 3.1.0: https://www.eclipse.dev/ditto/release_notes_310.html
    * New features, changes, bug fixes to last release / milestone release
    * Add migration notes (if there are any)
-* Write a Blog post announcement, e.g. like for: https://www.eclipse.org/ditto/2022-12-16-release-announcement-310.html
+* Write a Blog post announcement, e.g. like for: https://www.eclipse.dev/ditto/2022-12-16-release-announcement-310.html
 * Close GitHub milestone (and assign all Issues/PRs which were still included in that milestone): https://github.com/eclipse-ditto/ditto/milestones
 * Create a GitHub release: https://github.com/eclipse-ditto/ditto/releases (based on the Tags which was pushed during release job)
 * Write a mail to the "ditto-dev" mailing list
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/acks/AcknowledgementLabelInvalidException.java b/base/model/src/main/java/org/eclipse/ditto/base/model/acks/AcknowledgementLabelInvalidException.java
index 8dbc94eed48..03f40f04390 100644
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/acks/AcknowledgementLabelInvalidException.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/acks/AcknowledgementLabelInvalidException.java
@@ -19,12 +19,12 @@
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.NotThreadSafe;
 
-import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.json.JsonObject;
 
 /**
  * Thrown if an AcknowledgementLabel is not valid, for example because it did not comply to the AcknowledgmentLabel
@@ -48,7 +48,7 @@ public final class AcknowledgementLabelInvalidException extends DittoRuntimeExce
             "An acknowledgement label must conform to the regular expression of Ditto documentation.";
 
     private static final URI DEFAULT_HREF = URI.create(
-            "https://www.eclipse.org/ditto/protocol-specification-topic.html#acknowledgement-criterion-actions");
+            "https://www.eclipse.dev/ditto/protocol-specification-topic.html#acknowledgement-criterion-actions");
 
     private static final long serialVersionUID = -2385649293006205966L;
 
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/NamespacedEntityIdInvalidException.java b/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/NamespacedEntityIdInvalidException.java
index 4843ff97940..da4d16a030a 100644
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/NamespacedEntityIdInvalidException.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/NamespacedEntityIdInvalidException.java
@@ -56,7 +56,7 @@ public final class NamespacedEntityIdInvalidException extends EntityIdInvalidExc
                     "length of 256 characters.";
 
     private static final URI DEFAULT_HREF =
-            URI.create("https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id");
+            URI.create("https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id");
 
     private static final long serialVersionUID = -8903476318490123234L;
 
diff --git a/connectivity/service/src/main/resources/javascript/incoming-mapping.js b/connectivity/service/src/main/resources/javascript/incoming-mapping.js
index d85f3c61cbf..b9f6beeda01 100644
--- a/connectivity/service/src/main/resources/javascript/incoming-mapping.js
+++ b/connectivity/service/src/main/resources/javascript/incoming-mapping.js
@@ -19,7 +19,7 @@ function mapToDittoProtocolMsg(
   // ### Insert/adapt your mapping logic here.
   // Use helper function Ditto.buildDittoProtocolMsg to build Ditto protocol message
   // based on incoming payload.
-  // See https://www.eclipse.org/ditto/connectivity-mapping.html#helper-functions for details.
+  // See https://www.eclipse.dev/ditto/connectivity-mapping.html#helper-functions for details.
 
   // ### example code assuming the Ditto protocol content type for incoming messages.
   if (contentType === 'application/vnd.eclipse.ditto+json') {
diff --git a/deployment/docker/README.md b/deployment/docker/README.md
index 87631e977a9..ffc4874e221 100755
--- a/deployment/docker/README.md
+++ b/deployment/docker/README.md
@@ -49,7 +49,7 @@ curl http://devops:foobar@localhost:8080/devops/config/gateway/?path=ditto
 ```
 
 Or by going through the configuration files in this repository, all available configuration files are 
-[linked here](https://www.eclipse.org/ditto/installation-operating.html#ditto-configuration).
+[linked here](https://www.eclipse.dev/ditto/installation-operating.html#ditto-configuration).
 
 ## Start Eclipse Ditto
 
diff --git a/deployment/docker/sandbox/html/index.html b/deployment/docker/sandbox/html/index.html
index 4bcc6313894..cd904d960fe 100644
--- a/deployment/docker/sandbox/html/index.html
+++ b/deployment/docker/sandbox/html/index.html
@@ -105,7 +105,7 @@ <h1><img src="./images/ditto.svg" class="ditto-logo" alt="Eclipse Ditto logo"> -
             API</a>.<br/> The Swagger UI for exploring the API will require authentication.
         </p>
         <p>
-            Visit the Eclipse Ditto <a href="https://www.eclipse.org/ditto/intro-overview.html">documentation</a> in
+            Visit the Eclipse Ditto <a href="https://www.eclipse.dev/ditto/intro-overview.html">documentation</a> in
             order to learn more about the project.
         </p>
         <p>
diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index e743c2776d3..131bd3ae794 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 0.0.2  # chart version is set by release-job
+version: 0.0.4  # chart version is set by release-job
 appVersion: 3.2.1
 keywords:
   - iot-chart
@@ -25,7 +25,7 @@ keywords:
 home: https://www.eclipse.org/ditto
 sources:
   - https://github.com/eclipse-ditto/ditto
-icon: https://www.eclipse.org/ditto/images/ditto.svg
+icon: https://www.eclipse.dev/ditto/images/ditto.svg
 maintainers:
   - name: thjaeckle
     email: thomas.jaeckle@beyonnex.io
diff --git a/deployment/helm/ditto/README.md b/deployment/helm/ditto/README.md
index 4212a7c4f82..631852cb0bb 100644
--- a/deployment/helm/ditto/README.md
+++ b/deployment/helm/ditto/README.md
@@ -2,7 +2,7 @@
 
 ## Introduction
 
-[Eclipse Ditto™](https://www.eclipse.org/ditto/) is a technology in the IoT implementing a software pattern
+[Eclipse Ditto™](https://www.eclipse.dev/ditto/) is a technology in the IoT implementing a software pattern
 called “digital twins”. A digital twin is a virtual, cloud based, representation of his real world counterpart
 (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations, …).
 
diff --git a/deployment/helm/ditto/ci/ci-workflow-values.yaml b/deployment/helm/ditto/ci/ci-workflow-values.yaml
index 6e1b99504cf..f47e2e3a19c 100644
--- a/deployment/helm/ditto/ci/ci-workflow-values.yaml
+++ b/deployment/helm/ditto/ci/ci-workflow-values.yaml
@@ -27,7 +27,7 @@ ingress:
 
 ## ----------------------------------------------------------------------------
 ## policies configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-policies.html
 policies:
   resources:
     cpu: 0.15
@@ -38,7 +38,7 @@ policies:
 
 ## ----------------------------------------------------------------------------
 ## things configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things.html
 things:
   resources:
     cpu: 0.15
@@ -49,7 +49,7 @@ things:
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things-search.html
 thingsSearch:
   resources:
     cpu: 0.15
@@ -60,7 +60,7 @@ thingsSearch:
 
 ## ----------------------------------------------------------------------------
 ## connectivity configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-connectivity.html
 connectivity:
   resources:
     cpu: 0.15
@@ -71,7 +71,7 @@ connectivity:
 
 ## ----------------------------------------------------------------------------
 ## gateway configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-gateway.html
 gateway:
   resources:
     cpu: 0.15
diff --git a/deployment/helm/ditto/local-values.yaml b/deployment/helm/ditto/local-values.yaml
index c58ad3f1c86..9523f26b631 100644
--- a/deployment/helm/ditto/local-values.yaml
+++ b/deployment/helm/ditto/local-values.yaml
@@ -25,7 +25,7 @@ global:
 
 ## ----------------------------------------------------------------------------
 ## policies configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-policies.html
 policies:
   resources:
     cpu: 0.2
@@ -43,7 +43,7 @@ policies:
 
 ## ----------------------------------------------------------------------------
 ## things configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things.html
 things:
   resources:
     cpu: 0.2
@@ -61,7 +61,7 @@ things:
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things-search.html
 thingsSearch:
   resources:
     cpu: 0.2
@@ -72,7 +72,7 @@ thingsSearch:
 
 ## ----------------------------------------------------------------------------
 ## connectivity configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-connectivity.html
 connectivity:
   resources:
     cpu: 0.2
@@ -83,7 +83,7 @@ connectivity:
 
 ## ----------------------------------------------------------------------------
 ## gateway configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-gateway.html
 gateway:
   resources:
     cpu: 0.2
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index f3beb5ad686..182190f6fb6 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -61,7 +61,7 @@ global:
   hashedBasicAuthUsers: []
   # jwtOnly controls whether only OpenID-Connect authentication is supported
   #  if false, both OpenID-Connect and basicAuth via nginx (see above "basicAuthUsers" and "hashedBasicAuthUsers") is used
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#openid-connect
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#openid-connect
   jwtOnly: true
   # jvmOptions defines the JVM options applied to all Ditto services running in the JVM, it is put in JAVA_TOOL_OPTIONS
   jvmOptions: >
@@ -370,7 +370,7 @@ akka:
 
 ## ----------------------------------------------------------------------------
 ## policies configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-policies.html
 policies:
   # enabled controls whether policies related resources should be created
   enabled: true
@@ -401,7 +401,7 @@ policies:
   # additionalJvmOptions JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for policies service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to policies container
   extraEnv:
@@ -552,7 +552,7 @@ policies:
 
 ## ----------------------------------------------------------------------------
 ## things configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-things.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-things.html
 things:
   # enabled controls whether things related resources should be created
   enabled: true
@@ -583,7 +583,7 @@ things:
   # additionalJvmOptions JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for things service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to things container
   extraEnv:
@@ -751,12 +751,12 @@ things:
             }
           },
           "security": "basic_sc",
-          "support": "https://www.eclipse.org/ditto/"
+          "support": "https://www.eclipse.dev/ditto/"
         }
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-things-search.html
 thingsSearch:
   # enabled controls whether things-search related resources should be created
   enabled: true
@@ -787,7 +787,7 @@ thingsSearch:
   # additional JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for things-search service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to things-search container
   extraEnv:
@@ -870,7 +870,7 @@ thingsSearch:
       #  one of: unacknowledged | acknowledged | majority | journaled | w1 | w2 | w3
       searchWriteConcern: "acknowledged"
       # searchWithAcksWriteConcern configures the MongoDB write concern for commands sent with "search-persisted" ACK
-      #  ref: https://www.eclipse.org/ditto/basic-acknowledgements.html#built-in-acknowledgement-labels
+      #  ref: https://www.eclipse.dev/ditto/basic-acknowledgements.html#built-in-acknowledgement-labels
       #  one of: unacknowledged | acknowledged | majority | journaled | w1 | w2 | w3
       searchWithAcksWriteConcern: "majority"
       # queryReadConcern configures the MongoDB read concern for doing queries / performing searches
@@ -936,7 +936,7 @@ thingsSearch:
 
 ## ----------------------------------------------------------------------------
 ## connectivity configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-connectivity.html
 connectivity:
   # enabled controls whether connectivity related resources should be created
   enabled: true
@@ -967,7 +967,7 @@ connectivity:
   # additional JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for connectivity service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to connectivity container
   extraEnv:
@@ -1174,7 +1174,7 @@ connectivity:
 
 ## ----------------------------------------------------------------------------
 ## gateway configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-gateway.html
 gateway:
   # enabled controls whether gateway related resources should be created
   enabled: true
@@ -1205,7 +1205,7 @@ gateway:
     # pullPolicy for the gateway docker image
     pullPolicy: IfNotPresent
   # systemProps used to define arbitrary system properties configuration for gateway
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
     - "-Dditto.protocol.blocklist.0=raw-request-uri"
     - "-Dditto.protocol.blocklist.1=cache-control"
@@ -1302,7 +1302,7 @@ gateway:
     # authentication contains the settings regarding authentication against the gateway
     authentication:
       # enablePreAuthentication whether Ditto "pre-authentication" should be enabled
-      #  ref: https://www.eclipse.org/ditto/installation-operating.html#pre-authentication
+      #  ref: https://www.eclipse.dev/ditto/installation-operating.html#pre-authentication
       enablePreAuthentication: false
       # oauth contains the OAuth2.0 / OpenID Connect related configuration
       oauth:
diff --git a/deployment/kubernetes/README.md b/deployment/kubernetes/README.md
index 4f34d10311f..351e404874f 100644
--- a/deployment/kubernetes/README.md
+++ b/deployment/kubernetes/README.md
@@ -53,7 +53,7 @@ In case you already have a MongoDB in the cloud or elsewhere it is possible to c
 This can be done by setting the MongoDB URI via env variable "MONGO_DB_URI" in the 
 `deployment/kubernetes/deploymentFiles/ditto/ditto-cluster.yml` for all services except the `gateway`.
 Other MongoDB settings can be set via env variables and are documented in
-[Operating Ditto](https://www.eclipse.org/ditto/installation-operating.html) section.
+[Operating Ditto](https://www.eclipse.dev/ditto/installation-operating.html) section.
 
 In case your "MONGO_DB_URI" contains sensitive information like username and password it is recommended to use
 a kubernetes secret. 
diff --git a/deployment/openshift/nginx/index.html b/deployment/openshift/nginx/index.html
index d836b023218..d2c8839941d 100644
--- a/deployment/openshift/nginx/index.html
+++ b/deployment/openshift/nginx/index.html
@@ -41,7 +41,7 @@
   <h1>You have started Eclipse Ditto</h1>
   <div>
     <p>Thank you for trying out Eclipse Ditto!</p>
-    <p>In order to get started quickly, you can now have a look at the <a href="https://www.eclipse.org/ditto/index.html">documentation</a>
+    <p>In order to get started quickly, you can now have a look at the <a href="https://www.eclipse.dev/ditto/index.html">documentation</a>
 
     <p>To authenticate at the HTTP APIs use the following username "ditto" and password "ditto" when asked for by your browser.</p>
 
diff --git a/documentation/README.md b/documentation/README.md
index 878139c3b34..eb0cc54181d 100755
--- a/documentation/README.md
+++ b/documentation/README.md
@@ -1,6 +1,6 @@
 ## Eclipse Ditto :: Documentation
 
-This folder contains the documentation and [static website of Eclipse Ditto](https://www.eclipse.org/ditto/).
+This folder contains the documentation and [static website of Eclipse Ditto](https://www.eclipse.dev/ditto/).
 
 The documentation is based on [Jekyll](https://jekyllrb.com) and the fabulous [Jekyll Documentation Theme 6.0](http://idratherbewriting.com/documentation-theme-jekyll/).
 
diff --git a/documentation/src/main/resources/_includes/head.html b/documentation/src/main/resources/_includes/head.html
index 89e575f0cde..f85c61837f4 100644
--- a/documentation/src/main/resources/_includes/head.html
+++ b/documentation/src/main/resources/_includes/head.html
@@ -24,8 +24,8 @@
 {
   "@context": "http://schema.org",
   "@type": "Organization",
-  "url": "https://www.eclipse.org/ditto/",
-  "logo": "https://www.eclipse.org/ditto/images/ditto.svg"
+  "url": "https://www.eclipse.dev/ditto/",
+  "logo": "https://www.eclipse.dev/ditto/images/ditto.svg"
 }
 </script>
 
diff --git a/documentation/src/main/resources/_posts/2018-01-15-example-demonstrating-rest-to-websocket.md b/documentation/src/main/resources/_posts/2018-01-15-example-demonstrating-rest-to-websocket.md
index 62e96d14bc3..c29a55e1037 100644
--- a/documentation/src/main/resources/_posts/2018-01-15-example-demonstrating-rest-to-websocket.md
+++ b/documentation/src/main/resources/_posts/2018-01-15-example-demonstrating-rest-to-websocket.md
@@ -15,7 +15,7 @@ over at the [Eclipse Ditto examples repository](https://github.com/eclipse-ditto
 Right from the project's description:
 
 >This example shows how to leverage the powers of combining the REST and
- WebSocket Messages API of [Eclipse Ditto](https://www.eclipse.org/ditto/).
+ WebSocket Messages API of [Eclipse Ditto](https://www.eclipse.dev/ditto/).
  It demonstrates how to send direct Messages to a *live* Thing, as well as
  updating the *twin* representation of a Thing inside Ditto.
 <br/> 
@@ -35,7 +35,7 @@ caption="Source: https://github.com/eclipse-ditto/ditto-examples" %}
 
 If you have any wishes, improvements, are missing something
 or just want to get in touch with us, you can use one of
-our [feedback channels](https://www.eclipse.org/ditto/feedback.html).
+our [feedback channels](https://www.eclipse.dev/ditto/feedback.html).
 
 {% include image.html file="ditto.svg" alt="Ditto" max-width=500 %}
 --<br/>
diff --git a/documentation/src/main/resources/_posts/2018-10-16-example-mqtt-bidirectional.md b/documentation/src/main/resources/_posts/2018-10-16-example-mqtt-bidirectional.md
index 569cb507301..8a0e6f38848 100644
--- a/documentation/src/main/resources/_posts/2018-10-16-example-mqtt-bidirectional.md
+++ b/documentation/src/main/resources/_posts/2018-10-16-example-mqtt-bidirectional.md
@@ -50,7 +50,7 @@ caption="Source: https://github.com/eclipse-ditto/ditto-examples" %}
 
 If you have any wishes, improvements, are missing something
 or just want to get in touch with us, you can use one of
-our [feedback channels](https://www.eclipse.org/ditto/feedback.html).
+our [feedback channels](https://www.eclipse.dev/ditto/feedback.html).
 
 
 {% include image.html file="ditto.svg" alt="Ditto" max-width=500 %}
diff --git a/documentation/src/main/resources/_posts/2021-03-22-azure-iot-hub-integration.md b/documentation/src/main/resources/_posts/2021-03-22-azure-iot-hub-integration.md
index 7e88a7627a1..eafa8097716 100644
--- a/documentation/src/main/resources/_posts/2021-03-22-azure-iot-hub-integration.md
+++ b/documentation/src/main/resources/_posts/2021-03-22-azure-iot-hub-integration.md
@@ -77,7 +77,7 @@ and represents the actual use of Ditto as a  northbound service.*
   ]
 }
 ```
-- [Further information on creating connections](https://www.eclipse.org/ditto/connectivity-manage-connections.html)
+- [Further information on creating connections](https://www.eclipse.dev/ditto/connectivity-manage-connections.html)
 
 - [Further information on D2C messaging capabilities of Azure IoT Hub](https://docs.microsoft.com/en-us/azure/iot-hub/iot-hub-devguide-messages-d2c)
 
@@ -162,9 +162,9 @@ function mapFromDittoProtocolMsg(
 }
 ```
 
-- [Further information on creating connections](https://www.eclipse.org/ditto/connectivity-manage-connections.html)
+- [Further information on creating connections](https://www.eclipse.dev/ditto/connectivity-manage-connections.html)
 
-- [Further information on payload-mapping](https://www.eclipse.org/ditto/connectivity-mapping.html)
+- [Further information on payload-mapping](https://www.eclipse.dev/ditto/connectivity-mapping.html)
 
 - [Further information on C2D messaging capabilities of Azure IoT Hub](https://docs.microsoft.com/de-de/azure/iot-hub/iot-hub-devguide-messages-c2d)
 
diff --git a/documentation/src/main/resources/jsonschema/policy.json b/documentation/src/main/resources/jsonschema/policy.json
index cd627629c3a..b532c491e75 100644
--- a/documentation/src/main/resources/jsonschema/policy.json
+++ b/documentation/src/main/resources/jsonschema/policy.json
@@ -6,7 +6,7 @@
   "properties": {
     "policyId": {
       "type": "string",
-      "description": "Unique identifier representing the policy, has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).\n\nExamples for a valid policy ID:\n * `org.eclipse.ditto:xdk_policy_53`\n * `foo:xdk_53`\n * `org.eclipse.vorto_42:xdk_policy`"
+      "description": "Unique identifier representing the policy, has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).\n\nExamples for a valid policy ID:\n * `org.eclipse.ditto:xdk_policy_53`\n * `foo:xdk_53`\n * `org.eclipse.vorto_42:xdk_policy`"
     },
     "imports": {
       "title": "PolicyImports",
diff --git a/documentation/src/main/resources/jsonschema/protocol-search-subscribe-payload.json b/documentation/src/main/resources/jsonschema/protocol-search-subscribe-payload.json
index 51ea62f7e6a..d395fc6f365 100644
--- a/documentation/src/main/resources/jsonschema/protocol-search-subscribe-payload.json
+++ b/documentation/src/main/resources/jsonschema/protocol-search-subscribe-payload.json
@@ -6,11 +6,11 @@
   "properties": {
     "filter": {
       "type": "string",
-      "description": "[RQL filter expression](https://www.eclipse.org/ditto/basic-rql.html#rql-filter) to select for things."
+      "description": "[RQL filter expression](https://www.eclipse.dev/ditto/basic-rql.html#rql-filter) to select for things."
     },
     "options": {
       "type": "string",
-      "description": "Specify the page size with `size(PAGE_SIZE)`, or the order of the search results by `sort(<+|-><property>)` (see [RQL sorting](https://www.eclipse.org/ditto/basic-rql.html#rql-sorting)).",
+      "description": "Specify the page size with `size(PAGE_SIZE)`, or the order of the search results by `sort(<+|-><property>)` (see [RQL sorting](https://www.eclipse.dev/ditto/basic-rql.html#rql-sorting)).",
       "examples": ["size(25)", "sort(+_modified,-thingId)"]
     },
     "namespaces": {
diff --git a/documentation/src/main/resources/jsonschema/thing_v2.json b/documentation/src/main/resources/jsonschema/thing_v2.json
index d7ef22efbdf..8c08fc09bea 100644
--- a/documentation/src/main/resources/jsonschema/thing_v2.json
+++ b/documentation/src/main/resources/jsonschema/thing_v2.json
@@ -6,11 +6,11 @@
   "properties": {
     "thingId": {
       "type": "string",
-      "description": "Unique identifier representing the thing, has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).\n\nExamples for a valid thing ID:\n * `org.eclipse.ditto:xdk_53`\n * `foo:xdk_53`\n * `org.eclipse.vorto_42:xdk_thing`"
+      "description": "Unique identifier representing the thing, has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).\n\nExamples for a valid thing ID:\n * `org.eclipse.ditto:xdk_53`\n * `foo:xdk_53`\n * `org.eclipse.vorto_42:xdk_thing`"
     },
     "policyId": {
       "type": "string",
-      "description": "Links to the ID of an existing Policy which contains the authorization information applied for this thing. The policy ID has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))."
+      "description": "Links to the ID of an existing Policy which contains the authorization information applied for this thing. The policy ID has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))."
     },
     "definition": {
       "title": "Definition",
diff --git a/documentation/src/main/resources/openapi/ditto-api-2.yml b/documentation/src/main/resources/openapi/ditto-api-2.yml
index a62645111b5..5c3f0d90c9e 100644
--- a/documentation/src/main/resources/openapi/ditto-api-2.yml
+++ b/documentation/src/main/resources/openapi/ditto-api-2.yml
@@ -257,7 +257,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * at least one of the defined query parameters is invalid
           content:
             application/json:
@@ -390,7 +390,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON body of the thing to be created/modified is invalid
               * the JSON body of the thing to be created/modified contains a `thingId`
               which does not match the ID in the path
@@ -709,7 +709,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -784,7 +784,7 @@ paths:
             The request could not be completed. Possible reasons:
 
             * the `thingId` does not conform to the namespaced entity ID notation
-            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -863,7 +863,7 @@ paths:
             The request could not be completed. Possible reasons:
 
               * the `thingId` does not conform to the namespaced entity ID notation
-                (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+                (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON was invalid
               * the request body was not a JSON object.
           content:
@@ -937,7 +937,7 @@ paths:
             The request could not be completed. Possible reasons:
 
               * the `thingId` does not conform to the namespaced entity ID notation
-                (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+                (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON was invalid
               * the request body was not a JSON object.
           content:
@@ -1007,7 +1007,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. The `thingId` does not conform to the namespaced entity ID notation
-            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1080,7 +1080,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1135,7 +1135,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -1170,7 +1170,7 @@ paths:
           The policy is used for controlling access to this thing. It is managed by
           resource `/policies/{policyId}`.
 
-          The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
         required: true
     patch:
       summary: Patch the policy ID of a thing
@@ -1208,7 +1208,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the `policyId` can not be removed from a thing.
           content:
             application/json:
@@ -1241,7 +1241,7 @@ paths:
         description: |-
           The policy is used for controlling access to this thing. It is managed by resource `/policies/{policyId}`.
 
-          The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
         required: true
   '/api/2/things/{thingId}/attributes':
     get:
@@ -1288,7 +1288,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-            * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+            * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -1357,7 +1357,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the attributes to be created/modified is invalid
           content:
             application/json:
@@ -1430,7 +1430,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the attributes to be patched is invalid
           content:
             application/json:
@@ -1503,7 +1503,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1581,7 +1581,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1657,7 +1657,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1735,7 +1735,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1797,7 +1797,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1885,7 +1885,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined query parameters is invalid.
           content:
             application/json:
@@ -1991,7 +1991,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the feature to be created/modified is invalid
           content:
             application/json:
@@ -2121,7 +2121,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the feature to be created/modified is invalid
           content:
             application/json:
@@ -2199,7 +2199,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -2281,7 +2281,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined query parameters is invalid.
           content:
             application/json:
@@ -2372,7 +2372,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the feature to be created/modified is invalid
           content:
             application/json:
@@ -2479,7 +2479,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the feature to be created/modified is invalid
           content:
             application/json:
@@ -2554,7 +2554,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -2629,7 +2629,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined query parameters is invalid.
           content:
             application/json:
@@ -2703,7 +2703,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body is invalid
           content:
             application/json:
@@ -2788,7 +2788,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body is invalid
           content:
             application/json:
@@ -2856,7 +2856,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -2933,7 +2933,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined query parameters is invalid.
           content:
             application/json:
@@ -3002,7 +3002,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the feature properties to be created/modified is invalid
           content:
             application/json:
@@ -3097,7 +3097,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the feature properties to be created/modified is invalid
           content:
             application/json:
@@ -3173,7 +3173,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -3253,7 +3253,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -3324,7 +3324,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body is invalid
           content:
             application/json:
@@ -3404,7 +3404,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body is invalid
           content:
             application/json:
@@ -3468,7 +3468,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -3545,7 +3545,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined query parameters is invalid.
           content:
             application/json:
@@ -3614,7 +3614,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the desired feature roperties to be created/modified is invalid
           content:
             application/json:
@@ -3709,7 +3709,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the desired feature roperties to be created/modified is invalid
           content:
             application/json:
@@ -3785,7 +3785,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -3866,7 +3866,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -3938,7 +3938,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body is invalid
           content:
             application/json:
@@ -4017,7 +4017,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body is invalid
           content:
             application/json:
@@ -4084,7 +4084,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -4147,7 +4147,7 @@ paths:
         No special permission is required to issue a claim message.
 
         ### Example
-        See [Claiming](https://www.eclipse.org/ditto/protocol-specification-things-messages.html#sending-and-handling-claim-messages) concept in detail and example in GitHub.
+        See [Claiming](https://www.eclipse.dev/ditto/protocol-specification-things-messages.html#sending-and-handling-claim-messages) concept in detail and example in GitHub.
         However, in that scenario, the policy should grant you READ and WRITE permission on
         the "message:/" resource in order to be able to send the message and read the response.
         Further, the things-client which handles the "claim" message, needs permission to change the policy itself
@@ -4173,7 +4173,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined path parameters is invalid
           content:
             application/json:
@@ -4264,7 +4264,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined path parameters is invalid
           content:
             application/json:
@@ -4346,7 +4346,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined path parameters is invalid.
           content:
             application/json:
@@ -4432,7 +4432,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined path parameters is invalid.
           content:
             application/json:
@@ -4516,7 +4516,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined path parameters is valid.
           content:
             application/json:
@@ -4604,7 +4604,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -4734,7 +4734,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON body of the policy to be created/modified is invalid
           content:
             application/json:
@@ -4827,7 +4827,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -4979,7 +4979,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5031,7 +5031,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON body of the policy to be created/modified is invalid
           content:
             application/json:
@@ -5133,7 +5133,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5204,7 +5204,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
             * the JSON body of the policy entry to be created/modified is invalid
           content:
             application/json:
@@ -5319,7 +5319,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5471,7 +5471,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-               * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+               * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5536,7 +5536,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-               * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+               * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
              * the JSON body of the policy subjects to be created/modified is invalid
           content:
             application/json:
@@ -5619,7 +5619,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5688,7 +5688,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)))
             * the JSON body of the policy subject to be created/modified is invalid.
           content:
             application/json:
@@ -5757,7 +5757,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5824,7 +5824,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5924,7 +5924,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON is invalid, or no valid Resources JSON object.
           content:
             application/json:
@@ -6004,7 +6004,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -6076,7 +6076,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-             * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+             * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON is invalid, or no valid Resource JSON object.
           content:
             application/json:
@@ -6141,7 +6141,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -6206,7 +6206,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -6265,7 +6265,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON body of the policy imports to be created/modified is invalid
           content:
             application/json:
@@ -6354,7 +6354,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -6437,7 +6437,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON body of the policy import to be created/modified is invalid
           content:
             application/json:
@@ -6511,7 +6511,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -6726,11 +6726,11 @@ paths:
       summary: Processes a CloudEvent sent in Ditto Protocol
       description: |-
         Provides an endpoint accepting [CloudEvents via its HTTP protocol binding](https://github.com/cloudevents/spec/blob/v1.0/http-protocol-binding.md)
-        in [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html).
+        in [Ditto Protocol JSON](https://www.eclipse.dev/ditto/protocol-specification.html).
 
         The endpoint can also directly be configured as a [Knative eventing](https://knative.dev/docs/eventing/) destination.
 
-        Find more documentation on that [here](https://www.eclipse.org/ditto/httpapi-protocol-bindings-cloudevents.html).
+        Find more documentation on that [here](https://www.eclipse.dev/ditto/httpapi-protocol-bindings-cloudevents.html).
       tags:
         - CloudEvents
       parameters:
@@ -6784,7 +6784,7 @@ paths:
             The request could not be completed. Possible reasons:
               * the CloudEvent could not be parsed as some mandatory CloudEvent headers were missing from the request
               * the payload was missing from the CloudEvent
-              * the [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html) message could not be parsed or was missing a required field
+              * the [Ditto Protocol JSON](https://www.eclipse.dev/ditto/protocol-specification.html) message could not be parsed or was missing a required field
           content:
             application/json:
               schema:
@@ -6870,7 +6870,7 @@ paths:
                 attributes:
                   foo: 42
         description: |-
-          The [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html) payload defining which
+          The [Ditto Protocol JSON](https://www.eclipse.dev/ditto/protocol-specification.html) payload defining which
           command to process.
   /api/2/connections:
     get:
@@ -8277,7 +8277,7 @@ components:
       name: importedPolicyId
       in: path
       description: |-
-        The ID of the imported policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+        The ID of the imported policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
 
         The namespace needs to:
         * conform to the reverse domain name notation
@@ -8421,7 +8421,7 @@ components:
       name: policyId
       in: path
       description: |-
-        The ID of the policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+        The ID of the policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
 
         The namespace needs to:
         * conform to the reverse domain name notation
@@ -8684,7 +8684,7 @@ components:
     ThingIdPathParam:
       name: thingId
       in: path
-      description: 'The ID of a thing needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).'
+      description: 'The ID of a thing needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).'
       required: true
       schema:
         type: string
@@ -10101,7 +10101,7 @@ components:
         support:
           type: string
           format: iri-reference
-          example: 'https://www.eclipse.org/ditto/'
+          example: 'https://www.eclipse.dev/ditto/'
         created:
           type: string
           format: date-time
diff --git a/documentation/src/main/resources/openapi/sources/parameters/importedPolicyIdPathParam.yml b/documentation/src/main/resources/openapi/sources/parameters/importedPolicyIdPathParam.yml
index eb29b07dce0..2a597f9de8f 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/importedPolicyIdPathParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/importedPolicyIdPathParam.yml
@@ -11,7 +11,7 @@
 name: importedPolicyId
 in: path
 description: |-
-  The ID of the imported policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+  The ID of the imported policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
 
   The namespace needs to:
   * conform to the reverse domain name notation
diff --git a/documentation/src/main/resources/openapi/sources/parameters/policyIdPathParam.yml b/documentation/src/main/resources/openapi/sources/parameters/policyIdPathParam.yml
index f64e0fe3e96..82ad626a9ab 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/policyIdPathParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/policyIdPathParam.yml
@@ -11,7 +11,7 @@
 name: policyId
 in: path
 description: |-
-  The ID of the policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+  The ID of the policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
 
   The namespace needs to:
   * conform to the reverse domain name notation
diff --git a/documentation/src/main/resources/openapi/sources/parameters/thingIdPathParam.yml b/documentation/src/main/resources/openapi/sources/parameters/thingIdPathParam.yml
index c5dfac57665..8a406359e1c 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/thingIdPathParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/thingIdPathParam.yml
@@ -11,7 +11,7 @@
 name: thingId
 in: path
 description: |-
-  The ID of a thing needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+  The ID of a thing needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
 required: true
 schema:
   type: string
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/paths/cloudevents/cloudevents.yml b/documentation/src/main/resources/openapi/sources/paths/cloudevents/cloudevents.yml
index b333e4925dc..b0f2482a06f 100644
--- a/documentation/src/main/resources/openapi/sources/paths/cloudevents/cloudevents.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/cloudevents/cloudevents.yml
@@ -12,11 +12,11 @@ post:
   summary: Processes a CloudEvent sent in Ditto Protocol
   description: |-
     Provides an endpoint accepting [CloudEvents via its HTTP protocol binding](https://github.com/cloudevents/spec/blob/v1.0/http-protocol-binding.md)
-    in [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html).
+    in [Ditto Protocol JSON](https://www.eclipse.dev/ditto/protocol-specification.html).
 
     The endpoint can also directly be configured as a [Knative eventing](https://knative.dev/docs/eventing/) destination.
 
-    Find more documentation on that [here](https://www.eclipse.org/ditto/httpapi-protocol-bindings-cloudevents.html).
+    Find more documentation on that [here](https://www.eclipse.dev/ditto/httpapi-protocol-bindings-cloudevents.html).
   tags:
     - CloudEvents
   parameters:
@@ -71,7 +71,7 @@ post:
         The request could not be completed. Possible reasons:
           * the CloudEvent could not be parsed as some mandatory CloudEvent headers were missing from the request
           * the payload was missing from the CloudEvent
-          * the [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html) message could not be parsed or was missing a required field
+          * the [Ditto Protocol JSON](https://www.eclipse.dev/ditto/protocol-specification.html) message could not be parsed or was missing a required field
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/definition.yml b/documentation/src/main/resources/openapi/sources/paths/features/definition.yml
index d86e5571d32..db43c0dee9b 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/definition.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/definition.yml
@@ -55,7 +55,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined query parameters is invalid.
       content:
         application/json:
@@ -129,7 +129,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body is invalid
       content:
         application/json:
@@ -213,7 +213,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body is invalid
       content:
         application/json:
@@ -283,7 +283,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/desiredProperties.yml b/documentation/src/main/resources/openapi/sources/paths/features/desiredProperties.yml
index 8b2bf34577e..060c39170fb 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/desiredProperties.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/desiredProperties.yml
@@ -55,7 +55,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined query parameters is invalid.
       content:
         application/json:
@@ -124,7 +124,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the desired feature roperties to be created/modified is invalid
       content:
         application/json:
@@ -224,7 +224,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the desired feature roperties to be created/modified is invalid
       content:
         application/json:
@@ -302,7 +302,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/desiredProperty.yml b/documentation/src/main/resources/openapi/sources/paths/features/desiredProperty.yml
index c091efb15ce..d87a48d46ea 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/desiredProperty.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/desiredProperty.yml
@@ -58,7 +58,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -130,7 +130,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body is invalid
       content:
         application/json:
@@ -210,7 +210,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body is invalid
       content:
         application/json:
@@ -278,7 +278,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/feature.yml b/documentation/src/main/resources/openapi/sources/paths/features/feature.yml
index 706983cce93..4bf7ea92c81 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/feature.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/feature.yml
@@ -59,7 +59,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined query parameters is invalid.
       content:
         application/json:
@@ -150,7 +150,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the feature to be created/modified is invalid
       content:
         application/json:
@@ -258,7 +258,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the feature to be created/modified is invalid
       content:
         application/json:
@@ -334,7 +334,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/index.yml b/documentation/src/main/resources/openapi/sources/paths/features/index.yml
index ee473c370df..4fd941db96b 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/index.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/index.yml
@@ -68,7 +68,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined query parameters is invalid.
       content:
         application/json:
@@ -175,7 +175,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the feature to be created/modified is invalid
       content:
         application/json:
@@ -313,7 +313,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the feature to be created/modified is invalid
       content:
         application/json:
@@ -393,7 +393,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/properties.yml b/documentation/src/main/resources/openapi/sources/paths/features/properties.yml
index b9b97ddd21c..f82425052a1 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/properties.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/properties.yml
@@ -55,7 +55,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined query parameters is invalid.
       content:
         application/json:
@@ -124,7 +124,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the feature properties to be created/modified is invalid
       content:
         application/json:
@@ -223,7 +223,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the feature properties to be created/modified is invalid
       content:
         application/json:
@@ -301,7 +301,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/property.yml b/documentation/src/main/resources/openapi/sources/paths/features/property.yml
index 29c772ea275..1c048d2d73e 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/property.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/property.yml
@@ -57,7 +57,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -128,7 +128,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body is invalid
 
       content:
@@ -210,7 +210,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body is invalid
       content:
         application/json:
@@ -275,7 +275,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/messages/feature-inbox-message.yml b/documentation/src/main/resources/openapi/sources/paths/messages/feature-inbox-message.yml
index 86056d8be2a..0e3e5b7059c 100644
--- a/documentation/src/main/resources/openapi/sources/paths/messages/feature-inbox-message.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/messages/feature-inbox-message.yml
@@ -49,7 +49,7 @@ post:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined path parameters is invalid.
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/messages/feature-outbox-message.yml b/documentation/src/main/resources/openapi/sources/paths/messages/feature-outbox-message.yml
index df4ef3c19f1..500ad28fc8e 100644
--- a/documentation/src/main/resources/openapi/sources/paths/messages/feature-outbox-message.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/messages/feature-outbox-message.yml
@@ -47,7 +47,7 @@ post:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined path parameters is valid.
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/messages/inbox-claim.yml b/documentation/src/main/resources/openapi/sources/paths/messages/inbox-claim.yml
index c4c773b8917..bdbd4c7d102 100644
--- a/documentation/src/main/resources/openapi/sources/paths/messages/inbox-claim.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/messages/inbox-claim.yml
@@ -38,7 +38,7 @@ post:
     No special permission is required to issue a claim message.
 
     ### Example
-    See [Claiming](https://www.eclipse.org/ditto/protocol-specification-things-messages.html#sending-and-handling-claim-messages) concept in detail and example in GitHub.
+    See [Claiming](https://www.eclipse.dev/ditto/protocol-specification-things-messages.html#sending-and-handling-claim-messages) concept in detail and example in GitHub.
     However, in that scenario, the policy should grant you READ and WRITE permission on
     the "message:/" resource in order to be able to send the message and read the response.
     Further, the things-client which handles the "claim" message, needs permission to change the policy itself
@@ -65,7 +65,7 @@ post:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined path parameters is invalid
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/messages/inbox-message.yml b/documentation/src/main/resources/openapi/sources/paths/messages/inbox-message.yml
index dfc2e6f0cbb..feba0626d55 100644
--- a/documentation/src/main/resources/openapi/sources/paths/messages/inbox-message.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/messages/inbox-message.yml
@@ -59,7 +59,7 @@ post:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined path parameters is invalid
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/messages/outbox-message.yml b/documentation/src/main/resources/openapi/sources/paths/messages/outbox-message.yml
index 9579ba0a848..675439b0502 100644
--- a/documentation/src/main/resources/openapi/sources/paths/messages/outbox-message.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/messages/outbox-message.yml
@@ -45,7 +45,7 @@ post:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined path parameters is invalid.
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/entries.yml b/documentation/src/main/resources/openapi/sources/paths/policies/entries.yml
index 333369f967f..17540673fd7 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/entries.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/entries.yml
@@ -42,7 +42,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -94,7 +94,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON body of the policy to be created/modified is invalid
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/entry.yml b/documentation/src/main/resources/openapi/sources/paths/policies/entry.yml
index 63758c28214..d44e867afb7 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/entry.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/entry.yml
@@ -44,7 +44,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -115,7 +115,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
         * the JSON body of the policy entry to be created/modified is invalid
       content:
         application/json:
@@ -240,7 +240,7 @@ delete:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/import.yml b/documentation/src/main/resources/openapi/sources/paths/policies/import.yml
index ca4d6301bf9..872e3f5baa9 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/import.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/import.yml
@@ -43,7 +43,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -126,7 +126,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON body of the policy import to be created/modified is invalid
       content:
         application/json:
@@ -201,7 +201,7 @@ delete:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/imports.yml b/documentation/src/main/resources/openapi/sources/paths/policies/imports.yml
index e7389096e70..65d8162a513 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/imports.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/imports.yml
@@ -41,7 +41,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -101,7 +101,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON body of the policy imports to be created/modified is invalid
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/policy.yml b/documentation/src/main/resources/openapi/sources/paths/policies/policy.yml
index 12eb9309fab..5a89d09fad9 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/policy.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/policy.yml
@@ -51,7 +51,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -181,7 +181,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON body of the policy to be created/modified is invalid
       content:
         application/json:
@@ -286,7 +286,7 @@ delete:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/resource.yml b/documentation/src/main/resources/openapi/sources/paths/policies/resource.yml
index a304b118882..1329d675f75 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/resource.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/resource.yml
@@ -45,7 +45,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -117,7 +117,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-         * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+         * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON is invalid, or no valid Resource JSON object.
       content:
         application/json:
@@ -182,7 +182,7 @@ delete:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/resources.yml b/documentation/src/main/resources/openapi/sources/paths/policies/resources.yml
index 37506c69f90..a0204f9c7ec 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/resources.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/resources.yml
@@ -42,7 +42,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -142,7 +142,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON is invalid, or no valid Resources JSON object.
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/subject.yml b/documentation/src/main/resources/openapi/sources/paths/policies/subject.yml
index 71b2ebd8e4a..b7ac7ec3cb7 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/subject.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/subject.yml
@@ -44,7 +44,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -113,7 +113,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)))
         * the JSON body of the policy subject to be created/modified is invalid.
       content:
         application/json:
@@ -182,7 +182,7 @@ delete:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/subjects.yml b/documentation/src/main/resources/openapi/sources/paths/policies/subjects.yml
index 01c6fbba26b..966821c7ea0 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/subjects.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/subjects.yml
@@ -42,7 +42,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-           * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+           * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -107,7 +107,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-           * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+           * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
          * the JSON body of the policy subjects to be created/modified is invalid
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/attribute.yml b/documentation/src/main/resources/openapi/sources/paths/things/attribute.yml
index 7e171539109..a9457fb9c59 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/attribute.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/attribute.yml
@@ -57,7 +57,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -133,7 +133,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -212,7 +212,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -275,7 +275,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/attributes.yml b/documentation/src/main/resources/openapi/sources/paths/things/attributes.yml
index b1d4c7d878e..836e9c0e0b7 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/attributes.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/attributes.yml
@@ -55,7 +55,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-        * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+        * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -125,7 +125,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the attributes to be created/modified is invalid
       content:
         application/json:
@@ -199,7 +199,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the attributes to be patched is invalid
       content:
         application/json:
@@ -274,7 +274,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/definition.yml b/documentation/src/main/resources/openapi/sources/paths/things/definition.yml
index 97f228b9e27..d32de600554 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/definition.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/definition.yml
@@ -55,7 +55,7 @@ get:
         The request could not be completed. Possible reasons:
 
         * the `thingId` does not conform to the namespaced entity ID notation
-        (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+        (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -135,7 +135,7 @@ put:
         The request could not be completed. Possible reasons:
 
           * the `thingId` does not conform to the namespaced entity ID notation
-            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON was invalid
           * the request body was not a JSON object.
       content:
@@ -210,7 +210,7 @@ patch:
         The request could not be completed. Possible reasons:
 
           * the `thingId` does not conform to the namespaced entity ID notation
-            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON was invalid
           * the request body was not a JSON object.
       content:
@@ -282,7 +282,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. The `thingId` does not conform to the namespaced entity ID notation
-        (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+        (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/policyId.yml b/documentation/src/main/resources/openapi/sources/paths/things/policyId.yml
index 3ba267d24fb..7a49713e294 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/policyId.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/policyId.yml
@@ -53,7 +53,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -108,7 +108,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -143,7 +143,7 @@ put:
       The policy is used for controlling access to this thing. It is managed by
       resource `/policies/{policyId}`.
 
-      The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+      The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
     required: true
 patch:
   summary: Patch the policy ID of a thing
@@ -181,7 +181,7 @@ patch:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the `policyId` can not be removed from a thing.
       content:
         application/json:
@@ -215,5 +215,5 @@ patch:
     description: |-
       The policy is used for controlling access to this thing. It is managed by resource `/policies/{policyId}`.
 
-      The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+      The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
     required: true
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/thing.yml b/documentation/src/main/resources/openapi/sources/paths/things/thing.yml
index 0a968cf9c8e..25c7cb290d4 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/thing.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/thing.yml
@@ -65,7 +65,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * at least one of the defined query parameters is invalid
       content:
         application/json:
@@ -200,7 +200,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON body of the thing to be created/modified is invalid
           * the JSON body of the thing to be created/modified contains a `thingId`
           which does not match the ID in the path
@@ -527,7 +527,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/requests/dittoProtocol.yml b/documentation/src/main/resources/openapi/sources/requests/dittoProtocol.yml
index 9c25a01e62d..e6642476150 100644
--- a/documentation/src/main/resources/openapi/sources/requests/dittoProtocol.yml
+++ b/documentation/src/main/resources/openapi/sources/requests/dittoProtocol.yml
@@ -56,5 +56,5 @@ content:
       }
     }
 description: |-
-  The [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html) payload defining which
+  The [Ditto Protocol JSON](https://www.eclipse.dev/ditto/protocol-specification.html) payload defining which
   command to process.
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/schemas/wot-thingDescription.yml b/documentation/src/main/resources/openapi/sources/schemas/wot-thingDescription.yml
index a6ef27f34f2..b85f15c957a 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/wot-thingDescription.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/wot-thingDescription.yml
@@ -102,7 +102,7 @@ properties:
   support:
     type: string
     format: iri-reference
-    example: "https://www.eclipse.org/ditto/"
+    example: "https://www.eclipse.dev/ditto/"
   created:
     type: string
     format: date-time
diff --git a/documentation/src/main/resources/pages/ditto/basic-errors.md b/documentation/src/main/resources/pages/ditto/basic-errors.md
index 3ea394459e8..ce86ac8315a 100644
--- a/documentation/src/main/resources/pages/ditto/basic-errors.md
+++ b/documentation/src/main/resources/pages/ditto/basic-errors.md
@@ -71,7 +71,7 @@ The optional href contains a link to Ditto documentation or external resources i
   "error": "messages:id.invalid",
   "message": "Thing ID 'foobar2000' is not valid!",
   "description": "It must conform to the namespaced entity ID notation (see Ditto documentation)",
-  "href": "https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id"
+  "href": "https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id"
 }
 ```
 
diff --git a/documentation/src/main/resources/pages/ditto/basic-wot-integration-example.md b/documentation/src/main/resources/pages/ditto/basic-wot-integration-example.md
index 2d2ecad67df..f41e0e5c8eb 100644
--- a/documentation/src/main/resources/pages/ditto/basic-wot-integration-example.md
+++ b/documentation/src/main/resources/pages/ditto/basic-wot-integration-example.md
@@ -239,7 +239,7 @@ That should result in an HTTP status code `200` (OK) and return the following bo
       "scheme": "basic"
     }
   },
-  "support": "https://www.eclipse.org/ditto/",
+  "support": "https://www.eclipse.dev/ditto/",
   "created": "2022-02-16T11:48:22.192286Z",
   "forms": [
     {
@@ -570,7 +570,7 @@ That should result in an HTTP status code `200` (OK) and return the following bo
       "scheme": "basic"
     }
   },
-  "support": "https://www.eclipse.org/ditto/",
+  "support": "https://www.eclipse.dev/ditto/",
   "created": "2022-02-16T11:48:22.192286Z",
   "forms": [
     {
diff --git a/documentation/src/main/resources/pages/ditto/client-sdk-java.md b/documentation/src/main/resources/pages/ditto/client-sdk-java.md
index 9f0e8f82f49..7cb500dd0e9 100644
--- a/documentation/src/main/resources/pages/ditto/client-sdk-java.md
+++ b/documentation/src/main/resources/pages/ditto/client-sdk-java.md
@@ -9,18 +9,18 @@ A client SDK for Java in order to interact with digital twins provided by an Ecl
 
 ## Features
 
-* Digital twin management: CRUD (create, read, update, delete) of Ditto [things](https://www.eclipse.org/ditto/basic-thing.html)
-* [Change notifications](https://www.eclipse.org/ditto/basic-changenotifications.html): 
+* Digital twin management: CRUD (create, read, update, delete) of Ditto [things](https://www.eclipse.dev/ditto/basic-thing.html)
+* [Change notifications](https://www.eclipse.dev/ditto/basic-changenotifications.html): 
   consume notifications whenever a "watched" digital twin is modified 
-* Send/receive [messages](https://www.eclipse.org/ditto/basic-messages.html) to/from devices connected via a digital twin
-* Use the [live channel](https://www.eclipse.org/ditto/protocol-twinlive.html#live) in order to react on commands directed
+* Send/receive [messages](https://www.eclipse.dev/ditto/basic-messages.html) to/from devices connected via a digital twin
+* Use the [live channel](https://www.eclipse.dev/ditto/protocol-twinlive.html#live) in order to react on commands directed
   to devices targeting their "live" state
 
 ## Communication channel
 
 The Ditto Java client interacts with an Eclipse Ditto backend via Ditto's 
-[WebSocket](https://www.eclipse.org/ditto/httpapi-protocol-bindings-websocket.html) sending and receiving messages
-in [Ditto Protocol](https://www.eclipse.org/ditto/protocol-overview.html).
+[WebSocket](https://www.eclipse.dev/ditto/httpapi-protocol-bindings-websocket.html) sending and receiving messages
+in [Ditto Protocol](https://www.eclipse.dev/ditto/protocol-overview.html).
 
 ## Usage
 
diff --git a/documentation/src/main/resources/pages/ditto/protocol/examples/policies/generated/exceptions/policies_id_invalid.md b/documentation/src/main/resources/pages/ditto/protocol/examples/policies/generated/exceptions/policies_id_invalid.md
index 1e3d24f6e1c..8fc67f0aee6 100644
--- a/documentation/src/main/resources/pages/ditto/protocol/examples/policies/generated/exceptions/policies_id_invalid.md
+++ b/documentation/src/main/resources/pages/ditto/protocol/examples/policies/generated/exceptions/policies_id_invalid.md
@@ -12,7 +12,7 @@
     "error": "policies:id.invalid",
     "message": "Policy ID 'invalid id' is not valid!",
     "description": "It must conform to the namespaced entity ID notation (see Ditto documentation)",
-    "href": "https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id"
+    "href": "https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id"
   },
   "status": 400
 }
diff --git a/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/exceptions/things_id_invalid.md b/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/exceptions/things_id_invalid.md
index da4235d7e77..df054faa278 100644
--- a/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/exceptions/things_id_invalid.md
+++ b/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/exceptions/things_id_invalid.md
@@ -12,7 +12,7 @@
     "error": "things:id.invalid",
     "message": "Thing ID 'invalid id' is not valid!",
     "description": "It must conform to the namespaced entity ID notation (see Ditto documentation)",
-    "url": "https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id"
+    "url": "https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id"
   },
   "status": 400
 }
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_080M2.md b/documentation/src/main/resources/pages/ditto/release_notes_080M2.md
index e49c2f3ec84..713a53ac0d8 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_080M2.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_080M2.md
@@ -51,7 +51,7 @@ The new feature is documented as [change notification filters](basic-changenotif
 
 Ditto's APIs now support `If-Match` and `If-None-Match` headers specified in 
 [rfc7232](https://tools.ietf.org/html/rfc7232#section-3.2) for `things` and `policies` resources. Have a look at the
-new [documentation for conditional requests](https://www.eclipse.org/ditto/httpapi-concepts.html) for how this concept
+new [documentation for conditional requests](https://www.eclipse.dev/ditto/httpapi-concepts.html) for how this concept
 can help with advanced interaction-patterns with your twins.
 
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_100M1a.md b/documentation/src/main/resources/pages/ditto/release_notes_100M1a.md
index c2e56e1757c..7f7bb9007fb 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_100M1a.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_100M1a.md
@@ -50,7 +50,7 @@ Contribution was extracted from former commercial-only client - all references t
 ### [Configurable authorization servers](https://github.com/eclipse-ditto/ditto/pull/477)
 
 Eclipse Ditto now supports all OAuth 2.0 providers which implement OpenID Connect out-of-the-box. See this 
-[blog post](https://www.eclipse.org/ditto/2019-08-28-openid-connect.html) for more details.
+[blog post](https://www.eclipse.dev/ditto/2019-08-28-openid-connect.html) for more details.
  
 ### [Fine grained access for connections](https://github.com/eclipse-ditto/ditto/pull/463)
 
diff --git a/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html b/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
index 0b3803480ae..991f7ef58f9 100644
--- a/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
+++ b/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
@@ -284,7 +284,7 @@ <h2>domain model</h2>
                 <br />
                 <br />
                 <img src="../../images/pages/basic/ditto-class-diagram-v2.png" alt="Ditto class diagram v2" class="fragment"/>
-                <a href="https://www.eclipse.org/ditto/basic-overview.html#domain-model">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/basic-overview.html#domain-model">→ docs</a>
             </section>
             <section id="ditto-3" style="clear: both;">
                 <h2>turn device data into API</h2>
@@ -326,7 +326,7 @@ <h2>turn device data into API</h2>
 
 
 </code></pre>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-4" style="clear: both">
@@ -344,7 +344,7 @@ <h2>Ditto Protocol API</h2>
   },
   "revision": 42
 }</code></pre>
-                <a href="https://www.eclipse.org/ditto/protocol-overview.html" style="float: right;">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/protocol-overview.html" style="float: right;">→ docs</a>
             </section>
             <section id="ditto-5" style="clear: both">
                 <h2>access control</h2>
@@ -394,7 +394,7 @@ <h3>API v2: Policy</h3>
     }
   }
 }</code></pre>
-                    <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-6" style="clear: both;">
@@ -415,7 +415,7 @@ <h2>twin vs. live</h2>
                         <li>endpoints process commands, emit events</li>
                     </ul>
                     <img src="../../images/pages/protocol/ditto-live-channel.png" alt="Ditto live channel" />
-                    <a href="https://www.eclipse.org/ditto/protocol-twinlive.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/protocol-twinlive.html" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-7" style="clear: both;">
@@ -434,7 +434,7 @@ <h3>via WebSocket</h3>
                     <ul style="font-size: 0.7em">
                         <li>bidirectionally send/receive Ditto Protocol messages</li>
                     </ul>
-                    <a href="https://www.eclipse.org/ditto/httpapi-protocol-bindings-websocket.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-protocol-bindings-websocket.html" style="float: right;">→ docs</a>
                 </div>
                 <div style="text-align: left; float: right; width: 48%" class="fragment">
                     <h3>via SSEs</h3>
@@ -446,7 +446,7 @@ <h3>via SSEs</h3>
                     <ul style="font-size: 0.7em">
                         <li>unidirectionally receive changes in Thing JSON form</li>
                     </ul>
-                    <a href="https://www.eclipse.org/ditto/httpapi-sse.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-sse.html" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-8" style="clear: both;">
@@ -478,7 +478,7 @@ <h2>search</h2>
                         <li>apply field projection over the results</li>
                         <li>don't worry about indexing</li>
                     </ul>
-                    <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-9" style="clear: both;">
@@ -582,7 +582,7 @@ <h1>Q & A</h1>
                 <h3>thanks for attending</h3>
                 <br/>
                 <br/>
-                <a href="https://www.eclipse.org/ditto/feedback.html">reach out to the Ditto team</a>
+                <a href="https://www.eclipse.dev/ditto/feedback.html">reach out to the Ditto team</a>
             </section>
         </section>
     </div>
@@ -593,7 +593,7 @@ <h3>thanks for attending</h3>
     Copyright ©2018
     <a href="https://www.bosch-si.com" target="_blank">Bosch Software Innovations GmbH</a> All rights reserved. |
     <a href="https://www.bosch.com/terms-of-use/terms-of-use/provider/" target="_blank">Imprint</a> |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html b/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
index 2c8594095a0..db7d68f7b3a 100644
--- a/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
+++ b/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
@@ -328,7 +328,7 @@ <h2>domain model</h2>
                 <br />
                 <br />
                 <img src="../../images/pages/basic/ditto-class-diagram-v2.png" alt="Ditto class diagram v2" class="fragment"/>
-                <a href="https://www.eclipse.org/ditto/basic-overview.html#domain-model">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/basic-overview.html#domain-model">→ docs</a>
             </section>
             <section id="ditto-3" style="clear: both;">
                 <h2>turn device data into API</h2>
@@ -370,7 +370,7 @@ <h2>turn device data into API</h2>
 
 
 </code></pre>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-4" style="clear: both;">
@@ -400,7 +400,7 @@ <h2>Ditto Protocol API</h2>
   },
   "revision": 42
 }</code></pre>
-                <a href="https://www.eclipse.org/ditto/protocol-overview.html" style="float: right;">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/protocol-overview.html" style="float: right;">→ docs</a>
             </section>
             <section id="ditto-6" style="clear: both">
                 <h2>access control</h2>
@@ -450,7 +450,7 @@ <h3>API v2: Policy</h3>
     }
   }
 }</code></pre>
-                    <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-7" style="clear: both;">
@@ -471,7 +471,7 @@ <h2>twin vs. live</h2>
                         <li>endpoints process commands, emit events</li>
                     </ul>
                     <img src="../../images/pages/protocol/ditto-live-channel.png" alt="Ditto live channel" />
-                    <a href="https://www.eclipse.org/ditto/protocol-twinlive.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/protocol-twinlive.html" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-8" style="clear: both;">
@@ -490,7 +490,7 @@ <h3>via WebSocket</h3>
                     <ul style="font-size: 0.7em">
                         <li>bidirectionally send/receive Ditto Protocol messages</li>
                     </ul>
-                    <a href="https://www.eclipse.org/ditto/httpapi-protocol-bindings-websocket.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-protocol-bindings-websocket.html" style="float: right;">→ docs</a>
                 </div>
                 <div style="text-align: left; float: right; width: 48%" class="fragment">
                     <h3>via SSEs</h3>
@@ -502,7 +502,7 @@ <h3>via SSEs</h3>
                     <ul style="font-size: 0.7em">
                         <li>unidirectionally receive changes in Thing JSON form</li>
                     </ul>
-                    <a href="https://www.eclipse.org/ditto/httpapi-sse.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-sse.html" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-9" style="clear: both;">
@@ -514,7 +514,7 @@ <h3>notifications also possible via</h3>
                     <li>AMQP <b>0.9.1</b> broker (e.g. RabbitMQ)</li>
                 </ul>
                 <h3 class="fragment" style="margin-top: 1em">Ditto manages connections to those since version 0.3.0-M1</h3>
-                <a href="https://www.eclipse.org/ditto/connectivity-overview.html" style="float: right;">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/connectivity-overview.html" style="float: right;">→ docs</a>
             </section>
             <section id="ditto-10" style="clear: both;">
                 <h2>search</h2>
@@ -545,7 +545,7 @@ <h2>search</h2>
                         <li>apply field projection over the results</li>
                         <li>don't worry about indexing</li>
                     </ul>
-                    <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-11" style="clear: both;">
@@ -681,7 +681,7 @@ <h1>Q & A</h1>
     Copyright ©2018
     <a href="https://www.bosch-si.com" target="_blank">Bosch Software Innovations GmbH</a> All rights reserved. |
     <a href="https://www.bosch.com/terms-of-use/terms-of-use/provider/" target="_blank">Imprint</a> |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2018_10_22-eclipse-iot-wg-f2f-ludwigsburg/index.html b/documentation/src/main/resources/slides/2018_10_22-eclipse-iot-wg-f2f-ludwigsburg/index.html
index b9cd0e98936..4eed06f4e04 100644
--- a/documentation/src/main/resources/slides/2018_10_22-eclipse-iot-wg-f2f-ludwigsburg/index.html
+++ b/documentation/src/main/resources/slides/2018_10_22-eclipse-iot-wg-f2f-ludwigsburg/index.html
@@ -299,7 +299,7 @@ <h2>Collaboration</h2>
   Copyright ©2018
   <a href="https://www.bosch-si.com" target="_blank">Bosch Software Innovations GmbH</a> All rights reserved. |
   <a href="https://www.bosch.com/terms-of-use/terms-of-use/provider/" target="_blank">Imprint</a> |
-  <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+  <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
   <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
   <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2019_10_21-eclipse-iot-wg-f2f-ludwigsburg/index.html b/documentation/src/main/resources/slides/2019_10_21-eclipse-iot-wg-f2f-ludwigsburg/index.html
index 9c31b557605..854a75f6e87 100644
--- a/documentation/src/main/resources/slides/2019_10_21-eclipse-iot-wg-f2f-ludwigsburg/index.html
+++ b/documentation/src/main/resources/slides/2019_10_21-eclipse-iot-wg-f2f-ludwigsburg/index.html
@@ -306,7 +306,7 @@ <h2>Challenges</h2>
   Copyright ©2018
   <a href="https://www.bosch-si.com" target="_blank">Bosch Software Innovations GmbH</a> All rights reserved. |
   <a href="https://www.bosch.com/terms-of-use/terms-of-use/provider/" target="_blank">Imprint</a> |
-  <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+  <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
   <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
   <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html b/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
index 3e8308338cd..1eb087f76d1 100644
--- a/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
+++ b/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
@@ -349,7 +349,7 @@ <h2>turn device data into APIs</h2>
 
 
 </code></pre>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-3" style="clear: both;">
@@ -404,7 +404,7 @@ <h2>authorization</h2>
       }
     }
   }</code></pre>
-              <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
             </div>
           </section>
           <section id="ditto-5" style="clear: both;">
@@ -436,7 +436,7 @@ <h2>search</h2>
                 <li>apply field projection over the results</li>
                 <li>don't worry about indexing</li>
               </ul>
-              <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right;">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right;">→ docs</a>
             </div>
           </section>
           <section id="ditto-6" style="clear: both;">
@@ -455,7 +455,7 @@ <h2>get notified about changes</h2>
   console.log('received: ' + msg.data);
 };</code></pre>
               <p style="text-align: left; font-size: 0.7em">example of WebSocket browser API</p>
-              <a href="https://www.eclipse.org/ditto/basic-changenotifications.html" style="float: right;">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-changenotifications.html" style="float: right;">→ docs</a>
             </div>
           </section>
             <section id="ditto-7" style="clear: both;">
@@ -542,7 +542,7 @@ <h4 class="fragment"><b>* used now</b> for the hands-on part</h4>
             <section id="hands-on" class="new-chapter" data-background="../bg-images/background-demo-small.jpg" data-state="chapter-background">
                 <h1>hands-on time!</h1>
                 <br/>
-                <h3><a href="https://www.eclipse.org/ditto/2020-04-16-connecting-to-ttn-via-mqtt.html">Step-by-step blogpost</a></h3>
+                <h3><a href="https://www.eclipse.dev/ditto/2020-04-16-connecting-to-ttn-via-mqtt.html">Step-by-step blogpost</a></h3>
             </section>
         </section>
 
@@ -602,7 +602,7 @@ <h3>thanks to The Things Network for organising this virtual conference</h3>
 <div class="footer">
     Copyright ©2020
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2020_07_28-iot-wg-status-update/index.html b/documentation/src/main/resources/slides/2020_07_28-iot-wg-status-update/index.html
index ed3bfe740d8..95de55b5143 100644
--- a/documentation/src/main/resources/slides/2020_07_28-iot-wg-status-update/index.html
+++ b/documentation/src/main/resources/slides/2020_07_28-iot-wg-status-update/index.html
@@ -279,7 +279,7 @@ <h2>Achievements</h2>
           </li>
         </ul>
         <h4 style="text-align: left; margin-top: 1em;" class="fragment">LoRaWAN Virtual Conference:
-          <a href="https://www.eclipse.org/ditto/slides/2020_04_16-ttn-virtual-conference/">workshop</a> +
+          <a href="https://www.eclipse.dev/ditto/slides/2020_04_16-ttn-virtual-conference/">workshop</a> +
           <a href="https://youtu.be/D33JrN2RWiI">YouTube recording</a>
         </h4>
       </section>
@@ -312,7 +312,7 @@ <h2>Roadmap</h2>
 <div class="footer">
     Copyright ©2020
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2020_10_19-eclipse-iot-wg-community-day/index.html b/documentation/src/main/resources/slides/2020_10_19-eclipse-iot-wg-community-day/index.html
index f9f92594b70..1091f1204e4 100644
--- a/documentation/src/main/resources/slides/2020_10_19-eclipse-iot-wg-community-day/index.html
+++ b/documentation/src/main/resources/slides/2020_10_19-eclipse-iot-wg-community-day/index.html
@@ -315,7 +315,7 @@ <h2>Achievements</h2>
         </li>
       </ul>
       <h4 style="text-align: left; margin-top: 1em;" class="fragment">LoRaWAN Virtual Conference:
-        <a href="https://www.eclipse.org/ditto/slides/2020_04_16-ttn-virtual-conference/">workshop</a> +
+        <a href="https://www.eclipse.dev/ditto/slides/2020_04_16-ttn-virtual-conference/">workshop</a> +
         <a href="https://youtu.be/D33JrN2RWiI">YouTube recording</a>
       </h4>
     </section>
@@ -361,7 +361,7 @@ <h2>Roadmap</h2>
 <div class="footer">
   Copyright ©2020
   <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-  <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+  <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
   <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
   <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2021_05_ditto-introduction-deck/index.html b/documentation/src/main/resources/slides/2021_05_ditto-introduction-deck/index.html
index eb064691626..51b58f0e2ab 100644
--- a/documentation/src/main/resources/slides/2021_05_ditto-introduction-deck/index.html
+++ b/documentation/src/main/resources/slides/2021_05_ditto-introduction-deck/index.html
@@ -359,7 +359,7 @@ <h2>turn device data into APIs</h2>
 
 
 </code></pre>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
                 </div>
             </section>
             <section id="ditto-3" style="clear: both;">
@@ -372,7 +372,7 @@ <h2>modeling thing capabilities</h2>
               </div>
               <div style="text-align: left; float: right; width: 25%">
                 <img src="../../images/pages/basic/ditto-thing-feature-definition-model.png" style="width: 110%" alt="Ditto thing feature definition model">
-                <a href="https://www.eclipse.org/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
               </div>
 
               <ul style="clear: both">
@@ -437,7 +437,7 @@ <h2>authorization</h2>
       }
     }
   }</code></pre>
-              <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
           <section id="ditto-6" style="clear: both;">
@@ -469,7 +469,7 @@ <h2>search</h2>
                 <li>apply field projection over the results</li>
                 <li>don't worry about indexing</li>
               </ul>
-              <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
           <section id="ditto-7" style="clear: both;">
@@ -487,7 +487,7 @@ <h2>get notified about changes</h2>
 ws.onmessage = function(msg) {
   console.log('received: ' + msg.data);
 };</code></pre>
-              <a href="https://www.eclipse.org/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
               <p style="text-align: left; font-size: 0.7em">example of WebSocket browser API</p>
             </div>
           </section>
@@ -554,7 +554,7 @@ <h2>could benefit from each other</h2>
 <!--            <section id="hands-on" class="new-chapter" data-background="../bg-images/background-demo-small.jpg" data-state="chapter-background">-->
 <!--                <h1>hands-on time!</h1>-->
 <!--                <br/>-->
-<!--                <h3><a href="https://www.eclipse.org/ditto/2020-04-16-connecting-to-ttn-via-mqtt.html">Step-by-step blogpost</a></h3>-->
+<!--                <h3><a href="https://www.eclipse.dev/ditto/2020-04-16-connecting-to-ttn-via-mqtt.html">Step-by-step blogpost</a></h3>-->
 <!--            </section>-->
 <!--        </section>-->
 
@@ -592,7 +592,7 @@ <h1>Wrap up</h1>
 <div class="footer">
     Copyright ©2021
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2021_06_ditto-20-overview/index.html b/documentation/src/main/resources/slides/2021_06_ditto-20-overview/index.html
index 3d16be605f8..61e96faf0b8 100644
--- a/documentation/src/main/resources/slides/2021_06_ditto-20-overview/index.html
+++ b/documentation/src/main/resources/slides/2021_06_ditto-20-overview/index.html
@@ -300,7 +300,7 @@ <h3>Looking ahead</h3>
 <div class="footer">
     Copyright ©2021
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2021_06_ditto-in-20-min/index.html b/documentation/src/main/resources/slides/2021_06_ditto-in-20-min/index.html
index 08fca90e49f..f14da834811 100644
--- a/documentation/src/main/resources/slides/2021_06_ditto-in-20-min/index.html
+++ b/documentation/src/main/resources/slides/2021_06_ditto-in-20-min/index.html
@@ -280,7 +280,7 @@ <h2>turn device data into APIs</h2>
 
 
 </code></pre>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
                 </div>
             </section>
             <section id="ditto-3" style="clear: both;">
@@ -293,7 +293,7 @@ <h2>modeling thing capabilities</h2>
               </div>
               <div style="text-align: left; float: right; width: 25%">
                 <img src="../../images/pages/basic/ditto-thing-feature-definition-model.png" style="width: 110%" alt="Ditto thing feature definition model">
-                <a href="https://www.eclipse.org/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
               </div>
 
               <ul style="clear: both">
@@ -326,7 +326,7 @@ <h2>authorization</h2>
                 <li class="fragment" style="margin-top: 1em;">every API call is authorized</li>
               </ul>
             </div>
-            <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right; font-size: 0.7em">→ docs</a>
+            <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right; font-size: 0.7em">→ docs</a>
           </section>
           <section id="ditto-6" style="clear: both;">
             <h2>search</h2>
@@ -357,7 +357,7 @@ <h2>search</h2>
                 <li>apply field projection over the results</li>
                 <li>don't worry about indexing</li>
               </ul>
-              <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
           <section id="ditto-7" style="clear: both;">
@@ -368,7 +368,7 @@ <h2>get notified about changes</h2>
               <li class="fragment" style="margin-top: 1em;">server side filtering via RQL (same as in search)</li>
             </ul>
             <div class="fragment">
-              <a href="https://www.eclipse.org/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
         </section>
@@ -427,7 +427,7 @@ <h1>Wrap up</h1>
 <div class="footer">
     Copyright ©2021
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2021_10_25-eclipse-iot-wg-community-day/index.html b/documentation/src/main/resources/slides/2021_10_25-eclipse-iot-wg-community-day/index.html
index d17d5882b5e..e9d278b4f43 100644
--- a/documentation/src/main/resources/slides/2021_10_25-eclipse-iot-wg-community-day/index.html
+++ b/documentation/src/main/resources/slides/2021_10_25-eclipse-iot-wg-community-day/index.html
@@ -324,7 +324,7 @@ <h2>Roadmap</h2>
 <div class="footer">
   Copyright ©2021
   <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-  <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+  <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
   <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
   <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2022_10_24_eclipse-iot-wg-community-day/index.html b/documentation/src/main/resources/slides/2022_10_24_eclipse-iot-wg-community-day/index.html
index feeb3218875..49cab5a4c32 100644
--- a/documentation/src/main/resources/slides/2022_10_24_eclipse-iot-wg-community-day/index.html
+++ b/documentation/src/main/resources/slides/2022_10_24_eclipse-iot-wg-community-day/index.html
@@ -348,7 +348,7 @@ <h2>Roadmap</h2>
 <div class="footer">
     Copyright ©2022
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2022_10_ditto-and-wot/index.html b/documentation/src/main/resources/slides/2022_10_ditto-and-wot/index.html
index b77e23bf34a..d7400065841 100644
--- a/documentation/src/main/resources/slides/2022_10_ditto-and-wot/index.html
+++ b/documentation/src/main/resources/slides/2022_10_ditto-and-wot/index.html
@@ -288,7 +288,7 @@ <h2>turn device data into APIs</h2>
 
 </code></pre>
                   <p style="text-align: center">HTTP API of the Thing</p>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
                 </div>
             </section>
           <section id="ditto-3" style="clear: both;">
@@ -325,7 +325,7 @@ <h2>modeling thing capabilities</h2>
     }
   }
 }</code></pre>
-              <a href="https://www.eclipse.org/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
             <section id="ditto-4" style="clear: both;">
@@ -352,7 +352,7 @@ <h2>persistence of device state</h2>
 <!--                <li style="margin-top: 1em;">every API call is authorized</li>-->
 <!--              </ul>-->
 <!--            </div>-->
-<!--            <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right; font-size: 0.7em">→ docs</a>-->
+<!--            <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right; font-size: 0.7em">→ docs</a>-->
 <!--          </section>-->
           <section id="ditto-6" style="clear: both;">
             <h2>search</h2>
@@ -382,7 +382,7 @@ <h2>search</h2>
                 <li>apply field projection over the results</li>
                 <li>don't worry about indexing</li>
               </ul>
-              <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
 <!--          <section id="ditto-7" style="clear: both;">-->
@@ -393,7 +393,7 @@ <h2>search</h2>
 <!--              <li class="fragment" data-fragment-index="1" style="margin-top: 1em;">server side filtering via RQL (same as in search)</li>-->
 <!--            </ul>-->
 <!--            <div class="fragment" data-fragment-index="1">-->
-<!--              <a href="https://www.eclipse.org/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>-->
+<!--              <a href="https://www.eclipse.dev/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>-->
 <!--            </div>-->
 <!--          </section>-->
         </section>
@@ -521,8 +521,8 @@ <h2>Demo</h2>
               <h2>Links</h2>
               <br/>
               <ul>
-                <li><a target="_blank" href="https://www.eclipse.org/ditto/2022-03-03-wot-integration.html">Ditto Blogpost about WoT integration</a></li>
-                <li><a target="_blank" href="https://www.eclipse.org/ditto/basic-wot-integration.html">Ditto docs about WoT integration</a></li>
+                <li><a target="_blank" href="https://www.eclipse.dev/ditto/2022-03-03-wot-integration.html">Ditto Blogpost about WoT integration</a></li>
+                <li><a target="_blank" href="https://www.eclipse.dev/ditto/basic-wot-integration.html">Ditto docs about WoT integration</a></li>
                 <li><a target="_blank" href="https://github.com/eclipse-ditto/ditto">GitHub</a> - please give us a star ;)</li>
                 <li><a target="_blank" href="https://gitter.im/eclipse/ditto">Chatroom to ask more questions</a></li>
               </ul>
@@ -535,7 +535,7 @@ <h2>Links</h2>
 <div class="footer">
     Copyright ©2022
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html b/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html
index 115339d5c21..ee315a963fe 100644
--- a/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html
+++ b/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html
@@ -288,7 +288,7 @@ <h2>turn device data into APIs</h2>
 
 </code></pre>
                   <p style="text-align: center">HTTP API of the Thing</p>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
                 </div>
             </section>
           <section id="ditto-3" style="clear: both;">
@@ -325,7 +325,7 @@ <h2>modeling thing capabilities</h2>
     }
   }
 }</code></pre>
-              <a href="https://www.eclipse.org/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
           <section id="ditto-3b" style="clear: both;">
@@ -396,7 +396,7 @@ <h2>authorization</h2>
       }
     }
   }</code></pre>
-              <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
             </div>
           </section>
           <section id="ditto-6" style="clear: both;">
@@ -427,7 +427,7 @@ <h2>search</h2>
                 <li>apply field projection over the results</li>
                 <li>don't worry about indexing</li>
               </ul>
-              <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
           <section id="ditto-7" style="clear: both;">
@@ -438,7 +438,7 @@ <h2>get notified about changes</h2>
               <li class="fragment" data-fragment-index="1" style="margin-top: 1em;">server side filtering via RQL (same as in search)</li>
             </ul>
             <div class="fragment" data-fragment-index="1">
-              <a href="https://www.eclipse.org/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
           <section id="ditto-8" style="clear: both;">
@@ -495,8 +495,8 @@ <h2>Demo</h2>
               <h2>Links</h2>
               <br/>
               <ul>
-                <li><a target="_blank" href="https://www.eclipse.org/ditto/2022-03-03-wot-integration.html">Ditto Blogpost about WoT integration</a></li>
-                <li><a target="_blank" href="https://www.eclipse.org/ditto/basic-wot-integration.html">Ditto docs about WoT integration</a></li>
+                <li><a target="_blank" href="https://www.eclipse.dev/ditto/2022-03-03-wot-integration.html">Ditto Blogpost about WoT integration</a></li>
+                <li><a target="_blank" href="https://www.eclipse.dev/ditto/basic-wot-integration.html">Ditto docs about WoT integration</a></li>
                 <li><a target="_blank" href="https://github.com/eclipse-ditto/ditto">GitHub</a> - please give us a star ;)</li>
                 <li><a target="_blank" href="https://gitter.im/eclipse/ditto">Chatroom to ask more questions</a></li>
               </ul>
@@ -509,7 +509,7 @@ <h2>Links</h2>
 <div class="footer">
     Copyright ©2023
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/wot/ditto-extension.html b/documentation/src/main/resources/wot/ditto-extension.html
index 83809d8f1a5..71297c22264 100644
--- a/documentation/src/main/resources/wot/ditto-extension.html
+++ b/documentation/src/main/resources/wot/ditto-extension.html
@@ -61,7 +61,7 @@
   <h1><img src="../images/ditto.svg" class="ditto-logo" alt="Eclipse Ditto logo"> - WoT Extension Ontology</h1>
   <section id="1-intro">
     <h2>1. Introduction</h2>
-    <p>This ontology provides additional <a href="https://www.eclipse.org/ditto/">Eclipse Ditto™</a> specific context for <a href="https://www.w3.org/WoT/">W3C Web of Things</a> TDs and TMs.</p>
+    <p>This ontology provides additional <a href="https://www.eclipse.dev/ditto/">Eclipse Ditto™</a> specific context for <a href="https://www.w3.org/WoT/">W3C Web of Things</a> TDs and TMs.</p>
   </section>
   <section id="2-formats">
     <h2>2. Formats</h2>
diff --git a/legal/NOTICE.md b/legal/NOTICE.md
index c5b2026dc69..8a361fe4b52 100644
--- a/legal/NOTICE.md
+++ b/legal/NOTICE.md
@@ -1,7 +1,7 @@
 
 This content is produced and maintained by the Eclipse Ditto project.
 
-* Project home: https://www.eclipse.org/ditto
+* Project home: https://www.eclipse.dev/ditto/
 
 # Trademarks
 
diff --git a/messages/model/src/main/java/org/eclipse/ditto/messages/model/ThingIdInvalidException.java b/messages/model/src/main/java/org/eclipse/ditto/messages/model/ThingIdInvalidException.java
index b5d830868ca..d80a817efa4 100755
--- a/messages/model/src/main/java/org/eclipse/ditto/messages/model/ThingIdInvalidException.java
+++ b/messages/model/src/main/java/org/eclipse/ditto/messages/model/ThingIdInvalidException.java
@@ -44,7 +44,7 @@ public final class ThingIdInvalidException extends EntityIdInvalidException impl
             "It must conform to the namespaced entity ID notation (see Ditto documentation)";
 
     private static final URI DEFAULT_HREF =
-            URI.create("https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id");
+            URI.create("https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id");
 
     private static final long serialVersionUID = -2426810319409279256L;
 
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/PolicyIdInvalidException.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/PolicyIdInvalidException.java
index 95b7351fdde..d7802c6037d 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/PolicyIdInvalidException.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/PolicyIdInvalidException.java
@@ -44,7 +44,7 @@ public final class PolicyIdInvalidException extends EntityIdInvalidException imp
     private static final String DEFAULT_DESCRIPTION =
             "It must conform to the namespaced entity ID notation (see Ditto documentation)";
 
-    private static final URI DEFAULT_HREF = URI.create("https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id");
+    private static final URI DEFAULT_HREF = URI.create("https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id");
 
     private static final long serialVersionUID = 8154256308793903738L;
 
diff --git a/pom.xml b/pom.xml
index 3a06ef54281..33ee0beedd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
     <name>Eclipse Ditto</name>
     <description>Eclipse Ditto is a framework for creating and managing digital twins in the IoT.</description>
-    <url>https://eclipse.org/ditto/</url>
+    <url>https://eclipse.dev/ditto/</url>
     <inceptionYear>2017</inceptionYear>
 
     <organization>
@@ -455,7 +455,7 @@
                         <instructions>
                             <Bundle-Vendor>Eclipse Ditto</Bundle-Vendor>
                             <Bundle-License>EPL-2.0</Bundle-License>
-                            <Bundle-DocURL>https://eclipse.org/ditto/</Bundle-DocURL>
+                            <Bundle-DocURL>https://eclipse.dev/ditto/</Bundle-DocURL>
                             <_noee>true</_noee>
                             <!-- stays at 1.8 as all exported bundles (json, model, protocol-adapter, signals, ...) are 1.8 -->
                             <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/ThingIdInvalidException.java b/things/model/src/main/java/org/eclipse/ditto/things/model/ThingIdInvalidException.java
index 000980d1947..1c7799644b8 100755
--- a/things/model/src/main/java/org/eclipse/ditto/things/model/ThingIdInvalidException.java
+++ b/things/model/src/main/java/org/eclipse/ditto/things/model/ThingIdInvalidException.java
@@ -44,7 +44,7 @@ public final class ThingIdInvalidException extends EntityIdInvalidException impl
             "It must conform to the namespaced entity ID notation (see Ditto documentation)";
 
     private static final URI DEFAULT_HREF =
-            URI.create("https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id");
+            URI.create("https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id");
 
     private static final long serialVersionUID = -2026814719409279158L;
 
diff --git a/things/service/src/main/resources/things.conf b/things/service/src/main/resources/things.conf
index ef3ca2b5b04..22a4632ad37 100755
--- a/things/service/src/main/resources/things.conf
+++ b/things/service/src/main/resources/things.conf
@@ -185,7 +185,7 @@ ditto {
         #     }
         #   },
         #   "security": "oauth2_google_sc"
-        #   "support": "https://www.eclipse.org/ditto/"
+        #   "support": "https://www.eclipse.dev/ditto/"
         # }
 
         json-template {
@@ -196,7 +196,7 @@ ditto {
             }
           },
           "security": "basic_sc"
-          "support": "https://www.eclipse.org/ditto/"
+          "support": "https://www.eclipse.dev/ditto/"
         }
 
         placeholders {
diff --git a/ui/modules/connections/connectionTemplates.json b/ui/modules/connections/connectionTemplates.json
index b0bee479c1c..ae9470baa81 100644
--- a/ui/modules/connections/connectionTemplates.json
+++ b/ui/modules/connections/connectionTemplates.json
@@ -160,7 +160,7 @@
       "javascript": {
         "mappingEngine": "JavaScript",
         "options": {
-          "incomingScript": "/**\n * Maps the passed parameters to a Ditto Protocol message.\n * @param {Object.<string, string>} headers - The headers Object containing all received header values\n * @param {string} [textPayload] - The String to be mapped\n * @param {ArrayBuffer} [bytePayload] - The bytes to be mapped as ArrayBuffer\n * @param {string} [contentType] - The received Content-Type, e.g. \"application/json\"\n * @returns {(DittoProtocolMessage|Array<DittoProtocolMessage>)} dittoProtocolMessage(s) -\n *  The mapped Ditto Protocol message,\n *  an array of Ditto Protocol messages or\n *  <code>null</code> if the message could/should not be mapped\n */\nfunction mapToDittoProtocolMsg(\n  headers,\n  textPayload,\n  bytePayload,\n  contentType\n) {\n\n  // ### Insert/adapt your mapping logic here.\n  // Use helper function Ditto.buildDittoProtocolMsg to build Ditto protocol message\n  // based on incoming payload.\n  // See https://www.eclipse.org/ditto/connectivity-mapping.html#helper-functions for details.\n\n  // ### example code assuming the Ditto protocol content type for incoming messages.\n  if (contentType === 'application/vnd.eclipse.ditto+json') {\n    // Message is sent as Ditto protocol text payload and can be used directly\n    return JSON.parse(textPayload);\n  } else if (contentType === 'application/octet-stream') {\n    // Message is sent as binary payload; assume Ditto protocol message (JSON).\n    try {\n      return JSON.parse(Ditto.arrayBufferToString(bytePayload));\n    } catch (e) {\n      // parsing failed (no JSON document); return null to drop the message\n      return null;\n    }\n  }\n\n  // no mapping logic matched; return null to drop the message\n  return null;\n}",
+          "incomingScript": "/**\n * Maps the passed parameters to a Ditto Protocol message.\n * @param {Object.<string, string>} headers - The headers Object containing all received header values\n * @param {string} [textPayload] - The String to be mapped\n * @param {ArrayBuffer} [bytePayload] - The bytes to be mapped as ArrayBuffer\n * @param {string} [contentType] - The received Content-Type, e.g. \"application/json\"\n * @returns {(DittoProtocolMessage|Array<DittoProtocolMessage>)} dittoProtocolMessage(s) -\n *  The mapped Ditto Protocol message,\n *  an array of Ditto Protocol messages or\n *  <code>null</code> if the message could/should not be mapped\n */\nfunction mapToDittoProtocolMsg(\n  headers,\n  textPayload,\n  bytePayload,\n  contentType\n) {\n\n  // ### Insert/adapt your mapping logic here.\n  // Use helper function Ditto.buildDittoProtocolMsg to build Ditto protocol message\n  // based on incoming payload.\n  // See https://www.eclipse.dev/ditto/connectivity-mapping.html#helper-functions for details.\n\n  // ### example code assuming the Ditto protocol content type for incoming messages.\n  if (contentType === 'application/vnd.eclipse.ditto+json') {\n    // Message is sent as Ditto protocol text payload and can be used directly\n    return JSON.parse(textPayload);\n  } else if (contentType === 'application/octet-stream') {\n    // Message is sent as binary payload; assume Ditto protocol message (JSON).\n    try {\n      return JSON.parse(Ditto.arrayBufferToString(bytePayload));\n    } catch (e) {\n      // parsing failed (no JSON document); return null to drop the message\n      return null;\n    }\n  }\n\n  // no mapping logic matched; return null to drop the message\n  return null;\n}",
           "outgoingScript": "/**\n * Maps the passed parameters which originated from a Ditto Protocol message to an external message.\n * @param {string} namespace - The namespace of the entity in java package notation, e.g.: \"org.eclipse.ditto\". Or \"_\"\n * (underscore) for connection announcements.\n * @param {string} name - The name of the entity, e.g.: \"device\".\n * @param {string} group - The affected group/entity: \"things\"|\"policies\"|\"connections\".\n * @param {string} channel - The channel for the signal: \"twin\"|\"live\"|\"none\"\n * @param {string} criterion - The criterion to apply: \"commands\"|\"events\"|\"search\"|\"messages\"|\"announcements\"|\"errors\".\n * @param {string} action - The action to perform: \"create\"|\"retrieve\"|\"modify\"|\"delete\". Or the announcement name:\n * \"opened\"|\"closed\"|\"subjectDeletion\". Or the subject of the message.\n * @param {string} path - The path which is affected by the message (e.g.: \"/attributes\"), or the destination\n * of a message (e.g.: \"inbox\"|\"outbox\").\n * @param {Object.<string, string>} dittoHeaders - The headers Object containing all Ditto Protocol header values.\n * @param {*} [value] - The value to apply / which was applied (e.g. in a \"modify\" action).\n * @param {number} [status] - The status code that indicates the result of the command. When this field is set,\n * it indicates that the Ditto Protocol Message contains a response.\n * @param {Object} [extra] - The enriched extra fields when selected via \"extraFields\" option.\n * @returns {(ExternalMessage|Array<ExternalMessage>)} externalMessage - The mapped external message, an array of\n * external messages or <code>null</code> if the message could/should not be mapped.\n */\nfunction mapFromDittoProtocolMsg(\n  namespace,\n  name,\n  group,\n  channel,\n  criterion,\n  action,\n  path,\n  dittoHeaders,\n  value,\n  status,\n  extra\n) {\n\n  // ###\n  // Insert your mapping logic here\n\n  // ### example code using the Ditto protocol content type.\n  let headers = dittoHeaders;\n  let textPayload = JSON.stringify(Ditto.buildDittoProtocolMsg(namespace, name, group, channel, criterion, action,\n                                                               path, dittoHeaders, value, status, extra));\n  let bytePayload = null;\n  let contentType = 'application/vnd.eclipse.ditto+json';\n\n  return Ditto.buildExternalMsg(\n      headers, // The external headers Object containing header values\n      textPayload, // The external mapped String\n      bytePayload, // The external mapped byte[]\n      contentType // The returned Content-Type\n  );\n}",
           "loadBytebufferJS": "false",
           "loadLongJS": "false"
diff --git a/wot/model/README.md b/wot/model/README.md
index 0677705a4f1..9384c1e7608 100755
--- a/wot/model/README.md
+++ b/wot/model/README.md
@@ -106,7 +106,7 @@ public final class TesterBuilder {
                         Arrays.asList(
                                 SingleUriAtContext.W3ORG_2022_WOT_TD_V11,
                                 SinglePrefixedAtContext.of("ditto",
-                                        SingleUriAtContext.of("https://www.eclipse.org/ditto/ctx"))
+                                        SingleUriAtContext.of("https://www.eclipse.dev/ditto/ctx"))
                         )
                 ))
                 .setId(IRI.of("urn:org.eclipse.ditto:333-WoTLamp-1234"))
diff --git a/wot/model/src/test/java/org/eclipse/ditto/wot/model/ThingDescriptionTest.java b/wot/model/src/test/java/org/eclipse/ditto/wot/model/ThingDescriptionTest.java
index 27611f533b4..793f29364a8 100644
--- a/wot/model/src/test/java/org/eclipse/ditto/wot/model/ThingDescriptionTest.java
+++ b/wot/model/src/test/java/org/eclipse/ditto/wot/model/ThingDescriptionTest.java
@@ -69,7 +69,7 @@ public void testOverallParsingOfThingDescriptionFromJson() {
         assertThat(thingDescription.getAtContext()).isEqualTo(MultipleAtContext.of(
                 Arrays.asList(
                         SingleUriAtContext.W3ORG_2022_WOT_TD_V11,
-                        SinglePrefixedAtContext.of("ditto", SingleUriAtContext.of("https://www.eclipse.org/ditto/ctx")),
+                        SinglePrefixedAtContext.of("ditto", SingleUriAtContext.of("https://www.eclipse.dev/ditto/ctx")),
                         SinglePrefixedAtContext.of("ace", SingleUriAtContext.of("http://www.example.org/ace-security#"))
                 )
         ));
@@ -137,7 +137,7 @@ public void testOverallParsingOfThingDescriptionFromJson() {
         final List<BaseLink<?>> expectedLinks = new ArrayList<>();
         expectedLinks.add(Link.newBuilder()
                 .setRel("service-doc")
-                .setHref(IRI.of("https://eclipse.org/ditto/some-pdf.pdf"))
+                .setHref(IRI.of("https://eclipse.dev/ditto/some-pdf.pdf"))
                 .setType("application/pdf")
                 .setHreflang(Hreflang.newSingleHreflang("de-CH-1996"))
                 .build()
@@ -161,7 +161,7 @@ public void testBuildingThingDescriptionWithBuilder() {
                         Arrays.asList(
                                 SingleUriAtContext.W3ORG_2022_WOT_TD_V11,
                                 SinglePrefixedAtContext.of("ditto",
-                                        SingleUriAtContext.of("https://www.eclipse.org/ditto/ctx")),
+                                        SingleUriAtContext.of("https://www.eclipse.dev/ditto/ctx")),
                                 SinglePrefixedAtContext.of("ace",
                                         SingleUriAtContext.of("http://www.example.org/ace-security#"))
                         )
@@ -203,7 +203,7 @@ public void testBuildingThingDescriptionWithBuilder() {
                 )))
                 .setLinks(Links.of(Collections.singletonList(Link.newBuilder()
                         .setRel("service-doc")
-                        .setHref(IRI.of("https://eclipse.org/ditto/some-pdf.pdf"))
+                        .setHref(IRI.of("https://eclipse.dev/ditto/some-pdf.pdf"))
                         .setType("application/pdf")
                         .setHreflang(Hreflang.newSingleHreflang("de-CH-1996"))
                         .build()
diff --git a/wot/model/src/test/resources/tds/some-example.td.json b/wot/model/src/test/resources/tds/some-example.td.json
index 249530b8129..717b836a712 100644
--- a/wot/model/src/test/resources/tds/some-example.td.json
+++ b/wot/model/src/test/resources/tds/some-example.td.json
@@ -2,7 +2,7 @@
   "@context": [
     "https://www.w3.org/2022/wot/td/v1.1",
     {
-      "ditto": "https://www.eclipse.org/ditto/ctx",
+      "ditto": "https://www.eclipse.dev/ditto/ctx",
       "ace": "http://www.example.org/ace-security#"
     }
   ],
@@ -46,7 +46,7 @@
   },
   "links": [{
     "rel": "service-doc",
-    "href": "https://eclipse.org/ditto/some-pdf.pdf",
+    "href": "https://eclipse.dev/ditto/some-pdf.pdf",
     "type": "application/pdf",
     "hreflang" : "de-CH-1996"
   }]

From dd9683cd3f3ac0c1740db14230139371697ae865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 21 Jun 2023 13:44:03 +0200
Subject: [PATCH 134/173] improve AskWithRetry WARN logging
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../utils/cacheloaders/AskWithRetry.java       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/internal/utils/cache-loaders/src/main/java/org/eclipse/ditto/internal/utils/cacheloaders/AskWithRetry.java b/internal/utils/cache-loaders/src/main/java/org/eclipse/ditto/internal/utils/cacheloaders/AskWithRetry.java
index e495c5a25b6..9fd19c46b45 100644
--- a/internal/utils/cache-loaders/src/main/java/org/eclipse/ditto/internal/utils/cacheloaders/AskWithRetry.java
+++ b/internal/utils/cache-loaders/src/main/java/org/eclipse/ditto/internal/utils/cacheloaders/AskWithRetry.java
@@ -25,6 +25,8 @@
 import javax.annotation.Nullable;
 
 import org.eclipse.ditto.base.model.common.HttpStatus;
+import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.entity.id.WithEntityId;
 import org.eclipse.ditto.base.model.exceptions.AskException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
@@ -196,9 +198,21 @@ private static <M, A> CompletionStage<AskResult<A>> createAskHandle(final ActorR
                             ThreadSafeDittoLogger l = LOGGER;
                             if (null != dittoHeaders) {
                                 l = LOGGER.withCorrelationId(dittoHeaders);
+                            } else if (message instanceof WithDittoHeaders withDittoHeaders) {
+                                l = LOGGER.withCorrelationId(withDittoHeaders.getDittoHeaders());
                             }
-                            l.warn("Got AskTimeout during ask for message <{}> - retrying.. : <{}>",
-                                    message.getClass().getSimpleName(), throwable.getMessage());
+                            final EntityId entityId;
+                            if (message instanceof WithEntityId withEntityId) {
+                                entityId = withEntityId.getEntityId();
+                            } else {
+                                entityId = null;
+                            }
+                            l.warn("Got AskTimeout during ask for message <{}> and entityId <{} / {}> - retrying.. : <{}>",
+                                    message.getClass().getSimpleName(),
+                                    entityId,
+                                    entityId != null ? entityId.getEntityType() : null,
+                                    throwable.getMessage()
+                            );
                         }
                         // all non-known RuntimeException should be handled by the "Patterns.retry" with a retry:
                         throw new UnknownAskRuntimeException(throwable);

From b02a33885b3df11a2c0bec20d812c832ec4655b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 22 Jun 2023 10:54:45 +0200
Subject: [PATCH 135/173] #1644 fix filtering out empty field selectors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 json/src/main/java/org/eclipse/ditto/json/JsonFactory.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/json/src/main/java/org/eclipse/ditto/json/JsonFactory.java b/json/src/main/java/org/eclipse/ditto/json/JsonFactory.java
index 2dd5868b8da..08cc64bf9c3 100755
--- a/json/src/main/java/org/eclipse/ditto/json/JsonFactory.java
+++ b/json/src/main/java/org/eclipse/ditto/json/JsonFactory.java
@@ -647,6 +647,7 @@ public static JsonFieldSelector newFieldSelector(final Iterable<String> fieldSel
             final JsonParseOptions options) {
 
         final Collection<JsonPointer> selectors = StreamSupport.stream(fieldSelectorStrings.spliterator(), false)
+                .filter(fieldSelectorString -> !fieldSelectorString.isEmpty())
                 .map(fieldSelectorString -> ImmutableJsonFieldSelectorFactory.newInstance(fieldSelectorString, options))
                 .map(ImmutableJsonFieldSelectorFactory::newJsonFieldSelector)
                 .flatMap(foo -> foo.getPointers().stream())

From 41985f9d94e25bf0732fe55f8372292a1a8305b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Fri, 23 Jun 2023 08:35:05 +0200
Subject: [PATCH 136/173] prepare Helm chart for 3.3.0 release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* also lift binary-compatibility version to 3.3.0

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/Chart.yaml              |  8 ++--
 deployment/helm/ditto/README.md               |  2 +-
 .../helm/ditto/ci/ci-workflow-values.yaml     | 10 ++---
 deployment/helm/ditto/local-values.yaml       | 10 ++---
 deployment/helm/ditto/values.yaml             | 42 +++++++++----------
 pom.xml                                       |  2 +-
 6 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index cf615c1aa29..4cabbd217ee 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,16 +16,16 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 0.0.3  # chart version is set by release-job
-appVersion: 3.2.1
+version: 3.3.0  # chart version is effectively set by release-job
+appVersion: 3.3.0
 keywords:
   - iot-chart
   - digital-twin
   - IoT
-home: https://www.eclipse.org/ditto
+home: https://www.eclipse.dev/ditto
 sources:
   - https://github.com/eclipse-ditto/ditto
-icon: https://www.eclipse.org/ditto/images/ditto.svg
+icon: https://www.eclipse.dev/ditto/images/ditto.svg
 maintainers:
   - name: thjaeckle
     email: thomas.jaeckle@beyonnex.io
diff --git a/deployment/helm/ditto/README.md b/deployment/helm/ditto/README.md
index 4212a7c4f82..631852cb0bb 100644
--- a/deployment/helm/ditto/README.md
+++ b/deployment/helm/ditto/README.md
@@ -2,7 +2,7 @@
 
 ## Introduction
 
-[Eclipse Ditto™](https://www.eclipse.org/ditto/) is a technology in the IoT implementing a software pattern
+[Eclipse Ditto™](https://www.eclipse.dev/ditto/) is a technology in the IoT implementing a software pattern
 called “digital twins”. A digital twin is a virtual, cloud based, representation of his real world counterpart
 (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations, …).
 
diff --git a/deployment/helm/ditto/ci/ci-workflow-values.yaml b/deployment/helm/ditto/ci/ci-workflow-values.yaml
index 6e1b99504cf..f47e2e3a19c 100644
--- a/deployment/helm/ditto/ci/ci-workflow-values.yaml
+++ b/deployment/helm/ditto/ci/ci-workflow-values.yaml
@@ -27,7 +27,7 @@ ingress:
 
 ## ----------------------------------------------------------------------------
 ## policies configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-policies.html
 policies:
   resources:
     cpu: 0.15
@@ -38,7 +38,7 @@ policies:
 
 ## ----------------------------------------------------------------------------
 ## things configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things.html
 things:
   resources:
     cpu: 0.15
@@ -49,7 +49,7 @@ things:
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things-search.html
 thingsSearch:
   resources:
     cpu: 0.15
@@ -60,7 +60,7 @@ thingsSearch:
 
 ## ----------------------------------------------------------------------------
 ## connectivity configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-connectivity.html
 connectivity:
   resources:
     cpu: 0.15
@@ -71,7 +71,7 @@ connectivity:
 
 ## ----------------------------------------------------------------------------
 ## gateway configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-gateway.html
 gateway:
   resources:
     cpu: 0.15
diff --git a/deployment/helm/ditto/local-values.yaml b/deployment/helm/ditto/local-values.yaml
index c58ad3f1c86..9523f26b631 100644
--- a/deployment/helm/ditto/local-values.yaml
+++ b/deployment/helm/ditto/local-values.yaml
@@ -25,7 +25,7 @@ global:
 
 ## ----------------------------------------------------------------------------
 ## policies configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-policies.html
 policies:
   resources:
     cpu: 0.2
@@ -43,7 +43,7 @@ policies:
 
 ## ----------------------------------------------------------------------------
 ## things configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things.html
 things:
   resources:
     cpu: 0.2
@@ -61,7 +61,7 @@ things:
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things-search.html
 thingsSearch:
   resources:
     cpu: 0.2
@@ -72,7 +72,7 @@ thingsSearch:
 
 ## ----------------------------------------------------------------------------
 ## connectivity configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-connectivity.html
 connectivity:
   resources:
     cpu: 0.2
@@ -83,7 +83,7 @@ connectivity:
 
 ## ----------------------------------------------------------------------------
 ## gateway configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-gateway.html
 gateway:
   resources:
     cpu: 0.2
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index 317abe2d22e..2f5558c4f47 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -61,7 +61,7 @@ global:
   hashedBasicAuthUsers: []
   # jwtOnly controls whether only OpenID-Connect authentication is supported
   #  if false, both OpenID-Connect and basicAuth via nginx (see above "basicAuthUsers" and "hashedBasicAuthUsers") is used
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#openid-connect
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#openid-connect
   jwtOnly: true
   # jvmOptions defines the JVM options applied to all Ditto services running in the JVM, it is put in JAVA_TOOL_OPTIONS
   jvmOptions: >
@@ -365,12 +365,12 @@ akka:
 
 # Set "dittoTag" in order to specify another Ditto version to use for all Ditto services:
 # you may also use "1" (for latest Ditto 1.x.x) or "1.5" (for latest Ditto 1.5.x)
-# dittoTag: 3.2.0
+# dittoTag: 3.3.0
 
 
 ## ----------------------------------------------------------------------------
 ## policies configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-policies.html
 policies:
   # enabled controls whether policies related resources should be created
   enabled: true
@@ -395,13 +395,13 @@ policies:
     # repository for the policies docker image
     repository: docker.io/eclipse/ditto-policies
     # tag for the policies docker image - overwrite to specify something else than Chart.AppVersion
-    # tag: 3.2.0
+    # tag: 3.3.0
     # pullPolicy for the policies docker image
     pullPolicy: IfNotPresent
   # additionalJvmOptions JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for policies service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to policies container
   extraEnv:
@@ -547,7 +547,7 @@ policies:
 
 ## ----------------------------------------------------------------------------
 ## things configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-things.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-things.html
 things:
   # enabled controls whether things related resources should be created
   enabled: true
@@ -572,13 +572,13 @@ things:
     # repository for the things docker image
     repository: docker.io/eclipse/ditto-things
     # tag for the things docker image - overwrite to specify something else than Chart.AppVersion
-    # tag: 3.2.0
+    # tag: 3.3.0
     # pullPolicy for the things docker image
     pullPolicy: IfNotPresent
   # additionalJvmOptions JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for things service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to things container
   extraEnv:
@@ -741,12 +741,12 @@ things:
             }
           },
           "security": "basic_sc",
-          "support": "https://www.eclipse.org/ditto/"
+          "support": "https://www.eclipse.dev/ditto/"
         }
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-things-search.html
 thingsSearch:
   # enabled controls whether things-search related resources should be created
   enabled: true
@@ -771,13 +771,13 @@ thingsSearch:
     # repository for the things-search docker image
     repository: docker.io/eclipse/ditto-things-search
     # tag for the things-search docker image - overwrite to specify something else than Chart.AppVersion
-    # tag: 3.2.0
+    # tag: 3.3.0
     # pullPolicy for the things-search docker image
     pullPolicy: IfNotPresent
   # additional JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for things-search service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to things-search container
   extraEnv:
@@ -855,7 +855,7 @@ thingsSearch:
       #  one of: unacknowledged | acknowledged | majority | journaled | w1 | w2 | w3
       searchWriteConcern: "acknowledged"
       # searchWithAcksWriteConcern configures the MongoDB write concern for commands sent with "search-persisted" ACK
-      #  ref: https://www.eclipse.org/ditto/basic-acknowledgements.html#built-in-acknowledgement-labels
+      #  ref: https://www.eclipse.dev/ditto/basic-acknowledgements.html#built-in-acknowledgement-labels
       #  one of: unacknowledged | acknowledged | majority | journaled | w1 | w2 | w3
       searchWithAcksWriteConcern: "majority"
       # queryReadConcern configures the MongoDB read concern for doing queries / performing searches
@@ -921,7 +921,7 @@ thingsSearch:
 
 ## ----------------------------------------------------------------------------
 ## connectivity configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-connectivity.html
 connectivity:
   # enabled controls whether connectivity related resources should be created
   enabled: true
@@ -946,13 +946,13 @@ connectivity:
     # repository for the connectivity docker image
     repository: docker.io/eclipse/ditto-connectivity
     # tag for the connectivity docker image - overwrite to specify something else than Chart.AppVersion
-    # tag: 3.2.0
+    # tag: 3.3.0
     # pullPolicy for the connectivity docker image
     pullPolicy: IfNotPresent
   # additional JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for connectivity service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to connectivity container
   extraEnv:
@@ -1154,7 +1154,7 @@ connectivity:
 
 ## ----------------------------------------------------------------------------
 ## gateway configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-gateway.html
 gateway:
   # enabled controls whether gateway related resources should be created
   enabled: true
@@ -1181,11 +1181,11 @@ gateway:
     # repository for the gateway docker image
     repository: docker.io/eclipse/ditto-gateway
     # tag for the gateway docker image - overwrite to specify something else than Chart.AppVersion
-    # tag: 3.2.0
+    # tag: 3.3.0
     # pullPolicy for the gateway docker image
     pullPolicy: IfNotPresent
   # systemProps used to define arbitrary system properties configuration for gateway
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
     - "-Dditto.protocol.blocklist.0=raw-request-uri"
     - "-Dditto.protocol.blocklist.1=cache-control"
@@ -1277,7 +1277,7 @@ gateway:
     # authentication contains the settings regarding authentication against the gateway
     authentication:
       # enablePreAuthentication whether Ditto "pre-authentication" should be enabled
-      #  ref: https://www.eclipse.org/ditto/installation-operating.html#pre-authentication
+      #  ref: https://www.eclipse.dev/ditto/installation-operating.html#pre-authentication
       enablePreAuthentication: false
       # oauth contains the OAuth2.0 / OpenID Connect related configuration
       oauth:
@@ -1451,7 +1451,7 @@ dittoui:
     # repository for the Ditto UI docker image
     repository: docker.io/eclipse/ditto-ui
     # tag for the Ditto UI image - overwrite to specify something else than Chart.AppVersion
-    # tag: 3.2.0
+    # tag: 3.3.0
     # pullPolicy for the Ditto UI docker image
     pullPolicy: IfNotPresent
   # extraEnv to add arbitrary environment variable to Ditto UI container
diff --git a/pom.xml b/pom.xml
index 3a06ef54281..0d62da4177f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,7 +240,7 @@
         <!-- globally set version for checking binary compatibility against -->
         <!-- whoever changes this to ${revision} or ${project.version} is responsible for API breakage caused by this! -->
         <!-- in other words: never do that here! exclude the 'breakages' locally in the japicmp maven plugin if you intentionally break something -->
-        <binary-compatibility-check.version>3.2.0</binary-compatibility-check.version>
+        <binary-compatibility-check.version>3.3.0</binary-compatibility-check.version>
 
         <maven.skins.fluido.version>1.7</maven.skins.fluido.version>
         <doxia.markdown.version>1.8</doxia.markdown.version>

From b9667f6c85bc4c0374f98bd4c417193077dcf001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 26 Jun 2023 09:16:18 +0200
Subject: [PATCH 137/173] run .join() operations in WoT integration always on
 dedicated dispatcher + configure timeout

---
 ...DefaultWotThingModelExtensionResolver.java |  5 ++-
 .../DefaultWotThingSkeletonGenerator.java     | 13 ++++---
 .../DefaultWotThingDescriptionProvider.java   | 35 ++++++++++++++-----
 3 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java
index 657ccd9b95b..39cf8a5bbcd 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java
@@ -41,7 +41,8 @@ final class DefaultWotThingModelExtensionResolver implements WotThingModelExtens
     private static final String TM_EXTENDS = "tm:extends";
     private static final String TM_REF = "tm:ref";
 
-    private static final Duration MAX_FETCH_MODEL_DURATION = Duration.ofSeconds(30);
+    private static final Duration MAX_FETCH_MODEL_DURATION = Duration.ofSeconds(10);
+    private static final Duration MAX_JOIN_WAIT_DURATION = Duration.ofSeconds(20);
 
     private final WotThingModelFetcher thingModelFetcher;
     private final Executor executor;
@@ -69,6 +70,7 @@ public ThingModel resolveThingModelExtensions(final ThingModel thingModel, final
                                     .thenApplyAsync(aVoid -> fetchedModelFutures.stream()
                                         .map(CompletableFuture::join) // joining does not block anything here as "allOf" already guaranteed that all futures are ready
                                         .toList(), executor)
+                                    .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
                                     .join();
                         }
                 )
@@ -127,6 +129,7 @@ private JsonValue resolveRefs(final JsonObject objectWithTmRef, final DittoHeade
                                 .orElseGet(() -> CompletableFuture.completedStage(null))
                         , executor)
                 .toCompletableFuture()
+                .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
                 .join();
 
         return JsonFactory.mergeJsonValues(objectWithTmRef.remove(TM_REF), refObject).asObject();
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java
index 4126cb1c916..5c3e39dcac9 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java
@@ -87,7 +87,8 @@ final class DefaultWotThingSkeletonGenerator implements WotThingSkeletonGenerato
     private static final String TM_SUBMODEL = "tm:submodel";
     private static final String TM_SUBMODEL_INSTANCE_NAME = "instanceName";
 
-    private static final Duration MAX_FETCH_MODEL_DURATION = Duration.ofSeconds(30);
+    private static final Duration MAX_FETCH_MODEL_DURATION = Duration.ofSeconds(10);
+    private static final Duration MAX_JOIN_WAIT_DURATION = Duration.ofSeconds(20);
 
 
     private final WotThingModelFetcher thingModelFetcher;
@@ -223,12 +224,15 @@ private Optional<Features> createFeaturesFromSubmodels(final ThingModel thingMod
                 .toList();
 
         final List<Feature> features = CompletableFuture.allOf(futureList.toArray(CompletableFuture<?>[]::new))
-                .thenApply(v -> futureList.stream()
+                .thenApplyAsync(v -> futureList.stream()
                         .map(CompletableFuture::join)
                         .filter(Optional::isPresent)
                         .map(Optional::get)
-                        .toList()
-                ).join();
+                        .toList(),
+                        executor
+                )
+                .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
+                .join();
 
         if (features.isEmpty()) {
             return Optional.empty();
@@ -480,6 +484,7 @@ private List<DefinitionIdentifier> determineFurtherFeatureDefinitionIdentifiers(
                                                 dittoHeaders
                                         ), executor)
                                 .toCompletableFuture()
+                                .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
                                 .join();
                 final List<DefinitionIdentifier> combinedIdentifiers = new ArrayList<>();
                 combinedIdentifiers.add(ThingsModelFactory.newFeatureDefinitionIdentifier(link.getHref()));
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java
index e3bb23c02df..8f297a475f1 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java
@@ -15,8 +15,11 @@
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
 import java.net.URL;
+import java.time.Duration;
 import java.util.Optional;
 import java.util.concurrent.CompletionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
@@ -57,16 +60,20 @@ final class DefaultWotThingDescriptionProvider implements WotThingDescriptionPro
 
     public static final String MODEL_PLACEHOLDERS_KEY = "model-placeholders";
 
+    private static final Duration MAX_JOIN_WAIT_DURATION = Duration.ofSeconds(20);
+
     private final WotConfig wotConfig;
     private final WotThingModelFetcher thingModelFetcher;
     private final WotThingDescriptionGenerator thingDescriptionGenerator;
     private final WotThingSkeletonGenerator thingSkeletonGenerator;
+    private final Executor executor;
 
     private DefaultWotThingDescriptionProvider(final ActorSystem actorSystem, final WotConfig wotConfig) {
         this.wotConfig = checkNotNull(wotConfig, "wotConfig");
         thingModelFetcher = new DefaultWotThingModelFetcher(actorSystem, wotConfig);
         thingDescriptionGenerator = WotThingDescriptionGenerator.of(actorSystem, wotConfig, thingModelFetcher);
         thingSkeletonGenerator = WotThingSkeletonGenerator.of(actorSystem, thingModelFetcher);
+        executor = actorSystem.dispatchers().lookup("wot-dispatcher");
     }
 
     /**
@@ -127,9 +134,12 @@ public Optional<Thing> provideThingSkeletonForCreation(final ThingId thingId,
                     logger.debug("Fetching ThingModel from <{}> in order to create Thing skeleton for new Thing " +
                             "with id <{}>", url, thingId);
                     final Optional<Thing> thingSkeleton = thingModelFetcher.fetchThingModel(url, dittoHeaders)
-                            .thenApply(thingModel -> thingSkeletonGenerator
-                                    .generateThingSkeleton(thingId, thingModel, url, dittoHeaders))
+                            .thenApplyAsync(thingModel -> thingSkeletonGenerator
+                                            .generateThingSkeleton(thingId, thingModel, url, dittoHeaders),
+                                    executor
+                            )
                             .toCompletableFuture()
+                            .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
                             .join();
                     logger.debug("Created Thing skeleton for new Thing with id <{}>: <{}>", thingId, thingSkeleton);
                     return thingSkeleton;
@@ -161,9 +171,12 @@ public Optional<Feature> provideFeatureSkeletonForCreation(final String featureI
                     logger.debug("Fetching ThingModel from <{}> in order to create Feature skeleton for new Feature " +
                             "with id <{}>", url, featureId);
                     final Optional<Feature> featureSkeleton = thingModelFetcher.fetchThingModel(url, dittoHeaders)
-                            .thenApply(thingModel -> thingSkeletonGenerator
-                                    .generateFeatureSkeleton(featureId, thingModel, url, dittoHeaders))
+                            .thenApplyAsync(thingModel -> thingSkeletonGenerator
+                                            .generateFeatureSkeleton(featureId, thingModel, url, dittoHeaders),
+                                    executor
+                            )
                             .toCompletableFuture()
+                            .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
                             .join();
                     logger.debug("Created Feature skeleton for new Feature with id <{}>: <{}>", featureId,
                             featureSkeleton);
@@ -194,7 +207,7 @@ private ThingDescription getWotThingDescriptionForThing(final ThingDefinition de
             final URL url = urlOpt.get();
             try {
                 return thingModelFetcher.fetchThingModel(url, dittoHeaders)
-                        .thenApply(thingModel -> thingDescriptionGenerator
+                        .thenApplyAsync(thingModel -> thingDescriptionGenerator
                                 .generateThingDescription(thingId,
                                         thing,
                                         Optional.ofNullable(thing)
@@ -206,9 +219,12 @@ private ThingDescription getWotThingDescriptionForThing(final ThingDefinition de
                                         null,
                                         thingModel,
                                         url,
-                                        dittoHeaders)
+                                        dittoHeaders
+                                ),
+                                executor
                         )
                         .toCompletableFuture()
+                        .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
                         .join();
             } catch (final Exception e) {
                 throw DittoRuntimeException.asDittoRuntimeException(e, throwable ->
@@ -240,7 +256,7 @@ private ThingDescription getWotThingDescriptionForFeature(final ThingId thingId,
             final URL url = urlOpt.get();
             try {
                 return thingModelFetcher.fetchThingModel(url, dittoHeaders)
-                        .thenApply(thingModel -> thingDescriptionGenerator
+                        .thenApplyAsync(thingModel -> thingDescriptionGenerator
                                 .generateThingDescription(thingId,
                                         thing,
                                         feature.getProperties()
@@ -251,9 +267,12 @@ private ThingDescription getWotThingDescriptionForFeature(final ThingId thingId,
                                         feature.getId(),
                                         thingModel,
                                         url,
-                                        dittoHeaders)
+                                        dittoHeaders
+                                ),
+                                executor
                         )
                         .toCompletableFuture()
+                        .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
                         .join();
             } catch (final Exception e) {
                 throw DittoRuntimeException.asDittoRuntimeException(e, throwable ->

From 0d67706b35ff2b882fd135627231b6f73873581e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 26 Jun 2023 11:35:02 +0200
Subject: [PATCH 138/173] fix WoT skeleton creation doing blocking operations
 on Akka dispatcher thread
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* whenever creating a Thing using the WoT "ThingModel" included in the to-be-created thing a `.join()` of a CompletableFuture is called on the main Akka dispatcher thread
* this causes that the complete ActorSystem might be blocked to process any futher messages
* fixed that by making ResultVisitor work with a CompletionStage instead

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../ConnectionPersistenceActor.java           |  7 +-
 .../AbstractPersistenceActor.java             | 38 +++++----
 .../commands/AbstractCommandStrategies.java   |  2 +-
 .../persistentactors/results/EmptyResult.java |  3 +-
 .../persistentactors/results/ErrorResult.java |  3 +-
 .../results/MutationResult.java               | 23 +++---
 .../persistentactors/results/QueryResult.java |  3 +-
 .../persistentactors/results/Result.java      |  3 +-
 .../results/ResultFactory.java                | 41 ++++++++++
 .../results/ResultVisitor.java                |  6 +-
 .../events/AbstractPolicyActionEvent.java     |  8 +-
 .../signals/events/PolicyActionEvent.java     |  2 +-
 .../model/signals/events/SubjectCreated.java  |  2 +-
 .../model/signals/events/SubjectDeleted.java  |  2 +-
 .../model/signals/events/SubjectModified.java |  2 +-
 .../events/SubjectsDeletedPartially.java      |  2 +-
 .../events/SubjectsModifiedPartially.java     |  2 +-
 .../actors/PolicyPersistenceActor.java        |  6 +-
 .../TopLevelPolicyActionCommandStrategy.java  | 32 +++++---
 .../AbstractPolicyCommandStrategyTest.java    | 44 ++++++----
 .../commands/PolicyConflictStrategyTest.java  |  7 +-
 .../commands/CreateThingStrategy.java         | 53 ++++++------
 .../commands/ModifyFeatureStrategy.java       | 80 ++++++++++---------
 .../commands/ModifyFeaturesStrategy.java      | 78 +++++++++++-------
 .../commands/AbstractCommandStrategyTest.java | 16 +++-
 .../commands/ResultFactoryTest.java           | 22 ++++-
 .../commands/ThingConflictStrategyTest.java   |  7 +-
 .../DefaultWotThingDescriptionProvider.java   | 43 +++++-----
 .../provider/WotThingDescriptionProvider.java |  5 +-
 29 files changed, 346 insertions(+), 196 deletions(-)

diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java
index 40411357804..f3238f9576d 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java
@@ -571,8 +571,9 @@ private void askSelfForRetrieveConnectionStatus(@Nullable final CharSequence cor
     }
 
     @Override
-    public void onMutation(final Command<?> command, final ConnectivityEvent<?> event,
-            final WithDittoHeaders response, final boolean becomeCreated, final boolean becomeDeleted) {
+    public void onMutation(final Command<?> command, final CompletionStage<ConnectivityEvent<?>> event,
+            final CompletionStage<WithDittoHeaders> response, final boolean becomeCreated,
+            final boolean becomeDeleted) {
         if (command instanceof StagedCommand stagedCommand) {
             interpretStagedCommand(stagedCommand.withSenderUnlessDefined(getSender()));
         } else {
@@ -612,7 +613,7 @@ private void interpretStagedCommand(final StagedCommand command) {
                             "Failed to handle staged command because required event wasn't present: <{}>",
                             command));
             case PERSIST_AND_APPLY_EVENT -> command.getEvent().ifPresentOrElse(
-                    event -> persistAndApplyEvent(event,
+                    event -> persistAndApplyEvent(CompletableFuture.completedStage(event),
                             (unusedEvent, connection) -> interpretStagedCommand(command.next())),
                     () -> log.error("Failed to handle staged command because required event wasn't present: <{}>",
                             command));
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
index 27e9d9178de..6e808fb5338 100755
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
@@ -15,6 +15,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Optional;
+import java.util.concurrent.CompletionStage;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -518,18 +519,20 @@ protected void becomeDeletedHandler() {
      * @param event   the event to persist and apply.
      * @param handler what happens afterwards.
      */
-    protected void persistAndApplyEvent(final E event, final BiConsumer<E, S> handler) {
+    protected void persistAndApplyEvent(final CompletionStage<E> event, final BiConsumer<E, S> handler) {
 
-        final E modifiedEvent = modifyEventBeforePersist(event);
-        if (modifiedEvent.getDittoHeaders().isDryRun()) {
-            handler.accept(modifiedEvent, entity);
-        } else {
-            persistEvent(modifiedEvent, persistedEvent -> {
-                // after the event was persisted, apply the event on the current actor state
-                applyEvent(persistedEvent);
-                handler.accept(persistedEvent, entity);
-            });
-        }
+        event.thenAccept(completedEvent -> {
+            final E modifiedEvent = modifyEventBeforePersist(completedEvent);
+            if (modifiedEvent.getDittoHeaders().isDryRun()) {
+                handler.accept(modifiedEvent, entity);
+            } else {
+                persistEvent(modifiedEvent, persistedEvent -> {
+                    // after the event was persisted, apply the event on the current actor state
+                    applyEvent(persistedEvent);
+                    handler.accept(persistedEvent, entity);
+                });
+            }
+        });
     }
 
     /**
@@ -670,8 +673,9 @@ private <T extends Command<?>> void handleByStrategy(final T command, @Nullable
     }
 
     @Override
-    public void onMutation(final Command<?> command, final E event, final WithDittoHeaders response,
-                           final boolean becomeCreated, final boolean becomeDeleted) {
+    public void onMutation(final Command<?> command, final CompletionStage<E> event,
+            final CompletionStage<WithDittoHeaders> response,
+            final boolean becomeCreated, final boolean becomeDeleted) {
 
         persistAndApplyEvent(event, (persistedEvent, resultingEntity) -> {
             if (shouldSendResponse(command.getDittoHeaders())) {
@@ -802,6 +806,10 @@ private void notifySender(final WithDittoHeaders message) {
         notifySender(getSender(), message);
     }
 
+    private void notifySender(final CompletionStage<WithDittoHeaders> message) {
+        message.thenAccept(msg -> notifySender(getSender(), msg));
+    }
+
     private void takeSnapshotByInterval(final Control takeSnapshot) {
         takeSnapshot("snapshot interval has passed");
     }
@@ -980,8 +988,8 @@ private HistoricalResultListener(final ActorRef sender, final DittoHeaders histo
         }
 
         @Override
-        public void onMutation(final Command<?> command, final E event,
-                final WithDittoHeaders response,
+        public void onMutation(final Command<?> command, final CompletionStage<E> event,
+                final CompletionStage<WithDittoHeaders> response,
                 final boolean becomeCreated, final boolean becomeDeleted) {
             throw new UnsupportedOperationException("Mutating historical entity not supported.");
         }
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/commands/AbstractCommandStrategies.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/commands/AbstractCommandStrategies.java
index 563995a5589..e49461cecf3 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/commands/AbstractCommandStrategies.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/commands/AbstractCommandStrategies.java
@@ -97,7 +97,7 @@ protected Result<E> doApply(final Context<K> context, @Nullable final S entity,
         if (commandStrategy != null) {
             context.getLog().withCorrelationId(command)
                     .debug("Applying command <{}>", command);
-            return commandStrategy.apply(context, entity, nextRevision, command).map(x -> x);
+            return (Result<E>) commandStrategy.apply(context, entity, nextRevision, command);
         } else {
             // this may happen when subclasses override the "isDefined" condition.
             return unhandled(context, entity, nextRevision, command);
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/EmptyResult.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/EmptyResult.java
index ba93b8f9047..6197c9e30c8 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/EmptyResult.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/EmptyResult.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.ditto.internal.utils.persistentactors.results;
 
+import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 
 import org.eclipse.ditto.base.model.signals.events.Event;
@@ -42,7 +43,7 @@ public void accept(final ResultVisitor<E> visitor) {
     }
 
     @Override
-    public <F extends Event<?>> Result<F> map(final Function<E, F> mappingFunction) {
+    public <F extends Event<?>> Result<F> map(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
         return getInstance();
     }
 
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ErrorResult.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ErrorResult.java
index 307a960fb5f..7279f0fdf68 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ErrorResult.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ErrorResult.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.ditto.internal.utils.persistentactors.results;
 
+import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
@@ -45,7 +46,7 @@ public void accept(final ResultVisitor<E> visitor) {
     }
 
     @Override
-    public <F extends Event<?>> Result<F> map(final Function<E, F> mappingFunction) {
+    public <F extends Event<?>> Result<F> map(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
         return new ErrorResult<>(dittoRuntimeException, errorCausingCommand);
     }
 }
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/MutationResult.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/MutationResult.java
index 70458b19cd0..529bf85fac5 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/MutationResult.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/MutationResult.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.ditto.internal.utils.persistentactors.results;
 
+import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
@@ -26,28 +27,30 @@
 public final class MutationResult<E extends Event<?>> implements Result<E> {
 
     private final Command<?> command;
-    private final E eventToPersist;
-    private final WithDittoHeaders response;
+    private final CompletionStage<E> eventToPersistStage;
+    private final CompletionStage<WithDittoHeaders> responseStage;
     private final boolean becomeCreated;
     private final boolean becomeDeleted;
 
-    MutationResult(final Command<?> command, final E eventToPersist, final WithDittoHeaders response,
+    MutationResult(final Command<?> command,
+            final CompletionStage<E> eventToPersistStage,
+            final CompletionStage<WithDittoHeaders> responseStage,
             final boolean becomeCreated, final boolean becomeDeleted) {
         this.command = command;
-        this.eventToPersist = eventToPersist;
-        this.response = response;
+        this.eventToPersistStage = eventToPersistStage;
+        this.responseStage = responseStage;
         this.becomeCreated = becomeCreated;
         this.becomeDeleted = becomeDeleted;
     }
 
     @Override
     public void accept(final ResultVisitor<E> visitor) {
-        visitor.onMutation(command, eventToPersist, response, becomeCreated, becomeDeleted);
+        visitor.onMutation(command, eventToPersistStage, responseStage, becomeCreated, becomeDeleted);
     }
 
     @Override
-    public <F extends Event<?>> Result<F> map(final Function<E, F> mappingFunction) {
-        return new MutationResult<>(command, mappingFunction.apply(eventToPersist), response, becomeCreated,
+    public <F extends Event<?>> Result<F> map(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
+        return new MutationResult<>(command, mappingFunction.apply(eventToPersistStage), responseStage, becomeCreated,
                 becomeDeleted);
     }
 
@@ -55,8 +58,8 @@ public <F extends Event<?>> Result<F> map(final Function<E, F> mappingFunction)
     public String toString() {
         return this.getClass().getSimpleName() + " [" +
                 "command=" + command +
-                ", eventToPersist=" + eventToPersist +
-                ", response=" + response +
+                ", eventToPersistStage=" + eventToPersistStage +
+                ", response=" + responseStage +
                 ", becomeCreated=" + becomeCreated +
                 ", becomeDeleted=" + becomeDeleted +
                 ']';
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/QueryResult.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/QueryResult.java
index 1f6dfbae559..21911d6d06c 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/QueryResult.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/QueryResult.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.ditto.internal.utils.persistentactors.results;
 
+import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
@@ -47,7 +48,7 @@ public void accept(final ResultVisitor<E> visitor) {
     }
 
     @Override
-    public <F extends Event<?>> Result<F> map(final Function<E, F> mappingFunction) {
+    public <F extends Event<?>> Result<F> map(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
         return new QueryResult<>(command, response);
     }
 }
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/Result.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/Result.java
index 7cd94f00937..0bf1ed5f582 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/Result.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/Result.java
@@ -12,6 +12,7 @@
  */
 package org.eclipse.ditto.internal.utils.persistentactors.results;
 
+import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 
 import org.eclipse.ditto.base.model.signals.events.Event;
@@ -36,7 +37,7 @@ public interface Result<E extends Event<?>> {
      * @return the new result.
      * @since 2.0.0
      */
-    <F extends Event<?>> Result<F> map(Function<E, F> mappingFunction);
+    <F extends Event<?>> Result<F> map(Function<CompletionStage<E>, CompletionStage<F>> mappingFunction);
 
     /**
      * @return the empty result
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultFactory.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultFactory.java
index cbfa5f312ba..1020b4f6f50 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultFactory.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultFactory.java
@@ -12,6 +12,9 @@
  */
 package org.eclipse.ditto.internal.utils.persistentactors.results;
 
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
 import javax.annotation.concurrent.Immutable;
 
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
@@ -41,6 +44,23 @@ private ResultFactory() {
     public static <E extends Event<?>> Result<E> newMutationResult(final Command<?> command, final E eventToPersist,
             final WithDittoHeaders response) {
 
+        return newMutationResult(command, CompletableFuture.completedStage(eventToPersist),
+                CompletableFuture.completedStage(response));
+    }
+
+    /**
+     * Create a mutation result.
+     *
+     * @param command command that caused the mutation.
+     * @param eventToPersist event of the mutation.
+     * @param response response of the command.
+     * @param <E> type of the event.
+     * @return the result.
+     */
+    public static <E extends Event<?>> Result<E> newMutationResult(final Command<?> command,
+            final CompletionStage<E> eventToPersist,
+            final CompletionStage<WithDittoHeaders> response) {
+
         return new MutationResult<>(command, eventToPersist, response, false, false);
     }
 
@@ -61,6 +81,27 @@ public static <E extends Event<?>> Result<E> newMutationResult(final Command<?>
             final boolean becomeCreated,
             final boolean becomeDeleted) {
 
+        return newMutationResult(command, CompletableFuture.completedStage(eventToPersist),
+                CompletableFuture.completedStage(response), becomeCreated, becomeDeleted);
+    }
+
+    /**
+     * Create a mutation result.
+     *
+     * @param command command that caused the mutation.
+     * @param eventToPersist event of the mutation.
+     * @param response response of the command.
+     * @param becomeCreated whether the actor should behave as if the entity is created.
+     * @param becomeDeleted whether the actor should behave as if the entity is deleted.
+     * @param <E> type of the event.
+     * @return the result.
+     */
+    public static <E extends Event<?>> Result<E> newMutationResult(final Command<?> command,
+            final CompletionStage<E> eventToPersist,
+            final CompletionStage<WithDittoHeaders> response,
+            final boolean becomeCreated,
+            final boolean becomeDeleted) {
+
         return new MutationResult<>(command, eventToPersist, response, becomeCreated, becomeDeleted);
     }
 
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultVisitor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultVisitor.java
index e2b8cebe8cd..57548b391c2 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultVisitor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultVisitor.java
@@ -12,6 +12,8 @@
  */
 package org.eclipse.ditto.internal.utils.persistentactors.results;
 
+import java.util.concurrent.CompletionStage;
+
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
@@ -40,8 +42,8 @@ default void onEmpty() {
      * @param becomeCreated whether the actor should behave as if the entity is created.
      * @param becomeDeleted whether the actor should behave as if the entity is deleted.
      */
-    void onMutation(Command<?> command, E event, WithDittoHeaders response, boolean becomeCreated,
-            boolean becomeDeleted);
+    void onMutation(Command<?> command, CompletionStage<E> event, CompletionStage<WithDittoHeaders> response,
+            boolean becomeCreated, boolean becomeDeleted);
 
     /**
      * Evaluate a query result.
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/AbstractPolicyActionEvent.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/AbstractPolicyActionEvent.java
index da6810e2e5a..66bf5ba671e 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/AbstractPolicyActionEvent.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/AbstractPolicyActionEvent.java
@@ -67,10 +67,10 @@ protected AbstractPolicyActionEvent(final String type,
      */
     protected SubjectsModifiedPartially aggregateWithSubjectCreatedOrModified(
             final Map<Label, Collection<Subject>> initialModifiedSubjects,
-            final Collection<PolicyActionEvent<?>> otherEvents) {
+            final Collection<PolicyActionEvent> otherEvents) {
 
         final Map<Label, Collection<Subject>> modifiedSubjects = new LinkedHashMap<>(initialModifiedSubjects);
-        for (final PolicyActionEvent<?> event : otherEvents) {
+        for (final PolicyActionEvent event : otherEvents) {
             if (event instanceof SubjectCreated) {
                 final SubjectCreated subjectCreated = (SubjectCreated) event;
                 final Set<Subject> mergedSubjects =
@@ -99,10 +99,10 @@ protected SubjectsModifiedPartially aggregateWithSubjectCreatedOrModified(
      */
     protected SubjectsDeletedPartially aggregateWithSubjectDeleted(
             final Map<Label, Collection<SubjectId>> initialDeletedSubjectIds,
-            final Collection<PolicyActionEvent<?>> otherEvents) {
+            final Collection<PolicyActionEvent> otherEvents) {
 
         final Map<Label, Collection<SubjectId>> deletedSubjectIds = new LinkedHashMap<>(initialDeletedSubjectIds);
-        for (final PolicyActionEvent<?> event : otherEvents) {
+        for (final PolicyActionEvent event : otherEvents) {
             if (event instanceof SubjectDeleted) {
                 final SubjectDeleted subjectDeleted = (SubjectDeleted) event;
                 final Collection<SubjectId> existingSubjectIds = deletedSubjectIds.get(subjectDeleted.getLabel());
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyActionEvent.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyActionEvent.java
index 79982f133ed..afbbd789441 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyActionEvent.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyActionEvent.java
@@ -28,5 +28,5 @@ public interface PolicyActionEvent<T extends PolicyActionEvent<T>> extends Polic
      * @param otherPolicyActionEvents the collection of policy action events.
      * @return the aggregated event.
      */
-    PolicyEvent<?> aggregateWith(Collection<PolicyActionEvent<?>> otherPolicyActionEvents);
+    PolicyEvent<?> aggregateWith(Collection<PolicyActionEvent> otherPolicyActionEvents);
 }
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectCreated.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectCreated.java
index 6c853272925..980cedd28a9 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectCreated.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectCreated.java
@@ -202,7 +202,7 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
     }
 
     @Override
-    public SubjectsModifiedPartially aggregateWith(final Collection<PolicyActionEvent<?>> otherPolicyActionEvents) {
+    public SubjectsModifiedPartially aggregateWith(final Collection<PolicyActionEvent> otherPolicyActionEvents) {
         final Map<Label, Collection<Subject>> initialCreatedSubjects =
                 Stream.of(0).collect(Collectors.toMap(i -> label, i -> Collections.singleton(subject),
                         (u, v) -> {
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectDeleted.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectDeleted.java
index dbf417163b8..7ca4e7ae510 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectDeleted.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectDeleted.java
@@ -188,7 +188,7 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
     }
 
     @Override
-    public SubjectsDeletedPartially aggregateWith(final Collection<PolicyActionEvent<?>> otherPolicyActionEvents) {
+    public SubjectsDeletedPartially aggregateWith(final Collection<PolicyActionEvent> otherPolicyActionEvents) {
         final Map<Label, Collection<SubjectId>> initialDeletedSubjectId =
                 Stream.of(0).collect(Collectors.toMap(i -> label, i -> Collections.singleton(subjectId),
                         (u, v) -> {
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectModified.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectModified.java
index e0b74780d5b..f5d40d29e39 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectModified.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectModified.java
@@ -202,7 +202,7 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
     }
 
     @Override
-    public SubjectsModifiedPartially aggregateWith(final Collection<PolicyActionEvent<?>> otherPolicyActionEvents) {
+    public SubjectsModifiedPartially aggregateWith(final Collection<PolicyActionEvent> otherPolicyActionEvents) {
         final Map<Label, Collection<Subject>> initialModifiedSubjects =
                 Stream.of(0).collect(Collectors.toMap(i -> label, i -> Collections.singleton(subject),
                         (u, v) -> {
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsDeletedPartially.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsDeletedPartially.java
index 755acbe4696..dc8916c7759 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsDeletedPartially.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsDeletedPartially.java
@@ -190,7 +190,7 @@ public int hashCode() {
     }
 
     @Override
-    public SubjectsDeletedPartially aggregateWith(final Collection<PolicyActionEvent<?>> otherPolicyActionEvents) {
+    public SubjectsDeletedPartially aggregateWith(final Collection<PolicyActionEvent> otherPolicyActionEvents) {
         return aggregateWithSubjectDeleted(deletedSubjectIds, otherPolicyActionEvents);
     }
 
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsModifiedPartially.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsModifiedPartially.java
index a1c85153421..7a70d714dad 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsModifiedPartially.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsModifiedPartially.java
@@ -184,7 +184,7 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
     }
 
     @Override
-    public SubjectsModifiedPartially aggregateWith(final Collection<PolicyActionEvent<?>> otherPolicyActionEvents) {
+    public SubjectsModifiedPartially aggregateWith(final Collection<PolicyActionEvent> otherPolicyActionEvents) {
         return aggregateWithSubjectCreatedOrModified(modifiedSubjects, otherPolicyActionEvents);
     }
 
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
index 51d580dfc28..a2d454f53b8 100755
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
@@ -14,6 +14,7 @@
 
 import java.time.Instant;
 import java.util.Set;
+import java.util.concurrent.CompletionStage;
 import java.util.stream.StreamSupport;
 
 import javax.annotation.Nullable;
@@ -245,12 +246,13 @@ private void publishPolicyTag(final PolicyEvent<?> event) {
     }
 
     @Override
-    public void onMutation(final Command<?> command, final PolicyEvent<?> event, final WithDittoHeaders response,
+    public void onMutation(final Command<?> command, final CompletionStage<PolicyEvent<?>> event,
+            final CompletionStage<WithDittoHeaders> response,
             final boolean becomeCreated, final boolean becomeDeleted) {
 
         persistAndApplyEvent(event, (persistedEvent, resultingEntity) -> {
             if (shouldSendResponse(command.getDittoHeaders())) {
-                notifySender(getSender(), response);
+                response.thenAccept(rsp -> notifySender(getSender(), rsp));
             }
             if (becomeDeleted) {
                 becomeDeletedHandler();
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java
index d5e82708ff9..ff93ab88ab1 100644
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java
@@ -18,7 +18,10 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
@@ -101,11 +104,12 @@ protected Result<PolicyEvent<?>> doApply(final Context<PolicyId> context,
             if (visitor.error != null) {
                 return ResultFactory.newErrorResult(visitor.error, command);
             } else {
-                final Optional<PolicyEvent<?>> event = visitor.aggregateEvents();
+                final Optional<CompletionStage<PolicyEvent<?>>> event = visitor.aggregateEvents();
                 if (event.isPresent()) {
                     final TopLevelPolicyActionCommandResponse response =
                             TopLevelPolicyActionCommandResponse.of(context.getState(), dittoHeaders);
-                    return ResultFactory.newMutationResult(command, event.get(), response);
+                    return ResultFactory.newMutationResult(command, event.get(),
+                            CompletableFuture.completedFuture(response));
                 } else {
                     // builds an internal server error, 500
                     final PolicyActionFailedException exception = PolicyActionFailedException.newBuilder()
@@ -161,24 +165,34 @@ private static ResultCollectionVisitor collectResults(
     private static final class ResultCollectionVisitor implements ResultVisitor<PolicyActionEvent<?>> {
 
         @Nullable private DittoRuntimeException error;
-        @Nullable private PolicyActionEvent<?> firstEvent;
-        private final List<PolicyActionEvent<?>> otherEvents = new ArrayList<>();
+        @Nullable private CompletionStage<PolicyActionEvent<?>> firstEvent;
+        private final List<CompletableFuture<PolicyActionEvent>> otherEvents = new ArrayList<>();
 
-        private Optional<PolicyEvent<?>> aggregateEvents() {
+        private Optional<CompletionStage<PolicyEvent<?>>> aggregateEvents() {
             if (firstEvent == null) {
                 return Optional.empty();
             } else {
-                return Optional.of(firstEvent.aggregateWith(otherEvents));
+                return Optional.of(
+                        firstEvent.thenCompose(fe ->
+                                CompletableFuture.allOf(otherEvents.toArray(new CompletableFuture[0]))
+                                        .thenApply(aVoid -> fe.aggregateWith(otherEvents.stream()
+                                                .map(CompletableFuture::join)
+                                                .filter(Objects::nonNull)
+                                                .toList()
+                                        ))
+                        )
+                );
             }
         }
 
         @Override
-        public void onMutation(final Command<?> command, final PolicyActionEvent<?> event,
-                final WithDittoHeaders response, final boolean becomeCreated, final boolean becomeDeleted) {
+        public void onMutation(final Command<?> command, final CompletionStage<PolicyActionEvent<?>> event,
+                final CompletionStage<WithDittoHeaders> response, final boolean becomeCreated,
+                final boolean becomeDeleted) {
             if (firstEvent == null) {
                 firstEvent = event;
             } else {
-                otherEvents.add(event);
+                otherEvents.add(event.thenApply(x -> (PolicyActionEvent) x).toCompletableFuture());
             }
         }
 
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategyTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategyTest.java
index 11376735046..49d0625fc54 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategyTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategyTest.java
@@ -21,10 +21,12 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletionStage;
 import java.util.function.Consumer;
 
 import javax.annotation.Nullable;
 
+import org.assertj.core.api.CompletableFutureAssert;
 import org.eclipse.ditto.base.model.auth.AuthorizationContext;
 import org.eclipse.ditto.base.model.auth.AuthorizationSubject;
 import org.eclipse.ditto.base.model.auth.DittoAuthorizationContextType;
@@ -106,21 +108,27 @@ void assertModificationResult(
         final CommandStrategy.Context<PolicyId> context = getDefaultContext();
         final Result<?> result = applyStrategy(underTest, context, policy, command);
 
-        final ArgumentCaptor<T> event = ArgumentCaptor.forClass(expectedEventClass);
-        final ArgumentCaptor<R> response = ArgumentCaptor.forClass(expectedResponseClass);
+        final ArgumentCaptor<CompletionStage<T>> eventStage = ArgumentCaptor.forClass(CompletionStage.class);
+        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage =
+                ArgumentCaptor.forClass(CompletionStage.class);
         final Dummy<T> mock = Dummy.mock();
         result.accept(cast(mock));
 
-        verify(mock).onMutation(any(), event.capture(), response.capture(), anyBoolean(), eq(false));
-        assertThat(event.getValue()).isInstanceOf(expectedEventClass);
-        assertThat(response.getValue()).isInstanceOf(expectedResponseClass);
+        verify(mock).onMutation(any(), eventStage.capture(), responseStage.capture(),
+                anyBoolean(), eq(false));
+        assertThat(eventStage.getValue()).isInstanceOf(CompletionStage.class);
+        CompletableFutureAssert.assertThatCompletionStage(eventStage.getValue())
+                        .isCompletedWithValueMatching(t -> expectedEventClass.isAssignableFrom(t.getClass()));
+        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
+        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
+                .isCompletedWithValueMatching(t -> expectedResponseClass.isAssignableFrom(t.getClass()));
 
-        assertThat(event.getValue())
+        assertThat(eventStage.getValue().toCompletableFuture().join())
                 .describedAs("Event satisfactions failed for expected event of type '%s'",
                         expectedEventClass.getSimpleName())
                 .satisfies(eventSatisfactions);
-        assertThat(response.getValue())
-                .describedAs("Response predicate failed for expected response of type '%s'",
+        assertThat((R) responseStage.getValue().toCompletableFuture().join())
+                .describedAs("Response predicate failed for expected responseStage of type '%s'",
                         expectedResponseClass.getSimpleName())
                 .satisfies(responseSatisfactions);
     }
@@ -167,15 +175,22 @@ private static <T extends PolicyEvent<?>> T assertModificationResult(final Resul
             final WithDittoHeaders expectedResponse,
             final boolean becomeDeleted) {
 
-        final ArgumentCaptor<T> event = ArgumentCaptor.forClass(eventClazz);
+        final ArgumentCaptor<CompletionStage<T>> eventStage = ArgumentCaptor.forClass(CompletionStage.class);
+        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage =
+                ArgumentCaptor.forClass(CompletionStage.class);
 
         final Dummy<T> mock = Dummy.mock();
 
         result.accept(cast(mock));
 
-        verify(mock).onMutation(any(), event.capture(), eq(expectedResponse), anyBoolean(), eq(becomeDeleted));
-        assertThat(event.getValue()).isInstanceOf(eventClazz);
-        return event.getValue();
+        verify(mock).onMutation(any(), eventStage.capture(), responseStage.capture(), anyBoolean(), eq(becomeDeleted));
+        assertThat(eventStage.getValue()).isInstanceOf(CompletionStage.class);
+        CompletableFutureAssert.assertThatCompletionStage(eventStage.getValue())
+                .isCompletedWithValueMatching(t -> eventClazz.isAssignableFrom(t.getClass()));
+        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
+        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
+                .isCompletedWithValue(expectedResponse);
+        return eventStage.getValue().toCompletableFuture().join();
     }
 
     static <C extends Command<?>, E extends Event<?>> Result<E> applyStrategy(
@@ -191,11 +206,12 @@ static <E extends Event<?>> E getEvent(final Result<E> result) {
         final List<E> box = new ArrayList<>(1);
         result.accept(new ResultVisitor<>() {
             @Override
-            public void onMutation(final Command<?> command, final E event, final WithDittoHeaders response,
+            public void onMutation(final Command<?> command, final CompletionStage<E> event,
+                    final CompletionStage<WithDittoHeaders> response,
                     final boolean becomeCreated,
                     final boolean becomeDeleted) {
 
-                box.add(event);
+                box.add(event.toCompletableFuture().join());
             }
 
             @Override
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PolicyConflictStrategyTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PolicyConflictStrategyTest.java
index 42c38c7e741..f19460f103e 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PolicyConflictStrategyTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PolicyConflictStrategyTest.java
@@ -18,6 +18,8 @@
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
+import java.util.concurrent.CompletionStage;
+
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
@@ -100,8 +102,9 @@ private ExpectErrorVisitor(final Class<? extends DittoRuntimeException> clazz) {
         }
 
         @Override
-        public void onMutation(final Command command, final PolicyEvent event, final WithDittoHeaders response,
-                final boolean becomeCreated, final boolean becomeDeleted) {
+        public void onMutation(final Command<?> command, final CompletionStage<PolicyEvent<?>> event,
+                final CompletionStage<WithDittoHeaders> response, final boolean becomeCreated,
+                final boolean becomeDeleted) {
             throw new AssertionError("Expect error, got mutation: " + event);
         }
 
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/CreateThingStrategy.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/CreateThingStrategy.java
index 211eacdebba..6d5d16102b7 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/CreateThingStrategy.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/CreateThingStrategy.java
@@ -18,6 +18,7 @@
 import java.time.Instant;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.CompletionStage;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
@@ -106,34 +107,40 @@ protected Result<ThingEvent<?>> doApply(final Context<ThingId> context,
             newThing = newThing.setPolicyId(PolicyId.of(context.getState()));
         }
 
+        final Instant now = Instant.now();
+
         final Thing finalNewThing = newThing;
-        newThing = wotThingDescriptionProvider.provideThingSkeletonForCreation(
+        final CompletionStage<Thing> thingStage = wotThingDescriptionProvider.provideThingSkeletonForCreation(
                         command.getEntityId(),
                         newThing.getDefinition().orElse(null),
                         commandHeaders
                 )
-                .map(wotBasedThingSkeleton ->
-                        JsonFactory.mergeJsonValues(finalNewThing.toJson(), wotBasedThingSkeleton.toJson())
-                )
-                .filter(JsonValue::isObject)
-                .map(JsonValue::asObject)
-                .map(ThingsModelFactory::newThing)
-                .orElse(finalNewThing);
-
-        final Instant now = Instant.now();
-        final Thing newThingWithImplicits = newThing.toBuilder()
-                .setModified(now)
-                .setCreated(now)
-                .setRevision(nextRevision)
-                .setMetadata(metadata)
-                .build();
-        final ThingCreated thingCreated = ThingCreated.of(newThingWithImplicits, nextRevision, now, commandHeaders,
-                metadata);
-        final WithDittoHeaders response = appendETagHeaderIfProvided(command,
-                CreateThingResponse.of(newThingWithImplicits, commandHeaders),
-                newThingWithImplicits);
-
-        return newMutationResult(command, thingCreated, response, true, false);
+                .thenApply(opt -> opt.map(wotBasedThingSkeleton ->
+                                        JsonFactory.mergeJsonValues(finalNewThing.toJson(), wotBasedThingSkeleton.toJson())
+                                )
+                                .filter(JsonValue::isObject)
+                                .map(JsonValue::asObject)
+                                .map(ThingsModelFactory::newThing)
+                                .orElse(finalNewThing)
+                ).thenApply(enhancedThing -> enhancedThing.toBuilder()
+                        .setModified(now)
+                        .setCreated(now)
+                        .setRevision(nextRevision)
+                        .setMetadata(metadata)
+                        .build()
+                );
+
+        final CompletionStage<ThingEvent<?>> eventStage =
+                thingStage.thenApply(newThingWithImplicits ->
+                        ThingCreated.of(newThingWithImplicits, nextRevision, now, commandHeaders, metadata)
+                );
+
+        final CompletionStage<WithDittoHeaders> responseStage = thingStage.thenApply(newThingWithImplicits ->
+                appendETagHeaderIfProvided(command, CreateThingResponse.of(newThingWithImplicits, commandHeaders),
+                        newThingWithImplicits)
+        );
+
+        return newMutationResult(command, eventStage, responseStage, true, false);
     }
 
     private Thing handleCommandVersion(final Context<ThingId> context, final JsonSchemaVersion version,
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeatureStrategy.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeatureStrategy.java
index 91466b67fd5..019cdb59512 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeatureStrategy.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeatureStrategy.java
@@ -15,6 +15,7 @@
 import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.CompletionStage;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -121,49 +122,50 @@ private Result<ThingEvent<?>> getCreateResult(final Context<ThingId> context, fi
 
         final DittoHeaders dittoHeaders = command.getDittoHeaders();
 
-        Feature feature = command.getFeature();
-        final Feature finalNewFeature = feature;
-        feature = wotThingDescriptionProvider.provideFeatureSkeletonForCreation(
+        final Feature finalNewFeature = command.getFeature();
+        final CompletionStage<Feature> featureStage = wotThingDescriptionProvider.provideFeatureSkeletonForCreation(
                         finalNewFeature.getId(),
                         finalNewFeature.getDefinition().orElse(null),
                         dittoHeaders
                 )
-                .map(wotBasedFeatureSkeleton -> {
-                        final Optional<FeatureDefinition> mergedDefinition =
-                                wotBasedFeatureSkeleton.getDefinition()
-                                        .map(def -> {
-                                                final Set<DefinitionIdentifier> identifiers = Stream.concat(
-                                                        wotBasedFeatureSkeleton.getDefinition()
-                                                                .map(FeatureDefinition::stream)
-                                                                .orElse(Stream.empty()),
-                                                        finalNewFeature.getDefinition()
-                                                                .map(FeatureDefinition::stream)
-                                                                .orElse(Stream.empty())
-                                                ).collect(Collectors.toCollection(LinkedHashSet::new));
-                                                return ThingsModelFactory.newFeatureDefinition(identifiers);
-                                        })
-                                        .or(finalNewFeature::getDefinition);
-
-                        return mergedDefinition.map(definitionIdentifiers -> JsonFactory.mergeJsonValues(
-                                finalNewFeature.setDefinition(definitionIdentifiers).toJson(),
-                                wotBasedFeatureSkeleton.toJson()
-                        )).orElseGet(() -> JsonFactory.mergeJsonValues(finalNewFeature.toJson(),
-                                wotBasedFeatureSkeleton.toJson())
-                        );
-                })
-                .filter(JsonValue::isObject)
-                .map(JsonValue::asObject)
-                .map(ThingsModelFactory::newFeatureBuilder)
-                .map(b -> b.useId(finalNewFeature.getId()).build())
-                .orElse(finalNewFeature);
-
-        final ThingEvent<?> event =
-                FeatureCreated.of(command.getEntityId(), feature, nextRevision, getEventTimestamp(), dittoHeaders,
-                        metadata);
-        final WithDittoHeaders response = appendETagHeaderIfProvided(command,
-                ModifyFeatureResponse.created(context.getState(), feature, dittoHeaders), thing);
-
-        return ResultFactory.newMutationResult(command, event, response);
+                .thenApply(opt -> opt.map(wotBasedFeatureSkeleton -> wotBasedFeatureSkeleton.getDefinition()
+                                .map(def -> {
+                                    final Set<DefinitionIdentifier> identifiers = Stream.concat(
+                                            wotBasedFeatureSkeleton.getDefinition()
+                                                    .map(FeatureDefinition::stream)
+                                                    .orElse(Stream.empty()),
+                                            finalNewFeature.getDefinition()
+                                                    .map(FeatureDefinition::stream)
+                                                    .orElse(Stream.empty())
+                                    ).collect(Collectors.toCollection(LinkedHashSet::new));
+                                    return ThingsModelFactory.newFeatureDefinition(identifiers);
+                                })
+                                .or(finalNewFeature::getDefinition)
+                                .map(definitionIdentifiers -> JsonFactory.mergeJsonValues(
+                                        finalNewFeature.setDefinition(definitionIdentifiers).toJson(),
+                                        wotBasedFeatureSkeleton.toJson()
+                                ))
+                                .orElseGet(() -> JsonFactory.mergeJsonValues(finalNewFeature.toJson(),
+                                        wotBasedFeatureSkeleton.toJson())
+                                ))
+                        .filter(JsonValue::isObject)
+                        .map(JsonValue::asObject)
+                        .map(ThingsModelFactory::newFeatureBuilder)
+                        .map(b -> b.useId(finalNewFeature.getId()).build())
+                        .orElse(finalNewFeature)
+                );
+
+        final CompletionStage<ThingEvent<?>> eventStage =
+                featureStage.thenApply(feature -> FeatureCreated.of(command.getEntityId(), feature, nextRevision,
+                        getEventTimestamp(), dittoHeaders,
+                        metadata));
+
+        final CompletionStage<WithDittoHeaders> response = featureStage.thenApply(modFeature ->
+                appendETagHeaderIfProvided(command,
+                        ModifyFeatureResponse.created(context.getState(), modFeature, dittoHeaders), thing)
+        );
+
+        return ResultFactory.newMutationResult(command, eventStage, response);
     }
 
     @Override
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeaturesStrategy.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeaturesStrategy.java
index 70a1b4506ff..f222a2a487e 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeaturesStrategy.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeaturesStrategy.java
@@ -13,8 +13,12 @@
 package org.eclipse.ditto.things.service.persistence.actors.strategies.commands;
 
 import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -31,6 +35,7 @@
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.things.model.DefinitionIdentifier;
+import org.eclipse.ditto.things.model.Feature;
 import org.eclipse.ditto.things.model.FeatureDefinition;
 import org.eclipse.ditto.things.model.Features;
 import org.eclipse.ditto.things.model.Thing;
@@ -113,19 +118,17 @@ private Result<ThingEvent<?>> getCreateResult(final Context<ThingId> context, fi
 
         final DittoHeaders dittoHeaders = command.getDittoHeaders();
 
-        final Features features = ThingsModelFactory.newFeatures(command.getFeatures()
+        final List<CompletionStage<Feature>> featureStages = command.getFeatures()
                 .stream()
                 .map(feature -> wotThingDescriptionProvider.provideFeatureSkeletonForCreation(
-                                feature.getId(),
-                                feature.getDefinition().orElse(null),
-                                dittoHeaders
-                        )
-                        .map(wotBasedFeatureSkeleton -> {
-                                final Optional<FeatureDefinition> mergedDefinition =
-                                        wotBasedFeatureSkeleton.getDefinition()
+                                        feature.getId(),
+                                        feature.getDefinition().orElse(null),
+                                        dittoHeaders
+                                )
+                                .thenApply(opt -> opt.map(wotBasedFSkel -> wotBasedFSkel.getDefinition()
                                                 .map(def -> {
                                                     final Set<DefinitionIdentifier> identifiers = Stream.concat(
-                                                            wotBasedFeatureSkeleton.getDefinition()
+                                                            wotBasedFSkel.getDefinition()
                                                                     .map(FeatureDefinition::stream)
                                                                     .orElse(Stream.empty()),
                                                             feature.getDefinition()
@@ -134,32 +137,45 @@ private Result<ThingEvent<?>> getCreateResult(final Context<ThingId> context, fi
                                                     ).collect(Collectors.toCollection(LinkedHashSet::new));
                                                     return ThingsModelFactory.newFeatureDefinition(identifiers);
                                                 })
-                                                .or(feature::getDefinition);
-
-                                return mergedDefinition.map(definitionIdentifiers -> JsonFactory.mergeJsonValues(
-                                        feature.setDefinition(definitionIdentifiers).toJson(),
-                                        wotBasedFeatureSkeleton.toJson()
-                                )).orElseGet(() -> JsonFactory.mergeJsonValues(feature.toJson(),
-                                        wotBasedFeatureSkeleton.toJson())
-                                );
-
-                        })
-                        .filter(JsonValue::isObject)
-                        .map(JsonValue::asObject)
-                        .map(ThingsModelFactory::newFeatureBuilder)
-                        .map(b -> b.useId(feature.getId()).build())
-                        .orElse(feature)
+                                                .or(feature::getDefinition).map(definitionIdentifiers -> JsonFactory.mergeJsonValues(
+                                                        feature.setDefinition(definitionIdentifiers).toJson(),
+                                                        wotBasedFSkel.toJson()
+                                                )).orElseGet(() -> JsonFactory.mergeJsonValues(feature.toJson(),
+                                                        wotBasedFSkel.toJson())
+                                                ))
+                                        .filter(JsonValue::isObject)
+                                        .map(JsonValue::asObject)
+                                        .map(ThingsModelFactory::newFeatureBuilder)
+                                        .map(b -> b.useId(feature.getId()).build())
+                                        .orElse(feature)
+                                )
+                )
+                .toList();
+
+        final CompletableFuture<Features> featuresStage =
+                CompletableFuture.allOf(featureStages.toArray(new CompletableFuture[0]))
+                        .thenApply(aVoid ->
+                                ThingsModelFactory.newFeatures(
+                                        featureStages.stream()
+                                                .map(CompletionStage::toCompletableFuture)
+                                                .map(CompletableFuture::join)
+                                                .filter(Objects::nonNull)
+                                                .toList()
+                                )
+                        );
+
+        final CompletableFuture<ThingEvent<?>> eventStage = featuresStage.thenApply(features ->
+                FeaturesCreated.of(command.getEntityId(), features, nextRevision, getEventTimestamp(),
+                        dittoHeaders, metadata
                 )
-                .toList()
         );
 
-        final ThingEvent<?> event =
-                FeaturesCreated.of(command.getEntityId(), features, nextRevision, getEventTimestamp(),
-                        dittoHeaders, metadata);
-        final WithDittoHeaders response = appendETagHeaderIfProvided(command,
-                ModifyFeaturesResponse.created(context.getState(), features, dittoHeaders), thing);
+        final CompletableFuture<WithDittoHeaders> responseStage =
+                featuresStage.thenApply(features -> appendETagHeaderIfProvided(command,
+                        ModifyFeaturesResponse.created(context.getState(), features, dittoHeaders), thing)
+                );
 
-        return ResultFactory.newMutationResult(command, event, response);
+        return ResultFactory.newMutationResult(command, eventStage, responseStage);
     }
 
 
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/AbstractCommandStrategyTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/AbstractCommandStrategyTest.java
index 2e27c326e92..b8945fa6c89 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/AbstractCommandStrategyTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/AbstractCommandStrategyTest.java
@@ -20,10 +20,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
+import java.util.concurrent.CompletionStage;
 import java.util.function.Consumer;
 
 import javax.annotation.Nullable;
 
+import org.assertj.core.api.CompletableFutureAssert;
 import org.eclipse.ditto.base.model.common.DittoSystemProperties;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
@@ -148,15 +150,21 @@ private static <T extends ThingModifiedEvent<?>> T assertModificationResult(fina
             final WithDittoHeaders expectedResponse,
             final boolean becomeDeleted) {
 
-        final ArgumentCaptor<T> event = ArgumentCaptor.forClass(eventClazz);
+        final ArgumentCaptor<CompletionStage<ThingEvent<?>>> eventStage = ArgumentCaptor.forClass(CompletionStage.class);
+        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage = ArgumentCaptor.forClass(CompletionStage.class);
 
         final ResultVisitor<ThingEvent<?>> mock = mock(Dummy.class);
 
         result.accept(mock);
 
-        verify(mock).onMutation(any(), event.capture(), eq(expectedResponse), anyBoolean(), eq(becomeDeleted));
-        assertThat(event.getValue()).isInstanceOf(eventClazz);
-        return event.getValue();
+        verify(mock).onMutation(any(), eventStage.capture(), responseStage.capture(), anyBoolean(), eq(becomeDeleted));
+        assertThat(eventStage.getValue()).isInstanceOf(CompletionStage.class);
+        CompletableFutureAssert.assertThatCompletionStage(eventStage.getValue())
+                .isCompletedWithValueMatching(t -> eventClazz.isAssignableFrom(t.getClass()));
+        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
+        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
+                .isCompletedWithValue(expectedResponse);
+        return (T) eventStage.getValue().toCompletableFuture().join();
     }
 
     private static void assertInfoResult(final Result<ThingEvent<?>> result, final WithDittoHeaders infoResponse) {
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ResultFactoryTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ResultFactoryTest.java
index 2d7a6e36645..cbde9a335fa 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ResultFactoryTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ResultFactoryTest.java
@@ -13,13 +13,18 @@
 
 package org.eclipse.ditto.things.service.persistence.actors.strategies.commands;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
+import java.util.concurrent.CompletionStage;
+
+import org.assertj.core.api.CompletableFutureAssert;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
+import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 import org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory;
@@ -30,6 +35,7 @@
 import org.eclipse.ditto.things.model.signals.events.ThingEvent;
 import org.eclipse.ditto.things.model.signals.events.ThingModifiedEvent;
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 
 /**
  * Unit tests for {@link org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory}.
@@ -84,8 +90,20 @@ private void assertNotifyMutationResponse(final boolean becomeCreated, final boo
                         becomeCreated,
                         becomeDeleted);
         result.accept(mock);
-        verify(mock).onMutation(eq(thingModifyCommand), eq(thingModifiedEvent), eq(response), eq(becomeCreated),
-                eq(becomeDeleted));
+
+        final ArgumentCaptor<CompletionStage<ThingEvent<?>>> eventStage = ArgumentCaptor.forClass(CompletionStage.class);
+        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage = ArgumentCaptor.forClass(CompletionStage.class);
+
+        verify(mock).onMutation(eq(thingModifyCommand), eventStage.capture(),
+                responseStage.capture(), eq(becomeCreated), eq(becomeDeleted));
+
+        assertThat(eventStage.getValue()).isInstanceOf(CompletionStage.class);
+        CompletableFutureAssert.assertThatCompletionStage(eventStage.getValue())
+                .isCompletedWithValue(thingModifiedEvent);
+
+        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
+        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
+                .isCompletedWithValue(response);
     }
 
     interface Dummy extends ResultVisitor<ThingEvent<?>> {
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingConflictStrategyTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingConflictStrategyTest.java
index 028caf5a5e8..3d5173f37ec 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingConflictStrategyTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingConflictStrategyTest.java
@@ -18,6 +18,8 @@
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
+import java.util.concurrent.CompletionStage;
+
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
@@ -95,8 +97,9 @@ private ExpectErrorVisitor(final Class<? extends DittoRuntimeException> clazz) {
         }
 
         @Override
-        public void onMutation(final Command<?> command, final ThingEvent<?> event, final WithDittoHeaders response,
-                final boolean becomeCreated, final boolean becomeDeleted) {
+        public void onMutation(final Command<?> command, final CompletionStage<ThingEvent<?>> event,
+                final CompletionStage<WithDittoHeaders> response, final boolean becomeCreated,
+                final boolean becomeDeleted) {
             throw new AssertionError("Expect error, got mutation: " + event);
         }
 
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java
index 8f297a475f1..16fb921a067 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java
@@ -17,7 +17,9 @@
 import java.net.URL;
 import java.time.Duration;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 
@@ -119,7 +121,7 @@ public ThingDescription provideFeatureTD(final ThingId thingId,
     }
 
     @Override
-    public Optional<Thing> provideThingSkeletonForCreation(final ThingId thingId,
+    public CompletionStage<Optional<Thing>> provideThingSkeletonForCreation(final ThingId thingId,
             @Nullable final ThingDefinition thingDefinition,
             final DittoHeaders dittoHeaders) {
 
@@ -133,31 +135,31 @@ public Optional<Thing> provideThingSkeletonForCreation(final ThingId thingId,
                 try {
                     logger.debug("Fetching ThingModel from <{}> in order to create Thing skeleton for new Thing " +
                             "with id <{}>", url, thingId);
-                    final Optional<Thing> thingSkeleton = thingModelFetcher.fetchThingModel(url, dittoHeaders)
+                    return thingModelFetcher.fetchThingModel(url, dittoHeaders)
                             .thenApplyAsync(thingModel -> thingSkeletonGenerator
                                             .generateThingSkeleton(thingId, thingModel, url, dittoHeaders),
                                     executor
                             )
-                            .toCompletableFuture()
-                            .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
-                            .join();
-                    logger.debug("Created Thing skeleton for new Thing with id <{}>: <{}>", thingId, thingSkeleton);
-                    return thingSkeleton;
+                            .thenApply(thingSkeleton -> {
+                                logger.debug("Created Thing skeleton for new Thing with id <{}>: <{}>", thingId,
+                                        thingSkeleton);
+                                return thingSkeleton;
+                            });
                 } catch (final DittoRuntimeException | CompletionException e) {
                     logger.info("Could not fetch ThingModel or generate Feature skeleton based on it due to: <{}: {}>",
                             e.getClass().getSimpleName(), e.getMessage(), e);
-                    return Optional.empty();
+                    return CompletableFuture.completedStage(Optional.empty());
                 }
             } else {
-                return Optional.empty();
+                return CompletableFuture.completedStage(Optional.empty());
             }
         } else {
-            return Optional.empty();
+            return CompletableFuture.completedStage(Optional.empty());
         }
     }
 
     @Override
-    public Optional<Feature> provideFeatureSkeletonForCreation(final String featureId,
+    public CompletionStage<Optional<Feature>> provideFeatureSkeletonForCreation(final String featureId,
             @Nullable final FeatureDefinition featureDefinition, final DittoHeaders dittoHeaders) {
 
         final ThreadSafeDittoLogger logger = LOGGER.withCorrelationId(dittoHeaders);
@@ -170,27 +172,26 @@ public Optional<Feature> provideFeatureSkeletonForCreation(final String featureI
                 try {
                     logger.debug("Fetching ThingModel from <{}> in order to create Feature skeleton for new Feature " +
                             "with id <{}>", url, featureId);
-                    final Optional<Feature> featureSkeleton = thingModelFetcher.fetchThingModel(url, dittoHeaders)
+                    return thingModelFetcher.fetchThingModel(url, dittoHeaders)
                             .thenApplyAsync(thingModel -> thingSkeletonGenerator
                                             .generateFeatureSkeleton(featureId, thingModel, url, dittoHeaders),
                                     executor
                             )
-                            .toCompletableFuture()
-                            .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
-                            .join();
-                    logger.debug("Created Feature skeleton for new Feature with id <{}>: <{}>", featureId,
-                            featureSkeleton);
-                    return featureSkeleton;
+                            .thenApply(featureSkeleton -> {
+                                logger.debug("Created Feature skeleton for new Feature with id <{}>: <{}>", featureId,
+                                        featureSkeleton);
+                                return featureSkeleton;
+                            });
                 } catch (final DittoRuntimeException | CompletionException e) {
                     logger.info("Could not fetch ThingModel or generate Feature skeleton based on it due to: <{}: {}>",
                             e.getClass().getSimpleName(), e.getMessage(), e);
-                    return Optional.empty();
+                    return CompletableFuture.completedStage(Optional.empty());
                 }
             } else {
-                return Optional.empty();
+                return CompletableFuture.completedStage(Optional.empty());
             }
         } else {
-            return Optional.empty();
+            return CompletableFuture.completedStage(Optional.empty());
         }
     }
 
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/WotThingDescriptionProvider.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/WotThingDescriptionProvider.java
index da3da7f2c7d..5191f6b9c28 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/WotThingDescriptionProvider.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/WotThingDescriptionProvider.java
@@ -13,6 +13,7 @@
 package org.eclipse.ditto.wot.integration.provider;
 
 import java.util.Optional;
+import java.util.concurrent.CompletionStage;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
@@ -88,7 +89,7 @@ ThingDescription provideFeatureTD(ThingId thingId,
      * @param dittoHeaders the DittoHeaders for possibly thrown DittoRuntimeExceptions.
      * @return an optional Thing skeleton or empty optional if something went wrong during the skeleton creation.
      */
-    Optional<Thing> provideThingSkeletonForCreation(ThingId thingId,
+    CompletionStage<Optional<Thing>> provideThingSkeletonForCreation(ThingId thingId,
             @Nullable ThingDefinition thingDefinition,
             DittoHeaders dittoHeaders);
 
@@ -104,7 +105,7 @@ Optional<Thing> provideThingSkeletonForCreation(ThingId thingId,
      * @param dittoHeaders the DittoHeaders for possibly thrown DittoRuntimeExceptions.
      * @return an optional Feature skeleton or empty optional if something went wrong during the skeleton creation.
      */
-    Optional<Feature> provideFeatureSkeletonForCreation(String featureId,
+    CompletionStage<Optional<Feature>> provideFeatureSkeletonForCreation(String featureId,
             @Nullable FeatureDefinition featureDefinition,
             DittoHeaders dittoHeaders);
 

From 3ad2ffc517d95cbca260d1d8f39f92db69523636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 26 Jun 2023 13:06:19 +0200
Subject: [PATCH 139/173] #1663 fix that nginx's worker_processes setting
 'auto' causes problems when deploying Helm chart to worker with many CPUs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* configure the "dittoui"'s nginx to use 1 worker process (it only serves static content)
* add configuration option in values.yaml to configure the nginx's used worker_processes and default to 4

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/Chart.yaml              |  2 +-
 .../helm/ditto/dittoui-config/nginx.conf      | 36 +++++++++++++++++++
 .../helm/ditto/templates/dittoui-config.yaml  | 30 ++++++++++++++++
 .../ditto/templates/dittoui-deployment.yaml   |  8 +++++
 .../helm/ditto/templates/nginx-configmap.yaml |  4 +--
 deployment/helm/ditto/values.yaml             |  7 ++++
 6 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 deployment/helm/ditto/dittoui-config/nginx.conf
 create mode 100644 deployment/helm/ditto/templates/dittoui-config.yaml

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index 4cabbd217ee..824bb9ea0b1 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.3.0  # chart version is effectively set by release-job
+version: 3.3.1  # chart version is effectively set by release-job
 appVersion: 3.3.0
 keywords:
   - iot-chart
diff --git a/deployment/helm/ditto/dittoui-config/nginx.conf b/deployment/helm/ditto/dittoui-config/nginx.conf
new file mode 100644
index 00000000000..05e57d72a68
--- /dev/null
+++ b/deployment/helm/ditto/dittoui-config/nginx.conf
@@ -0,0 +1,36 @@
+worker_processes 1;
+
+error_log  /var/log/nginx/error.log notice;
+pid        /tmp/nginx.pid;
+
+events {
+  worker_connections  1024;
+}
+
+http {
+    proxy_temp_path /tmp/proxy_temp;
+    client_body_temp_path /tmp/client_temp;
+    fastcgi_temp_path /tmp/fastcgi_temp;
+    uwsgi_temp_path /tmp/uwsgi_temp;
+    scgi_temp_path /tmp/scgi_temp;
+
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    server_tokens off; # Hide Nginx version
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+}
diff --git a/deployment/helm/ditto/templates/dittoui-config.yaml b/deployment/helm/ditto/templates/dittoui-config.yaml
new file mode 100644
index 00000000000..bfba14c9b74
--- /dev/null
+++ b/deployment/helm/ditto/templates/dittoui-config.yaml
@@ -0,0 +1,30 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.dittoui.enabled -}}
+{{- $releaseName := .Release.Name -}}
+{{- $name := include "ditto.name" . -}}
+{{- $labels := include "ditto.labels" . -}}
+{{ $root := . }}
+{{ range $path, $bytes := .Files.Glob "dittoui-config/**" }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $releaseName }}-{{ $path | replace "/" "-" | replace "." "-" }}
+  labels:
+    app.kubernetes.io/name: {{ $name }}-dittoui-config
+{{ $labels | indent 4 }}
+data:
+  {{ $path | replace "dittoui-config/" ""}}: |-
+{{ $root.Files.Get $path | indent 4 }}
+---
+{{- end -}}
+{{- end -}}
diff --git a/deployment/helm/ditto/templates/dittoui-deployment.yaml b/deployment/helm/ditto/templates/dittoui-deployment.yaml
index 6cace32316a..3ba80f3927e 100644
--- a/deployment/helm/ditto/templates/dittoui-deployment.yaml
+++ b/deployment/helm/ditto/templates/dittoui-deployment.yaml
@@ -63,4 +63,12 @@ spec:
             limits:
               # cpu: ""
               memory: {{ .Values.dittoui.resources.memoryMi }}Mi
+          volumeMounts:
+            - name: dittoui-nginx-conf
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
+      volumes:
+        - name: dittoui-nginx-conf
+          configMap:
+            name: {{ .Release.Name }}-dittoui-config-nginx-conf
 {{- end }}
diff --git a/deployment/helm/ditto/templates/nginx-configmap.yaml b/deployment/helm/ditto/templates/nginx-configmap.yaml
index 4430b7a5a6b..b9667b661ed 100644
--- a/deployment/helm/ditto/templates/nginx-configmap.yaml
+++ b/deployment/helm/ditto/templates/nginx-configmap.yaml
@@ -19,10 +19,10 @@ metadata:
 {{ include "ditto.labels" . | indent 4 }}
 data:
   nginx.conf: |-
-    worker_processes auto;
+    worker_processes {{ .Values.nginx.config.workerProcesses }};
 
     events {
-      worker_connections 1024;
+      worker_connections {{ .Values.nginx.config.workerConnections }};
     }
     
     http {
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index 2f5558c4f47..f0d8104b2ac 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -1429,6 +1429,13 @@ nginx:
       enabled: true
       name: wait-for-gateway
       image: rancher/curlimages-curl:7.73.0
+  # config holds nginx specific configuration
+  config:
+    # workerProcesses the 'worker_processes' option for nginx to use - can also be set to 'auto' in order to let nginx
+    # determine the worker processes based on the CPU count
+    workerProcesses: 4
+    # workerProcesses the 'events' 'worker_connections' option for nginx to use
+    workerConnections: 1024
 
 ## ----------------------------------------------------------------------------
 ## Ditto UI configuration

From 0b0f1f8eaa297f777216e98ea082e916900bb7f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 26 Jun 2023 15:00:46 +0200
Subject: [PATCH 140/173] update swagger-ui version and nginx version used in
 Helm chart
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index f0d8104b2ac..6cf5efa3ce0 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -1386,7 +1386,7 @@ nginx:
     # repository for the nginx docker image
     repository: docker.io/nginx
     # tag for the nginx docker image
-    tag: 1.23
+    tag: 1.25
     # pullPolicy for the nginx docker image
     pullPolicy: IfNotPresent
   # extraEnv to add arbitrary environment variables to nginx container
@@ -1504,7 +1504,7 @@ swaggerui:
     # repository for the swagger ui docker image
     repository: docker.io/swaggerapi/swagger-ui
     # tag for the swagger ui docker image
-    tag: v4.15.5
+    tag: v4.19.1
     # pullPolicy for the swagger ui docker image
     pullPolicy: IfNotPresent
   # extraEnv to add arbitrary environment variable to swagger ui container

From 9e696d600cd03233e5a0bdfb1dac8de75eb3f727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 27 Jun 2023 08:35:21 +0200
Subject: [PATCH 141/173] address review finding that "catch" block should be
 replaced with ".exceptionally" instead on CompletionStage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../DefaultWotThingDescriptionProvider.java   | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java
index 16fb921a067..58b6a2a7600 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java
@@ -18,7 +18,6 @@
 import java.time.Duration;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
@@ -132,24 +131,25 @@ public CompletionStage<Optional<Thing>> provideThingSkeletonForCreation(final Th
             final Optional<URL> urlOpt = thingDefinition.getUrl();
             if (urlOpt.isPresent()) {
                 final URL url = urlOpt.get();
-                try {
-                    logger.debug("Fetching ThingModel from <{}> in order to create Thing skeleton for new Thing " +
-                            "with id <{}>", url, thingId);
-                    return thingModelFetcher.fetchThingModel(url, dittoHeaders)
-                            .thenApplyAsync(thingModel -> thingSkeletonGenerator
-                                            .generateThingSkeleton(thingId, thingModel, url, dittoHeaders),
-                                    executor
-                            )
-                            .thenApply(thingSkeleton -> {
-                                logger.debug("Created Thing skeleton for new Thing with id <{}>: <{}>", thingId,
-                                        thingSkeleton);
-                                return thingSkeleton;
-                            });
-                } catch (final DittoRuntimeException | CompletionException e) {
-                    logger.info("Could not fetch ThingModel or generate Feature skeleton based on it due to: <{}: {}>",
-                            e.getClass().getSimpleName(), e.getMessage(), e);
-                    return CompletableFuture.completedStage(Optional.empty());
-                }
+                logger.debug("Fetching ThingModel from <{}> in order to create Thing skeleton for new Thing " +
+                        "with id <{}>", url, thingId);
+                return thingModelFetcher.fetchThingModel(url, dittoHeaders)
+                        .thenApplyAsync(thingModel -> thingSkeletonGenerator
+                                        .generateThingSkeleton(thingId, thingModel, url, dittoHeaders),
+                                executor
+                        )
+                        .thenApply(thingSkeleton -> {
+                            logger.debug("Created Thing skeleton for new Thing with id <{}>: <{}>", thingId,
+                                    thingSkeleton);
+                            return thingSkeleton;
+                        })
+                        .exceptionally(throwable -> {
+                            logger.info("Could not fetch ThingModel or generate Feature skeleton based on it due " +
+                                            "to: <{}: {}>",
+                                    throwable.getClass().getSimpleName(),throwable.getMessage(), throwable);
+                            return Optional.empty();
+                        });
+
             } else {
                 return CompletableFuture.completedStage(Optional.empty());
             }
@@ -169,24 +169,24 @@ public CompletionStage<Optional<Feature>> provideFeatureSkeletonForCreation(fina
             final Optional<URL> urlOpt = featureDefinition.getFirstIdentifier().getUrl();
             if (urlOpt.isPresent()) {
                 final URL url = urlOpt.get();
-                try {
-                    logger.debug("Fetching ThingModel from <{}> in order to create Feature skeleton for new Feature " +
-                            "with id <{}>", url, featureId);
-                    return thingModelFetcher.fetchThingModel(url, dittoHeaders)
-                            .thenApplyAsync(thingModel -> thingSkeletonGenerator
-                                            .generateFeatureSkeleton(featureId, thingModel, url, dittoHeaders),
-                                    executor
-                            )
-                            .thenApply(featureSkeleton -> {
-                                logger.debug("Created Feature skeleton for new Feature with id <{}>: <{}>", featureId,
-                                        featureSkeleton);
-                                return featureSkeleton;
-                            });
-                } catch (final DittoRuntimeException | CompletionException e) {
-                    logger.info("Could not fetch ThingModel or generate Feature skeleton based on it due to: <{}: {}>",
-                            e.getClass().getSimpleName(), e.getMessage(), e);
-                    return CompletableFuture.completedStage(Optional.empty());
-                }
+                logger.debug("Fetching ThingModel from <{}> in order to create Feature skeleton for new Feature " +
+                        "with id <{}>", url, featureId);
+                return thingModelFetcher.fetchThingModel(url, dittoHeaders)
+                        .thenApplyAsync(thingModel -> thingSkeletonGenerator
+                                        .generateFeatureSkeleton(featureId, thingModel, url, dittoHeaders),
+                                executor
+                        )
+                        .thenApply(featureSkeleton -> {
+                            logger.debug("Created Feature skeleton for new Feature with id <{}>: <{}>", featureId,
+                                    featureSkeleton);
+                            return featureSkeleton;
+                        })
+                        .exceptionally(throwable -> {
+                            logger.info("Could not fetch ThingModel or generate Feature skeleton based on it " +
+                                            "due to: <{}: {}>",
+                                    throwable.getClass().getSimpleName(), throwable.getMessage(), throwable);
+                            return Optional.empty();
+                        });
             } else {
                 return CompletableFuture.completedStage(Optional.empty());
             }

From 84fc4f003ef7ca2707b85492baf3534fef21d5a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 27 Jun 2023 17:22:26 +0200
Subject: [PATCH 142/173] also made WoT based queries asynchronous
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* quite a refactoring was needed overall
* still with an open "TODO" as I got not rid of blocking on the Akka dispatcher thread when persisting a "CreateThing"

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../AbstractPersistenceActor.java             |  53 ++--
 .../results/MutationResult.java               |   2 +-
 .../persistentactors/results/QueryResult.java |  12 +-
 .../results/ResultFactory.java                |  13 +
 .../results/ResultVisitor.java                |   2 +-
 .../actors/PolicyPersistenceActor.java        |   3 +-
 .../TopLevelPolicyActionCommandStrategy.java  |   2 +-
 .../AbstractPolicyCommandStrategyTest.java    |   2 +-
 .../commands/PolicyConflictStrategyTest.java  |   2 +-
 .../actors/ThingPersistenceActor.java         |  30 +-
 .../commands/RetrieveFeatureStrategy.java     |  31 +-
 .../commands/RetrieveThingStrategy.java       |  22 +-
 .../commands/AbstractCommandStrategyTest.java |  26 +-
 .../commands/ResultFactoryTest.java           |   9 +-
 .../commands/ThingConflictStrategyTest.java   |   2 +-
 .../DefaultWotThingDescriptionGenerator.java  |  86 +++---
 ...DefaultWotThingModelExtensionResolver.java | 103 ++++---
 .../DefaultWotThingSkeletonGenerator.java     | 284 +++++++++---------
 .../WotThingDescriptionGenerator.java         |   3 +-
 .../WotThingModelExtensionResolver.java       |   6 +-
 .../generator/WotThingSkeletonGenerator.java  |   5 +-
 .../DefaultWotThingDescriptionProvider.java   | 122 ++++----
 .../provider/DefaultWotThingModelFetcher.java |   7 +-
 .../provider/WotThingDescriptionProvider.java |   4 +-
 24 files changed, 465 insertions(+), 366 deletions(-)

diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
index 6e808fb5338..84aadf0a073 100755
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
@@ -15,6 +15,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Optional;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -26,6 +27,7 @@
 import org.eclipse.ditto.base.api.commands.sudo.SudoCommand;
 import org.eclipse.ditto.base.model.entity.id.EntityId;
 import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
+import org.eclipse.ditto.base.model.exceptions.DittoInternalErrorException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
 import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
@@ -532,7 +534,7 @@ protected void persistAndApplyEvent(final CompletionStage<E> event, final BiCons
                     handler.accept(persistedEvent, entity);
                 });
             }
-        });
+        }).toCompletableFuture().join(); // TODO TJ is this bad or not? - propbably yes :/
     }
 
     /**
@@ -662,9 +664,14 @@ private <T extends Command<?>> void handleByStrategy(final T command, @Nullable
         try {
             result = strategy.apply(getStrategyContext(), workEntity, getNextRevisionNumber(), (T) tracedCommand);
             result.accept(this);
-        } catch (final DittoRuntimeException e) {
+        } catch (final CompletionException | DittoRuntimeException e) {
+            final DittoRuntimeException dittoRuntimeException =
+                    DittoRuntimeException.asDittoRuntimeException(e, throwable ->
+                            DittoInternalErrorException.newBuilder()
+                                    .dittoHeaders(command.getDittoHeaders())
+                                    .build());
             startedSpan.tagAsFailed(e);
-            result = ResultFactory.newErrorResult(e, tracedCommand);
+            result = ResultFactory.newErrorResult(dittoRuntimeException, tracedCommand);
             result.accept(this);
         } finally {
             startedSpan.finish();
@@ -677,9 +684,10 @@ public void onMutation(final Command<?> command, final CompletionStage<E> event,
             final CompletionStage<WithDittoHeaders> response,
             final boolean becomeCreated, final boolean becomeDeleted) {
 
+        final ActorRef sender = getSender();
         persistAndApplyEvent(event, (persistedEvent, resultingEntity) -> {
             if (shouldSendResponse(command.getDittoHeaders())) {
-                notifySender(response);
+                notifySender(sender, response);
             }
             if (becomeDeleted) {
                 becomeDeletedHandler();
@@ -691,9 +699,10 @@ public void onMutation(final Command<?> command, final CompletionStage<E> event,
     }
 
     @Override
-    public void onQuery(final Command<?> command, final WithDittoHeaders response) {
+    public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
         if (command.getDittoHeaders().isResponseRequired()) {
-            notifySender(response);
+            final ActorRef sender = getSender();
+            response.thenAccept(r -> notifySender(sender, r));
         }
     }
 
@@ -806,8 +815,8 @@ private void notifySender(final WithDittoHeaders message) {
         notifySender(getSender(), message);
     }
 
-    private void notifySender(final CompletionStage<WithDittoHeaders> message) {
-        message.thenAccept(msg -> notifySender(getSender(), msg));
+    private void notifySender(final ActorRef sender, final CompletionStage<WithDittoHeaders> message) {
+        message.thenAccept(msg -> notifySender(sender, msg));
     }
 
     private void takeSnapshotByInterval(final Control takeSnapshot) {
@@ -995,20 +1004,22 @@ public void onMutation(final Command<?> command, final CompletionStage<E> event,
         }
 
         @Override
-        public void onQuery(final Command<?> command, final WithDittoHeaders response) {
+        public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
             if (command.getDittoHeaders().isResponseRequired()) {
-                final WithDittoHeaders theResponseToSend;
-                if (response instanceof DittoHeadersSettable<?> dittoHeadersSettable) {
-                    final DittoHeaders queryCommandHeaders = response.getDittoHeaders();
-                    final DittoHeaders adjustedHeaders = queryCommandHeaders.toBuilder()
-                            .putHeader(DittoHeaderDefinition.HISTORICAL_HEADERS.getKey(),
-                                    historicalDittoHeaders.toJson().toString())
-                            .build();
-                    theResponseToSend = dittoHeadersSettable.setDittoHeaders(adjustedHeaders);
-                } else {
-                    theResponseToSend = response;
-                }
-                notifySender(sender, theResponseToSend);
+                response.thenAccept(r -> {
+                    final WithDittoHeaders theResponseToSend;
+                    if (response instanceof DittoHeadersSettable<?> dittoHeadersSettable) {
+                        final DittoHeaders queryCommandHeaders = r.getDittoHeaders();
+                        final DittoHeaders adjustedHeaders = queryCommandHeaders.toBuilder()
+                                .putHeader(DittoHeaderDefinition.HISTORICAL_HEADERS.getKey(),
+                                        historicalDittoHeaders.toJson().toString())
+                                .build();
+                        theResponseToSend = dittoHeadersSettable.setDittoHeaders(adjustedHeaders);
+                    } else {
+                        theResponseToSend = r;
+                    }
+                    notifySender(sender, theResponseToSend);
+                });
             }
         }
 
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/MutationResult.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/MutationResult.java
index 529bf85fac5..eee22c24e4f 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/MutationResult.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/MutationResult.java
@@ -59,7 +59,7 @@ public String toString() {
         return this.getClass().getSimpleName() + " [" +
                 "command=" + command +
                 ", eventToPersistStage=" + eventToPersistStage +
-                ", response=" + responseStage +
+                ", responseStage=" + responseStage +
                 ", becomeCreated=" + becomeCreated +
                 ", becomeDeleted=" + becomeDeleted +
                 ']';
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/QueryResult.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/QueryResult.java
index 21911d6d06c..87ec7d0d40c 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/QueryResult.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/QueryResult.java
@@ -27,28 +27,28 @@
 public final class QueryResult<E extends Event<?>> implements Result<E> {
 
     private final Command<?> command;
-    private final WithDittoHeaders response;
+    private final CompletionStage<WithDittoHeaders> responseStage;
 
-    QueryResult(final Command<?> command, final WithDittoHeaders response) {
+    QueryResult(final Command<?> command, final CompletionStage<WithDittoHeaders> responseStage) {
         this.command = command;
-        this.response = response;
+        this.responseStage = responseStage;
     }
 
     @Override
     public String toString() {
         return this.getClass().getSimpleName() + " [" +
                 "command=" + command +
-                ", response=" + response +
+                ", responseStage=" + responseStage +
                 ']';
     }
 
     @Override
     public void accept(final ResultVisitor<E> visitor) {
-        visitor.onQuery(command, response);
+        visitor.onQuery(command, responseStage);
     }
 
     @Override
     public <F extends Event<?>> Result<F> map(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
-        return new QueryResult<>(command, response);
+        return new QueryResult<>(command, responseStage);
     }
 }
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultFactory.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultFactory.java
index 1020b4f6f50..b86e54dcfb9 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultFactory.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultFactory.java
@@ -128,6 +128,19 @@ public static <E extends Event<?>> Result<E> newErrorResult(final DittoRuntimeEx
      */
     public static <E extends Event<?>> Result<E> newQueryResult(final Command<?> command,
             final WithDittoHeaders response) {
+        return newQueryResult(command, CompletableFuture.completedStage(response));
+    }
+
+    /**
+     * Create a query result.
+     *
+     * @param command the query command.
+     * @param response the response.
+     * @param <E> type of events (irrelevant).
+     * @return the result.
+     */
+    public static <E extends Event<?>> Result<E> newQueryResult(final Command<?> command,
+            final CompletionStage<WithDittoHeaders> response) {
         return new QueryResult<>(command, response);
     }
 
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultVisitor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultVisitor.java
index 57548b391c2..a4a1c6212b2 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultVisitor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultVisitor.java
@@ -51,7 +51,7 @@ void onMutation(Command<?> command, CompletionStage<E> event, CompletionStage<Wi
      * @param command the query command.
      * @param response the response.
      */
-    void onQuery(Command<?> command, WithDittoHeaders response);
+    void onQuery(Command<?> command, CompletionStage<WithDittoHeaders> response);
 
     /**
      * Evaluate an error result.
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
index a2d454f53b8..1aaf5b622b8 100755
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
@@ -250,9 +250,10 @@ public void onMutation(final Command<?> command, final CompletionStage<PolicyEve
             final CompletionStage<WithDittoHeaders> response,
             final boolean becomeCreated, final boolean becomeDeleted) {
 
+        final ActorRef sender = getSender();
         persistAndApplyEvent(event, (persistedEvent, resultingEntity) -> {
             if (shouldSendResponse(command.getDittoHeaders())) {
-                response.thenAccept(rsp -> notifySender(getSender(), rsp));
+                response.thenAccept(rsp -> notifySender(sender, rsp));
             }
             if (becomeDeleted) {
                 becomeDeletedHandler();
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java
index ff93ab88ab1..4c9aee4c86a 100644
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java
@@ -197,7 +197,7 @@ public void onMutation(final Command<?> command, final CompletionStage<PolicyAct
         }
 
         @Override
-        public void onQuery(final Command<?> command, final WithDittoHeaders response) {
+        public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
             // do nothing
         }
 
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategyTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategyTest.java
index 49d0625fc54..3f89658b64d 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategyTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategyTest.java
@@ -215,7 +215,7 @@ public void onMutation(final Command<?> command, final CompletionStage<E> event,
             }
 
             @Override
-            public void onQuery(final Command<?> command, final WithDittoHeaders response) {
+            public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
                 throw new AssertionError("Expect mutation result, got query response: " + response);
             }
 
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PolicyConflictStrategyTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PolicyConflictStrategyTest.java
index f19460f103e..f8f440e0c31 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PolicyConflictStrategyTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PolicyConflictStrategyTest.java
@@ -109,7 +109,7 @@ public void onMutation(final Command<?> command, final CompletionStage<PolicyEve
         }
 
         @Override
-        public void onQuery(final Command command, final WithDittoHeaders response) {
+        public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
             throw new AssertionError("Expect error, got query: " + response);
         }
 
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java
index 5245df33416..a27224e5596 100755
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java
@@ -13,6 +13,7 @@
 package org.eclipse.ditto.things.service.persistence.actors;
 
 import java.time.Instant;
+import java.util.concurrent.CompletionStage;
 
 import javax.annotation.Nullable;
 
@@ -118,18 +119,25 @@ public static Props props(final ThingId thingId,
     }
 
     @Override
-    public void onQuery(final Command<?> command, final WithDittoHeaders response) {
-        if (response.getDittoHeaders().didLiveChannelConditionMatch()) {
-            final var liveChannelTimeoutStrategy = response.getDittoHeaders()
-                    .getLiveChannelTimeoutStrategy()
-                    .orElse(LiveChannelTimeoutStrategy.FAIL);
-            if (liveChannelTimeoutStrategy != LiveChannelTimeoutStrategy.USE_TWIN &&
-                    response instanceof ThingQueryCommandResponse<?> queryResponse) {
-                super.onQuery(command, queryResponse.setEntity(JsonFactory.nullLiteral()));
-                return;
+    public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
+        final ActorRef sender = getSender();
+        response.thenAccept(r -> {
+            if (r.getDittoHeaders().didLiveChannelConditionMatch()) {
+                final var liveChannelTimeoutStrategy = r.getDittoHeaders()
+                        .getLiveChannelTimeoutStrategy()
+                        .orElse(LiveChannelTimeoutStrategy.FAIL);
+                if (liveChannelTimeoutStrategy != LiveChannelTimeoutStrategy.USE_TWIN &&
+                        r instanceof ThingQueryCommandResponse<?> queryResponse &&
+                        command.getDittoHeaders().isResponseRequired()) {
+                    notifySender(sender, queryResponse.setEntity(JsonFactory.nullLiteral()));
+                    return;
+                }
             }
-        }
-        super.onQuery(command, response);
+
+            if (command.getDittoHeaders().isResponseRequired()) {
+                notifySender(sender, r);
+            }
+        });
     }
 
     @Override
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/RetrieveFeatureStrategy.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/RetrieveFeatureStrategy.java
index f5602ea3e46..e0669d82d3a 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/RetrieveFeatureStrategy.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/RetrieveFeatureStrategy.java
@@ -13,6 +13,8 @@
 package org.eclipse.ditto.things.service.persistence.actors.strategies.commands;
 
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
@@ -20,7 +22,7 @@
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.base.model.headers.DittoHeadersSettable;
+import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.headers.contenttype.ContentType;
 import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.base.model.signals.FeatureToggle;
@@ -89,7 +91,7 @@ protected Result<ThingEvent<?>> doApply(final Context<ThingId> context,
         }
     }
 
-    private DittoHeadersSettable<?> getRetrieveThingDescriptionResponse(@Nullable final Thing thing,
+    private CompletionStage<WithDittoHeaders> getRetrieveThingDescriptionResponse(@Nullable final Thing thing,
             final RetrieveFeature command) {
         final String featureId = command.getFeatureId();
         if (thing != null) {
@@ -98,18 +100,23 @@ private DittoHeadersSettable<?> getRetrieveThingDescriptionResponse(@Nullable fi
                     .map(feature -> wotThingDescriptionProvider
                             .provideFeatureTD(command.getEntityId(), thing, feature, command.getDittoHeaders())
                     )
-                    .map(td -> RetrieveWotThingDescriptionResponse.of(command.getEntityId(), td.toJson(),
-                            command.getDittoHeaders()
-                                    .toBuilder()
-                                    .contentType(ContentType.APPLICATION_TD_JSON)
-                                    .build())
+                    .map(tdStage -> tdStage.thenApply(td ->
+                            RetrieveWotThingDescriptionResponse.of(command.getEntityId(), td.toJson(),
+                                    command.getDittoHeaders()
+                                            .toBuilder()
+                                            .contentType(ContentType.APPLICATION_TD_JSON)
+                                            .build()
+                            )
+                            ).thenApply(WithDittoHeaders.class::cast)
                     )
-                    .map(DittoHeadersSettable.class::cast)
-                    .orElseGet(() -> ExceptionFactory.featureNotFound(command.getEntityId(), featureId,
-                            command.getDittoHeaders()));
+                    .orElseGet(() -> CompletableFuture.completedStage(ExceptionFactory.featureNotFound(command.getEntityId(), featureId,
+                            command.getDittoHeaders())
+                    ));
         } else {
-            return ExceptionFactory.featureNotFound(command.getEntityId(), featureId,
-                    command.getDittoHeaders());
+            return CompletableFuture.completedStage(
+                    ExceptionFactory.featureNotFound(command.getEntityId(), featureId,
+                    command.getDittoHeaders())
+            );
         }
     }
 
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/RetrieveThingStrategy.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/RetrieveThingStrategy.java
index d8e33c32441..e7f343082fb 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/RetrieveThingStrategy.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/RetrieveThingStrategy.java
@@ -14,6 +14,8 @@
 
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
@@ -21,6 +23,7 @@
 import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.headers.DittoHeadersSettable;
+import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.headers.contenttype.ContentType;
 import org.eclipse.ditto.base.model.headers.entitytag.EntityTag;
 import org.eclipse.ditto.base.model.signals.FeatureToggle;
@@ -39,7 +42,6 @@
 import org.eclipse.ditto.things.model.signals.commands.query.ThingQueryCommand;
 import org.eclipse.ditto.things.model.signals.events.ThingEvent;
 import org.eclipse.ditto.wot.integration.provider.WotThingDescriptionProvider;
-import org.eclipse.ditto.wot.model.ThingDescription;
 
 import akka.actor.ActorSystem;
 
@@ -122,18 +124,24 @@ private static JsonObject getThingJson(final Thing thing, final ThingQueryComman
                 .orElseGet(() -> thing.toJson(command.getImplementedSchemaVersion()));
     }
 
-    private DittoHeadersSettable<?> getRetrieveThingDescriptionResponse(@Nullable final Thing thing,
+    private CompletionStage<WithDittoHeaders> getRetrieveThingDescriptionResponse(@Nullable final Thing thing,
             final RetrieveThing command) {
         if (thing != null) {
-            final ThingDescription wotThingDescription = wotThingDescriptionProvider
+            return wotThingDescriptionProvider
                     .provideThingTD(thing.getDefinition().orElse(null),
                             command.getEntityId(),
                             thing,
-                            command.getDittoHeaders());
-            return RetrieveWotThingDescriptionResponse.of(command.getEntityId(), wotThingDescription.toJson(),
-                    command.getDittoHeaders().toBuilder().contentType(ContentType.APPLICATION_TD_JSON).build());
+                            command.getDittoHeaders())
+                    .thenApply(wotThingDescription ->
+                            RetrieveWotThingDescriptionResponse.of(command.getEntityId(),
+                                    wotThingDescription.toJson(),
+                                    command.getDittoHeaders().toBuilder()
+                                            .contentType(ContentType.APPLICATION_TD_JSON)
+                                            .build()
+                            )
+                    );
         } else {
-            return notAccessible(command);
+            return CompletableFuture.completedStage(notAccessible(command));
         }
     }
 
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/AbstractCommandStrategyTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/AbstractCommandStrategyTest.java
index b8945fa6c89..ca612d293cb 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/AbstractCommandStrategyTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/AbstractCommandStrategyTest.java
@@ -128,9 +128,20 @@ protected static <C extends Command<?>> void assertQueryResult(
         final Result<ThingEvent<?>> thingEventResult = applyStrategy(underTest, getDefaultContext(), thing, command);
         final ResultVisitor<ThingEvent<?>> mock = mock(Dummy.class);
         thingEventResult.accept(mock);
-        final ArgumentCaptor<CommandResponse<?>> captor = ArgumentCaptor.forClass(CommandResponse.class);
-        verify(mock).onQuery(any(), captor.capture());
-        commandResponseAssertions.accept(captor.getValue());
+        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage =
+                ArgumentCaptor.forClass(CompletionStage.class);
+        verify(mock).onQuery(any(), responseStage.capture());
+
+        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
+        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
+                .isCompletedWithValueMatching(p -> {
+                    try {
+                        commandResponseAssertions.accept((CommandResponse<?>) p);
+                        return true;
+                    } catch (final AssertionError ae) {
+                        return false;
+                    }
+                });
     }
 
 
@@ -170,7 +181,14 @@ private static <T extends ThingModifiedEvent<?>> T assertModificationResult(fina
     private static void assertInfoResult(final Result<ThingEvent<?>> result, final WithDittoHeaders infoResponse) {
         final ResultVisitor<ThingEvent<?>> mock = mock(Dummy.class);
         result.accept(mock);
-        verify(mock).onQuery(any(), eq(infoResponse));
+        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage =
+                ArgumentCaptor.forClass(CompletionStage.class);
+
+        verify(mock).onQuery(any(), responseStage.capture());
+
+        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
+        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
+                .isCompletedWithValue(infoResponse);
     }
 
     private static <C extends Command<?>> Result<ThingEvent<?>> applyStrategy(
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ResultFactoryTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ResultFactoryTest.java
index cbde9a335fa..785930ac397 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ResultFactoryTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ResultFactoryTest.java
@@ -58,7 +58,14 @@ public void assertImmutability() {
     public void notifyQueryResponse() {
         final Result<ThingEvent<?>> result = ResultFactory.newQueryResult(thingQueryCommand, response);
         result.accept(mock);
-        verify(mock).onQuery(eq(thingQueryCommand), eq(response));
+        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage =
+                ArgumentCaptor.forClass(CompletionStage.class);
+
+        verify(mock).onQuery(eq(thingQueryCommand), responseStage.capture());
+
+        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
+        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
+                .isCompletedWithValue(response);
     }
 
     @Test
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingConflictStrategyTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingConflictStrategyTest.java
index 3d5173f37ec..97f0a1d17be 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingConflictStrategyTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingConflictStrategyTest.java
@@ -104,7 +104,7 @@ public void onMutation(final Command<?> command, final CompletionStage<ThingEven
         }
 
         @Override
-        public void onQuery(final Command<?> command, final WithDittoHeaders response) {
+        public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
             throw new AssertionError("Expect error, got query: " + response);
         }
 
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingDescriptionGenerator.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingDescriptionGenerator.java
index f084c3cd577..9bc61a95fbb 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingDescriptionGenerator.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingDescriptionGenerator.java
@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
@@ -135,7 +136,7 @@ final class DefaultWotThingDescriptionGenerator implements WotThingDescriptionGe
     }
 
     @Override
-    public ThingDescription generateThingDescription(final ThingId thingId,
+    public CompletionStage<ThingDescription> generateThingDescription(final ThingId thingId,
             @Nullable final Thing thing,
             @Nullable final JsonObject placeholderLookupObject,
             @Nullable final String featureId,
@@ -144,46 +145,51 @@ public ThingDescription generateThingDescription(final ThingId thingId,
             final DittoHeaders dittoHeaders) {
 
         // generation rules defined at: https://w3c.github.io/wot-thing-description/#thing-model-td-generation
+        return thingModelExtensionResolver
+                .resolveThingModelExtensions(thingModel, dittoHeaders)
+                .thenCompose(thingModelWithExtensions ->
+                        thingModelExtensionResolver.resolveThingModelRefs(thingModelWithExtensions, dittoHeaders)
+                )
+                .thenApply(thingModelWithExtensionsAndImports -> {
+                    LOGGER.withCorrelationId(dittoHeaders)
+                            .debug("ThingModel after resolving extensions + refs: <{}>",
+                                    thingModelWithExtensionsAndImports);
+
+                    final ThingModel cleanedTm =
+                            removeThingModelSpecificElements(thingModelWithExtensionsAndImports, dittoHeaders);
+
+                    final ThingDescription.Builder tdBuilder = ThingDescription.newBuilder(cleanedTm.toJson());
+                    addBase(tdBuilder, thingId, featureId);
+                    addInstanceVersion(tdBuilder, cleanedTm.getVersion().orElse(null));
+                    addThingDescriptionLinks(tdBuilder, thingModelUrl, null != featureId, thingId);
+                    convertThingDescriptionTmSubmodelLinksToItems(tdBuilder, dittoHeaders);
+                    addThingDescriptionTemplateFromConfig(tdBuilder);
+                    addThingDescriptionAdditionalMetadata(tdBuilder, thing);
+                    if (null == featureId) {
+                        addThingDescriptionForms(cleanedTm, tdBuilder, Thing.JsonFields.ATTRIBUTES.getPointer());
+                    } else {
+                        addThingDescriptionForms(cleanedTm, tdBuilder, Feature.JsonFields.PROPERTIES.getPointer());
+                    }
 
-        final ThingModel thingModelWithExtensions = thingModelExtensionResolver
-                .resolveThingModelExtensions(thingModel, dittoHeaders);
-        final ThingModel thingModelWithExtensionsAndImports = thingModelExtensionResolver
-                .resolveThingModelRefs(thingModelWithExtensions, dittoHeaders);
-
-        LOGGER.withCorrelationId(dittoHeaders)
-                .debug("ThingModel after resolving extensions + refs: <{}>", thingModelWithExtensionsAndImports);
-
-        final ThingModel cleanedTm = removeThingModelSpecificElements(thingModelWithExtensionsAndImports, dittoHeaders);
-
-        final ThingDescription.Builder tdBuilder = ThingDescription.newBuilder(cleanedTm.toJson());
-        addBase(tdBuilder, thingId, featureId);
-        addInstanceVersion(tdBuilder, cleanedTm.getVersion().orElse(null));
-        addThingDescriptionLinks(tdBuilder, thingModelUrl, null != featureId, thingId);
-        convertThingDescriptionTmSubmodelLinksToItems(tdBuilder, dittoHeaders);
-        addThingDescriptionTemplateFromConfig(tdBuilder);
-        addThingDescriptionAdditionalMetadata(tdBuilder, thing);
-        if (null == featureId) {
-            addThingDescriptionForms(cleanedTm, tdBuilder, Thing.JsonFields.ATTRIBUTES.getPointer());
-        } else {
-            addThingDescriptionForms(cleanedTm, tdBuilder, Feature.JsonFields.PROPERTIES.getPointer());
-        }
-
-        tdBuilder.setUriVariables(provideUriVariables(
-                DittoHeaderDefinition.CHANNEL.getKey(),
-                DittoHeaderDefinition.TIMEOUT.getKey(),
-                DittoHeaderDefinition.RESPONSE_REQUIRED.getKey(),
-                DITTO_FIELDS_URI_VARIABLE
-        ));
-        tdBuilder.setSchemaDefinitions(SchemaDefinitions.of(
-                Map.of(SCHEMA_DITTO_ERROR, buildDittoErrorSchema())
-        ));
-
-        final ThingDescription thingDescription = resolvePlaceholders(tdBuilder.build(), placeholderLookupObject,
-                dittoHeaders);
-        LOGGER.withCorrelationId(dittoHeaders)
-                .info("Created ThingDescription for thingId <{}> and featureId <{}>: <{}>", thingId, featureId,
-                        thingDescription);
-        return thingDescription;
+                    tdBuilder.setUriVariables(provideUriVariables(
+                            DittoHeaderDefinition.CHANNEL.getKey(),
+                            DittoHeaderDefinition.TIMEOUT.getKey(),
+                            DittoHeaderDefinition.RESPONSE_REQUIRED.getKey(),
+                            DITTO_FIELDS_URI_VARIABLE
+                    ));
+                    tdBuilder.setSchemaDefinitions(SchemaDefinitions.of(
+                            Map.of(SCHEMA_DITTO_ERROR, buildDittoErrorSchema())
+                    ));
+
+                    final ThingDescription thingDescription =
+                            resolvePlaceholders(tdBuilder.build(), placeholderLookupObject,
+                                    dittoHeaders);
+                    LOGGER.withCorrelationId(dittoHeaders)
+                            .info("Created ThingDescription for thingId <{}> and featureId <{}>: <{}>", thingId,
+                                    featureId,
+                                    thingDescription);
+                    return thingDescription;
+                });
     }
 
     private ObjectSchema buildDittoErrorSchema() {
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java
index 39cf8a5bbcd..6a52e95765d 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java
@@ -14,12 +14,11 @@
 
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
-import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
+import java.util.function.BiFunction;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.json.JsonCollectors;
@@ -41,9 +40,6 @@ final class DefaultWotThingModelExtensionResolver implements WotThingModelExtens
     private static final String TM_EXTENDS = "tm:extends";
     private static final String TM_REF = "tm:ref";
 
-    private static final Duration MAX_FETCH_MODEL_DURATION = Duration.ofSeconds(10);
-    private static final Duration MAX_JOIN_WAIT_DURATION = Duration.ofSeconds(20);
-
     private final WotThingModelFetcher thingModelFetcher;
     private final Executor executor;
 
@@ -54,61 +50,85 @@ final class DefaultWotThingModelExtensionResolver implements WotThingModelExtens
     }
 
     @Override
-    public ThingModel resolveThingModelExtensions(final ThingModel thingModel, final DittoHeaders dittoHeaders) {
+    public CompletionStage<ThingModel> resolveThingModelExtensions(final ThingModel thingModel,
+            final DittoHeaders dittoHeaders) {
         final ThingModel.Builder tmBuilder = thingModel.toBuilder();
-        thingModel.getLinks()
+        return thingModel.getLinks()
                 .map(links -> {
                             final List<CompletableFuture<ThingModel>> fetchedModelFutures = links.stream()
                                     .filter(baseLink -> baseLink.getRel().filter(TM_EXTENDS::equals).isPresent())
                                     .map(extendsLink -> thingModelFetcher.fetchThingModel(extendsLink.getHref(), dittoHeaders))
                                     .map(CompletionStage::toCompletableFuture)
-                                    .map(cf -> cf.orTimeout(MAX_FETCH_MODEL_DURATION.toSeconds(), TimeUnit.SECONDS))
                                     .toList();
-                            final CompletableFuture<Void> allModelFuture =
+                            final CompletionStage<Void> allModelFuture =
                                     CompletableFuture.allOf(fetchedModelFutures.toArray(new CompletableFuture[0]));
                             return allModelFuture
                                     .thenApplyAsync(aVoid -> fetchedModelFutures.stream()
-                                        .map(CompletableFuture::join) // joining does not block anything here as "allOf" already guaranteed that all futures are ready
-                                        .toList(), executor)
-                                    .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
-                                    .join();
+                                            .map(CompletableFuture::join) // joining does not block anything here as "allOf" already guaranteed that all futures are ready
+                                            .toList(), executor
+                                    );
                         }
                 )
-                .ifPresent(extendedModels -> extendedModels.forEach(extendedModel -> {
-                    final ThingModel extendedRecursedModel =
-                            resolveThingModelExtensions(extendedModel, dittoHeaders); // recurse!
+                .map(extendedModelsFut -> extendedModelsFut.thenComposeAsync(extendedModels -> {
+                    if (extendedModels.isEmpty()) {
+                        return CompletableFuture.completedStage(thingModel);
+                    } else {
+                        CompletionStage<ThingModel.Builder> currentStage =
+                                resolveThingModelExtensions(extendedModels.get(0), dittoHeaders) // recurse!
+                                        .thenApply(extendedModel ->
+                                                mergeThingModelIntoBuilder().apply(tmBuilder, extendedModel)
+                                        );
+                        for (int i = 1; i < extendedModels.size(); i++) {
+                            currentStage = currentStage.thenCombine(
+                                    resolveThingModelExtensions(extendedModels.get(i), dittoHeaders),  // recurse!
+                                    mergeThingModelIntoBuilder()
+                            );
+                        }
+                        return currentStage.thenApply(ThingModel.Builder::build);
+                    }
+                }, executor))
+                .orElse(CompletableFuture.completedStage(thingModel));
+    }
 
-                    final JsonObject mergedTmObject = JsonFactory
-                            .mergeJsonValues(tmBuilder.build(), extendedRecursedModel).asObject();
-                    tmBuilder.removeAll();
-                    tmBuilder.setAll(mergedTmObject);
-                }));
-        return tmBuilder.build();
+    private BiFunction<ThingModel.Builder, ThingModel, ThingModel.Builder> mergeThingModelIntoBuilder() {
+        return (builder, model) -> {
+            final JsonObject mergedTmObject = JsonFactory.mergeJsonValues(builder.build(), model).asObject();
+            builder.removeAll();
+            builder.setAll(mergedTmObject);
+            return builder;
+        };
     }
 
     @Override
-    public ThingModel resolveThingModelRefs(final ThingModel thingModel, final DittoHeaders dittoHeaders) {
-        final JsonObject thingModelObject = potentiallyResolveRefs(thingModel, dittoHeaders);
-        return ThingModel.fromJson(thingModelObject);
+    public CompletionStage<ThingModel> resolveThingModelRefs(final ThingModel thingModel, final DittoHeaders dittoHeaders) {
+        return potentiallyResolveRefs(thingModel, dittoHeaders).thenApply(ThingModel::fromJson);
     }
 
-    private JsonObject potentiallyResolveRefs(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
-        return jsonObject.stream()
+    private CompletionStage<JsonObject> potentiallyResolveRefs(final JsonObject jsonObject,
+            final DittoHeaders dittoHeaders) {
+        final List<CompletableFuture<JsonField>> completionStages = jsonObject.stream()
                 .map(field -> {
                     if (field.getValue().isObject() && field.getValue().asObject().contains(TM_REF)) {
-                        return JsonField.newInstance(field.getKey(),
-                                resolveRefs(field.getValue().asObject(), dittoHeaders));
+                        return resolveRefs(field.getValue().asObject(), dittoHeaders)
+                                .thenApply(refs -> JsonField.newInstance(field.getKey(), refs));
                     } else if (field.getValue().isObject()) {
-                        return JsonField.newInstance(field.getKey(),
-                                potentiallyResolveRefs(field.getValue().asObject(), dittoHeaders)); // recurse!
+                        return potentiallyResolveRefs(field.getValue().asObject(), dittoHeaders)  // recurse!
+                                .thenApply(refs -> JsonField.newInstance(field.getKey(), refs));
                     } else {
-                        return field;
+                        return CompletableFuture.completedStage(field);
                     }
                 })
-                .collect(JsonCollectors.fieldsToObject());
+                .map(CompletionStage::toCompletableFuture)
+                .toList();
+        return CompletableFuture.allOf(completionStages.toArray(CompletableFuture[]::new))
+                .thenApplyAsync(v -> completionStages.stream()
+                                .map(CompletableFuture::join)
+                                .collect(JsonCollectors.fieldsToObject()),
+                        executor
+                );
     }
 
-    private JsonValue resolveRefs(final JsonObject objectWithTmRef, final DittoHeaders dittoHeaders) {
+    private CompletionStage<JsonValue> resolveRefs(final JsonObject objectWithTmRef, final DittoHeaders dittoHeaders) {
         final String tmRef = objectWithTmRef.getValue(TM_REF)
                 .filter(JsonValue::isString)
                 .map(JsonValue::asString)
@@ -118,20 +138,17 @@ private JsonValue resolveRefs(final JsonObject objectWithTmRef, final DittoHeade
         if (urlAndPointer.length != 2) {
             throw WotThingModelRefInvalidException.newBuilder(tmRef).dittoHeaders(dittoHeaders).build();
         }
-        final JsonObject refObject = thingModelFetcher.fetchThingModel(IRI.of(urlAndPointer[0]), dittoHeaders)
-                .toCompletableFuture()
-                .orTimeout(MAX_FETCH_MODEL_DURATION.toSeconds(), TimeUnit.SECONDS)
+        return thingModelFetcher.fetchThingModel(IRI.of(urlAndPointer[0]), dittoHeaders)
                 .thenApply(thingModel -> thingModel.getValue(JsonPointer.of(urlAndPointer[1])))
                 .thenComposeAsync(optJsonValue -> optJsonValue
                                 .filter(JsonValue::isObject)
                                 .map(JsonValue::asObject)
                                 .map(CompletableFuture::completedStage)
                                 .orElseGet(() -> CompletableFuture.completedStage(null))
-                        , executor)
-                .toCompletableFuture()
-                .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
-                .join();
-
-        return JsonFactory.mergeJsonValues(objectWithTmRef.remove(TM_REF), refObject).asObject();
+                        , executor
+                )
+                .thenApply(refObject ->
+                        JsonFactory.mergeJsonValues(objectWithTmRef.remove(TM_REF), refObject).asObject()
+                );
     }
 }
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java
index 5c3e39dcac9..33b1db01561 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/DefaultWotThingSkeletonGenerator.java
@@ -16,7 +16,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -24,8 +23,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
@@ -34,8 +33,8 @@
 import javax.annotation.concurrent.Immutable;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.internal.utils.akka.logging.DittoLogger;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
+import org.eclipse.ditto.internal.utils.akka.logging.ThreadSafeDittoLogger;
 import org.eclipse.ditto.json.JsonArray;
 import org.eclipse.ditto.json.JsonArrayBuilder;
 import org.eclipse.ditto.json.JsonObject;
@@ -73,6 +72,7 @@
 import org.eclipse.ditto.wot.model.WotThingModelInvalidException;
 
 import akka.actor.ActorSystem;
+import akka.japi.Pair;
 
 /**
  * Default Ditto specific implementation of {@link WotThingSkeletonGenerator}.
@@ -80,17 +80,14 @@
 @Immutable
 final class DefaultWotThingSkeletonGenerator implements WotThingSkeletonGenerator {
 
-    private static final DittoLogger LOGGER = DittoLoggerFactory.getLogger(DefaultWotThingSkeletonGenerator.class);
+    private static final ThreadSafeDittoLogger LOGGER =
+            DittoLoggerFactory.getThreadSafeLogger(DefaultWotThingSkeletonGenerator.class);
 
     private static final String TM_EXTENDS = "tm:extends";
 
     private static final String TM_SUBMODEL = "tm:submodel";
     private static final String TM_SUBMODEL_INSTANCE_NAME = "instanceName";
 
-    private static final Duration MAX_FETCH_MODEL_DURATION = Duration.ofSeconds(10);
-    private static final Duration MAX_JOIN_WAIT_DURATION = Duration.ofSeconds(20);
-
-
     private final WotThingModelFetcher thingModelFetcher;
     private final Executor executor;
     private final WotThingModelExtensionResolver thingModelExtensionResolver;
@@ -102,55 +99,63 @@ final class DefaultWotThingSkeletonGenerator implements WotThingSkeletonGenerato
     }
 
     @Override
-    public Optional<Thing> generateThingSkeleton(final ThingId thingId,
+    public CompletionStage<Optional<Thing>> generateThingSkeleton(final ThingId thingId,
             final ThingModel thingModel,
             final URL thingModelUrl,
             final DittoHeaders dittoHeaders) {
 
-        final ThingModel thingModelWithExtensions = thingModelExtensionResolver
-                .resolveThingModelExtensions(thingModel, dittoHeaders);
-        final ThingModel thingModelWithExtensionsAndImports = thingModelExtensionResolver
-                .resolveThingModelRefs(thingModelWithExtensions, dittoHeaders);
-
-        final Optional<String> dittoExtensionPrefix = thingModelWithExtensionsAndImports.getAtContext()
-                .determinePrefixFor(DittoWotExtension.DITTO_WOT_EXTENSION);
-
-        LOGGER.withCorrelationId(dittoHeaders)
-                .debug("ThingModel for generating Thing skeleton after resolving extensions + refs: <{}>",
-                        thingModelWithExtensionsAndImports);
-
-        final ThingBuilder.FromScratch builder = Thing.newBuilder();
-        thingModelWithExtensionsAndImports.getProperties()
-                .map(properties -> {
-                    final JsonObjectBuilder jsonObjectBuilder = JsonObject.newBuilder();
-                    final Map<String, JsonObjectBuilder> attributesCategories = new LinkedHashMap<>();
-
-                    fillPropertiesInOptionalCategories(
-                            properties,
-                            thingModelWithExtensionsAndImports.getTmOptional().orElse(null),
-                            jsonObjectBuilder,
-                            attributesCategories,
-                            property -> dittoExtensionPrefix.flatMap(prefix ->
-                                    property.getValue(prefix + ":" + DittoWotExtension.DITTO_WOT_EXTENSION_CATEGORY)
+        return thingModelExtensionResolver
+                .resolveThingModelExtensions(thingModel, dittoHeaders)
+                .thenCompose(thingModelWithExtensions ->
+                        thingModelExtensionResolver.resolveThingModelRefs(thingModelWithExtensions, dittoHeaders)
+                )
+                .thenApply(thingModelWithExtensionsAndImports -> {
+                    final Optional<String> dittoExtensionPrefix = thingModelWithExtensionsAndImports.getAtContext()
+                            .determinePrefixFor(DittoWotExtension.DITTO_WOT_EXTENSION);
+
+                    LOGGER.withCorrelationId(dittoHeaders)
+                            .debug("ThingModel for generating Thing skeleton after resolving extensions + refs: <{}>",
+                                    thingModelWithExtensionsAndImports);
+
+                    final ThingBuilder.FromScratch builder = Thing.newBuilder();
+                    thingModelWithExtensionsAndImports.getProperties()
+                            .map(properties -> {
+                                final JsonObjectBuilder jsonObjectBuilder = JsonObject.newBuilder();
+                                final Map<String, JsonObjectBuilder> attributesCategories = new LinkedHashMap<>();
+
+                                fillPropertiesInOptionalCategories(
+                                        properties,
+                                        thingModelWithExtensionsAndImports.getTmOptional().orElse(null),
+                                        jsonObjectBuilder,
+                                        attributesCategories,
+                                        property -> dittoExtensionPrefix.flatMap(prefix ->
+                                                        property.getValue(prefix + ":" +
+                                                                DittoWotExtension.DITTO_WOT_EXTENSION_CATEGORY
+                                                        )
+                                                )
+                                                .filter(JsonValue::isString)
+                                                .map(JsonValue::asString)
+                                );
+
+                                final AttributesBuilder attributesBuilder = Attributes.newBuilder();
+                                if (attributesCategories.size() > 0) {
+                                    attributesCategories.forEach((attributeCategory, categoryObjBuilder) ->
+                                            attributesBuilder.set(attributeCategory, categoryObjBuilder.build())
+                                    );
+                                }
+                                attributesBuilder.setAll(jsonObjectBuilder.build());
+                                return attributesBuilder.build();
+                            }).ifPresent(builder::setAttributes);
+
+                    return Pair.apply(thingModelWithExtensionsAndImports, builder);
+                })
+                .thenCompose(pair ->
+                    createFeaturesFromSubmodels(pair.first(), dittoHeaders)
+                            .thenApply(features ->
+                                    features.map(f -> pair.second().setFeatures(f)).orElse(pair.second())
                             )
-                            .filter(JsonValue::isString)
-                            .map(JsonValue::asString)
-                    );
-
-                    final AttributesBuilder attributesBuilder = Attributes.newBuilder();
-                    if (attributesCategories.size() > 0) {
-                        attributesCategories.forEach((attributeCategory, categoryObjBuilder) ->
-                                attributesBuilder.set(attributeCategory, categoryObjBuilder.build())
-                        );
-                    }
-                    attributesBuilder.setAll(jsonObjectBuilder.build());
-                    return attributesBuilder.build();
-                }).ifPresent(builder::setAttributes);
-
-        createFeaturesFromSubmodels(thingModelWithExtensionsAndImports, dittoHeaders)
-                .ifPresent(builder::setFeatures);
-
-        return Optional.of(builder.build());
+                )
+                .thenApply(builder -> Optional.of(builder.build()));
     }
 
     private static void fillPropertiesInOptionalCategories(final Properties properties,
@@ -185,7 +190,7 @@ private static void fillPropertiesInOptionalCategories(final Properties properti
                 );
     }
 
-    private Optional<Features> createFeaturesFromSubmodels(final ThingModel thingModel,
+    private CompletionStage<Optional<Features>> createFeaturesFromSubmodels(final ThingModel thingModel,
             final DittoHeaders dittoHeaders) {
 
         final FeaturesBuilder featuresBuilder = Features.newBuilder();
@@ -211,9 +216,7 @@ private Optional<Features> createFeaturesFromSubmodels(final ThingModel thingMod
                 )
                 .orElseGet(Stream::empty)
                 .map(submodel -> thingModelFetcher.fetchThingModel(submodel.href, dittoHeaders)
-                        .toCompletableFuture()
-                        .orTimeout(MAX_FETCH_MODEL_DURATION.toSeconds(), TimeUnit.SECONDS)
-                        .thenApplyAsync(subThingModel ->
+                        .thenComposeAsync(subThingModel ->
                                 generateFeatureSkeleton(submodel.instanceName,
                                         subThingModel,
                                         submodel.href,
@@ -223,26 +226,24 @@ private Optional<Features> createFeaturesFromSubmodels(final ThingModel thingMod
                 )
                 .toList();
 
-        final List<Feature> features = CompletableFuture.allOf(futureList.toArray(CompletableFuture<?>[]::new))
-                .thenApplyAsync(v -> futureList.stream()
-                        .map(CompletableFuture::join)
-                        .filter(Optional::isPresent)
-                        .map(Optional::get)
-                        .toList(),
+        return CompletableFuture.allOf(futureList.toArray(CompletableFuture<?>[]::new))
+                .thenApplyAsync(v -> {
+                            if (futureList.isEmpty()) {
+                                return Optional.empty();
+                            } else {
+                                featuresBuilder.setAll(futureList.stream()
+                                        .map(CompletableFuture::join)
+                                        .filter(Optional::isPresent)
+                                        .map(Optional::get)
+                                        .toList());
+                                return Optional.of(featuresBuilder.build());
+                            }
+                        },
                         executor
-                )
-                .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
-                .join();
-
-        if (features.isEmpty()) {
-            return Optional.empty();
-        } else {
-            featuresBuilder.setAll(features);
-            return Optional.of(featuresBuilder.build());
-        }
+                );
     }
 
-    private Optional<Feature> generateFeatureSkeleton(final String featureId,
+    private CompletionStage<Optional<Feature>> generateFeatureSkeleton(final String featureId,
             final ThingModel thingModel,
             final IRI thingModelIri,
             final DittoHeaders dittoHeaders) {
@@ -256,54 +257,61 @@ private Optional<Feature> generateFeatureSkeleton(final String featureId,
     }
 
     @Override
-    public Optional<Feature> generateFeatureSkeleton(final String featureId,
+    public CompletionStage<Optional<Feature>> generateFeatureSkeleton(final String featureId,
             final ThingModel thingModel,
             final URL thingModelUrl,
             final DittoHeaders dittoHeaders) {
 
-        final ThingModel thingModelWithExtensions = thingModelExtensionResolver
-                .resolveThingModelExtensions(thingModel, dittoHeaders);
-        final ThingModel thingModelWithExtensionsAndImports = thingModelExtensionResolver
-                .resolveThingModelRefs(thingModelWithExtensions, dittoHeaders);
-
-        final Optional<String> dittoExtensionPrefix = thingModelWithExtensionsAndImports.getAtContext()
-                .determinePrefixFor(DittoWotExtension.DITTO_WOT_EXTENSION);
-
-        LOGGER.withCorrelationId(dittoHeaders)
-                .debug("ThingModel for generating Feature skeleton after resolving extensions + refs: <{}>",
-                        thingModelWithExtensionsAndImports);
-
-        final FeatureBuilder.FromScratchBuildable builder = Feature.newBuilder();
-        thingModelWithExtensionsAndImports.getProperties()
-                .map(properties -> {
-                    final JsonObjectBuilder jsonObjectBuilder = JsonObject.newBuilder();
-                    final Map<String, JsonObjectBuilder> propertiesCategories = new LinkedHashMap<>();
-
-                    fillPropertiesInOptionalCategories(
-                            properties,
-                            thingModelWithExtensionsAndImports.getTmOptional().orElse(null),
-                            jsonObjectBuilder,
-                            propertiesCategories,
-                            property -> dittoExtensionPrefix.flatMap(prefix ->
-                                            property.getValue(prefix + ":" + DittoWotExtension.DITTO_WOT_EXTENSION_CATEGORY)
-                                    )
-                                    .filter(JsonValue::isString)
-                                    .map(JsonValue::asString)
-                    );
-
-                    final FeaturePropertiesBuilder propertiesBuilder = FeatureProperties.newBuilder();
-                    if (propertiesCategories.size() > 0) {
-                        propertiesCategories.forEach((propertyCategory, categoryObjBuilder) ->
-                                propertiesBuilder.set(propertyCategory, categoryObjBuilder.build())
-                        );
-                    }
-                    propertiesBuilder.setAll(jsonObjectBuilder.build());
-                    return propertiesBuilder.build();
-                }).ifPresent(builder::properties);
+        return thingModelExtensionResolver
+                .resolveThingModelExtensions(thingModel, dittoHeaders)
+                .thenCompose(thingModelWithExtensions -> thingModelExtensionResolver
+                        .resolveThingModelRefs(thingModelWithExtensions, dittoHeaders))
+                .thenCombine(resolveFeatureDefinition(thingModel, thingModelUrl, dittoHeaders),
+                        (thingModelWithExtensionsAndImports, featureDefinition) -> {
+                            final Optional<String> dittoExtensionPrefix =
+                                    thingModelWithExtensionsAndImports.getAtContext()
+                                            .determinePrefixFor(DittoWotExtension.DITTO_WOT_EXTENSION);
+
+                            LOGGER.withCorrelationId(dittoHeaders)
+                                    .debug("ThingModel for generating Feature skeleton after resolving extensions + refs: <{}>",
+                                            thingModelWithExtensionsAndImports);
+
+                            final FeatureBuilder.FromScratchBuildable builder = Feature.newBuilder();
+                            thingModelWithExtensionsAndImports.getProperties()
+                                    .map(properties -> {
+                                        final JsonObjectBuilder jsonObjectBuilder = JsonObject.newBuilder();
+                                        final Map<String, JsonObjectBuilder> propertiesCategories =
+                                                new LinkedHashMap<>();
+
+                                        fillPropertiesInOptionalCategories(
+                                                properties,
+                                                thingModelWithExtensionsAndImports.getTmOptional().orElse(null),
+                                                jsonObjectBuilder,
+                                                propertiesCategories,
+                                                property -> dittoExtensionPrefix.flatMap(prefix ->
+                                                                property.getValue(
+                                                                        prefix + ":" +
+                                                                                DittoWotExtension.DITTO_WOT_EXTENSION_CATEGORY)
+                                                        )
+                                                        .filter(JsonValue::isString)
+                                                        .map(JsonValue::asString)
+                                        );
+
+                                        final FeaturePropertiesBuilder propertiesBuilder =
+                                                FeatureProperties.newBuilder();
+                                        if (propertiesCategories.size() > 0) {
+                                            propertiesCategories.forEach((propertyCategory, categoryObjBuilder) ->
+                                                    propertiesBuilder.set(propertyCategory, categoryObjBuilder.build())
+                                            );
+                                        }
+                                        propertiesBuilder.setAll(jsonObjectBuilder.build());
+                                        return propertiesBuilder.build();
+                                    }).ifPresent(builder::properties);
 
-        builder.definition(resolveFeatureDefinition(thingModel, thingModelUrl, dittoHeaders));
+                            builder.definition(featureDefinition);
 
-        return Optional.of(builder.withId(featureId).build());
+                            return Optional.of(builder.withId(featureId).build());
+                        });
     }
 
     private static Optional<JsonValue> determineInitialPropertyValue(final SingleDataSchema dataSchema) {
@@ -458,14 +466,17 @@ private static String provideNeutralStringElement(@Nullable final Integer minLen
         return "";
     }
 
-    private FeatureDefinition resolveFeatureDefinition(final ThingModel thingModel, final URL thingModelUrl,
+    private CompletionStage<FeatureDefinition> resolveFeatureDefinition(final ThingModel thingModel, final URL thingModelUrl,
             final DittoHeaders dittoHeaders) {
-        return FeatureDefinition.fromIdentifier(thingModelUrl.toString(),
-                determineFurtherFeatureDefinitionIdentifiers(thingModel, dittoHeaders)
-                        .toArray(new DefinitionIdentifier[]{}));
+        return determineFurtherFeatureDefinitionIdentifiers(thingModel, dittoHeaders)
+                .thenApply(definitionIdentifiers -> FeatureDefinition.fromIdentifier(
+                        thingModelUrl.toString(),
+                        definitionIdentifiers.toArray(DefinitionIdentifier[]::new)
+                ));
     }
 
-    private List<DefinitionIdentifier> determineFurtherFeatureDefinitionIdentifiers(final ThingModel thingModel,
+    private CompletionStage<List<DefinitionIdentifier>> determineFurtherFeatureDefinitionIdentifiers(
+            final ThingModel thingModel,
             final DittoHeaders dittoHeaders) {
         return thingModel.getLinks().map(links -> {
             final Optional<BaseLink<?>> extendsLink = links.stream()
@@ -474,26 +485,23 @@ private List<DefinitionIdentifier> determineFurtherFeatureDefinitionIdentifiers(
 
             if (extendsLink.isPresent()) {
                 final BaseLink<?> link = extendsLink.get();
-                final List<DefinitionIdentifier> recursedSubmodels =
-                        thingModelFetcher.fetchThingModel(link.getHref(), dittoHeaders)
-                                .toCompletableFuture()
-                                .orTimeout(MAX_FETCH_MODEL_DURATION.toSeconds(), TimeUnit.SECONDS)
-                                .thenApplyAsync(subThingModel ->
-                                        determineFurtherFeatureDefinitionIdentifiers( // recurse!
-                                                subThingModel,
-                                                dittoHeaders
-                                        ), executor)
-                                .toCompletableFuture()
-                                .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
-                                .join();
-                final List<DefinitionIdentifier> combinedIdentifiers = new ArrayList<>();
-                combinedIdentifiers.add(ThingsModelFactory.newFeatureDefinitionIdentifier(link.getHref()));
-                combinedIdentifiers.addAll(recursedSubmodels);
-                return combinedIdentifiers;
+                return thingModelFetcher.fetchThingModel(link.getHref(), dittoHeaders)
+                        .thenComposeAsync(subThingModel ->
+                                determineFurtherFeatureDefinitionIdentifiers( // recurse!
+                                        subThingModel,
+                                        dittoHeaders
+                                ), executor
+                        )
+                        .thenApply(recursedSubmodels -> {
+                            final List<DefinitionIdentifier> combinedIdentifiers = new ArrayList<>();
+                            combinedIdentifiers.add(ThingsModelFactory.newFeatureDefinitionIdentifier(link.getHref()));
+                            combinedIdentifiers.addAll(recursedSubmodels);
+                            return combinedIdentifiers;
+                        });
             } else {
-                return Collections.<DefinitionIdentifier>emptyList();
+                return CompletableFuture.completedStage(Collections.<DefinitionIdentifier>emptyList());
             }
-        }).orElseGet(Collections::emptyList);
+        }).orElseGet(() -> CompletableFuture.completedStage(Collections.emptyList()));
     }
 
     private static class Submodel {
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/WotThingDescriptionGenerator.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/WotThingDescriptionGenerator.java
index 799d565e5a5..c40d8f1b571 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/WotThingDescriptionGenerator.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/WotThingDescriptionGenerator.java
@@ -13,6 +13,7 @@
 package org.eclipse.ditto.wot.integration.generator;
 
 import java.net.URL;
+import java.util.concurrent.CompletionStage;
 
 import javax.annotation.Nullable;
 
@@ -54,7 +55,7 @@ public interface WotThingDescriptionGenerator {
      * @throws org.eclipse.ditto.wot.model.WotThingModelInvalidException if the WoT ThingModel did not contain the
      * mandatory {@code "@type"} being {@code "tm:ThingModel"}
      */
-    ThingDescription generateThingDescription(ThingId thingId,
+    CompletionStage<ThingDescription> generateThingDescription(ThingId thingId,
             @Nullable Thing thing,
             @Nullable JsonObject placeholderLookupObject,
             @Nullable String featureId,
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/WotThingModelExtensionResolver.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/WotThingModelExtensionResolver.java
index 251602bc631..1cd749befe0 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/WotThingModelExtensionResolver.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/WotThingModelExtensionResolver.java
@@ -12,6 +12,8 @@
  */
 package org.eclipse.ditto.wot.integration.generator;
 
+import java.util.concurrent.CompletionStage;
+
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.wot.model.ThingModel;
 
@@ -37,7 +39,7 @@ public interface WotThingModelExtensionResolver {
      * @throws org.eclipse.ditto.wot.model.WotThingModelInvalidException if the fetched extended ThingModel could not be
      * parsed/interpreted as correct WoT ThingModel.
      */
-    ThingModel resolveThingModelExtensions(ThingModel thingModel, DittoHeaders dittoHeaders);
+    CompletionStage<ThingModel> resolveThingModelExtensions(ThingModel thingModel, DittoHeaders dittoHeaders);
 
     /**
      * Resolves the "references" ({@code tm:ref}) contained in the passed {@code thingModel} and merges them into the
@@ -53,5 +55,5 @@ public interface WotThingModelExtensionResolver {
      * @throws org.eclipse.ditto.wot.model.WotThingModelInvalidException if the fetched referenced ThingModel could not
      * be parsed/interpreted as correct WoT ThingModel.
      */
-    ThingModel resolveThingModelRefs(ThingModel thingModel, DittoHeaders dittoHeaders);
+    CompletionStage<ThingModel> resolveThingModelRefs(ThingModel thingModel, DittoHeaders dittoHeaders);
 }
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/WotThingSkeletonGenerator.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/WotThingSkeletonGenerator.java
index c61ca238459..b458ddb63bb 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/WotThingSkeletonGenerator.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/generator/WotThingSkeletonGenerator.java
@@ -14,6 +14,7 @@
 
 import java.net.URL;
 import java.util.Optional;
+import java.util.concurrent.CompletionStage;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.things.model.Feature;
@@ -50,7 +51,7 @@ public interface WotThingSkeletonGenerator {
      * @throws org.eclipse.ditto.wot.model.WotThingModelInvalidException if the WoT ThingModel did not contain the
      * mandatory {@code "@type"} being {@code "tm:ThingModel"}
      */
-    Optional<Thing> generateThingSkeleton(ThingId thingId,
+    CompletionStage<Optional<Thing>> generateThingSkeleton(ThingId thingId,
             ThingModel thingModel,
             URL thingModelUrl,
             DittoHeaders dittoHeaders);
@@ -71,7 +72,7 @@ Optional<Thing> generateThingSkeleton(ThingId thingId,
      * @throws org.eclipse.ditto.wot.model.WotThingModelInvalidException if the WoT ThingModel did not contain the
      * mandatory {@code "@type"} being {@code "tm:ThingModel"}
      */
-    Optional<Feature> generateFeatureSkeleton(String featureId,
+    CompletionStage<Optional<Feature>> generateFeatureSkeleton(String featureId,
             ThingModel thingModel,
             URL thingModelUrl,
             DittoHeaders dittoHeaders);
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java
index 58b6a2a7600..46e11581281 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingDescriptionProvider.java
@@ -15,12 +15,10 @@
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
 import java.net.URL;
-import java.time.Duration;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
@@ -61,8 +59,6 @@ final class DefaultWotThingDescriptionProvider implements WotThingDescriptionPro
 
     public static final String MODEL_PLACEHOLDERS_KEY = "model-placeholders";
 
-    private static final Duration MAX_JOIN_WAIT_DURATION = Duration.ofSeconds(20);
-
     private final WotConfig wotConfig;
     private final WotThingModelFetcher thingModelFetcher;
     private final WotThingDescriptionGenerator thingDescriptionGenerator;
@@ -90,7 +86,7 @@ public static DefaultWotThingDescriptionProvider of(final ActorSystem actorSyste
     }
 
     @Override
-    public ThingDescription provideThingTD(@Nullable final ThingDefinition thingDefinition,
+    public CompletionStage<ThingDescription> provideThingTD(@Nullable final ThingDefinition thingDefinition,
             final ThingId thingId,
             @Nullable final Thing thing,
             final DittoHeaders dittoHeaders) {
@@ -104,7 +100,7 @@ public ThingDescription provideThingTD(@Nullable final ThingDefinition thingDefi
     }
 
     @Override
-    public ThingDescription provideFeatureTD(final ThingId thingId,
+    public CompletionStage<ThingDescription> provideFeatureTD(final ThingId thingId,
             @Nullable final Thing thing,
             final Feature feature,
             final DittoHeaders dittoHeaders) {
@@ -134,7 +130,7 @@ public CompletionStage<Optional<Thing>> provideThingSkeletonForCreation(final Th
                 logger.debug("Fetching ThingModel from <{}> in order to create Thing skeleton for new Thing " +
                         "with id <{}>", url, thingId);
                 return thingModelFetcher.fetchThingModel(url, dittoHeaders)
-                        .thenApplyAsync(thingModel -> thingSkeletonGenerator
+                        .thenComposeAsync(thingModel -> thingSkeletonGenerator
                                         .generateThingSkeleton(thingId, thingModel, url, dittoHeaders),
                                 executor
                         )
@@ -144,7 +140,7 @@ public CompletionStage<Optional<Thing>> provideThingSkeletonForCreation(final Th
                             return thingSkeleton;
                         })
                         .exceptionally(throwable -> {
-                            logger.info("Could not fetch ThingModel or generate Feature skeleton based on it due " +
+                            logger.info("Could not fetch ThingModel or generate Thing skeleton based on it due " +
                                             "to: <{}: {}>",
                                     throwable.getClass().getSimpleName(),throwable.getMessage(), throwable);
                             return Optional.empty();
@@ -172,7 +168,7 @@ public CompletionStage<Optional<Feature>> provideFeatureSkeletonForCreation(fina
                 logger.debug("Fetching ThingModel from <{}> in order to create Feature skeleton for new Feature " +
                         "with id <{}>", url, featureId);
                 return thingModelFetcher.fetchThingModel(url, dittoHeaders)
-                        .thenApplyAsync(thingModel -> thingSkeletonGenerator
+                        .thenComposeAsync(thingModel -> thingSkeletonGenerator
                                         .generateFeatureSkeleton(featureId, thingModel, url, dittoHeaders),
                                 executor
                         )
@@ -198,7 +194,7 @@ public CompletionStage<Optional<Feature>> provideFeatureSkeletonForCreation(fina
     /**
      * Download TM, add it to local cache + build TD + return it
      */
-    private ThingDescription getWotThingDescriptionForThing(final ThingDefinition definitionIdentifier,
+    private CompletionStage<ThingDescription> getWotThingDescriptionForThing(final ThingDefinition definitionIdentifier,
             final ThingId thingId,
             @Nullable final Thing thing,
             final DittoHeaders dittoHeaders) {
@@ -206,35 +202,30 @@ private ThingDescription getWotThingDescriptionForThing(final ThingDefinition de
         final Optional<URL> urlOpt = definitionIdentifier.getUrl();
         if (urlOpt.isPresent()) {
             final URL url = urlOpt.get();
-            try {
-                return thingModelFetcher.fetchThingModel(url, dittoHeaders)
-                        .thenApplyAsync(thingModel -> thingDescriptionGenerator
-                                .generateThingDescription(thingId,
-                                        thing,
-                                        Optional.ofNullable(thing)
-                                                .flatMap(Thing::getAttributes)
-                                                .flatMap(a -> a.getValue(MODEL_PLACEHOLDERS_KEY))
-                                                .filter(JsonValue::isObject)
-                                                .map(JsonValue::asObject)
-                                                .orElse(null),
-                                        null,
-                                        thingModel,
-                                        url,
-                                        dittoHeaders
-                                ),
-                                executor
-                        )
-                        .toCompletableFuture()
-                        .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
-                        .join();
-            } catch (final Exception e) {
-                throw DittoRuntimeException.asDittoRuntimeException(e, throwable ->
-                        WotInternalErrorException.newBuilder()
-                                .dittoHeaders(dittoHeaders)
-                                .cause(e)
-                                .build()
-                );
-            }
+            return thingModelFetcher.fetchThingModel(url, dittoHeaders)
+                    .thenComposeAsync(thingModel -> thingDescriptionGenerator
+                            .generateThingDescription(thingId,
+                                    thing,
+                                    Optional.ofNullable(thing)
+                                            .flatMap(Thing::getAttributes)
+                                            .flatMap(a -> a.getValue(MODEL_PLACEHOLDERS_KEY))
+                                            .filter(JsonValue::isObject)
+                                            .map(JsonValue::asObject)
+                                            .orElse(null),
+                                    null,
+                                    thingModel,
+                                    url,
+                                    dittoHeaders
+                            ),
+                            executor
+                    )
+                    .exceptionally(throwable -> {
+                        throw DittoRuntimeException.asDittoRuntimeException(throwable, t ->
+                                WotInternalErrorException.newBuilder()
+                                        .dittoHeaders(dittoHeaders)
+                                        .cause(t)
+                                        .build());
+                    });
         } else {
             throw ThingDefinitionInvalidException.newBuilder(definitionIdentifier)
                     .dittoHeaders(dittoHeaders)
@@ -245,7 +236,7 @@ private ThingDescription getWotThingDescriptionForThing(final ThingDefinition de
     /**
      * Download TM, add it to local cache + build TD + return it
      */
-    private ThingDescription getWotThingDescriptionForFeature(final ThingId thingId,
+    private CompletionStage<ThingDescription> getWotThingDescriptionForFeature(final ThingId thingId,
             @Nullable final Thing thing,
             final Feature feature,
             final DittoHeaders dittoHeaders) {
@@ -255,34 +246,29 @@ private ThingDescription getWotThingDescriptionForFeature(final ThingId thingId,
         final Optional<URL> urlOpt = definitionIdentifier.flatMap(DefinitionIdentifier::getUrl);
         if (urlOpt.isPresent()) {
             final URL url = urlOpt.get();
-            try {
-                return thingModelFetcher.fetchThingModel(url, dittoHeaders)
-                        .thenApplyAsync(thingModel -> thingDescriptionGenerator
-                                .generateThingDescription(thingId,
-                                        thing,
-                                        feature.getProperties()
-                                                .flatMap(p -> p.getValue(MODEL_PLACEHOLDERS_KEY))
-                                                .filter(JsonValue::isObject)
-                                                .map(JsonValue::asObject)
-                                                .orElse(null),
-                                        feature.getId(),
-                                        thingModel,
-                                        url,
-                                        dittoHeaders
-                                ),
-                                executor
-                        )
-                        .toCompletableFuture()
-                        .orTimeout(MAX_JOIN_WAIT_DURATION.toSeconds(), TimeUnit.SECONDS)
-                        .join();
-            } catch (final Exception e) {
-                throw DittoRuntimeException.asDittoRuntimeException(e, throwable ->
-                        WotInternalErrorException.newBuilder()
-                                .dittoHeaders(dittoHeaders)
-                                .cause(e)
-                                .build()
-                );
-            }
+            return thingModelFetcher.fetchThingModel(url, dittoHeaders)
+                    .thenComposeAsync(thingModel -> thingDescriptionGenerator
+                            .generateThingDescription(thingId,
+                                    thing,
+                                    feature.getProperties()
+                                            .flatMap(p -> p.getValue(MODEL_PLACEHOLDERS_KEY))
+                                            .filter(JsonValue::isObject)
+                                            .map(JsonValue::asObject)
+                                            .orElse(null),
+                                    feature.getId(),
+                                    thingModel,
+                                    url,
+                                    dittoHeaders
+                            ),
+                            executor
+                    )
+                    .exceptionally(throwable -> {
+                        throw DittoRuntimeException.asDittoRuntimeException(throwable, t ->
+                                WotInternalErrorException.newBuilder()
+                                        .dittoHeaders(dittoHeaders)
+                                        .cause(t)
+                                        .build());
+                    });
         } else {
             throw ThingDefinitionInvalidException.newBuilder(definitionIdentifier.orElse(null))
                     .dittoHeaders(dittoHeaders)
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingModelFetcher.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingModelFetcher.java
index cce98ff243a..f9c8406b389 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingModelFetcher.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/DefaultWotThingModelFetcher.java
@@ -15,10 +15,12 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.MessageFormat;
+import java.time.Duration;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nullable;
 
@@ -63,6 +65,8 @@ final class DefaultWotThingModelFetcher implements WotThingModelFetcher {
     private static final ThreadSafeDittoLogger LOGGER =
             DittoLoggerFactory.getThreadSafeLogger(DefaultWotThingModelFetcher.class);
 
+    private static final Duration MAX_FETCH_MODEL_DURATION = Duration.ofSeconds(10);
+
     private static final HttpHeader ACCEPT_HEADER = Accept.create(
             MediaRanges.create(MediaTypes.applicationWithOpenCharset("tm+json")),
             MediaRanges.create(MediaTypes.APPLICATION_JSON)
@@ -98,7 +102,8 @@ public CompletableFuture<ThingModel> fetchThingModel(final URL url, final DittoH
         LOGGER.withCorrelationId(dittoHeaders)
                 .debug("Fetching ThingModel (from cache or downloading as fallback) from URL: <{}>", url);
         return thingModelCache.get(url)
-                .thenApply(optTm -> resolveThingModel(optTm.orElse(null), url, dittoHeaders));
+                .thenApply(optTm -> resolveThingModel(optTm.orElse(null), url, dittoHeaders))
+                .orTimeout(MAX_FETCH_MODEL_DURATION.toSeconds(), TimeUnit.SECONDS);
     }
 
     private ThingModel resolveThingModel(@Nullable final ThingModel thingModel,
diff --git a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/WotThingDescriptionProvider.java b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/WotThingDescriptionProvider.java
index 5191f6b9c28..72ca8c754b2 100644
--- a/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/WotThingDescriptionProvider.java
+++ b/wot/integration/src/main/java/org/eclipse/ditto/wot/integration/provider/WotThingDescriptionProvider.java
@@ -53,7 +53,7 @@ public interface WotThingDescriptionProvider extends Extension {
      * @throws org.eclipse.ditto.wot.model.WotThingModelNotAccessibleException if the ThingModel could not be accessed/
      * downloaded.
      */
-    ThingDescription provideThingTD(@Nullable ThingDefinition thingDefinition,
+    CompletionStage<ThingDescription> provideThingTD(@Nullable ThingDefinition thingDefinition,
             ThingId thingId,
             @Nullable Thing thing,
             DittoHeaders dittoHeaders);
@@ -72,7 +72,7 @@ ThingDescription provideThingTD(@Nullable ThingDefinition thingDefinition,
      * @throws org.eclipse.ditto.wot.model.WotThingModelNotAccessibleException if the ThingModel could not be accessed/
      * downloaded.
      */
-    ThingDescription provideFeatureTD(ThingId thingId,
+    CompletionStage<ThingDescription> provideFeatureTD(ThingId thingId,
             @Nullable Thing thing,
             Feature feature,
             DittoHeaders dittoHeaders);

From 7cbfdfc999410481cb2ec2607fd2bc935df4197d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 27 Jun 2023 21:50:34 +0200
Subject: [PATCH 143/173] #1669 by default, configure queryReadConcern: "local"
 for ditto things-search
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* if used in a replicated MongoDB setup, this should be changed to `queryReadConcern: "linearizable"`

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/Chart.yaml  | 2 +-
 deployment/helm/ditto/values.yaml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index 4cabbd217ee..ca2750966a9 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.3.0  # chart version is effectively set by release-job
+version: 3.3.2  # chart version is effectively set by release-job
 appVersion: 3.3.0
 keywords:
   - iot-chart
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index 2f5558c4f47..249937ca218 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -860,9 +860,10 @@ thingsSearch:
       searchWithAcksWriteConcern: "majority"
       # queryReadConcern configures the MongoDB read concern for doing queries / performing searches
       #  only if this is "linearizable" in combination with the searchWithAcksWriteConcern: "majority" a strong consistency
+      #  if used in a replicated MongoDB setup, this should be changed to `queryReadConcern: "linearizable"`
       #  for commands using the "search-persisted" requested ACK is guaranteed
       #  one of: default | local | majority | linearizable | snapshot | available
-      queryReadConcern: "linearizable"
+      queryReadConcern: "local"
       # updaterPersistenceReadConcern configures the MongoDB read concern for the "ThingUpdater"
       #  one of: default | local | majority | linearizable | snapshot | available
       updaterPersistenceReadConcern: "local"

From a6253fc216bcd6f3756b56a704dbfe21ab984488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 27 Jun 2023 21:45:42 +0200
Subject: [PATCH 144/173] #1670 fix wrong config path for pulling devops and
 status password from helm values
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/Chart.yaml                    |  2 +-
 deployment/helm/ditto/templates/gateway-secret.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index 4cabbd217ee..ca2750966a9 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.3.0  # chart version is effectively set by release-job
+version: 3.3.2  # chart version is effectively set by release-job
 appVersion: 3.3.0
 keywords:
   - iot-chart
diff --git a/deployment/helm/ditto/templates/gateway-secret.yaml b/deployment/helm/ditto/templates/gateway-secret.yaml
index fab1708b8c1..45e9a42c6af 100644
--- a/deployment/helm/ditto/templates/gateway-secret.yaml
+++ b/deployment/helm/ditto/templates/gateway-secret.yaml
@@ -8,7 +8,7 @@
 # http://www.eclipse.org/legal/epl-2.0
 #
 # SPDX-License-Identifier: EPL-2.0
-{{- if not .Values.gateway.existingSecret }}
+{{- if not .Values.gateway.config.authentication.devops.existingSecret }}
 ---
 apiVersion: v1
 kind: Secret
@@ -19,13 +19,13 @@ metadata:
 {{ include "ditto.labels" . | indent 4 }}
 type: Opaque
 data:
-  {{- if .Values.gateway.devopsPassword }}
-  devops-password: {{ .Values.gateway.devopsPassword | b64enc | quote }}
+  {{- if .Values.gateway.config.authentication.devops.devopsPassword }}
+  devops-password: {{ .Values.gateway.config.authentication.devops.devopsPassword | b64enc | quote }}
   {{- else }}
   devops-password: {{ randAlphaNum 12 | b64enc | quote }}
   {{- end }}
-  {{- if .Values.gateway.statusPassword }}
-  status-password: {{ .Values.gateway.statusPassword | b64enc | quote }}
+  {{- if .Values.gateway.config.authentication.devops.statusPassword }}
+  status-password: {{ .Values.gateway.config.authentication.devops.statusPassword | b64enc | quote }}
   {{- else }}
   status-password: {{ randAlphaNum 12 | b64enc | quote }}
   {{- end }}

From 50202df0aabf21ca4e304c17993cff3366088292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Tue, 27 Jun 2023 21:40:43 +0200
Subject: [PATCH 145/173] restored old "synchronous path" for mutations and
 queries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* only for specific commands, enable an "async path" for mutations and queries
* still block on the Akka dispatcher thread, otherwise the persist will not work

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../ConnectionPersistenceActor.java           |  16 +-
 .../AbstractPersistenceActor.java             | 166 ++++++++++++++----
 .../AbstractPersistenceSupervisor.java        |   2 +-
 .../persistentactors/results/EmptyResult.java |   7 +-
 .../persistentactors/results/ErrorResult.java |   7 +-
 .../results/MutationResult.java               |  34 +++-
 .../persistentactors/results/QueryResult.java |  26 ++-
 .../persistentactors/results/Result.java      |  14 +-
 .../results/ResultFactory.java                |  19 +-
 .../results/ResultVisitor.java                |  23 ++-
 .../events/AbstractPolicyActionEvent.java     |   8 +-
 .../signals/events/PolicyActionEvent.java     |   2 +-
 .../model/signals/events/SubjectCreated.java  |   2 +-
 .../model/signals/events/SubjectDeleted.java  |   2 +-
 .../model/signals/events/SubjectModified.java |   2 +-
 .../events/SubjectsDeletedPartially.java      |   2 +-
 .../events/SubjectsModifiedPartially.java     |   2 +-
 .../actors/PolicyPersistenceActor.java        |  22 ++-
 .../TopLevelPolicyActionCommandStrategy.java  |  48 ++---
 .../AbstractPolicyCommandStrategyTest.java    |  55 +++---
 .../commands/PolicyConflictStrategyTest.java  |  16 +-
 .../actors/ThingPersistenceActor.java         |  40 +++--
 .../commands/AbstractCommandStrategyTest.java |  58 +++---
 .../commands/ModifyFeatureStrategyTest.java   |   8 +-
 .../commands/ModifyFeaturesStrategyTest.java  |   4 +-
 .../commands/ResultFactoryTest.java           |  31 +---
 .../commands/ThingConflictStrategyTest.java   |  16 +-
 27 files changed, 431 insertions(+), 201 deletions(-)

diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java
index f3238f9576d..a55e3fb1979 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java
@@ -571,13 +571,23 @@ private void askSelfForRetrieveConnectionStatus(@Nullable final CharSequence cor
     }
 
     @Override
-    public void onMutation(final Command<?> command, final CompletionStage<ConnectivityEvent<?>> event,
+    public void onMutation(final Command<?> command, final ConnectivityEvent<?> event,
+            final WithDittoHeaders response, final boolean becomeCreated, final boolean becomeDeleted) {
+        if (command instanceof StagedCommand stagedCommand) {
+            interpretStagedCommand(stagedCommand.withSenderUnlessDefined(getSender()));
+        } else {
+            super.onMutation(command, event, response, becomeCreated, becomeDeleted);
+        }
+    }
+
+    @Override
+    public void onStagedMutation(final Command<?> command, final CompletionStage<ConnectivityEvent<?>> event,
             final CompletionStage<WithDittoHeaders> response, final boolean becomeCreated,
             final boolean becomeDeleted) {
         if (command instanceof StagedCommand stagedCommand) {
             interpretStagedCommand(stagedCommand.withSenderUnlessDefined(getSender()));
         } else {
-            super.onMutation(command, event, response, becomeCreated, becomeDeleted);
+            super.onStagedMutation(command, event, response, becomeCreated, becomeDeleted);
         }
     }
 
@@ -613,7 +623,7 @@ private void interpretStagedCommand(final StagedCommand command) {
                             "Failed to handle staged command because required event wasn't present: <{}>",
                             command));
             case PERSIST_AND_APPLY_EVENT -> command.getEvent().ifPresentOrElse(
-                    event -> persistAndApplyEvent(CompletableFuture.completedStage(event),
+                    event -> persistAndApplyEvent(event,
                             (unusedEvent, connection) -> interpretStagedCommand(command.next())),
                     () -> log.error("Failed to handle staged command because required event wasn't present: <{}>",
                             command));
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
index 84aadf0a073..6007026aa26 100755
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
@@ -17,6 +17,7 @@
 import java.util.Optional;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -42,6 +43,7 @@
 import org.eclipse.ditto.base.model.signals.events.GlobalEventRegistry;
 import org.eclipse.ditto.internal.utils.akka.PingCommand;
 import org.eclipse.ditto.internal.utils.akka.PingCommandResponse;
+import org.eclipse.ditto.internal.utils.akka.logging.DittoDiagnosticLoggingAdapter;
 import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.internal.utils.namespaces.BlockedNamespaces;
 import org.eclipse.ditto.internal.utils.persistence.SnapshotAdapter;
@@ -58,6 +60,7 @@
 import org.eclipse.ditto.internal.utils.tracing.DittoTracing;
 import org.eclipse.ditto.internal.utils.tracing.span.SpanOperationName;
 import org.eclipse.ditto.internal.utils.tracing.span.SpanTagKey;
+import org.eclipse.ditto.internal.utils.tracing.span.StartedSpan;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonValue;
@@ -100,6 +103,13 @@ public abstract class AbstractPersistenceActor<
      */
     public static final String JOURNAL_TAG_ALWAYS_ALIVE = "always-alive";
 
+    /**
+     * The max timeout to wait for asynchronous performed "pre persist()" event processing (e.g. in order to enhance a
+     * {@code CreateThing} command with a WoT JSON skeleton).
+     * One Akka dispatcher thread is blocked for this amount of time, so this should be minimized.
+     */
+    private static final Duration MAX_ASYNC_EVENT_PRE_PROCESSING_TIMEOUT = Duration.ofSeconds(5);
+
     private final SnapshotAdapter<S> snapshotAdapter;
     private final Receive handleEvents;
     private final Receive handleCleanups;
@@ -521,20 +531,46 @@ protected void becomeDeletedHandler() {
      * @param event   the event to persist and apply.
      * @param handler what happens afterwards.
      */
-    protected void persistAndApplyEvent(final CompletionStage<E> event, final BiConsumer<E, S> handler) {
+    protected void persistAndApplyEvent(final E event, final BiConsumer<E, S> handler) {
+
+        final E modifiedEvent = modifyEventBeforePersist(event);
+        if (modifiedEvent.getDittoHeaders().isDryRun()) {
+            handler.accept(modifiedEvent, entity);
+        } else {
+            persistEvent(modifiedEvent, persistedEvent -> {
+                // after the event was persisted, apply the event on the current actor state
+                applyEvent(persistedEvent);
+                handler.accept(persistedEvent, entity);
+            });
+        }
+    }
+
+    /**
+     * Persist an event, modify actor state by the event strategy, then invoke the handler.
+     *
+     * @param event   the event to persist and apply.
+     * @param handler what happens afterwards.
+     */
+    protected void persistAndApplyEventAsync(final CompletionStage<E> event, final BiConsumer<E, S> handler) {
 
         event.thenAccept(completedEvent -> {
             final E modifiedEvent = modifyEventBeforePersist(completedEvent);
             if (modifiedEvent.getDittoHeaders().isDryRun()) {
                 handler.accept(modifiedEvent, entity);
             } else {
-                persistEvent(modifiedEvent, persistedEvent -> {
+                persistEventAsync(modifiedEvent, persistedEvent -> {
                     // after the event was persisted, apply the event on the current actor state
                     applyEvent(persistedEvent);
                     handler.accept(persistedEvent, entity);
                 });
             }
-        }).toCompletableFuture().join(); // TODO TJ is this bad or not? - propbably yes :/
+        }).toCompletableFuture()
+                .orTimeout(MAX_ASYNC_EVENT_PRE_PROCESSING_TIMEOUT.getSeconds(), TimeUnit.SECONDS)
+                .join(); // this blocks the Akka dispatcher thread, but is needed so that Akka persistence persist()
+                         // is invoked in the correct context
+                         // as most of the provided `CompletionStage<E> event` are already completed futures, this only
+                         // is of relevance for asynchronously preprocessed events to persist, like e.g. CreateThing
+                         // being enhanced by a WoT based Thing JSON skeleton
     }
 
     /**
@@ -680,8 +716,7 @@ private <T extends Command<?>> void handleByStrategy(final T command, @Nullable
     }
 
     @Override
-    public void onMutation(final Command<?> command, final CompletionStage<E> event,
-            final CompletionStage<WithDittoHeaders> response,
+    public void onMutation(final Command<?> command, final E event, final WithDittoHeaders response,
             final boolean becomeCreated, final boolean becomeDeleted) {
 
         final ActorRef sender = getSender();
@@ -699,7 +734,34 @@ public void onMutation(final Command<?> command, final CompletionStage<E> event,
     }
 
     @Override
-    public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
+    public void onStagedMutation(final Command<?> command, final CompletionStage<E> event,
+            final CompletionStage<WithDittoHeaders> response,
+            final boolean becomeCreated, final boolean becomeDeleted) {
+
+        final ActorRef sender = getSender();
+        persistAndApplyEventAsync(event, (persistedEvent, resultingEntity) -> {
+            if (shouldSendResponse(command.getDittoHeaders())) {
+                notifySender(sender, response);
+            }
+            if (becomeDeleted) {
+                becomeDeletedHandler();
+            }
+            if (becomeCreated) {
+                becomeCreatedHandler();
+            }
+        });
+    }
+
+    @Override
+    public void onQuery(final Command<?> command, final WithDittoHeaders response) {
+        if (command.getDittoHeaders().isResponseRequired()) {
+            final ActorRef sender = getSender();
+            notifySender(sender, response);
+        }
+    }
+
+    @Override
+    public void onStagedQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
         if (command.getDittoHeaders().isResponseRequired()) {
             final ActorRef sender = getSender();
             response.thenAccept(r -> notifySender(sender, r));
@@ -728,8 +790,16 @@ private long getNextRevisionNumber() {
         return getRevisionNumber() + 1;
     }
 
-    @SuppressWarnings("unchecked")
     private void persistEvent(final E event, final Consumer<E> handler) {
+        persistEvent(event, handler, false);
+    }
+
+    private void persistEventAsync(final E event, final Consumer<E> handler) {
+        persistEvent(event, handler, true);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void persistEvent(final E event, final Consumer<E> handler, final boolean async) {
         final var l = log.withCorrelationId(event);
         l.debug("Persisting Event <{}>.", event.getType());
 
@@ -740,28 +810,38 @@ private void persistEvent(final E event, final Consumer<E> handler) {
                 .tag(SpanTagKey.SIGNAL_TYPE.getTagForValue(event.getType()))
                 .start();
 
-        persist(
-                event.setDittoHeaders(DittoHeaders.of(persistOperationSpan.propagateContext(event.getDittoHeaders()))),
-                persistedEvent -> {
-                    l.info("Successfully persisted Event <{}> w/ rev: <{}>.",
-                            persistedEvent.getType(),
-                            getRevisionNumber());
-                    persistOperationSpan.finish();
-
-                    /*
-                     * The event has to be applied before creating the snapshot, otherwise a snapshot with new
-                     * sequence no (e.g. 2), but old entity revision no (e.g. 1) will be created -> can lead to serious
-                     * aftereffects.
-                     */
-                    handler.accept(persistedEvent);
-                    onEntityModified();
-
-                    // save a snapshot if there were too many changes since the last snapshot
-                    if (snapshotThresholdPassed()) {
-                        takeSnapshot("snapshot threshold is reached");
-                    }
-                }
-        );
+        if (async) {
+            persistAsync(
+                    event.setDittoHeaders(DittoHeaders.of(persistOperationSpan.propagateContext(event.getDittoHeaders()))),
+                    persistedEvent -> handlePersistedEvent(handler, l, persistOperationSpan, persistedEvent)
+            );
+        } else {
+            persist(
+                    event.setDittoHeaders(DittoHeaders.of(persistOperationSpan.propagateContext(event.getDittoHeaders()))),
+                    persistedEvent -> handlePersistedEvent(handler, l, persistOperationSpan, persistedEvent)
+            );
+        }
+    }
+
+    private void handlePersistedEvent(final Consumer<E> handler, final DittoDiagnosticLoggingAdapter l,
+            final StartedSpan persistOperationSpan, final E persistedEvent) {
+        l.info("Successfully persisted Event <{}> w/ rev: <{}>.",
+                persistedEvent.getType(),
+                getRevisionNumber());
+        persistOperationSpan.finish();
+
+        /*
+         * The event has to be applied before creating the snapshot, otherwise a snapshot with new
+         * sequence no (e.g. 2), but old entity revision no (e.g. 1) will be created -> can lead to serious
+         * aftereffects.
+         */
+        handler.accept(persistedEvent);
+        onEntityModified();
+
+        // save a snapshot if there were too many changes since the last snapshot
+        if (snapshotThresholdPassed()) {
+            takeSnapshot("snapshot threshold is reached");
+        }
     }
 
     private void takeSnapshot(final String reason) {
@@ -997,14 +1077,38 @@ private HistoricalResultListener(final ActorRef sender, final DittoHeaders histo
         }
 
         @Override
-        public void onMutation(final Command<?> command, final CompletionStage<E> event,
+        public void onMutation(final Command<?> command, final E event, final WithDittoHeaders response,
+                final boolean becomeCreated, final boolean becomeDeleted) {
+            throw new UnsupportedOperationException("Mutating historical entity not supported.");
+        }
+
+        @Override
+        public void onStagedMutation(final Command<?> command, final CompletionStage<E> event,
                 final CompletionStage<WithDittoHeaders> response,
                 final boolean becomeCreated, final boolean becomeDeleted) {
             throw new UnsupportedOperationException("Mutating historical entity not supported.");
         }
 
         @Override
-        public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
+        public void onQuery(final Command<?> command, final WithDittoHeaders response) {
+            if (command.getDittoHeaders().isResponseRequired()) {
+                final WithDittoHeaders theResponseToSend;
+                if (response instanceof DittoHeadersSettable<?> dittoHeadersSettable) {
+                    final DittoHeaders queryCommandHeaders = response.getDittoHeaders();
+                    final DittoHeaders adjustedHeaders = queryCommandHeaders.toBuilder()
+                            .putHeader(DittoHeaderDefinition.HISTORICAL_HEADERS.getKey(),
+                                    historicalDittoHeaders.toJson().toString())
+                            .build();
+                    theResponseToSend = dittoHeadersSettable.setDittoHeaders(adjustedHeaders);
+                } else {
+                    theResponseToSend = response;
+                }
+                notifySender(sender, theResponseToSend);
+            }
+        }
+
+        @Override
+        public void onStagedQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
             if (command.getDittoHeaders().isResponseRequired()) {
                 response.thenAccept(r -> {
                     final WithDittoHeaders theResponseToSend;
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
index 3aadf9620a9..d1493354a53 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceSupervisor.java
@@ -783,7 +783,7 @@ private void enforceAndForwardToTargetActor(final Object message) {
                 final var syncCs = signalTransformer.apply(signal)
                         .whenComplete((result, error) -> handleOptionalTransformationException(signal, error, sender))
                         .thenCompose(transformed -> enforceSignalAndForwardToTargetActor((S) transformed, sender)
-                                .exceptionallyCompose(error -> handleTargetActorAndEnforcerException(signal, error))
+                                .exceptionallyCompose(error -> handleTargetActorAndEnforcerException(transformed, error))
                                 .whenComplete((response, throwable) ->
                                         handleSignalEnforcementResponse(response, throwable, transformed, sender)
                                 ))
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/EmptyResult.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/EmptyResult.java
index 6197c9e30c8..aff9969d19b 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/EmptyResult.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/EmptyResult.java
@@ -43,7 +43,12 @@ public void accept(final ResultVisitor<E> visitor) {
     }
 
     @Override
-    public <F extends Event<?>> Result<F> map(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
+    public <F extends Event<?>> Result<F> map(final Function<E, F> mappingFunction) {
+        return getInstance();
+    }
+
+    @Override
+    public <F extends Event<?>> Result<F> mapStages(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
         return getInstance();
     }
 
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ErrorResult.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ErrorResult.java
index 7279f0fdf68..4cf6822691e 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ErrorResult.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ErrorResult.java
@@ -46,7 +46,12 @@ public void accept(final ResultVisitor<E> visitor) {
     }
 
     @Override
-    public <F extends Event<?>> Result<F> map(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
+    public <F extends Event<?>> Result<F> map(final Function<E, F> mappingFunction) {
+        return new ErrorResult<>(dittoRuntimeException, errorCausingCommand);
+    }
+
+    @Override
+    public <F extends Event<?>> Result<F> mapStages(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
         return new ErrorResult<>(dittoRuntimeException, errorCausingCommand);
     }
 }
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/MutationResult.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/MutationResult.java
index eee22c24e4f..afdbd71156b 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/MutationResult.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/MutationResult.java
@@ -15,6 +15,8 @@
 import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 
+import javax.annotation.Nullable;
+
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.events.Event;
@@ -27,16 +29,22 @@
 public final class MutationResult<E extends Event<?>> implements Result<E> {
 
     private final Command<?> command;
-    private final CompletionStage<E> eventToPersistStage;
-    private final CompletionStage<WithDittoHeaders> responseStage;
+    @Nullable private final E eventToPersist;
+    @Nullable private final WithDittoHeaders response;
+    @Nullable private final CompletionStage<E> eventToPersistStage;
+    @Nullable private final CompletionStage<WithDittoHeaders> responseStage;
     private final boolean becomeCreated;
     private final boolean becomeDeleted;
 
     MutationResult(final Command<?> command,
-            final CompletionStage<E> eventToPersistStage,
-            final CompletionStage<WithDittoHeaders> responseStage,
+            @Nullable final E eventToPersist,
+            @Nullable final WithDittoHeaders response,
+            @Nullable final CompletionStage<E> eventToPersistStage,
+            @Nullable final CompletionStage<WithDittoHeaders> responseStage,
             final boolean becomeCreated, final boolean becomeDeleted) {
         this.command = command;
+        this.eventToPersist = eventToPersist;
+        this.response = response;
         this.eventToPersistStage = eventToPersistStage;
         this.responseStage = responseStage;
         this.becomeCreated = becomeCreated;
@@ -45,12 +53,22 @@ public final class MutationResult<E extends Event<?>> implements Result<E> {
 
     @Override
     public void accept(final ResultVisitor<E> visitor) {
-        visitor.onMutation(command, eventToPersistStage, responseStage, becomeCreated, becomeDeleted);
+        if (eventToPersistStage != null && responseStage != null) {
+            visitor.onStagedMutation(command, eventToPersistStage, responseStage, becomeCreated, becomeDeleted);
+        } else {
+            visitor.onMutation(command, eventToPersist, response, becomeCreated, becomeDeleted);
+        }
+    }
+
+    @Override
+    public <F extends Event<?>> Result<F> map(final Function<E, F> mappingFunction) {
+        return new MutationResult<>(command, mappingFunction.apply(eventToPersist), response, null, responseStage, becomeCreated,
+                becomeDeleted);
     }
 
     @Override
-    public <F extends Event<?>> Result<F> map(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
-        return new MutationResult<>(command, mappingFunction.apply(eventToPersistStage), responseStage, becomeCreated,
+    public <F extends Event<?>> Result<F> mapStages(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
+        return new MutationResult<>(command, null, response, mappingFunction.apply(eventToPersistStage), responseStage, becomeCreated,
                 becomeDeleted);
     }
 
@@ -58,6 +76,8 @@ public <F extends Event<?>> Result<F> map(final Function<CompletionStage<E>, Com
     public String toString() {
         return this.getClass().getSimpleName() + " [" +
                 "command=" + command +
+                ", eventToPersist=" + eventToPersist +
+                ", response=" + response +
                 ", eventToPersistStage=" + eventToPersistStage +
                 ", responseStage=" + responseStage +
                 ", becomeCreated=" + becomeCreated +
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/QueryResult.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/QueryResult.java
index 87ec7d0d40c..9a82284f885 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/QueryResult.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/QueryResult.java
@@ -15,6 +15,8 @@
 import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 
+import javax.annotation.Nullable;
+
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.base.model.signals.events.Event;
@@ -27,10 +29,14 @@
 public final class QueryResult<E extends Event<?>> implements Result<E> {
 
     private final Command<?> command;
-    private final CompletionStage<WithDittoHeaders> responseStage;
+    @Nullable private final WithDittoHeaders response;
+    @Nullable private final CompletionStage<WithDittoHeaders> responseStage;
 
-    QueryResult(final Command<?> command, final CompletionStage<WithDittoHeaders> responseStage) {
+    QueryResult(final Command<?> command,
+            @Nullable final WithDittoHeaders response,
+            @Nullable final CompletionStage<WithDittoHeaders> responseStage) {
         this.command = command;
+        this.response = response;
         this.responseStage = responseStage;
     }
 
@@ -38,17 +44,27 @@ public final class QueryResult<E extends Event<?>> implements Result<E> {
     public String toString() {
         return this.getClass().getSimpleName() + " [" +
                 "command=" + command +
+                ", response=" + response +
                 ", responseStage=" + responseStage +
                 ']';
     }
 
     @Override
     public void accept(final ResultVisitor<E> visitor) {
-        visitor.onQuery(command, responseStage);
+        if (responseStage != null) {
+            visitor.onStagedQuery(command, responseStage);
+        } else {
+            visitor.onQuery(command, response);
+        }
+    }
+
+    @Override
+    public <F extends Event<?>> Result<F> map(final Function<E, F> mappingFunction) {
+        return new QueryResult<>(command, response, null);
     }
 
     @Override
-    public <F extends Event<?>> Result<F> map(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
-        return new QueryResult<>(command, responseStage);
+    public <F extends Event<?>> Result<F> mapStages(final Function<CompletionStage<E>, CompletionStage<F>> mappingFunction) {
+        return new QueryResult<>(command, null, responseStage);
     }
 }
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/Result.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/Result.java
index 0bf1ed5f582..cb92d2b9071 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/Result.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/Result.java
@@ -27,7 +27,7 @@ public interface Result<E extends Event<?>> {
      *
      * @param visitor the visitor to evaluate the result, typically the persistent actor itself.
      */
-    void accept(final ResultVisitor<E> visitor);
+    void accept(ResultVisitor<E> visitor);
 
     /**
      * Convert the result with a function.
@@ -35,9 +35,17 @@ public interface Result<E extends Event<?>> {
      * @param mappingFunction the mapping function.
      * @param <F> the new event type of the result.
      * @return the new result.
-     * @since 2.0.0
      */
-    <F extends Event<?>> Result<F> map(Function<CompletionStage<E>, CompletionStage<F>> mappingFunction);
+    <F extends Event<?>> Result<F> map(Function<E, F> mappingFunction);
+
+    /**
+     * Convert the result with a function.
+     *
+     * @param mappingFunction the mapping function.
+     * @param <F> the new event type of the result.
+     * @return the new result.
+     */
+    <F extends Event<?>> Result<F> mapStages(Function<CompletionStage<E>, CompletionStage<F>> mappingFunction);
 
     /**
      * @return the empty result
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultFactory.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultFactory.java
index b86e54dcfb9..36bed2db20b 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultFactory.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultFactory.java
@@ -12,7 +12,6 @@
  */
 package org.eclipse.ditto.internal.utils.persistentactors.results;
 
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
 import javax.annotation.concurrent.Immutable;
@@ -44,8 +43,8 @@ private ResultFactory() {
     public static <E extends Event<?>> Result<E> newMutationResult(final Command<?> command, final E eventToPersist,
             final WithDittoHeaders response) {
 
-        return newMutationResult(command, CompletableFuture.completedStage(eventToPersist),
-                CompletableFuture.completedStage(response));
+        return new MutationResult<>(command, eventToPersist, response, null, null,
+                false, false);
     }
 
     /**
@@ -61,7 +60,8 @@ public static <E extends Event<?>> Result<E> newMutationResult(final Command<?>
             final CompletionStage<E> eventToPersist,
             final CompletionStage<WithDittoHeaders> response) {
 
-        return new MutationResult<>(command, eventToPersist, response, false, false);
+        return new MutationResult<>(command, null, null, eventToPersist, response,
+                false, false);
     }
 
     /**
@@ -81,8 +81,8 @@ public static <E extends Event<?>> Result<E> newMutationResult(final Command<?>
             final boolean becomeCreated,
             final boolean becomeDeleted) {
 
-        return newMutationResult(command, CompletableFuture.completedStage(eventToPersist),
-                CompletableFuture.completedStage(response), becomeCreated, becomeDeleted);
+        return new MutationResult<>(command, eventToPersist, response, null, null,
+                becomeCreated, becomeDeleted);
     }
 
     /**
@@ -102,7 +102,8 @@ public static <E extends Event<?>> Result<E> newMutationResult(final Command<?>
             final boolean becomeCreated,
             final boolean becomeDeleted) {
 
-        return new MutationResult<>(command, eventToPersist, response, becomeCreated, becomeDeleted);
+        return new MutationResult<>(command, null, null, eventToPersist, response,
+                becomeCreated, becomeDeleted);
     }
 
     /**
@@ -128,7 +129,7 @@ public static <E extends Event<?>> Result<E> newErrorResult(final DittoRuntimeEx
      */
     public static <E extends Event<?>> Result<E> newQueryResult(final Command<?> command,
             final WithDittoHeaders response) {
-        return newQueryResult(command, CompletableFuture.completedStage(response));
+        return new QueryResult<>(command, response, null);
     }
 
     /**
@@ -141,7 +142,7 @@ public static <E extends Event<?>> Result<E> newQueryResult(final Command<?> com
      */
     public static <E extends Event<?>> Result<E> newQueryResult(final Command<?> command,
             final CompletionStage<WithDittoHeaders> response) {
-        return new QueryResult<>(command, response);
+        return new QueryResult<>(command, null, response);
     }
 
     /**
diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultVisitor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultVisitor.java
index a4a1c6212b2..cd3322d5f86 100644
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultVisitor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/results/ResultVisitor.java
@@ -42,7 +42,18 @@ default void onEmpty() {
      * @param becomeCreated whether the actor should behave as if the entity is created.
      * @param becomeDeleted whether the actor should behave as if the entity is deleted.
      */
-    void onMutation(Command<?> command, CompletionStage<E> event, CompletionStage<WithDittoHeaders> response,
+    void onMutation(Command<?> command, E event, WithDittoHeaders response, boolean becomeCreated, boolean becomeDeleted);
+
+    /**
+     * Evaluate a mutation result.
+     *
+     * @param command command that caused the mutation.
+     * @param event event of the mutation.
+     * @param response response of the command.
+     * @param becomeCreated whether the actor should behave as if the entity is created.
+     * @param becomeDeleted whether the actor should behave as if the entity is deleted.
+     */
+    void onStagedMutation(Command<?> command, CompletionStage<E> event, CompletionStage<WithDittoHeaders> response,
             boolean becomeCreated, boolean becomeDeleted);
 
     /**
@@ -51,7 +62,15 @@ void onMutation(Command<?> command, CompletionStage<E> event, CompletionStage<Wi
      * @param command the query command.
      * @param response the response.
      */
-    void onQuery(Command<?> command, CompletionStage<WithDittoHeaders> response);
+    void onQuery(Command<?> command, WithDittoHeaders response);
+
+    /**
+     * Evaluate a query result.
+     *
+     * @param command the query command.
+     * @param response the response.
+     */
+    void onStagedQuery(Command<?> command, CompletionStage<WithDittoHeaders> response);
 
     /**
      * Evaluate an error result.
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/AbstractPolicyActionEvent.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/AbstractPolicyActionEvent.java
index 66bf5ba671e..da6810e2e5a 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/AbstractPolicyActionEvent.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/AbstractPolicyActionEvent.java
@@ -67,10 +67,10 @@ protected AbstractPolicyActionEvent(final String type,
      */
     protected SubjectsModifiedPartially aggregateWithSubjectCreatedOrModified(
             final Map<Label, Collection<Subject>> initialModifiedSubjects,
-            final Collection<PolicyActionEvent> otherEvents) {
+            final Collection<PolicyActionEvent<?>> otherEvents) {
 
         final Map<Label, Collection<Subject>> modifiedSubjects = new LinkedHashMap<>(initialModifiedSubjects);
-        for (final PolicyActionEvent event : otherEvents) {
+        for (final PolicyActionEvent<?> event : otherEvents) {
             if (event instanceof SubjectCreated) {
                 final SubjectCreated subjectCreated = (SubjectCreated) event;
                 final Set<Subject> mergedSubjects =
@@ -99,10 +99,10 @@ protected SubjectsModifiedPartially aggregateWithSubjectCreatedOrModified(
      */
     protected SubjectsDeletedPartially aggregateWithSubjectDeleted(
             final Map<Label, Collection<SubjectId>> initialDeletedSubjectIds,
-            final Collection<PolicyActionEvent> otherEvents) {
+            final Collection<PolicyActionEvent<?>> otherEvents) {
 
         final Map<Label, Collection<SubjectId>> deletedSubjectIds = new LinkedHashMap<>(initialDeletedSubjectIds);
-        for (final PolicyActionEvent event : otherEvents) {
+        for (final PolicyActionEvent<?> event : otherEvents) {
             if (event instanceof SubjectDeleted) {
                 final SubjectDeleted subjectDeleted = (SubjectDeleted) event;
                 final Collection<SubjectId> existingSubjectIds = deletedSubjectIds.get(subjectDeleted.getLabel());
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyActionEvent.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyActionEvent.java
index afbbd789441..79982f133ed 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyActionEvent.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/PolicyActionEvent.java
@@ -28,5 +28,5 @@ public interface PolicyActionEvent<T extends PolicyActionEvent<T>> extends Polic
      * @param otherPolicyActionEvents the collection of policy action events.
      * @return the aggregated event.
      */
-    PolicyEvent<?> aggregateWith(Collection<PolicyActionEvent> otherPolicyActionEvents);
+    PolicyEvent<?> aggregateWith(Collection<PolicyActionEvent<?>> otherPolicyActionEvents);
 }
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectCreated.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectCreated.java
index 980cedd28a9..6c853272925 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectCreated.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectCreated.java
@@ -202,7 +202,7 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
     }
 
     @Override
-    public SubjectsModifiedPartially aggregateWith(final Collection<PolicyActionEvent> otherPolicyActionEvents) {
+    public SubjectsModifiedPartially aggregateWith(final Collection<PolicyActionEvent<?>> otherPolicyActionEvents) {
         final Map<Label, Collection<Subject>> initialCreatedSubjects =
                 Stream.of(0).collect(Collectors.toMap(i -> label, i -> Collections.singleton(subject),
                         (u, v) -> {
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectDeleted.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectDeleted.java
index 7ca4e7ae510..dbf417163b8 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectDeleted.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectDeleted.java
@@ -188,7 +188,7 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
     }
 
     @Override
-    public SubjectsDeletedPartially aggregateWith(final Collection<PolicyActionEvent> otherPolicyActionEvents) {
+    public SubjectsDeletedPartially aggregateWith(final Collection<PolicyActionEvent<?>> otherPolicyActionEvents) {
         final Map<Label, Collection<SubjectId>> initialDeletedSubjectId =
                 Stream.of(0).collect(Collectors.toMap(i -> label, i -> Collections.singleton(subjectId),
                         (u, v) -> {
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectModified.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectModified.java
index f5d40d29e39..e0b74780d5b 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectModified.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectModified.java
@@ -202,7 +202,7 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
     }
 
     @Override
-    public SubjectsModifiedPartially aggregateWith(final Collection<PolicyActionEvent> otherPolicyActionEvents) {
+    public SubjectsModifiedPartially aggregateWith(final Collection<PolicyActionEvent<?>> otherPolicyActionEvents) {
         final Map<Label, Collection<Subject>> initialModifiedSubjects =
                 Stream.of(0).collect(Collectors.toMap(i -> label, i -> Collections.singleton(subject),
                         (u, v) -> {
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsDeletedPartially.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsDeletedPartially.java
index dc8916c7759..755acbe4696 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsDeletedPartially.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsDeletedPartially.java
@@ -190,7 +190,7 @@ public int hashCode() {
     }
 
     @Override
-    public SubjectsDeletedPartially aggregateWith(final Collection<PolicyActionEvent> otherPolicyActionEvents) {
+    public SubjectsDeletedPartially aggregateWith(final Collection<PolicyActionEvent<?>> otherPolicyActionEvents) {
         return aggregateWithSubjectDeleted(deletedSubjectIds, otherPolicyActionEvents);
     }
 
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsModifiedPartially.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsModifiedPartially.java
index 7a70d714dad..a1c85153421 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsModifiedPartially.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/signals/events/SubjectsModifiedPartially.java
@@ -184,7 +184,7 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
     }
 
     @Override
-    public SubjectsModifiedPartially aggregateWith(final Collection<PolicyActionEvent> otherPolicyActionEvents) {
+    public SubjectsModifiedPartially aggregateWith(final Collection<PolicyActionEvent<?>> otherPolicyActionEvents) {
         return aggregateWithSubjectCreatedOrModified(modifiedSubjects, otherPolicyActionEvents);
     }
 
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
index 1aaf5b622b8..3fbaa4a7579 100755
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/PolicyPersistenceActor.java
@@ -246,12 +246,30 @@ private void publishPolicyTag(final PolicyEvent<?> event) {
     }
 
     @Override
-    public void onMutation(final Command<?> command, final CompletionStage<PolicyEvent<?>> event,
-            final CompletionStage<WithDittoHeaders> response,
+    public void onMutation(final Command<?> command, final PolicyEvent<?> event, final WithDittoHeaders response,
             final boolean becomeCreated, final boolean becomeDeleted) {
 
         final ActorRef sender = getSender();
         persistAndApplyEvent(event, (persistedEvent, resultingEntity) -> {
+            if (shouldSendResponse(command.getDittoHeaders())) {
+                notifySender(sender, response);
+            }
+            if (becomeDeleted) {
+                becomeDeletedHandler();
+            }
+            if (becomeCreated) {
+                becomeCreatedHandler();
+            }
+        });
+    }
+
+    @Override
+    public void onStagedMutation(final Command<?> command, final CompletionStage<PolicyEvent<?>> event,
+            final CompletionStage<WithDittoHeaders> response,
+            final boolean becomeCreated, final boolean becomeDeleted) {
+
+        final ActorRef sender = getSender();
+        persistAndApplyEventAsync(event, (persistedEvent, resultingEntity) -> {
             if (shouldSendResponse(command.getDittoHeaders())) {
                 response.thenAccept(rsp -> notifySender(sender, rsp));
             }
diff --git a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java
index 4c9aee4c86a..14f12ad766a 100644
--- a/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java
+++ b/policies/service/src/main/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/TopLevelPolicyActionCommandStrategy.java
@@ -18,9 +18,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.stream.Collectors;
 
@@ -104,12 +102,11 @@ protected Result<PolicyEvent<?>> doApply(final Context<PolicyId> context,
             if (visitor.error != null) {
                 return ResultFactory.newErrorResult(visitor.error, command);
             } else {
-                final Optional<CompletionStage<PolicyEvent<?>>> event = visitor.aggregateEvents();
+                final Optional<PolicyEvent<?>> event = visitor.aggregateEvents();
                 if (event.isPresent()) {
                     final TopLevelPolicyActionCommandResponse response =
                             TopLevelPolicyActionCommandResponse.of(context.getState(), dittoHeaders);
-                    return ResultFactory.newMutationResult(command, event.get(),
-                            CompletableFuture.completedFuture(response));
+                    return ResultFactory.newMutationResult(command, event.get(), response);
                 } else {
                     // builds an internal server error, 500
                     final PolicyActionFailedException exception = PolicyActionFailedException.newBuilder()
@@ -165,39 +162,46 @@ private static ResultCollectionVisitor collectResults(
     private static final class ResultCollectionVisitor implements ResultVisitor<PolicyActionEvent<?>> {
 
         @Nullable private DittoRuntimeException error;
-        @Nullable private CompletionStage<PolicyActionEvent<?>> firstEvent;
-        private final List<CompletableFuture<PolicyActionEvent>> otherEvents = new ArrayList<>();
+        @Nullable private PolicyActionEvent<?> firstEvent;
+        private final List<PolicyActionEvent<?>> otherEvents = new ArrayList<>();
 
-        private Optional<CompletionStage<PolicyEvent<?>>> aggregateEvents() {
+        private Optional<PolicyEvent<?>> aggregateEvents() {
             if (firstEvent == null) {
                 return Optional.empty();
             } else {
-                return Optional.of(
-                        firstEvent.thenCompose(fe ->
-                                CompletableFuture.allOf(otherEvents.toArray(new CompletableFuture[0]))
-                                        .thenApply(aVoid -> fe.aggregateWith(otherEvents.stream()
-                                                .map(CompletableFuture::join)
-                                                .filter(Objects::nonNull)
-                                                .toList()
-                                        ))
-                        )
-                );
+                return Optional.of(firstEvent.aggregateWith(otherEvents));
             }
         }
 
         @Override
-        public void onMutation(final Command<?> command, final CompletionStage<PolicyActionEvent<?>> event,
-                final CompletionStage<WithDittoHeaders> response, final boolean becomeCreated,
+        public void onMutation(final Command<?> command, final PolicyActionEvent<?> event,
+                final WithDittoHeaders response, final boolean becomeCreated,
                 final boolean becomeDeleted) {
             if (firstEvent == null) {
                 firstEvent = event;
             } else {
-                otherEvents.add(event.thenApply(x -> (PolicyActionEvent) x).toCompletableFuture());
+                otherEvents.add(event);
             }
         }
 
         @Override
-        public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
+        public void onStagedMutation(final Command<?> command, final CompletionStage<PolicyActionEvent<?>> event,
+                final CompletionStage<WithDittoHeaders> response, final boolean becomeCreated,
+                final boolean becomeDeleted) {
+            if (firstEvent == null) {
+                firstEvent = event.toCompletableFuture().join();
+            } else {
+                otherEvents.add(event.thenApply(x -> (PolicyActionEvent<?>) x).toCompletableFuture().join());
+            }
+        }
+
+        @Override
+        public void onQuery(final Command<?> command, final WithDittoHeaders response) {
+            // do nothing
+        }
+
+        @Override
+        public void onStagedQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
             // do nothing
         }
 
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategyTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategyTest.java
index 3f89658b64d..38cd8480b17 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategyTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/AbstractPolicyCommandStrategyTest.java
@@ -26,7 +26,6 @@
 
 import javax.annotation.Nullable;
 
-import org.assertj.core.api.CompletableFutureAssert;
 import org.eclipse.ditto.base.model.auth.AuthorizationContext;
 import org.eclipse.ditto.base.model.auth.AuthorizationSubject;
 import org.eclipse.ditto.base.model.auth.DittoAuthorizationContextType;
@@ -108,26 +107,21 @@ void assertModificationResult(
         final CommandStrategy.Context<PolicyId> context = getDefaultContext();
         final Result<?> result = applyStrategy(underTest, context, policy, command);
 
-        final ArgumentCaptor<CompletionStage<T>> eventStage = ArgumentCaptor.forClass(CompletionStage.class);
-        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage =
-                ArgumentCaptor.forClass(CompletionStage.class);
+        final ArgumentCaptor<T> event = ArgumentCaptor.forClass(expectedEventClass);
+        final ArgumentCaptor<R> response = ArgumentCaptor.forClass(expectedResponseClass);
         final Dummy<T> mock = Dummy.mock();
         result.accept(cast(mock));
 
-        verify(mock).onMutation(any(), eventStage.capture(), responseStage.capture(),
+        verify(mock).onMutation(any(), event.capture(), response.capture(),
                 anyBoolean(), eq(false));
-        assertThat(eventStage.getValue()).isInstanceOf(CompletionStage.class);
-        CompletableFutureAssert.assertThatCompletionStage(eventStage.getValue())
-                        .isCompletedWithValueMatching(t -> expectedEventClass.isAssignableFrom(t.getClass()));
-        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
-        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
-                .isCompletedWithValueMatching(t -> expectedResponseClass.isAssignableFrom(t.getClass()));
-
-        assertThat(eventStage.getValue().toCompletableFuture().join())
+        assertThat(event.getValue()).isInstanceOf(expectedEventClass);
+        assertThat(response.getValue()).isInstanceOf(expectedResponseClass);
+
+        assertThat(event.getValue())
                 .describedAs("Event satisfactions failed for expected event of type '%s'",
                         expectedEventClass.getSimpleName())
                 .satisfies(eventSatisfactions);
-        assertThat((R) responseStage.getValue().toCompletableFuture().join())
+        assertThat((R) response.getValue())
                 .describedAs("Response predicate failed for expected responseStage of type '%s'",
                         expectedResponseClass.getSimpleName())
                 .satisfies(responseSatisfactions);
@@ -175,22 +169,15 @@ private static <T extends PolicyEvent<?>> T assertModificationResult(final Resul
             final WithDittoHeaders expectedResponse,
             final boolean becomeDeleted) {
 
-        final ArgumentCaptor<CompletionStage<T>> eventStage = ArgumentCaptor.forClass(CompletionStage.class);
-        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage =
-                ArgumentCaptor.forClass(CompletionStage.class);
+        final ArgumentCaptor<T> event = ArgumentCaptor.forClass(eventClazz);
 
         final Dummy<T> mock = Dummy.mock();
 
         result.accept(cast(mock));
 
-        verify(mock).onMutation(any(), eventStage.capture(), responseStage.capture(), anyBoolean(), eq(becomeDeleted));
-        assertThat(eventStage.getValue()).isInstanceOf(CompletionStage.class);
-        CompletableFutureAssert.assertThatCompletionStage(eventStage.getValue())
-                .isCompletedWithValueMatching(t -> eventClazz.isAssignableFrom(t.getClass()));
-        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
-        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
-                .isCompletedWithValue(expectedResponse);
-        return eventStage.getValue().toCompletableFuture().join();
+        verify(mock).onMutation(any(), event.capture(), eq(expectedResponse), anyBoolean(), eq(becomeDeleted));
+        assertThat(event.getValue()).isInstanceOf(eventClazz);
+        return event.getValue();
     }
 
     static <C extends Command<?>, E extends Event<?>> Result<E> applyStrategy(
@@ -206,7 +193,16 @@ static <E extends Event<?>> E getEvent(final Result<E> result) {
         final List<E> box = new ArrayList<>(1);
         result.accept(new ResultVisitor<>() {
             @Override
-            public void onMutation(final Command<?> command, final CompletionStage<E> event,
+            public void onMutation(final Command<?> command, final E event,
+                    final WithDittoHeaders response,
+                    final boolean becomeCreated,
+                    final boolean becomeDeleted) {
+
+                box.add(event);
+            }
+
+            @Override
+            public void onStagedMutation(final Command<?> command, final CompletionStage<E> event,
                     final CompletionStage<WithDittoHeaders> response,
                     final boolean becomeCreated,
                     final boolean becomeDeleted) {
@@ -215,7 +211,12 @@ public void onMutation(final Command<?> command, final CompletionStage<E> event,
             }
 
             @Override
-            public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
+            public void onQuery(final Command<?> command, final WithDittoHeaders response) {
+                throw new AssertionError("Expect mutation result, got query response: " + response);
+            }
+
+            @Override
+            public void onStagedQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
                 throw new AssertionError("Expect mutation result, got query response: " + response);
             }
 
diff --git a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PolicyConflictStrategyTest.java b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PolicyConflictStrategyTest.java
index f8f440e0c31..71ea8980047 100644
--- a/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PolicyConflictStrategyTest.java
+++ b/policies/service/src/test/java/org/eclipse/ditto/policies/service/persistence/actors/strategies/commands/PolicyConflictStrategyTest.java
@@ -102,14 +102,26 @@ private ExpectErrorVisitor(final Class<? extends DittoRuntimeException> clazz) {
         }
 
         @Override
-        public void onMutation(final Command<?> command, final CompletionStage<PolicyEvent<?>> event,
+        public void onMutation(final Command<?> command, final PolicyEvent<?> event,
+                final WithDittoHeaders response, final boolean becomeCreated,
+                final boolean becomeDeleted) {
+            throw new AssertionError("Expect error, got mutation: " + event);
+        }
+
+        @Override
+        public void onStagedMutation(final Command<?> command, final CompletionStage<PolicyEvent<?>> event,
                 final CompletionStage<WithDittoHeaders> response, final boolean becomeCreated,
                 final boolean becomeDeleted) {
             throw new AssertionError("Expect error, got mutation: " + event);
         }
 
         @Override
-        public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
+        public void onQuery(final Command<?> command, final WithDittoHeaders response) {
+            throw new AssertionError("Expect error, got query: " + response);
+        }
+
+        @Override
+        public void onStagedQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
             throw new AssertionError("Expect error, got query: " + response);
         }
 
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java
index a27224e5596..41bb3dcadde 100755
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java
@@ -119,25 +119,33 @@ public static Props props(final ThingId thingId,
     }
 
     @Override
-    public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
+    public void onQuery(final Command<?> command, final WithDittoHeaders response) {
         final ActorRef sender = getSender();
-        response.thenAccept(r -> {
-            if (r.getDittoHeaders().didLiveChannelConditionMatch()) {
-                final var liveChannelTimeoutStrategy = r.getDittoHeaders()
-                        .getLiveChannelTimeoutStrategy()
-                        .orElse(LiveChannelTimeoutStrategy.FAIL);
-                if (liveChannelTimeoutStrategy != LiveChannelTimeoutStrategy.USE_TWIN &&
-                        r instanceof ThingQueryCommandResponse<?> queryResponse &&
-                        command.getDittoHeaders().isResponseRequired()) {
-                    notifySender(sender, queryResponse.setEntity(JsonFactory.nullLiteral()));
-                    return;
-                }
-            }
+        doOnQuery(command, response, sender);
+    }
 
-            if (command.getDittoHeaders().isResponseRequired()) {
-                notifySender(sender, r);
+    @Override
+    public void onStagedQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
+        final ActorRef sender = getSender();
+        response.thenAccept(r -> doOnQuery(command, r, sender));
+    }
+
+    private void doOnQuery(final Command<?> command, final WithDittoHeaders response, final ActorRef sender) {
+        if (response.getDittoHeaders().didLiveChannelConditionMatch()) {
+            final var liveChannelTimeoutStrategy = response.getDittoHeaders()
+                    .getLiveChannelTimeoutStrategy()
+                    .orElse(LiveChannelTimeoutStrategy.FAIL);
+            if (liveChannelTimeoutStrategy != LiveChannelTimeoutStrategy.USE_TWIN &&
+                    response instanceof ThingQueryCommandResponse<?> queryResponse &&
+                    command.getDittoHeaders().isResponseRequired()) {
+                notifySender(sender, queryResponse.setEntity(JsonFactory.nullLiteral()));
+                return;
             }
-        });
+        }
+
+        if (command.getDittoHeaders().isResponseRequired()) {
+            notifySender(sender, response);
+        }
     }
 
     @Override
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/AbstractCommandStrategyTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/AbstractCommandStrategyTest.java
index ca612d293cb..17fd6848ea5 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/AbstractCommandStrategyTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/AbstractCommandStrategyTest.java
@@ -99,6 +99,20 @@ protected static <C extends Command<?>, T extends ThingModifiedEvent<?>> T asser
         return assertModificationResult(result, expectedEventClass, expectedCommandResponse, becomeDeleted);
     }
 
+    protected static <C extends Command<?>, T extends ThingModifiedEvent<?>> T assertStagedModificationResult(
+            final CommandStrategy<C, Thing, ThingId, ThingEvent<?>> underTest,
+            @Nullable final Thing thing,
+            final C command,
+            final Class<T> expectedEventClass,
+            final CommandResponse<?> expectedCommandResponse,
+            final boolean becomeDeleted) {
+
+        final CommandStrategy.Context<ThingId> context = getDefaultContext();
+        final Result<ThingEvent<?>> result = applyStrategy(underTest, context, thing, command);
+
+        return assertStagedModificationResult(result, expectedEventClass, expectedCommandResponse, becomeDeleted);
+    }
+
     protected static <C extends Command<?>> void assertErrorResult(
             final CommandStrategy<C, Thing, ThingId, ThingEvent<?>> underTest,
             @Nullable final Thing thing,
@@ -128,20 +142,9 @@ protected static <C extends Command<?>> void assertQueryResult(
         final Result<ThingEvent<?>> thingEventResult = applyStrategy(underTest, getDefaultContext(), thing, command);
         final ResultVisitor<ThingEvent<?>> mock = mock(Dummy.class);
         thingEventResult.accept(mock);
-        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage =
-                ArgumentCaptor.forClass(CompletionStage.class);
-        verify(mock).onQuery(any(), responseStage.capture());
-
-        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
-        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
-                .isCompletedWithValueMatching(p -> {
-                    try {
-                        commandResponseAssertions.accept((CommandResponse<?>) p);
-                        return true;
-                    } catch (final AssertionError ae) {
-                        return false;
-                    }
-                });
+        final ArgumentCaptor<CommandResponse<?>> captor = ArgumentCaptor.forClass(CommandResponse.class);
+        verify(mock).onQuery(any(), captor.capture());
+        commandResponseAssertions.accept(captor.getValue());
     }
 
 
@@ -161,6 +164,22 @@ private static <T extends ThingModifiedEvent<?>> T assertModificationResult(fina
             final WithDittoHeaders expectedResponse,
             final boolean becomeDeleted) {
 
+        final ArgumentCaptor<T> event = ArgumentCaptor.forClass(eventClazz);
+
+        final ResultVisitor<ThingEvent<?>> mock = mock(Dummy.class);
+
+        result.accept(mock);
+
+        verify(mock).onMutation(any(), event.capture(), eq(expectedResponse), anyBoolean(), eq(becomeDeleted));
+        assertThat(event.getValue()).isInstanceOf(eventClazz);
+        return event.getValue();
+    }
+
+    private static <T extends ThingModifiedEvent<?>> T assertStagedModificationResult(final Result<ThingEvent<?>> result,
+            final Class<T> eventClazz,
+            final WithDittoHeaders expectedResponse,
+            final boolean becomeDeleted) {
+
         final ArgumentCaptor<CompletionStage<ThingEvent<?>>> eventStage = ArgumentCaptor.forClass(CompletionStage.class);
         final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage = ArgumentCaptor.forClass(CompletionStage.class);
 
@@ -168,7 +187,7 @@ private static <T extends ThingModifiedEvent<?>> T assertModificationResult(fina
 
         result.accept(mock);
 
-        verify(mock).onMutation(any(), eventStage.capture(), responseStage.capture(), anyBoolean(), eq(becomeDeleted));
+        verify(mock).onStagedMutation(any(), eventStage.capture(), responseStage.capture(), anyBoolean(), eq(becomeDeleted));
         assertThat(eventStage.getValue()).isInstanceOf(CompletionStage.class);
         CompletableFutureAssert.assertThatCompletionStage(eventStage.getValue())
                 .isCompletedWithValueMatching(t -> eventClazz.isAssignableFrom(t.getClass()));
@@ -181,14 +200,7 @@ private static <T extends ThingModifiedEvent<?>> T assertModificationResult(fina
     private static void assertInfoResult(final Result<ThingEvent<?>> result, final WithDittoHeaders infoResponse) {
         final ResultVisitor<ThingEvent<?>> mock = mock(Dummy.class);
         result.accept(mock);
-        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage =
-                ArgumentCaptor.forClass(CompletionStage.class);
-
-        verify(mock).onQuery(any(), responseStage.capture());
-
-        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
-        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
-                .isCompletedWithValue(infoResponse);
+        verify(mock).onQuery(any(), eq(infoResponse));
     }
 
     private static <C extends Command<?>> Result<ThingEvent<?>> applyStrategy(
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeatureStrategyTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeatureStrategyTest.java
index e3bc75a6bae..a549d9b8d2c 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeatureStrategyTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeatureStrategyTest.java
@@ -66,9 +66,9 @@ public void modifyFeatureOnThingWithoutFeatures() {
         final CommandStrategy.Context<ThingId> context = getDefaultContext();
         final ModifyFeature command = ModifyFeature.of(context.getState(), modifiedFeature, DittoHeaders.empty());
 
-        assertModificationResult(underTest, THING_V2.removeFeatures(), command,
+        assertStagedModificationResult(underTest, THING_V2.removeFeatures(), command,
                 FeatureCreated.class,
-                ETagTestUtils.modifyFeatureResponse(context.getState(), command.getFeature(), command.getDittoHeaders(), true));
+                ETagTestUtils.modifyFeatureResponse(context.getState(), command.getFeature(), command.getDittoHeaders(), true), false);
     }
 
     @Test
@@ -76,9 +76,9 @@ public void modifyFeatureOnThingWithoutThatFeature() {
         final CommandStrategy.Context<ThingId> context = getDefaultContext();
         final ModifyFeature command = ModifyFeature.of(context.getState(), modifiedFeature, DittoHeaders.empty());
 
-        assertModificationResult(underTest, THING_V2.removeFeature(modifiedFeature.getId()), command,
+        assertStagedModificationResult(underTest, THING_V2.removeFeature(modifiedFeature.getId()), command,
                 FeatureCreated.class,
-                ETagTestUtils.modifyFeatureResponse(context.getState(), command.getFeature(), command.getDittoHeaders(), true));
+                ETagTestUtils.modifyFeatureResponse(context.getState(), command.getFeature(), command.getDittoHeaders(), true), false);
     }
 
     @Test
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeaturesStrategyTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeaturesStrategyTest.java
index fe536d219e4..282b981dfa5 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeaturesStrategyTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ModifyFeaturesStrategyTest.java
@@ -77,9 +77,9 @@ public void modifyFeaturesOfThingWithoutFeatures() {
         final CommandStrategy.Context<ThingId> context = getDefaultContext();
         final ModifyFeatures command = ModifyFeatures.of(context.getState(), modifiedFeatures, DittoHeaders.empty());
 
-        assertModificationResult(underTest, THING_V2.removeFeatures(), command,
+        assertStagedModificationResult(underTest, THING_V2.removeFeatures(), command,
                 FeaturesCreated.class,
-                ETagTestUtils.modifyFeaturesResponse(context.getState(), modifiedFeatures, command.getDittoHeaders(), true));
+                ETagTestUtils.modifyFeaturesResponse(context.getState(), modifiedFeatures, command.getDittoHeaders(), true), false);
     }
 
     @Test
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ResultFactoryTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ResultFactoryTest.java
index 785930ac397..2d7a6e36645 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ResultFactoryTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ResultFactoryTest.java
@@ -13,18 +13,13 @@
 
 package org.eclipse.ditto.things.service.persistence.actors.strategies.commands;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
-import java.util.concurrent.CompletionStage;
-
-import org.assertj.core.api.CompletableFutureAssert;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
-import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
 import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.internal.utils.persistentactors.results.Result;
 import org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory;
@@ -35,7 +30,6 @@
 import org.eclipse.ditto.things.model.signals.events.ThingEvent;
 import org.eclipse.ditto.things.model.signals.events.ThingModifiedEvent;
 import org.junit.Test;
-import org.mockito.ArgumentCaptor;
 
 /**
  * Unit tests for {@link org.eclipse.ditto.internal.utils.persistentactors.results.ResultFactory}.
@@ -58,14 +52,7 @@ public void assertImmutability() {
     public void notifyQueryResponse() {
         final Result<ThingEvent<?>> result = ResultFactory.newQueryResult(thingQueryCommand, response);
         result.accept(mock);
-        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage =
-                ArgumentCaptor.forClass(CompletionStage.class);
-
-        verify(mock).onQuery(eq(thingQueryCommand), responseStage.capture());
-
-        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
-        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
-                .isCompletedWithValue(response);
+        verify(mock).onQuery(eq(thingQueryCommand), eq(response));
     }
 
     @Test
@@ -97,20 +84,8 @@ private void assertNotifyMutationResponse(final boolean becomeCreated, final boo
                         becomeCreated,
                         becomeDeleted);
         result.accept(mock);
-
-        final ArgumentCaptor<CompletionStage<ThingEvent<?>>> eventStage = ArgumentCaptor.forClass(CompletionStage.class);
-        final ArgumentCaptor<CompletionStage<WithDittoHeaders>> responseStage = ArgumentCaptor.forClass(CompletionStage.class);
-
-        verify(mock).onMutation(eq(thingModifyCommand), eventStage.capture(),
-                responseStage.capture(), eq(becomeCreated), eq(becomeDeleted));
-
-        assertThat(eventStage.getValue()).isInstanceOf(CompletionStage.class);
-        CompletableFutureAssert.assertThatCompletionStage(eventStage.getValue())
-                .isCompletedWithValue(thingModifiedEvent);
-
-        assertThat(responseStage.getValue()).isInstanceOf(CompletionStage.class);
-        CompletableFutureAssert.assertThatCompletionStage(responseStage.getValue())
-                .isCompletedWithValue(response);
+        verify(mock).onMutation(eq(thingModifyCommand), eq(thingModifiedEvent), eq(response), eq(becomeCreated),
+                eq(becomeDeleted));
     }
 
     interface Dummy extends ResultVisitor<ThingEvent<?>> {
diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingConflictStrategyTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingConflictStrategyTest.java
index 97f0a1d17be..8f909e6a59b 100644
--- a/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingConflictStrategyTest.java
+++ b/things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/ThingConflictStrategyTest.java
@@ -97,14 +97,26 @@ private ExpectErrorVisitor(final Class<? extends DittoRuntimeException> clazz) {
         }
 
         @Override
-        public void onMutation(final Command<?> command, final CompletionStage<ThingEvent<?>> event,
+        public void onMutation(final Command<?> command, final ThingEvent<?> event,
+                final WithDittoHeaders response, final boolean becomeCreated,
+                final boolean becomeDeleted) {
+            throw new AssertionError("Expect error, got mutation: " + event);
+        }
+
+        @Override
+        public void onStagedMutation(final Command<?> command, final CompletionStage<ThingEvent<?>> event,
                 final CompletionStage<WithDittoHeaders> response, final boolean becomeCreated,
                 final boolean becomeDeleted) {
             throw new AssertionError("Expect error, got mutation: " + event);
         }
 
         @Override
-        public void onQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
+        public void onQuery(final Command<?> command, final WithDittoHeaders response) {
+            throw new AssertionError("Expect error, got query: " + response);
+        }
+
+        @Override
+        public void onStagedQuery(final Command<?> command, final CompletionStage<WithDittoHeaders> response) {
             throw new AssertionError("Expect error, got query: " + response);
         }
 

From 42a8ee385b63ce24c080584b72da914c478bc599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 28 Jun 2023 09:33:42 +0200
Subject: [PATCH 146/173] got rid of blocking the Akka dispatcher thread
 completely

---
 .../AbstractPersistenceActor.java             | 56 ++++++-------------
 1 file changed, 16 insertions(+), 40 deletions(-)

diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
index 6007026aa26..bcaae8bdeaf 100755
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
@@ -17,7 +17,6 @@
 import java.util.Optional;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -68,6 +67,7 @@
 import akka.actor.ActorRef;
 import akka.actor.Cancellable;
 import akka.japi.pf.ReceiveBuilder;
+import akka.pattern.Patterns;
 import akka.persistence.RecoveryCompleted;
 import akka.persistence.RecoveryTimedOut;
 import akka.persistence.SaveSnapshotFailure;
@@ -348,6 +348,8 @@ protected void becomeCreatedHandler() {
                         .matchEquals(Control.TAKE_SNAPSHOT, this::takeSnapshotByInterval)
                         .match(SaveSnapshotSuccess.class, this::saveSnapshotSuccess)
                         .match(SaveSnapshotFailure.class, this::saveSnapshotFailure)
+                        .match(PersistEventAsync.class, persistEventAsync ->
+                                persistAndApplyEvent((E) persistEventAsync.event, persistEventAsync.handler))
                         .build())
                 .orElse(matchAnyAfterInitialization());
 
@@ -545,6 +547,10 @@ protected void persistAndApplyEvent(final E event, final BiConsumer<E, S> handle
         }
     }
 
+    private record PersistEventAsync<
+            E extends EventsourcedEvent<? extends E>,
+            S extends Jsonifiable.WithFieldSelectorAndPredicate<JsonField>>(E event, BiConsumer<E, S> handler) {};
+
     /**
      * Persist an event, modify actor state by the event strategy, then invoke the handler.
      *
@@ -552,25 +558,8 @@ protected void persistAndApplyEvent(final E event, final BiConsumer<E, S> handle
      * @param handler what happens afterwards.
      */
     protected void persistAndApplyEventAsync(final CompletionStage<E> event, final BiConsumer<E, S> handler) {
-
-        event.thenAccept(completedEvent -> {
-            final E modifiedEvent = modifyEventBeforePersist(completedEvent);
-            if (modifiedEvent.getDittoHeaders().isDryRun()) {
-                handler.accept(modifiedEvent, entity);
-            } else {
-                persistEventAsync(modifiedEvent, persistedEvent -> {
-                    // after the event was persisted, apply the event on the current actor state
-                    applyEvent(persistedEvent);
-                    handler.accept(persistedEvent, entity);
-                });
-            }
-        }).toCompletableFuture()
-                .orTimeout(MAX_ASYNC_EVENT_PRE_PROCESSING_TIMEOUT.getSeconds(), TimeUnit.SECONDS)
-                .join(); // this blocks the Akka dispatcher thread, but is needed so that Akka persistence persist()
-                         // is invoked in the correct context
-                         // as most of the provided `CompletionStage<E> event` are already completed futures, this only
-                         // is of relevance for asynchronously preprocessed events to persist, like e.g. CreateThing
-                         // being enhanced by a WoT based Thing JSON skeleton
+        Patterns.pipe(event.thenApply(e -> new PersistEventAsync<>(e, handler)), getContext().getDispatcher())
+                .to(getSelf());
     }
 
     /**
@@ -640,6 +629,8 @@ private Receive createDeletedBehavior() {
                         .matchEquals(Control.TAKE_SNAPSHOT, this::takeSnapshotByInterval)
                         .match(SaveSnapshotSuccess.class, this::saveSnapshotSuccess)
                         .match(SaveSnapshotFailure.class, this::saveSnapshotFailure)
+                        .match(PersistEventAsync.class, persistEventAsync ->
+                                persistAndApplyEvent((E) persistEventAsync.event, persistEventAsync.handler))
                         .build())
                 .orElse(matchAnyWhenDeleted());
     }
@@ -790,16 +781,8 @@ private long getNextRevisionNumber() {
         return getRevisionNumber() + 1;
     }
 
-    private void persistEvent(final E event, final Consumer<E> handler) {
-        persistEvent(event, handler, false);
-    }
-
-    private void persistEventAsync(final E event, final Consumer<E> handler) {
-        persistEvent(event, handler, true);
-    }
-
     @SuppressWarnings("unchecked")
-    private void persistEvent(final E event, final Consumer<E> handler, final boolean async) {
+    private void persistEvent(final E event, final Consumer<E> handler) {
         final var l = log.withCorrelationId(event);
         l.debug("Persisting Event <{}>.", event.getType());
 
@@ -810,17 +793,10 @@ private void persistEvent(final E event, final Consumer<E> handler, final boolea
                 .tag(SpanTagKey.SIGNAL_TYPE.getTagForValue(event.getType()))
                 .start();
 
-        if (async) {
-            persistAsync(
-                    event.setDittoHeaders(DittoHeaders.of(persistOperationSpan.propagateContext(event.getDittoHeaders()))),
-                    persistedEvent -> handlePersistedEvent(handler, l, persistOperationSpan, persistedEvent)
-            );
-        } else {
-            persist(
-                    event.setDittoHeaders(DittoHeaders.of(persistOperationSpan.propagateContext(event.getDittoHeaders()))),
-                    persistedEvent -> handlePersistedEvent(handler, l, persistOperationSpan, persistedEvent)
-            );
-        }
+        persist(
+                event.setDittoHeaders(DittoHeaders.of(persistOperationSpan.propagateContext(event.getDittoHeaders()))),
+                persistedEvent -> handlePersistedEvent(handler, l, persistOperationSpan, persistedEvent)
+        );
     }
 
     private void handlePersistedEvent(final Consumer<E> handler, final DittoDiagnosticLoggingAdapter l,

From 7f96a643bbe0b81f3f06ab15f97d654da36c78da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 28 Jun 2023 10:14:24 +0200
Subject: [PATCH 147/173] removed no longer used constant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../utils/persistentactors/AbstractPersistenceActor.java   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
index bcaae8bdeaf..d4f5e9cd6aa 100755
--- a/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
+++ b/internal/utils/persistent-actors/src/main/java/org/eclipse/ditto/internal/utils/persistentactors/AbstractPersistenceActor.java
@@ -103,13 +103,6 @@ public abstract class AbstractPersistenceActor<
      */
     public static final String JOURNAL_TAG_ALWAYS_ALIVE = "always-alive";
 
-    /**
-     * The max timeout to wait for asynchronous performed "pre persist()" event processing (e.g. in order to enhance a
-     * {@code CreateThing} command with a WoT JSON skeleton).
-     * One Akka dispatcher thread is blocked for this amount of time, so this should be minimized.
-     */
-    private static final Duration MAX_ASYNC_EVENT_PRE_PROCESSING_TIMEOUT = Duration.ofSeconds(5);
-
     private final SnapshotAdapter<S> snapshotAdapter;
     private final Receive handleEvents;
     private final Receive handleCleanups;

From bc8e6a20cd75a761ed6270cfc952ce072064ec9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 28 Jun 2023 20:05:47 +0200
Subject: [PATCH 148/173] fix handling weak ack for built-in ack labels in
 StreamingSessionActor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* before an error to the WS session was sent declaring that ack-label 'live-response' was not declared if a WS subscribed for live messages, but filtered them out based on an RQL filter
* now this situation is handled correctly by dropping the weak ack

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../streaming/actors/StreamingSessionActor.java      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActor.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActor.java
index cd5597f415b..d847fe6c9ce 100755
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActor.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/streaming/actors/StreamingSessionActor.java
@@ -27,6 +27,7 @@
 import org.eclipse.ditto.base.model.acks.AcknowledgementLabel;
 import org.eclipse.ditto.base.model.acks.AcknowledgementLabelNotDeclaredException;
 import org.eclipse.ditto.base.model.acks.AcknowledgementLabelNotUniqueException;
+import org.eclipse.ditto.base.model.acks.DittoAcknowledgementLabel;
 import org.eclipse.ditto.base.model.acks.FatalPubSubException;
 import org.eclipse.ditto.base.model.auth.AuthorizationContext;
 import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
@@ -268,6 +269,7 @@ private Receive createIncomingSignalBehavior() {
                 .build();
 
         final Receive signalBehavior = ReceiveBuilder.create()
+                .match(Acknowledgement.class, this::isWeakAckForBuiltInAckLabel, this::dropWeakAckForBuiltInAckLabelAcknowledgement)
                 .match(Acknowledgement.class, this::hasUndeclaredAckLabel, this::ackLabelNotDeclared)
                 .match(Acknowledgement.class, this::forwardAcknowledgementOrLiveCommandResponse)
                 .match(CommandResponse.class, CommandResponse::isLiveCommandResponse, liveCommandResponse ->
@@ -493,6 +495,16 @@ private static Receive addPreprocessors(final List<PartialFunction<Object, Objec
                 .orElse(receive);
     }
 
+    private boolean isWeakAckForBuiltInAckLabel(final Acknowledgement acknowledgement) {
+        return acknowledgement.isWeak() &&
+                List.of(DittoAcknowledgementLabel.values()).contains(acknowledgement.getLabel());
+    }
+
+    private void dropWeakAckForBuiltInAckLabelAcknowledgement(final Acknowledgement ack) {
+        logger.withCorrelationId(ack)
+                .info("Dropping weak ack for built-in ack label <{}>", ack.getLabel());
+    }
+
     private boolean hasUndeclaredAckLabel(final Acknowledgement acknowledgement) {
         return !declaredAcks.contains(acknowledgement.getLabel());
     }

From e3015a0867eb329f89cda66a73728119246d8627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 29 Jun 2023 10:19:13 +0200
Subject: [PATCH 149/173] fix "policies.imports-limit" configuration which had
 wrong config key in code and was not applied
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* remove obsolete (no longer used) config keys as well

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../service/config/limits/DefaultLimitsConfig.java   | 10 +++++-----
 .../base/service/config/limits/LimitsConfig.java     | 12 ++++++------
 .../config/src/main/resources/ditto-limits.conf      |  6 ------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/base/service/src/main/java/org/eclipse/ditto/base/service/config/limits/DefaultLimitsConfig.java b/base/service/src/main/java/org/eclipse/ditto/base/service/config/limits/DefaultLimitsConfig.java
index ff45d6567ad..567320531fe 100644
--- a/base/service/src/main/java/org/eclipse/ditto/base/service/config/limits/DefaultLimitsConfig.java
+++ b/base/service/src/main/java/org/eclipse/ditto/base/service/config/limits/DefaultLimitsConfig.java
@@ -69,6 +69,11 @@ public long getPoliciesMaxSize() {
         return policiesMaxSize;
     }
 
+    @Override
+    public int getPolicyImportsLimit() {
+        return policyImportsLimit;
+    }
+
     @Override
     public long getMessagesMaxSize() {
         return messagesMaxSize;
@@ -92,11 +97,6 @@ public String getConfigPath() {
         return CONFIG_PATH;
     }
 
-    @Override
-    public int getPolicyImportsLimit() {
-        return policyImportsLimit;
-    }
-
     @Override
     public boolean equals(@Nullable final Object o) {
         if (this == o) {
diff --git a/base/service/src/main/java/org/eclipse/ditto/base/service/config/limits/LimitsConfig.java b/base/service/src/main/java/org/eclipse/ditto/base/service/config/limits/LimitsConfig.java
index 0978ebecb09..94343f286c8 100644
--- a/base/service/src/main/java/org/eclipse/ditto/base/service/config/limits/LimitsConfig.java
+++ b/base/service/src/main/java/org/eclipse/ditto/base/service/config/limits/LimitsConfig.java
@@ -80,6 +80,11 @@ enum LimitsConfigValue implements KnownConfigValue {
          */
         POLICIES_MAX_SIZE("policies.max-size", Constants.DEFAULT_ENTITY_MAX_SIZE),
 
+        /**
+         * The number of imports that a policy may contain.
+         */
+        POLICY_IMPORTS_LIMIT("policies.imports-limit", 10),
+
         /**
          * The maximum possible size of "Messages" entities in bytes.
          */
@@ -93,12 +98,7 @@ enum LimitsConfigValue implements KnownConfigValue {
         /**
          * The maximum pagination size to apply when searching for "Things" via "things-search".
          */
-        THINGS_SEARCH_MAX_PAGE_SIZE(Constants.THINGS_SEARCH_PATH + "." + "max-page-size", 200),
-
-        /**
-         * The number of imports that a policy may contain.
-         */
-        POLICY_IMPORTS_LIMIT("imports-limit", 10);
+        THINGS_SEARCH_MAX_PAGE_SIZE(Constants.THINGS_SEARCH_PATH + "." + "max-page-size", 200);
 
         private final String path;
         private final Object defaultValue;
diff --git a/internal/utils/config/src/main/resources/ditto-limits.conf b/internal/utils/config/src/main/resources/ditto-limits.conf
index 1e8f1b20266..45a26d0f541 100644
--- a/internal/utils/config/src/main/resources/ditto-limits.conf
+++ b/internal/utils/config/src/main/resources/ditto-limits.conf
@@ -19,12 +19,6 @@ ditto.limits {
   messages {
     max-size = 250k
     max-size = ${?LIMITS_MESSAGES_MAX_SIZE}
-
-    headers-size = 5k
-    headers-size = ${?LIMITS_MESSAGES_HEADERS_SIZE}
-
-    auth-subjects-count = 100
-    auth-subjects-count = ${?LIMITS_MESSAGES_AUTH_SUBJECTS_COUNT}
   }
 
   # limiations for the "things-search" service

From 313ae133ba53340fe2bd55842382c337aded73b8 Mon Sep 17 00:00:00 2001
From: Vladimir Brkic <brv1sf@bosch.com>
Date: Thu, 22 Jun 2023 19:17:23 +0200
Subject: [PATCH 150/173] Support for ingress controller

Signed-off-by: Vladimir Brkic <brv1sf@bosch.com>
---
 .../helm/ditto/templates/nginx-ingress.yaml   | 836 ++++++++++++++++++
 deployment/helm/ditto/values.yaml             |   9 +-
 2 files changed, 844 insertions(+), 1 deletion(-)
 create mode 100644 deployment/helm/ditto/templates/nginx-ingress.yaml

diff --git a/deployment/helm/ditto/templates/nginx-ingress.yaml b/deployment/helm/ditto/templates/nginx-ingress.yaml
new file mode 100644
index 00000000000..ef1e2d9af47
--- /dev/null
+++ b/deployment/helm/ditto/templates/nginx-ingress.yaml
@@ -0,0 +1,836 @@
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+{{- if .Values.ingress.enabled -}}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nginx-node-health-check-conf
+  namespace: "{{ .Values.ingress.namespace }}"
+data:
+  nginx-node-health-check.conf: |
+    # config for health check container running together with the ingress controller
+    worker_processes auto; #auto-detect number of logical CPU cores
+
+    events {
+      worker_connections 1024;
+    }
+
+    http {
+      charset utf-8;
+
+      server {
+        listen 8080;
+        server_name localhost;
+
+        location /healthz {
+          add_header Content-Type text-plain;
+          return 200 'ok';
+        }
+
+      }
+    }
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.namespace }}"
+  name: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.namespace }}"
+spec:
+  selector:
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+  ports:
+    - name: tcp
+      port: 80
+      protocol: TCP
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxIngressVersion }}"
+  name: nginx-ingress-controller-admission
+  namespace: "{{ .Values.ingress.namespace }}"
+spec:
+  ports:
+    - appProtocol: https
+      name: https-webhook
+      port: 443
+      targetPort: webhook
+  selector:
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+  type: ClusterIP
+  
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-configuration
+  namespace: "{{ .Values.ingress.namespace }}"
+data:
+  worker-processes: "auto"
+  max-worker-connections: "0" # 0 will use the value of max-worker-open-files
+  max-worker-open-files: "0" # the default of 0 means "max open files (system's limit) / worker-processes - 1024"
+  server-tokens: "False"
+  use-gzip: "True"
+  gzip-level: "6"
+  gzip-types: "text/plain text/css text/js text/xml text/javascript application/javascript application/x-javascript application/json application/xml application/xml+rss"
+  location-snippet: |
+    more_set_headers "Strict-Transport-Security: max-age=31536000; includeSubDomains";
+    more_set_headers 'X-Content-Type-Options: "nosniff"';
+    more_set_headers 'X-Frame-Options: "SAMEORIGIN"';
+    more_set_headers 'X-XSS-Protection: "1; mode=block"';
+    default_type application/octet-stream;
+    gzip_disable "msie6";
+    gzip_min_length 1100;
+    gzip_buffers 16 8k;
+    gzip_proxied any;
+    gunzip on;
+    gzip_static always;
+    gzip_vary on;
+
+    tcp_nopush on;
+
+    # timeouts are configured slightly higher than gateway read-timeout of 60 seconds
+    send_timeout 70; # seconds, default: 60
+
+    # ignore X-Original-URI in the request
+    proxy_hide_header X-Original-URI;
+    proxy_set_header X-Original-URI $request_uri;
+
+    # set ditto-specific forwarded headers
+
+  proxy-connect-timeout: "10" # seconds, default: 60
+  # timeouts are configured slightly higher than gateway read-timeout of 60 seconds
+  proxy-send-timeout: "70" # seconds, default: 60
+  proxy-read-timeout: "70" # seconds, default: 60
+  # will try another upstream if an error or timeout occurred during the connection
+  # or if the upstream returns 502 response
+  proxy-next-upstream: "error timeout http_502"
+  # will retry up to 4 times to find another upstream to connect to
+  proxy-next-upstream-tries: "4"
+  # will try for max. 50s to find another upstream to connect to
+  proxy-next-upstream-timeout: "50"
+  client-header-buffer-size: "8k" # allow longer URIs + headers (default: 1k)
+  large-client-header-buffers: "4 16k"
+  keep-alive: "75" #seconds, default: 75
+  log-format-upstream: '$remote_addr - "$remote_user" [$time_local] "$host" "$request" $status $bytes_sent "$upstream_addr" "$http_referer" "$http_user_agent" "$http_origin" "$http_content_type"'
+  use-forwarded-headers: "True"
+  http-snippet: |
+    charset utf-8;
+    sendfile on;
+
+    # timeouts are configured slightly higher than gateway read-timeout of 60 seconds
+    send_timeout 70; # seconds, default: 60
+
+    merge_slashes off; # allow multiple slashes for CRS Authentication
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: tcp-services
+  namespace: "{{ .Values.ingress.namespace }}"
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: udp-services
+  namespace: "{{ .Values.ingress.namespace }}"
+
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-ingress-serviceaccount
+  namespace: "{{ .Values.ingress.namespace }}"
+
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-ingress-admission
+  namespace: "{{ .Values.ingress.namespace }}"
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-ingress-role
+  namespace: "{{ .Values.ingress.namespace }}"
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - namespaces
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+      - pods
+      - secrets
+      - endpoints
+      - services
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - networking.k8s.io
+    resources:
+      - ingresses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - networking.k8s.io
+    resources:
+      - ingresses/status
+    verbs:
+      - update
+  - apiGroups:
+      - networking.k8s.io
+    resources:
+      - ingressclasses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resourceNames:
+      - ingress-controller-leader
+    resources:
+      - configmaps
+    verbs:
+      - get
+      - update
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - create
+  - apiGroups:
+      - coordination.k8s.io
+    resourceNames:
+      - ingress-controller-leader
+    resources:
+      - leases
+    verbs:
+      - get
+      - update
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - create
+  - apiGroups:
+      - ""
+    resources:
+      - events
+    verbs:
+      - create
+      - patch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - list
+      - watch
+      - get
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-ingress-admission
+  namespace: "{{ .Values.ingress.namespace }}"
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+    verbs:
+      - get
+      - create
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: "{{ .Values.ingress.namespace }}-clusterrole"
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+      - endpoints
+      - nodes
+      - pods
+      - secrets
+      - namespaces
+    verbs:
+      - list
+      - watch
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - services
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - networking.k8s.io
+    resources:
+      - ingresses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - events
+    verbs:
+      - create
+      - patch
+  - apiGroups:
+    - networking.k8s.io
+    resources:
+      - ingresses/status
+    verbs:
+      - update
+  - apiGroups:
+      - networking.k8s.io
+    resources:
+      - ingressclasses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - list
+      - watch
+      - get
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-ingress-admission
+rules:
+  - apiGroups:
+      - admissionregistration.k8s.io
+    resources:
+      - validatingwebhookconfigurations
+    verbs:
+      - get
+      - update
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-ingress-role-binding
+  namespace: "{{ .Values.ingress.namespace }}"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: nginx-ingress-role
+subjects:
+- kind: ServiceAccount
+  name: nginx-ingress-serviceaccount
+  namespace: "{{ .Values.ingress.namespace }}"
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-ingress-admission
+  namespace: "{{ .Values.ingress.namespace }}"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: nginx-ingress-admission
+subjects:
+  - kind: ServiceAccount
+    name: nginx-ingress-admission
+    namespace: "{{ .Values.ingress.namespace }}"
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: "{{ .Values.ingress.namespace }}-clusterrole-binding"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: "{{ .Values.ingress.namespace }}-clusterrole"
+subjects:
+- kind: ServiceAccount
+  name: nginx-ingress-serviceaccount
+  namespace: "{{ .Values.ingress.namespace }}"
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-ingress-admission
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: nginx-ingress-admission
+subjects:
+  - kind: ServiceAccount
+    name: nginx-ingress-admission
+    namespace: "{{ .Values.ingress.namespace }}"
+
+---
+apiVersion: scheduling.k8s.io/v1
+kind: PriorityClass
+metadata:
+  name: high-priority
+value: 1000000
+globalDefault: false
+description: "This priority class is used for the things and gateway service pods only."
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-ingress-controller
+  namespace: "{{ .Values.ingress.namespace }}"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+      app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+  minReadySeconds: 10
+  revisionHistoryLimit: 5
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: controller
+        app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+        app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+      annotations:
+        prometheus.io/port: "10254"
+        prometheus.io/scrape: "true"
+    spec:
+      priorityClassName: high-priority
+      serviceAccountName: nginx-ingress-serviceaccount
+      dnsPolicy: ClusterFirst
+      nodeSelector:
+        ingress.node: "master"
+      terminationGracePeriodSeconds: 100
+      imagePullSecrets:
+        - name: acr-secret
+      securityContext:
+        fsGroup: 101
+        supplementalGroups: [101]
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+      - name: nginx-node-health-check
+        image: docker.io/library/nginx:{{ .Values.ingress.nginxVersion }}
+        imagePullPolicy: Always
+        ports:
+        - name: healthz-port
+          containerPort: 8080
+          hostPort: 31005
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 15
+          timeoutSeconds: 6
+          successThreshold: 1
+          failureThreshold: 4
+        readinessProbe:
+          httpGet:
+            path: /healthz
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          timeoutSeconds: 2
+          failureThreshold: 3
+          successThreshold: 1
+        volumeMounts:
+          - name: nginx-node-health-check-conf
+            mountPath: /etc/nginx/nginx.conf
+            subPath: nginx-node-health-check.conf
+      - name: nginx-ingress-controller
+        image: registry.k8s.io/ingress-nginx/controller:{{ .Values.ingress.nginxIngressVersion }}
+        imagePullPolicy: IfNotPresent
+        args:
+        - /nginx-ingress-controller
+        - --publish-service=$(POD_NAMESPACE)/{{ .Values.ingress.namespace }}
+        - --election-id=ingress-controller-leader
+        - --controller-class=k8s.io/{{ .Values.ingress.namespace }}
+        - --ingress-class={{ .Values.ingress.namespace }}
+        - --configmap=$(POD_NAMESPACE)/nginx-configuration
+        - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
+        - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
+        - --shutdown-grace-period=65
+        - --validating-webhook=:8443
+        - --validating-webhook-certificate=/usr/local/certificates/cert
+        - --validating-webhook-key=/usr/local/certificates/key
+        securityContext:
+          capabilities:
+            drop:
+            - ALL
+            add:
+            - NET_BIND_SERVICE
+          # www-data -> 101
+          runAsUser: 101
+          runAsGroup: 101
+          runAsNonRoot: true
+          allowPrivilegeEscalation: true
+          seccompProfile:
+            type: RuntimeDefault
+        lifecycle:
+          preStop:
+            exec:
+              command: ["sleep", "95"]
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: LD_PRELOAD
+          value: /usr/local/lib/libmimalloc.so
+        ports:
+        - name: http
+          containerPort: 80
+          hostPort: 30005
+        - name: https
+          containerPort: 443
+          protocol: TCP
+        - name: health
+          containerPort: 10254
+        - name: webhook
+          containerPort: 8443
+          protocol: TCP
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 10254
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 15
+          timeoutSeconds: 6
+          successThreshold: 1
+          failureThreshold: 4
+        readinessProbe:
+          httpGet:
+            path: /healthz
+            port: 10254
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          timeoutSeconds: 2
+          failureThreshold: 3
+          successThreshold: 1
+        resources:
+          requests:
+            cpu: "0.75"
+            memory: "1024Mi"
+        volumeMounts:
+          - mountPath: /usr/local/certificates/
+            name: webhook-cert
+            readOnly: true
+      volumes:
+        - name: nginx-node-health-check-conf
+          configMap:
+            name: nginx-node-health-check-conf
+        - name: webhook-cert
+          secret:
+            secretName: nginx-ingress-admission
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-ingress-admission-create
+  namespace: "{{ .Values.ingress.namespace }}"
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: admission-webhook
+        app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+        app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+        app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+        app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+      name: nginx-ingress-admission-create
+    spec:
+      containers:
+        - args:
+            - create
+            - --host=nginx-ingress-controller-admission.$(POD_NAMESPACE).svc
+            - --namespace=$(POD_NAMESPACE)
+            - --secret-name=nginx-ingress-admission
+          env:
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20220916-gd32f8c343@sha256:39c5b2e3310dc4264d638ad28d9d1d96c4cbb2b2dcfb52368fe4e3c63f61e10f
+          imagePullPolicy: IfNotPresent
+          name: create
+          securityContext:
+            allowPrivilegeEscalation: false
+      nodeSelector:
+        kubernetes.io/os: linux
+      restartPolicy: OnFailure
+      securityContext:
+        fsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+      serviceAccountName: nginx-ingress-admission
+
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-ingress-admission-patch
+  namespace: "{{ .Values.ingress.namespace }}"
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: admission-webhook
+        app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+        app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+        app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+        app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+      name: nginx-ingress-admission-patch
+    spec:
+      containers:
+        - args:
+            - patch
+            - --webhook-name=nginx-ingress-admission-{{ .Values.ingress.namespace }}
+            - --namespace=$(POD_NAMESPACE)
+            - --patch-mutating=false
+            - --secret-name=nginx-ingress-admission
+            - --patch-failure-policy=Fail
+          env:
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20220916-gd32f8c343@sha256:39c5b2e3310dc4264d638ad28d9d1d96c4cbb2b2dcfb52368fe4e3c63f61e10f
+          imagePullPolicy: IfNotPresent
+          name: patch
+          securityContext:
+            allowPrivilegeEscalation: false
+      nodeSelector:
+        kubernetes.io/os: linux
+      restartPolicy: OnFailure
+      securityContext:
+        fsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 2000
+      serviceAccountName: nginx-ingress-admission
+
+---
+apiVersion: networking.k8s.io/v1
+kind: IngressClass
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: "{{ .Values.ingress.namespace }}"
+spec:
+  controller: k8s.io/{{ .Values.ingress.namespace }}
+
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  labels:
+    app.kubernetes.io/component: admission-webhook
+    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+  name: nginx-ingress-admission-{{ .Values.ingress.namespace }}
+webhooks:
+  - admissionReviewVersions:
+      - v1
+    clientConfig:
+      service:
+        name: nginx-ingress-controller-admission
+        namespace: "{{ .Values.ingress.namespace }}"
+        path: /networking/v1/ingresses
+    failurePolicy: Fail
+    matchPolicy: Equivalent
+    name: validate.nginx.ingress.kubernetes.io
+    rules:
+      - apiGroups:
+          - networking.k8s.io
+        apiVersions:
+          - v1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - ingresses
+    sideEffects: None
+{{- end }}
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index 6cf5efa3ce0..6336957f5ac 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -169,8 +169,15 @@ dbconfig:
 ingress:
   # enabled whether Ingress should be enabled as alternative to the contained nginx
   enabled: false
+  # namespace for ingress controller, must exist
+  namespace: ingress-nginx
+  # Ingress-NGINX version
+  nginxIngressVersion: v1.8.0
+  # Nginx Version
+  nginxVersion: "1.21.6"
+
   # className is the 'ingressClassName' to configure in the Ingress spec
-  className: nginx
+  className: ingress-nginx
   # host the hostname of the Ingress shared for all: api, ws and ui
   host: localhost
   # defaultBackendSuffix the suffix to add to the internal fullname to use as Ingress "defaultBackend"

From 916c84b5efb2fbdc4a3b0eaccca2a55f455f0dec Mon Sep 17 00:00:00 2001
From: Vladimir Brkic <brv1sf@bosch.com>
Date: Tue, 27 Jun 2023 09:15:57 +0200
Subject: [PATCH 151/173] Creation of ingress-nginx namespace

Signed-off-by: Vladimir Brkic <brv1sf@bosch.com>
---
 deployment/helm/ditto/templates/nginx-ingress.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/deployment/helm/ditto/templates/nginx-ingress.yaml b/deployment/helm/ditto/templates/nginx-ingress.yaml
index ef1e2d9af47..2948999b560 100644
--- a/deployment/helm/ditto/templates/nginx-ingress.yaml
+++ b/deployment/helm/ditto/templates/nginx-ingress.yaml
@@ -11,6 +11,13 @@
 {{- if .Values.ingress.enabled -}}
 ---
 apiVersion: v1
+kind: Namespace
+metadata:
+  name: "{{ .Values.ingress.namespace }}"
+  labels:
+    name: "{{ .Values.ingress.namespace }}"
+---
+apiVersion: v1
 kind: ConfigMap
 metadata:
   name: nginx-node-health-check-conf

From c9aeec005522543929d4668d4effdb60836eb26f Mon Sep 17 00:00:00 2001
From: Vladimir Brkic <brv1sf@bosch.com>
Date: Tue, 27 Jun 2023 12:14:57 +0200
Subject: [PATCH 152/173] Bump Chart version

Signed-off-by: Vladimir Brkic <brv1sf@bosch.com>
---
 deployment/helm/ditto/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index ca2750966a9..8e0d0293d70 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.3.2  # chart version is effectively set by release-job
+version: 3.3.3  # chart version is effectively set by release-job
 appVersion: 3.3.0
 keywords:
   - iot-chart

From bb42206fefc3a7b08927863b9829dbd770e9774c Mon Sep 17 00:00:00 2001
From: Vladimir Brkic <brv1sf@bosch.com>
Date: Thu, 29 Jun 2023 13:11:47 +0200
Subject: [PATCH 153/173] controller section under ingress

---
 .../helm/ditto/templates/nginx-ingress.yaml   | 264 +++++++++---------
 deployment/helm/ditto/values.yaml             |  15 +-
 2 files changed, 141 insertions(+), 138 deletions(-)

diff --git a/deployment/helm/ditto/templates/nginx-ingress.yaml b/deployment/helm/ditto/templates/nginx-ingress.yaml
index 2948999b560..c1573b5934a 100644
--- a/deployment/helm/ditto/templates/nginx-ingress.yaml
+++ b/deployment/helm/ditto/templates/nginx-ingress.yaml
@@ -8,20 +8,20 @@
 # http://www.eclipse.org/legal/epl-2.0
 #
 # SPDX-License-Identifier: EPL-2.0
-{{- if .Values.ingress.enabled -}}
+{{- if .Values.ingress.controller.enabled -}}
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: "{{ .Values.ingress.namespace }}"
+  name: "{{ .Values.ingress.controller.namespace }}"
   labels:
-    name: "{{ .Values.ingress.namespace }}"
+    name: "{{ .Values.ingress.controller.namespace }}"
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: nginx-node-health-check-conf
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 data:
   nginx-node-health-check.conf: |
     # config for health check container running together with the ingress controller
@@ -52,16 +52,16 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.namespace }}"
-  name: "{{ .Values.ingress.namespace }}"
-  namespace: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.namespace }}"
+  name: "{{ .Values.ingress.controller.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 spec:
   selector:
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
   ports:
     - name: tcp
       port: 80
@@ -73,12 +73,12 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxIngressVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxIngressVersion }}"
   name: nginx-ingress-controller-admission
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 spec:
   ports:
     - appProtocol: https
@@ -86,8 +86,8 @@ spec:
       port: 443
       targetPort: webhook
   selector:
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
   type: ClusterIP
   
 ---
@@ -96,12 +96,12 @@ kind: ConfigMap
 metadata:
   labels:
     app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: nginx-configuration
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 data:
   worker-processes: "auto"
   max-worker-connections: "0" # 0 will use the value of max-worker-open-files
@@ -166,12 +166,12 @@ kind: ConfigMap
 metadata:
   labels:
     app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: tcp-services
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 
 ---
 apiVersion: v1
@@ -179,12 +179,12 @@ kind: ConfigMap
 metadata:
   labels:
     app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: udp-services
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 
 ---
 apiVersion: v1
@@ -192,12 +192,12 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: nginx-ingress-serviceaccount
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 
 ---
 apiVersion: v1
@@ -205,12 +205,12 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: nginx-ingress-admission
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -218,12 +218,12 @@ kind: Role
 metadata:
   labels:
     app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: nginx-ingress-role
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 rules:
   - apiGroups:
       - ""
@@ -317,12 +317,12 @@ kind: Role
 metadata:
   labels:
     app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: nginx-ingress-admission
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 rules:
   - apiGroups:
       - ""
@@ -337,11 +337,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
-  name: "{{ .Values.ingress.namespace }}-clusterrole"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
+  name: "{{ .Values.ingress.controller.namespace }}-clusterrole"
 rules:
   - apiGroups:
       - ""
@@ -420,10 +420,10 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: nginx-ingress-admission
 rules:
   - apiGroups:
@@ -440,12 +440,12 @@ kind: RoleBinding
 metadata:
   labels:
     app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: nginx-ingress-role-binding
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -453,7 +453,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: nginx-ingress-serviceaccount
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -461,12 +461,12 @@ kind: RoleBinding
 metadata:
   labels:
     app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: nginx-ingress-admission
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -474,26 +474,26 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: nginx-ingress-admission
-    namespace: "{{ .Values.ingress.namespace }}"
+    namespace: "{{ .Values.ingress.controller.namespace }}"
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
-  name: "{{ .Values.ingress.namespace }}-clusterrole-binding"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
+  name: "{{ .Values.ingress.controller.namespace }}-clusterrole-binding"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: "{{ .Values.ingress.namespace }}-clusterrole"
+  name: "{{ .Values.ingress.controller.namespace }}-clusterrole"
 subjects:
 - kind: ServiceAccount
   name: nginx-ingress-serviceaccount
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -501,10 +501,10 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: nginx-ingress-admission
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -513,7 +513,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: nginx-ingress-admission
-    namespace: "{{ .Values.ingress.namespace }}"
+    namespace: "{{ .Values.ingress.controller.namespace }}"
 
 ---
 apiVersion: scheduling.k8s.io/v1
@@ -530,18 +530,18 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: nginx-ingress-controller
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-      app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+      app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+      app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -553,8 +553,8 @@ spec:
     metadata:
       labels:
         app.kubernetes.io/component: controller
-        app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-        app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
+        app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+        app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
       annotations:
         prometheus.io/port: "10254"
         prometheus.io/scrape: "true"
@@ -574,7 +574,7 @@ spec:
           type: RuntimeDefault
       containers:
       - name: nginx-node-health-check
-        image: docker.io/library/nginx:{{ .Values.ingress.nginxVersion }}
+        image: docker.io/library/nginx:{{ .Values.ingress.controller.nginxVersion }}
         imagePullPolicy: Always
         ports:
         - name: healthz-port
@@ -605,14 +605,14 @@ spec:
             mountPath: /etc/nginx/nginx.conf
             subPath: nginx-node-health-check.conf
       - name: nginx-ingress-controller
-        image: registry.k8s.io/ingress-nginx/controller:{{ .Values.ingress.nginxIngressVersion }}
+        image: registry.k8s.io/ingress-nginx/controller:{{ .Values.ingress.controller.nginxIngressVersion }}
         imagePullPolicy: IfNotPresent
         args:
         - /nginx-ingress-controller
-        - --publish-service=$(POD_NAMESPACE)/{{ .Values.ingress.namespace }}
+        - --publish-service=$(POD_NAMESPACE)/{{ .Values.ingress.controller.namespace }}
         - --election-id=ingress-controller-leader
-        - --controller-class=k8s.io/{{ .Values.ingress.namespace }}
-        - --ingress-class={{ .Values.ingress.namespace }}
+        - --controller-class=k8s.io/{{ .Values.ingress.controller.namespace }}
+        - --ingress-class={{ .Values.ingress.controller.namespace }}
         - --configmap=$(POD_NAMESPACE)/nginx-configuration
         - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
         - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
@@ -701,21 +701,21 @@ kind: Job
 metadata:
   labels:
     app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: nginx-ingress-admission-create
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 spec:
   template:
     metadata:
       labels:
         app.kubernetes.io/component: admission-webhook
-        app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-        app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-        app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-        app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+        app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+        app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+        app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+        app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
       name: nginx-ingress-admission-create
     spec:
       containers:
@@ -749,27 +749,27 @@ kind: Job
 metadata:
   labels:
     app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
   name: nginx-ingress-admission-patch
-  namespace: "{{ .Values.ingress.namespace }}"
+  namespace: "{{ .Values.ingress.controller.namespace }}"
 spec:
   template:
     metadata:
       labels:
         app.kubernetes.io/component: admission-webhook
-        app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-        app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-        app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-        app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
+        app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+        app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+        app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+        app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
       name: nginx-ingress-admission-patch
     spec:
       containers:
         - args:
             - patch
-            - --webhook-name=nginx-ingress-admission-{{ .Values.ingress.namespace }}
+            - --webhook-name=nginx-ingress-admission-{{ .Values.ingress.controller.namespace }}
             - --namespace=$(POD_NAMESPACE)
             - --patch-mutating=false
             - --secret-name=nginx-ingress-admission
@@ -799,13 +799,13 @@ kind: IngressClass
 metadata:
   labels:
     app.kubernetes.io/component: controller
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
-  name: "{{ .Values.ingress.namespace }}"
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
+  name: "{{ .Values.ingress.controller.namespace }}"
 spec:
-  controller: k8s.io/{{ .Values.ingress.namespace }}
+  controller: k8s.io/{{ .Values.ingress.controller.namespace }}
 
 ---
 apiVersion: admissionregistration.k8s.io/v1
@@ -813,18 +813,18 @@ kind: ValidatingWebhookConfiguration
 metadata:
   labels:
     app.kubernetes.io/component: admission-webhook
-    app.kubernetes.io/instance: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/name: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/part-of: "{{ .Values.ingress.namespace }}"
-    app.kubernetes.io/version: "{{ .Values.ingress.nginxVersion }}"
-  name: nginx-ingress-admission-{{ .Values.ingress.namespace }}
+    app.kubernetes.io/instance: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
+    app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
+  name: nginx-ingress-admission-{{ .Values.ingress.controller.namespace }}
 webhooks:
   - admissionReviewVersions:
       - v1
     clientConfig:
       service:
         name: nginx-ingress-controller-admission
-        namespace: "{{ .Values.ingress.namespace }}"
+        namespace: "{{ .Values.ingress.controller.namespace }}"
         path: /networking/v1/ingresses
     failurePolicy: Fail
     matchPolicy: Equivalent
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index 6336957f5ac..88bb2f6e7e9 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -169,12 +169,6 @@ dbconfig:
 ingress:
   # enabled whether Ingress should be enabled as alternative to the contained nginx
   enabled: false
-  # namespace for ingress controller, must exist
-  namespace: ingress-nginx
-  # Ingress-NGINX version
-  nginxIngressVersion: v1.8.0
-  # Nginx Version
-  nginxVersion: "1.21.6"
 
   # className is the 'ingressClassName' to configure in the Ingress spec
   className: ingress-nginx
@@ -183,6 +177,15 @@ ingress:
   # defaultBackendSuffix the suffix to add to the internal fullname to use as Ingress "defaultBackend"
   defaultBackendSuffix: nginx
   # annotations common annotations for all 3 Ingresses of Ditto
+  controller:
+    # enabled whether Ingress controller should be enabled
+    enabled: false
+    # namespace for ingress controller
+    namespace: ingress-nginx
+    # Ingress-NGINX version. Check Supported Versions table from https://github.com/kubernetes/ingress-nginx to match k8s version.
+    nginxIngressVersion: "v1.8.0"
+    # Nginx Version. Check Supported Versions table from https://github.com/kubernetes/ingress-nginx to match k8s version.
+    nginxVersion: "1.21.6"
   annotations:
     nginx.ingress.kubernetes.io/service-upstream: "true"
     nginx.ingress.kubernetes.io/server-snippet: |

From 538239787ef00644ecaf497f0b60491fce4ebcf6 Mon Sep 17 00:00:00 2001
From: Vladimir Brkic <brv1sf@bosch.com>
Date: Thu, 29 Jun 2023 13:14:02 +0200
Subject: [PATCH 154/173] Limit number of worker processes for ingress nginx
 healh-check

---
 deployment/helm/ditto/templates/nginx-ingress.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/helm/ditto/templates/nginx-ingress.yaml b/deployment/helm/ditto/templates/nginx-ingress.yaml
index c1573b5934a..9bdf5d83ebb 100644
--- a/deployment/helm/ditto/templates/nginx-ingress.yaml
+++ b/deployment/helm/ditto/templates/nginx-ingress.yaml
@@ -25,7 +25,7 @@ metadata:
 data:
   nginx-node-health-check.conf: |
     # config for health check container running together with the ingress controller
-    worker_processes auto; #auto-detect number of logical CPU cores
+    worker_processes 1;
 
     events {
       worker_connections 1024;

From 90c4bf06592063dc1df3da6c7d30ec2d07428869 Mon Sep 17 00:00:00 2001
From: Vladimir Brkic <brv1sf@bosch.com>
Date: Thu, 29 Jun 2023 14:18:02 +0200
Subject: [PATCH 155/173] Properly setting ingress class in ingress controller

---
 deployment/helm/ditto/templates/nginx-ingress.yaml | 4 ++--
 deployment/helm/ditto/values.yaml                  | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/deployment/helm/ditto/templates/nginx-ingress.yaml b/deployment/helm/ditto/templates/nginx-ingress.yaml
index 9bdf5d83ebb..75c2f5abd60 100644
--- a/deployment/helm/ditto/templates/nginx-ingress.yaml
+++ b/deployment/helm/ditto/templates/nginx-ingress.yaml
@@ -612,7 +612,7 @@ spec:
         - --publish-service=$(POD_NAMESPACE)/{{ .Values.ingress.controller.namespace }}
         - --election-id=ingress-controller-leader
         - --controller-class=k8s.io/{{ .Values.ingress.controller.namespace }}
-        - --ingress-class={{ .Values.ingress.controller.namespace }}
+        - --ingress-class={{ .Values.ingress.className }}
         - --configmap=$(POD_NAMESPACE)/nginx-configuration
         - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
         - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
@@ -803,7 +803,7 @@ metadata:
     app.kubernetes.io/name: "{{ .Values.ingress.controller.namespace }}"
     app.kubernetes.io/part-of: "{{ .Values.ingress.controller.namespace }}"
     app.kubernetes.io/version: "{{ .Values.ingress.controller.nginxVersion }}"
-  name: "{{ .Values.ingress.controller.namespace }}"
+  name: "{{ .Values.ingress.className }}"
 spec:
   controller: k8s.io/{{ .Values.ingress.controller.namespace }}
 
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index 88bb2f6e7e9..5436634c306 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -169,9 +169,8 @@ dbconfig:
 ingress:
   # enabled whether Ingress should be enabled as alternative to the contained nginx
   enabled: false
-
   # className is the 'ingressClassName' to configure in the Ingress spec
-  className: ingress-nginx
+  className: nginx
   # host the hostname of the Ingress shared for all: api, ws and ui
   host: localhost
   # defaultBackendSuffix the suffix to add to the internal fullname to use as Ingress "defaultBackend"
@@ -180,7 +179,7 @@ ingress:
   controller:
     # enabled whether Ingress controller should be enabled
     enabled: false
-    # namespace for ingress controller
+    # namespace for ingress controller, managed by helm, should not be created manually
     namespace: ingress-nginx
     # Ingress-NGINX version. Check Supported Versions table from https://github.com/kubernetes/ingress-nginx to match k8s version.
     nginxIngressVersion: "v1.8.0"

From aa04c6aa59acbfd42353336746909455071875a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 29 Jun 2023 20:20:58 +0200
Subject: [PATCH 156/173] prepare Ditto 3.3.1 bugfix release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../_data/sidebars/ditto_sidebar.yml          |  3 +
 .../pages/ditto/release_notes_331.md          | 60 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 documentation/src/main/resources/pages/ditto/release_notes_331.md

diff --git a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
index b0a6ddeef0d..b637d8e168e 100644
--- a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
+++ b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
@@ -23,6 +23,9 @@ entries:
       - title: Release Notes
         output: web
         folderitems:
+          - title: 3.3.1
+            url: /release_notes_331.html
+            output: web
           - title: 3.3.0
             url: /release_notes_330.html
             output: web
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_331.md b/documentation/src/main/resources/pages/ditto/release_notes_331.md
new file mode 100644
index 00000000000..69945396039
--- /dev/null
+++ b/documentation/src/main/resources/pages/ditto/release_notes_331.md
@@ -0,0 +1,60 @@
+---
+title: Release notes 3.3.1
+tags: [release_notes]
+published: true
+keywords: release notes, announcements, changelog
+summary: "Version 3.3.1 of Eclipse Ditto, released on 29.06.2023"
+permalink: release_notes_331.html
+---
+
+This is a bugfix release, no new features since [3.3.0](release_notes_330.html) were added.
+
+## Changelog
+
+Compared to the latest release [3.3.0](release_notes_330.html), the following changes and bugfixes were added.
+
+### Changes
+
+None
+
+
+### Bugfixes
+
+This is a complete list of the
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A3.3.1).
+
+#### [Fix blocking Akka dispatcher thread on WoT skeleton creation](https://github.com/eclipse-ditto/ditto/pull/1666)
+
+Ditto's [WoT integration](basic-wot-integration.html) did block the Akka dispatcher thread which could lead to deadlock 
+situations when e.g. creating new twins based on a WoT ThingModel.  
+
+This was solved and the complete WoT operations are now executed asynchronously.
+
+
+### Helm Chart
+
+The [Ditto Helm Chart](https://github.com/eclipse-ditto/ditto/tree/master/deployment/helm), which was enhanced and changed 
+a lot for version 3.3.0, contained some configuration bugs which are also addressed with this bugfix release.
+
+
+#### [Fix that nginx's worker_processes setting 'auto' causes problems with workers having many CPUs](https://github.com/eclipse-ditto/ditto/pull/1667)
+
+Configure the "dittoui"'s nginx to only use 1 worker process, as it only serves static content.  
+Add configuration option in the Helm chart `values.yaml` to configure the nginx's used worker_processes and default to 4
+
+#### [Fix wrong config path for pulling devops and status password from helm values](https://github.com/eclipse-ditto/ditto/pull/1671)
+
+The devopsPassword and statusPassword were read from `.Values.gateway.devopsPassword` and `.Values.gateway.statusPassword`.
+In the `values.yaml` these two values were however located at different configuration levels.
+
+As a result, the two passwords werew always regenerated and the passed passwords were not used.
+
+#### [Configure queryReadConcern: "local" for ditto things-search by default](https://github.com/eclipse-ditto/ditto/pull/1672)
+
+The `readConcern` was by default configured to `"linearizable"` which however fails in a "single instance" MongoDB setup.  
+Changed to be by default `queryReadConcern: "local"` with hint to configure otherwise for replicated MongoDB setups.
+
+#### [Support for ingress controller](https://github.com/eclipse-ditto/ditto/pull/1668)
+
+The Ditto Helm chart now supports to additionally deploy a (nginx-based) "Ingress controller", if configured.  
+By default, the deployment of the Ingress controller is however disabled.

From e1b188bf286921b0606858745f12f4977261f1fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 29 Jun 2023 21:18:35 +0200
Subject: [PATCH 157/173] update chart version and appVersion to 3.3.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index 8e0d0293d70..24ea3ec4992 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,8 +16,8 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.3.3  # chart version is effectively set by release-job
-appVersion: 3.3.0
+version: 3.3.1  # chart version is effectively set by release-job
+appVersion: 3.3.1
 keywords:
   - iot-chart
   - digital-twin

From b07bcf1bedc9cfef65d8980abc3930b58c7ac5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Fri, 30 Jun 2023 08:09:17 +0200
Subject: [PATCH 158/173] prepare Ditto 3.3.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/Chart.yaml                          | 4 ++--
 .../src/main/resources/_data/sidebars/ditto_sidebar.yml   | 4 ++--
 .../ditto/{release_notes_331.md => release_notes_332.md}  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename documentation/src/main/resources/pages/ditto/{release_notes_331.md => release_notes_332.md} (92%)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index 24ea3ec4992..1d9e3752731 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,8 +16,8 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.3.1  # chart version is effectively set by release-job
-appVersion: 3.3.1
+version: 3.3.2  # chart version is effectively set by release-job
+appVersion: 3.3.2
 keywords:
   - iot-chart
   - digital-twin
diff --git a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
index b637d8e168e..9b5bf0aae49 100644
--- a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
+++ b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
@@ -23,8 +23,8 @@ entries:
       - title: Release Notes
         output: web
         folderitems:
-          - title: 3.3.1
-            url: /release_notes_331.html
+          - title: 3.3.2
+            url: /release_notes_332.html
             output: web
           - title: 3.3.0
             url: /release_notes_330.html
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_331.md b/documentation/src/main/resources/pages/ditto/release_notes_332.md
similarity index 92%
rename from documentation/src/main/resources/pages/ditto/release_notes_331.md
rename to documentation/src/main/resources/pages/ditto/release_notes_332.md
index 69945396039..eec019b6dad 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_331.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_332.md
@@ -1,10 +1,10 @@
 ---
-title: Release notes 3.3.1
+title: Release notes 3.3.2
 tags: [release_notes]
 published: true
 keywords: release notes, announcements, changelog
-summary: "Version 3.3.1 of Eclipse Ditto, released on 29.06.2023"
-permalink: release_notes_331.html
+summary: "Version 3.3.2 of Eclipse Ditto, released on 30.06.2023"
+permalink: release_notes_332.html
 ---
 
 This is a bugfix release, no new features since [3.3.0](release_notes_330.html) were added.
@@ -15,7 +15,7 @@ Compared to the latest release [3.3.0](release_notes_330.html), the following ch
 
 ### Changes
 
-None
+We had to skip Ditto version 3.3.1, as there were errors in our release pipeline.
 
 
 ### Bugfixes

From 64e323f1a78c24b1236dfe1ee21011d246fb2c83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Fri, 30 Jun 2023 13:35:40 +0200
Subject: [PATCH 159/173] fix that ImmutablePolicyImports.getPolicyImport with
 arbitrary CharSequence did not work
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* reason is that the Map contained `CharSequence` as key, but was internally always `PolicyId` - which however was not "equal to" an arbitrary CharSequence provided to the `getPolicyImport(CharSequence)` method
* this method therefore never returned the expected entry

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../model/ImmutablePolicyImports.java         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/ImmutablePolicyImports.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/ImmutablePolicyImports.java
index 74bdcff47a7..3b32b0c971c 100644
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/ImmutablePolicyImports.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/ImmutablePolicyImports.java
@@ -47,14 +47,14 @@
 @Immutable
 final class ImmutablePolicyImports implements PolicyImports {
 
-    private final Map<CharSequence, PolicyImport> policyImports;
+    private final Map<PolicyId, PolicyImport> policyImports;
     public static final String POLICY_IMPORTS = "policyImports";
 
     private ImmutablePolicyImports() {
         this.policyImports = Collections.emptyMap();
     }
 
-    private ImmutablePolicyImports(final Map<CharSequence, PolicyImport> policyImports) {
+    private ImmutablePolicyImports(final Map<PolicyId, PolicyImport> policyImports) {
         checkNotNull(policyImports, POLICY_IMPORTS);
         this.policyImports = Collections.unmodifiableMap(new HashMap<>(policyImports));
     }
@@ -69,7 +69,7 @@ private ImmutablePolicyImports(final Map<CharSequence, PolicyImport> policyImpor
     public static ImmutablePolicyImports of(final Iterable<PolicyImport> policyImports) {
         checkNotNull(policyImports, POLICY_IMPORTS);
 
-        final Map<CharSequence, PolicyImport> resourcesMap = new HashMap<>();
+        final Map<PolicyId, PolicyImport> resourcesMap = new HashMap<>();
         policyImports.forEach(policyImport -> {
             final PolicyImport existingPolicyImport =
                     resourcesMap.put(policyImport.getImportedPolicyId(), policyImport);
@@ -113,7 +113,7 @@ public static PolicyImports fromJson(final JsonObject jsonObject) {
     @Override
     public Optional<PolicyImport> getPolicyImport(final CharSequence importedPolicyId) {
         checkNotNull(importedPolicyId, "importedPolicyId");
-        return Optional.ofNullable(policyImports.get(importedPolicyId));
+        return Optional.ofNullable(policyImports.get(PolicyId.of(importedPolicyId)));
     }
 
     @Override
@@ -143,7 +143,7 @@ public PolicyImports setPolicyImports(final PolicyImports policyImports) {
 
 
     private PolicyImports createNewPolicyImportsWithNewPolicyImport(final PolicyImport newPolicyImport) {
-        final Map<CharSequence, PolicyImport> resourcesCopy = copyPolicyImports();
+        final Map<PolicyId, PolicyImport> resourcesCopy = copyPolicyImports();
         resourcesCopy.put(newPolicyImport.getImportedPolicyId(), newPolicyImport);
         if (resourcesCopy.size() > DITTO_LIMITS_POLICY_IMPORTS_LIMIT) {
             throw PolicyImportsTooLargeException.newBuilder(newPolicyImport.getImportedPolicyId()).build();
@@ -151,7 +151,7 @@ private PolicyImports createNewPolicyImportsWithNewPolicyImport(final PolicyImpo
         return new ImmutablePolicyImports(resourcesCopy);
     }
 
-    private Map<CharSequence, PolicyImport> copyPolicyImports() {
+    private Map<PolicyId, PolicyImport> copyPolicyImports() {
         return new HashMap<>(policyImports);
     }
 
@@ -159,12 +159,13 @@ private Map<CharSequence, PolicyImport> copyPolicyImports() {
     public PolicyImports removePolicyImport(final CharSequence importedPolicyId) {
         checkNotNull(importedPolicyId, "importedPolicyId");
 
-        if (!policyImports.containsKey(importedPolicyId)) {
+        final PolicyId policyId = PolicyId.of(importedPolicyId);
+        if (!policyImports.containsKey(policyId)) {
             return this;
         }
 
-        final Map<CharSequence, PolicyImport> resourcesCopy = copyPolicyImports();
-        resourcesCopy.remove(importedPolicyId);
+        final Map<PolicyId, PolicyImport> resourcesCopy = copyPolicyImports();
+        resourcesCopy.remove(policyId);
 
         return new ImmutablePolicyImports(resourcesCopy);
     }

From 57128db4093bd3fe9be5c85dac6bb8b7f35e319b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Fri, 30 Jun 2023 16:39:10 +0200
Subject: [PATCH 160/173] fix JsonSchema for policy "announcements"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* the schema was missing a level (`"announcement"`) in the hierarchy
* and was also missing `randomizationInterval`

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../src/main/resources/jsonschema/policy.json | 48 ++++++++++++++-----
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/documentation/src/main/resources/jsonschema/policy.json b/documentation/src/main/resources/jsonschema/policy.json
index b532c491e75..e4186dff71d 100644
--- a/documentation/src/main/resources/jsonschema/policy.json
+++ b/documentation/src/main/resources/jsonschema/policy.json
@@ -61,22 +61,46 @@
                     "description": "The optional expiry timestamp (formatted in ISO-8601) indicates how long this subject should be considered before it is automatically deleted from the policy.",
                     "format": "date-time"
                   },
-                  "requestedAcks": {
-                    "title": "RequestedAcks",
+                  "announcement": {
+                    "title": "Announcement",
                     "type": "object",
-                    "description": "Settings to enable at-least-once delivery for policy announcements.",
+                    "description": "The configuration of announcements to send for this Subject.",
                     "properties": {
-                      "labels": {
-                        "type": "array",
-                        "description": "Acknowledgement labels to request when an announcement is published.",
-                        "items": {
-                          "type": "string"
-                        },
-                        "example": ["my-connection:my-issued-acknowledgement"]
+                      "beforeExpiry": {
+                        "title": "Before expiry",
+                        "type": "string",
+                        "description": "The duration before expiry when an announcement should be sent.",
+                        "example": "100s"
+                      },
+                      "whenDeleted": {
+                        "title": "When deleted",
+                        "type": "boolean",
+                        "description": "Whether an announcement should be sent upon subject deletion."
+                      },
+                      "requestedAcks": {
+                        "title": "Requested Acks",
+                        "type": "object",
+                        "description": "Settings to enable at-least-once delivery for policy announcements.",
+                        "properties": {
+                          "labels": {
+                            "type": "array",
+                            "description": "Acknowledgement labels to request when an announcement is published.",
+                            "items": {
+                              "type": "string"
+                            },
+                            "example": ["my-connection:my-issued-acknowledgement"]
+                          },
+                          "timeout": {
+                            "type": "string",
+                            "description": "How long to wait for requested announcements before retrying publication of an announcement.",
+                            "example": "60s"
+                          }
+                        }
                       },
-                      "timeout": {
+                      "randomizationInterval": {
+                        "title": "Randomization interval",
                         "type": "string",
-                        "description": "How long to wait for requested announcements before retrying publication of an announcement.",
+                        "description": "The interval in which the announcement can be sent earlier in effort to prevent announcement peaks.",
                         "example": "60s"
                       }
                     }

From 1604fcc18069ba37c43f01289d8981c185e9e415 Mon Sep 17 00:00:00 2001
From: Altair-Bueno <altair.bueno@uma.es>
Date: Mon, 3 Jul 2023 11:36:16 +0200
Subject: [PATCH 161/173] fix(helm): Allow inter cluster communication

Signed-off-by: Altair-Bueno <altair.bueno@uma.es>
---
 deployment/helm/ditto/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index 742e3a1cbff..e8acdd6d4a8 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -1124,12 +1124,12 @@ connectivity:
       # allowedHostnames contains a comma separated list of explicitly allowed hostnames
       allowedHostnames: ""
       # blockedHostnames contains a comma separated list of blocked hostnames
-      blockedHostnames: "localhost"
+      blockedHostnames: ""
       # blockedSubnets holds a comma separated string of blocked subnets
       #  specify subnets to block in CIDR format e.g. "11.1.0.0/16"
       blockedSubnets: ""
       # blockedHostRegex contains the regex for blocked hostnames
-      blockedHostRegex: ^.*\\.svc.cluster.local$
+      blockedHostRegex: ""
       limits:
         # maxSources contains the max number of sources per connection
         maxSources: 5

From b60be91aaca6136eab58b05091eb3abc45fc1d43 Mon Sep 17 00:00:00 2001
From: Altair-Bueno <altair.bueno@uma.es>
Date: Mon, 3 Jul 2023 12:51:13 +0200
Subject: [PATCH 162/173] chores(helm): Bump chart version

Signed-off-by: Altair-Bueno <altair.bueno@uma.es>
---
 deployment/helm/ditto/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index 1d9e3752731..967f51223d1 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.3.2  # chart version is effectively set by release-job
+version: 3.3.3  # chart version is effectively set by release-job
 appVersion: 3.3.2
 keywords:
   - iot-chart

From db956574b170ec00f4b825c5201ba6ed3bebd6f1 Mon Sep 17 00:00:00 2001
From: Altair-Bueno <altair.bueno@uma.es>
Date: Wed, 5 Jul 2023 10:17:14 +0200
Subject: [PATCH 163/173] fix(gha): Avoid running cron on forks

Signed-off-by: Altair-Bueno <altair.bueno@uma.es>
---
 .github/workflows/docker-nightly.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/docker-nightly.yml b/.github/workflows/docker-nightly.yml
index e251c08e235..8c4ba08344e 100644
--- a/.github/workflows/docker-nightly.yml
+++ b/.github/workflows/docker-nightly.yml
@@ -15,8 +15,11 @@ on:
     - cron: '0 1 * * *' # run at 1 AM UTC
   workflow_dispatch:
 
+env:
+  GITHUB_REPOSITORY: eclipse-ditto/ditto
 jobs:
   build:
+    if: github.repository == ${{ env.GITHUB_REPOSITORY }}
     runs-on: ubuntu-latest
     steps:
       -

From b833d7df7e5d8c7de9023d7253a84ab858e16412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 5 Jul 2023 16:32:58 +0200
Subject: [PATCH 164/173] fix non-correct WARN log about potentially failing
 connections status
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* the logic was assuming that 1 Publisher actor will only be started if targets are available which is a wrong assumption - it is always started

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../ditto/connectivity/service/messaging/BaseClientActor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java
index ea9a47e3c2c..0c026c0ced7 100644
--- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java
+++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java
@@ -1443,8 +1443,8 @@ private FSM.State<BaseClientState, BaseClientData> retrieveConnectionStatus(fina
                                 " Forwarding to consumers and publishers.", command.getEntityId(),
                         sender);
 
-        // only one PublisherActor is started for all targets (if targets are present)
-        final int numberOfProducers = connection.getTargets().isEmpty() ? 0 : 1;
+        // only one PublisherActor is started for all targets - and it always is started
+        final int numberOfProducers = 1;
         final int numberOfConsumers = determineNumberOfConsumers();
         int expectedNumberOfChildren = numberOfProducers + numberOfConsumers;
         if (getSshTunnelState().isEnabled()) {

From 7a402af5a2b894600a6b5d11b9ad8139d801c67d Mon Sep 17 00:00:00 2001
From: Altair-Bueno <altair.bueno@uma.es>
Date: Thu, 6 Jul 2023 09:46:41 +0200
Subject: [PATCH 165/173] fix(gha): Hardcode repo name into action

Signed-off-by: Altair-Bueno <altair.bueno@uma.es>
---
 .github/workflows/docker-nightly.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/docker-nightly.yml b/.github/workflows/docker-nightly.yml
index 8c4ba08344e..66633f10181 100644
--- a/.github/workflows/docker-nightly.yml
+++ b/.github/workflows/docker-nightly.yml
@@ -15,11 +15,9 @@ on:
     - cron: '0 1 * * *' # run at 1 AM UTC
   workflow_dispatch:
 
-env:
-  GITHUB_REPOSITORY: eclipse-ditto/ditto
 jobs:
   build:
-    if: github.repository == ${{ env.GITHUB_REPOSITORY }}
+    if: github.repository == 'eclipse-ditto/ditto'
     runs-on: ubuntu-latest
     steps:
       -

From a7f1af8021ff1011c3f9ea2d654df2a7901bb7ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 6 Jul 2023 15:34:56 +0200
Subject: [PATCH 166/173] fix MergeThing command being used for creating new
 things did not respect "inlinePolicy"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* when processed via Ditto "Adaptable" - there the "inlinePolicy" was missing

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../ImmutableFeaturePlaceholderTest.java      |  2 +-
 .../mapper/ThingMergeSignalMapper.java        |  2 +-
 .../things/ThingMergeCommandAdapterTest.java  | 35 +++++++++---
 .../signals/commands/modify/MergeThing.java   | 14 ++++-
 .../commands/modify/MergeThingTest.java       | 54 +++++++++++++++++++
 .../enforcement/ThingCommandEnforcement.java  |  3 +-
 .../pre/ModifyToCreateThingTransformer.java   |  2 +-
 .../commands/MergeThingStrategy.java          |  5 +-
 8 files changed, 103 insertions(+), 14 deletions(-)

diff --git a/edge/service/src/test/java/org/eclipse/ditto/edge/service/placeholders/ImmutableFeaturePlaceholderTest.java b/edge/service/src/test/java/org/eclipse/ditto/edge/service/placeholders/ImmutableFeaturePlaceholderTest.java
index a4d0a2c32cb..e13b8a91218 100644
--- a/edge/service/src/test/java/org/eclipse/ditto/edge/service/placeholders/ImmutableFeaturePlaceholderTest.java
+++ b/edge/service/src/test/java/org/eclipse/ditto/edge/service/placeholders/ImmutableFeaturePlaceholderTest.java
@@ -146,7 +146,7 @@ public void testReplaceFeatureIdsForMergeThingOnTopLevelWithNonObjectValue() {
                 .set(ThingCommand.JsonFields.TYPE, MergeThing.TYPE)
                 .set(ThingCommand.JsonFields.JSON_THING_ID, THING_ID.toString())
                 .set("path", "/")
-                .set("value", "This is wrong.")
+                .set("value", JsonObject.newBuilder().set("foo", "This is wrong.").build())
                 .build(), DittoHeaders.empty());
         assertThat(UNDER_TEST.resolveValues(mergeThing, "id")).isEmpty();
     }
diff --git a/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/ThingMergeSignalMapper.java b/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/ThingMergeSignalMapper.java
index be1f1556d05..289dac4564a 100644
--- a/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/ThingMergeSignalMapper.java
+++ b/protocol/src/main/java/org/eclipse/ditto/protocol/mapper/ThingMergeSignalMapper.java
@@ -23,7 +23,7 @@ final class ThingMergeSignalMapper extends AbstractModifySignalMapper<MergeThing
 
     @Override
     void enhancePayloadBuilder(final MergeThing command, final PayloadBuilder payloadBuilder) {
-        payloadBuilder.withValue(command.getValue());
+        payloadBuilder.withValue(command.getEntity().orElseGet(command::getValue));
     }
 
     @Override
diff --git a/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/things/ThingMergeCommandAdapterTest.java b/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/things/ThingMergeCommandAdapterTest.java
index 8714dcd69ae..24c6d339d6f 100644
--- a/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/things/ThingMergeCommandAdapterTest.java
+++ b/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/things/ThingMergeCommandAdapterTest.java
@@ -15,21 +15,22 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.assertj.core.api.Assertions;
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonPointer;
-import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.base.model.exceptions.DittoJsonException;
 import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
 import org.eclipse.ditto.base.model.headers.contenttype.ContentType;
-import org.eclipse.ditto.things.model.Thing;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.protocol.Adaptable;
-import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
 import org.eclipse.ditto.protocol.LiveTwinTest;
 import org.eclipse.ditto.protocol.Payload;
-import org.eclipse.ditto.protocol.adapter.ProtocolAdapterTest;
 import org.eclipse.ditto.protocol.TestConstants;
 import org.eclipse.ditto.protocol.TopicPath;
 import org.eclipse.ditto.protocol.UnknownPathException;
+import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
+import org.eclipse.ditto.protocol.adapter.ProtocolAdapterTest;
+import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.PolicyIdNotDeletableException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingIdNotDeletableException;
 import org.eclipse.ditto.things.model.signals.commands.exceptions.ThingIdNotExplicitlySettableException;
@@ -133,6 +134,28 @@ public void mergeThingWithPolicyIdFromAdaptable() {
         assertWithExternalHeadersThat(actual).isEqualTo(expected);
     }
 
+    @Test
+    public void mergeThingWithInlinePolicyFromAdaptable() {
+        final JsonObject initialPolicy = JsonObject.newBuilder().set("foo", "bar").build();
+        final MergeThing expected =
+                MergeThing.withThing(TestConstants.THING_ID, TestConstants.THING, initialPolicy, null,
+                        TestConstants.DITTO_HEADERS_V_2);
+        final Adaptable adaptable = Adaptable.newBuilder(topicPath)
+                .withPayload(Payload.newBuilder(JsonPointer.empty())
+                        .withValue(TestConstants.THING.toJson().toBuilder()
+                                .set(MergeThing.JSON_INLINE_POLICY.getPointer(), initialPolicy)
+                                .build()
+                        )
+                        .build()
+                )
+                .withHeaders(TestConstants.HEADERS_V_2_FOR_MERGE_COMMANDS)
+                .build();
+
+        final MergeThing actual = underTest.fromAdaptable(adaptable);
+
+        assertWithExternalHeadersThat(actual).isEqualTo(expected);
+    }
+
     @Test(expected = PolicyIdNotDeletableException.class)
     public void mergeThingWithNullPolicyIdFromAdaptable() {
         final Adaptable adaptable = Adaptable.newBuilder(topicPath)
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThing.java b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThing.java
index 1ea3f1162f9..eccbfde79e5 100644
--- a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThing.java
+++ b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThing.java
@@ -497,12 +497,22 @@ public ThingId getEntityId() {
 
     @Override
     public Optional<JsonValue> getEntity() {
-        return Optional.of(value);
+        if (path.isEmpty()) {
+            final JsonObject thingJson = value.asObject();
+            final JsonObject withInlinePolicyThingJson =
+                    getInitialPolicy().map(ip -> thingJson.set(JSON_INLINE_POLICY, ip)).orElse(thingJson);
+            final JsonObject fullThingJson = getPolicyIdOrPlaceholder().map(
+                    containedPolicyIdOrPlaceholder -> withInlinePolicyThingJson.set(JSON_COPY_POLICY_FROM,
+                            containedPolicyIdOrPlaceholder)).orElse(withInlinePolicyThingJson);
+            return Optional.of(fullThingJson);
+        } else {
+            return Optional.of(value);
+        }
     }
 
     @Override
     public Optional<JsonValue> getEntity(final JsonSchemaVersion schemaVersion) {
-        return Optional.of(value);
+        return getEntity();
     }
 
     @Override
diff --git a/things/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThingTest.java b/things/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThingTest.java
index 255da909665..d2d57300bb9 100644
--- a/things/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThingTest.java
+++ b/things/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/modify/MergeThingTest.java
@@ -18,10 +18,12 @@
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
+import java.text.MessageFormat;
 import java.util.Optional;
 import java.util.UUID;
 
 import org.assertj.core.api.Assertions;
+import org.assertj.core.api.JUnitSoftAssertions;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonKeyInvalidException;
@@ -37,6 +39,8 @@
 import org.eclipse.ditto.things.model.ThingsModelFactory;
 import org.eclipse.ditto.things.model.signals.commands.TestConstants;
 import org.eclipse.ditto.things.model.signals.commands.ThingCommand;
+import org.eclipse.ditto.things.model.signals.commands.exceptions.PoliciesConflictingException;
+import org.junit.Rule;
 import org.junit.Test;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
@@ -58,6 +62,9 @@ public final class MergeThingTest {
     private static final MergeThing KNOWN_MERGE_THING = MergeThing.withAttribute(TestConstants.Thing.THING_ID,
             TestConstants.Thing.LOCATION_ATTRIBUTE_POINTER, TestConstants.Thing.LOCATION_ATTRIBUTE_VALUE, DITTO_HEADERS);
 
+    @Rule
+    public final JUnitSoftAssertions softly = new JUnitSoftAssertions();
+
     @Test
     public void assertImmutability() {
         assertInstancesOf(MergeThing.class,
@@ -426,4 +433,51 @@ public void mergeTooLargeThing() {
                 .isInstanceOf(ThingTooLargeException.class);
     }
 
+    @Test
+    public void initializeWithInitialPolicyNullAndWithCopiedPolicyNull() {
+        final MergeThing modifyThing =
+                MergeThing.withThing(TestConstants.Thing.THING_ID, TestConstants.Thing.THING, null, null,
+                        TestConstants.EMPTY_DITTO_HEADERS);
+
+        softly.assertThat(modifyThing.getInitialPolicy()).isNotPresent();
+        softly.assertThat(modifyThing.getPolicyIdOrPlaceholder()).isNotPresent();
+    }
+
+    @Test
+    public void initializeWithCopiedPolicy() {
+        final String thingReference = "{{ ref:things/my_namespace:my_thing/policyId }}";
+        final MergeThing modifyThing =
+                MergeThing.withThing(TestConstants.Thing.THING_ID, TestConstants.Thing.THING, null, thingReference,
+                        TestConstants.EMPTY_DITTO_HEADERS);
+
+        softly.assertThat(modifyThing.getInitialPolicy()).isNotPresent();
+        softly.assertThat(modifyThing.getPolicyIdOrPlaceholder()).isPresent();
+        softly.assertThat(modifyThing.getPolicyIdOrPlaceholder()).contains(thingReference);
+    }
+
+    @Test
+    public void initializeWithCopiedPolicyAndWithInitialPolicyNullAndPolicyIdNull() {
+        final Thing thing = TestConstants.Thing.THING.setPolicyId(null);
+        final String thingReference = "{{ ref:things/my_namespace:my_thing/policyId }}";
+        final MergeThing modifyThing =
+                MergeThing.withThing(TestConstants.Thing.THING_ID, thing, null, thingReference,
+                        TestConstants.EMPTY_DITTO_HEADERS);
+
+        softly.assertThat(modifyThing.getInitialPolicy()).isNotPresent();
+        softly.assertThat(modifyThing.getPolicyIdOrPlaceholder()).isPresent();
+        softly.assertThat(modifyThing.getPolicyIdOrPlaceholder()).contains(thingReference);
+    }
+
+    @Test
+    public void initializeWithCopiedPolicyAndWithInitialPolicy() {
+        final String thingReference = "{{ ref:things/my_namespace:my_thing/policyId }}";
+        softly.assertThatThrownBy(() ->
+                MergeThing.withThing(TestConstants.Thing.THING_ID, TestConstants.Thing.THING,
+                                JsonObject.newBuilder().build(), thingReference, TestConstants.EMPTY_DITTO_HEADERS)
+                )
+                .isInstanceOf(PoliciesConflictingException.class)
+                .hasMessage(MessageFormat.format(
+                        "The Thing with ID ''{0}'' could not be created as it contained an inline Policy as" +
+                                " well as a policyID to copy.", TestConstants.Thing.THING_ID));
+    }
 }
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java
index 45d6b6f1572..66be66eed4b 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcement.java
@@ -493,7 +493,8 @@ private static boolean enforceMergeThingCommand(final Enforcer enforcer,
         } else if (enforcer.hasPartialPermissions(thingResourceKey, authorizationContext, Permission.WRITE)) {
             // in case of partial permissions at thingResourceKey level check all leaves of merge patch for
             // unrestricted permissions
-            final Set<ResourceKey> resourceKeys = calculateLeaves(command.getPath(), command.getValue());
+            final Set<ResourceKey> resourceKeys = calculateLeaves(command.getPath(),
+                    command.getEntity().orElseGet(command::getValue));
             return enforcer.hasUnrestrictedPermissions(resourceKeys, authorizationContext, Permission.WRITE);
         } else {
             // not even partial permission
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/pre/ModifyToCreateThingTransformer.java b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/pre/ModifyToCreateThingTransformer.java
index 9c8cf53991b..c4e42a88f0e 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/pre/ModifyToCreateThingTransformer.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/enforcement/pre/ModifyToCreateThingTransformer.java
@@ -73,7 +73,7 @@ private static Optional<InputParams> calculateInputParams(final Signal<?> signal
                     modifyThing.getPolicyIdOrPlaceholder().orElse(null)
             ));
         } else if (signal instanceof MergeThing mergeThing && mergeThing.getPath().isEmpty()) {
-            final JsonObject mergeThingObject = mergeThing.getValue().asObject();
+            final JsonObject mergeThingObject = mergeThing.getEntity().orElseGet(mergeThing::getValue).asObject();
             return Optional.of(new InputParams(mergeThing,
                     ThingsModelFactory.newThing(mergeThingObject),
                     mergeThing.getInitialPolicy().orElse(null),
diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/MergeThingStrategy.java b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/MergeThingStrategy.java
index ae840a0da28..04470101746 100644
--- a/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/MergeThingStrategy.java
+++ b/things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/MergeThingStrategy.java
@@ -93,7 +93,7 @@ private Result<ThingEvent<?>> applyMergeCommand(final Context<ThingId> context,
         // (this is required e.g. for updating the search-index)
         final DittoHeaders dittoHeaders = command.getDittoHeaders();
         final JsonPointer path = command.getPath();
-        final JsonValue value = command.getValue();
+        final JsonValue value = command.getEntity().orElseGet(command::getValue);
 
         final Thing mergedThing = wrapException(() -> mergeThing(context, command, thing, eventTs, nextRevision),
                 command.getDittoHeaders());
@@ -109,7 +109,8 @@ private Result<ThingEvent<?>> applyMergeCommand(final Context<ThingId> context,
     private Thing mergeThing(final Context<ThingId> context, final MergeThing command, final Thing thing,
             final Instant eventTs, final long nextRevision) {
         final JsonObject existingThingJson = thing.toJson(FieldType.all());
-        final JsonMergePatch jsonMergePatch = JsonMergePatch.of(command.getPath(), command.getValue());
+        final JsonMergePatch jsonMergePatch = JsonMergePatch.of(command.getPath(),
+                command.getEntity().orElseGet(command::getValue));
         final JsonObject mergedJson = jsonMergePatch.applyOn(existingThingJson).asObject();
 
         ThingCommandSizeValidator.getInstance().ensureValidSize(

From 8809c33f3334fcbf0720856a9b9e2dffbe263213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Thu, 6 Jul 2023 21:51:21 +0200
Subject: [PATCH 167/173] prepare release notes for Ditto 3.3.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../_data/sidebars/ditto_sidebar.yml          |  3 ++
 .../pages/ditto/release_notes_332.md          |  2 +-
 .../pages/ditto/release_notes_333.md          | 52 +++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 documentation/src/main/resources/pages/ditto/release_notes_333.md

diff --git a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
index 9b5bf0aae49..bda236c677d 100644
--- a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
+++ b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
@@ -23,6 +23,9 @@ entries:
       - title: Release Notes
         output: web
         folderitems:
+          - title: 3.3.3
+            url: /release_notes_333.html
+            output: web
           - title: 3.3.2
             url: /release_notes_332.html
             output: web
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_332.md b/documentation/src/main/resources/pages/ditto/release_notes_332.md
index eec019b6dad..f5d23c6c16a 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_332.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_332.md
@@ -21,7 +21,7 @@ We had to skip Ditto version 3.3.1, as there were errors in our release pipeline
 ### Bugfixes
 
 This is a complete list of the
-[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A3.3.1).
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A3.3.2).
 
 #### [Fix blocking Akka dispatcher thread on WoT skeleton creation](https://github.com/eclipse-ditto/ditto/pull/1666)
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_333.md b/documentation/src/main/resources/pages/ditto/release_notes_333.md
new file mode 100644
index 00000000000..ce1cfbf378d
--- /dev/null
+++ b/documentation/src/main/resources/pages/ditto/release_notes_333.md
@@ -0,0 +1,52 @@
+---
+title: Release notes 3.3.3
+tags: [release_notes]
+published: true
+keywords: release notes, announcements, changelog
+summary: "Version 3.3.3 of Eclipse Ditto, released on 07.07.2023"
+permalink: release_notes_333.html
+---
+
+This is a bugfix release, no new features since [3.3.2](release_notes_332.html) were added.
+
+## Changelog
+
+Compared to the latest release [3.3.2](release_notes_332.html), the following changes and bugfixes were added.
+
+### Changes
+
+
+### Bugfixes
+
+This is a complete list of the
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A3.3.3).
+
+#### [Fix that ImmutablePolicyImports.getPolicyImport with arbitrary CharSequence did not work](https://github.com/eclipse-ditto/ditto/pull/1674)
+
+A model class' implementation signature did not work when using plain `CharSequence` instead of using an
+instance of `PolicyId` (inheriting from `CharSequence`).
+
+#### [Fix JsonSchema for policy "announcements"](https://github.com/eclipse-ditto/ditto/pull/1675)
+
+The JsonSchema documentation for the "announcement" part of a Policy was wrongly documented / missing.
+
+#### [Fix non-correct WARN log about potentially failing connections status](https://github.com/eclipse-ditto/ditto/pull/1678)
+
+When connections did not contain any `target`, a `WARN` message was logged on every status-check of the
+connection due to a wrong assumption in how the warning message is determined.
+
+#### [Fix MergeThing command being used for creating new things did not respect "inlinePolicy"](https://github.com/eclipse-ditto/ditto/pull/1680)
+
+After the addition of the [functionality to create a thing when it did not yet exist when using a "merge thing" command](https://github.com/eclipse-ditto/ditto/issues/1614)
+which was added to Ditto 3.3.0, using an inline policy `"_policy"` and creating an inline policy as part of creating the
+thing did not yet work.
+
+### Helm Chart
+
+The [Ditto Helm Chart](https://github.com/eclipse-ditto/ditto/tree/master/deployment/helm), which was enhanced and changed 
+a lot for version 3.3.0, contained some configuration bugs which are also addressed with this bugfix release.
+
+#### [Allow connectivity inter cluster communication](https://github.com/eclipse-ditto/ditto/pull/1676)
+
+By default, allow connecting to hostnames local in the Kubernetes cluster where Ditto is deployed.  
+Previously, this was disabled by default.

From 42ea47fe9b8f37636cb81af2b84b12410edb85ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Fri, 7 Jul 2023 09:48:51 +0200
Subject: [PATCH 168/173] update to Ditto 3.3.3 in helm chart
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index 967f51223d1..d3772c78141 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -17,7 +17,7 @@ description: |
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
 version: 3.3.3  # chart version is effectively set by release-job
-appVersion: 3.3.2
+appVersion: 3.3.3
 keywords:
   - iot-chart
   - digital-twin

From 3e8a74e9f6d13f60080365f2b2e3849198832441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Fri, 7 Jul 2023 13:58:18 +0200
Subject: [PATCH 169/173] fix that CreationRestrictionPreEnforcer did not work
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* reason was that wrong config was loaded - and e.g. system properties overwrites were not applied
* also cleaned up and improved documentation of that feature

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 .../ditto/base/model/common/LikeHelper.java   |  5 +++-
 .../pages/ditto/installation-operating.md     | 28 ++++++++++++-------
 .../main/resources/ditto-entity-creation.conf | 15 +++++++++-
 .../DefaultCreationRestrictionConfig.java     | 20 +++++++------
 .../config/DefaultEntityCreationConfig.java   |  2 +-
 .../pre/CreationRestrictionPreEnforcer.java   |  4 ++-
 .../resources/entity-creation/default.conf    |  2 +-
 .../entity-creation/restricted1.conf          |  2 +-
 8 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/common/LikeHelper.java b/base/model/src/main/java/org/eclipse/ditto/base/model/common/LikeHelper.java
index 75a3d9bd566..e25db8a962b 100644
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/common/LikeHelper.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/common/LikeHelper.java
@@ -14,6 +14,8 @@
 
 import java.util.regex.Pattern;
 
+import javax.annotation.Nullable;
+
 /**
  * A helper to create "like" patterns.
  *
@@ -40,7 +42,8 @@ private LikeHelper() {
      * @param expression The wildcard expression to convert.
      * @return The regular expression, which can be compiled with {@link Pattern#compile(String)}.
      */
-    public static String convertToRegexSyntax(final String expression) {
+    @Nullable
+    public static String convertToRegexSyntax(@Nullable final String expression) {
         if (expression == null) {
             return null;
         }
diff --git a/documentation/src/main/resources/pages/ditto/installation-operating.md b/documentation/src/main/resources/pages/ditto/installation-operating.md
index e12756f5d16..aeba2c62a80 100644
--- a/documentation/src/main/resources/pages/ditto/installation-operating.md
+++ b/documentation/src/main/resources/pages/ditto/installation-operating.md
@@ -260,16 +260,24 @@ The basic schema is:
 ```
 # restrict entity creation
 ditto.entity-creation {
-   grant = [
-      {
-         resource-types = [],
-         namespace = []
-         auth-subjects = []
-      }
-   ]
-   revoke = [
-      # same as "grant", but rejecting requests which already passed "grant"
-   ]
+   # this default entry allows every authenticated "auth-subject" to create any "resource-type" in any "namespace":
+  grant = [
+    {
+      resource-types = [
+//        "policy"
+//        "thing"
+      ]
+      namespaces = [
+//        "org.eclipse.ditto*"
+      ]
+      auth-subjects = [
+//        "pre:ditto-*"
+      ]
+    }
+  ]
+  revoke = [
+    # same as "grant", but rejecting requests which already passed "grant"
+  ]
 }
 ```
 
diff --git a/internal/utils/config/src/main/resources/ditto-entity-creation.conf b/internal/utils/config/src/main/resources/ditto-entity-creation.conf
index 9f9286739cb..2cd95bef807 100644
--- a/internal/utils/config/src/main/resources/ditto-entity-creation.conf
+++ b/internal/utils/config/src/main/resources/ditto-entity-creation.conf
@@ -2,7 +2,20 @@
 ditto.entity-creation {
 
   # this default entry allows every authenticated "auth-subject" to create any "resource-type" in any "namespace":
-  grant = [{}]
+  grant = [
+    {
+      resource-types = [
+//        "policy"
+//        "thing"
+      ]
+      namespaces = [
+//        "org.eclipse.ditto*"
+      ]
+      auth-subjects = [
+//        "pre:ditto-*"
+      ]
+    }
+  ]
   # same as "grant", but rejecting requests which already passed "grant"
   revoke = []
 }
diff --git a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/config/DefaultCreationRestrictionConfig.java b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/config/DefaultCreationRestrictionConfig.java
index 2714d017ce9..0ba36ad9f82 100644
--- a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/config/DefaultCreationRestrictionConfig.java
+++ b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/config/DefaultCreationRestrictionConfig.java
@@ -30,23 +30,27 @@
 @Immutable
 public final class DefaultCreationRestrictionConfig implements CreationRestrictionConfig {
 
-    private static final String RESOURCE_TYPES_CONFIG_PATH = "resource-types";
-    private static final String NAMESPACES_CONFIG_PATH = "namespaces";
-    private static final String AUTH_SUBJECTS_CONFIG_PATH = "auth-subjects";
-
     private final Set<String> resourceTypes;
     private final List<Pattern> namespacePatterns;
     private final List<Pattern> authSubjectPatterns;
 
     private DefaultCreationRestrictionConfig(final ConfigWithFallback configWithFallback) {
-        this.resourceTypes = Set.copyOf(configWithFallback.getStringList(RESOURCE_TYPES_CONFIG_PATH));
-        this.namespacePatterns = compile(List.copyOf(configWithFallback.getStringList(NAMESPACES_CONFIG_PATH)));
-        this.authSubjectPatterns = compile(List.copyOf(configWithFallback.getStringList(AUTH_SUBJECTS_CONFIG_PATH)));
+        this.resourceTypes = Set.copyOf(configWithFallback.getStringList(
+                CreationRestrictionConfigValues.RESOURCE_TYPES.getConfigPath()
+        ));
+        this.namespacePatterns = compile(List.copyOf(configWithFallback.getStringList(
+                CreationRestrictionConfigValues.NAMESPACES.getConfigPath())
+        ));
+        this.authSubjectPatterns = compile(List.copyOf(configWithFallback.getStringList(
+                CreationRestrictionConfigValues.AUTH_SUBJECTS.getConfigPath())
+        ));
     }
 
     private static List<Pattern> compile(final List<String> patterns) {
         return patterns.stream()
-                .map(expression -> Pattern.compile(LikeHelper.convertToRegexSyntax(expression)))
+                .map(LikeHelper::convertToRegexSyntax)
+                .filter(Objects::nonNull)
+                .map(Pattern::compile)
                 .toList();
     }
 
diff --git a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/config/DefaultEntityCreationConfig.java b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/config/DefaultEntityCreationConfig.java
index 2dcc2050f8a..64d9a652dca 100644
--- a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/config/DefaultEntityCreationConfig.java
+++ b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/config/DefaultEntityCreationConfig.java
@@ -28,7 +28,7 @@
 @Immutable
 public final class DefaultEntityCreationConfig implements EntityCreationConfig {
 
-    private static final String CONFIG_PATH = "entity-creation";
+    private static final String CONFIG_PATH = "ditto.entity-creation";
 
     private final List<CreationRestrictionConfig> grant;
     private final List<CreationRestrictionConfig> revoke;
diff --git a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/pre/CreationRestrictionPreEnforcer.java b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/pre/CreationRestrictionPreEnforcer.java
index 67276ee1dd0..ad6e0c3b6cb 100644
--- a/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/pre/CreationRestrictionPreEnforcer.java
+++ b/policies/enforcement/src/main/java/org/eclipse/ditto/policies/enforcement/pre/CreationRestrictionPreEnforcer.java
@@ -55,7 +55,9 @@ public final class CreationRestrictionPreEnforcer implements PreEnforcer {
      */
     @SuppressWarnings("unused")
     public CreationRestrictionPreEnforcer(final ActorSystem actorSystem, final Config config) {
-        this.config = DefaultEntityCreationConfig.of(config);
+        // explicitly use the ActorSystem config instead of the PreEnforcer config - as the config is loaded from
+        // file "ditto-entity-creation.conf" and extending with system properties of that file should not be broken
+        this.config = DefaultEntityCreationConfig.of(actorSystem.settings().config());
     }
 
     boolean canCreate(final Context context) {
diff --git a/policies/enforcement/src/test/resources/entity-creation/default.conf b/policies/enforcement/src/test/resources/entity-creation/default.conf
index 09e77540432..b5a6255acf2 100644
--- a/policies/enforcement/src/test/resources/entity-creation/default.conf
+++ b/policies/enforcement/src/test/resources/entity-creation/default.conf
@@ -1,4 +1,4 @@
-entity-creation {
+ditto.entity-creation {
     grant = [{}]
     revoke = []
 }
diff --git a/policies/enforcement/src/test/resources/entity-creation/restricted1.conf b/policies/enforcement/src/test/resources/entity-creation/restricted1.conf
index 49cff709b50..ff04466da27 100644
--- a/policies/enforcement/src/test/resources/entity-creation/restricted1.conf
+++ b/policies/enforcement/src/test/resources/entity-creation/restricted1.conf
@@ -1,4 +1,4 @@
-entity-creation {
+ditto.entity-creation {
     grant = [
         {
             resource-types = ["policy"]

From 87c9f67576a752211ee275f29bcc66d4b80a2fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 10 Jul 2023 14:06:41 +0200
Subject: [PATCH 170/173] Helm chart: add support for entity creation via Helm
 configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/Chart.yaml              |  2 +-
 deployment/helm/ditto/local-values.yaml       | 12 +++++++
 .../ditto/templates/policies-deployment.yaml  | 18 ++++++++++
 .../ditto/templates/things-deployment.yaml    | 18 ++++++++++
 deployment/helm/ditto/values.yaml             | 34 +++++++++++++++++++
 5 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index d3772c78141..44a9aeb513d 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.3.3  # chart version is effectively set by release-job
+version: 3.3.4  # chart version is effectively set by release-job
 appVersion: 3.3.3
 keywords:
   - iot-chart
diff --git a/deployment/helm/ditto/local-values.yaml b/deployment/helm/ditto/local-values.yaml
index 9523f26b631..faeb79351f3 100644
--- a/deployment/helm/ditto/local-values.yaml
+++ b/deployment/helm/ditto/local-values.yaml
@@ -40,6 +40,12 @@ policies:
         - "ditto-originator"
         - "ditto-origin"
         - "correlation-id"
+    entityCreation:
+      grants:
+        - namespaces:
+          - "org.eclipse.ditto.room"
+          authSubjects:
+          - "connection:some"
 
 ## ----------------------------------------------------------------------------
 ## things configuration
@@ -58,6 +64,12 @@ things:
           - "ditto-originator"
           - "ditto-origin"
           - "correlation-id"
+    entityCreation:
+      grants:
+        - namespaces:
+          - "org.eclipse.ditto.room"
+          authSubjects:
+          - "connection:some"
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
diff --git a/deployment/helm/ditto/templates/policies-deployment.yaml b/deployment/helm/ditto/templates/policies-deployment.yaml
index 8fc365b063c..ea372d7915e 100644
--- a/deployment/helm/ditto/templates/policies-deployment.yaml
+++ b/deployment/helm/ditto/templates/policies-deployment.yaml
@@ -126,6 +126,24 @@ spec:
                 {{- range $index, $header := .Values.policies.config.persistence.events.historicalHeadersToPersist }}
                 "{{ printf "%s%d=%s" "-Dditto.policies.policy.event.historical-headers-to-persist." $index $header }}"
                 {{- end }}
+                {{- range $grantIdx, $grant := .Values.policies.config.entityCreation.grants }}
+                "{{ printf "%s%d%s=%s" "-Dditto.entity-creation.grant." $grantIdx ".resource-types.0" "policy" }}"
+                {{- range $namespaceIdx, $namespace := $grant.namespaces }}
+                "{{ printf "%s%d%s%d=%s" "-Dditto.entity-creation.grant." $grantIdx ".namespaces." $namespaceIdx $namespace }}"
+                {{- end }}
+                {{- range $subjectIdx, $subject := $grant.authSubjects }}
+                "{{ printf "%s%d%s%d=%s" "-Dditto.entity-creation.grant." $grantIdx ".auth-subjects." $subjectIdx $subject }}"
+                {{- end }}
+                {{- end }}
+                {{- range $revokeIdx, $revoke := .Values.policies.config.entityCreation.revokes }}
+                "{{ printf "%s%d%s=%s" "-Dditto.entity-creation.revoke." $revokeIdx ".resource-types.0" "policy" }}"
+                {{- range $namespaceIdx, $namespace := $revoke.namespaces }}
+                "{{ printf "%s%d%s%d=%s" "-Dditto.entity-creation.revoke." $revokeIdx ".namespaces." $namespaceIdx $namespace }}"
+                {{- end }}
+                {{- range $subjectIdx, $subject := $revoke.authSubjects }}
+                "{{ printf "%s%d%s%d=%s" "-Dditto.entity-creation.revoke." $revokeIdx ".auth-subjects." $subjectIdx $subject }}"
+                {{- end }}
+                {{- end }}
                 {{ join " " .Values.policies.systemProps }}
             - name: MONGO_DB_SSL_ENABLED
               value: "{{ if .Values.dbconfig.policies.ssl }}true{{ else }}false{{ end }}"
diff --git a/deployment/helm/ditto/templates/things-deployment.yaml b/deployment/helm/ditto/templates/things-deployment.yaml
index 50a4284fa32..a5355985557 100644
--- a/deployment/helm/ditto/templates/things-deployment.yaml
+++ b/deployment/helm/ditto/templates/things-deployment.yaml
@@ -126,6 +126,24 @@ spec:
                 {{- range $index, $header := .Values.things.config.persistence.events.historicalHeadersToPersist }}
                 "{{ printf "%s%d=%s" "-Dditto.things.thing.event.historical-headers-to-persist." $index $header }}"
                 {{- end }}
+                {{- range $grantIdx, $grant := .Values.things.config.entityCreation.grants }}
+                "{{ printf "%s%d%s=%s" "-Dditto.entity-creation.grant." $grantIdx ".resource-types.0" "thing" }}"
+                {{- range $namespaceIdx, $namespace := $grant.namespaces }}
+                "{{ printf "%s%d%s%d=%s" "-Dditto.entity-creation.grant." $grantIdx ".namespaces." $namespaceIdx $namespace }}"
+                {{- end }}
+                {{- range $subjectIdx, $subject := $grant.authSubjects }}
+                "{{ printf "%s%d%s%d=%s" "-Dditto.entity-creation.grant." $grantIdx ".auth-subjects." $subjectIdx $subject }}"
+                {{- end }}
+                {{- end }}
+                {{- range $revokeIdx, $revoke := .Values.things.config.entityCreation.revokes }}
+                "{{ printf "%s%d%s=%s" "-Dditto.entity-creation.revoke." $revokeIdx ".resource-types.0" "thing" }}"
+                {{- range $namespaceIdx, $namespace := $revoke.namespaces }}
+                "{{ printf "%s%d%s%d=%s" "-Dditto.entity-creation.revoke." $revokeIdx ".namespaces." $namespaceIdx $namespace }}"
+                {{- end }}
+                {{- range $subjectIdx, $subject := $revoke.authSubjects }}
+                "{{ printf "%s%d%s%d=%s" "-Dditto.entity-creation.revoke." $revokeIdx ".auth-subjects." $subjectIdx $subject }}"
+                {{- end }}
+                {{- end }}
                 '-Dditto.things.wot.to-thing-description.json-template={{ .Values.things.config.wot.tdJsonTemplate | replace "\n" "" | replace "\\\"" "\"" }}'
                 {{ join " " .Values.things.systemProps }}
             - name: MONGO_DB_SSL_ENABLED
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index e8acdd6d4a8..0f8d8e71f81 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -553,6 +553,23 @@ policies:
         interval: 15m
         # threshold configures the threshold after how many changes to a Policy to do a snapshot
         threshold: 5
+    # entityCreation by default, Ditto allows anyone to create a new entity (policy in this case) in any namespace.
+    #  However, this behavior can be customized, and the ability to create new entities can be restricted:
+    entityCreation:
+      # grants contains the list of creation config entries which would allow the creation of entities
+      #  An empty list would *not* allow any entity to be created.
+      #  You must have at least one entry, even if it is without restrictions.
+      grants:
+        -  # namespaces holds the list of namespaces this entry applies to. An empty list would match any.
+          #  Wildcards `*` (Matching any number of any character) and `?` (Matches any single character) are supported in entries of this list.
+          namespaces: []
+           # authSubjects holds list of authentication subjects this entry applies to. An empty list would match any.
+           #  Wildcards `*` (Matching any number of any character) and `?` (Matches any single character) are supported in entries of this list.
+          authSubjects: []
+      # revokes contains the list of creation config entries which would reject the creation of entities
+      revokes: []
+      # - namespaces: []
+      #   authSubjects: []
 
 ## ----------------------------------------------------------------------------
 ## things configuration
@@ -724,6 +741,23 @@ things:
         interval: 15m
         # the threshold after how many changes to a Thing to do a snapshot
         threshold: 50
+    # entityCreation by default, Ditto allows anyone to create a new entity (thing in this case) in any namespace.
+    #  However, this behavior can be customized, and the ability to create new entities can be restricted:
+    entityCreation:
+      # grants contains the list of creation config entries which would allow the creation of entities
+      #  An empty list would *not* allow any entity to be created.
+      #  You must have at least one entry, even if it is without restrictions.
+      grants:
+        -  # namespaces holds the list of namespaces this entry applies to. An empty list would match any.
+          #  Wildcards `*` (Matching any number of any character) and `?` (Matches any single character) are supported in entries of this list.
+          namespaces: []
+          # authSubjects holds list of authentication subjects this entry applies to. An empty list would match any.
+          #  Wildcards `*` (Matching any number of any character) and `?` (Matches any single character) are supported in entries of this list.
+          authSubjects: []
+      # revokes contains the list of creation config entries which would reject the creation of entities
+      revokes: []
+      # - namespaces: []
+      #   authSubjects: []
     # policiesEnforcer contains configuration for Ditto "Policy Enforcers", e.g. regarding caching
     policiesEnforcer:
       # cache holds the configuration of policy enforcer caching

From f3d1d7708cebfa79c671097b8401024cee800098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 10 Jul 2023 17:39:07 +0200
Subject: [PATCH 171/173] adjusted Eclipse Ditto domain to eclipse.dev/ditto
 fix default value of 'jwtOnly' being 'true' in Helm chart
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* changed to `false` as default so that simple setups can use nginx based auth

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 deployment/helm/ditto/Chart.yaml  | 2 +-
 deployment/helm/ditto/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index 44a9aeb513d..752f170fb39 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.3.4  # chart version is effectively set by release-job
+version: 3.3.5  # chart version is effectively set by release-job
 appVersion: 3.3.3
 keywords:
   - iot-chart
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index 0f8d8e71f81..2f6649605e2 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -62,7 +62,7 @@ global:
   # jwtOnly controls whether only OpenID-Connect authentication is supported
   #  if false, both OpenID-Connect and basicAuth via nginx (see above "basicAuthUsers" and "hashedBasicAuthUsers") is used
   #  ref: https://www.eclipse.dev/ditto/installation-operating.html#openid-connect
-  jwtOnly: true
+  jwtOnly: false
   # jvmOptions defines the JVM options applied to all Ditto services running in the JVM, it is put in JAVA_TOOL_OPTIONS
   jvmOptions: >
     -XX:+ExitOnOutOfMemoryError

From 46936c5bcf2501fd41cfe9b898904a0dd6f4c306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 10 Jul 2023 17:58:29 +0200
Subject: [PATCH 172/173] prepare Ditto 3.3.4 release notes

---
 .../_data/sidebars/ditto_sidebar.yml          |  3 ++
 .../pages/ditto/release_notes_334.md          | 49 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 documentation/src/main/resources/pages/ditto/release_notes_334.md

diff --git a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
index bda236c677d..48c7c3de88d 100644
--- a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
+++ b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
@@ -23,6 +23,9 @@ entries:
       - title: Release Notes
         output: web
         folderitems:
+          - title: 3.3.4
+            url: /release_notes_334.html
+            output: web
           - title: 3.3.3
             url: /release_notes_333.html
             output: web
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_334.md b/documentation/src/main/resources/pages/ditto/release_notes_334.md
new file mode 100644
index 00000000000..06bbc65641d
--- /dev/null
+++ b/documentation/src/main/resources/pages/ditto/release_notes_334.md
@@ -0,0 +1,49 @@
+---
+title: Release notes 3.3.4
+tags: [release_notes]
+published: true
+keywords: release notes, announcements, changelog
+summary: "Version 3.3.4 of Eclipse Ditto, released on 11.07.2023"
+permalink: release_notes_334.html
+---
+
+This is a bugfix release, no new features since [3.3.3](release_notes_333.html) were added.
+
+## Changelog
+
+Compared to the latest release [3.3.3](release_notes_333.html), the following changes and bugfixes were added.
+
+### Changes
+
+
+### Bugfixes
+
+This is a complete list of the
+[merged pull requests](https://github.com/eclipse-ditto/ditto/pulls?q=is%3Apr+milestone%3A3.3.4).
+
+#### [Fix that CreationRestrictionPreEnforcer did not work](https://github.com/eclipse-ditto/ditto/pull/1682)
+
+The previously added [restriction configuration of creating new entities](installation-operating.html#restricting-entity-creation)
+did no longer work with Ditto 3.x - as some changes were done in Ditto 3.x regarding extension loading.
+
+This is now fixed and creating new entities can be configured again.
+
+
+### Helm Chart
+
+The [Ditto Helm Chart](https://github.com/eclipse-ditto/ditto/tree/master/deployment/helm), which was enhanced and changed 
+a lot for version 3.3.0, contained some configuration bugs which are also addressed with this bugfix release.
+
+#### [Add support for entity creation via Helm configuration](https://github.com/eclipse-ditto/ditto/pull/1684)
+
+In order to make use of the [restriction for creating new entities](installation-operating.html#restricting-entity-creation), 
+the Helm chart was enhanced with configuration options for creating policies and things.
+
+#### [Fix default value of 'jwtOnly' being 'true' in Helm chart ](https://github.com/eclipse-ditto/ditto/pull/1686)
+
+Former versions of the Helm chart configured by default `jwtOnly: false` which meant that it was possible to authenticate 
+users at Ditto's HTTP or WebSocket API via the nginx `.htpasswd` file approach.
+
+The new Helm chart changed the default to `jwtOnly: true` which broke this very simple approach of authenticating users.
+
+So the default was changed back to allow nginx authentication.

From 3a0419a346b563fbba34e6f50eec25f0664c8b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Mon, 10 Jul 2023 19:54:04 +0200
Subject: [PATCH 173/173] prepare Helm chart for 3.3.4 release

---
 deployment/helm/ditto/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index 752f170fb39..69ec7769588 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,8 +16,8 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.3.5  # chart version is effectively set by release-job
-appVersion: 3.3.3
+version: 3.3.4  # chart version is effectively set by release-job
+appVersion: 3.3.4
 keywords:
   - iot-chart
   - digital-twin