diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
index 6d8889f98d..f5d093f424 100644
--- a/.github/ISSUE_TEMPLATE/---bug-report.md
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -3,7 +3,7 @@ name: "\U0001F41E Bug report"
 about: Create a report to help us improve
 title: "Your title here"
 labels: ['bug', 'unconfirmed']
-assignees: AndriichnekoDm
+assignees: Ultrazombie
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index c73f810cd8..1168adaf15 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -3,7 +3,7 @@ name: Feature request
 about: Suggest an idea for this project
 title: "Your title here"
 labels: ['feature']
-assignees: 'AndriichnekoDm'
+assignees: 'Ultrazombie'
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 2f15690f68..dea6318ac5 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -3,7 +3,7 @@ name: Question
 about: Describe your questions in detail
 title: "Your title here"
 labels: ['question']
-assignees: 'AndriichnekoDm'
+assignees: 'Ultrazombie'
 
 ---
 
diff --git a/application/pom.xml b/application/pom.xml
index adc3f1e801..902b541566 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -262,7 +262,7 @@
             <artifactId>opensmpp-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springdoc</groupId>
+            <groupId>org.thingsboard</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
         </dependency>
         <dependency>
diff --git a/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json b/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json
index 83a96c6fe6..99ff00e602 100644
--- a/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json
+++ b/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json
@@ -13,6 +13,7 @@
           "datasources": [
             {
               "type": "entity",
+              "entityAliasId": "140f23dd-e3a0-ed98-6189-03c49d2d8018",
               "dataKeys": [
                 {
                   "name": "ruleEngineException",
@@ -51,7 +52,59 @@
                   "_hash": 0.7255162989552142
                 }
               ],
-              "entityAliasId": "140f23dd-e3a0-ed98-6189-03c49d2d8018"
+              "alarmFilterConfig": {
+                "statusList": [
+                  "ACTIVE"
+                ]
+              },
+              "latestDataKeys": [
+                {
+                  "name": "queueName",
+                  "type": "entityField",
+                  "label": "Queue name",
+                  "color": "#ffc107",
+                  "settings": {
+                    "show": false,
+                    "order": null,
+                    "useCellStyleFunction": false,
+                    "cellStyleFunction": "",
+                    "useCellContentFunction": false,
+                    "cellContentFunction": "",
+                    "defaultColumnVisibility": "visible",
+                    "columnSelectionToDisplay": "enabled"
+                  },
+                  "_hash": 0.8104572478982748,
+                  "aggregationType": null,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                },
+                {
+                  "name": "serviceId",
+                  "type": "entityField",
+                  "label": "Service Id",
+                  "color": "#607d8b",
+                  "settings": {
+                    "show": false,
+                    "order": null,
+                    "useCellStyleFunction": false,
+                    "cellStyleFunction": "",
+                    "useCellContentFunction": false,
+                    "cellContentFunction": "",
+                    "defaultColumnVisibility": "visible",
+                    "columnSelectionToDisplay": "enabled"
+                  },
+                  "_hash": 0.38329217099945034,
+                  "aggregationType": null,
+                  "units": null,
+                  "decimals": null,
+                  "funcBody": null,
+                  "usePostProcessing": null,
+                  "postFuncBody": null
+                }
+              ]
             }
           ],
           "timewindow": {
@@ -71,7 +124,9 @@
           "settings": {
             "showTimestamp": true,
             "displayPagination": true,
-            "defaultPageSize": 10
+            "defaultPageSize": 10,
+            "enableSearch": true,
+            "enableSelectColumnDisplay": true
           },
           "title": "Exceptions",
           "dropShadow": true,
@@ -89,7 +144,10 @@
           "iconColor": "rgba(0, 0, 0, 0.87)",
           "iconSize": "24px",
           "titleTooltip": "",
-          "displayTimewindow": true
+          "displayTimewindow": true,
+          "configMode": "basic",
+          "titleFont": null,
+          "titleColor": null
         },
         "id": "5eb79712-5c24-3060-7e4f-6af36b8f842d",
         "typeFullFqn": "system.cards.timeseries_table"
@@ -329,7 +387,25 @@
                 "statusList": [
                   "ACTIVE"
                 ]
-              }
+              },
+              "latestDataKeys": [
+                {
+                  "name": "queueName",
+                  "type": "entityField",
+                  "label": "Queue name",
+                  "color": "#ffc107",
+                  "settings": {},
+                  "_hash": 0.8012481564934415
+                },
+                {
+                  "name": "serviceId",
+                  "type": "entityField",
+                  "label": "Service Id",
+                  "color": "#607d8b",
+                  "settings": {},
+                  "_hash": 0.0724871638610094
+                }
+              ]
             }
           ],
           "timewindow": {
@@ -724,7 +800,25 @@
                 "statusList": [
                   "ACTIVE"
                 ]
-              }
+              },
+              "latestDataKeys": [
+                {
+                  "name": "queueName",
+                  "type": "entityField",
+                  "label": "Queue name",
+                  "color": "#f44336",
+                  "settings": {},
+                  "_hash": 0.7242351292118758
+                },
+                {
+                  "name": "serviceId",
+                  "type": "entityField",
+                  "label": "Service Id",
+                  "color": "#ffc107",
+                  "settings": {},
+                  "_hash": 0.3347262075244206
+                }
+              ]
             }
           ],
           "timewindow": {
@@ -1004,12 +1098,9 @@
         "id": "140f23dd-e3a0-ed98-6189-03c49d2d8018",
         "alias": "TbServiceQueues",
         "filter": {
-          "type": "assetType",
+          "type": "entityType",
           "resolveMultiple": true,
-          "assetNameFilter": "",
-          "assetTypes": [
-            "TbServiceQueue"
-          ]
+          "entityType": "QUEUE_STATS"
         }
       }
     },
diff --git a/application/src/main/data/json/system/widget_bundles/charts.json b/application/src/main/data/json/system/widget_bundles/charts.json
index 979b241e67..b7b1d643e3 100644
--- a/application/src/main/data/json/system/widget_bundles/charts.json
+++ b/application/src/main/data/json/system/widget_bundles/charts.json
@@ -12,13 +12,15 @@
     "line_chart",
     "bar_chart",
     "point_chart",
+    "state_chart",
+    "bar_chart_with_labels",
+    "range_chart",
     "charts.basic_timeseries",
     "charts.state_chart",
-    "range_chart",
-    "bar_chart_with_labels",
     "charts.timeseries_bars_flot",
     "cards.aggregated_value_card",
     "charts.bars",
+    "pie",
     "charts.pie",
     "charts.pie_chart_js",
     "doughnut",
diff --git a/application/src/main/data/json/system/widget_bundles/status_indicators.json b/application/src/main/data/json/system/widget_bundles/status_indicators.json
index 3c8192493b..135fd69938 100644
--- a/application/src/main/data/json/system/widget_bundles/status_indicators.json
+++ b/application/src/main/data/json/system/widget_bundles/status_indicators.json
@@ -2,15 +2,15 @@
   "widgetsBundle": {
     "alias": "status_indicators",
     "title": "Status indicators",
-    "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAAjVBMVEUAAADu7u7u7u7g4OD///9c35Dw8PCt78fz/ffW9+PHx8dw457r+/Hj4+Pl+u6QkJDZ+OWsrKzM9tzf+er4/vuE56xYWFi6urp0dHTV1dXS9uCZ67qCgoKF56tm4Zeenp7C89VmZmZKSkq48c7A89Wj7cFLS0s9PT08PDyF56zi+euP6bN65aWZ67lZWVkXV4nvAAAABHRSTlMA799f7FlksgAABdJJREFUeNrt3I12mjAYBuBt/YAkJCJgCVQEFLX+7v4vbwHGQEnbeQwOXF7XVjjuvDxiCN04fHv5bvaaHy/fRB7Q8gN6znfheESLCT3HFI4HtGiIhlTREA0ZJSQi5ZJ6iKSlV8i7u4qAAYTiUfwEUzVE3qIeQkKWOku+4zvixEuydZcsVA2Rt6iGxCR1VhCIx9YJiANhylVD5C2qIUu+5StYsZ9sSVxRQXagGiJvUQvhbgSMc+CMRSYnplgKVUPkLb0ffmOmGiJv0fOIhmjIVTREQ54FMquiGiJv6REy8aocFEPkLdPeILM373dQj5CZVweph8wmvojXZCoWD0ghpGl5u2qhCiEIT5Ak04lSCJ3SWTfIPyiDzKazzJKE+kghZPZG90Y3J+9AVUHoJDNkOc6mCiET+iptSdBUFWSCLGnFAt4UQnxkyIM1REM0RENuhXjShvn4ICCbEHM0QgjCksD4IDSRNeTjgzzNYNcQDflHEJNzgDRIwYwD3h+EcAAeugBOyPuBLAMHyNYMiBuznQnAUrMHSBiEwHaRaFlGZYtr3grJv4CA64AbgpOGHLYMII7cVD2kqOCixQldCCIAJ0rTGyHobHezOHQgTkggEJDIiVk/ELeGkKLFYTdCQJ5rSMxDt9wjwGLH7W+PxBUEmHh2G4Tu7W5O/gXEXDkrRt7jFUC5151eIOYqfWdkm+5AJCVuqGKMHBsIY+KLmNW3MsRUCmlaXAIQ1cOcMz2PaIiGaMgzQ6gta7DGBwFEu0Ej/J0drHk3Gzo+SCaf2ccHeZrBriEaoiGfQuizQCZY2jBHU4WQA32VQ6gyCOCZJ/1vhSlVCEFT6YlQktOJMgiaTii6Dp1gtVc+THw0k2SCVV5UQyeSzEApBJA/lYTqC88uoyEaoiHtlu/Qc34IxyNaXn6Yveb7i3A8okVHR+fT6DsM/GX0HQZuylPN7BqiIWU05P+CmBGDCJowAvK4d0DUtsghP93A5GAWq8QXA+KUz0hafC/Xln9CCMw7IEpb5JClG5kBC+LQWa4ix4mLimWcxgHZ8jhO3SAgcfwe7cjWCW6E9N9yoRbvVcBTFjrEIakTFBVxGBGxaO6cpSsSQP24BdJfixyyIksSkNAtK1Z8VVYUa7gDK0JckSV5hy27A6K4RQ5hnAABnsYRi5hYMKPq6jvOouInEyHuFqKIALkR0n+L2VlVXwsnDQ9dFYffr1v0PNJEQzREQzREQzSkjI9F6PghuVEGK4Egf51v5kU21hqjh0JeK4h1N8TPj7ZxmWRv4ZFB8CYx5EmO2WggyGoUUsucjgFC58bX2eOhQySMxLbtpEuhg4ZYSVuw2KwP9fYi7FmLC8+cDhaC7ZZig5HsINB6iZ0NFJK3LprD8FEO56TZKUgtBPlY5E4I2v/ZGRaCz0Iz+89OoUohdjX87oJQW/o2y4OsP2isEIKNKndBascJX5+jFNfLW5aH0YX7XEvQsCC+UWVzMbL3RjunuQdNst9DJRsWBFUfefzFSUoyx9cfRjwsCFgXQxfvO4buQRcVH6/z0MYIeFaO6ve6YUgptPk7GAYHaZInl9ttn2z7krJBUGe4kPbuOG3WtF6NrUV7pwwe4tvNvEg/ngmTTBUEW0WoaghNPj+Raii5Ggj9ve9VQ46SsxQ5xVYBaTa+H8iJwsehxzFAMkPk3NodyMsty8q9Ns0qG4YNgWxxyqEOtezmQDXH7RdZMHBIK/6+cy9FaDIaCNoY3czp6CDUlp+e+CODtB2JnbQW/HFBvKt/g8B5LdvcD0G5JZI9BLKu58XOTGjdD5kbZbxHQFCx1QvaHf42vRfSbONjBvvmnHcnmfOGwsggH2a8ELS2MvoEkPIXFNsbPaSeUPyxQ7J6+hg75GxUWYwdkhtVjmOHHIwq2dghYFVDZPRHLYDDcXH0nmAe6WFmt1qfVvTabC9Kyuf2xYuGDAFvLYKhE7ougtovGv9FNc9zmZOGaIiG3Bl9h4EB3mHgF3NeY+W3xB1xAAAAAElFTkSuQmCC",
+    "image": "tb-image:c3RhdHVzX2luZGljYXRvcnNfc3lzdGVtX2J1bmRsZV9pbWFnZS5wbmc=:IlN0YXR1cyBpbmRpY2F0b3JzIiBzeXN0ZW0gYnVuZGxlIGltYWdl;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAAjVBMVEUAAADu7u7u7u7g4OD///9c35Dw8PCt78fz/ffW9+PHx8dw457r+/Hj4+Pl+u6QkJDZ+OWsrKzM9tzf+er4/vuE56xYWFi6urp0dHTV1dXS9uCZ67qCgoKF56tm4Zeenp7C89VmZmZKSkq48c7A89Wj7cFLS0s9PT08PDyF56zi+euP6bN65aWZ67lZWVkXV4nvAAAABHRSTlMA799f7FlksgAABdJJREFUeNrt3I12mjAYBuBt/YAkJCJgCVQEFLX+7v4vbwHGQEnbeQwOXF7XVjjuvDxiCN04fHv5bvaaHy/fRB7Q8gN6znfheESLCT3HFI4HtGiIhlTREA0ZJSQi5ZJ6iKSlV8i7u4qAAYTiUfwEUzVE3qIeQkKWOku+4zvixEuydZcsVA2Rt6iGxCR1VhCIx9YJiANhylVD5C2qIUu+5StYsZ9sSVxRQXagGiJvUQvhbgSMc+CMRSYnplgKVUPkLb0ffmOmGiJv0fOIhmjIVTREQ54FMquiGiJv6REy8aocFEPkLdPeILM373dQj5CZVweph8wmvojXZCoWD0ghpGl5u2qhCiEIT5Ak04lSCJ3SWTfIPyiDzKazzJKE+kghZPZG90Y3J+9AVUHoJDNkOc6mCiET+iptSdBUFWSCLGnFAt4UQnxkyIM1REM0RENuhXjShvn4ICCbEHM0QgjCksD4IDSRNeTjgzzNYNcQDflHEJNzgDRIwYwD3h+EcAAeugBOyPuBLAMHyNYMiBuznQnAUrMHSBiEwHaRaFlGZYtr3grJv4CA64AbgpOGHLYMII7cVD2kqOCixQldCCIAJ0rTGyHobHezOHQgTkggEJDIiVk/ELeGkKLFYTdCQJ5rSMxDt9wjwGLH7W+PxBUEmHh2G4Tu7W5O/gXEXDkrRt7jFUC5151eIOYqfWdkm+5AJCVuqGKMHBsIY+KLmNW3MsRUCmlaXAIQ1cOcMz2PaIiGaMgzQ6gta7DGBwFEu0Ej/J0drHk3Gzo+SCaf2ccHeZrBriEaoiGfQuizQCZY2jBHU4WQA32VQ6gyCOCZJ/1vhSlVCEFT6YlQktOJMgiaTii6Dp1gtVc+THw0k2SCVV5UQyeSzEApBJA/lYTqC88uoyEaoiHtlu/Qc34IxyNaXn6Yveb7i3A8okVHR+fT6DsM/GX0HQZuylPN7BqiIWU05P+CmBGDCJowAvK4d0DUtsghP93A5GAWq8QXA+KUz0hafC/Xln9CCMw7IEpb5JClG5kBC+LQWa4ix4mLimWcxgHZ8jhO3SAgcfwe7cjWCW6E9N9yoRbvVcBTFjrEIakTFBVxGBGxaO6cpSsSQP24BdJfixyyIksSkNAtK1Z8VVYUa7gDK0JckSV5hy27A6K4RQ5hnAABnsYRi5hYMKPq6jvOouInEyHuFqKIALkR0n+L2VlVXwsnDQ9dFYffr1v0PNJEQzREQzREQzSkjI9F6PghuVEGK4Egf51v5kU21hqjh0JeK4h1N8TPj7ZxmWRv4ZFB8CYx5EmO2WggyGoUUsucjgFC58bX2eOhQySMxLbtpEuhg4ZYSVuw2KwP9fYi7FmLC8+cDhaC7ZZig5HsINB6iZ0NFJK3LprD8FEO56TZKUgtBPlY5E4I2v/ZGRaCz0Iz+89OoUohdjX87oJQW/o2y4OsP2isEIKNKndBascJX5+jFNfLW5aH0YX7XEvQsCC+UWVzMbL3RjunuQdNst9DJRsWBFUfefzFSUoyx9cfRjwsCFgXQxfvO4buQRcVH6/z0MYIeFaO6ve6YUgptPk7GAYHaZInl9ttn2z7krJBUGe4kPbuOG3WtF6NrUV7pwwe4tvNvEg/ngmTTBUEW0WoaghNPj+Raii5Ggj9ve9VQ46SsxQ5xVYBaTa+H8iJwsehxzFAMkPk3NodyMsty8q9Ns0qG4YNgWxxyqEOtezmQDXH7RdZMHBIK/6+cy9FaDIaCNoY3czp6CDUlp+e+CODtB2JnbQW/HFBvKt/g8B5LdvcD0G5JZI9BLKu58XOTGjdD5kbZbxHQFCx1QvaHf42vRfSbONjBvvmnHcnmfOGwsggH2a8ELS2MvoEkPIXFNsbPaSeUPyxQ7J6+hg75GxUWYwdkhtVjmOHHIwq2dghYFVDZPRHLYDDcXH0nmAe6WFmt1qfVvTabC9Kyuf2xYuGDAFvLYKhE7ougtovGv9FNc9zmZOGaIiG3Bl9h4EB3mHgF3NeY+W3xB1xAAAAAElFTkSuQmCC",
     "description": "Contains widgets displaying battery level and signal strength.",
     "order": 9000,
-    "externalId": null,
     "name": "Status indicators"
   },
   "widgetTypeFqns": [
     "battery_level",
     "signal_strength",
-    "progress_bar"
+    "progress_bar",
+    "status_widget"
   ]
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/doughnut.json b/application/src/main/data/json/system/widget_types/doughnut.json
index 8764bbcace..3e505938af 100644
--- a/application/src/main/data/json/system/widget_types/doughnut.json
+++ b/application/src/main/data/json/system/widget_types/doughnut.json
@@ -17,7 +17,7 @@
     "settingsDirective": "tb-doughnut-widget-settings",
     "hasBasicMode": true,
     "basicModeDirective": "tb-doughnut-basic-config",
-    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Wind power\",\"color\":\"#08872B\",\"settings\":{},\"_hash\":0.7227918773301678,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Solar power\",\"color\":\"#FF4D5A\",\"settings\":{},\"_hash\":0.2392660816082064,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"layout\":\"default\",\"autoScale\":true,\"totalValueFont\":{\"family\":\"Roboto\",\"size\":24,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"1\"},\"totalValueColor\":{\"type\":\"constant\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"colorFunction\":\"var temperature = value;\\nif (typeof temperature !== undefined) {\\n  var percent = (temperature + 60)/120 * 100;\\n  return tinycolor.mix('blue', 'red', percent).toHexString();\\n}\\nreturn 'blue';\"},\"showLegend\":true,\"legendPosition\":\"bottom\",\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.38)\",\"legendValueFont\":{\"family\":\"Roboto\",\"size\":14,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"20px\"},\"legendValueColor\":\"rgba(0, 0, 0, 0.87)\",\"showTooltip\":true,\"tooltipValueType\":\"percentage\",\"tooltipValueDecimals\":0,\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":13,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}}},\"title\":\"Doughnut\",\"dropShadow\":true,\"enableFullscreen\":false,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"units\":null,\"decimals\":0,\"useDashboardTimewindow\":true,\"showLegend\":false,\"widgetStyle\":{},\"actions\":{\"headerButton\":[]},\"configMode\":\"basic\",\"displayTimewindow\":true,\"margin\":\"0px\",\"borderRadius\":\"0px\",\"widgetCss\":\"\",\"pageSize\":1024,\"noDataDisplayMessage\":\"\",\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleIcon\":\"donut_large\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"timewindowStyle\":{\"showIcon\":true,\"iconSize\":\"14px\",\"icon\":\"query_builder\",\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":null,\"weight\":null,\"style\":null,\"lineHeight\":\"1\"},\"color\":null},\"titleColor\":\"rgba(0, 0, 0, 0.87)\"}"
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Wind power\",\"color\":\"#08872B\",\"settings\":{},\"_hash\":0.7227918773301678,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Solar power\",\"color\":\"#FF4D5A\",\"settings\":{},\"_hash\":0.2392660816082064,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{},\"title\":\"Doughnut\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"units\":null,\"decimals\":0,\"useDashboardTimewindow\":true,\"showLegend\":false,\"widgetStyle\":{},\"actions\":{\"headerButton\":[]},\"configMode\":\"basic\",\"displayTimewindow\":true,\"margin\":\"0px\",\"borderRadius\":\"0px\",\"widgetCss\":\"\",\"pageSize\":1024,\"noDataDisplayMessage\":\"\",\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleIcon\":\"donut_large\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"titleColor\":\"rgba(0, 0, 0, 0.87)\"}"
   },
   "externalId": null,
   "tags": [
diff --git a/application/src/main/data/json/system/widget_types/horizontal_doughnut.json b/application/src/main/data/json/system/widget_types/horizontal_doughnut.json
index f76bf50e48..26b00decb9 100644
--- a/application/src/main/data/json/system/widget_types/horizontal_doughnut.json
+++ b/application/src/main/data/json/system/widget_types/horizontal_doughnut.json
@@ -17,7 +17,7 @@
     "settingsDirective": "tb-doughnut-widget-settings",
     "hasBasicMode": true,
     "basicModeDirective": "tb-doughnut-basic-config",
-    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Wind power\",\"color\":\"#08872B\",\"settings\":{},\"_hash\":0.7227918773301678,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Solar power\",\"color\":\"#FF4D5A\",\"settings\":{},\"_hash\":0.2392660816082064,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"layout\":\"default\",\"autoScale\":true,\"totalValueFont\":{\"family\":\"Roboto\",\"size\":24,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"1\"},\"totalValueColor\":{\"type\":\"constant\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"colorFunction\":\"var temperature = value;\\nif (typeof temperature !== undefined) {\\n  var percent = (temperature + 60)/120 * 100;\\n  return tinycolor.mix('blue', 'red', percent).toHexString();\\n}\\nreturn 'blue';\"},\"showLegend\":true,\"legendPosition\":\"right\",\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.38)\",\"legendValueFont\":{\"family\":\"Roboto\",\"size\":14,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"20px\"},\"legendValueColor\":\"rgba(0, 0, 0, 0.87)\",\"showTooltip\":true,\"tooltipValueType\":\"percentage\",\"tooltipValueDecimals\":0,\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":13,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}}},\"title\":\"Doughnut\",\"dropShadow\":true,\"enableFullscreen\":false,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"units\":null,\"decimals\":0,\"useDashboardTimewindow\":true,\"showLegend\":false,\"widgetStyle\":{},\"actions\":{\"headerButton\":[]},\"configMode\":\"basic\",\"displayTimewindow\":true,\"margin\":\"0px\",\"borderRadius\":\"0px\",\"widgetCss\":\"\",\"pageSize\":1024,\"noDataDisplayMessage\":\"\",\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleIcon\":\"donut_large\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"timewindowStyle\":{\"showIcon\":true,\"iconSize\":\"14px\",\"icon\":\"query_builder\",\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":null,\"weight\":null,\"style\":null,\"lineHeight\":\"1\"},\"color\":null},\"titleColor\":\"rgba(0, 0, 0, 0.87)\"}"
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Wind power\",\"color\":\"#08872B\",\"settings\":{},\"_hash\":0.7227918773301678,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Solar power\",\"color\":\"#FF4D5A\",\"settings\":{},\"_hash\":0.2392660816082064,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{},\"title\":\"Doughnut\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"units\":null,\"decimals\":0,\"useDashboardTimewindow\":true,\"showLegend\":false,\"widgetStyle\":{},\"actions\":{\"headerButton\":[]},\"configMode\":\"basic\",\"displayTimewindow\":true,\"margin\":\"0px\",\"borderRadius\":\"0px\",\"widgetCss\":\"\",\"pageSize\":1024,\"noDataDisplayMessage\":\"\",\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleIcon\":\"donut_large\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"titleColor\":\"rgba(0, 0, 0, 0.87)\"}"
   },
   "externalId": null,
   "tags": [
diff --git a/application/src/main/data/json/system/widget_types/pie.json b/application/src/main/data/json/system/widget_types/pie.json
new file mode 100644
index 0000000000..4d54a874b5
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/pie.json
@@ -0,0 +1,26 @@
+{
+  "fqn": "pie",
+  "name": "Pie",
+  "deprecated": false,
+  "image": "tb-image:cGllX2NoYXJ0LnN2Zw==:IlBpZSIgc3lzdGVtIHdpZGdldCBpbWFnZQ==;data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAxIiBoZWlnaHQ9IjE2MCIgdmlld0JveD0iMCAwIDIwMSAxNjAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxnIGZpbHRlcj0idXJsKCNmaWx0ZXIwX2RfNDUzOF8zNTMwNikiPgo8cmVjdCB3aWR0aD0iMjAwIiBoZWlnaHQ9IjE2MCIgcng9IjIuMzg4MDYiIGZpbGw9IndoaXRlIiBzaGFwZS1yZW5kZXJpbmc9ImNyaXNwRWRnZXMiLz4KPHBhdGggZD0iTTE0OC45NzUgMTI5LjQ5N0MxNTYuNzc0IDEyMS42OTggMTYyLjYyIDExMi4xNjYgMTY2LjAzNiAxMDEuNjc4TDk5LjQ3NzUgODBMMTQ4Ljk3NSAxMjkuNDk3WiIgZmlsbD0iI0ZGREUzMCIgc3Ryb2tlPSJ3aGl0ZSIvPgo8cGF0aCBkPSJNOTkuNDc3NSAxMEM4Ny45NjYgMTAgNzYuNjMyMSAxMi44MzkgNjYuNDc5OCAxOC4yNjU1QzU2LjMyNzUgMjMuNjkyIDQ3LjY3MDIgMzEuNTM4NiA0MS4yNzQ3IDQxLjExMDFDMzQuODc5MiA1MC42ODE2IDMwLjk0MjkgNjEuNjgyNyAyOS44MTQ2IDczLjEzODhDMjguNjg2MyA4NC41OTQ5IDMwLjQwMDcgOTYuMTUyNSAzNC44MDYgMTA2Ljc4OEMzOS4yMTEzIDExNy40MjMgNDYuMTcxNCAxMjYuODA4IDU1LjA3IDEzNC4xMTFDNjMuOTY4NiAxNDEuNDE0IDc0LjUzMDggMTQ2LjQwOSA4NS44MjEyIDE0OC42NTVDOTcuMTExNiAxNTAuOTAxIDEwOC43ODIgMTUwLjMyNyAxMTkuNzk3IDE0Ni45ODZDMTMwLjgxMyAxNDMuNjQ0IDE0MC44MzUgMTM3LjYzNyAxNDguOTc1IDEyOS40OTdMOTkuNDc3NSA4MFYxMFoiIGZpbGw9IiMwODg3MkIiIHN0cm9rZT0id2hpdGUiLz4KPGcgZmlsdGVyPSJ1cmwoI2ZpbHRlcjFfZF80NTM4XzM1MzA2KSI+CjxwYXRoIGQ9Ik0xNjcuNTYyIDEwMi4wNTdDMTcxLjAxNCA5MS4yNTc1IDE3MS44ODIgNzkuNzg5OCAxNzAuMDk2IDY4LjU4ODVDMTY4LjMxMSA1Ny4zODcxIDE2My45MjIgNDYuNzY5MiAxNTcuMjg4IDM3LjYwMDJDMTUwLjY1MyAyOC40MzEyIDE0MS45NjEgMjAuOTcwNiAxMzEuOTIgMTUuODI2NkMxMjEuODc5IDEwLjY4MjYgMTEwLjc3MiA4LjAwMDc4IDk5LjUwNjQgNy45OTk3Nkw5OS41IDc5Ljk5OThMMTY3LjU2MiAxMDIuMDU3WiIgZmlsbD0iI0ZGNEQ1QSIvPgo8cGF0aCBkPSJNMTY3LjU2MiAxMDIuMDU3QzE3MS4wMTQgOTEuMjU3NSAxNzEuODgyIDc5Ljc4OTggMTcwLjA5NiA2OC41ODg1QzE2OC4zMTEgNTcuMzg3MSAxNjMuOTIyIDQ2Ljc2OTIgMTU3LjI4OCAzNy42MDAyQzE1MC42NTMgMjguNDMxMiAxNDEuOTYxIDIwLjk3MDYgMTMxLjkyIDE1LjgyNjZDMTIxLjg3OSAxMC42ODI2IDExMC43NzIgOC4wMDA3OCA5OS41MDY0IDcuOTk5NzZMOTkuNSA3OS45OTk4TDE2Ny41NjIgMTAyLjA1N1oiIHN0cm9rZT0id2hpdGUiLz4KPC9nPgo8L2c+CjxkZWZzPgo8ZmlsdGVyIGlkPSJmaWx0ZXIwX2RfNDUzOF8zNTMwNiIgeD0iLTcuMTY0MTgiIHk9Ii00Ljc3NjEyIiB3aWR0aD0iMjE0LjMyOCIgaGVpZ2h0PSIxNzQuMzI4IiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIGNvbG9yLWludGVycG9sYXRpb24tZmlsdGVycz0ic1JHQiI+CjxmZUZsb29kIGZsb29kLW9wYWNpdHk9IjAiIHJlc3VsdD0iQmFja2dyb3VuZEltYWdlRml4Ii8+CjxmZUNvbG9yTWF0cml4IGluPSJTb3VyY2VBbHBoYSIgdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDEyNyAwIiByZXN1bHQ9ImhhcmRBbHBoYSIvPgo8ZmVPZmZzZXQgZHk9IjIuMzg4MDYiLz4KPGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iMy41ODIwOSIvPgo8ZmVDb21wb3NpdGUgaW4yPSJoYXJkQWxwaGEiIG9wZXJhdG9yPSJvdXQiLz4KPGZlQ29sb3JNYXRyaXggdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAuMDYgMCIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluMj0iQmFja2dyb3VuZEltYWdlRml4IiByZXN1bHQ9ImVmZmVjdDFfZHJvcFNoYWRvd180NTM4XzM1MzA2Ii8+CjxmZUJsZW5kIG1vZGU9Im5vcm1hbCIgaW49IlNvdXJjZUdyYXBoaWMiIGluMj0iZWZmZWN0MV9kcm9wU2hhZG93XzQ1MzhfMzUzMDYiIHJlc3VsdD0ic2hhcGUiLz4KPC9maWx0ZXI+CjxmaWx0ZXIgaWQ9ImZpbHRlcjFfZF80NTM4XzM1MzA2IiB4PSI4NyIgeT0iLTQuNTAwMjQiIHdpZHRoPSI5Ni41IiBoZWlnaHQ9IjExOS4xODciIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj4KPGZlRmxvb2QgZmxvb2Qtb3BhY2l0eT0iMCIgcmVzdWx0PSJCYWNrZ3JvdW5kSW1hZ2VGaXgiLz4KPGZlQ29sb3JNYXRyaXggaW49IlNvdXJjZUFscGhhIiB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMTI3IDAiIHJlc3VsdD0iaGFyZEFscGhhIi8+CjxmZU9mZnNldC8+CjxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249IjYiLz4KPGZlQ29tcG9zaXRlIGluMj0iaGFyZEFscGhhIiBvcGVyYXRvcj0ib3V0Ii8+CjxmZUNvbG9yTWF0cml4IHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwLjI1IDAiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbjI9IkJhY2tncm91bmRJbWFnZUZpeCIgcmVzdWx0PSJlZmZlY3QxX2Ryb3BTaGFkb3dfNDUzOF8zNTMwNiIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluPSJTb3VyY2VHcmFwaGljIiBpbjI9ImVmZmVjdDFfZHJvcFNoYWRvd180NTM4XzM1MzA2IiByZXN1bHQ9InNoYXBlIi8+CjwvZmlsdGVyPgo8L2RlZnM+Cjwvc3ZnPgo=",
+  "description": "Displays the latest values of the attributes or time-series data in a pie chart. Supports numeric values only.",
+  "descriptor": {
+    "type": "latest",
+    "sizeX": 5,
+    "sizeY": 4,
+    "resources": [],
+    "templateHtml": "<tb-pie-chart-widget \n    [ctx]=\"ctx\"\n    [widgetTitlePanel]=\"widgetTitlePanel\">\n</tb-pie-chart-widget>",
+    "templateCss": "",
+    "controllerScript": "self.onInit = function() {\n    self.ctx.$scope.pieChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.pieChartWidget.onDataUpdated();\n};\n\nself.typeParameters = function() {\n    return {\n        previewWidth: '500px',\n        previewHeight: '380px',\n        embedTitlePanel: true,\n        defaultDataKeysFunction: function() {\n            return [{ name: 'windPower', label: 'Wind', type: 'timeseries', color: '#08872B' },\n                    { name: 'solarPower', label: 'Solar', type: 'timeseries', color: '#FF4D5A' },\n                    { name: 'hydroelectricPower', label: 'Hydroelectric', type: 'timeseries', color: '#FFDE30' }];\n        }\n    };\n};\n\nself.onDestroy = function() {\n};\n\nself.actionSources = function() {\n    return {\n        'sliceClick': {\n            name: 'widget-action.pie-slice-click',\n            multiple: false\n        }\n    };\n}\n",
+    "settingsSchema": "",
+    "dataKeySettingsSchema": "",
+    "settingsDirective": "tb-pie-chart-widget-settings",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-pie-chart-basic-config",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Wind\",\"color\":\"#08872B\",\"settings\":{},\"_hash\":0.7227918773301678,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Solar\",\"color\":\"#FF4D5A\",\"settings\":{},\"_hash\":0.2392660816082064,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Hydroelectric\",\"color\":\"#FFDE30\",\"settings\":{},\"_hash\":0.7051898468567794,\"funcBody\":\"if (prevValue === 0) {\\n    prevValue = Math.random() * 200;\\n}\\nvar value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 200) {\\n\\tvalue = 200;\\n}\\nreturn value;\",\"decimals\":0,\"aggregationType\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":null,\"padding\":\"0px\",\"settings\":{},\"title\":\"Pie\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"units\":null,\"decimals\":0,\"useDashboardTimewindow\":true,\"showLegend\":false,\"widgetStyle\":{},\"actions\":{\"headerButton\":[]},\"configMode\":\"basic\",\"displayTimewindow\":true,\"margin\":\"0px\",\"borderRadius\":\"\",\"widgetCss\":\"\",\"pageSize\":1024,\"noDataDisplayMessage\":\"\",\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleIcon\":\"pie_chart\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true}}"
+  },
+  "tags": [
+    "pie chart",
+    "pie"
+  ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/pie___chart_js.json b/application/src/main/data/json/system/widget_types/pie___chart_js.json
index f54c4f9702..fcbc2f2020 100644
--- a/application/src/main/data/json/system/widget_types/pie___chart_js.json
+++ b/application/src/main/data/json/system/widget_types/pie___chart_js.json
@@ -1,8 +1,8 @@
 {
   "fqn": "charts.pie_chart_js",
   "name": "Pie - Chart.js",
-  "deprecated": false,
-  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAZTElEQVR42u2deXwUVbbH/e+tM/Pe5/Oe82beNjo6znvjvFFnRkFxF1f2RREQWQQEEZFNFDUCOjAoCKjsq+xG1hBCWAJkJSEJCQGyJyQkZN+7urq7lvt+1RU61dWd0Emqqm911/2cPzq9pdP1zT3nnnvO795BrGENHcYd1ldgDQss3YYoiDcr+NQkLvqQc/sGx5eL2Q9n2aePt49/lRk1gBn0jNeTk+4kKb8iab8jGX1JzkCS9xYp/YxUriMNsYQtJUSwvs4wBovjhGtXXAf2OZZF2KeNs738hO3Zh7swr9ee/5uuLOFnJP1PJG8iqVxLWtOIwFpghfrgef7yJefWdex7k20v9euapJ6DpbL4f5AmtpKFpPFMWEEW+mCJba3ciShHxAfwaN2CSRuwvCazfyJXhpHq3YRrssAyLU92O3fmBPvJHNuL/XrMk8ZgdUxj/0hyBpPaH0J4DgtBsISyUuemb5khz/aeJ73A8ljSz0nBdNKWaYFFdQjFnY6xz5igIU+6g+WxrKdJbSQRXRZYNA2Xkzt53P7mCD2QMggs2S7cI6UtQsI/mhwsp9MVuZsZ/oJ+SBkKlmwp/00qVhPBboEVlEhKwFqPeX2Q3kgFAaz22esucnMzEXkLLAOjqUvp9kmvG4NU0MCSLeMR0nTeAkv/JEJDvWPZZ7bnHjGSqmCCJdnfkrwJxFVrgaUTUyJ39AAz+FmDkaIALDkx8QtStRXfggWWxhMVu3B2UJCiBSzZsOftvGmBpc1AdkrbbKeJwZKnLqTsLbB6NRwOVLAEFynqwJIN1RMCY4HVI/dXU4WKKBqoohEsacHYh7AlFljdTChcSApWnG4asOStxsaTFlgB79Ac+sHWvw89VNELllQo8fek4jsLrNvnFFw7NlGFFO1gyVY0l7YcPU1guZxsxPxuXW/7lDH2ccP9PsQMec6x8i+OpREd9wx73rlulVRRM3pQqIEFuzaWquIIasByONC/EOBlZka+BESE4kLpdcsi/D6Hi4mSZsD6uvaXDHxKrLop5Ofy2RmoKWVee0W6//m+zIgXQwQsKcs1mJ6tazrAcrDsvBkBUoVnYgdanuE6A4ud+w68qhIs9qNZuEeqTu7fR2xscKxahjudG9YIuVdCByxYdn/C2yywblE1a0rgXol9f6pr/0601rj2bPcP1suPCxU3hMI8L7A+nYceL0xRuC1WVznXfs2MGUxYO/v+2yEFlsTWCzRUdAUbLI7DXNKzgLozsFz7vseUhhyYlysc+bLIMPCPgFJ6dMoYZDTwY+jEWEq7/AoRHGEMlig4Pl/Y45WaX7DsU8aiRhkNgzINHrCkh2ZM4M7EcvFxQNmx+EOxuZEZ2j80wZJi+dHBbZ0NJljONct7kwLwA1b/PgjPxdpqhOq+YHXE/oOeERvq5PIbrAMCyZmZDyxY8QfhCJaUBe1dbskXLOf61e57PsOmNUwui5A2sF941OuFRyL5zIv2qW9g16i9dGLm5BAEC4Zu7LACi8/OtL3wmOZgiS3Nfn8dInelQ8RyAZ0XfGYanxzPDHyaO3Uc81xogoW8fJD2fIIAltjUiOxl77Phfmasb1cg/+kx6XcxNtzoSKI+31coKoDsh0RhVaVzw2rccHy5RLS1hSZYcpmNJFUSHjOWkH8NSQHNwfKlQRVjIQcmlBbLvdHwhnziOUycXPRhoSg/ZMGCpf/Z+Bqb4AXvrN0+a6rBYEl2q+Me+Qg8Kj2npZmdMy2UwYLlTwmrdIPo2rsjmLvL/ftA/koV2ocmWLC6A6EJVp29flHKkjp7ndotFubZXnmKwoqGUAMLxVuOG6EGlkjEiOTFAw4Nee3Y6MTKJB+3yLJzpltgGZGRN6rPxyCwTpSeBFWyDTw0dEvONk7g1W4xco8Flu5WtSN0wGpgG1+NGu0BS7Y55+bXMDVqt1h+3Tb4GQssHS35F8b0vhoB1vKLK1RUyQbaEioS/RRmBVxCY4HVE8sdHwpgZdde9kuVxy1uyN7kElxqt9jrDR8LrK6sOd7cYAmiMP30zC7Akm3W2Tk3bVXq194otw3pb4GlT+vYw3rXPugLVuz1k7elSraRUa+fv+Hzb+RyOT6db4Gli1XvMitYTt45/sRbAYIl28r01Q5eXaEGtb6QAiv+J+TKSHJ9CSmaRzL7eVVQQY/U16CEKwXdvyTF8yVZ79R7NdLfulvXQlMdwYosONAtqmR7N25WRVuF2i1WVtj0l+0zAqzkfydtWV7vVrGm/SHmmr8EIC+JeCf+C2Gvk7YMKTaClDc02WQF+ZT/7NWH0bMhUS+wMPGMOf5mD8CCjYgaFVd+zo9bXLTA9GBV73TDtJok/iu5+EB7KhwnDMhTSOpvOyz7RSmZWX+kvf0Gt3HUCspgnDWkYIa7ju9D6eSLXmpS6tbVoxdYh4uO9owqpVtkefVczSecNTdYrgapGl32brDy5dIb5k/utEYv61npNlwnYm1MUbjNlkntqam/kbpxsp6jthJQF7A4gXszZlIvwYJhRVneWq52DjXV9tcGmBWspH+TJh5VHhyTk9pj/lIqdIH+u2dq4VulJ99YITlHlME0xEg/9j7SQsQmcqYBC46s91TJNuzoyKNFx3zI5RxLFpp+VZj5qDR7MXmSg1M9hNAeAwqRHU/uR2r2kbqDkltEmO+qk3LoFFc96ALW7HPztAJLthXpX7NcMN2i9mAhikc8LjrJpSd8jtz5Z4kbKPdh/ehnzruTOKskfSxok6b8lx8oe3B2gSnAym3I05Yq2aaeeqe0RV1iK9bV2kcPMh9YWOW1pkvxuMSHz6OF70m/pTSik6hoPWk6K6kpO9xBgrOaXHqqt59HhzNXtAdrVcY3eoAlu8WY0hPq38fzjuWLzQRWwk9JU5z0Pshj+W1/gJwaFmsIs/x4z35S7JV2v/QO9cekpWXNHikN0cuPVDiTdrCwjkMOXSewZPviwjKbSy1PwKcl6yqppRlY4EaOacq+6FQ0BgNHB/g9+tCWTa4vdq8NS0nxgvaaY6651zWAd2qed9AYrNNlZ3SlSraJsZPzGvLVbrGh3j52KO1gVax25+TqSPmXHVbykcIrZUguEikuP2V6LxHmqjTh4Ta8IVJcCMKg0Y2Ma++9s9aCuRqD9XFShAFgwYYeGXm0+JivW3SuXEo1WC0X/M3zpbf0PF6UfkQnYBdutN0nPtauy43EWPbzWkggDaEXrFZn6+DDw40BS7YlF/7S6mxT7/9kZdj6Pxr6m9DwqkjWe3KtvY/8+BZKwQq8lkFDm3Bi8rWGXLVbbG3R9rCdEKxu8DXkyegEC004xoMFG3Jk+KHCI6KqTUAQeik6EnZgSQI19IGFKtARR0cFBSzZFqd8AV+sDroyL2riFsMCLGTXtFMx1QysrNrsIFIl2/gTk67WX/Nxi60QzbLACmxtkUIdWNuu7Ag6WDCsHiLzD/hxixvXWGDd3q5/Th1YaOeiASzZFiZ+2sg2qVeL13IC6aYPa7CynqELLFQhDzkygh6wYCgzvFSTpXaLba32qWMtsDpPOvxM2henB6ycuitUUSXboMPD9uTuQ6eQN1yic9sGC6xOTdodpwasAwWHKASrK7eYd7VbAl1hBFblOorA+ip9JbVgwcYeH3+pVu0WCcPY351ogeVzEuIkisAKpCs1uIaW642XN/sqkTgDOxMqjMBCZwclYKHCHblvysGSbUH8wnq2Xu0WC3JtrzxpgdVRv6pFk7QGYKEN0BRUyTY6etzFap/4FLqVs9+2wGo3NALRABauk4nAkt0i0rm86CPQtX+nBZZkDbFUgIW6KHOBJdu88wtq7WqlKKGkyDbg6XAH6+YWKsDakrPdjGDJupUJFT66ldIZd9PDGiy5+SzoYKE3y6RgKVaLnNotHtwfvmDlT6UCLMPKkfWz98/NrWaq1W7xRpnt1gka4QVWziAqwII+jNnBcrvFMUmVyT6boE72o/fDDiz00NIA1qTYqd2v+Rzx+YWlu3P3brq81bdtesaZ9+Cevr+6a1HK5wMPD1VmCjbnbN1+5Xt06eiEF5RIsKGudotHIsMLrIt/oAIsXO9u1h2MK24uUb6DUpoGSt2iKCq3t+W6CbQrQmW5sKkI96CvUBYdQfUVtmu0ZWtm3OzKtptd/cEhD1bKr6gACw3K3bpyp8vi3DAdgWrytNPvymdVQIYUD70RMx7ppRZnyztnZo46Nja9Gk12ZG3Wejz0WfISlO9hHYeahSZH03dZ63Dn1ivb8xsLNJ+33LqVCeELFmqUaQBL6a0CMVSmo0DeswuEgk9yqzH/o8RPiCRWc1Z+CK4QP6KtHrfhOjGTye1lNUwtfOjE2ClovF6QsFA/t+irWykN1O+iWRRVAGhKhpTjleHk0uPkwq87mv5CYVfHhGBhKsLE4/nxVNlpvAmKW3B78slpmJYKGguRBZAnJE/R87iYCXbOjiejRAclVlgxIOOPH3WN6BHt3Wit6MZ3AVVPKC+0JJOGaKlNHgkhibxhkqILRPpk5TRTlPtRAdahoT2+crPOzsXshYsHByffsz9fipTh4HDkDtwibnjEIFD9DGVlrN3gFpelLW92tLwe/Ybeq8W/pn2lYVMU4RolrVGQV/sjqfhWEquF4AzIQ00BIpvzf0dHK+xPTDljKaN4xONITs49/4HnThADKSx4PflUgeiS477d1ZjwcIwKXBWYRljmgVJzmxn3vnpLUdcBHTaokrakkvoo94T3uSRpBJ3IS09KEx48lEEz1k+pAKtn7YSYhwqaCuH4wIdyRQY3h/vBHHhCGyreH1kJ1WtBGw68wJPlzT4UiM6LX6A5VXC+qtTDyjTnq4fsC8461mc6owq5tJt8YaNQw4iMi/DGHKoFVwvVNQiHeFxt0Ryp0bTd1WrUbg89SxrAAgQ9kPRAHyJeixhcef/e3P24c3Xmt55oDD+WtZapTndCTD311HS8Q2pVGpaWUKZEGkJbqoZHvYrFqfLP3HPVddfati7s7rVt/Xbaxh9jP09y7MhxnSrlMqv50mahkRUdHA7pMIQ8HMBku0Iaz0i6WTdWSdLwODkHMjXpD5Hk/whYAv4uKsDC6qy7PQ7ykYV78/arHkISC/fvurZH/nHa6RnEWyIQ01hJc+muXOkJ2ISR979XZ35jczFadmEcGlZp80plxV3n7lnf1jVYgdgTu5jJMezSFMfeq64TJRJ5ZS1ik0N08kaRJwd5IK96d0eQB/IuPugO8txgQdiNBrDkFFTghgwWXoXQGycMeExe+k05NQ0ZBBiYW5+9EXMVnolTnDyv/TgxAndiwsNteMOUmxeQPoUYCTKuGoKFHKzyD7xUzf/vRg2ouq09tLXt9cP2j887NmS6oou41Eq+qFGok1ytaJSrZaRVrS2bCrAikhd167JhBvJ9E0w/8qNIZV1vaa9gRIYdGzuqVadMlbxz3MA2ELd80kcJn2hF1YnrXmVuZS3Cn7fZDKAqEHvQTd4n8Y5v0p2H8rkLlVKQV2cX25wiJxCqhgZgKaNvDSulxsVMDMSrQq9Bw4p7TJzKPw3h0dO7GUqouq3dt77tlf3MO7Hs12nOfddc58v4q3VCRavY6pRcrWg6sLArHALVDVKmI3W5UvSB5cjwg3azUBWI/X5z24DIjiDvXBl/rV7wBHkibWBFl8SEAFWzz81X9kwjlH47hg0lqgKxR7YzWNVevMlTARa2is1O1fiYt1Qpq0UJjnCjymMplXSAZa72L7+p2jaXl5DpxkuusKUKVsuIVICFTQ/PSs10hpRVNVPj5dmLuF+vC1+q/m+zjZYYy9TVydjkVv4h2KX57Ya2cJ6uhh6wUwQW5aIgnVl8RaLyr0BO6MEttnCmCjYvzkERWEeKokxH1Z7cvco/AXvJj+9kwpwq2O6rLorAKm4uNhdVqzLWKD+/nSNwARZVsNx6gSKwkAFC+5RZqPowYaGyXwPbcJOPsxZSsPs32bTalNRM3BZVnaagasqp6aq+Z9RXWUjJNuaoZmeAaQYWKhTop2pU9FgUzis/9pp0p8WTx1amOqkDCwfa0J6yOjKs3l0N0bHmKODutnhSWEY1Tx1Y8C/BPfLktoYKQeUHTq7gf7PegqnD/rjNpmHVl5aHNOHsU2qpSqvyUvHLbxD+EPYpK5XNPcPSVd3gGWfK4+ikCi38ys9ZZRMf/d6iSm3HizhKwTL+IMxADCXO3h9SfGGflQhVG6ICfDOUgtWDMmW9DU36yto91O++cdRKhPqxt0+w2pKgMVhny8/TQ9XMuFnKdlPwNeeMlQj1b2hWoxosNNiMiKJibYhDmvBhlJ/trylWyqrT9aDmvRgag0WkdtNvgk4V6sMgdaT8VHuvuiyAOrPFiQ7NMdAeLBo2pMtby72Wq2g3XWcB1KmhmccEYGGg4y+IVKGRVflhcmqF322ykgudGhoVKW3/8h3Q7AsWVcdLTig/STlN7aZ0GqZz04CFQ7b005/twjZd3qJqN312j5Wy6srw/eikGaELWMRbr9YY+wJakoqUlYMnIw5aKavb2F6N6kWNAwviad1VU+5du+k8Vbvp9FgrZXUb67PDxnLEZGBhHCw06DxfSHOr2k2XJBpRu4d+npkn2VUXnRHxjs62iXDxVH36D221QUALSTWIaYVGebvRYDl5FxQ79KYKCmnYo1T+3i1ZRqSssI19vdlrjlQmYCF7NOsUe76cRyHKD7kuZe3vjVYBC1UIxbQ4xL47JLagvGX8CgNiJ7oK1OgIFrmlpK1ru2mVzesMHGxNGJOyinbXAnyb7vyfjW399zKVbZKE1ZO7GJkem0t0/2tJH0kJ1oRjdjyAplB8SMgPQQoLdy5NdmbV8AaDBalLXS+9vmAh7plxRsdeVpXUVnqVce2mQArikZ5ft/2y5FZkHRGA9WMeB4YmRrMqsKbGsJjbZHFACAzBZaPnDLpqow4bus4YGMnorWp0h87vT7LrLutE1dkb57wy/k0CwpdgxSuoR8VneHm/V6Q1LsquAuuR7dJkFpnr2nDJiRkOzz9bxkfmGrrdhGpsTfRkggwWxtLU5Xq3mzbYxaeCoZA2JYZFSAcpUdHtFlWP+oIl97AfLeBiiqUpDSJp+OQG/z98eM5hwEU3AixoskP/WEOqVqSvUr4/2k2HBandFLo0jDucQjLWN8HhFyyl/Abar1HJgynk4e02Y0JDQIyPGiJguaP4WK2o+iBe3W46JdgKaYjZ8+oFBE+DIpnAwdqZ44IDHfCDFPjjaRAPMiCjC+VSY664QWAhJ66J/uzkU9NU7aYLzwWn3fSBLTZMOZ4fITiLD7Mi1RkgWHCImGif2cMk3eBPl3K/32zDJUcaQtfPPP6YnRg17jDsN+EUiV624Y+KHqNqN/0uI2i1e/Bi2DW6/1bdBBpffSnvDCysCiH+CQla3MY2+V+SpVfNj3Og6ly/D/ynbbZaRgxBsDBwvlLv2k3rle92tDCY7aabsqT8QkYVj1wUwnZMPwi2VM0/nYE19qi9oEG4b0P7cjK2hEMvA3SOURel30rwdCln5LU2FCyMrzN6qN1d1FysfB/oZN4XVIW0e9e34UQdOXKXCKvmh/xoDzx493z4wT8y1bb28H/0Eb1irIh4h8EX2miwcAxOD+T/cAKF8k0QKSvjmyAaRCX7fm/rZSHhPe43uVe3tuyX9jMsR0IcLCJJnNV065zBHwsOKl+O/+/HrHbT7uQXcLiG8Vc5CGARt4J3gIcM4uxn5QtxtsdL+63avW60oaZW8kG5xMEBCyOqOPq2VH2c9Jmq3RRRi4ULJYUxlIKFseHypi6owgH3vGC1m/bcliQ5gnhxgwkWah+WpX3pv900+k3UoCqf/FWq1W7aDZt9mhVEEqZgub0bF5G82F+7abPyacjxWKx0S4iBD/Ypc0EGS05ALEhYqATLc16hPFBYco+lkNYdHVEHH/SrSgFYMlsfJ0XIVGXWZCkfstpNu0uVJ2drgSUNdENAAulYSbTyTpSHo57EwiVAe+s4S8NcRRdYUrwleqWHcTojasktXAI/qoQX6bmYNIHl7RzJq4eslFWghn4ykbIrSClYM09ZKatA98KDmAU1H1iJN/g/WmIeAZRYBWvHxqxgYdxsE30LUSzzmKem2QKrB0tFIrd0Wqaq2sPXYudovnR0gyWPY0VcEBsGKXR/BteChixYGPV2EdsUFlUo7pDLTS2wtBzoY3kgXM8pwVIGDdOieS6WmcAi7gN257o7PMMHKVQ/o3e5ySGa60qZDCx5QJslTE7axdIvs5o34zUyJVjEXfd3II/rG7rF75CiOFzACaJJr49pwZKHSyAH8zlZlSpkDP8t2y67nLypr4zJwfLgBakqCE2FwCy1I8fl4EPgmoQEWPJAqwVU9tDzacbQHh8bWoTmdXyhDJZnFDUJixIcpjhA9cEtNuTQc+uF0LsKIQiWPND7C3GzGbEsdGZp4wmypZBcO1nCuYRQ/fpDFyzPQKkuNoWgihb05CqSnJBSxlpP27NMLbCCPFBgmV0jrM1wojDcMA1cFOyjYhEiR/jVghg+X3Y4gaUcWMxfrhWwloSiFYpzNOQMJEGTGLlytKwheOKF8PyCwxUs38kM4tgomkPSFSdNoH58UjSLmQY6ETg/AusACKzBk3oM4sfP72NeO2yHvPYHZx1opoVWEV5ew4jWl2mBZQ0LLGuYbfw/UfikHjIsMFkAAAAASUVORK5CYII=",
+  "deprecated": true,
+  "image": "tb-image:cGllX2Zsb3Rfc3lzdGVtX3dpZGdldF9pbWFnZS5wbmc=:IlBpZSAtIEZsb3QiIHN5c3RlbSB3aWRnZXQgaW1hZ2U=;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAZTElEQVR42u2deXwUVbbH/e+tM/Pe5/Oe82beNjo6znvjvFFnRkFxF1f2RREQWQQEEZFNFDUCOjAoCKjsq+xG1hBCWAJkJSEJCQGyJyQkZN+7urq7lvt+1RU61dWd0Emqqm911/2cPzq9pdP1zT3nnnvO795BrGENHcYd1ldgDQss3YYoiDcr+NQkLvqQc/sGx5eL2Q9n2aePt49/lRk1gBn0jNeTk+4kKb8iab8jGX1JzkCS9xYp/YxUriMNsYQtJUSwvs4wBovjhGtXXAf2OZZF2KeNs738hO3Zh7swr9ee/5uuLOFnJP1PJG8iqVxLWtOIwFpghfrgef7yJefWdex7k20v9euapJ6DpbL4f5AmtpKFpPFMWEEW+mCJba3ciShHxAfwaN2CSRuwvCazfyJXhpHq3YRrssAyLU92O3fmBPvJHNuL/XrMk8ZgdUxj/0hyBpPaH0J4DgtBsISyUuemb5khz/aeJ73A8ljSz0nBdNKWaYFFdQjFnY6xz5igIU+6g+WxrKdJbSQRXRZYNA2Xkzt53P7mCD2QMggs2S7cI6UtQsI/mhwsp9MVuZsZ/oJ+SBkKlmwp/00qVhPBboEVlEhKwFqPeX2Q3kgFAaz22esucnMzEXkLLAOjqUvp9kmvG4NU0MCSLeMR0nTeAkv/JEJDvWPZZ7bnHjGSqmCCJdnfkrwJxFVrgaUTUyJ39AAz+FmDkaIALDkx8QtStRXfggWWxhMVu3B2UJCiBSzZsOftvGmBpc1AdkrbbKeJwZKnLqTsLbB6NRwOVLAEFynqwJIN1RMCY4HVI/dXU4WKKBqoohEsacHYh7AlFljdTChcSApWnG4asOStxsaTFlgB79Ac+sHWvw89VNELllQo8fek4jsLrNvnFFw7NlGFFO1gyVY0l7YcPU1guZxsxPxuXW/7lDH2ccP9PsQMec6x8i+OpREd9wx73rlulVRRM3pQqIEFuzaWquIIasByONC/EOBlZka+BESE4kLpdcsi/D6Hi4mSZsD6uvaXDHxKrLop5Ofy2RmoKWVee0W6//m+zIgXQwQsKcs1mJ6tazrAcrDsvBkBUoVnYgdanuE6A4ud+w68qhIs9qNZuEeqTu7fR2xscKxahjudG9YIuVdCByxYdn/C2yywblE1a0rgXol9f6pr/0601rj2bPcP1suPCxU3hMI8L7A+nYceL0xRuC1WVznXfs2MGUxYO/v+2yEFlsTWCzRUdAUbLI7DXNKzgLozsFz7vseUhhyYlysc+bLIMPCPgFJ6dMoYZDTwY+jEWEq7/AoRHGEMlig4Pl/Y45WaX7DsU8aiRhkNgzINHrCkh2ZM4M7EcvFxQNmx+EOxuZEZ2j80wZJi+dHBbZ0NJljONct7kwLwA1b/PgjPxdpqhOq+YHXE/oOeERvq5PIbrAMCyZmZDyxY8QfhCJaUBe1dbskXLOf61e57PsOmNUwui5A2sF941OuFRyL5zIv2qW9g16i9dGLm5BAEC4Zu7LACi8/OtL3wmOZgiS3Nfn8dInelQ8RyAZ0XfGYanxzPDHyaO3Uc81xogoW8fJD2fIIAltjUiOxl77Phfmasb1cg/+kx6XcxNtzoSKI+31coKoDsh0RhVaVzw2rccHy5RLS1hSZYcpmNJFUSHjOWkH8NSQHNwfKlQRVjIQcmlBbLvdHwhnziOUycXPRhoSg/ZMGCpf/Z+Bqb4AXvrN0+a6rBYEl2q+Me+Qg8Kj2npZmdMy2UwYLlTwmrdIPo2rsjmLvL/ftA/koV2ocmWLC6A6EJVp29flHKkjp7ndotFubZXnmKwoqGUAMLxVuOG6EGlkjEiOTFAw4Nee3Y6MTKJB+3yLJzpltgGZGRN6rPxyCwTpSeBFWyDTw0dEvONk7g1W4xco8Flu5WtSN0wGpgG1+NGu0BS7Y55+bXMDVqt1h+3Tb4GQssHS35F8b0vhoB1vKLK1RUyQbaEioS/RRmBVxCY4HVE8sdHwpgZdde9kuVxy1uyN7kElxqt9jrDR8LrK6sOd7cYAmiMP30zC7Akm3W2Tk3bVXq194otw3pb4GlT+vYw3rXPugLVuz1k7elSraRUa+fv+Hzb+RyOT6db4Gli1XvMitYTt45/sRbAYIl28r01Q5eXaEGtb6QAiv+J+TKSHJ9CSmaRzL7eVVQQY/U16CEKwXdvyTF8yVZ79R7NdLfulvXQlMdwYosONAtqmR7N25WRVuF2i1WVtj0l+0zAqzkfydtWV7vVrGm/SHmmr8EIC+JeCf+C2Gvk7YMKTaClDc02WQF+ZT/7NWH0bMhUS+wMPGMOf5mD8CCjYgaFVd+zo9bXLTA9GBV73TDtJok/iu5+EB7KhwnDMhTSOpvOyz7RSmZWX+kvf0Gt3HUCspgnDWkYIa7ju9D6eSLXmpS6tbVoxdYh4uO9owqpVtkefVczSecNTdYrgapGl32brDy5dIb5k/utEYv61npNlwnYm1MUbjNlkntqam/kbpxsp6jthJQF7A4gXszZlIvwYJhRVneWq52DjXV9tcGmBWspH+TJh5VHhyTk9pj/lIqdIH+u2dq4VulJ99YITlHlME0xEg/9j7SQsQmcqYBC46s91TJNuzoyKNFx3zI5RxLFpp+VZj5qDR7MXmSg1M9hNAeAwqRHU/uR2r2kbqDkltEmO+qk3LoFFc96ALW7HPztAJLthXpX7NcMN2i9mAhikc8LjrJpSd8jtz5Z4kbKPdh/ehnzruTOKskfSxok6b8lx8oe3B2gSnAym3I05Yq2aaeeqe0RV1iK9bV2kcPMh9YWOW1pkvxuMSHz6OF70m/pTSik6hoPWk6K6kpO9xBgrOaXHqqt59HhzNXtAdrVcY3eoAlu8WY0hPq38fzjuWLzQRWwk9JU5z0Pshj+W1/gJwaFmsIs/x4z35S7JV2v/QO9cekpWXNHikN0cuPVDiTdrCwjkMOXSewZPviwjKbSy1PwKcl6yqppRlY4EaOacq+6FQ0BgNHB/g9+tCWTa4vdq8NS0nxgvaaY6651zWAd2qed9AYrNNlZ3SlSraJsZPzGvLVbrGh3j52KO1gVax25+TqSPmXHVbykcIrZUguEikuP2V6LxHmqjTh4Ta8IVJcCMKg0Y2Ma++9s9aCuRqD9XFShAFgwYYeGXm0+JivW3SuXEo1WC0X/M3zpbf0PF6UfkQnYBdutN0nPtauy43EWPbzWkggDaEXrFZn6+DDw40BS7YlF/7S6mxT7/9kZdj6Pxr6m9DwqkjWe3KtvY/8+BZKwQq8lkFDm3Bi8rWGXLVbbG3R9rCdEKxu8DXkyegEC004xoMFG3Jk+KHCI6KqTUAQeik6EnZgSQI19IGFKtARR0cFBSzZFqd8AV+sDroyL2riFsMCLGTXtFMx1QysrNrsIFIl2/gTk67WX/Nxi60QzbLACmxtkUIdWNuu7Ag6WDCsHiLzD/hxixvXWGDd3q5/Th1YaOeiASzZFiZ+2sg2qVeL13IC6aYPa7CynqELLFQhDzkygh6wYCgzvFSTpXaLba32qWMtsDpPOvxM2henB6ycuitUUSXboMPD9uTuQ6eQN1yic9sGC6xOTdodpwasAwWHKASrK7eYd7VbAl1hBFblOorA+ip9JbVgwcYeH3+pVu0WCcPY351ogeVzEuIkisAKpCs1uIaW642XN/sqkTgDOxMqjMBCZwclYKHCHblvysGSbUH8wnq2Xu0WC3JtrzxpgdVRv6pFk7QGYKEN0BRUyTY6etzFap/4FLqVs9+2wGo3NALRABauk4nAkt0i0rm86CPQtX+nBZZkDbFUgIW6KHOBJdu88wtq7WqlKKGkyDbg6XAH6+YWKsDakrPdjGDJupUJFT66ldIZd9PDGiy5+SzoYKE3y6RgKVaLnNotHtwfvmDlT6UCLMPKkfWz98/NrWaq1W7xRpnt1gka4QVWziAqwII+jNnBcrvFMUmVyT6boE72o/fDDiz00NIA1qTYqd2v+Rzx+YWlu3P3brq81bdtesaZ9+Cevr+6a1HK5wMPD1VmCjbnbN1+5Xt06eiEF5RIsKGudotHIsMLrIt/oAIsXO9u1h2MK24uUb6DUpoGSt2iKCq3t+W6CbQrQmW5sKkI96CvUBYdQfUVtmu0ZWtm3OzKtptd/cEhD1bKr6gACw3K3bpyp8vi3DAdgWrytNPvymdVQIYUD70RMx7ppRZnyztnZo46Nja9Gk12ZG3Wejz0WfISlO9hHYeahSZH03dZ63Dn1ivb8xsLNJ+33LqVCeELFmqUaQBL6a0CMVSmo0DeswuEgk9yqzH/o8RPiCRWc1Z+CK4QP6KtHrfhOjGTye1lNUwtfOjE2ClovF6QsFA/t+irWykN1O+iWRRVAGhKhpTjleHk0uPkwq87mv5CYVfHhGBhKsLE4/nxVNlpvAmKW3B78slpmJYKGguRBZAnJE/R87iYCXbOjiejRAclVlgxIOOPH3WN6BHt3Wit6MZ3AVVPKC+0JJOGaKlNHgkhibxhkqILRPpk5TRTlPtRAdahoT2+crPOzsXshYsHByffsz9fipTh4HDkDtwibnjEIFD9DGVlrN3gFpelLW92tLwe/Ybeq8W/pn2lYVMU4RolrVGQV/sjqfhWEquF4AzIQ00BIpvzf0dHK+xPTDljKaN4xONITs49/4HnThADKSx4PflUgeiS477d1ZjwcIwKXBWYRljmgVJzmxn3vnpLUdcBHTaokrakkvoo94T3uSRpBJ3IS09KEx48lEEz1k+pAKtn7YSYhwqaCuH4wIdyRQY3h/vBHHhCGyreH1kJ1WtBGw68wJPlzT4UiM6LX6A5VXC+qtTDyjTnq4fsC8461mc6owq5tJt8YaNQw4iMi/DGHKoFVwvVNQiHeFxt0Ryp0bTd1WrUbg89SxrAAgQ9kPRAHyJeixhcef/e3P24c3Xmt55oDD+WtZapTndCTD311HS8Q2pVGpaWUKZEGkJbqoZHvYrFqfLP3HPVddfati7s7rVt/Xbaxh9jP09y7MhxnSrlMqv50mahkRUdHA7pMIQ8HMBku0Iaz0i6WTdWSdLwODkHMjXpD5Hk/whYAv4uKsDC6qy7PQ7ykYV78/arHkISC/fvurZH/nHa6RnEWyIQ01hJc+muXOkJ2ISR979XZ35jczFadmEcGlZp80plxV3n7lnf1jVYgdgTu5jJMezSFMfeq64TJRJ5ZS1ik0N08kaRJwd5IK96d0eQB/IuPugO8txgQdiNBrDkFFTghgwWXoXQGycMeExe+k05NQ0ZBBiYW5+9EXMVnolTnDyv/TgxAndiwsNteMOUmxeQPoUYCTKuGoKFHKzyD7xUzf/vRg2ouq09tLXt9cP2j887NmS6oou41Eq+qFGok1ytaJSrZaRVrS2bCrAikhd167JhBvJ9E0w/8qNIZV1vaa9gRIYdGzuqVadMlbxz3MA2ELd80kcJn2hF1YnrXmVuZS3Cn7fZDKAqEHvQTd4n8Y5v0p2H8rkLlVKQV2cX25wiJxCqhgZgKaNvDSulxsVMDMSrQq9Bw4p7TJzKPw3h0dO7GUqouq3dt77tlf3MO7Hs12nOfddc58v4q3VCRavY6pRcrWg6sLArHALVDVKmI3W5UvSB5cjwg3azUBWI/X5z24DIjiDvXBl/rV7wBHkibWBFl8SEAFWzz81X9kwjlH47hg0lqgKxR7YzWNVevMlTARa2is1O1fiYt1Qpq0UJjnCjymMplXSAZa72L7+p2jaXl5DpxkuusKUKVsuIVICFTQ/PSs10hpRVNVPj5dmLuF+vC1+q/m+zjZYYy9TVydjkVv4h2KX57Ya2cJ6uhh6wUwQW5aIgnVl8RaLyr0BO6MEttnCmCjYvzkERWEeKokxH1Z7cvco/AXvJj+9kwpwq2O6rLorAKm4uNhdVqzLWKD+/nSNwARZVsNx6gSKwkAFC+5RZqPowYaGyXwPbcJOPsxZSsPs32bTalNRM3BZVnaagasqp6aq+Z9RXWUjJNuaoZmeAaQYWKhTop2pU9FgUzis/9pp0p8WTx1amOqkDCwfa0J6yOjKs3l0N0bHmKODutnhSWEY1Tx1Y8C/BPfLktoYKQeUHTq7gf7PegqnD/rjNpmHVl5aHNOHsU2qpSqvyUvHLbxD+EPYpK5XNPcPSVd3gGWfK4+ikCi38ys9ZZRMf/d6iSm3HizhKwTL+IMxADCXO3h9SfGGflQhVG6ICfDOUgtWDMmW9DU36yto91O++cdRKhPqxt0+w2pKgMVhny8/TQ9XMuFnKdlPwNeeMlQj1b2hWoxosNNiMiKJibYhDmvBhlJ/trylWyqrT9aDmvRgag0WkdtNvgk4V6sMgdaT8VHuvuiyAOrPFiQ7NMdAeLBo2pMtby72Wq2g3XWcB1KmhmccEYGGg4y+IVKGRVflhcmqF322ykgudGhoVKW3/8h3Q7AsWVcdLTig/STlN7aZ0GqZz04CFQ7b005/twjZd3qJqN312j5Wy6srw/eikGaELWMRbr9YY+wJakoqUlYMnIw5aKavb2F6N6kWNAwviad1VU+5du+k8Vbvp9FgrZXUb67PDxnLEZGBhHCw06DxfSHOr2k2XJBpRu4d+npkn2VUXnRHxjs62iXDxVH36D221QUALSTWIaYVGebvRYDl5FxQ79KYKCmnYo1T+3i1ZRqSssI19vdlrjlQmYCF7NOsUe76cRyHKD7kuZe3vjVYBC1UIxbQ4xL47JLagvGX8CgNiJ7oK1OgIFrmlpK1ru2mVzesMHGxNGJOyinbXAnyb7vyfjW399zKVbZKE1ZO7GJkem0t0/2tJH0kJ1oRjdjyAplB8SMgPQQoLdy5NdmbV8AaDBalLXS+9vmAh7plxRsdeVpXUVnqVce2mQArikZ5ft/2y5FZkHRGA9WMeB4YmRrMqsKbGsJjbZHFACAzBZaPnDLpqow4bus4YGMnorWp0h87vT7LrLutE1dkb57wy/k0CwpdgxSuoR8VneHm/V6Q1LsquAuuR7dJkFpnr2nDJiRkOzz9bxkfmGrrdhGpsTfRkggwWxtLU5Xq3mzbYxaeCoZA2JYZFSAcpUdHtFlWP+oIl97AfLeBiiqUpDSJp+OQG/z98eM5hwEU3AixoskP/WEOqVqSvUr4/2k2HBandFLo0jDucQjLWN8HhFyyl/Abar1HJgynk4e02Y0JDQIyPGiJguaP4WK2o+iBe3W46JdgKaYjZ8+oFBE+DIpnAwdqZ44IDHfCDFPjjaRAPMiCjC+VSY664QWAhJ66J/uzkU9NU7aYLzwWn3fSBLTZMOZ4fITiLD7Mi1RkgWHCImGif2cMk3eBPl3K/32zDJUcaQtfPPP6YnRg17jDsN+EUiV624Y+KHqNqN/0uI2i1e/Bi2DW6/1bdBBpffSnvDCysCiH+CQla3MY2+V+SpVfNj3Og6ly/D/ynbbZaRgxBsDBwvlLv2k3rle92tDCY7aabsqT8QkYVj1wUwnZMPwi2VM0/nYE19qi9oEG4b0P7cjK2hEMvA3SOURel30rwdCln5LU2FCyMrzN6qN1d1FysfB/oZN4XVIW0e9e34UQdOXKXCKvmh/xoDzx493z4wT8y1bb28H/0Eb1irIh4h8EX2miwcAxOD+T/cAKF8k0QKSvjmyAaRCX7fm/rZSHhPe43uVe3tuyX9jMsR0IcLCJJnNV065zBHwsOKl+O/+/HrHbT7uQXcLiG8Vc5CGARt4J3gIcM4uxn5QtxtsdL+63avW60oaZW8kG5xMEBCyOqOPq2VH2c9Jmq3RRRi4ULJYUxlIKFseHypi6owgH3vGC1m/bcliQ5gnhxgwkWah+WpX3pv900+k3UoCqf/FWq1W7aDZt9mhVEEqZgub0bF5G82F+7abPyacjxWKx0S4iBD/Ypc0EGS05ALEhYqATLc16hPFBYco+lkNYdHVEHH/SrSgFYMlsfJ0XIVGXWZCkfstpNu0uVJ2drgSUNdENAAulYSbTyTpSHo57EwiVAe+s4S8NcRRdYUrwleqWHcTojasktXAI/qoQX6bmYNIHl7RzJq4eslFWghn4ykbIrSClYM09ZKatA98KDmAU1H1iJN/g/WmIeAZRYBWvHxqxgYdxsE30LUSzzmKem2QKrB0tFIrd0Wqaq2sPXYudovnR0gyWPY0VcEBsGKXR/BteChixYGPV2EdsUFlUo7pDLTS2wtBzoY3kgXM8pwVIGDdOieS6WmcAi7gN257o7PMMHKVQ/o3e5ySGa60qZDCx5QJslTE7axdIvs5o34zUyJVjEXfd3II/rG7rF75CiOFzACaJJr49pwZKHSyAH8zlZlSpkDP8t2y67nLypr4zJwfLgBakqCE2FwCy1I8fl4EPgmoQEWPJAqwVU9tDzacbQHh8bWoTmdXyhDJZnFDUJixIcpjhA9cEtNuTQc+uF0LsKIQiWPND7C3GzGbEsdGZp4wmypZBcO1nCuYRQ/fpDFyzPQKkuNoWgihb05CqSnJBSxlpP27NMLbCCPFBgmV0jrM1wojDcMA1cFOyjYhEiR/jVghg+X3Y4gaUcWMxfrhWwloSiFYpzNOQMJEGTGLlytKwheOKF8PyCwxUs38kM4tgomkPSFSdNoH58UjSLmQY6ETg/AusACKzBk3oM4sfP72NeO2yHvPYHZx1opoVWEV5ew4jWl2mBZQ0LLGuYbfw/UfikHjIsMFkAAAAASUVORK5CYII=",
   "description": "Displays the latest values of the attributes or time series data for multiple entities in a pie chart. Supports numeric values only.",
   "descriptor": {
     "type": "latest",
@@ -21,5 +21,5 @@
     "settingsDirective": "tb-chart-widget-settings",
     "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Pie - Chart.js\"}"
   },
-  "externalId": null
+  "tags": null
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/pie___flot.json b/application/src/main/data/json/system/widget_types/pie___flot.json
index a50993639e..428c599e74 100644
--- a/application/src/main/data/json/system/widget_types/pie___flot.json
+++ b/application/src/main/data/json/system/widget_types/pie___flot.json
@@ -1,8 +1,8 @@
 {
   "fqn": "charts.pie",
   "name": "Pie - Flot",
-  "deprecated": false,
-  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAZTElEQVR42u2deXwUVbbH/e+tM/Pe5/Oe82beNjo6znvjvFFnRkFxF1f2RREQWQQEEZFNFDUCOjAoCKjsq+xG1hBCWAJkJSEJCQGyJyQkZN+7urq7lvt+1RU61dWd0Emqqm911/2cPzq9pdP1zT3nnnvO795BrGENHcYd1ldgDQss3YYoiDcr+NQkLvqQc/sGx5eL2Q9n2aePt49/lRk1gBn0jNeTk+4kKb8iab8jGX1JzkCS9xYp/YxUriMNsYQtJUSwvs4wBovjhGtXXAf2OZZF2KeNs738hO3Zh7swr9ee/5uuLOFnJP1PJG8iqVxLWtOIwFpghfrgef7yJefWdex7k20v9euapJ6DpbL4f5AmtpKFpPFMWEEW+mCJba3ciShHxAfwaN2CSRuwvCazfyJXhpHq3YRrssAyLU92O3fmBPvJHNuL/XrMk8ZgdUxj/0hyBpPaH0J4DgtBsISyUuemb5khz/aeJ73A8ljSz0nBdNKWaYFFdQjFnY6xz5igIU+6g+WxrKdJbSQRXRZYNA2Xkzt53P7mCD2QMggs2S7cI6UtQsI/mhwsp9MVuZsZ/oJ+SBkKlmwp/00qVhPBboEVlEhKwFqPeX2Q3kgFAaz22esucnMzEXkLLAOjqUvp9kmvG4NU0MCSLeMR0nTeAkv/JEJDvWPZZ7bnHjGSqmCCJdnfkrwJxFVrgaUTUyJ39AAz+FmDkaIALDkx8QtStRXfggWWxhMVu3B2UJCiBSzZsOftvGmBpc1AdkrbbKeJwZKnLqTsLbB6NRwOVLAEFynqwJIN1RMCY4HVI/dXU4WKKBqoohEsacHYh7AlFljdTChcSApWnG4asOStxsaTFlgB79Ac+sHWvw89VNELllQo8fek4jsLrNvnFFw7NlGFFO1gyVY0l7YcPU1guZxsxPxuXW/7lDH2ccP9PsQMec6x8i+OpREd9wx73rlulVRRM3pQqIEFuzaWquIIasByONC/EOBlZka+BESE4kLpdcsi/D6Hi4mSZsD6uvaXDHxKrLop5Ofy2RmoKWVee0W6//m+zIgXQwQsKcs1mJ6tazrAcrDsvBkBUoVnYgdanuE6A4ud+w68qhIs9qNZuEeqTu7fR2xscKxahjudG9YIuVdCByxYdn/C2yywblE1a0rgXol9f6pr/0601rj2bPcP1suPCxU3hMI8L7A+nYceL0xRuC1WVznXfs2MGUxYO/v+2yEFlsTWCzRUdAUbLI7DXNKzgLozsFz7vseUhhyYlysc+bLIMPCPgFJ6dMoYZDTwY+jEWEq7/AoRHGEMlig4Pl/Y45WaX7DsU8aiRhkNgzINHrCkh2ZM4M7EcvFxQNmx+EOxuZEZ2j80wZJi+dHBbZ0NJljONct7kwLwA1b/PgjPxdpqhOq+YHXE/oOeERvq5PIbrAMCyZmZDyxY8QfhCJaUBe1dbskXLOf61e57PsOmNUwui5A2sF941OuFRyL5zIv2qW9g16i9dGLm5BAEC4Zu7LACi8/OtL3wmOZgiS3Nfn8dInelQ8RyAZ0XfGYanxzPDHyaO3Uc81xogoW8fJD2fIIAltjUiOxl77Phfmasb1cg/+kx6XcxNtzoSKI+31coKoDsh0RhVaVzw2rccHy5RLS1hSZYcpmNJFUSHjOWkH8NSQHNwfKlQRVjIQcmlBbLvdHwhnziOUycXPRhoSg/ZMGCpf/Z+Bqb4AXvrN0+a6rBYEl2q+Me+Qg8Kj2npZmdMy2UwYLlTwmrdIPo2rsjmLvL/ftA/koV2ocmWLC6A6EJVp29flHKkjp7ndotFubZXnmKwoqGUAMLxVuOG6EGlkjEiOTFAw4Nee3Y6MTKJB+3yLJzpltgGZGRN6rPxyCwTpSeBFWyDTw0dEvONk7g1W4xco8Flu5WtSN0wGpgG1+NGu0BS7Y55+bXMDVqt1h+3Tb4GQssHS35F8b0vhoB1vKLK1RUyQbaEioS/RRmBVxCY4HVE8sdHwpgZdde9kuVxy1uyN7kElxqt9jrDR8LrK6sOd7cYAmiMP30zC7Akm3W2Tk3bVXq194otw3pb4GlT+vYw3rXPugLVuz1k7elSraRUa+fv+Hzb+RyOT6db4Gli1XvMitYTt45/sRbAYIl28r01Q5eXaEGtb6QAiv+J+TKSHJ9CSmaRzL7eVVQQY/U16CEKwXdvyTF8yVZ79R7NdLfulvXQlMdwYosONAtqmR7N25WRVuF2i1WVtj0l+0zAqzkfydtWV7vVrGm/SHmmr8EIC+JeCf+C2Gvk7YMKTaClDc02WQF+ZT/7NWH0bMhUS+wMPGMOf5mD8CCjYgaFVd+zo9bXLTA9GBV73TDtJok/iu5+EB7KhwnDMhTSOpvOyz7RSmZWX+kvf0Gt3HUCspgnDWkYIa7ju9D6eSLXmpS6tbVoxdYh4uO9owqpVtkefVczSecNTdYrgapGl32brDy5dIb5k/utEYv61npNlwnYm1MUbjNlkntqam/kbpxsp6jthJQF7A4gXszZlIvwYJhRVneWq52DjXV9tcGmBWspH+TJh5VHhyTk9pj/lIqdIH+u2dq4VulJ99YITlHlME0xEg/9j7SQsQmcqYBC46s91TJNuzoyKNFx3zI5RxLFpp+VZj5qDR7MXmSg1M9hNAeAwqRHU/uR2r2kbqDkltEmO+qk3LoFFc96ALW7HPztAJLthXpX7NcMN2i9mAhikc8LjrJpSd8jtz5Z4kbKPdh/ehnzruTOKskfSxok6b8lx8oe3B2gSnAym3I05Yq2aaeeqe0RV1iK9bV2kcPMh9YWOW1pkvxuMSHz6OF70m/pTSik6hoPWk6K6kpO9xBgrOaXHqqt59HhzNXtAdrVcY3eoAlu8WY0hPq38fzjuWLzQRWwk9JU5z0Pshj+W1/gJwaFmsIs/x4z35S7JV2v/QO9cekpWXNHikN0cuPVDiTdrCwjkMOXSewZPviwjKbSy1PwKcl6yqppRlY4EaOacq+6FQ0BgNHB/g9+tCWTa4vdq8NS0nxgvaaY6651zWAd2qed9AYrNNlZ3SlSraJsZPzGvLVbrGh3j52KO1gVax25+TqSPmXHVbykcIrZUguEikuP2V6LxHmqjTh4Ta8IVJcCMKg0Y2Ma++9s9aCuRqD9XFShAFgwYYeGXm0+JivW3SuXEo1WC0X/M3zpbf0PF6UfkQnYBdutN0nPtauy43EWPbzWkggDaEXrFZn6+DDw40BS7YlF/7S6mxT7/9kZdj6Pxr6m9DwqkjWe3KtvY/8+BZKwQq8lkFDm3Bi8rWGXLVbbG3R9rCdEKxu8DXkyegEC004xoMFG3Jk+KHCI6KqTUAQeik6EnZgSQI19IGFKtARR0cFBSzZFqd8AV+sDroyL2riFsMCLGTXtFMx1QysrNrsIFIl2/gTk67WX/Nxi60QzbLACmxtkUIdWNuu7Ag6WDCsHiLzD/hxixvXWGDd3q5/Th1YaOeiASzZFiZ+2sg2qVeL13IC6aYPa7CynqELLFQhDzkygh6wYCgzvFSTpXaLba32qWMtsDpPOvxM2henB6ycuitUUSXboMPD9uTuQ6eQN1yic9sGC6xOTdodpwasAwWHKASrK7eYd7VbAl1hBFblOorA+ip9JbVgwcYeH3+pVu0WCcPY351ogeVzEuIkisAKpCs1uIaW642XN/sqkTgDOxMqjMBCZwclYKHCHblvysGSbUH8wnq2Xu0WC3JtrzxpgdVRv6pFk7QGYKEN0BRUyTY6etzFap/4FLqVs9+2wGo3NALRABauk4nAkt0i0rm86CPQtX+nBZZkDbFUgIW6KHOBJdu88wtq7WqlKKGkyDbg6XAH6+YWKsDakrPdjGDJupUJFT66ldIZd9PDGiy5+SzoYKE3y6RgKVaLnNotHtwfvmDlT6UCLMPKkfWz98/NrWaq1W7xRpnt1gka4QVWziAqwII+jNnBcrvFMUmVyT6boE72o/fDDiz00NIA1qTYqd2v+Rzx+YWlu3P3brq81bdtesaZ9+Cevr+6a1HK5wMPD1VmCjbnbN1+5Xt06eiEF5RIsKGudotHIsMLrIt/oAIsXO9u1h2MK24uUb6DUpoGSt2iKCq3t+W6CbQrQmW5sKkI96CvUBYdQfUVtmu0ZWtm3OzKtptd/cEhD1bKr6gACw3K3bpyp8vi3DAdgWrytNPvymdVQIYUD70RMx7ppRZnyztnZo46Nja9Gk12ZG3Wejz0WfISlO9hHYeahSZH03dZ63Dn1ivb8xsLNJ+33LqVCeELFmqUaQBL6a0CMVSmo0DeswuEgk9yqzH/o8RPiCRWc1Z+CK4QP6KtHrfhOjGTye1lNUwtfOjE2ClovF6QsFA/t+irWykN1O+iWRRVAGhKhpTjleHk0uPkwq87mv5CYVfHhGBhKsLE4/nxVNlpvAmKW3B78slpmJYKGguRBZAnJE/R87iYCXbOjiejRAclVlgxIOOPH3WN6BHt3Wit6MZ3AVVPKC+0JJOGaKlNHgkhibxhkqILRPpk5TRTlPtRAdahoT2+crPOzsXshYsHByffsz9fipTh4HDkDtwibnjEIFD9DGVlrN3gFpelLW92tLwe/Ybeq8W/pn2lYVMU4RolrVGQV/sjqfhWEquF4AzIQ00BIpvzf0dHK+xPTDljKaN4xONITs49/4HnThADKSx4PflUgeiS477d1ZjwcIwKXBWYRljmgVJzmxn3vnpLUdcBHTaokrakkvoo94T3uSRpBJ3IS09KEx48lEEz1k+pAKtn7YSYhwqaCuH4wIdyRQY3h/vBHHhCGyreH1kJ1WtBGw68wJPlzT4UiM6LX6A5VXC+qtTDyjTnq4fsC8461mc6owq5tJt8YaNQw4iMi/DGHKoFVwvVNQiHeFxt0Ryp0bTd1WrUbg89SxrAAgQ9kPRAHyJeixhcef/e3P24c3Xmt55oDD+WtZapTndCTD311HS8Q2pVGpaWUKZEGkJbqoZHvYrFqfLP3HPVddfati7s7rVt/Xbaxh9jP09y7MhxnSrlMqv50mahkRUdHA7pMIQ8HMBku0Iaz0i6WTdWSdLwODkHMjXpD5Hk/whYAv4uKsDC6qy7PQ7ykYV78/arHkISC/fvurZH/nHa6RnEWyIQ01hJc+muXOkJ2ISR979XZ35jczFadmEcGlZp80plxV3n7lnf1jVYgdgTu5jJMezSFMfeq64TJRJ5ZS1ik0N08kaRJwd5IK96d0eQB/IuPugO8txgQdiNBrDkFFTghgwWXoXQGycMeExe+k05NQ0ZBBiYW5+9EXMVnolTnDyv/TgxAndiwsNteMOUmxeQPoUYCTKuGoKFHKzyD7xUzf/vRg2ouq09tLXt9cP2j887NmS6oou41Eq+qFGok1ytaJSrZaRVrS2bCrAikhd167JhBvJ9E0w/8qNIZV1vaa9gRIYdGzuqVadMlbxz3MA2ELd80kcJn2hF1YnrXmVuZS3Cn7fZDKAqEHvQTd4n8Y5v0p2H8rkLlVKQV2cX25wiJxCqhgZgKaNvDSulxsVMDMSrQq9Bw4p7TJzKPw3h0dO7GUqouq3dt77tlf3MO7Hs12nOfddc58v4q3VCRavY6pRcrWg6sLArHALVDVKmI3W5UvSB5cjwg3azUBWI/X5z24DIjiDvXBl/rV7wBHkibWBFl8SEAFWzz81X9kwjlH47hg0lqgKxR7YzWNVevMlTARa2is1O1fiYt1Qpq0UJjnCjymMplXSAZa72L7+p2jaXl5DpxkuusKUKVsuIVICFTQ/PSs10hpRVNVPj5dmLuF+vC1+q/m+zjZYYy9TVydjkVv4h2KX57Ya2cJ6uhh6wUwQW5aIgnVl8RaLyr0BO6MEttnCmCjYvzkERWEeKokxH1Z7cvco/AXvJj+9kwpwq2O6rLorAKm4uNhdVqzLWKD+/nSNwARZVsNx6gSKwkAFC+5RZqPowYaGyXwPbcJOPsxZSsPs32bTalNRM3BZVnaagasqp6aq+Z9RXWUjJNuaoZmeAaQYWKhTop2pU9FgUzis/9pp0p8WTx1amOqkDCwfa0J6yOjKs3l0N0bHmKODutnhSWEY1Tx1Y8C/BPfLktoYKQeUHTq7gf7PegqnD/rjNpmHVl5aHNOHsU2qpSqvyUvHLbxD+EPYpK5XNPcPSVd3gGWfK4+ikCi38ys9ZZRMf/d6iSm3HizhKwTL+IMxADCXO3h9SfGGflQhVG6ICfDOUgtWDMmW9DU36yto91O++cdRKhPqxt0+w2pKgMVhny8/TQ9XMuFnKdlPwNeeMlQj1b2hWoxosNNiMiKJibYhDmvBhlJ/trylWyqrT9aDmvRgag0WkdtNvgk4V6sMgdaT8VHuvuiyAOrPFiQ7NMdAeLBo2pMtby72Wq2g3XWcB1KmhmccEYGGg4y+IVKGRVflhcmqF322ykgudGhoVKW3/8h3Q7AsWVcdLTig/STlN7aZ0GqZz04CFQ7b005/twjZd3qJqN312j5Wy6srw/eikGaELWMRbr9YY+wJakoqUlYMnIw5aKavb2F6N6kWNAwviad1VU+5du+k8Vbvp9FgrZXUb67PDxnLEZGBhHCw06DxfSHOr2k2XJBpRu4d+npkn2VUXnRHxjs62iXDxVH36D221QUALSTWIaYVGebvRYDl5FxQ79KYKCmnYo1T+3i1ZRqSssI19vdlrjlQmYCF7NOsUe76cRyHKD7kuZe3vjVYBC1UIxbQ4xL47JLagvGX8CgNiJ7oK1OgIFrmlpK1ru2mVzesMHGxNGJOyinbXAnyb7vyfjW399zKVbZKE1ZO7GJkem0t0/2tJH0kJ1oRjdjyAplB8SMgPQQoLdy5NdmbV8AaDBalLXS+9vmAh7plxRsdeVpXUVnqVce2mQArikZ5ft/2y5FZkHRGA9WMeB4YmRrMqsKbGsJjbZHFACAzBZaPnDLpqow4bus4YGMnorWp0h87vT7LrLutE1dkb57wy/k0CwpdgxSuoR8VneHm/V6Q1LsquAuuR7dJkFpnr2nDJiRkOzz9bxkfmGrrdhGpsTfRkggwWxtLU5Xq3mzbYxaeCoZA2JYZFSAcpUdHtFlWP+oIl97AfLeBiiqUpDSJp+OQG/z98eM5hwEU3AixoskP/WEOqVqSvUr4/2k2HBandFLo0jDucQjLWN8HhFyyl/Abar1HJgynk4e02Y0JDQIyPGiJguaP4WK2o+iBe3W46JdgKaYjZ8+oFBE+DIpnAwdqZ44IDHfCDFPjjaRAPMiCjC+VSY664QWAhJ66J/uzkU9NU7aYLzwWn3fSBLTZMOZ4fITiLD7Mi1RkgWHCImGif2cMk3eBPl3K/32zDJUcaQtfPPP6YnRg17jDsN+EUiV624Y+KHqNqN/0uI2i1e/Bi2DW6/1bdBBpffSnvDCysCiH+CQla3MY2+V+SpVfNj3Og6ly/D/ynbbZaRgxBsDBwvlLv2k3rle92tDCY7aabsqT8QkYVj1wUwnZMPwi2VM0/nYE19qi9oEG4b0P7cjK2hEMvA3SOURel30rwdCln5LU2FCyMrzN6qN1d1FysfB/oZN4XVIW0e9e34UQdOXKXCKvmh/xoDzx493z4wT8y1bb28H/0Eb1irIh4h8EX2miwcAxOD+T/cAKF8k0QKSvjmyAaRCX7fm/rZSHhPe43uVe3tuyX9jMsR0IcLCJJnNV065zBHwsOKl+O/+/HrHbT7uQXcLiG8Vc5CGARt4J3gIcM4uxn5QtxtsdL+63avW60oaZW8kG5xMEBCyOqOPq2VH2c9Jmq3RRRi4ULJYUxlIKFseHypi6owgH3vGC1m/bcliQ5gnhxgwkWah+WpX3pv900+k3UoCqf/FWq1W7aDZt9mhVEEqZgub0bF5G82F+7abPyacjxWKx0S4iBD/Ypc0EGS05ALEhYqATLc16hPFBYco+lkNYdHVEHH/SrSgFYMlsfJ0XIVGXWZCkfstpNu0uVJ2drgSUNdENAAulYSbTyTpSHo57EwiVAe+s4S8NcRRdYUrwleqWHcTojasktXAI/qoQX6bmYNIHl7RzJq4eslFWghn4ykbIrSClYM09ZKatA98KDmAU1H1iJN/g/WmIeAZRYBWvHxqxgYdxsE30LUSzzmKem2QKrB0tFIrd0Wqaq2sPXYudovnR0gyWPY0VcEBsGKXR/BteChixYGPV2EdsUFlUo7pDLTS2wtBzoY3kgXM8pwVIGDdOieS6WmcAi7gN257o7PMMHKVQ/o3e5ySGa60qZDCx5QJslTE7axdIvs5o34zUyJVjEXfd3II/rG7rF75CiOFzACaJJr49pwZKHSyAH8zlZlSpkDP8t2y67nLypr4zJwfLgBakqCE2FwCy1I8fl4EPgmoQEWPJAqwVU9tDzacbQHh8bWoTmdXyhDJZnFDUJixIcpjhA9cEtNuTQc+uF0LsKIQiWPND7C3GzGbEsdGZp4wmypZBcO1nCuYRQ/fpDFyzPQKkuNoWgihb05CqSnJBSxlpP27NMLbCCPFBgmV0jrM1wojDcMA1cFOyjYhEiR/jVghg+X3Y4gaUcWMxfrhWwloSiFYpzNOQMJEGTGLlytKwheOKF8PyCwxUs38kM4tgomkPSFSdNoH58UjSLmQY6ETg/AusACKzBk3oM4sfP72NeO2yHvPYHZx1opoVWEV5ew4jWl2mBZQ0LLGuYbfw/UfikHjIsMFkAAAAASUVORK5CYII=",
+  "deprecated": true,
+  "image": "tb-image:cGllX2Zsb3Rfc3lzdGVtX3dpZGdldF9pbWFnZS5wbmc=:IlBpZSAtIEZsb3QiIHN5c3RlbSB3aWRnZXQgaW1hZ2U=;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAIAAADGnbT+AAAABmJLR0QA/wD/AP+gvaeTAAAZTElEQVR42u2deXwUVbbH/e+tM/Pe5/Oe82beNjo6znvjvFFnRkFxF1f2RREQWQQEEZFNFDUCOjAoCKjsq+xG1hBCWAJkJSEJCQGyJyQkZN+7urq7lvt+1RU61dWd0Emqqm911/2cPzq9pdP1zT3nnnvO795BrGENHcYd1ldgDQss3YYoiDcr+NQkLvqQc/sGx5eL2Q9n2aePt49/lRk1gBn0jNeTk+4kKb8iab8jGX1JzkCS9xYp/YxUriMNsYQtJUSwvs4wBovjhGtXXAf2OZZF2KeNs738hO3Zh7swr9ee/5uuLOFnJP1PJG8iqVxLWtOIwFpghfrgef7yJefWdex7k20v9euapJ6DpbL4f5AmtpKFpPFMWEEW+mCJba3ciShHxAfwaN2CSRuwvCazfyJXhpHq3YRrssAyLU92O3fmBPvJHNuL/XrMk8ZgdUxj/0hyBpPaH0J4DgtBsISyUuemb5khz/aeJ73A8ljSz0nBdNKWaYFFdQjFnY6xz5igIU+6g+WxrKdJbSQRXRZYNA2Xkzt53P7mCD2QMggs2S7cI6UtQsI/mhwsp9MVuZsZ/oJ+SBkKlmwp/00qVhPBboEVlEhKwFqPeX2Q3kgFAaz22esucnMzEXkLLAOjqUvp9kmvG4NU0MCSLeMR0nTeAkv/JEJDvWPZZ7bnHjGSqmCCJdnfkrwJxFVrgaUTUyJ39AAz+FmDkaIALDkx8QtStRXfggWWxhMVu3B2UJCiBSzZsOftvGmBpc1AdkrbbKeJwZKnLqTsLbB6NRwOVLAEFynqwJIN1RMCY4HVI/dXU4WKKBqoohEsacHYh7AlFljdTChcSApWnG4asOStxsaTFlgB79Ac+sHWvw89VNELllQo8fek4jsLrNvnFFw7NlGFFO1gyVY0l7YcPU1guZxsxPxuXW/7lDH2ccP9PsQMec6x8i+OpREd9wx73rlulVRRM3pQqIEFuzaWquIIasByONC/EOBlZka+BESE4kLpdcsi/D6Hi4mSZsD6uvaXDHxKrLop5Ofy2RmoKWVee0W6//m+zIgXQwQsKcs1mJ6tazrAcrDsvBkBUoVnYgdanuE6A4ud+w68qhIs9qNZuEeqTu7fR2xscKxahjudG9YIuVdCByxYdn/C2yywblE1a0rgXol9f6pr/0601rj2bPcP1suPCxU3hMI8L7A+nYceL0xRuC1WVznXfs2MGUxYO/v+2yEFlsTWCzRUdAUbLI7DXNKzgLozsFz7vseUhhyYlysc+bLIMPCPgFJ6dMoYZDTwY+jEWEq7/AoRHGEMlig4Pl/Y45WaX7DsU8aiRhkNgzINHrCkh2ZM4M7EcvFxQNmx+EOxuZEZ2j80wZJi+dHBbZ0NJljONct7kwLwA1b/PgjPxdpqhOq+YHXE/oOeERvq5PIbrAMCyZmZDyxY8QfhCJaUBe1dbskXLOf61e57PsOmNUwui5A2sF941OuFRyL5zIv2qW9g16i9dGLm5BAEC4Zu7LACi8/OtL3wmOZgiS3Nfn8dInelQ8RyAZ0XfGYanxzPDHyaO3Uc81xogoW8fJD2fIIAltjUiOxl77Phfmasb1cg/+kx6XcxNtzoSKI+31coKoDsh0RhVaVzw2rccHy5RLS1hSZYcpmNJFUSHjOWkH8NSQHNwfKlQRVjIQcmlBbLvdHwhnziOUycXPRhoSg/ZMGCpf/Z+Bqb4AXvrN0+a6rBYEl2q+Me+Qg8Kj2npZmdMy2UwYLlTwmrdIPo2rsjmLvL/ftA/koV2ocmWLC6A6EJVp29flHKkjp7ndotFubZXnmKwoqGUAMLxVuOG6EGlkjEiOTFAw4Nee3Y6MTKJB+3yLJzpltgGZGRN6rPxyCwTpSeBFWyDTw0dEvONk7g1W4xco8Flu5WtSN0wGpgG1+NGu0BS7Y55+bXMDVqt1h+3Tb4GQssHS35F8b0vhoB1vKLK1RUyQbaEioS/RRmBVxCY4HVE8sdHwpgZdde9kuVxy1uyN7kElxqt9jrDR8LrK6sOd7cYAmiMP30zC7Akm3W2Tk3bVXq194otw3pb4GlT+vYw3rXPugLVuz1k7elSraRUa+fv+Hzb+RyOT6db4Gli1XvMitYTt45/sRbAYIl28r01Q5eXaEGtb6QAiv+J+TKSHJ9CSmaRzL7eVVQQY/U16CEKwXdvyTF8yVZ79R7NdLfulvXQlMdwYosONAtqmR7N25WRVuF2i1WVtj0l+0zAqzkfydtWV7vVrGm/SHmmr8EIC+JeCf+C2Gvk7YMKTaClDc02WQF+ZT/7NWH0bMhUS+wMPGMOf5mD8CCjYgaFVd+zo9bXLTA9GBV73TDtJok/iu5+EB7KhwnDMhTSOpvOyz7RSmZWX+kvf0Gt3HUCspgnDWkYIa7ju9D6eSLXmpS6tbVoxdYh4uO9owqpVtkefVczSecNTdYrgapGl32brDy5dIb5k/utEYv61npNlwnYm1MUbjNlkntqam/kbpxsp6jthJQF7A4gXszZlIvwYJhRVneWq52DjXV9tcGmBWspH+TJh5VHhyTk9pj/lIqdIH+u2dq4VulJ99YITlHlME0xEg/9j7SQsQmcqYBC46s91TJNuzoyKNFx3zI5RxLFpp+VZj5qDR7MXmSg1M9hNAeAwqRHU/uR2r2kbqDkltEmO+qk3LoFFc96ALW7HPztAJLthXpX7NcMN2i9mAhikc8LjrJpSd8jtz5Z4kbKPdh/ehnzruTOKskfSxok6b8lx8oe3B2gSnAym3I05Yq2aaeeqe0RV1iK9bV2kcPMh9YWOW1pkvxuMSHz6OF70m/pTSik6hoPWk6K6kpO9xBgrOaXHqqt59HhzNXtAdrVcY3eoAlu8WY0hPq38fzjuWLzQRWwk9JU5z0Pshj+W1/gJwaFmsIs/x4z35S7JV2v/QO9cekpWXNHikN0cuPVDiTdrCwjkMOXSewZPviwjKbSy1PwKcl6yqppRlY4EaOacq+6FQ0BgNHB/g9+tCWTa4vdq8NS0nxgvaaY6651zWAd2qed9AYrNNlZ3SlSraJsZPzGvLVbrGh3j52KO1gVax25+TqSPmXHVbykcIrZUguEikuP2V6LxHmqjTh4Ta8IVJcCMKg0Y2Ma++9s9aCuRqD9XFShAFgwYYeGXm0+JivW3SuXEo1WC0X/M3zpbf0PF6UfkQnYBdutN0nPtauy43EWPbzWkggDaEXrFZn6+DDw40BS7YlF/7S6mxT7/9kZdj6Pxr6m9DwqkjWe3KtvY/8+BZKwQq8lkFDm3Bi8rWGXLVbbG3R9rCdEKxu8DXkyegEC004xoMFG3Jk+KHCI6KqTUAQeik6EnZgSQI19IGFKtARR0cFBSzZFqd8AV+sDroyL2riFsMCLGTXtFMx1QysrNrsIFIl2/gTk67WX/Nxi60QzbLACmxtkUIdWNuu7Ag6WDCsHiLzD/hxixvXWGDd3q5/Th1YaOeiASzZFiZ+2sg2qVeL13IC6aYPa7CynqELLFQhDzkygh6wYCgzvFSTpXaLba32qWMtsDpPOvxM2henB6ycuitUUSXboMPD9uTuQ6eQN1yic9sGC6xOTdodpwasAwWHKASrK7eYd7VbAl1hBFblOorA+ip9JbVgwcYeH3+pVu0WCcPY351ogeVzEuIkisAKpCs1uIaW642XN/sqkTgDOxMqjMBCZwclYKHCHblvysGSbUH8wnq2Xu0WC3JtrzxpgdVRv6pFk7QGYKEN0BRUyTY6etzFap/4FLqVs9+2wGo3NALRABauk4nAkt0i0rm86CPQtX+nBZZkDbFUgIW6KHOBJdu88wtq7WqlKKGkyDbg6XAH6+YWKsDakrPdjGDJupUJFT66ldIZd9PDGiy5+SzoYKE3y6RgKVaLnNotHtwfvmDlT6UCLMPKkfWz98/NrWaq1W7xRpnt1gka4QVWziAqwII+jNnBcrvFMUmVyT6boE72o/fDDiz00NIA1qTYqd2v+Rzx+YWlu3P3brq81bdtesaZ9+Cevr+6a1HK5wMPD1VmCjbnbN1+5Xt06eiEF5RIsKGudotHIsMLrIt/oAIsXO9u1h2MK24uUb6DUpoGSt2iKCq3t+W6CbQrQmW5sKkI96CvUBYdQfUVtmu0ZWtm3OzKtptd/cEhD1bKr6gACw3K3bpyp8vi3DAdgWrytNPvymdVQIYUD70RMx7ppRZnyztnZo46Nja9Gk12ZG3Wejz0WfISlO9hHYeahSZH03dZ63Dn1ivb8xsLNJ+33LqVCeELFmqUaQBL6a0CMVSmo0DeswuEgk9yqzH/o8RPiCRWc1Z+CK4QP6KtHrfhOjGTye1lNUwtfOjE2ClovF6QsFA/t+irWykN1O+iWRRVAGhKhpTjleHk0uPkwq87mv5CYVfHhGBhKsLE4/nxVNlpvAmKW3B78slpmJYKGguRBZAnJE/R87iYCXbOjiejRAclVlgxIOOPH3WN6BHt3Wit6MZ3AVVPKC+0JJOGaKlNHgkhibxhkqILRPpk5TRTlPtRAdahoT2+crPOzsXshYsHByffsz9fipTh4HDkDtwibnjEIFD9DGVlrN3gFpelLW92tLwe/Ybeq8W/pn2lYVMU4RolrVGQV/sjqfhWEquF4AzIQ00BIpvzf0dHK+xPTDljKaN4xONITs49/4HnThADKSx4PflUgeiS477d1ZjwcIwKXBWYRljmgVJzmxn3vnpLUdcBHTaokrakkvoo94T3uSRpBJ3IS09KEx48lEEz1k+pAKtn7YSYhwqaCuH4wIdyRQY3h/vBHHhCGyreH1kJ1WtBGw68wJPlzT4UiM6LX6A5VXC+qtTDyjTnq4fsC8461mc6owq5tJt8YaNQw4iMi/DGHKoFVwvVNQiHeFxt0Ryp0bTd1WrUbg89SxrAAgQ9kPRAHyJeixhcef/e3P24c3Xmt55oDD+WtZapTndCTD311HS8Q2pVGpaWUKZEGkJbqoZHvYrFqfLP3HPVddfati7s7rVt/Xbaxh9jP09y7MhxnSrlMqv50mahkRUdHA7pMIQ8HMBku0Iaz0i6WTdWSdLwODkHMjXpD5Hk/whYAv4uKsDC6qy7PQ7ykYV78/arHkISC/fvurZH/nHa6RnEWyIQ01hJc+muXOkJ2ISR979XZ35jczFadmEcGlZp80plxV3n7lnf1jVYgdgTu5jJMezSFMfeq64TJRJ5ZS1ik0N08kaRJwd5IK96d0eQB/IuPugO8txgQdiNBrDkFFTghgwWXoXQGycMeExe+k05NQ0ZBBiYW5+9EXMVnolTnDyv/TgxAndiwsNteMOUmxeQPoUYCTKuGoKFHKzyD7xUzf/vRg2ouq09tLXt9cP2j887NmS6oou41Eq+qFGok1ytaJSrZaRVrS2bCrAikhd167JhBvJ9E0w/8qNIZV1vaa9gRIYdGzuqVadMlbxz3MA2ELd80kcJn2hF1YnrXmVuZS3Cn7fZDKAqEHvQTd4n8Y5v0p2H8rkLlVKQV2cX25wiJxCqhgZgKaNvDSulxsVMDMSrQq9Bw4p7TJzKPw3h0dO7GUqouq3dt77tlf3MO7Hs12nOfddc58v4q3VCRavY6pRcrWg6sLArHALVDVKmI3W5UvSB5cjwg3azUBWI/X5z24DIjiDvXBl/rV7wBHkibWBFl8SEAFWzz81X9kwjlH47hg0lqgKxR7YzWNVevMlTARa2is1O1fiYt1Qpq0UJjnCjymMplXSAZa72L7+p2jaXl5DpxkuusKUKVsuIVICFTQ/PSs10hpRVNVPj5dmLuF+vC1+q/m+zjZYYy9TVydjkVv4h2KX57Ya2cJ6uhh6wUwQW5aIgnVl8RaLyr0BO6MEttnCmCjYvzkERWEeKokxH1Z7cvco/AXvJj+9kwpwq2O6rLorAKm4uNhdVqzLWKD+/nSNwARZVsNx6gSKwkAFC+5RZqPowYaGyXwPbcJOPsxZSsPs32bTalNRM3BZVnaagasqp6aq+Z9RXWUjJNuaoZmeAaQYWKhTop2pU9FgUzis/9pp0p8WTx1amOqkDCwfa0J6yOjKs3l0N0bHmKODutnhSWEY1Tx1Y8C/BPfLktoYKQeUHTq7gf7PegqnD/rjNpmHVl5aHNOHsU2qpSqvyUvHLbxD+EPYpK5XNPcPSVd3gGWfK4+ikCi38ys9ZZRMf/d6iSm3HizhKwTL+IMxADCXO3h9SfGGflQhVG6ICfDOUgtWDMmW9DU36yto91O++cdRKhPqxt0+w2pKgMVhny8/TQ9XMuFnKdlPwNeeMlQj1b2hWoxosNNiMiKJibYhDmvBhlJ/trylWyqrT9aDmvRgag0WkdtNvgk4V6sMgdaT8VHuvuiyAOrPFiQ7NMdAeLBo2pMtby72Wq2g3XWcB1KmhmccEYGGg4y+IVKGRVflhcmqF322ykgudGhoVKW3/8h3Q7AsWVcdLTig/STlN7aZ0GqZz04CFQ7b005/twjZd3qJqN312j5Wy6srw/eikGaELWMRbr9YY+wJakoqUlYMnIw5aKavb2F6N6kWNAwviad1VU+5du+k8Vbvp9FgrZXUb67PDxnLEZGBhHCw06DxfSHOr2k2XJBpRu4d+npkn2VUXnRHxjs62iXDxVH36D221QUALSTWIaYVGebvRYDl5FxQ79KYKCmnYo1T+3i1ZRqSssI19vdlrjlQmYCF7NOsUe76cRyHKD7kuZe3vjVYBC1UIxbQ4xL47JLagvGX8CgNiJ7oK1OgIFrmlpK1ru2mVzesMHGxNGJOyinbXAnyb7vyfjW399zKVbZKE1ZO7GJkem0t0/2tJH0kJ1oRjdjyAplB8SMgPQQoLdy5NdmbV8AaDBalLXS+9vmAh7plxRsdeVpXUVnqVce2mQArikZ5ft/2y5FZkHRGA9WMeB4YmRrMqsKbGsJjbZHFACAzBZaPnDLpqow4bus4YGMnorWp0h87vT7LrLutE1dkb57wy/k0CwpdgxSuoR8VneHm/V6Q1LsquAuuR7dJkFpnr2nDJiRkOzz9bxkfmGrrdhGpsTfRkggwWxtLU5Xq3mzbYxaeCoZA2JYZFSAcpUdHtFlWP+oIl97AfLeBiiqUpDSJp+OQG/z98eM5hwEU3AixoskP/WEOqVqSvUr4/2k2HBandFLo0jDucQjLWN8HhFyyl/Abar1HJgynk4e02Y0JDQIyPGiJguaP4WK2o+iBe3W46JdgKaYjZ8+oFBE+DIpnAwdqZ44IDHfCDFPjjaRAPMiCjC+VSY664QWAhJ66J/uzkU9NU7aYLzwWn3fSBLTZMOZ4fITiLD7Mi1RkgWHCImGif2cMk3eBPl3K/32zDJUcaQtfPPP6YnRg17jDsN+EUiV624Y+KHqNqN/0uI2i1e/Bi2DW6/1bdBBpffSnvDCysCiH+CQla3MY2+V+SpVfNj3Og6ly/D/ynbbZaRgxBsDBwvlLv2k3rle92tDCY7aabsqT8QkYVj1wUwnZMPwi2VM0/nYE19qi9oEG4b0P7cjK2hEMvA3SOURel30rwdCln5LU2FCyMrzN6qN1d1FysfB/oZN4XVIW0e9e34UQdOXKXCKvmh/xoDzx493z4wT8y1bb28H/0Eb1irIh4h8EX2miwcAxOD+T/cAKF8k0QKSvjmyAaRCX7fm/rZSHhPe43uVe3tuyX9jMsR0IcLCJJnNV065zBHwsOKl+O/+/HrHbT7uQXcLiG8Vc5CGARt4J3gIcM4uxn5QtxtsdL+63avW60oaZW8kG5xMEBCyOqOPq2VH2c9Jmq3RRRi4ULJYUxlIKFseHypi6owgH3vGC1m/bcliQ5gnhxgwkWah+WpX3pv900+k3UoCqf/FWq1W7aDZt9mhVEEqZgub0bF5G82F+7abPyacjxWKx0S4iBD/Ypc0EGS05ALEhYqATLc16hPFBYco+lkNYdHVEHH/SrSgFYMlsfJ0XIVGXWZCkfstpNu0uVJ2drgSUNdENAAulYSbTyTpSHo57EwiVAe+s4S8NcRRdYUrwleqWHcTojasktXAI/qoQX6bmYNIHl7RzJq4eslFWghn4ykbIrSClYM09ZKatA98KDmAU1H1iJN/g/WmIeAZRYBWvHxqxgYdxsE30LUSzzmKem2QKrB0tFIrd0Wqaq2sPXYudovnR0gyWPY0VcEBsGKXR/BteChixYGPV2EdsUFlUo7pDLTS2wtBzoY3kgXM8pwVIGDdOieS6WmcAi7gN257o7PMMHKVQ/o3e5ySGa60qZDCx5QJslTE7axdIvs5o34zUyJVjEXfd3II/rG7rF75CiOFzACaJJr49pwZKHSyAH8zlZlSpkDP8t2y67nLypr4zJwfLgBakqCE2FwCy1I8fl4EPgmoQEWPJAqwVU9tDzacbQHh8bWoTmdXyhDJZnFDUJixIcpjhA9cEtNuTQc+uF0LsKIQiWPND7C3GzGbEsdGZp4wmypZBcO1nCuYRQ/fpDFyzPQKkuNoWgihb05CqSnJBSxlpP27NMLbCCPFBgmV0jrM1wojDcMA1cFOyjYhEiR/jVghg+X3Y4gaUcWMxfrhWwloSiFYpzNOQMJEGTGLlytKwheOKF8PyCwxUs38kM4tgomkPSFSdNoH58UjSLmQY6ETg/AusACKzBk3oM4sfP72NeO2yHvPYHZx1opoVWEV5ew4jWl2mBZQ0LLGuYbfw/UfikHjIsMFkAAAAASUVORK5CYII=",
   "description": "Displays the latest values of the attributes or time series data for multiple entities in a pie chart. Supports numeric values only.",
   "descriptor": {
     "type": "latest",
@@ -18,5 +18,5 @@
     "dataKeySettingsDirective": "tb-flot-pie-key-settings",
     "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.6114638304362894,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.9955906536344441,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.9430835931647599,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"radius\":1,\"fontColor\":\"#545454\",\"fontSize\":10,\"decimals\":1,\"legend\":{\"show\":true,\"position\":\"nw\",\"labelBoxBorderColor\":\"#CCCCCC\",\"backgroundColor\":\"#F0F0F0\",\"backgroundOpacity\":0.85},\"innerRadius\":0,\"showLabels\":true,\"showPercentages\":true,\"stroke\":{\"width\":5},\"tilt\":1,\"animatedPie\":false},\"title\":\"Pie - Flot\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"
   },
-  "externalId": null
+  "tags": null
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/state_chart.json b/application/src/main/data/json/system/widget_types/state_chart.json
index a78fc06f64..0af2631813 100644
--- a/application/src/main/data/json/system/widget_types/state_chart.json
+++ b/application/src/main/data/json/system/widget_types/state_chart.json
@@ -1,26 +1,34 @@
 {
-  "fqn": "charts.state_chart",
-  "name": "State Chart",
+  "fqn": "state_chart",
+  "name": "State chart",
   "deprecated": false,
-  "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAB9VBMVEUAAAAhlvMilvMymeE+nNVDoetInslNq/VZqOdpuPd3d3d5p5Z5suB6enp8fHyBgYGDg4ODqoqEhISIiIiKioqKuN2MjIyNjY2Ojo6QkJCRkZGSkpKUlJSVlZWWlpaXl5eYmJiZmZmampqcnJydnZ2enp6goKCgr3KhoaGioqKisXSjo6OjvsmkpKSlpaWlwdempqanp6eoqKiosGOo1vqpqampsGOqqqqqsWOrq6usrKysw9Wurq6wsLCysrK0tLS1tbW1wbK2tra3t7e4wau5ubm6urq7u7u8vLy9vb2+vr6/xbTAwMDAxbjCwsLC3ejDw8PExMTFxcXGxsbHx8fIv3jIyMjJycnKysrK5vzMzc7Nzc3Ozs7Pz8/QuDnRzcHS0tLT09PT39HU1NTU6/3VzLLV1dXV3sjW1tbX19fYuTHY2NjZ2dna0Ira2trb29vc3Nzex4De3t7f39/guyvhvCfhvCvh4eHh6Nbi4uLjvCTj4+PkyXbk5OTlvCTm5ubm693o6Ojpxl7q6urr6+vswTTs7Ozt7e3uvhju7u7vvhjv7+/wvxjw8PDx8fHyvxX0yTv09PT19fX29vb39/f4wyL4+Pj5+fn6+vr75J37+/v8whP8/Pz9/f39/v/+/v7/wQf/xRb/3HT/5JH/9tz/++/////APs7XAAAAAWJLR0Smt7AblQAAA1RJREFUeNrt3dlT01AUBvAEd8UNl2oLrdrFolZArUul1hWlVhQXFAUF1xaxIqi4FUQUrDsUClZi4nb+Th96S9NQkjDOOKZ+3wuZw8md++M25OXMlKOccJQnTUYocdRqdw8UAqTfOjG4lvr7uowOqbtAtG6o5OiGFoNDapuJHO8tFK4xOKS9msTVgoUiaQjPclnSl01snZ/y4ly2yBNZbRarbc+3yvdpt/hLawOPJp9ur7O0mRiEmzFkY1M6N/4I8qJpulzR2sBx1sgRjQuyA2pk+STdylw2VqR/FPFfWdcCvjhduiM7kVF2db1Nuspu7JGes+I76SRba7f0Wfnn/6F6It+mfo7m8TvYvh7KTiT3PQIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggPwXkFa7e7AQIP3WiUFzdl7LuBDFvJZxIYp5LeNCFPNaBn7Yc+e1KlheSYcrFCniL7LZqPl8cbp0TjavNcqu9rZJB9gdPdIJVnwjbWG1ndI95UzWM9V5rS9Ti3P4VWy1+5jXAgQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAMK+FeS3Ma2FeC/NamNfCCxEQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBA/hZkTKSkwSGn7VUJOmOLV241NiRSRZ2uYcvt+Io+Y0N83USm+MqGWEnU2JCqXqI1ZE+QhYiIy36tXR5INpOQbB5kftcmK85mtdey2iJekeWqX6/3kc+TLCQTrq6eEuZCgKTsbnNXBsIZOERJMedNQnry73XpW8UAKVhIyBPScVfQE9RqEaP7iMT6g+pdw7vKbxKl3IJqV8K7OUqXPHvG9UMGykk2lz1d4g5yvNXo6QqZiA41aHT5OwQTUWBJSrWrvlMwj1jFU2f1Q8K1dCysCUmVhdenNLvMRKZt3hGNriEnxfxlGqt9aPYRkb9bP6Q1SMFrmltMukKuMT2QpckWjc/WhP2lYB/TgjzdHyCKVM/gGXnsp+qY5hbba+hIVA/ETL0+9SepsoNiTs/igGpXZIhKqVv9QVJARIfXIWqfiM1nS+qBnHdae1V7Qss8ngEijRO5a6sMCAtdqv+HfgPwpNPbU6ipOwAAAABJRU5ErkJggg==",
+  "image": "tb-image:Y2hhcnRfKDUpLnN2Zw==:IlN0YXRlIGNoYXJ0IiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_4437_96858)">
<path d="M2.76562 1.81641L0.882812 7H0.113281L2.28125 1.3125H2.77734L2.76562 1.81641ZM4.34375 7L2.45703 1.81641L2.44531 1.3125H2.94141L5.11719 7H4.34375ZM4.24609 4.89453V5.51172H1.05078V4.89453H4.24609Z" fill="black" fill-opacity="0.54"/>
<path d="M3.6875 32.5464H2.24609L2.23828 31.9409H3.54688C3.76302 31.9409 3.95182 31.9045 4.11328 31.8315C4.27474 31.7586 4.39974 31.6545 4.48828 31.519C4.57943 31.381 4.625 31.217 4.625 31.0269C4.625 30.8185 4.58464 30.6493 4.50391 30.519C4.42578 30.3862 4.30469 30.2899 4.14062 30.23C3.97917 30.1675 3.77344 30.1362 3.52344 30.1362H2.41406V35.2065H1.66016V29.519H3.52344C3.8151 29.519 4.07552 29.549 4.30469 29.6089C4.53385 29.6662 4.72786 29.7573 4.88672 29.8823C5.04818 30.0047 5.17057 30.161 5.25391 30.3511C5.33724 30.5412 5.37891 30.769 5.37891 31.0347C5.37891 31.269 5.31901 31.4813 5.19922 31.6714C5.07943 31.8589 4.91276 32.0125 4.69922 32.1323C4.48828 32.2521 4.24089 32.3289 3.95703 32.3628L3.6875 32.5464ZM3.65234 35.2065H1.94922L2.375 34.5933H3.65234C3.89193 34.5933 4.09505 34.5516 4.26172 34.4683C4.43099 34.3849 4.5599 34.2677 4.64844 34.1167C4.73698 33.9631 4.78125 33.7821 4.78125 33.5737C4.78125 33.3628 4.74349 33.1805 4.66797 33.0269C4.59245 32.8732 4.47396 32.7547 4.3125 32.6714C4.15104 32.5881 3.94271 32.5464 3.6875 32.5464H2.61328L2.62109 31.9409H4.08984L4.25 32.1597C4.52344 32.1831 4.75521 32.2612 4.94531 32.394C5.13542 32.5243 5.27995 32.6909 5.37891 32.894C5.48047 33.0972 5.53125 33.3211 5.53125 33.5659C5.53125 33.9201 5.45312 34.2196 5.29688 34.4644C5.14323 34.7065 4.92578 34.8914 4.64453 35.019C4.36328 35.144 4.03255 35.2065 3.65234 35.2065Z" fill="black" fill-opacity="0.54"/>
<path d="M4.09375 61.605H4.84375C4.80469 61.9644 4.70182 62.286 4.53516 62.5698C4.36849 62.8537 4.13281 63.0789 3.82812 63.2456C3.52344 63.4097 3.14323 63.4917 2.6875 63.4917C2.35417 63.4917 2.05078 63.4292 1.77734 63.3042C1.50651 63.1792 1.27344 63.0021 1.07812 62.7729C0.882812 62.5412 0.731771 62.2638 0.625 61.9409C0.520833 61.6154 0.46875 61.2534 0.46875 60.855V60.2886C0.46875 59.8901 0.520833 59.5295 0.625 59.2065C0.731771 58.881 0.884115 58.6024 1.08203 58.3706C1.28255 58.1388 1.52344 57.9604 1.80469 57.8354C2.08594 57.7104 2.40234 57.6479 2.75391 57.6479C3.18359 57.6479 3.54688 57.7287 3.84375 57.8901C4.14062 58.0516 4.37109 58.2756 4.53516 58.562C4.70182 58.8459 4.80469 59.1753 4.84375 59.5503H4.09375C4.05729 59.2847 3.98958 59.0568 3.89062 58.8667C3.79167 58.674 3.65104 58.5256 3.46875 58.4214C3.28646 58.3172 3.04818 58.2651 2.75391 58.2651C2.5013 58.2651 2.27865 58.3133 2.08594 58.4097C1.89583 58.506 1.73568 58.6427 1.60547 58.8198C1.47786 58.9969 1.38151 59.2091 1.31641 59.4565C1.2513 59.7039 1.21875 59.9787 1.21875 60.2808V60.855C1.21875 61.1336 1.2474 61.3953 1.30469 61.6401C1.36458 61.8849 1.45443 62.0998 1.57422 62.2847C1.69401 62.4696 1.84635 62.6154 2.03125 62.7222C2.21615 62.8263 2.4349 62.8784 2.6875 62.8784C3.00781 62.8784 3.26302 62.8276 3.45312 62.7261C3.64323 62.6245 3.78646 62.4787 3.88281 62.2886C3.98177 62.0985 4.05208 61.8706 4.09375 61.605Z" fill="black" fill-opacity="0.54"/>
<path d="M2.19922 91.6201H1.01172L1.01953 91.0068H2.19922C2.60547 91.0068 2.94401 90.9222 3.21484 90.7529C3.48568 90.5811 3.6888 90.3415 3.82422 90.0342C3.96224 89.7243 4.03125 89.3623 4.03125 88.9482V88.6006C4.03125 88.2751 3.99219 87.986 3.91406 87.7334C3.83594 87.4782 3.72135 87.2633 3.57031 87.0889C3.41927 86.9118 3.23438 86.7777 3.01562 86.6865C2.79948 86.5954 2.55078 86.5498 2.26953 86.5498H0.988281V85.9326H2.26953C2.64193 85.9326 2.98177 85.9951 3.28906 86.1201C3.59635 86.2425 3.86068 86.4209 4.08203 86.6553C4.30599 86.887 4.47786 87.1683 4.59766 87.499C4.71745 87.8271 4.77734 88.1969 4.77734 88.6084V88.9482C4.77734 89.3597 4.71745 89.7308 4.59766 90.0615C4.47786 90.3896 4.30469 90.6696 4.07812 90.9014C3.85417 91.1331 3.58333 91.3115 3.26562 91.4365C2.95052 91.5589 2.59505 91.6201 2.19922 91.6201ZM1.41406 85.9326V91.6201H0.660156V85.9326H1.41406Z" fill="black" fill-opacity="0.54"/>
<path d="M5.27344 119.214V119.827H2.26172V119.214H5.27344ZM2.41406 114.14V119.827H1.66016V114.14H2.41406ZM4.875 116.585V117.198H2.26172V116.585H4.875ZM5.23438 114.14V114.757H2.26172V114.14H5.23438Z" fill="black" fill-opacity="0.54"/>
<path d="M11 4.16113L186 4.16116" stroke="black" stroke-opacity="0.12"/>
<path d="M11 33.1611L186 33.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M11 61.1611L186 61.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M11 89.1611L186 89.1612" stroke="black" stroke-opacity="0.12"/>
<path d="M11 118.161L186 118.161" stroke="black" stroke-opacity="0.12"/>
<line x1="9.2" y1="145.961" x2="188.8" y2="145.961" stroke="black" stroke-opacity="0.7" stroke-width="0.4" stroke-linecap="square"/>
<line x1="26.4502" y1="148.072" x2="26.4502" y2="147.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M18.5091 152.025V152.893C18.5091 153.359 18.4674 153.752 18.3841 154.072C18.3007 154.393 18.1809 154.65 18.0247 154.846C17.8684 155.041 17.6796 155.183 17.4583 155.271C17.2395 155.357 16.9921 155.4 16.7161 155.4C16.4973 155.4 16.2955 155.373 16.1106 155.318C15.9257 155.264 15.7591 155.176 15.6106 155.057C15.4648 154.934 15.3398 154.775 15.2356 154.58C15.1315 154.385 15.052 154.148 14.9973 153.869C14.9427 153.59 14.9153 153.265 14.9153 152.893V152.025C14.9153 151.559 14.957 151.169 15.0403 150.854C15.1262 150.538 15.2473 150.286 15.4036 150.096C15.5598 149.903 15.7473 149.765 15.9661 149.682C16.1874 149.598 16.4348 149.557 16.7083 149.557C16.9296 149.557 17.1328 149.584 17.3177 149.639C17.5052 149.691 17.6718 149.775 17.8177 149.893C17.9635 150.007 18.0872 150.161 18.1887 150.354C18.2929 150.544 18.3723 150.777 18.427 151.053C18.4817 151.329 18.5091 151.653 18.5091 152.025ZM17.7825 153.01V151.904C17.7825 151.649 17.7669 151.425 17.7356 151.232C17.707 151.037 17.664 150.87 17.6067 150.732C17.5494 150.594 17.4765 150.482 17.388 150.396C17.302 150.311 17.2018 150.248 17.0872 150.209C16.9752 150.167 16.8489 150.146 16.7083 150.146C16.5364 150.146 16.3841 150.179 16.2512 150.244C16.1184 150.307 16.0065 150.407 15.9153 150.545C15.8268 150.683 15.7591 150.864 15.7122 151.088C15.6653 151.312 15.6419 151.584 15.6419 151.904V153.01C15.6419 153.265 15.6562 153.49 15.6848 153.686C15.7161 153.881 15.7617 154.05 15.8216 154.193C15.8815 154.334 15.9544 154.45 16.0403 154.541C16.1262 154.632 16.2252 154.7 16.3372 154.744C16.4518 154.786 16.5781 154.807 16.7161 154.807C16.8932 154.807 17.0481 154.773 17.1809 154.705C17.3137 154.637 17.4244 154.532 17.513 154.389C17.6041 154.243 17.6718 154.057 17.7161 153.83C17.7604 153.601 17.7825 153.327 17.7825 153.01ZM21.8964 149.604V155.322H21.1737V150.506L19.7167 151.037V150.385L21.7831 149.604H21.8964ZM27.1124 149.635V155.322H26.3585V149.635H27.1124ZM29.4952 152.193V152.811H26.9483V152.193H29.4952ZM29.8819 149.635V150.252H26.9483V149.635H29.8819ZM32.4216 155.4C32.1273 155.4 31.8604 155.351 31.6208 155.252C31.3838 155.15 31.1794 155.008 31.0075 154.826C30.8383 154.644 30.7081 154.428 30.6169 154.178C30.5258 153.928 30.4802 153.654 30.4802 153.357V153.193C30.4802 152.85 30.531 152.544 30.6325 152.275C30.7341 152.005 30.8721 151.775 31.0466 151.588C31.2211 151.4 31.419 151.258 31.6403 151.162C31.8617 151.066 32.0909 151.018 32.3278 151.018C32.6299 151.018 32.8903 151.07 33.1091 151.174C33.3305 151.278 33.5114 151.424 33.6521 151.611C33.7927 151.796 33.8969 152.015 33.9646 152.268C34.0323 152.518 34.0661 152.791 34.0661 153.088V153.412H30.9099V152.822H33.3435V152.768C33.3331 152.58 33.294 152.398 33.2263 152.221C33.1612 152.044 33.057 151.898 32.9138 151.783C32.7706 151.669 32.5752 151.611 32.3278 151.611C32.1638 151.611 32.0127 151.646 31.8747 151.717C31.7367 151.785 31.6182 151.886 31.5193 152.021C31.4203 152.157 31.3435 152.322 31.2888 152.518C31.2341 152.713 31.2068 152.938 31.2068 153.193V153.357C31.2068 153.558 31.2341 153.747 31.2888 153.924C31.3461 154.098 31.4281 154.252 31.5349 154.385C31.6443 154.518 31.7758 154.622 31.9294 154.697C32.0857 154.773 32.2627 154.811 32.4607 154.811C32.7159 154.811 32.932 154.758 33.1091 154.654C33.2862 154.55 33.4411 154.411 33.5739 154.236L34.0114 154.584C33.9203 154.722 33.8044 154.854 33.6638 154.979C33.5232 155.104 33.35 155.205 33.1443 155.283C32.9411 155.361 32.7002 155.4 32.4216 155.4ZM34.9886 149.322H35.7152V154.502L35.6527 155.322H34.9886V149.322ZM38.5706 153.174V153.256C38.5706 153.563 38.5342 153.848 38.4613 154.111C38.3883 154.372 38.2816 154.598 38.1409 154.791C38.0003 154.984 37.8284 155.133 37.6253 155.24C37.4222 155.347 37.1891 155.4 36.9261 155.4C36.6579 155.4 36.4222 155.355 36.2191 155.264C36.0185 155.17 35.8493 155.036 35.7113 154.861C35.5732 154.687 35.4626 154.476 35.3792 154.229C35.2985 153.981 35.2425 153.702 35.2113 153.393V153.033C35.2425 152.721 35.2985 152.441 35.3792 152.193C35.4626 151.946 35.5732 151.735 35.7113 151.561C35.8493 151.383 36.0185 151.249 36.2191 151.158C36.4196 151.064 36.6527 151.018 36.9183 151.018C37.1839 151.018 37.4196 151.07 37.6253 151.174C37.831 151.275 38.0029 151.421 38.1409 151.611C38.2816 151.801 38.3883 152.029 38.4613 152.295C38.5342 152.558 38.5706 152.851 38.5706 153.174ZM37.8441 153.256V153.174C37.8441 152.963 37.8245 152.765 37.7855 152.58C37.7464 152.393 37.6839 152.229 37.598 152.088C37.512 151.945 37.3988 151.833 37.2581 151.752C37.1175 151.669 36.9443 151.627 36.7386 151.627C36.5563 151.627 36.3975 151.658 36.262 151.721C36.1292 151.783 36.0159 151.868 35.9222 151.975C35.8284 152.079 35.7516 152.199 35.6917 152.334C35.6344 152.467 35.5915 152.605 35.5628 152.748V153.689C35.6045 153.872 35.6722 154.048 35.7659 154.217C35.8623 154.383 35.9899 154.52 36.1488 154.627C36.3102 154.734 36.5094 154.787 36.7464 154.787C36.9417 154.787 37.1084 154.748 37.2464 154.67C37.387 154.589 37.5003 154.479 37.5863 154.338C37.6748 154.197 37.7399 154.035 37.7816 153.85C37.8232 153.665 37.8441 153.467 37.8441 153.256Z" fill="black" fill-opacity="0.54"/>
<g clip-path="url(#clip1_4437_96858)">
<line x1="61.8501" y1="147.072" x2="61.8501" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M53.909 152.025V152.893C53.909 153.359 53.8673 153.752 53.784 154.072C53.7006 154.393 53.5808 154.65 53.4246 154.846C53.2683 155.041 53.0795 155.183 52.8582 155.271C52.6394 155.357 52.392 155.4 52.116 155.4C51.8972 155.4 51.6954 155.373 51.5105 155.318C51.3256 155.264 51.159 155.176 51.0105 155.057C50.8647 154.934 50.7397 154.775 50.6355 154.58C50.5314 154.385 50.4519 154.148 50.3972 153.869C50.3426 153.59 50.3152 153.265 50.3152 152.893V152.025C50.3152 151.559 50.3569 151.169 50.4402 150.854C50.5261 150.538 50.6472 150.286 50.8035 150.096C50.9597 149.903 51.1472 149.765 51.366 149.682C51.5873 149.598 51.8347 149.557 52.1082 149.557C52.3295 149.557 52.5327 149.584 52.7176 149.639C52.9051 149.691 53.0717 149.775 53.2176 149.893C53.3634 150.007 53.4871 150.161 53.5886 150.354C53.6928 150.544 53.7722 150.777 53.8269 151.053C53.8816 151.329 53.909 151.653 53.909 152.025ZM53.1824 153.01V151.904C53.1824 151.649 53.1668 151.425 53.1355 151.232C53.1069 151.037 53.0639 150.87 53.0066 150.732C52.9493 150.594 52.8764 150.482 52.7879 150.396C52.7019 150.311 52.6017 150.248 52.4871 150.209C52.3751 150.167 52.2488 150.146 52.1082 150.146C51.9363 150.146 51.784 150.179 51.6511 150.244C51.5183 150.307 51.4064 150.407 51.3152 150.545C51.2267 150.683 51.159 150.864 51.1121 151.088C51.0652 151.312 51.0418 151.584 51.0418 151.904V153.01C51.0418 153.265 51.0561 153.49 51.0847 153.686C51.116 153.881 51.1616 154.05 51.2215 154.193C51.2814 154.334 51.3543 154.45 51.4402 154.541C51.5261 154.632 51.6251 154.7 51.7371 154.744C51.8517 154.786 51.978 154.807 52.116 154.807C52.2931 154.807 52.448 154.773 52.5808 154.705C52.7136 154.637 52.8243 154.532 52.9129 154.389C53.004 154.243 53.0717 154.057 53.116 153.83C53.1603 153.601 53.1824 153.327 53.1824 153.01ZM58.6478 154.729V155.322H54.9252V154.803L56.7885 152.729C57.0176 152.473 57.1947 152.257 57.3197 152.08C57.4473 151.9 57.5359 151.74 57.5853 151.6C57.6374 151.456 57.6635 151.311 57.6635 151.162C57.6635 150.975 57.6244 150.805 57.5463 150.654C57.4708 150.501 57.3588 150.378 57.2103 150.287C57.0619 150.196 56.8822 150.15 56.6713 150.15C56.4187 150.15 56.2077 150.2 56.0385 150.299C55.8718 150.395 55.7468 150.531 55.6635 150.705C55.5801 150.88 55.5385 151.08 55.5385 151.307H54.8158C54.8158 150.986 54.8861 150.693 55.0267 150.428C55.1674 150.162 55.3757 149.951 55.6517 149.795C55.9278 149.636 56.2676 149.557 56.6713 149.557C57.0307 149.557 57.3379 149.62 57.5932 149.748C57.8484 149.873 58.0437 150.05 58.1791 150.279C58.3171 150.506 58.3861 150.771 58.3861 151.076C58.3861 151.243 58.3575 151.412 58.3002 151.584C58.2455 151.753 58.1687 151.923 58.0697 152.092C57.9734 152.261 57.8601 152.428 57.7299 152.592C57.6023 152.756 57.4655 152.917 57.3197 153.076L55.7963 154.729H58.6478ZM62.5123 149.635V155.322H61.7584V149.635H62.5123ZM64.8951 152.193V152.811H62.3482V152.193H64.8951ZM65.2818 149.635V150.252H62.3482V149.635H65.2818ZM67.8215 155.4C67.5272 155.4 67.2603 155.351 67.0207 155.252C66.7837 155.15 66.5793 155.008 66.4074 154.826C66.2382 154.644 66.108 154.428 66.0168 154.178C65.9257 153.928 65.8801 153.654 65.8801 153.357V153.193C65.8801 152.85 65.9309 152.544 66.0324 152.275C66.134 152.005 66.272 151.775 66.4465 151.588C66.621 151.4 66.8189 151.258 67.0402 151.162C67.2616 151.066 67.4908 151.018 67.7277 151.018C68.0298 151.018 68.2902 151.07 68.509 151.174C68.7304 151.278 68.9113 151.424 69.052 151.611C69.1926 151.796 69.2968 152.015 69.3645 152.268C69.4322 152.518 69.466 152.791 69.466 153.088V153.412H66.3098V152.822H68.7434V152.768C68.733 152.58 68.6939 152.398 68.6262 152.221C68.5611 152.044 68.4569 151.898 68.3137 151.783C68.1705 151.669 67.9751 151.611 67.7277 151.611C67.5637 151.611 67.4126 151.646 67.2746 151.717C67.1366 151.785 67.0181 151.886 66.9192 152.021C66.8202 152.157 66.7434 152.322 66.6887 152.518C66.634 152.713 66.6067 152.938 66.6067 153.193V153.357C66.6067 153.558 66.634 153.747 66.6887 153.924C66.746 154.098 66.828 154.252 66.9348 154.385C67.0442 154.518 67.1757 154.622 67.3293 154.697C67.4856 154.773 67.6626 154.811 67.8606 154.811C68.1158 154.811 68.3319 154.758 68.509 154.654C68.6861 154.55 68.841 154.411 68.9738 154.236L69.4113 154.584C69.3202 154.722 69.2043 154.854 69.0637 154.979C68.9231 155.104 68.7499 155.205 68.5442 155.283C68.341 155.361 68.1001 155.4 67.8215 155.4ZM70.3885 149.322H71.1151V154.502L71.0526 155.322H70.3885V149.322ZM73.9705 153.174V153.256C73.9705 153.563 73.9341 153.848 73.8612 154.111C73.7882 154.372 73.6815 154.598 73.5408 154.791C73.4002 154.984 73.2283 155.133 73.0252 155.24C72.8221 155.347 72.589 155.4 72.326 155.4C72.0578 155.4 71.8221 155.355 71.619 155.264C71.4185 155.17 71.2492 155.036 71.1112 154.861C70.9731 154.687 70.8625 154.476 70.7791 154.229C70.6984 153.981 70.6424 153.702 70.6112 153.393V153.033C70.6424 152.721 70.6984 152.441 70.7791 152.193C70.8625 151.946 70.9731 151.735 71.1112 151.561C71.2492 151.383 71.4185 151.249 71.619 151.158C71.8195 151.064 72.0526 151.018 72.3182 151.018C72.5838 151.018 72.8195 151.07 73.0252 151.174C73.231 151.275 73.4028 151.421 73.5408 151.611C73.6815 151.801 73.7882 152.029 73.8612 152.295C73.9341 152.558 73.9705 152.851 73.9705 153.174ZM73.244 153.256V153.174C73.244 152.963 73.2244 152.765 73.1854 152.58C73.1463 152.393 73.0838 152.229 72.9979 152.088C72.9119 151.945 72.7987 151.833 72.658 151.752C72.5174 151.669 72.3442 151.627 72.1385 151.627C71.9562 151.627 71.7974 151.658 71.6619 151.721C71.5291 151.783 71.4158 151.868 71.3221 151.975C71.2283 152.079 71.1515 152.199 71.0916 152.334C71.0343 152.467 70.9914 152.605 70.9627 152.748V153.689C71.0044 153.872 71.0721 154.048 71.1658 154.217C71.2622 154.383 71.3898 154.52 71.5487 154.627C71.7101 154.734 71.9093 154.787 72.1463 154.787C72.3416 154.787 72.5083 154.748 72.6463 154.67C72.7869 154.589 72.9002 154.479 72.9862 154.338C73.0747 154.197 73.1398 154.035 73.1815 153.85C73.2231 153.665 73.244 153.467 73.244 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip2_4437_96858)">
<line x1="97.25" y1="147.072" x2="97.25" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M89.3089 152.025V152.893C89.3089 153.359 89.2672 153.752 89.1839 154.072C89.1005 154.393 88.9807 154.65 88.8245 154.846C88.6682 155.041 88.4794 155.183 88.2581 155.271C88.0393 155.357 87.7919 155.4 87.5159 155.4C87.2971 155.4 87.0953 155.373 86.9104 155.318C86.7255 155.264 86.5589 155.176 86.4104 155.057C86.2646 154.934 86.1396 154.775 86.0354 154.58C85.9313 154.385 85.8518 154.148 85.7971 153.869C85.7425 153.59 85.7151 153.265 85.7151 152.893V152.025C85.7151 151.559 85.7568 151.169 85.8401 150.854C85.9261 150.538 86.0471 150.286 86.2034 150.096C86.3596 149.903 86.5471 149.765 86.7659 149.682C86.9872 149.598 87.2346 149.557 87.5081 149.557C87.7294 149.557 87.9326 149.584 88.1175 149.639C88.305 149.691 88.4716 149.775 88.6175 149.893C88.7633 150.007 88.887 150.161 88.9886 150.354C89.0927 150.544 89.1721 150.777 89.2268 151.053C89.2815 151.329 89.3089 151.653 89.3089 152.025ZM88.5823 153.01V151.904C88.5823 151.649 88.5667 151.425 88.5354 151.232C88.5068 151.037 88.4638 150.87 88.4065 150.732C88.3492 150.594 88.2763 150.482 88.1878 150.396C88.1018 150.311 88.0016 150.248 87.887 150.209C87.775 150.167 87.6487 150.146 87.5081 150.146C87.3362 150.146 87.1839 150.179 87.0511 150.244C86.9182 150.307 86.8063 150.407 86.7151 150.545C86.6266 150.683 86.5589 150.864 86.512 151.088C86.4651 151.312 86.4417 151.584 86.4417 151.904V153.01C86.4417 153.265 86.456 153.49 86.4846 153.686C86.5159 153.881 86.5615 154.05 86.6214 154.193C86.6813 154.334 86.7542 154.45 86.8401 154.541C86.9261 154.632 87.025 154.7 87.137 154.744C87.2516 154.786 87.3779 154.807 87.5159 154.807C87.693 154.807 87.8479 154.773 87.9807 154.705C88.1136 154.637 88.2242 154.532 88.3128 154.389C88.4039 154.243 88.4716 154.057 88.5159 153.83C88.5602 153.601 88.5823 153.327 88.5823 153.01ZM91.3759 152.123H91.8915C92.1441 152.123 92.3524 152.081 92.5165 151.998C92.6832 151.912 92.8069 151.796 92.8876 151.65C92.9709 151.502 93.0126 151.335 93.0126 151.15C93.0126 150.932 92.9761 150.748 92.9032 150.6C92.8303 150.451 92.7209 150.339 92.5751 150.264C92.4293 150.188 92.2444 150.15 92.0204 150.15C91.8173 150.15 91.6376 150.191 91.4813 150.271C91.3277 150.35 91.2066 150.462 91.1181 150.607C91.0321 150.753 90.9891 150.925 90.9891 151.123H90.2665C90.2665 150.834 90.3394 150.571 90.4852 150.334C90.6311 150.097 90.8355 149.908 91.0985 149.768C91.3641 149.627 91.6714 149.557 92.0204 149.557C92.3641 149.557 92.6649 149.618 92.9227 149.74C93.1806 149.86 93.3811 150.04 93.5243 150.279C93.6675 150.516 93.7391 150.812 93.7391 151.166C93.7391 151.309 93.7053 151.463 93.6376 151.627C93.5725 151.788 93.4696 151.939 93.329 152.08C93.191 152.221 93.0113 152.337 92.7899 152.428C92.5686 152.516 92.3029 152.561 91.9931 152.561H91.3759V152.123ZM91.3759 152.717V152.283H91.9931C92.355 152.283 92.6545 152.326 92.8915 152.412C93.1285 152.498 93.3147 152.613 93.4501 152.756C93.5881 152.899 93.6845 153.057 93.7391 153.229C93.7964 153.398 93.8251 153.567 93.8251 153.736C93.8251 154.002 93.7795 154.238 93.6884 154.443C93.5998 154.649 93.4735 154.824 93.3095 154.967C93.148 155.11 92.9579 155.218 92.7391 155.291C92.5204 155.364 92.2821 155.4 92.0243 155.4C91.7769 155.4 91.5438 155.365 91.3251 155.295C91.1089 155.225 90.9175 155.123 90.7509 154.99C90.5842 154.855 90.454 154.689 90.3602 154.494C90.2665 154.296 90.2196 154.071 90.2196 153.818H90.9423C90.9423 154.016 90.9852 154.189 91.0712 154.338C91.1597 154.486 91.2847 154.602 91.4462 154.686C91.6102 154.766 91.8029 154.807 92.0243 154.807C92.2457 154.807 92.4358 154.769 92.5946 154.693C92.7561 154.615 92.8798 154.498 92.9657 154.342C93.0543 154.186 93.0985 153.989 93.0985 153.752C93.0985 153.515 93.049 153.321 92.9501 153.17C92.8511 153.016 92.7105 152.903 92.5282 152.83C92.3485 152.755 92.1363 152.717 91.8915 152.717H91.3759ZM97.9122 149.635V155.322H97.1583V149.635H97.9122ZM100.295 152.193V152.811H97.7481V152.193H100.295ZM100.682 149.635V150.252H97.7481V149.635H100.682ZM103.221 155.4C102.927 155.4 102.66 155.351 102.421 155.252C102.184 155.15 101.979 155.008 101.807 154.826C101.638 154.644 101.508 154.428 101.417 154.178C101.326 153.928 101.28 153.654 101.28 153.357V153.193C101.28 152.85 101.331 152.544 101.432 152.275C101.534 152.005 101.672 151.775 101.846 151.588C102.021 151.4 102.219 151.258 102.44 151.162C102.662 151.066 102.891 151.018 103.128 151.018C103.43 151.018 103.69 151.07 103.909 151.174C104.13 151.278 104.311 151.424 104.452 151.611C104.592 151.796 104.697 152.015 104.764 152.268C104.832 152.518 104.866 152.791 104.866 153.088V153.412H101.71V152.822H104.143V152.768C104.133 152.58 104.094 152.398 104.026 152.221C103.961 152.044 103.857 151.898 103.714 151.783C103.57 151.669 103.375 151.611 103.128 151.611C102.964 151.611 102.813 151.646 102.675 151.717C102.537 151.785 102.418 151.886 102.319 152.021C102.22 152.157 102.143 152.322 102.089 152.518C102.034 152.713 102.007 152.938 102.007 153.193V153.357C102.007 153.558 102.034 153.747 102.089 153.924C102.146 154.098 102.228 154.252 102.335 154.385C102.444 154.518 102.576 154.622 102.729 154.697C102.885 154.773 103.063 154.811 103.26 154.811C103.516 154.811 103.732 154.758 103.909 154.654C104.086 154.55 104.241 154.411 104.374 154.236L104.811 154.584C104.72 154.722 104.604 154.854 104.464 154.979C104.323 155.104 104.15 155.205 103.944 155.283C103.741 155.361 103.5 155.4 103.221 155.4ZM105.788 149.322H106.515V154.502L106.452 155.322H105.788V149.322ZM109.37 153.174V153.256C109.37 153.563 109.334 153.848 109.261 154.111C109.188 154.372 109.081 154.598 108.941 154.791C108.8 154.984 108.628 155.133 108.425 155.24C108.222 155.347 107.989 155.4 107.726 155.4C107.458 155.4 107.222 155.355 107.019 155.264C106.818 155.17 106.649 155.036 106.511 154.861C106.373 154.687 106.262 154.476 106.179 154.229C106.098 153.981 106.042 153.702 106.011 153.393V153.033C106.042 152.721 106.098 152.441 106.179 152.193C106.262 151.946 106.373 151.735 106.511 151.561C106.649 151.383 106.818 151.249 107.019 151.158C107.219 151.064 107.452 151.018 107.718 151.018C107.984 151.018 108.219 151.07 108.425 151.174C108.631 151.275 108.803 151.421 108.941 151.611C109.081 151.801 109.188 152.029 109.261 152.295C109.334 152.558 109.37 152.851 109.37 153.174ZM108.644 153.256V153.174C108.644 152.963 108.624 152.765 108.585 152.58C108.546 152.393 108.484 152.229 108.398 152.088C108.312 151.945 108.199 151.833 108.058 151.752C107.917 151.669 107.744 151.627 107.538 151.627C107.356 151.627 107.197 151.658 107.062 151.721C106.929 151.783 106.816 151.868 106.722 151.975C106.628 152.079 106.551 152.199 106.492 152.334C106.434 152.467 106.391 152.605 106.363 152.748V153.689C106.404 153.872 106.472 154.048 106.566 154.217C106.662 154.383 106.79 154.52 106.949 154.627C107.11 154.734 107.309 154.787 107.546 154.787C107.742 154.787 107.908 154.748 108.046 154.67C108.187 154.589 108.3 154.479 108.386 154.338C108.475 154.197 108.54 154.035 108.581 153.85C108.623 153.665 108.644 153.467 108.644 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip3_4437_96858)">
<line x1="132.65" y1="147.072" x2="132.65" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M124.709 152.025V152.893C124.709 153.359 124.668 153.752 124.584 154.072C124.501 154.393 124.381 154.65 124.225 154.846C124.069 155.041 123.88 155.183 123.658 155.271C123.44 155.357 123.192 155.4 122.916 155.4C122.698 155.4 122.496 155.373 122.311 155.318C122.126 155.264 121.959 155.176 121.811 155.057C121.665 154.934 121.54 154.775 121.436 154.58C121.332 154.385 121.252 154.148 121.198 153.869C121.143 153.59 121.116 153.265 121.116 152.893V152.025C121.116 151.559 121.157 151.169 121.241 150.854C121.326 150.538 121.448 150.286 121.604 150.096C121.76 149.903 121.948 149.765 122.166 149.682C122.388 149.598 122.635 149.557 122.908 149.557C123.13 149.557 123.333 149.584 123.518 149.639C123.705 149.691 123.872 149.775 124.018 149.893C124.164 150.007 124.287 150.161 124.389 150.354C124.493 150.544 124.573 150.777 124.627 151.053C124.682 151.329 124.709 151.653 124.709 152.025ZM123.983 153.01V151.904C123.983 151.649 123.967 151.425 123.936 151.232C123.907 151.037 123.864 150.87 123.807 150.732C123.75 150.594 123.677 150.482 123.588 150.396C123.502 150.311 123.402 150.248 123.287 150.209C123.175 150.167 123.049 150.146 122.908 150.146C122.737 150.146 122.584 150.179 122.451 150.244C122.319 150.307 122.207 150.407 122.116 150.545C122.027 150.683 121.959 150.864 121.912 151.088C121.866 151.312 121.842 151.584 121.842 151.904V153.01C121.842 153.265 121.856 153.49 121.885 153.686C121.916 153.881 121.962 154.05 122.022 154.193C122.082 154.334 122.155 154.45 122.241 154.541C122.326 154.632 122.425 154.7 122.537 154.744C122.652 154.786 122.778 154.807 122.916 154.807C123.093 154.807 123.248 154.773 123.381 154.705C123.514 154.637 123.625 154.532 123.713 154.389C123.804 154.243 123.872 154.057 123.916 153.83C123.961 153.601 123.983 153.327 123.983 153.01ZM129.565 153.408V154.002H125.456V153.576L128.003 149.635H128.593L127.96 150.775L126.276 153.408H129.565ZM128.772 149.635V155.322H128.05V149.635H128.772ZM133.313 149.635V155.322H132.559V149.635H133.313ZM135.695 152.193V152.811H133.149V152.193H135.695ZM136.082 149.635V150.252H133.149V149.635H136.082ZM138.622 155.4C138.328 155.4 138.061 155.351 137.821 155.252C137.584 155.15 137.38 155.008 137.208 154.826C137.038 154.644 136.908 154.428 136.817 154.178C136.726 153.928 136.68 153.654 136.68 153.357V153.193C136.68 152.85 136.731 152.544 136.833 152.275C136.934 152.005 137.072 151.775 137.247 151.588C137.421 151.4 137.619 151.258 137.841 151.162C138.062 151.066 138.291 151.018 138.528 151.018C138.83 151.018 139.091 151.07 139.309 151.174C139.531 151.278 139.712 151.424 139.852 151.611C139.993 151.796 140.097 152.015 140.165 152.268C140.232 152.518 140.266 152.791 140.266 153.088V153.412H137.11V152.822H139.544V152.768C139.533 152.58 139.494 152.398 139.426 152.221C139.361 152.044 139.257 151.898 139.114 151.783C138.971 151.669 138.775 151.611 138.528 151.611C138.364 151.611 138.213 151.646 138.075 151.717C137.937 151.785 137.818 151.886 137.719 152.021C137.62 152.157 137.544 152.322 137.489 152.518C137.434 152.713 137.407 152.938 137.407 153.193V153.357C137.407 153.558 137.434 153.747 137.489 153.924C137.546 154.098 137.628 154.252 137.735 154.385C137.844 154.518 137.976 154.622 138.13 154.697C138.286 154.773 138.463 154.811 138.661 154.811C138.916 154.811 139.132 154.758 139.309 154.654C139.486 154.55 139.641 154.411 139.774 154.236L140.212 154.584C140.12 154.722 140.005 154.854 139.864 154.979C139.723 155.104 139.55 155.205 139.344 155.283C139.141 155.361 138.9 155.4 138.622 155.4ZM141.189 149.322H141.915V154.502L141.853 155.322H141.189V149.322ZM144.771 153.174V153.256C144.771 153.563 144.734 153.848 144.661 154.111C144.589 154.372 144.482 154.598 144.341 154.791C144.201 154.984 144.029 155.133 143.826 155.24C143.622 155.347 143.389 155.4 143.126 155.4C142.858 155.4 142.622 155.355 142.419 155.264C142.219 155.17 142.049 155.036 141.911 154.861C141.773 154.687 141.663 154.476 141.579 154.229C141.499 153.981 141.443 153.702 141.411 153.393V153.033C141.443 152.721 141.499 152.441 141.579 152.193C141.663 151.946 141.773 151.735 141.911 151.561C142.049 151.383 142.219 151.249 142.419 151.158C142.62 151.064 142.853 151.018 143.118 151.018C143.384 151.018 143.62 151.07 143.826 151.174C144.031 151.275 144.203 151.421 144.341 151.611C144.482 151.801 144.589 152.029 144.661 152.295C144.734 152.558 144.771 152.851 144.771 153.174ZM144.044 153.256V153.174C144.044 152.963 144.025 152.765 143.986 152.58C143.947 152.393 143.884 152.229 143.798 152.088C143.712 151.945 143.599 151.833 143.458 151.752C143.318 151.669 143.145 151.627 142.939 151.627C142.757 151.627 142.598 151.658 142.462 151.721C142.329 151.783 142.216 151.868 142.122 151.975C142.029 152.079 141.952 152.199 141.892 152.334C141.835 152.467 141.792 152.605 141.763 152.748V153.689C141.805 153.872 141.872 154.048 141.966 154.217C142.062 154.383 142.19 154.52 142.349 154.627C142.51 154.734 142.71 154.787 142.947 154.787C143.142 154.787 143.309 154.748 143.447 154.67C143.587 154.589 143.701 154.479 143.786 154.338C143.875 154.197 143.94 154.035 143.982 153.85C144.023 153.665 144.044 153.467 144.044 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<g clip-path="url(#clip4_4437_96858)">
<line x1="168.05" y1="147.072" x2="168.05" y2="146.25" stroke="black" stroke-opacity="0.5" stroke-width="0.5" stroke-linecap="square"/>
<path d="M160.109 152.025V152.893C160.109 153.359 160.067 153.752 159.984 154.072C159.901 154.393 159.781 154.65 159.625 154.846C159.469 155.041 159.28 155.183 159.058 155.271C158.84 155.357 158.592 155.4 158.316 155.4C158.097 155.4 157.896 155.373 157.711 155.318C157.526 155.264 157.359 155.176 157.211 155.057C157.065 154.934 156.94 154.775 156.836 154.58C156.732 154.385 156.652 154.148 156.597 153.869C156.543 153.59 156.515 153.265 156.515 152.893V152.025C156.515 151.559 156.557 151.169 156.64 150.854C156.726 150.538 156.847 150.286 157.004 150.096C157.16 149.903 157.347 149.765 157.566 149.682C157.788 149.598 158.035 149.557 158.308 149.557C158.53 149.557 158.733 149.584 158.918 149.639C159.105 149.691 159.272 149.775 159.418 149.893C159.564 150.007 159.687 150.161 159.789 150.354C159.893 150.544 159.972 150.777 160.027 151.053C160.082 151.329 160.109 151.653 160.109 152.025ZM159.383 153.01V151.904C159.383 151.649 159.367 151.425 159.336 151.232C159.307 151.037 159.264 150.87 159.207 150.732C159.15 150.594 159.077 150.482 158.988 150.396C158.902 150.311 158.802 150.248 158.687 150.209C158.575 150.167 158.449 150.146 158.308 150.146C158.136 150.146 157.984 150.179 157.851 150.244C157.719 150.307 157.607 150.407 157.515 150.545C157.427 150.683 157.359 150.864 157.312 151.088C157.265 151.312 157.242 151.584 157.242 151.904V153.01C157.242 153.265 157.256 153.49 157.285 153.686C157.316 153.881 157.362 154.05 157.422 154.193C157.482 154.334 157.554 154.45 157.64 154.541C157.726 154.632 157.825 154.7 157.937 154.744C158.052 154.786 158.178 154.807 158.316 154.807C158.493 154.807 158.648 154.773 158.781 154.705C158.914 154.637 159.025 154.532 159.113 154.389C159.204 154.243 159.272 154.057 159.316 153.83C159.36 153.601 159.383 153.327 159.383 153.01ZM162.036 152.615L161.457 152.467L161.743 149.635H164.661V150.303H162.356L162.184 151.85C162.288 151.79 162.42 151.734 162.579 151.682C162.74 151.63 162.925 151.604 163.133 151.604C163.396 151.604 163.632 151.649 163.84 151.74C164.049 151.829 164.226 151.956 164.371 152.123C164.52 152.29 164.633 152.49 164.711 152.725C164.789 152.959 164.829 153.221 164.829 153.51C164.829 153.783 164.791 154.035 164.715 154.264C164.642 154.493 164.532 154.693 164.383 154.865C164.235 155.035 164.047 155.166 163.821 155.26C163.597 155.354 163.332 155.4 163.028 155.4C162.799 155.4 162.581 155.369 162.375 155.307C162.172 155.242 161.99 155.144 161.829 155.014C161.67 154.881 161.539 154.717 161.438 154.521C161.339 154.324 161.276 154.092 161.25 153.826H161.938C161.969 154.04 162.032 154.219 162.125 154.365C162.219 154.511 162.342 154.622 162.493 154.697C162.646 154.77 162.825 154.807 163.028 154.807C163.2 154.807 163.352 154.777 163.485 154.717C163.618 154.657 163.73 154.571 163.821 154.459C163.912 154.347 163.981 154.212 164.028 154.053C164.077 153.894 164.102 153.715 164.102 153.518C164.102 153.338 164.077 153.171 164.028 153.018C163.978 152.864 163.904 152.73 163.805 152.615C163.709 152.501 163.59 152.412 163.45 152.35C163.309 152.285 163.148 152.252 162.965 152.252C162.723 152.252 162.539 152.285 162.414 152.35C162.292 152.415 162.166 152.503 162.036 152.615ZM168.713 149.635V155.322H167.959V149.635H168.713ZM171.095 152.193V152.811H168.548V152.193H171.095ZM171.482 149.635V150.252H168.548V149.635H171.482ZM174.022 155.4C173.727 155.4 173.46 155.351 173.221 155.252C172.984 155.15 172.78 155.008 172.608 154.826C172.438 154.644 172.308 154.428 172.217 154.178C172.126 153.928 172.08 153.654 172.08 153.357V153.193C172.08 152.85 172.131 152.544 172.233 152.275C172.334 152.005 172.472 151.775 172.647 151.588C172.821 151.4 173.019 151.258 173.24 151.162C173.462 151.066 173.691 151.018 173.928 151.018C174.23 151.018 174.49 151.07 174.709 151.174C174.931 151.278 175.112 151.424 175.252 151.611C175.393 151.796 175.497 152.015 175.565 152.268C175.632 152.518 175.666 152.791 175.666 153.088V153.412H172.51V152.822H174.944V152.768C174.933 152.58 174.894 152.398 174.826 152.221C174.761 152.044 174.657 151.898 174.514 151.783C174.371 151.669 174.175 151.611 173.928 151.611C173.764 151.611 173.613 151.646 173.475 151.717C173.337 151.785 173.218 151.886 173.119 152.021C173.02 152.157 172.944 152.322 172.889 152.518C172.834 152.713 172.807 152.938 172.807 153.193V153.357C172.807 153.558 172.834 153.747 172.889 153.924C172.946 154.098 173.028 154.252 173.135 154.385C173.244 154.518 173.376 154.622 173.53 154.697C173.686 154.773 173.863 154.811 174.061 154.811C174.316 154.811 174.532 154.758 174.709 154.654C174.886 154.55 175.041 154.411 175.174 154.236L175.612 154.584C175.52 154.722 175.405 154.854 175.264 154.979C175.123 155.104 174.95 155.205 174.744 155.283C174.541 155.361 174.3 155.4 174.022 155.4ZM176.589 149.322H177.315V154.502L177.253 155.322H176.589V149.322ZM180.171 153.174V153.256C180.171 153.563 180.134 153.848 180.061 154.111C179.988 154.372 179.882 154.598 179.741 154.791C179.6 154.984 179.429 155.133 179.225 155.24C179.022 155.347 178.789 155.4 178.526 155.4C178.258 155.4 178.022 155.355 177.819 155.264C177.619 155.17 177.449 155.036 177.311 154.861C177.173 154.687 177.063 154.476 176.979 154.229C176.899 153.981 176.843 153.702 176.811 153.393V153.033C176.843 152.721 176.899 152.441 176.979 152.193C177.063 151.946 177.173 151.735 177.311 151.561C177.449 151.383 177.619 151.249 177.819 151.158C178.02 151.064 178.253 151.018 178.518 151.018C178.784 151.018 179.02 151.07 179.225 151.174C179.431 151.275 179.603 151.421 179.741 151.611C179.882 151.801 179.988 152.029 180.061 152.295C180.134 152.558 180.171 152.851 180.171 153.174ZM179.444 153.256V153.174C179.444 152.963 179.425 152.765 179.386 152.58C179.347 152.393 179.284 152.229 179.198 152.088C179.112 151.945 178.999 151.833 178.858 151.752C178.718 151.669 178.544 151.627 178.339 151.627C178.156 151.627 177.998 151.658 177.862 151.721C177.729 151.783 177.616 151.868 177.522 151.975C177.429 152.079 177.352 152.199 177.292 152.334C177.235 152.467 177.192 152.605 177.163 152.748V153.689C177.205 153.872 177.272 154.048 177.366 154.217C177.462 154.383 177.59 154.52 177.749 154.627C177.91 154.734 178.11 154.787 178.347 154.787C178.542 154.787 178.708 154.748 178.847 154.67C178.987 154.589 179.1 154.479 179.186 154.338C179.275 154.197 179.34 154.035 179.382 153.85C179.423 153.665 179.444 153.467 179.444 153.256Z" fill="black" fill-opacity="0.54"/>
</g>
<path d="M14.5 17.5H27H60.5C61.0523 17.5 61.5 17.9477 61.5 18.5V26C61.5 26.5523 61.9477 27 62.5 27H96C96.5523 27 97 26.5523 97 26V12.5C97 11.9477 97.4477 11.5 98 11.5H132C132.552 11.5 133 11.9477 133 12.5V32.5C133 33.0523 133.448 33.5 134 33.5H167.5C168.052 33.5 168.5 33.0523 168.5 32.5V24C168.5 23.4477 168.948 23 169.5 23H186" stroke="#FFC107" stroke-width="2" stroke-linecap="round"/>
<path d="M11 117H27V127.5H62V79.1611H97V101H132V89.2675H168.5V121.5H186" stroke="#4CAF50" stroke-width="2" stroke-linecap="round"/>
<path d="M12 60.5H28V69.5H62.5V47L97 47.0002V57.0002L133 57V69.5H168H185.5" stroke="#2196F3" stroke-width="2" stroke-linecap="round"/>
</g>
<defs>
<clipPath id="clip0_4437_96858">
<rect width="200" height="160" fill="white"/>
</clipPath>
<clipPath id="clip1_4437_96858">
<rect width="35.4" height="10.322" fill="white" transform="translate(44.3999 146)"/>
</clipPath>
<clipPath id="clip2_4437_96858">
<rect width="35.4" height="10.322" fill="white" transform="translate(79.7998 146)"/>
</clipPath>
<clipPath id="clip3_4437_96858">
<rect width="35.4" height="10.322" fill="white" transform="translate(115.2 146)"/>
</clipPath>
<clipPath id="clip4_4437_96858">
<rect width="35.4" height="10.322" fill="white" transform="translate(150.6 146)"/>
</clipPath>
</defs>
</svg>
",
   "description": "Displays changes to the state of the entity over time. For example, online and offline.",
   "descriptor": {
     "type": "timeseries",
     "sizeX": 8,
     "sizeY": 5,
     "resources": [],
-    "templateHtml": "<tb-flot-widget \n    [ctx]=\"ctx\" chartType=\"state\">\n</tb-flot-widget>",
-    "templateCss": ".legend {\n    font-size: 13px;\n    line-height: 10px;\n}\n\n.legend table { \n    border-spacing: 0px;\n    border-collapse: separate;\n}\n\n.mouse-events .flot-overlay {\n    cursor: crosshair; \n}\n\n",
-    "controllerScript": "self.onInit = function() {\n}\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.flotWidget.onDataUpdated();\n}\n\nself.onLatestDataUpdated = function() {\n    self.ctx.$scope.flotWidget.onLatestDataUpdated();\n}\n\nself.onResize = function() {\n    self.ctx.$scope.flotWidget.onResize();\n}\n\nself.onEditModeChanged = function() {\n    self.ctx.$scope.flotWidget.onEditModeChanged();\n}\n\nself.onDestroy = function() {\n    self.ctx.$scope.flotWidget.onDestroy();\n}\n\nself.typeParameters = function() {\n    return {\n        stateData: true,\n        hasAdditionalLatestDataKeys: true,\n        defaultDataKeysFunction: function() {\n            return [{ name: 'temperature', label: 'Temperature', type: 'timeseries', units: '°C', decimals: 0 }];\n        }\n    };\n}\n\n",
+    "templateHtml": "<tb-time-series-chart-widget \n    [ctx]=\"ctx\"\n    [widgetTitlePanel]=\"widgetTitlePanel\">\n</tb-time-series-chart-widget>",
+    "templateCss": "",
+    "controllerScript": "self.onInit = function() {\n    self.ctx.$scope.timeSeriesChartWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.timeSeriesChartWidget.onDataUpdated();\n}\n\nself.onLatestDataUpdated = function() {\n    self.ctx.$scope.timeSeriesChartWidget.onLatestDataUpdated();\n}\n\nself.typeParameters = function() {\n    return {\n        stateData: true,\n        chartType: 'state',\n        previewWidth: '80%',\n        embedTitlePanel: true,\n        hasAdditionalLatestDataKeys: true,\n        dataKeySettingsFunction: TbTimeSeriesChart.dataKeySettings('state'),\n        defaultDataKeysFunction: function() {\n            return [{ name: 'state', label: 'State', type: 'timeseries', units: '', decimals: 0 }];\n        }\n    };\n}\n",
     "settingsSchema": "{}",
     "dataKeySettingsSchema": "{}",
-    "settingsDirective": "tb-flot-line-widget-settings",
-    "dataKeySettingsDirective": "tb-flot-line-key-settings",
-    "latestDataKeySettingsDirective": "tb-flot-latest-key-settings",
+    "latestDataKeySettingsSchema": "{}",
+    "settingsDirective": "tb-time-series-chart-widget-settings",
+    "dataKeySettingsDirective": "tb-time-series-chart-key-settings",
+    "latestDataKeySettingsDirective": "",
     "hasBasicMode": true,
-    "basicModeDirective": "tb-flot-basic-config",
-    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Switch 1\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false,\"axisPosition\":\"left\",\"showSeparateAxis\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"return Math.random() > 0.5 ? 1 : 0;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Switch 2\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false,\"axisPosition\":\"left\"},\"_hash\":0.12775350966079668,\"funcBody\":\"return Math.random() <= 0.5 ? 1 : 0;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"stack\":false,\"fontSize\":10,\"fontColor\":\"#545454\",\"showTooltip\":true,\"tooltipIndividual\":false,\"tooltipCumulative\":false,\"hideZeros\":false,\"tooltipValueFormatter\":\"if (value > 0 && value <= 1) {\\n    return 'On';\\n} else if (value === 0) {\\n    return 'Off';\\n} else {\\n    return '';\\n}\",\"grid\":{\"verticalLines\":true,\"horizontalLines\":true,\"outlineWidth\":1,\"color\":\"#545454\",\"backgroundColor\":null,\"tickColor\":\"#DDDDDD\"},\"xaxis\":{\"title\":null,\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"min\":0,\"max\":1.2,\"title\":null,\"showLabels\":true,\"color\":\"#545454\",\"tickSize\":null,\"tickDecimals\":0,\"ticksFormatter\":\"if (value > 0 && value <= 1) {\\n    return 'On';\\n} else if (value === 0) {\\n    return 'Off';\\n} else {\\n    return '';\\n}\"},\"shadowSize\":4,\"smoothLines\":false,\"comparisonEnabled\":false,\"timeForComparison\":\"previousInterval\",\"comparisonCustomIntervalValue\":7200000,\"xaxisSecond\":{\"axisPosition\":\"top\",\"title\":null,\"showLabels\":true},\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"right\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":false,\"showTotal\":false,\"showLatest\":false},\"customLegendEnabled\":false,\"dataKeysListForLabels\":[]},\"title\":\"State Chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null,\"widgetStyle\":{},\"useDashboardTimewindow\":true,\"showLegend\":true,\"actions\":{},\"configMode\":\"basic\",\"showTitleIcon\":false,\"titleIcon\":\"waterfall_chart\",\"iconColor\":\"#1F6BDD\"}"
+    "basicModeDirective": "tb-time-series-chart-basic-config",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Switch 1\",\"color\":\"#2196f3\",\"settings\":{\"yAxisId\":\"default\",\"showInLegend\":true,\"dataHiddenByDefault\":false,\"type\":\"line\",\"lineSettings\":{\"showLine\":true,\"step\":true,\"stepType\":\"end\",\"smooth\":false,\"lineType\":\"solid\",\"lineWidth\":2,\"showPoints\":false,\"showPointLabel\":false,\"pointLabelPosition\":\"top\",\"pointLabelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"pointLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"enablePointLabelBackground\":false,\"pointLabelBackground\":\"rgba(255,255,255,0.56)\",\"pointShape\":\"circle\",\"pointSize\":12,\"fillAreaSettings\":{\"type\":\"opacity\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}},\"barSettings\":{\"showBorder\":false,\"borderWidth\":2,\"borderRadius\":0,\"showLabel\":false,\"labelPosition\":\"top\",\"labelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.76)\",\"enableLabelBackground\":false,\"labelBackground\":\"rgba(255,255,255,0.56)\",\"backgroundSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}},\"tooltipValueFormatter\":\"\"},\"_hash\":0.676226248393859,\"funcBody\":\"return Math.random() > 0.5 ? true : false;\",\"decimals\":0,\"aggregationType\":null,\"usePostProcessing\":null,\"postFuncBody\":null,\"units\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Switch 2\",\"color\":\"#FFC107\",\"settings\":{\"yAxisId\":\"default\",\"showInLegend\":true,\"dataHiddenByDefault\":false,\"type\":\"line\",\"lineSettings\":{\"showLine\":true,\"step\":true,\"stepType\":\"end\",\"smooth\":false,\"lineType\":\"solid\",\"lineWidth\":2,\"showPoints\":false,\"showPointLabel\":false,\"pointLabelPosition\":\"top\",\"pointLabelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"pointLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"enablePointLabelBackground\":false,\"pointLabelBackground\":\"rgba(255,255,255,0.56)\",\"pointShape\":\"circle\",\"pointSize\":12,\"fillAreaSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}},\"barSettings\":{\"showBorder\":false,\"borderWidth\":2,\"borderRadius\":0,\"showLabel\":false,\"labelPosition\":\"top\",\"labelFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.76)\",\"enableLabelBackground\":false,\"labelBackground\":\"rgba(255,255,255,0.56)\",\"backgroundSettings\":{\"type\":\"none\",\"opacity\":0.4,\"gradient\":{\"start\":100,\"end\":0}}},\"tooltipValueFormatter\":null},\"_hash\":0.1106990458957191,\"funcBody\":\"return Math.random() <= 0.5 ? true : false;\",\"decimals\":0,\"aggregationType\":null,\"usePostProcessing\":null,\"postFuncBody\":null,\"units\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]},\"latestDataKeys\":null}],\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":0,\"realtime\":{\"realtimeType\":0,\"timewindowMs\":60000,\"quickInterval\":\"CURRENT_DAY\",\"interval\":1000},\"aggregation\":{\"type\":\"NONE\",\"limit\":25000},\"timezone\":null},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"yAxes\":{\"default\":{\"units\":null,\"decimals\":0,\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"left\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"ticksFormatter\":\"\",\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\",\"id\":\"default\",\"order\":0,\"interval\":null,\"splitNumber\":null,\"min\":null,\"max\":null,\"ticksGenerator\":\"\"}},\"thresholds\":[],\"dataZoom\":true,\"stack\":false,\"xAxis\":{\"show\":true,\"label\":\"\",\"labelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"600\",\"lineHeight\":\"1\"},\"labelColor\":\"rgba(0, 0, 0, 0.54)\",\"position\":\"bottom\",\"showTickLabels\":true,\"tickLabelFont\":{\"family\":\"Roboto\",\"size\":10,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"1\"},\"tickLabelColor\":\"rgba(0, 0, 0, 0.54)\",\"ticksFormat\":{},\"showTicks\":true,\"ticksColor\":\"rgba(0, 0, 0, 0.54)\",\"showLine\":true,\"lineColor\":\"rgba(0, 0, 0, 0.54)\",\"showSplitLines\":true,\"splitLinesColor\":\"rgba(0, 0, 0, 0.12)\"},\"noAggregationBarWidthSettings\":{\"strategy\":\"group\",\"groupWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000},\"barWidth\":{\"relative\":true,\"relativeWidth\":2,\"absoluteWidth\":1000}},\"showLegend\":true,\"legendLabelFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"legendLabelColor\":\"rgba(0, 0, 0, 0.76)\",\"legendConfig\":{\"direction\":\"column\",\"position\":\"right\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":false,\"showTotal\":false,\"showLatest\":false},\"showTooltip\":true,\"tooltipTrigger\":\"axis\",\"tooltipValueFont\":{\"family\":\"Roboto\",\"size\":12,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"16px\"},\"tooltipValueColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipValueFormatter\":\"\",\"tooltipShowDate\":true,\"tooltipDateFormat\":{\"format\":null,\"lastUpdateAgo\":false,\"custom\":false,\"auto\":true,\"autoDateFormatSettings\":{\"millisecond\":\"MMM dd yyyy HH:mm:ss\"}},\"tooltipDateFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"tooltipDateColor\":\"rgba(0, 0, 0, 0.76)\",\"tooltipDateInterval\":true,\"tooltipBackgroundColor\":\"rgba(255, 255, 255, 0.76)\",\"tooltipBackgroundBlur\":4,\"animation\":{\"animation\":true,\"animationThreshold\":2000,\"animationDuration\":500,\"animationEasing\":\"cubicOut\",\"animationDelay\":0,\"animationDurationUpdate\":300,\"animationEasingUpdate\":\"cubicOut\",\"animationDelayUpdate\":0},\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}},\"padding\":\"12px\",\"states\":[{\"label\":\"Off\",\"value\":0,\"sourceType\":\"constant\",\"sourceValue\":false},{\"label\":\"On\",\"value\":1,\"sourceType\":\"constant\",\"sourceValue\":true}]},\"title\":\"State chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"#1F6BDD\",\"useDashboardTimewindow\":false,\"displayTimewindow\":true,\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"units\":\"\",\"decimals\":null,\"noDataDisplayMessage\":\"\",\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":null,\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true},\"margin\":\"0px\",\"borderRadius\":\"0px\",\"iconSize\":\"0px\"}"
   },
-  "externalId": null,
-  "tags": null
+  "tags": [
+    "chart",
+    "time series",
+    "time-series",
+    "state",
+    "state chart",
+    "online",
+    "offline"
+  ]
 }
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/state_chart_deprecated.json b/application/src/main/data/json/system/widget_types/state_chart_deprecated.json
new file mode 100644
index 0000000000..90fc886d62
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/state_chart_deprecated.json
@@ -0,0 +1,25 @@
+{
+  "fqn": "charts.state_chart",
+  "name": "State Chart",
+  "deprecated": true,
+  "image": "tb-image:c3RhdGVfY2hhcnRfc3lzdGVtX3dpZGdldF9pbWFnZS5wbmc=:IlN0YXRlIENoYXJ0IiBzeXN0ZW0gd2lkZ2V0IGltYWdl;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAB9VBMVEUAAAAhlvMilvMymeE+nNVDoetInslNq/VZqOdpuPd3d3d5p5Z5suB6enp8fHyBgYGDg4ODqoqEhISIiIiKioqKuN2MjIyNjY2Ojo6QkJCRkZGSkpKUlJSVlZWWlpaXl5eYmJiZmZmampqcnJydnZ2enp6goKCgr3KhoaGioqKisXSjo6OjvsmkpKSlpaWlwdempqanp6eoqKiosGOo1vqpqampsGOqqqqqsWOrq6usrKysw9Wurq6wsLCysrK0tLS1tbW1wbK2tra3t7e4wau5ubm6urq7u7u8vLy9vb2+vr6/xbTAwMDAxbjCwsLC3ejDw8PExMTFxcXGxsbHx8fIv3jIyMjJycnKysrK5vzMzc7Nzc3Ozs7Pz8/QuDnRzcHS0tLT09PT39HU1NTU6/3VzLLV1dXV3sjW1tbX19fYuTHY2NjZ2dna0Ira2trb29vc3Nzex4De3t7f39/guyvhvCfhvCvh4eHh6Nbi4uLjvCTj4+PkyXbk5OTlvCTm5ubm693o6Ojpxl7q6urr6+vswTTs7Ozt7e3uvhju7u7vvhjv7+/wvxjw8PDx8fHyvxX0yTv09PT19fX29vb39/f4wyL4+Pj5+fn6+vr75J37+/v8whP8/Pz9/f39/v/+/v7/wQf/xRb/3HT/5JH/9tz/++/////APs7XAAAAAWJLR0Smt7AblQAAA1RJREFUeNrt3dlT01AUBvAEd8UNl2oLrdrFolZArUul1hWlVhQXFAUF1xaxIqi4FUQUrDsUClZi4nb+Th96S9NQkjDOOKZ+3wuZw8md++M25OXMlKOccJQnTUYocdRqdw8UAqTfOjG4lvr7uowOqbtAtG6o5OiGFoNDapuJHO8tFK4xOKS9msTVgoUiaQjPclnSl01snZ/y4ly2yBNZbRarbc+3yvdpt/hLawOPJp9ur7O0mRiEmzFkY1M6N/4I8qJpulzR2sBx1sgRjQuyA2pk+STdylw2VqR/FPFfWdcCvjhduiM7kVF2db1Nuspu7JGes+I76SRba7f0Wfnn/6F6It+mfo7m8TvYvh7KTiT3PQIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggPwXkFa7e7AQIP3WiUFzdl7LuBDFvJZxIYp5LeNCFPNaBn7Yc+e1KlheSYcrFCniL7LZqPl8cbp0TjavNcqu9rZJB9gdPdIJVnwjbWG1ndI95UzWM9V5rS9Ti3P4VWy1+5jXAgQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAMK+FeS3Ma2FeC/NamNfCCxEQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBA/hZkTKSkwSGn7VUJOmOLV241NiRSRZ2uYcvt+Io+Y0N83USm+MqGWEnU2JCqXqI1ZE+QhYiIy36tXR5INpOQbB5kftcmK85mtdey2iJekeWqX6/3kc+TLCQTrq6eEuZCgKTsbnNXBsIZOERJMedNQnry73XpW8UAKVhIyBPScVfQE9RqEaP7iMT6g+pdw7vKbxKl3IJqV8K7OUqXPHvG9UMGykk2lz1d4g5yvNXo6QqZiA41aHT5OwQTUWBJSrWrvlMwj1jFU2f1Q8K1dCysCUmVhdenNLvMRKZt3hGNriEnxfxlGqt9aPYRkb9bP6Q1SMFrmltMukKuMT2QpckWjc/WhP2lYB/TgjzdHyCKVM/gGXnsp+qY5hbba+hIVA/ETL0+9SepsoNiTs/igGpXZIhKqVv9QVJARIfXIWqfiM1nS+qBnHdae1V7Qss8ngEijRO5a6sMCAtdqv+HfgPwpNPbU6ipOwAAAABJRU5ErkJggg==",
+  "description": "Displays changes to the state of the entity over time. For example, online and offline.",
+  "descriptor": {
+    "type": "timeseries",
+    "sizeX": 8,
+    "sizeY": 5,
+    "resources": [],
+    "templateHtml": "<tb-flot-widget \n    [ctx]=\"ctx\" chartType=\"state\">\n</tb-flot-widget>",
+    "templateCss": ".legend {\n    font-size: 13px;\n    line-height: 10px;\n}\n\n.legend table { \n    border-spacing: 0px;\n    border-collapse: separate;\n}\n\n.mouse-events .flot-overlay {\n    cursor: crosshair; \n}\n\n",
+    "controllerScript": "self.onInit = function() {\n}\n\nself.onDataUpdated = function() {\n    self.ctx.$scope.flotWidget.onDataUpdated();\n}\n\nself.onLatestDataUpdated = function() {\n    self.ctx.$scope.flotWidget.onLatestDataUpdated();\n}\n\nself.onResize = function() {\n    self.ctx.$scope.flotWidget.onResize();\n}\n\nself.onEditModeChanged = function() {\n    self.ctx.$scope.flotWidget.onEditModeChanged();\n}\n\nself.onDestroy = function() {\n    self.ctx.$scope.flotWidget.onDestroy();\n}\n\nself.typeParameters = function() {\n    return {\n        stateData: true,\n        hasAdditionalLatestDataKeys: true,\n        defaultDataKeysFunction: function() {\n            return [{ name: 'temperature', label: 'Temperature', type: 'timeseries', units: '°C', decimals: 0 }];\n        }\n    };\n}\n\n",
+    "settingsSchema": "{}",
+    "dataKeySettingsSchema": "{}",
+    "settingsDirective": "tb-flot-line-widget-settings",
+    "dataKeySettingsDirective": "tb-flot-line-key-settings",
+    "latestDataKeySettingsDirective": "tb-flot-latest-key-settings",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-flot-basic-config",
+    "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Switch 1\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false,\"axisPosition\":\"left\",\"showSeparateAxis\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"return Math.random() > 0.5 ? 1 : 0;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Switch 2\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false,\"axisPosition\":\"left\"},\"_hash\":0.12775350966079668,\"funcBody\":\"return Math.random() <= 0.5 ? 1 : 0;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"stack\":false,\"fontSize\":10,\"fontColor\":\"#545454\",\"showTooltip\":true,\"tooltipIndividual\":false,\"tooltipCumulative\":false,\"hideZeros\":false,\"tooltipValueFormatter\":\"if (value > 0 && value <= 1) {\\n    return 'On';\\n} else if (value === 0) {\\n    return 'Off';\\n} else {\\n    return '';\\n}\",\"grid\":{\"verticalLines\":true,\"horizontalLines\":true,\"outlineWidth\":1,\"color\":\"#545454\",\"backgroundColor\":null,\"tickColor\":\"#DDDDDD\"},\"xaxis\":{\"title\":null,\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"min\":0,\"max\":1.2,\"title\":null,\"showLabels\":true,\"color\":\"#545454\",\"tickSize\":null,\"tickDecimals\":0,\"ticksFormatter\":\"if (value > 0 && value <= 1) {\\n    return 'On';\\n} else if (value === 0) {\\n    return 'Off';\\n} else {\\n    return '';\\n}\"},\"shadowSize\":4,\"smoothLines\":false,\"comparisonEnabled\":false,\"timeForComparison\":\"previousInterval\",\"comparisonCustomIntervalValue\":7200000,\"xaxisSecond\":{\"axisPosition\":\"top\",\"title\":null,\"showLabels\":true},\"showLegend\":true,\"legendConfig\":{\"direction\":\"column\",\"position\":\"right\",\"sortDataKeys\":false,\"showMin\":false,\"showMax\":false,\"showAvg\":false,\"showTotal\":false,\"showLatest\":false},\"customLegendEnabled\":false,\"dataKeysListForLabels\":[]},\"title\":\"State Chart\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null,\"widgetStyle\":{},\"useDashboardTimewindow\":true,\"showLegend\":true,\"actions\":{},\"configMode\":\"basic\",\"showTitleIcon\":false,\"titleIcon\":\"waterfall_chart\",\"iconColor\":\"#1F6BDD\"}"
+  },
+  "tags": null
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/system/widget_types/status_widget.json b/application/src/main/data/json/system/widget_types/status_widget.json
new file mode 100644
index 0000000000..97dc721c0f
--- /dev/null
+++ b/application/src/main/data/json/system/widget_types/status_widget.json
@@ -0,0 +1,26 @@
+{
+  "fqn": "status_widget",
+  "name": "Status widget",
+  "deprecated": false,
+  "image": "tb-image:c3RhdHVzLXdpZGdldF8oMykuc3Zn:IlN0YXR1cyB3aWRnZXQiIHN5c3RlbSB3aWRnZXQgaW1hZ2U=;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="200" height="160" rx="5.45669" fill="#3F52DD"/>
<path d="M52.4166 20.75H17.5833V17.5833H52.4166V20.75ZM19.1666 50.8333H25.4999C25.4999 46.0833 22.3333 42.9166 22.3333 42.9166C31.8333 36.5833 33.4166 22.3333 33.4166 22.3333H19.1666V50.8333ZM50.8333 22.3333H36.5833C36.5833 22.3333 38.1666 36.5833 47.6666 42.9166C47.6666 42.9166 44.4999 46.0833 44.4999 50.8333H50.8333V22.3333Z" fill="white"/>
<path d="M19.5068 112.765L21.4893 105.047H22.5283L22.4121 107.036L20.293 115H19.2129L19.5068 112.765ZM18.0234 105.047L19.6299 112.703L19.7734 115H18.625L16.3213 105.047H18.0234ZM24.7773 112.683L26.3633 105.047H28.0723L25.7686 115H24.6201L24.7773 112.683ZM22.9316 105.047L24.8936 112.785L25.1807 115H24.1006L22.0156 107.036L21.9062 105.047H22.9316ZM31.1934 107.604V115H29.5391V107.604H31.1934ZM29.4297 105.662C29.4297 105.411 29.5117 105.204 29.6758 105.04C29.8444 104.871 30.0768 104.787 30.373 104.787C30.6647 104.787 30.8949 104.871 31.0635 105.04C31.2321 105.204 31.3164 105.411 31.3164 105.662C31.3164 105.908 31.2321 106.113 31.0635 106.277C30.8949 106.441 30.6647 106.523 30.373 106.523C30.0768 106.523 29.8444 106.441 29.6758 106.277C29.5117 106.113 29.4297 105.908 29.4297 105.662ZM34.8818 109.183V115H33.2344V107.604H34.7861L34.8818 109.183ZM34.5879 111.028L34.0547 111.021C34.0592 110.497 34.1322 110.017 34.2734 109.579C34.4193 109.142 34.6198 108.766 34.875 108.451C35.1348 108.137 35.4447 107.895 35.8047 107.727C36.1647 107.553 36.5658 107.467 37.0078 107.467C37.3633 107.467 37.6846 107.517 37.9717 107.617C38.2633 107.713 38.5117 107.87 38.7168 108.089C38.9264 108.308 39.0859 108.592 39.1953 108.943C39.3047 109.29 39.3594 109.716 39.3594 110.222V115H37.7051V110.215C37.7051 109.859 37.6527 109.579 37.5479 109.374C37.4476 109.164 37.2995 109.016 37.1035 108.93C36.9121 108.839 36.6729 108.793 36.3857 108.793C36.1032 108.793 35.8503 108.852 35.627 108.971C35.4036 109.089 35.2145 109.251 35.0596 109.456C34.9092 109.661 34.793 109.898 34.7109 110.167C34.6289 110.436 34.5879 110.723 34.5879 111.028ZM45.8027 113.469V104.5H47.457V115H45.96L45.8027 113.469ZM40.9902 111.384V111.24C40.9902 110.68 41.0563 110.169 41.1885 109.709C41.3206 109.244 41.512 108.845 41.7627 108.513C42.0133 108.175 42.3187 107.918 42.6787 107.74C43.0387 107.558 43.4443 107.467 43.8955 107.467C44.3421 107.467 44.734 107.553 45.0713 107.727C45.4085 107.9 45.6956 108.148 45.9326 108.472C46.1696 108.791 46.3587 109.174 46.5 109.62C46.6413 110.062 46.7415 110.554 46.8008 111.097V111.555C46.7415 112.083 46.6413 112.566 46.5 113.004C46.3587 113.441 46.1696 113.82 45.9326 114.139C45.6956 114.458 45.4062 114.704 45.0645 114.877C44.7272 115.05 44.333 115.137 43.8818 115.137C43.4352 115.137 43.0319 115.043 42.6719 114.856C42.3164 114.67 42.0133 114.408 41.7627 114.07C41.512 113.733 41.3206 113.337 41.1885 112.881C41.0563 112.421 40.9902 111.922 40.9902 111.384ZM42.6377 111.24V111.384C42.6377 111.721 42.6673 112.035 42.7266 112.327C42.7904 112.619 42.8883 112.876 43.0205 113.1C43.1527 113.318 43.3236 113.492 43.5332 113.619C43.7474 113.742 44.0026 113.804 44.2988 113.804C44.6725 113.804 44.9801 113.722 45.2217 113.558C45.4632 113.394 45.6523 113.173 45.7891 112.895C45.9303 112.612 46.026 112.298 46.0762 111.951V110.714C46.0488 110.445 45.9919 110.194 45.9053 109.962C45.8232 109.729 45.7116 109.527 45.5703 109.354C45.429 109.176 45.2536 109.039 45.0439 108.943C44.8389 108.843 44.5951 108.793 44.3125 108.793C44.0117 108.793 43.7565 108.857 43.5469 108.984C43.3372 109.112 43.1641 109.287 43.0273 109.511C42.8952 109.734 42.7972 109.994 42.7334 110.29C42.6696 110.586 42.6377 110.903 42.6377 111.24ZM49.1152 111.384V111.227C49.1152 110.693 49.1927 110.199 49.3477 109.743C49.5026 109.283 49.7259 108.884 50.0176 108.547C50.3138 108.205 50.6738 107.941 51.0977 107.754C51.526 107.562 52.0091 107.467 52.5469 107.467C53.0892 107.467 53.5723 107.562 53.9961 107.754C54.4245 107.941 54.7868 108.205 55.083 108.547C55.3792 108.884 55.6048 109.283 55.7598 109.743C55.9147 110.199 55.9922 110.693 55.9922 111.227V111.384C55.9922 111.917 55.9147 112.411 55.7598 112.867C55.6048 113.323 55.3792 113.722 55.083 114.063C54.7868 114.401 54.4268 114.665 54.0029 114.856C53.5791 115.043 53.0983 115.137 52.5605 115.137C52.0182 115.137 51.5329 115.043 51.1045 114.856C50.6807 114.665 50.3206 114.401 50.0244 114.063C49.7282 113.722 49.5026 113.323 49.3477 112.867C49.1927 112.411 49.1152 111.917 49.1152 111.384ZM50.7627 111.227V111.384C50.7627 111.716 50.7969 112.031 50.8652 112.327C50.9336 112.623 51.0407 112.883 51.1865 113.106C51.3324 113.33 51.5192 113.505 51.7471 113.633C51.9749 113.76 52.2461 113.824 52.5605 113.824C52.8659 113.824 53.1302 113.76 53.3535 113.633C53.5814 113.505 53.7682 113.33 53.9141 113.106C54.0599 112.883 54.167 112.623 54.2354 112.327C54.3083 112.031 54.3447 111.716 54.3447 111.384V111.227C54.3447 110.898 54.3083 110.589 54.2354 110.297C54.167 110.001 54.0576 109.739 53.9072 109.511C53.7614 109.283 53.5745 109.105 53.3467 108.978C53.1234 108.845 52.8568 108.779 52.5469 108.779C52.237 108.779 51.9681 108.845 51.7402 108.978C51.5169 109.105 51.3324 109.283 51.1865 109.511C51.0407 109.739 50.9336 110.001 50.8652 110.297C50.7969 110.589 50.7627 110.898 50.7627 111.227ZM59.6328 113.359L61.3418 107.604H62.3945L62.1074 109.326L60.3848 115H59.4414L59.6328 113.359ZM58.6279 107.604L59.9609 113.387L60.0703 115H59.0176L57.0146 107.604H58.6279ZM63.9941 113.318L65.2861 107.604H66.8926L64.8965 115H63.8438L63.9941 113.318ZM62.5723 107.604L64.2607 113.291L64.4727 115H63.5293L61.7861 109.319L61.499 107.604H62.5723ZM73.7637 104.5V115H72.1094V104.5H73.7637ZM79.0791 115.137C78.5322 115.137 78.0378 115.048 77.5957 114.87C77.1582 114.688 76.7845 114.435 76.4746 114.111C76.1693 113.788 75.9346 113.407 75.7705 112.97C75.6064 112.532 75.5244 112.061 75.5244 111.555V111.281C75.5244 110.702 75.6087 110.178 75.7773 109.709C75.946 109.24 76.1807 108.839 76.4814 108.506C76.7822 108.169 77.1377 107.911 77.5479 107.733C77.958 107.556 78.4023 107.467 78.8809 107.467C79.4095 107.467 79.8721 107.556 80.2686 107.733C80.665 107.911 80.9932 108.162 81.2529 108.485C81.5173 108.804 81.7132 109.185 81.8408 109.627C81.973 110.069 82.0391 110.557 82.0391 111.09V111.794H76.3242V110.611H80.4121V110.481C80.403 110.185 80.3438 109.907 80.2344 109.647C80.1296 109.388 79.9678 109.178 79.749 109.019C79.5303 108.859 79.2386 108.779 78.874 108.779C78.6006 108.779 78.3568 108.839 78.1426 108.957C77.9329 109.071 77.7575 109.237 77.6162 109.456C77.4749 109.675 77.3656 109.939 77.2881 110.249C77.2152 110.554 77.1787 110.898 77.1787 111.281V111.555C77.1787 111.878 77.222 112.179 77.3086 112.457C77.3997 112.73 77.5319 112.97 77.7051 113.175C77.8783 113.38 78.0879 113.542 78.334 113.66C78.5801 113.774 78.8604 113.831 79.1748 113.831C79.5713 113.831 79.9245 113.751 80.2344 113.592C80.5443 113.432 80.8132 113.207 81.041 112.915L81.9092 113.756C81.7497 113.988 81.5423 114.212 81.2871 114.426C81.0319 114.635 80.7197 114.806 80.3506 114.938C79.986 115.071 79.5622 115.137 79.0791 115.137ZM85.8027 115H84.1553V106.893C84.1553 106.341 84.2578 105.879 84.4629 105.505C84.6725 105.127 84.971 104.842 85.3584 104.65C85.7458 104.454 86.2038 104.356 86.7324 104.356C86.8965 104.356 87.0583 104.368 87.2178 104.391C87.3773 104.409 87.5322 104.438 87.6826 104.479L87.6416 105.751C87.5505 105.728 87.4502 105.712 87.3408 105.703C87.236 105.694 87.1221 105.689 86.999 105.689C86.7484 105.689 86.5319 105.737 86.3496 105.833C86.1719 105.924 86.0352 106.059 85.9395 106.236C85.8483 106.414 85.8027 106.633 85.8027 106.893V115ZM87.3271 107.604V108.807H83.0205V107.604H87.3271ZM92.1641 107.604V108.807H87.9941V107.604H92.1641ZM89.1973 105.792H90.8447V112.956C90.8447 113.184 90.8766 113.359 90.9404 113.482C91.0088 113.601 91.1022 113.681 91.2207 113.722C91.3392 113.763 91.4782 113.783 91.6377 113.783C91.7516 113.783 91.861 113.776 91.9658 113.763C92.0706 113.749 92.1549 113.735 92.2188 113.722L92.2256 114.979C92.0889 115.021 91.9294 115.057 91.7471 115.089C91.5693 115.121 91.3643 115.137 91.1318 115.137C90.7536 115.137 90.4186 115.071 90.127 114.938C89.8353 114.802 89.6074 114.581 89.4434 114.275C89.2793 113.97 89.1973 113.564 89.1973 113.059V105.792ZM100.443 113.824C100.712 113.824 100.954 113.772 101.168 113.667C101.387 113.558 101.562 113.407 101.694 113.216C101.831 113.024 101.906 112.803 101.92 112.553H103.472C103.463 113.031 103.321 113.466 103.048 113.858C102.774 114.25 102.412 114.562 101.961 114.795C101.51 115.023 101.011 115.137 100.464 115.137C99.8988 115.137 99.4066 115.041 98.9873 114.85C98.568 114.654 98.2194 114.385 97.9414 114.043C97.6634 113.701 97.4538 113.307 97.3125 112.86C97.1758 112.414 97.1074 111.935 97.1074 111.425V111.186C97.1074 110.675 97.1758 110.197 97.3125 109.75C97.4538 109.299 97.6634 108.902 97.9414 108.561C98.2194 108.219 98.568 107.952 98.9873 107.761C99.4066 107.565 99.8965 107.467 100.457 107.467C101.049 107.467 101.569 107.585 102.016 107.822C102.462 108.055 102.813 108.381 103.068 108.8C103.328 109.215 103.463 109.698 103.472 110.249H101.92C101.906 109.976 101.838 109.729 101.715 109.511C101.596 109.287 101.428 109.11 101.209 108.978C100.995 108.845 100.737 108.779 100.437 108.779C100.104 108.779 99.8281 108.848 99.6094 108.984C99.3906 109.117 99.2197 109.299 99.0967 109.531C98.9736 109.759 98.8848 110.017 98.8301 110.304C98.7799 110.586 98.7549 110.88 98.7549 111.186V111.425C98.7549 111.73 98.7799 112.026 98.8301 112.313C98.8802 112.601 98.9668 112.858 99.0898 113.086C99.2174 113.309 99.3906 113.489 99.6094 113.626C99.8281 113.758 100.106 113.824 100.443 113.824ZM104.672 111.384V111.227C104.672 110.693 104.749 110.199 104.904 109.743C105.059 109.283 105.283 108.884 105.574 108.547C105.87 108.205 106.23 107.941 106.654 107.754C107.083 107.562 107.566 107.467 108.104 107.467C108.646 107.467 109.129 107.562 109.553 107.754C109.981 107.941 110.343 108.205 110.64 108.547C110.936 108.884 111.161 109.283 111.316 109.743C111.471 110.199 111.549 110.693 111.549 111.227V111.384C111.549 111.917 111.471 112.411 111.316 112.867C111.161 113.323 110.936 113.722 110.64 114.063C110.343 114.401 109.983 114.665 109.56 114.856C109.136 115.043 108.655 115.137 108.117 115.137C107.575 115.137 107.09 115.043 106.661 114.856C106.237 114.665 105.877 114.401 105.581 114.063C105.285 113.722 105.059 113.323 104.904 112.867C104.749 112.411 104.672 111.917 104.672 111.384ZM106.319 111.227V111.384C106.319 111.716 106.354 112.031 106.422 112.327C106.49 112.623 106.597 112.883 106.743 113.106C106.889 113.33 107.076 113.505 107.304 113.633C107.532 113.76 107.803 113.824 108.117 113.824C108.423 113.824 108.687 113.76 108.91 113.633C109.138 113.505 109.325 113.33 109.471 113.106C109.617 112.883 109.724 112.623 109.792 112.327C109.865 112.031 109.901 111.716 109.901 111.384V111.227C109.901 110.898 109.865 110.589 109.792 110.297C109.724 110.001 109.614 109.739 109.464 109.511C109.318 109.283 109.131 109.105 108.903 108.978C108.68 108.845 108.413 108.779 108.104 108.779C107.794 108.779 107.525 108.845 107.297 108.978C107.074 109.105 106.889 109.283 106.743 109.511C106.597 109.739 106.49 110.001 106.422 110.297C106.354 110.589 106.319 110.898 106.319 111.227ZM114.834 109.012V115H113.187V107.604H114.759L114.834 109.012ZM117.097 107.556L117.083 109.087C116.983 109.069 116.873 109.055 116.755 109.046C116.641 109.037 116.527 109.032 116.413 109.032C116.131 109.032 115.882 109.073 115.668 109.155C115.454 109.233 115.274 109.347 115.128 109.497C114.987 109.643 114.877 109.821 114.8 110.03C114.722 110.24 114.677 110.475 114.663 110.734L114.287 110.762C114.287 110.297 114.333 109.866 114.424 109.47C114.515 109.073 114.652 108.725 114.834 108.424C115.021 108.123 115.253 107.888 115.531 107.72C115.814 107.551 116.14 107.467 116.509 107.467C116.609 107.467 116.716 107.476 116.83 107.494C116.949 107.512 117.037 107.533 117.097 107.556ZM120.013 109.183V115H118.365V107.604H119.917L120.013 109.183ZM119.719 111.028L119.186 111.021C119.19 110.497 119.263 110.017 119.404 109.579C119.55 109.142 119.751 108.766 120.006 108.451C120.266 108.137 120.576 107.895 120.936 107.727C121.296 107.553 121.697 107.467 122.139 107.467C122.494 107.467 122.815 107.517 123.103 107.617C123.394 107.713 123.643 107.87 123.848 108.089C124.057 108.308 124.217 108.592 124.326 108.943C124.436 109.29 124.49 109.716 124.49 110.222V115H122.836V110.215C122.836 109.859 122.784 109.579 122.679 109.374C122.578 109.164 122.43 109.016 122.234 108.93C122.043 108.839 121.804 108.793 121.517 108.793C121.234 108.793 120.981 108.852 120.758 108.971C120.535 109.089 120.345 109.251 120.19 109.456C120.04 109.661 119.924 109.898 119.842 110.167C119.76 110.436 119.719 110.723 119.719 111.028ZM129.683 115.137C129.136 115.137 128.641 115.048 128.199 114.87C127.762 114.688 127.388 114.435 127.078 114.111C126.773 113.788 126.538 113.407 126.374 112.97C126.21 112.532 126.128 112.061 126.128 111.555V111.281C126.128 110.702 126.212 110.178 126.381 109.709C126.549 109.24 126.784 108.839 127.085 108.506C127.386 108.169 127.741 107.911 128.151 107.733C128.562 107.556 129.006 107.467 129.484 107.467C130.013 107.467 130.476 107.556 130.872 107.733C131.269 107.911 131.597 108.162 131.856 108.485C132.121 108.804 132.317 109.185 132.444 109.627C132.576 110.069 132.643 110.557 132.643 111.09V111.794H126.928V110.611H131.016V110.481C131.007 110.185 130.947 109.907 130.838 109.647C130.733 109.388 130.571 109.178 130.353 109.019C130.134 108.859 129.842 108.779 129.478 108.779C129.204 108.779 128.96 108.839 128.746 108.957C128.536 109.071 128.361 109.237 128.22 109.456C128.078 109.675 127.969 109.939 127.892 110.249C127.819 110.554 127.782 110.898 127.782 111.281V111.555C127.782 111.878 127.826 112.179 127.912 112.457C128.003 112.73 128.135 112.97 128.309 113.175C128.482 113.38 128.691 113.542 128.938 113.66C129.184 113.774 129.464 113.831 129.778 113.831C130.175 113.831 130.528 113.751 130.838 113.592C131.148 113.432 131.417 113.207 131.645 112.915L132.513 113.756C132.353 113.988 132.146 114.212 131.891 114.426C131.635 114.635 131.323 114.806 130.954 114.938C130.59 115.071 130.166 115.137 129.683 115.137ZM135.832 109.012V115H134.185V107.604H135.757L135.832 109.012ZM138.095 107.556L138.081 109.087C137.981 109.069 137.871 109.055 137.753 109.046C137.639 109.037 137.525 109.032 137.411 109.032C137.129 109.032 136.88 109.073 136.666 109.155C136.452 109.233 136.272 109.347 136.126 109.497C135.985 109.643 135.875 109.821 135.798 110.03C135.72 110.24 135.675 110.475 135.661 110.734L135.285 110.762C135.285 110.297 135.331 109.866 135.422 109.47C135.513 109.073 135.65 108.725 135.832 108.424C136.019 108.123 136.251 107.888 136.529 107.72C136.812 107.551 137.138 107.467 137.507 107.467C137.607 107.467 137.714 107.476 137.828 107.494C137.947 107.512 138.035 107.533 138.095 107.556Z" fill="white"/>
<path d="M23.6699 131.5V131.969C23.6699 132.613 23.5859 133.191 23.418 133.703C23.25 134.215 23.0098 134.65 22.6973 135.01C22.3887 135.369 22.0176 135.645 21.584 135.836C21.1504 136.023 20.6699 136.117 20.1426 136.117C19.6191 136.117 19.1406 136.023 18.707 135.836C18.2773 135.645 17.9043 135.369 17.5879 135.01C17.2715 134.65 17.0254 134.215 16.8496 133.703C16.6777 133.191 16.5918 132.613 16.5918 131.969V131.5C16.5918 130.855 16.6777 130.279 16.8496 129.771C17.0215 129.26 17.2637 128.824 17.5762 128.465C17.8926 128.102 18.2656 127.826 18.6953 127.639C19.1289 127.447 19.6074 127.352 20.1309 127.352C20.6582 127.352 21.1387 127.447 21.5723 127.639C22.0059 127.826 22.3789 128.102 22.6914 128.465C23.0039 128.824 23.2441 129.26 23.4121 129.771C23.584 130.279 23.6699 130.855 23.6699 131.5ZM22.1992 131.969V131.488C22.1992 131.012 22.1523 130.592 22.0586 130.229C21.9688 129.861 21.834 129.555 21.6543 129.309C21.4785 129.059 21.2617 128.871 21.0039 128.746C20.7461 128.617 20.4551 128.553 20.1309 128.553C19.8066 128.553 19.5176 128.617 19.2637 128.746C19.0098 128.871 18.793 129.059 18.6133 129.309C18.4375 129.555 18.3027 129.861 18.209 130.229C18.1152 130.592 18.0684 131.012 18.0684 131.488V131.969C18.0684 132.445 18.1152 132.867 18.209 133.234C18.3027 133.602 18.4395 133.912 18.6191 134.166C18.8027 134.416 19.0215 134.605 19.2754 134.734C19.5293 134.859 19.8184 134.922 20.1426 134.922C20.4707 134.922 20.7617 134.859 21.0156 134.734C21.2695 134.605 21.4844 134.416 21.6602 134.166C21.8359 133.912 21.9688 133.602 22.0586 133.234C22.1523 132.867 22.1992 132.445 22.1992 131.969ZM28.8809 132.818H26.6602V131.652H28.8809C29.2676 131.652 29.5801 131.59 29.8184 131.465C30.0566 131.34 30.2305 131.168 30.3398 130.949C30.4531 130.727 30.5098 130.473 30.5098 130.188C30.5098 129.918 30.4531 129.666 30.3398 129.432C30.2305 129.193 30.0566 129.002 29.8184 128.857C29.5801 128.713 29.2676 128.641 28.8809 128.641H27.1113V136H25.6406V127.469H28.8809C29.541 127.469 30.1016 127.586 30.5625 127.82C31.0273 128.051 31.3809 128.371 31.623 128.781C31.8652 129.188 31.9863 129.652 31.9863 130.176C31.9863 130.727 31.8652 131.199 31.623 131.594C31.3809 131.988 31.0273 132.291 30.5625 132.502C30.1016 132.713 29.541 132.818 28.8809 132.818ZM39.3887 134.834V136H34.8594V134.834H39.3887ZM35.2754 127.469V136H33.8047V127.469H35.2754ZM38.7969 131.031V132.18H34.8594V131.031H38.7969ZM39.3594 127.469V128.641H34.8594V127.469H39.3594ZM47.8574 127.469V136H46.3867L42.5605 129.889V136H41.0898V127.469H42.5605L46.3984 133.592V127.469H47.8574ZM55.6934 134.834V136H51.1641V134.834H55.6934ZM51.5801 127.469V136H50.1094V127.469H51.5801ZM55.1016 131.031V132.18H51.1641V131.031H55.1016ZM55.6641 127.469V128.641H51.1641V127.469H55.6641ZM59.873 136H58.0508L58.0625 134.834H59.873C60.4004 134.834 60.8418 134.719 61.1973 134.488C61.5566 134.258 61.8262 133.928 62.0059 133.498C62.1895 133.068 62.2812 132.557 62.2812 131.963V131.5C62.2812 131.039 62.2285 130.631 62.123 130.275C62.0215 129.92 61.8691 129.621 61.666 129.379C61.4668 129.137 61.2207 128.953 60.9277 128.828C60.6387 128.703 60.3047 128.641 59.9258 128.641H58.0156V127.469H59.9258C60.4922 127.469 61.0098 127.564 61.4785 127.756C61.9473 127.943 62.3516 128.215 62.6914 128.57C63.0352 128.926 63.2988 129.352 63.4824 129.848C63.666 130.344 63.7578 130.898 63.7578 131.512V131.963C63.7578 132.576 63.666 133.131 63.4824 133.627C63.2988 134.123 63.0352 134.549 62.6914 134.904C62.3477 135.256 61.9375 135.527 61.4609 135.719C60.9883 135.906 60.459 136 59.873 136ZM58.8652 127.469V136H57.3945V127.469H58.8652Z" fill="white" fill-opacity="0.8"/>
</svg>
",
+  "description": "Displays current status.",
+  "descriptor": {
+    "type": "rpc",
+    "sizeX": 2,
+    "sizeY": 2,
+    "resources": [],
+    "templateHtml": "<tb-status-widget\n    [ctx]='ctx'\n    [widgetTitlePanel]=\"widgetTitlePanel\">\n</tb-status-widget>",
+    "templateCss": "",
+    "controllerScript": "self.onInit = function() {\n    self.ctx.$scope.actionWidget.onInit();\n}\n\nself.typeParameters = function() {\n    return {\n        previewWidth: '180px',\n        previewHeight: '180px',\n        embedTitlePanel: true,\n        displayRpcMessageToast: false\n    };\n};\n\nself.onDestroy = function() {\n}\n",
+    "settingsSchema": "",
+    "dataKeySettingsSchema": "{}\n",
+    "settingsDirective": "tb-status-widget-settings",
+    "hasBasicMode": true,
+    "basicModeDirective": "tb-status-widget-basic-config",
+    "defaultConfig": "{\"showTitle\":false,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{},\"title\":\"Status widget\",\"dropShadow\":true,\"enableFullscreen\":false,\"widgetStyle\":{},\"actions\":{},\"widgetCss\":\"\",\"noDataDisplayMessage\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":null,\"lineHeight\":\"1.6\"},\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"pageSize\":1024,\"titleIcon\":\"mdi:lightbulb-outline\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"configMode\":\"basic\",\"targetDevice\":null,\"titleColor\":null,\"borderRadius\":null}"
+  },
+  "tags": [
+    "status",
+    "status widget"
+  ]
+}
\ No newline at end of file
diff --git a/application/src/main/data/upgrade/3.6.3/schema_update.sql b/application/src/main/data/upgrade/3.6.3/schema_update.sql
index e2d454353e..3e0fdc3b4b 100644
--- a/application/src/main/data/upgrade/3.6.3/schema_update.sql
+++ b/application/src/main/data/upgrade/3.6.3/schema_update.sql
@@ -14,95 +14,14 @@
 -- limitations under the License.
 --
 
+-- NOTIFICATIONS UPDATE START
 
--- create new attribute_kv table schema
-DO
-$$
-    BEGIN
-        -- in case of running the upgrade script a second time:
-        IF EXISTS(SELECT 1 FROM information_schema.columns WHERE table_name = 'attribute_kv' and column_name='entity_type') THEN
-            DROP VIEW IF EXISTS device_info_view;
-            DROP VIEW IF EXISTS device_info_active_attribute_view;
-            ALTER INDEX IF EXISTS idx_attribute_kv_by_key_and_last_update_ts RENAME TO idx_attribute_kv_by_key_and_last_update_ts_old;
-            IF EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'attribute_kv_pkey') THEN
-                ALTER TABLE attribute_kv RENAME CONSTRAINT attribute_kv_pkey TO attribute_kv_pkey_old;
-            END IF;
-            ALTER TABLE attribute_kv RENAME TO attribute_kv_old;
-            CREATE TABLE IF NOT EXISTS attribute_kv
-            (
-                entity_id uuid,
-                attribute_type int,
-                attribute_key int,
-                bool_v boolean,
-                str_v varchar(10000000),
-                long_v bigint,
-                dbl_v double precision,
-                json_v json,
-                last_update_ts bigint,
-                CONSTRAINT attribute_kv_pkey PRIMARY KEY (entity_id, attribute_type, attribute_key)
-            );
-        END IF;
-    END;
-$$;
+ALTER TABLE notification ADD COLUMN IF NOT EXISTS delivery_method VARCHAR(50) NOT NULL default 'WEB';
 
--- rename ts_kv_dictionary table to key_dictionary or create table if not exists
-DO
-$$
-    BEGIN
-        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'ts_kv_dictionary') THEN
-            ALTER TABLE ts_kv_dictionary RENAME CONSTRAINT ts_key_id_pkey TO key_dictionary_id_pkey;
-            ALTER TABLE ts_kv_dictionary RENAME TO key_dictionary;
-        ELSE CREATE TABLE IF NOT EXISTS key_dictionary(
-                key    varchar(255) NOT NULL,
-                key_id serial UNIQUE,
-                CONSTRAINT key_dictionary_id_pkey PRIMARY KEY (key)
-                );
-        END IF;
-    END;
-$$;
+DROP INDEX IF EXISTS idx_notification_recipient_id_created_time;
+DROP INDEX IF EXISTS idx_notification_recipient_id_unread;
 
--- insert keys into key_dictionary
-DO
-$$
-    BEGIN
-        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
-            INSERT INTO key_dictionary(key) SELECT DISTINCT attribute_key FROM attribute_kv_old ON CONFLICT DO NOTHING;
-        END IF;
-    END;
-$$;
+CREATE INDEX IF NOT EXISTS idx_notification_delivery_method_recipient_id_created_time ON notification(delivery_method, recipient_id, created_time DESC);
+CREATE INDEX IF NOT EXISTS idx_notification_delivery_method_recipient_id_unread ON notification(delivery_method, recipient_id) WHERE status <> 'READ';
 
--- migrate attributes from attribute_kv_old to attribute_kv
-DO
-$$
-DECLARE
-    row_num_old integer;
-    row_num integer;
-BEGIN
-    IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
-        INSERT INTO attribute_kv(entity_id, attribute_type, attribute_key, bool_v, str_v, long_v, dbl_v, json_v, last_update_ts)
-            SELECT a.entity_id, CASE
-                        WHEN a.attribute_type = 'CLIENT_SCOPE' THEN 1
-                        WHEN a.attribute_type = 'SERVER_SCOPE' THEN 2
-                        WHEN a.attribute_type = 'SHARED_SCOPE' THEN 3
-                        ELSE 0
-                        END,
-                k.key_id,  a.bool_v, a.str_v, a.long_v, a.dbl_v, a.json_v, a.last_update_ts
-                FROM attribute_kv_old a INNER JOIN key_dictionary k ON (a.attribute_key = k.key);
-        SELECT COUNT(*) INTO row_num_old FROM attribute_kv_old;
-        SELECT COUNT(*) INTO row_num FROM attribute_kv;
-        RAISE NOTICE 'Migrated % of % rows', row_num, row_num_old;
-
-        IF row_num != 0 THEN
-            DROP TABLE IF EXISTS attribute_kv_old;
-        ELSE
-           RAISE EXCEPTION 'Table attribute_kv is empty';
-        END IF;
-
-        CREATE INDEX IF NOT EXISTS idx_attribute_kv_by_key_and_last_update_ts ON attribute_kv(entity_id, attribute_key, last_update_ts desc);
-    END IF;
-EXCEPTION
-    WHEN others THEN
-        ROLLBACK;
-        RAISE EXCEPTION 'Error during COPY: %', SQLERRM;
-END
-$$;
\ No newline at end of file
+-- NOTIFICATIONS UPDATE END
diff --git a/application/src/main/data/upgrade/3.6.4/schema_update.sql b/application/src/main/data/upgrade/3.6.4/schema_update.sql
new file mode 100644
index 0000000000..d7d8887d13
--- /dev/null
+++ b/application/src/main/data/upgrade/3.6.4/schema_update.sql
@@ -0,0 +1,136 @@
+--
+-- Copyright © 2016-2024 The Thingsboard Authors
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+-- create new attribute_kv table schema
+DO
+$$
+    BEGIN
+        -- in case of running the upgrade script a second time:
+        IF EXISTS(SELECT 1 FROM information_schema.columns WHERE table_name = 'attribute_kv' and column_name='entity_type') THEN
+            DROP VIEW IF EXISTS device_info_view;
+            DROP VIEW IF EXISTS device_info_active_attribute_view;
+            ALTER INDEX IF EXISTS idx_attribute_kv_by_key_and_last_update_ts RENAME TO idx_attribute_kv_by_key_and_last_update_ts_old;
+            IF EXISTS(SELECT 1 FROM pg_constraint WHERE conname = 'attribute_kv_pkey') THEN
+                ALTER TABLE attribute_kv RENAME CONSTRAINT attribute_kv_pkey TO attribute_kv_pkey_old;
+            END IF;
+            ALTER TABLE attribute_kv RENAME TO attribute_kv_old;
+            CREATE TABLE IF NOT EXISTS attribute_kv
+            (
+                entity_id uuid,
+                attribute_type int,
+                attribute_key int,
+                bool_v boolean,
+                str_v varchar(10000000),
+                long_v bigint,
+                dbl_v double precision,
+                json_v json,
+                last_update_ts bigint,
+                CONSTRAINT attribute_kv_pkey PRIMARY KEY (entity_id, attribute_type, attribute_key)
+            );
+        END IF;
+    END;
+$$;
+
+-- rename ts_kv_dictionary table to key_dictionary or create table if not exists
+DO
+$$
+    BEGIN
+        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'ts_kv_dictionary') THEN
+            ALTER TABLE ts_kv_dictionary RENAME CONSTRAINT ts_key_id_pkey TO key_dictionary_id_pkey;
+            ALTER TABLE ts_kv_dictionary RENAME TO key_dictionary;
+        ELSE CREATE TABLE IF NOT EXISTS key_dictionary(
+                key    varchar(255) NOT NULL,
+                key_id serial UNIQUE,
+                CONSTRAINT key_dictionary_id_pkey PRIMARY KEY (key)
+                );
+        END IF;
+    END;
+$$;
+
+-- insert keys into key_dictionary
+DO
+$$
+    BEGIN
+        IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
+            INSERT INTO key_dictionary(key) SELECT DISTINCT attribute_key FROM attribute_kv_old ON CONFLICT DO NOTHING;
+        END IF;
+    END;
+$$;
+
+-- migrate attributes from attribute_kv_old to attribute_kv
+DO
+$$
+DECLARE
+    row_num_old integer;
+    row_num integer;
+BEGIN
+    IF EXISTS(SELECT 1 FROM information_schema.tables WHERE table_name = 'attribute_kv_old') THEN
+        INSERT INTO attribute_kv(entity_id, attribute_type, attribute_key, bool_v, str_v, long_v, dbl_v, json_v, last_update_ts)
+            SELECT a.entity_id, CASE
+                        WHEN a.attribute_type = 'CLIENT_SCOPE' THEN 1
+                        WHEN a.attribute_type = 'SERVER_SCOPE' THEN 2
+                        WHEN a.attribute_type = 'SHARED_SCOPE' THEN 3
+                        ELSE 0
+                        END,
+                k.key_id,  a.bool_v, a.str_v, a.long_v, a.dbl_v, a.json_v, a.last_update_ts
+                FROM attribute_kv_old a INNER JOIN key_dictionary k ON (a.attribute_key = k.key);
+        SELECT COUNT(*) INTO row_num_old FROM attribute_kv_old;
+        SELECT COUNT(*) INTO row_num FROM attribute_kv;
+        RAISE NOTICE 'Migrated % of % rows', row_num, row_num_old;
+
+        IF row_num != 0 THEN
+            DROP TABLE IF EXISTS attribute_kv_old;
+        ELSE
+           RAISE EXCEPTION 'Table attribute_kv is empty';
+        END IF;
+
+        CREATE INDEX IF NOT EXISTS idx_attribute_kv_by_key_and_last_update_ts ON attribute_kv(entity_id, attribute_key, last_update_ts desc);
+    END IF;
+EXCEPTION
+    WHEN others THEN
+        ROLLBACK;
+        RAISE EXCEPTION 'Error during COPY: %', SQLERRM;
+END
+$$;
+
+-- OAUTH2 PARAMS ALTER TABLE START
+
+ALTER TABLE oauth2_params
+    ADD COLUMN IF NOT EXISTS edge_enabled boolean DEFAULT false;
+
+-- OAUTH2 PARAMS ALTER TABLE END
+
+-- QUEUE STATS UPDATE START
+
+CREATE TABLE IF NOT EXISTS queue_stats (
+    id uuid NOT NULL CONSTRAINT queue_stats_pkey PRIMARY KEY,
+    created_time bigint NOT NULL,
+    tenant_id uuid NOT NULL,
+    queue_name varchar(255) NOT NULL,
+    service_id varchar(255) NOT NULL,
+    CONSTRAINT queue_stats_name_unq_key UNIQUE (tenant_id, queue_name, service_id)
+);
+
+INSERT INTO queue_stats
+    SELECT id, created_time, tenant_id, substring(name FROM 1 FOR position('_' IN name) - 1) AS queue_name,
+           substring(name FROM position('_' IN name) + 1) AS service_id
+    FROM asset
+    WHERE type = 'TbServiceQueue' and name LIKE '%\_%';
+
+DELETE FROM asset WHERE type='TbServiceQueue';
+DELETE FROM asset_profile WHERE name ='TbServiceQueue';
+
+-- QUEUE STATS UPDATE END
diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
index 6a10791091..f411344e3f 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
+++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
@@ -19,6 +19,8 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -79,6 +81,7 @@ import org.thingsboard.server.dao.notification.NotificationTargetService;
 import org.thingsboard.server.dao.notification.NotificationTemplateService;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.queue.QueueService;
+import org.thingsboard.server.dao.queue.QueueStatsService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
@@ -115,9 +118,6 @@ import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 import org.thingsboard.server.service.transport.TbCoreToTransportService;
 
-import jakarta.annotation.Nullable;
-import jakarta.annotation.PostConstruct;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.concurrent.ConcurrentHashMap;
@@ -447,6 +447,11 @@ public class ActorSystemContext {
     @Getter
     private QueueService queueService;
 
+    @Lazy
+    @Autowired(required = false)
+    @Getter
+    private QueueStatsService queueStatsService;
+
     @Lazy
     @Autowired(required = false)
     @Getter
diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
index d6b5da4ddf..87d5c8a63a 100644
--- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
@@ -21,6 +21,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.thingsboard.common.util.JacksonUtil;
@@ -42,7 +43,6 @@ import org.thingsboard.server.common.data.id.RpcId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.AttributeKey;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
-import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.SortOrder;
@@ -68,14 +68,11 @@ import org.thingsboard.server.common.msg.rule.engine.DeviceEdgeUpdateMsg;
 import org.thingsboard.server.common.msg.rule.engine.DeviceNameOrTypeUpdateMsg;
 import org.thingsboard.server.common.msg.timeout.DeviceActorServerSideRpcTimeoutMsg;
 import org.thingsboard.server.common.util.KvProtoUtil;
-import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.AttributeUpdateNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ClaimDeviceMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.DeviceSessionsCacheEntry;
 import org.thingsboard.server.gen.transport.TransportProtos.GetAttributeRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetAttributeResponseMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.KeyValueProto;
-import org.thingsboard.server.gen.transport.TransportProtos.KeyValueType;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionCloseNotificationProto;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionEvent;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionEventMsg;
@@ -97,7 +94,6 @@ import org.thingsboard.server.service.rpc.RpcSubmitStrategy;
 import org.thingsboard.server.service.state.DefaultDeviceStateService;
 import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWrapper;
 
-import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -255,14 +251,12 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
     }
 
     private boolean isSendNewRpcAvailable() {
-        switch (rpcSubmitStrategy) {
-            case SEQUENTIAL_ON_ACK_FROM_DEVICE:
-                return toDeviceRpcPendingMap.values().stream().filter(md -> !md.isDelivered()).findAny().isEmpty();
-            case SEQUENTIAL_ON_RESPONSE_FROM_DEVICE:
-                return toDeviceRpcPendingMap.values().stream().filter(ToDeviceRpcRequestMetadata::isDelivered).findAny().isEmpty();
-            default:
-                return true;
-        }
+        return switch (rpcSubmitStrategy) {
+            case SEQUENTIAL_ON_ACK_FROM_DEVICE -> toDeviceRpcPendingMap.values().stream().filter(md -> !md.isDelivered()).findAny().isEmpty();
+            case SEQUENTIAL_ON_RESPONSE_FROM_DEVICE ->
+                    toDeviceRpcPendingMap.values().stream().filter(ToDeviceRpcRequestMetadata::isDelivered).findAny().isEmpty();
+            default -> true;
+        };
     }
 
     private void createRpc(ToDeviceRpcRequest request, RpcStatus status) {
@@ -466,7 +460,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
             handleSessionActivity(sessionInfo, msg.getSubscriptionInfo());
         }
         if (msg.hasClaimDevice()) {
-            handleClaimDeviceMsg(msg.getClaimDevice());
+            handleClaimDeviceMsg(sessionInfo, msg.getClaimDevice());
         }
         if (msg.hasRpcResponseStatusMsg()) {
             processRpcResponseStatus(sessionInfo, msg.getRpcResponseStatusMsg());
@@ -491,9 +485,22 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
                 });
     }
 
-    private void handleClaimDeviceMsg(ClaimDeviceMsg msg) {
+    private void handleClaimDeviceMsg(SessionInfoProto sessionInfo, ClaimDeviceMsg msg) {
+        UUID sessionId = getSessionId(sessionInfo);
         DeviceId deviceId = new DeviceId(new UUID(msg.getDeviceIdMSB(), msg.getDeviceIdLSB()));
-        systemContext.getClaimDevicesService().registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
+        ListenableFuture<Void> registrationFuture = systemContext.getClaimDevicesService()
+                        .registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
+        Futures.addCallback(registrationFuture, new FutureCallback<>() {
+            @Override
+            public void onSuccess(Void result) {
+                log.debug("[{}][{}] Successfully processed register claiming info request!", sessionId, deviceId);
+            }
+
+            @Override
+            public void onFailure(Throwable t) {
+                log.error("[{}][{}] Failed to process register claiming info request due to: ", sessionId, deviceId, t);
+            }
+        }, MoreExecutors.directExecutor());
     }
 
     private void reportSessionOpen() {
@@ -928,34 +935,6 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         return systemContext.getEdgeEventService().saveAsync(edgeEvent);
     }
 
-    private KeyValueProto toKeyValueProto(KvEntry kvEntry) {
-        KeyValueProto.Builder builder = KeyValueProto.newBuilder();
-        builder.setKey(kvEntry.getKey());
-        switch (kvEntry.getDataType()) {
-            case BOOLEAN:
-                builder.setType(KeyValueType.BOOLEAN_V);
-                builder.setBoolV(kvEntry.getBooleanValue().get());
-                break;
-            case DOUBLE:
-                builder.setType(KeyValueType.DOUBLE_V);
-                builder.setDoubleV(kvEntry.getDoubleValue().get());
-                break;
-            case LONG:
-                builder.setType(KeyValueType.LONG_V);
-                builder.setLongV(kvEntry.getLongValue().get());
-                break;
-            case STRING:
-                builder.setType(KeyValueType.STRING_V);
-                builder.setStringV(kvEntry.getStrValue().get());
-                break;
-            case JSON:
-                builder.setType(KeyValueType.JSON_V);
-                builder.setJsonV(kvEntry.getJsonValue().get());
-                break;
-        }
-        return builder.build();
-    }
-
     void restoreSessions() {
         if (systemContext.isLocalCacheType()) {
             return;
diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
index 79dddfdbe4..0dc9d68984 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
+++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
@@ -96,6 +96,7 @@ import org.thingsboard.server.dao.notification.NotificationTargetService;
 import org.thingsboard.server.dao.notification.NotificationTemplateService;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.queue.QueueService;
+import org.thingsboard.server.dao.queue.QueueStatsService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
@@ -768,6 +769,11 @@ class DefaultTbContext implements TbContext {
         return mainCtx.getQueueService();
     }
 
+    @Override
+    public QueueStatsService getQueueStatsService() {
+        return mainCtx.getQueueStatsService();
+    }
+
     @Override
     public EventLoopGroup getSharedEventLoop() {
         return mainCtx.getSharedEventLoopGroupService().getSharedEventLoopGroup();
diff --git a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
index 21255bf1f7..963205c08b 100644
--- a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
@@ -15,12 +15,17 @@
  */
 package org.thingsboard.server.config;
 
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.v3.core.converter.AnnotatedType;
+import io.swagger.v3.core.converter.ModelConverter;
 import io.swagger.v3.core.converter.ModelConverters;
+import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.Paths;
 import io.swagger.v3.oas.models.examples.Example;
 import io.swagger.v3.oas.models.info.Contact;
 import io.swagger.v3.oas.models.info.Info;
@@ -33,29 +38,42 @@ import io.swagger.v3.oas.models.responses.ApiResponse;
 import io.swagger.v3.oas.models.responses.ApiResponses;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
-import io.swagger.v3.oas.models.servers.Server;
 import io.swagger.v3.oas.models.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springdoc.core.customizers.OpenApiCustomizer;
+import org.springdoc.core.customizers.OperationCustomizer;
+import org.springdoc.core.customizers.RouterOperationCustomizer;
+import org.springdoc.core.discoverer.SpringDocParameterNameDiscoverer;
 import org.springdoc.core.models.GroupedOpenApi;
+import org.springdoc.core.properties.SpringDocConfigProperties;
 import org.springdoc.core.properties.SwaggerUiConfigProperties;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Primary;
 import org.springframework.context.annotation.Profile;
+import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.exception.ThingsboardCredentialsExpiredResponse;
 import org.thingsboard.server.exception.ThingsboardErrorResponse;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.auth.rest.LoginRequest;
 import org.thingsboard.server.service.security.auth.rest.LoginResponse;
 
-import java.util.Collections;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
@@ -67,8 +85,14 @@ public class SwaggerConfiguration {
 
     public static final String LOGIN_ENDPOINT = "/api/auth/login";
 
+    private static final ApiResponses loginResponses = loginResponses();
+    private static final ApiResponses defaultErrorResponses = defaultErrorResponses(false);
+    private static final ApiResponses defaultPostErrorResponses = defaultErrorResponses(true);
+
     @Value("${swagger.api_path:/api/**}")
     private String apiPath;
+    @Value("${swagger.security_path_regex}")
+    private String securityPathRegex;
     @Value("${swagger.non_security_path_regex}")
     private String nonSecurityPathRegex;
     @Value("${swagger.title}")
@@ -90,6 +114,7 @@ public class SwaggerConfiguration {
     @Value("${app.version:unknown}")
     private String appVersion;
 
+
     @Bean
     public OpenAPI thingsboardApi() {
         Contact contact = new Contact()
@@ -115,93 +140,24 @@ public class SwaggerConfiguration {
 
         SecurityScheme securityScheme = new SecurityScheme()
                 .type(SecurityScheme.Type.HTTP)
-                .scheme("bearer")
-                .bearerFormat("JWT")
-                .in(SecurityScheme.In.HEADER)
-                .description("Enter Username / Password");
+                .description("Enter Username / Password")
+                .scheme("loginPassword")
+                .bearerFormat("/api/auth/login|X-Authorization");
 
         var openApi = new OpenAPI()
-                .addServersItem(new Server().url("/").description("Default Server URL"))
                 .components(new Components().addSecuritySchemes("HTTP login form", securityScheme))
                 .info(info);
+        addDefaultSchemas(openApi);
         addLoginOperation(openApi);
         return openApi;
     }
 
-    public void addLoginOperation(OpenAPI openAPI) {
-        openAPI.getComponents()
-                .addSchemas("LoginRequest", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(LoginRequest.class)).schema)
-                .addSchemas("LoginResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(LoginResponse.class)).schema)
-                .addSchemas("ThingsboardErrorResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(ThingsboardErrorResponse.class)).schema)
-                .addSchemas("ThingsboardCredentialsExpiredResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(ThingsboardCredentialsExpiredResponse.class)).schema);
-
-        var operation = new Operation();
-        operation.summary("Login method to get user JWT token data");
-        operation.description("Login method used to authenticate user and get JWT token data.\n\nValue of the response **token** " +
-                "field can be used as **X-Authorization** header value:\n\n`X-Authorization: Bearer $JWT_TOKEN_VALUE`.");
-        var requestBody = new RequestBody().content(new Content().addMediaType(APPLICATION_JSON_VALUE,
-                new MediaType().schema(new Schema<LoginRequest>().$ref("#/components/schemas/LoginRequest"))));
-        operation.requestBody(requestBody);
-        operation.responses(getResponses());
-        operation.addTagsItem("login-endpoint");
-        var pathItem = new PathItem().post(operation);
-        openAPI.path(LOGIN_ENDPOINT, pathItem);
-    }
-
-    private ApiResponses getResponses() {
-        ApiResponses apiResponses = new ApiResponses();
-
-        apiResponses.addApiResponse("200", new ApiResponse().description("OK")
-                .content(new Content().addMediaType(APPLICATION_JSON_VALUE,
-                        new MediaType().schema(new Schema<LoginResponse>().$ref("#/components/schemas/LoginResponse")))));
-
-        ApiResponse unauthorizedResponse = new ApiResponse().description("Unauthorized");
-        Content content = new Content();
-        MediaType mediaType = new MediaType().schema(new Schema<ThingsboardErrorResponse>().$ref("#/components/schemas/ThingsboardErrorResponse"));
-
-        Map<String, Example> examples = Map.of(
-                "bad-credentials", errorExample("Bad credentials",
-                        ThingsboardErrorResponse.of("Invalid username or password", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
-                "token-expired", errorExample("JWT token expired",
-                        ThingsboardErrorResponse.of("Token has expired", ThingsboardErrorCode.JWT_TOKEN_EXPIRED, HttpStatus.UNAUTHORIZED)),
-                "account-disabled", errorExample("Disabled account",
-                        ThingsboardErrorResponse.of("User account is not active", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
-                "account-locked", errorExample("Locked account",
-                        ThingsboardErrorResponse.of("User account is locked due to security policy", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
-                "authentication-failed", errorExample("General authentication error",
-                        ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED))
-        );
-
-        mediaType.setExamples(examples);
-        content.addMediaType(APPLICATION_JSON_VALUE, mediaType);
-        unauthorizedResponse.setContent(content);
-        apiResponses.addApiResponse("401", unauthorizedResponse);
-
-        ApiResponse expiredCredentialsResponse = new ApiResponse().description("Unauthorized (**Expired credentials**)");
-        Content expiredContent = new Content();
-        MediaType expiredMediaType = new MediaType().schema(new Schema<ThingsboardCredentialsExpiredResponse>().$ref("#/components/schemas/ThingsboardCredentialsExpiredResponse"));
-        expiredMediaType.addExamples("credentials-expired", errorExample("Expired credentials",
-                ThingsboardCredentialsExpiredResponse.of("User password expired!", StringUtils.randomAlphanumeric(30))));
-        expiredContent.addMediaType(APPLICATION_JSON_VALUE, expiredMediaType);
-        expiredCredentialsResponse.setContent(expiredContent);
-        apiResponses.addApiResponse("401 ", expiredCredentialsResponse);
-
-        return apiResponses;
-    }
-
-    private Example errorExample(String summary, ThingsboardErrorResponse example) {
-        return new Example()
-                .summary(summary)
-                .value(example);
-    }
-
     @Bean
-    public GroupedOpenApi groupedApi() {
-        return GroupedOpenApi.builder()
-                .group("thingsboard")
-                .pathsToMatch(apiPath)
-                .addOpenApiCustomizer(customOpenApiCustomizer())
-                .build();
+    @Primary
+    public SpringDocConfigProperties springDocConfig(SpringDocConfigProperties springDocProperties) {
+        springDocProperties.getApiDocs().setVersion(SpringDocConfigProperties.ApiDocs.OpenApiVersion.OPENAPI_3_1);
+        springDocProperties.setRemoveBrokenReferenceDefinitions(false);
+        return springDocProperties;
     }
 
     @Bean
@@ -232,35 +188,166 @@ public class SwaggerConfiguration {
         return uiProperties;
     }
 
-    public OpenApiCustomizer customOpenApiCustomizer() {
-        var loginForm = new SecurityRequirement().addList("HTTP login form");
-        return openAPI -> openAPI.getPaths().entrySet().stream().peek(entry -> {
-            securityCustomization(loginForm, entry);
-            if (!entry.getKey().equals(LOGIN_ENDPOINT)) {
-                defaultErrorResponsesCustomization(entry.getValue());
+    private void addLoginOperation(OpenAPI openAPI) {
+        var operation = new Operation();
+        operation.summary("Login method to get user JWT token data");
+        operation.description("""
+                Login method used to authenticate user and get JWT token data.
+
+                Value of the response **token** field can be used as **X-Authorization** header value:
+
+                `X-Authorization: Bearer $JWT_TOKEN_VALUE`.""");
+        var requestBody = new RequestBody().description("Login request")
+                .content(new Content().addMediaType(APPLICATION_JSON_VALUE,
+                new MediaType().schema(new Schema<LoginRequest>().$ref("#/components/schemas/LoginRequest"))));
+        operation.requestBody(requestBody);
+
+        operation.responses(loginResponses);
+
+        operation.addTagsItem("login-endpoint");
+        var pathItem = new PathItem().post(operation);
+        openAPI.path(LOGIN_ENDPOINT, pathItem);
+    }
+
+    @Bean
+    public GroupedOpenApi groupedApi(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
+        return GroupedOpenApi.builder()
+                .group("thingsboard")
+                .pathsToMatch(apiPath)
+                .addRouterOperationCustomizer(routerOperationCustomizer(localSpringDocParameterNameDiscoverer))
+                .addOperationCustomizer(operationCustomizer())
+                .addOpenApiCustomizer(customOpenApiCustomizer())
+                .build();
+    }
+
+    @Bean
+    @Lazy(false)
+    ModelConverter mapAwareConverter() {
+        return (type, context, chain) -> {
+            if (chain.hasNext()) {
+                Schema schema = chain.next().resolve(type, context, chain);
+                JavaType javaType = Json.mapper().constructType(type.getType());
+                if (javaType != null) {
+                    Class<?> cls = javaType.getRawClass();
+                    if (Map.class.isAssignableFrom(cls)) {
+                        if (schema != null && schema.getProperties() != null) {
+                            schema.getProperties().remove("empty");
+                            if (schema.getProperties().isEmpty()) {
+                                schema.setProperties(null);
+                            }
+                        }
+                    }
+                }
+                return schema;
+            } else {
+                return null;
             }
-        }).map(this::tagsCustomization).forEach(openAPI::addTagsItem);
+        };
     }
 
-    private Tag tagsCustomization(Map.Entry<String, PathItem> entry) {
-        var operations = entry.getValue().readOperationsMap().values();
-        var tagItem = operations.stream().findAny().get().getTags().get(0);
-        return tagFromTagItem(tagItem);
+    private void addDefaultSchemas(OpenAPI openAPI) {
+        var jsonNodeSchema = ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(JsonNode.class)).schema;
+        jsonNodeSchema.setType("any");
+        //noinspection unchecked
+        jsonNodeSchema.setExamples(List.of(JacksonUtil.newObjectNode()));
+        jsonNodeSchema.setDescription("A value representing the any type (object or primitive)");
+        openAPI.getComponents()
+                .addSchemas("JsonNode", jsonNodeSchema)
+                .addSchemas("LoginRequest", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(LoginRequest.class)).schema)
+                .addSchemas("LoginResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(LoginResponse.class)).schema)
+                .addSchemas("ThingsboardErrorResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(ThingsboardErrorResponse.class)).schema)
+                .addSchemas("ThingsboardCredentialsExpiredResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(ThingsboardCredentialsExpiredResponse.class)).schema);
     }
 
-    private void defaultErrorResponsesCustomization(PathItem pathItem) {
-        pathItem.readOperationsMap().forEach(((httpMethod, operation) -> {
-            operation.setResponses(getResponses(operation.getResponses(), httpMethod.equals(PathItem.HttpMethod.POST)));
-        }));
+    private RouterOperationCustomizer routerOperationCustomizer(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
+        return (routerOperation, handlerMethod) -> {
+            String[] pNames = localSpringDocParameterNameDiscoverer.getParameterNames(handlerMethod.getMethod());
+            String[] reflectionParametersNames = Arrays.stream(handlerMethod.getMethod().getParameters()).map(java.lang.reflect.Parameter::getName).toArray(String[]::new);
+            if (pNames == null || Arrays.stream(pNames).anyMatch(Objects::isNull))
+                pNames = reflectionParametersNames;
+            MethodParameter[] parameters = handlerMethod.getMethodParameters();
+            List<String> requestParams = new ArrayList<>();
+            for (var i = 0; i < parameters.length; i++) {
+                var methodParameter = parameters[i];
+                RequestParam requestParam = methodParameter.getParameterAnnotation(RequestParam.class);
+                if (requestParam != null) {
+                    String pName = StringUtils.isNotBlank(requestParam.value()) ? requestParam.value() :
+                            pNames[i];
+                    if (StringUtils.isNotBlank(pName)) {
+                        requestParams.add(pName);
+                    }
+                }
+            }
+            if (!requestParams.isEmpty()) {
+                var path = routerOperation.getPath() + "{?" + String.join(",", requestParams) + "}";
+                routerOperation.setPath(path);
+            }
+            return routerOperation;
+        };
     }
 
-    private void securityCustomization(SecurityRequirement loginForm, Map.Entry<String, PathItem> entry) {
-        if (!(entry.getKey().matches(nonSecurityPathRegex) || entry.getKey().equals(LOGIN_ENDPOINT))) {
-            entry.getValue()
-                    .readOperationsMap()
-                    .values()
-                    .forEach(operation -> operation.addSecurityItem(loginForm));
+    private OperationCustomizer operationCustomizer() {
+        return (operation, handlerMethod) -> {
+            if (StringUtils.isBlank(operation.getSummary())) {
+                operation.setSummary(operation.getOperationId());
+            }
+            return operation;
+        };
+    }
+
+    private OpenApiCustomizer customOpenApiCustomizer() {
+        var loginForm = new SecurityRequirement().addList("HTTP login form", Arrays.asList(
+                Authority.SYS_ADMIN.name(),
+                Authority.TENANT_ADMIN.name(),
+                Authority.CUSTOMER_USER.name()
+        ));
+        return openAPI -> {
+            var paths = openAPI.getPaths();
+            paths.entrySet().stream().peek(entry -> {
+                securityCustomization(loginForm, entry);
+                if (!entry.getKey().equals(LOGIN_ENDPOINT)) {
+                    defaultErrorResponsesCustomization(entry.getValue());
+                }
+            }).map(this::tagsCustomization).filter(Objects::nonNull).distinct().sorted(Comparator.comparing(Tag::getName)).forEach(openAPI::addTagsItem);
+
+            var pathItemsByTags = new TreeMap<String, Map<String, PathItem>>();
+            paths.forEach((k, v) -> {
+                var tagItem = tagItemFromPathItem(v);
+                if (tagItem != null) {
+                    var pathItemMap = pathItemsByTags.computeIfAbsent(tagItem, k1 -> new TreeMap<>());
+                    pathItemMap.put(k, v);
+                }
+            });
+            var sortedPaths = new Paths();
+            pathItemsByTags.forEach((tagItem, pathItemMap) -> {
+                pathItemMap.forEach(sortedPaths::addPathItem);
+            });
+            sortedPaths.setExtensions(paths.getExtensions());
+            openAPI.setPaths(sortedPaths);
+            var sortedSchemas = new TreeMap<>(openAPI.getComponents().getSchemas());
+            openAPI.getComponents().setSchemas(new LinkedHashMap<>(sortedSchemas));
+        };
+    }
+
+
+    private Tag tagsCustomization(Map.Entry<String, PathItem> entry) {
+        var tagItem = tagItemFromPathItem(entry.getValue());
+        if (tagItem != null) {
+            return tagFromTagItem(tagItem);
         }
+        return null;
+    }
+
+    private String tagItemFromPathItem(PathItem item) {
+        var operations = item.readOperationsMap().values();
+        var operation = operations.stream().findAny();
+        if (operation.isPresent()) {
+            var tags = operation.get().getTags();
+            if (tags != null && !tags.isEmpty()) {
+                return tags.get(0);
+            }
+        }
+        return null;
     }
 
     private Tag tagFromTagItem(String tagItem) {
@@ -276,32 +363,113 @@ public class SwaggerConfiguration {
         return new Tag().name(tagItem).description(sb.toString().trim());
     }
 
-    private ApiResponses getResponses(ApiResponses apiResponses, boolean isPost) {
-        if (apiResponses == null) {
-            apiResponses = new ApiResponses();
+    private void defaultErrorResponsesCustomization(PathItem pathItem) {
+        pathItem.readOperationsMap().forEach(((httpMethod, operation) -> {
+            var errorResponses = httpMethod.equals(PathItem.HttpMethod.POST) ? defaultPostErrorResponses : defaultErrorResponses;
+            var responses = operation.getResponses();
+            if (responses == null) {
+                responses = errorResponses;
+            } else {
+                ApiResponses updated = responses;
+                errorResponses.forEach((key, apiResponse) -> {
+                    if (!updated.containsKey(key)) {
+                        updated.put(key, apiResponse);
+                    }
+                });
+            }
+            operation.setResponses(responses);
+        }));
+    }
+
+    private void securityCustomization(SecurityRequirement loginForm, Map.Entry<String, PathItem> entry) {
+        var path = entry.getKey();
+        if (path.matches(securityPathRegex) && !path.matches(nonSecurityPathRegex) && !path.equals(LOGIN_ENDPOINT)) {
+            entry.getValue()
+                    .readOperationsMap()
+                    .values()
+                    .forEach(operation -> operation.addSecurityItem(loginForm));
         }
+    }
 
-        apiResponses.addApiResponse("400", new ApiResponse().description("Bad Request")
-                .content(getErrorContent(ThingsboardErrorResponse.of(isPost ? "Invalid request body" : "Invalid UUID string: 123", ThingsboardErrorCode.BAD_REQUEST_PARAMS, HttpStatus.BAD_REQUEST))));
+    private static ApiResponses loginResponses() {
+        ApiResponses apiResponses = new ApiResponses();
+        apiResponses.addApiResponse("200", new ApiResponse().description("OK")
+                .content(new Content().addMediaType(APPLICATION_JSON_VALUE,
+                        new MediaType().schema(new Schema<LoginResponse>().$ref("#/components/schemas/LoginResponse")))));
+        apiResponses.putAll(loginErrorResponses());
+        return apiResponses;
+    }
+
+    private static ApiResponses defaultErrorResponses(boolean isPost) {
+        ApiResponses apiResponses = new ApiResponses();
+        apiResponses.addApiResponse("400", errorResponse("400", "Bad Request",
+                ThingsboardErrorResponse.of(isPost ? "Invalid request body" : "Invalid UUID string: 123", ThingsboardErrorCode.BAD_REQUEST_PARAMS, HttpStatus.BAD_REQUEST)));
 
-        apiResponses.addApiResponse("401", new ApiResponse().description("Unauthorized")
-                .content(getErrorContent(ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED))));
+        apiResponses.addApiResponse("401", errorResponse("401", "Unauthorized",
+                ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)));
 
-        apiResponses.addApiResponse("403", new ApiResponse().description("Forbidden")
-                .content(getErrorContent(ThingsboardErrorResponse.of("You don't have permission to perform this operation!", ThingsboardErrorCode.PERMISSION_DENIED, HttpStatus.FORBIDDEN))));
+        apiResponses.addApiResponse("403", errorResponse("403", "Forbidden",
+                ThingsboardErrorResponse.of("You don't have permission to perform this operation!", ThingsboardErrorCode.PERMISSION_DENIED, HttpStatus.FORBIDDEN)));
 
-        apiResponses.addApiResponse("404", new ApiResponse().description("Not Found")
-                .content(getErrorContent(ThingsboardErrorResponse.of("Requested item wasn't found!", ThingsboardErrorCode.ITEM_NOT_FOUND, HttpStatus.NOT_FOUND))));
+        apiResponses.addApiResponse("404", errorResponse("404", "Not Found",
+                ThingsboardErrorResponse.of("Requested item wasn't found!", ThingsboardErrorCode.ITEM_NOT_FOUND, HttpStatus.NOT_FOUND)));
 
-        apiResponses.addApiResponse("429", new ApiResponse().description("Too Many Requests")
-                .content(getErrorContent(ThingsboardErrorResponse.of("Too many requests for current tenant!", ThingsboardErrorCode.TOO_MANY_REQUESTS, HttpStatus.TOO_MANY_REQUESTS))));
+        apiResponses.addApiResponse("429", errorResponse("429", "Too Many Requests",
+                ThingsboardErrorResponse.of("Too many requests for current tenant!", ThingsboardErrorCode.TOO_MANY_REQUESTS, HttpStatus.TOO_MANY_REQUESTS)));
 
         return apiResponses;
     }
 
-    private Content getErrorContent(ThingsboardErrorResponse errorResponse) {
-        return new Content().addMediaType(org.springframework.http.MediaType.APPLICATION_JSON_VALUE,
-                new MediaType().schema(new Schema<ThingsboardErrorResponse>().example(errorResponse)));
+    private static ApiResponses loginErrorResponses() {
+        ApiResponses apiResponses = new ApiResponses();
+
+        apiResponses.addApiResponse("401", errorResponse("Unauthorized",
+                Map.of(
+                        "bad-credentials", errorExample("Bad credentials",
+                                ThingsboardErrorResponse.of("Invalid username or password", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
+                        "token-expired", errorExample("JWT token expired",
+                                ThingsboardErrorResponse.of("Token has expired", ThingsboardErrorCode.JWT_TOKEN_EXPIRED, HttpStatus.UNAUTHORIZED)),
+                        "account-disabled", errorExample("Disabled account",
+                                ThingsboardErrorResponse.of("User account is not active", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
+                        "account-locked", errorExample("Locked account",
+                                ThingsboardErrorResponse.of("User account is locked due to security policy", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED)),
+                        "authentication-failed", errorExample("General authentication error",
+                                ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED))
+                )
+        ));
+        var credentialsExpiredSchema = new Schema<ThingsboardCredentialsExpiredResponse>();
+        credentialsExpiredSchema.$ref("#/components/schemas/ThingsboardCredentialsExpiredResponse");
+        apiResponses.addApiResponse("401 ", errorResponse("Unauthorized (**Expired credentials**)",
+                Map.of(
+                        "credentials-expired", errorExample("Expired credentials",
+                                ThingsboardCredentialsExpiredResponse.of("User password expired!", StringUtils.randomAlphanumeric(30)))
+                ),
+                credentialsExpiredSchema
+        ));
+        return apiResponses;
+    }
+
+    private static ApiResponse errorResponse(String code, String description, ThingsboardErrorResponse example) {
+        return errorResponse(description, Map.of("error-code-" + code, errorExample(description, example)));
+    }
+
+    private static ApiResponse errorResponse(String description, Map<String, Example> examples) {
+        var schema = new Schema<ThingsboardErrorResponse>();
+        schema.$ref("#/components/schemas/ThingsboardErrorResponse");
+        return errorResponse(description, examples, schema);
+    }
+
+    private static ApiResponse errorResponse(String description, Map<String, Example> examples, Schema<? extends ThingsboardErrorResponse> errorResponseSchema) {
+        MediaType mediaType = new MediaType().schema(errorResponseSchema);
+        mediaType.setExamples(examples);
+        Content content =  new Content().addMediaType(org.springframework.http.MediaType.APPLICATION_JSON_VALUE, mediaType);
+        return new ApiResponse().description(description).content(content);
+    }
+
+    private static Example errorExample(String summary, ThingsboardErrorResponse example) {
+        return new Example()
+                .summary(summary)
+                .value(example);
     }
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/config/WebConfig.java b/application/src/main/java/org/thingsboard/server/config/WebConfig.java
index 81597952c0..70afc8b99c 100644
--- a/application/src/main/java/org/thingsboard/server/config/WebConfig.java
+++ b/application/src/main/java/org/thingsboard/server/config/WebConfig.java
@@ -37,4 +37,9 @@ public class WebConfig {
         response.sendRedirect(baseUrl + "/swagger-ui/");
     }
 
+    @RequestMapping("/swagger-ui/")
+    public String redirectSwaggerIndex() throws IOException {
+        return "forward:/swagger-ui/index.html";
+    }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java b/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
index 93e8c0be90..3df3d6887a 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AbstractRpcController.java
@@ -122,15 +122,9 @@ public abstract class AbstractRpcController extends BaseController {
             logRpcCall(rpcRequest, rpcError, null);
             RpcError error = rpcError.get();
             switch (error) {
-                case TIMEOUT:
-                    responseWriter.setResult(new ResponseEntity<>(timeoutStatus));
-                    break;
-                case NO_ACTIVE_CONNECTION:
-                    responseWriter.setResult(new ResponseEntity<>(noActiveConnectionStatus));
-                    break;
-                default:
-                    responseWriter.setResult(new ResponseEntity<>(timeoutStatus));
-                    break;
+                case TIMEOUT -> responseWriter.setResult(new ResponseEntity<>(timeoutStatus));
+                case NO_ACTIVE_CONNECTION -> responseWriter.setResult(new ResponseEntity<>(noActiveConnectionStatus));
+                default -> responseWriter.setResult(new ResponseEntity<>(timeoutStatus));
             }
         } else {
             Optional<String> responseData = response.getResponse();
diff --git a/application/src/main/java/org/thingsboard/server/controller/AdminController.java b/application/src/main/java/org/thingsboard/server/controller/AdminController.java
index 739f386dc9..818a2a15a6 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AdminController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AdminController.java
@@ -184,8 +184,7 @@ public class AdminController extends BaseController {
     }
 
     @ApiOperation(value = "Get the JWT Settings object (getJwtSettings)",
-            notes = "Get the JWT Settings object that contains JWT token policy, etc. " + SYSTEM_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Get the JWT Settings object that contains JWT token policy, etc. " + SYSTEM_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/jwtSettings", method = RequestMethod.GET)
     @ResponseBody
@@ -195,8 +194,7 @@ public class AdminController extends BaseController {
     }
 
     @ApiOperation(value = "Update JWT Settings (saveJwtSettings)",
-            notes = "Updates the JWT Settings object that contains JWT token policy, etc. The tokenSigningKey field is a Base64 encoded string." + SYSTEM_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Updates the JWT Settings object that contains JWT token policy, etc. The tokenSigningKey field is a Base64 encoded string." + SYSTEM_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/jwtSettings", method = RequestMethod.POST)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java b/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java
index cca82f5ee5..15918f0a08 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java
@@ -69,13 +69,12 @@ public class AlarmCommentController extends BaseController {
                     "Referencing non-existing Alarm Comment Id will cause 'Not Found' error. " +
                     "\n\n To create new Alarm comment entity it is enough to specify 'comment' json element with 'text' node, for example: {\"comment\": { \"text\": \"my comment\"}}. " +
                     "\n\n If comment type is not specified the default value 'OTHER' will be saved. If 'alarmId' or 'userId' specified in body it will be ignored." +
-                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH
-            , responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/{alarmId}/comment", method = RequestMethod.POST)
     @ResponseBody
     public AlarmComment saveAlarmComment(@Parameter(description = ALARM_ID_PARAM_DESCRIPTION)
-                                         @PathVariable(ALARM_ID) String strAlarmId, @Parameter(description = "A JSON value representing the comment.") @RequestBody AlarmComment alarmComment) throws ThingsboardException {
+                                         @PathVariable(ALARM_ID) String strAlarmId, @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "A JSON value representing the comment.") @RequestBody AlarmComment alarmComment) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
         Alarm alarm = checkAlarmInfoId(alarmId, Operation.WRITE);
@@ -84,7 +83,7 @@ public class AlarmCommentController extends BaseController {
     }
 
     @ApiOperation(value = "Delete Alarm comment (deleteAlarmComment)",
-            notes = "Deletes the Alarm comment. Referencing non-existing Alarm comment Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Deletes the Alarm comment. Referencing non-existing Alarm comment Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/{alarmId}/comment/{commentId}", method = RequestMethod.DELETE)
     @ResponseBody
@@ -100,7 +99,7 @@ public class AlarmCommentController extends BaseController {
 
     @ApiOperation(value = "Get Alarm comments (getAlarmComments)",
             notes = "Returns a page of alarm comments for specified alarm. " +
-                    PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/{alarmId}/comment", method = RequestMethod.GET)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
index d983f08ec2..e78313f6d8 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
@@ -104,7 +104,7 @@ public class AlarmController extends BaseController {
             "filled in the AlarmInfo object  field: 'originatorName' or will returns as null.";
 
     @ApiOperation(value = "Get Alarm (getAlarmById)",
-            notes = "Fetch the Alarm object based on the provided Alarm Id. " + ALARM_SECURITY_CHECK, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Fetch the Alarm object based on the provided Alarm Id. " + ALARM_SECURITY_CHECK)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/{alarmId}", method = RequestMethod.GET)
     @ResponseBody
@@ -117,7 +117,7 @@ public class AlarmController extends BaseController {
 
     @ApiOperation(value = "Get Alarm Info (getAlarmInfoById)",
             notes = "Fetch the Alarm Info object based on the provided Alarm Id. " +
-                    ALARM_SECURITY_CHECK + ALARM_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    ALARM_SECURITY_CHECK + ALARM_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/info/{alarmId}", method = RequestMethod.GET)
     @ResponseBody
@@ -139,11 +139,11 @@ public class AlarmController extends BaseController {
                     "If the user clears the alarm (see 'Clear Alarm(clearAlarm)'), than new alarm with the same type and same device may be created. " +
                     "Remove 'id', 'tenantId' and optionally 'customerId' from the request body example (below) to create new Alarm entity. " +
                     TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH
-            , responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            )
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm", method = RequestMethod.POST)
     @ResponseBody
-    public Alarm saveAlarm(@Parameter(description = "A JSON value representing the alarm.") @RequestBody Alarm alarm) throws ThingsboardException {
+    public Alarm saveAlarm(@io.swagger.v3.oas.annotations.parameters.RequestBody(description = "A JSON value representing the alarm.") @RequestBody Alarm alarm) throws ThingsboardException {
         alarm.setTenantId(getTenantId());
         checkNotNull(alarm.getOriginator());
         checkEntity(alarm.getId(), alarm, Resource.ALARM);
@@ -155,7 +155,7 @@ public class AlarmController extends BaseController {
     }
 
     @ApiOperation(value = "Delete Alarm (deleteAlarm)",
-            notes = "Deletes the Alarm. Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Deletes the Alarm. Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/{alarmId}", method = RequestMethod.DELETE)
     @ResponseBody
@@ -169,7 +169,7 @@ public class AlarmController extends BaseController {
     @ApiOperation(value = "Acknowledge Alarm (ackAlarm)",
             notes = "Acknowledge the Alarm. " +
                     "Once acknowledged, the 'ack_ts' field will be set to current timestamp and special rule chain event 'ALARM_ACK' will be generated. " +
-                    "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/{alarmId}/ack", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
@@ -184,7 +184,7 @@ public class AlarmController extends BaseController {
     @ApiOperation(value = "Clear Alarm (clearAlarm)",
             notes = "Clear the Alarm. " +
                     "Once cleared, the 'clear_ts' field will be set to current timestamp and special rule chain event 'ALARM_CLEAR' will be generated. " +
-                    "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/{alarmId}/clear", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
@@ -200,7 +200,7 @@ public class AlarmController extends BaseController {
             notes = "Assign the Alarm. " +
                     "Once assigned, the 'assign_ts' field will be set to current timestamp and special rule chain event 'ALARM_ASSIGNED' " +
                     "(or ALARM_REASSIGNED in case of assigning already assigned alarm) will be generated. " +
-                    "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/{alarmId}/assign/{assigneeId}", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
@@ -221,7 +221,7 @@ public class AlarmController extends BaseController {
     @ApiOperation(value = "Unassign Alarm (unassignAlarm)",
             notes = "Unassign the Alarm. " +
                     "Once unassigned, the 'assign_ts' field will be set to current timestamp and special rule chain event 'ALARM_UNASSIGNED' will be generated. " +
-                    "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Referencing non-existing Alarm Id will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/{alarmId}/assign", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
@@ -236,7 +236,7 @@ public class AlarmController extends BaseController {
 
     @ApiOperation(value = "Get Alarms (getAlarms)",
             notes = "Returns a page of alarms for the selected entity. Specifying both parameters 'searchStatus' and 'status' at the same time will cause an error. " +
-                    PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/{entityType}/{entityId}", method = RequestMethod.GET)
     @ResponseBody
@@ -292,7 +292,7 @@ public class AlarmController extends BaseController {
                     "If the user has the authority of 'Tenant Administrator', the server returns alarms that belongs to the tenant of current user. " +
                     "If the user has the authority of 'Customer User', the server returns alarms that belongs to the customer of current user. " +
                     "Specifying both parameters 'searchStatus' and 'status' at the same time will cause an error. " +
-                    PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarms", method = RequestMethod.GET)
     @ResponseBody
@@ -341,7 +341,7 @@ public class AlarmController extends BaseController {
 
     @ApiOperation(value = "Get Alarms (getAlarmsV2)",
             notes = "Returns a page of alarms for the selected entity. " +
-                    PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/v2/alarm/{entityType}/{entityId}", method = RequestMethod.GET)
     @ResponseBody
@@ -407,7 +407,7 @@ public class AlarmController extends BaseController {
             notes = "Returns a page of alarms that belongs to the current user owner. " +
                     "If the user has the authority of 'Tenant Administrator', the server returns alarms that belongs to the tenant of current user. " +
                     "If the user has the authority of 'Customer User', the server returns alarms that belongs to the customer of current user. " +
-                    PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/v2/alarms", method = RequestMethod.GET)
     @ResponseBody
@@ -468,7 +468,7 @@ public class AlarmController extends BaseController {
     @ApiOperation(value = "Get Highest Alarm Severity (getHighestAlarmSeverity)",
             notes = "Search the alarms by originator ('entityType' and entityId') and optional 'status' or 'searchStatus' filters and returns the highest AlarmSeverity(CRITICAL, MAJOR, MINOR, WARNING or INDETERMINATE). " +
                     "Specifying both parameters 'searchStatus' and 'status' at the same time will cause an error." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH
-            , responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            )
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/highestSeverity/{entityType}/{entityId}", method = RequestMethod.GET)
     @ResponseBody
@@ -499,8 +499,7 @@ public class AlarmController extends BaseController {
     }
 
     @ApiOperation(value = "Get Alarm Types (getAlarmTypes)",
-            notes = "Returns a set of unique alarm types based on alarms that are either owned by the tenant or assigned to the customer which user is performing the request.",
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Returns a set of unique alarm types based on alarms that are either owned by the tenant or assigned to the customer which user is performing the request.")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/alarm/types", method = RequestMethod.GET)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/AssetController.java b/application/src/main/java/org/thingsboard/server/controller/AssetController.java
index 6f51202c36..8c03d34e8e 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AssetController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AssetController.java
@@ -103,7 +103,7 @@ public class AssetController extends BaseController {
             notes = "Fetch the Asset object based on the provided Asset Id. " +
                     "If the user has the authority of 'Tenant Administrator', the server checks that the asset is owned by the same tenant. " +
                     "If the user has the authority of 'Customer User', the server checks that the asset is assigned to the same customer." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH
-            , responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            )
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/asset/{assetId}", method = RequestMethod.GET)
     @ResponseBody
@@ -118,7 +118,7 @@ public class AssetController extends BaseController {
             notes = "Fetch the Asset Info object based on the provided Asset Id. " +
                     "If the user has the authority of 'Tenant Administrator', the server checks that the asset is owned by the same tenant. " +
                     "If the user has the authority of 'Customer User', the server checks that the asset is assigned to the same customer. "
-                    + ASSET_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + ASSET_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/asset/info/{assetId}", method = RequestMethod.GET)
     @ResponseBody
@@ -135,11 +135,11 @@ public class AssetController extends BaseController {
                     "Specify existing Asset id to update the asset. " +
                     "Referencing non-existing Asset Id will cause 'Not Found' error. " +
                     "Remove 'id', 'tenantId' and optionally 'customerId' from the request body example (below) to create new Asset entity. "
-                    + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/asset", method = RequestMethod.POST)
     @ResponseBody
-    public Asset saveAsset(@Parameter(description = "A JSON value representing the asset.") @RequestBody Asset asset) throws Exception {
+    public Asset saveAsset(@io.swagger.v3.oas.annotations.parameters.RequestBody(description = "A JSON value representing the asset.") @RequestBody Asset asset) throws Exception {
         asset.setTenantId(getTenantId());
         checkEntity(asset.getId(), asset, Resource.ASSET);
         return tbAssetService.save(asset, getCurrentUser());
@@ -158,7 +158,7 @@ public class AssetController extends BaseController {
     }
 
     @ApiOperation(value = "Assign asset to customer (assignAssetToCustomer)",
-            notes = "Creates assignment of the asset to customer. Customer will be able to query asset afterwards." + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Creates assignment of the asset to customer. Customer will be able to query asset afterwards." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/{customerId}/asset/{assetId}", method = RequestMethod.POST)
     @ResponseBody
@@ -174,7 +174,7 @@ public class AssetController extends BaseController {
     }
 
     @ApiOperation(value = "Unassign asset from customer (unassignAssetFromCustomer)",
-            notes = "Clears assignment of the asset to customer. Customer will not be able to query asset afterwards." + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Clears assignment of the asset to customer. Customer will not be able to query asset afterwards." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/asset/{assetId}", method = RequestMethod.DELETE)
     @ResponseBody
@@ -192,7 +192,7 @@ public class AssetController extends BaseController {
     @ApiOperation(value = "Make asset publicly available (assignAssetToPublicCustomer)",
             notes = "Asset will be available for non-authorized (not logged-in) users. " +
                     "This is useful to create dashboards that you plan to share/embed on a publicly available website. " +
-                    "However, users that are logged-in and belong to different tenant will not be able to access the asset." + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "However, users that are logged-in and belong to different tenant will not be able to access the asset." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/public/asset/{assetId}", method = RequestMethod.POST)
     @ResponseBody
@@ -205,7 +205,7 @@ public class AssetController extends BaseController {
 
     @ApiOperation(value = "Get Tenant Assets (getTenantAssets)",
             notes = "Returns a page of assets owned by tenant. " +
-                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/assets", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -233,7 +233,7 @@ public class AssetController extends BaseController {
 
     @ApiOperation(value = "Get Tenant Asset Infos (getTenantAssetInfos)",
             notes = "Returns a page of assets info objects owned by tenant. " +
-                    PAGE_DATA_PARAMETERS + ASSET_INFO_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + ASSET_INFO_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/assetInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -266,7 +266,7 @@ public class AssetController extends BaseController {
 
     @ApiOperation(value = "Get Tenant Asset (getTenantAsset)",
             notes = "Requested asset must be owned by tenant that the user belongs to. " +
-                    "Asset name is an unique property of asset. So it can be used to identify the asset." + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Asset name is an unique property of asset. So it can be used to identify the asset." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/assets", params = {"assetName"}, method = RequestMethod.GET)
     @ResponseBody
@@ -279,7 +279,7 @@ public class AssetController extends BaseController {
 
     @ApiOperation(value = "Get Customer Assets (getCustomerAssets)",
             notes = "Returns a page of assets objects assigned to customer. " +
-                    PAGE_DATA_PARAMETERS, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/customer/{customerId}/assets", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -312,7 +312,7 @@ public class AssetController extends BaseController {
 
     @ApiOperation(value = "Get Customer Asset Infos (getCustomerAssetInfos)",
             notes = "Returns a page of assets info objects assigned to customer. " +
-                    PAGE_DATA_PARAMETERS + ASSET_INFO_DESCRIPTION, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + ASSET_INFO_DESCRIPTION)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/customer/{customerId}/assetInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -349,7 +349,7 @@ public class AssetController extends BaseController {
     }
 
     @ApiOperation(value = "Get Assets By Ids (getAssetsByIds)",
-            notes = "Requested assets must be owned by tenant or assigned to customer which user is performing the request. ", responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Requested assets must be owned by tenant or assigned to customer which user is performing the request. ")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/assets", params = {"assetIds"}, method = RequestMethod.GET)
     @ResponseBody
@@ -376,7 +376,7 @@ public class AssetController extends BaseController {
     @ApiOperation(value = "Find related assets (findByQuery)",
             notes = "Returns all assets that are related to the specific entity. " +
                     "The entity id, relation type, asset types, depth of the search, and other query parameters defined using complex 'AssetSearchQuery' object. " +
-                    "See 'Model' tab of the Parameters for more info.", responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "See 'Model' tab of the Parameters for more info.")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/assets", method = RequestMethod.POST)
     @ResponseBody
@@ -398,8 +398,7 @@ public class AssetController extends BaseController {
     }
 
     @ApiOperation(value = "Get Asset Types (getAssetTypes)",
-            notes = "Deprecated. See 'getAssetProfileNames' API from Asset Profile Controller instead." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Deprecated. See 'getAssetProfileNames' API from Asset Profile Controller instead." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/asset/types", method = RequestMethod.GET)
     @ResponseBody
@@ -416,8 +415,7 @@ public class AssetController extends BaseController {
                     EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION +
                     "Second, remote edge service will receive a copy of assignment asset " +
                     EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION +
-                    "Third, once asset will be delivered to edge service, it's going to be available for usage on remote edge instance.",
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Third, once asset will be delivered to edge service, it's going to be available for usage on remote edge instance.")
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/asset/{assetId}", method = RequestMethod.POST)
     @ResponseBody
@@ -440,8 +438,7 @@ public class AssetController extends BaseController {
                     EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION +
                     "Second, remote edge service will receive an 'unassign' command to remove asset " +
                     EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION +
-                    "Third, once 'unassign' command will be delivered to edge service, it's going to remove asset locally.",
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Third, once 'unassign' command will be delivered to edge service, it's going to remove asset locally.")
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/asset/{assetId}", method = RequestMethod.DELETE)
     @ResponseBody
@@ -460,7 +457,7 @@ public class AssetController extends BaseController {
 
     @ApiOperation(value = "Get assets assigned to edge (getEdgeAssets)",
             notes = "Returns a page of assets assigned to edge. " +
-                    PAGE_DATA_PARAMETERS, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/edge/{edgeId}/assets", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -510,7 +507,7 @@ public class AssetController extends BaseController {
     }
 
     @ApiOperation(value = "Import the bulk of assets (processAssetsBulkImport)",
-            notes = "There's an ability to import the bulk of assets using the only .csv file.", responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "There's an ability to import the bulk of assets using the only .csv file.")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @PostMapping("/asset/bulk_import")
     public BulkImportResult<Asset> processAssetsBulkImport(@RequestBody BulkImportRequest request) throws Exception {
diff --git a/application/src/main/java/org/thingsboard/server/controller/AssetProfileController.java b/application/src/main/java/org/thingsboard/server/controller/AssetProfileController.java
index a6126011cc..a4dc7a1cb0 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AssetProfileController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AssetProfileController.java
@@ -78,8 +78,7 @@ public class AssetProfileController extends BaseController {
 
     @ApiOperation(value = "Get Asset Profile (getAssetProfileById)",
             notes = "Fetch the Asset Profile object based on the provided Asset Profile Id. " +
-                    "The server checks that the asset profile is owned by the same tenant. " + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "The server checks that the asset profile is owned by the same tenant. " + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/assetProfile/{assetProfileId}", method = RequestMethod.GET)
     @ResponseBody
@@ -99,8 +98,7 @@ public class AssetProfileController extends BaseController {
 
     @ApiOperation(value = "Get Asset Profile Info (getAssetProfileInfoById)",
             notes = "Fetch the Asset Profile Info object based on the provided Asset Profile Id. "
-                    + ASSET_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + ASSET_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/assetProfileInfo/{assetProfileId}", method = RequestMethod.GET)
     @ResponseBody
@@ -114,8 +112,7 @@ public class AssetProfileController extends BaseController {
 
     @ApiOperation(value = "Get Default Asset Profile (getDefaultAssetProfileInfo)",
             notes = "Fetch the Default Asset Profile Info object. " +
-                    ASSET_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    ASSET_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/assetProfileInfo/default", method = RequestMethod.GET)
     @ResponseBody
@@ -130,8 +127,7 @@ public class AssetProfileController extends BaseController {
                     "Referencing non-existing asset profile Id will cause 'Not Found' error. " + NEW_LINE +
                     "Asset profile name is unique in the scope of tenant. Only one 'default' asset profile may exist in scope of tenant. " +
                     "Remove 'id', 'tenantId' from the request body example (below) to create new Asset Profile entity. " +
-                    TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/assetProfile", method = RequestMethod.POST)
     @ResponseBody
@@ -145,8 +141,7 @@ public class AssetProfileController extends BaseController {
 
     @ApiOperation(value = "Delete asset profile (deleteAssetProfile)",
             notes = "Deletes the asset profile. Referencing non-existing asset profile Id will cause an error. " +
-                    "Can't delete the asset profile if it is referenced by existing assets." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Can't delete the asset profile if it is referenced by existing assets." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/assetProfile/{assetProfileId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
@@ -160,8 +155,7 @@ public class AssetProfileController extends BaseController {
     }
 
     @ApiOperation(value = "Make Asset Profile Default (setDefaultAssetProfile)",
-            notes = "Marks asset profile as default within a tenant scope." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Marks asset profile as default within a tenant scope." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/assetProfile/{assetProfileId}/default", method = RequestMethod.POST)
     @ResponseBody
@@ -177,8 +171,7 @@ public class AssetProfileController extends BaseController {
 
     @ApiOperation(value = "Get Asset Profiles (getAssetProfiles)",
             notes = "Returns a page of asset profile objects owned by tenant. " +
-                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/assetProfiles", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -199,8 +192,7 @@ public class AssetProfileController extends BaseController {
 
     @ApiOperation(value = "Get Asset Profile infos (getAssetProfileInfos)",
             notes = "Returns a page of asset profile info objects owned by tenant. " +
-                    PAGE_DATA_PARAMETERS + ASSET_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + ASSET_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/assetProfileInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java b/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java
index 5e58b28ab0..c8ea4073b1 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AuditLogController.java
@@ -74,8 +74,7 @@ public class AuditLogController extends BaseController {
     @ApiOperation(value = "Get audit logs by customer id (getAuditLogsByCustomerId)",
             notes = "Returns a page of audit logs related to the targeted customer entities (devices, assets, etc.), " +
                     "and users actions (login, logout, etc.) that belong to this customer. " +
-                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/audit/logs/customer/{customerId}", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -108,8 +107,7 @@ public class AuditLogController extends BaseController {
     @ApiOperation(value = "Get audit logs by user id (getAuditLogsByUserId)",
             notes = "Returns a page of audit logs related to the actions of targeted user. " +
                     "For example, RPC call to a particular device, or alarm acknowledgment for a specific device, etc. " +
-                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/audit/logs/user/{userId}", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -143,8 +141,7 @@ public class AuditLogController extends BaseController {
             notes = "Returns a page of audit logs related to the actions on the targeted entity. " +
                     "Basically, this API call is used to get the full lifecycle of some specific entity. " +
                     "For example to see when a device was created, updated, assigned to some customer, or even deleted from the system. " +
-                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/audit/logs/entity/{entityType}/{entityId}", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -179,8 +176,7 @@ public class AuditLogController extends BaseController {
 
     @ApiOperation(value = "Get all audit logs (getAuditLogs)",
             notes = "Returns a page of audit logs related to all entities in the scope of the current user's Tenant. " +
-                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/audit/logs", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
index 9c437821c6..0942329f40 100644
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
@@ -506,7 +506,7 @@ public abstract class BaseController {
 
     TenantProfile checkTenantProfileId(TenantProfileId tenantProfileId, Operation operation) throws ThingsboardException {
         try {
-            validateId(tenantProfileId, "Incorrect tenantProfileId " + tenantProfileId);
+            validateId(tenantProfileId, id -> "Incorrect tenantProfileId " + id);
             TenantProfile tenantProfile = tenantProfileService.findTenantProfileById(getTenantId(), tenantProfileId);
             checkNotNull(tenantProfile, "Tenant profile with id [" + tenantProfileId + "] is not found");
             accessControlService.checkPermission(getCurrentUser(), Resource.TENANT_PROFILE, operation);
@@ -541,7 +541,7 @@ public abstract class BaseController {
             if (entityId == null) {
                 throw new ThingsboardException("Parameter entityId can't be empty!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
             }
-            validateId(entityId.getId(), "Incorrect entityId " + entityId);
+            validateId(entityId.getId(), id -> "Incorrect entityId " + id);
             switch (entityId.getEntityType()) {
                 case ALARM:
                     checkAlarmId(new AlarmId(entityId.getId()), operation);
@@ -668,7 +668,7 @@ public abstract class BaseController {
 
     AlarmComment checkAlarmCommentId(AlarmCommentId alarmCommentId, AlarmId alarmId) throws ThingsboardException {
         try {
-            validateId(alarmCommentId, "Incorrect alarmCommentId " + alarmCommentId);
+            validateId(alarmCommentId, id -> "Incorrect alarmCommentId " + id);
             AlarmComment alarmComment = alarmCommentService.findAlarmCommentByIdAsync(getCurrentUser().getTenantId(), alarmCommentId).get();
             checkNotNull(alarmComment, "Alarm comment with id [" + alarmCommentId + "] is not found");
             if (!alarmId.equals(alarmComment.getAlarmId())) {
@@ -736,7 +736,7 @@ public abstract class BaseController {
     }
 
     protected RuleNode checkRuleNode(RuleNodeId ruleNodeId, Operation operation) throws ThingsboardException {
-        validateId(ruleNodeId, "Incorrect ruleNodeId " + ruleNodeId);
+        validateId(ruleNodeId, id -> "Incorrect ruleNodeId " + id);
         RuleNode ruleNode = ruleChainService.findRuleNodeById(getTenantId(), ruleNodeId);
         checkNotNull(ruleNode, "Rule node with id [" + ruleNodeId + "] is not found");
         checkRuleChain(ruleNode.getRuleChainId(), operation);
diff --git a/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
index 595d6feef1..5271de2329 100644
--- a/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
@@ -68,7 +68,7 @@ public class ComponentDescriptorController extends BaseController {
     @RequestMapping(value = "/components/{componentType}", method = RequestMethod.GET)
     @ResponseBody
     public List<ComponentDescriptor> getComponentDescriptorsByType(
-            @Parameter(description = "Type of the Rule Node", schema = @Schema(allowableValues = "ENRICHMENT,FILTER,TRANSFORMATION,ACTION,EXTERNAL", required = true))
+            @Parameter(description = "Type of the Rule Node", schema = @Schema(allowableValues = "ENRICHMENT,FILTER,TRANSFORMATION,ACTION,EXTERNAL", requiredMode = Schema.RequiredMode.REQUIRED))
             @PathVariable("componentType") String strComponentType,
             @Parameter(description = "Type of the Rule Chain", schema = @Schema(allowableValues = "CORE,EDGE"))
             @RequestParam(value = "ruleChainType", required = false) String strRuleChainType) throws ThingsboardException {
diff --git a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java
index c24c345f76..a46cbe7dba 100644
--- a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java
@@ -130,7 +130,7 @@ public class CustomerController extends BaseController {
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer", method = RequestMethod.POST)
     @ResponseBody
-    public Customer saveCustomer(@Parameter(description = "A JSON value representing the customer.") @RequestBody Customer customer) throws Exception {
+    public Customer saveCustomer(@io.swagger.v3.oas.annotations.parameters.RequestBody(description = "A JSON value representing the customer.") @RequestBody Customer customer) throws Exception {
         customer.setTenantId(getTenantId());
         checkEntity(customer.getId(), customer, Resource.CUSTOMER);
         return tbCustomerService.save(customer, getCurrentUser());
diff --git a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
index 0683bc21be..013575361d 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
@@ -133,9 +133,7 @@ public class DashboardController extends BaseController {
     }
 
     @ApiOperation(value = "Get Dashboard Info (getDashboardInfoById)",
-            notes = "Get the information about the dashboard based on 'dashboardId' parameter. " + DASHBOARD_INFO_DEFINITION,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE))
-    )
+            notes = "Get the information about the dashboard based on 'dashboardId' parameter. " + DASHBOARD_INFO_DEFINITION)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/dashboard/info/{dashboardId}", method = RequestMethod.GET)
     @ResponseBody
@@ -148,8 +146,7 @@ public class DashboardController extends BaseController {
     }
 
     @ApiOperation(value = "Get Dashboard (getDashboardById)",
-            notes = "Get the dashboard based on 'dashboardId' parameter. " + DASHBOARD_DEFINITION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE))
+            notes = "Get the dashboard based on 'dashboardId' parameter. " + DASHBOARD_DEFINITION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH
     )
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/dashboard/{dashboardId}", method = RequestMethod.GET)
@@ -174,13 +171,12 @@ public class DashboardController extends BaseController {
                     "Specify existing Dashboard id to update the dashboard. " +
                     "Referencing non-existing dashboard Id will cause 'Not Found' error. " +
                     "Remove 'id', 'tenantId' and optionally 'customerId' from the request body example (below) to create new Dashboard entity. " +
-                    TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/dashboard", method = RequestMethod.POST)
     @ResponseBody
     public Dashboard saveDashboard(
-            @Parameter(description = "A JSON value representing the dashboard.")
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "A JSON value representing the dashboard.")
             @RequestBody Dashboard dashboard) throws Exception {
         dashboard.setTenantId(getTenantId());
         checkEntity(dashboard.getId(), dashboard, Resource.DASHBOARD);
@@ -203,8 +199,7 @@ public class DashboardController extends BaseController {
 
     @ApiOperation(value = "Assign the Dashboard (assignDashboardToCustomer)",
             notes = "Assign the Dashboard to specified Customer or do nothing if the Dashboard is already assigned to that Customer. " +
-                    "Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/{customerId}/dashboard/{dashboardId}", method = RequestMethod.POST)
     @ResponseBody
@@ -226,8 +221,7 @@ public class DashboardController extends BaseController {
 
     @ApiOperation(value = "Unassign the Dashboard (unassignDashboardFromCustomer)",
             notes = "Unassign the Dashboard from specified Customer or do nothing if the Dashboard is already assigned to that Customer. " +
-                    "Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/{customerId}/dashboard/{dashboardId}", method = RequestMethod.DELETE)
     @ResponseBody
@@ -247,8 +241,7 @@ public class DashboardController extends BaseController {
 
     @ApiOperation(value = "Update the Dashboard Customers (updateDashboardCustomers)",
             notes = "Updates the list of Customers that this Dashboard is assigned to. Removes previous assignments to customers that are not in the provided list. " +
-                    "Returns the Dashboard object. " + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Returns the Dashboard object. " + TENANT_AUTHORITY_PARAGRAPH)
 
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/dashboard/{dashboardId}/customers", method = RequestMethod.POST)
@@ -267,8 +260,7 @@ public class DashboardController extends BaseController {
 
     @ApiOperation(value = "Adds the Dashboard Customers (addDashboardCustomers)",
             notes = "Adds the list of Customers to the existing list of assignments for the Dashboard. Keeps previous assignments to customers that are not in the provided list. " +
-                    "Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/dashboard/{dashboardId}/customers/add", method = RequestMethod.POST)
     @ResponseBody
@@ -286,8 +278,7 @@ public class DashboardController extends BaseController {
 
     @ApiOperation(value = "Remove the Dashboard Customers (removeDashboardCustomers)",
             notes = "Removes the list of Customers from the existing list of assignments for the Dashboard. Keeps other assignments to customers that are not in the provided list. " +
-                    "Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/dashboard/{dashboardId}/customers/remove", method = RequestMethod.POST)
     @ResponseBody
@@ -309,8 +300,7 @@ public class DashboardController extends BaseController {
                     "Be aware that making the dashboard public does not mean that it automatically makes all devices and assets you use in the dashboard to be public." +
                     "Use [assign Asset to Public Customer](#!/asset-controller/assignAssetToPublicCustomerUsingPOST) and " +
                     "[assign Device to Public Customer](#!/device-controller/assignDeviceToPublicCustomerUsingPOST) for this purpose. " +
-                    "Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/public/dashboard/{dashboardId}", method = RequestMethod.POST)
     @ResponseBody
@@ -325,8 +315,7 @@ public class DashboardController extends BaseController {
 
     @ApiOperation(value = "Unassign the Dashboard from Public Customer (unassignDashboardFromPublicCustomer)",
             notes = "Unassigns the dashboard from a special, auto-generated 'Public' Customer. Once unassigned, unauthenticated users may no longer browse the dashboard. " +
-                    "Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Returns the Dashboard object." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/public/dashboard/{dashboardId}", method = RequestMethod.DELETE)
     @ResponseBody
@@ -341,8 +330,7 @@ public class DashboardController extends BaseController {
 
     @ApiOperation(value = "Get Tenant Dashboards by System Administrator (getTenantDashboards)",
             notes = "Returns a page of dashboard info objects owned by tenant. " + DASHBOARD_INFO_DEFINITION + " " + PAGE_DATA_PARAMETERS +
-                    SYSTEM_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    SYSTEM_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/tenant/{tenantId}/dashboards", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -367,8 +355,7 @@ public class DashboardController extends BaseController {
 
     @ApiOperation(value = "Get Tenant Dashboards (getTenantDashboards)",
             notes = "Returns a page of dashboard info objects owned by the tenant of a current user. "
-                    + DASHBOARD_INFO_DEFINITION + " " + PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + DASHBOARD_INFO_DEFINITION + " " + PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/dashboards", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -396,8 +383,7 @@ public class DashboardController extends BaseController {
 
     @ApiOperation(value = "Get Customer Dashboards (getCustomerDashboards)",
             notes = "Returns a page of dashboard info objects owned by the specified customer. "
-                    + DASHBOARD_INFO_DEFINITION + " " + PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + DASHBOARD_INFO_DEFINITION + " " + PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/customer/{customerId}/dashboards", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -432,8 +418,7 @@ public class DashboardController extends BaseController {
             notes = "Returns the home dashboard object that is configured as 'homeDashboardId' parameter in the 'additionalInfo' of the User. " +
                     "If 'homeDashboardId' parameter is not set on the User level and the User has authority 'CUSTOMER_USER', check the same parameter for the corresponding Customer. " +
                     "If 'homeDashboardId' parameter is not set on the User and Customer levels then checks the same parameter for the Tenant that owns the user. "
-                    + DASHBOARD_DEFINITION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + DASHBOARD_DEFINITION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/dashboard/home", method = RequestMethod.GET)
     @ResponseBody
@@ -465,8 +450,7 @@ public class DashboardController extends BaseController {
             notes = "Returns the home dashboard info object that is configured as 'homeDashboardId' parameter in the 'additionalInfo' of the User. " +
                     "If 'homeDashboardId' parameter is not set on the User level and the User has authority 'CUSTOMER_USER', check the same parameter for the corresponding Customer. " +
                     "If 'homeDashboardId' parameter is not set on the User and Customer levels then checks the same parameter for the Tenant that owns the user. " +
-                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/dashboard/home/info", method = RequestMethod.GET)
     @ResponseBody
@@ -496,8 +480,7 @@ public class DashboardController extends BaseController {
 
     @ApiOperation(value = "Get Tenant Home Dashboard Info (getTenantHomeDashboardInfo)",
             notes = "Returns the home dashboard info object that is configured as 'homeDashboardId' parameter in the 'additionalInfo' of the corresponding tenant. " +
-                    TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/dashboard/home/info", method = RequestMethod.GET)
     @ResponseBody
@@ -518,8 +501,7 @@ public class DashboardController extends BaseController {
 
     @ApiOperation(value = "Update Tenant Home Dashboard Info (getTenantHomeDashboardInfo)",
             notes = "Update the home dashboard assignment for the current tenant. " +
-                    TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/dashboard/home/info", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
@@ -584,8 +566,7 @@ public class DashboardController extends BaseController {
                     "Second, remote edge service will receive a copy of assignment dashboard " +
                     EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION +
                     "Third, once dashboard will be delivered to edge service, it's going to be available for usage on remote edge instance." +
-                    TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/dashboard/{dashboardId}", method = RequestMethod.POST)
     @ResponseBody
@@ -608,8 +589,7 @@ public class DashboardController extends BaseController {
                     "Second, remote edge service will receive an 'unassign' command to remove dashboard " +
                     EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION +
                     "Third, once 'unassign' command will be delivered to edge service, it's going to remove dashboard locally." +
-                    TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/dashboard/{dashboardId}", method = RequestMethod.DELETE)
     @ResponseBody
@@ -629,8 +609,7 @@ public class DashboardController extends BaseController {
 
     @ApiOperation(value = "Get Edge Dashboards (getEdgeDashboards)",
             notes = "Returns a page of dashboard info objects assigned to the specified edge. "
-                    + DASHBOARD_INFO_DEFINITION + " " + PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + DASHBOARD_INFO_DEFINITION + " " + PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/edge/{edgeId}/dashboards", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
index 555769370c..fedbd48503 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
@@ -177,7 +177,7 @@ public class DeviceController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/device", method = RequestMethod.POST)
     @ResponseBody
-    public Device saveDevice(@Parameter(description = "A JSON value representing the device.") @RequestBody Device device,
+    public Device saveDevice(@io.swagger.v3.oas.annotations.parameters.RequestBody(description = "A JSON value representing the device.") @RequestBody Device device,
                              @Parameter(description = "Optional value of the device credentials to be used during device creation. " +
                                      "If omitted, access token will be auto-generated.") @RequestParam(name = "accessToken", required = false) String accessToken) throws Exception {
         device.setTenantId(getCurrentUser().getTenantId());
@@ -534,8 +534,7 @@ public class DeviceController extends BaseController {
     }
 
     @ApiOperation(value = "Get Device Types (getDeviceTypes)",
-            notes = "Deprecated. See 'getDeviceProfileNames' API from Device Profile Controller instead." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Deprecated. See 'getDeviceProfileNames' API from Device Profile Controller instead." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/device/types", method = RequestMethod.GET)
     @ResponseBody
@@ -668,8 +667,7 @@ public class DeviceController extends BaseController {
                     EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION +
                     "Second, remote edge service will receive a copy of assignment device " +
                     EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION +
-                    "Third, once device will be delivered to edge service, it's going to be available for usage on remote edge instance." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Third, once device will be delivered to edge service, it's going to be available for usage on remote edge instance." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/device/{deviceId}", method = RequestMethod.POST)
     @ResponseBody
@@ -693,8 +691,7 @@ public class DeviceController extends BaseController {
                     EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION +
                     "Second, remote edge service will receive an 'unassign' command to remove device " +
                     EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION +
-                    "Third, once 'unassign' command will be delivered to edge service, it's going to remove device locally." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Third, once 'unassign' command will be delivered to edge service, it's going to remove device locally." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/device/{deviceId}", method = RequestMethod.DELETE)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
index 02cf15c81d..b84e801d31 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
@@ -86,8 +86,7 @@ public class DeviceProfileController extends BaseController {
 
     @ApiOperation(value = "Get Device Profile (getDeviceProfileById)",
             notes = "Fetch the Device Profile object based on the provided Device Profile Id. " +
-                    "The server checks that the device profile is owned by the same tenant. " + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "The server checks that the device profile is owned by the same tenant. " + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/deviceProfile/{deviceProfileId}", method = RequestMethod.GET)
     @ResponseBody
@@ -107,8 +106,7 @@ public class DeviceProfileController extends BaseController {
 
     @ApiOperation(value = "Get Device Profile Info (getDeviceProfileInfoById)",
             notes = "Fetch the Device Profile Info object based on the provided Device Profile Id. "
-                    + DEVICE_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + DEVICE_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/deviceProfileInfo/{deviceProfileId}", method = RequestMethod.GET)
     @ResponseBody
@@ -122,8 +120,7 @@ public class DeviceProfileController extends BaseController {
 
     @ApiOperation(value = "Get Default Device Profile (getDefaultDeviceProfileInfo)",
             notes = "Fetch the Default Device Profile Info object. " +
-                    DEVICE_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    DEVICE_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/deviceProfileInfo/default", method = RequestMethod.GET)
     @ResponseBody
@@ -136,8 +133,7 @@ public class DeviceProfileController extends BaseController {
                     "If profile is not set returns a list of unique keys among all profiles. " +
                     "The call is used for auto-complete in the UI forms. " +
                     "The implementation limits the number of devices that participate in search to 100 as a trade of between accurate results and time-consuming queries. " +
-                    TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/deviceProfile/devices/keys/timeseries", method = RequestMethod.GET)
     @ResponseBody
@@ -160,8 +156,7 @@ public class DeviceProfileController extends BaseController {
                     "If profile is not set returns a list of unique keys among all profiles. " +
                     "The call is used for auto-complete in the UI forms. " +
                     "The implementation limits the number of devices that participate in search to 100 as a trade of between accurate results and time-consuming queries. " +
-                    TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/deviceProfile/devices/keys/attributes", method = RequestMethod.GET)
     @ResponseBody
@@ -186,8 +181,7 @@ public class DeviceProfileController extends BaseController {
                     "Referencing non-existing device profile Id will cause 'Not Found' error. " + NEW_LINE +
                     "Device profile name is unique in the scope of tenant. Only one 'default' device profile may exist in scope of tenant." + DEVICE_PROFILE_DATA +
                     "Remove 'id', 'tenantId' from the request body example (below) to create new Device Profile entity. " +
-                    TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/deviceProfile", method = RequestMethod.POST)
     @ResponseBody
@@ -215,8 +209,7 @@ public class DeviceProfileController extends BaseController {
     }
 
     @ApiOperation(value = "Make Device Profile Default (setDefaultDeviceProfile)",
-            notes = "Marks device profile as default within a tenant scope." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Marks device profile as default within a tenant scope." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/deviceProfile/{deviceProfileId}/default", method = RequestMethod.POST)
     @ResponseBody
@@ -232,8 +225,7 @@ public class DeviceProfileController extends BaseController {
 
     @ApiOperation(value = "Get Device Profiles (getDeviceProfiles)",
             notes = "Returns a page of devices profile objects owned by tenant. " +
-                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/deviceProfiles", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -254,8 +246,7 @@ public class DeviceProfileController extends BaseController {
 
     @ApiOperation(value = "Get Device Profiles for transport type (getDeviceProfileInfos)",
             notes = "Returns a page of devices profile info objects owned by tenant. " +
-                    PAGE_DATA_PARAMETERS + DEVICE_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + DEVICE_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/deviceProfileInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/EdgeController.java b/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
index 9781d48828..3042b8f2a1 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
@@ -120,8 +120,7 @@ public class EdgeController extends BaseController {
     }
 
     @ApiOperation(value = "Get Edge (getEdgeById)",
-            notes = "Get the Edge object based on the provided Edge Id. " + EDGE_SECURITY_CHECK + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Get the Edge object based on the provided Edge Id. " + EDGE_SECURITY_CHECK + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/edge/{edgeId}", method = RequestMethod.GET)
     @ResponseBody
@@ -133,8 +132,7 @@ public class EdgeController extends BaseController {
     }
 
     @ApiOperation(value = "Get Edge Info (getEdgeInfoById)",
-            notes = "Get the Edge Info object based on the provided Edge Id. " + EDGE_SECURITY_CHECK + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Get the Edge Info object based on the provided Edge Id. " + EDGE_SECURITY_CHECK + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/edge/info/{edgeId}", method = RequestMethod.GET)
     @ResponseBody
@@ -152,8 +150,7 @@ public class EdgeController extends BaseController {
                     "Referencing non-existing Edge Id will cause 'Not Found' error." +
                     "\n\nEdge name is unique in the scope of tenant. Use unique identifiers like MAC or IMEI for the edge names and non-unique 'label' field for user-friendly visualization purposes." +
                     "Remove 'id', 'tenantId' and optionally 'customerId' from the request body example (below) to create new Edge entity. " +
-                    TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge", method = RequestMethod.POST)
     @ResponseBody
@@ -193,7 +190,7 @@ public class EdgeController extends BaseController {
 
     @ApiOperation(value = "Get Tenant Edges (getEdges)",
             notes = "Returns a page of edges owned by tenant. " +
-                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edges", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -213,8 +210,7 @@ public class EdgeController extends BaseController {
     }
 
     @ApiOperation(value = "Assign edge to customer (assignEdgeToCustomer)",
-            notes = "Creates assignment of the edge to customer. Customer will be able to query edge afterwards." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Creates assignment of the edge to customer. Customer will be able to query edge afterwards." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/{customerId}/edge/{edgeId}", method = RequestMethod.POST)
     @ResponseBody
@@ -232,8 +228,7 @@ public class EdgeController extends BaseController {
     }
 
     @ApiOperation(value = "Unassign edge from customer (unassignEdgeFromCustomer)",
-            notes = "Clears assignment of the edge to customer. Customer will not be able to query edge afterwards." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Clears assignment of the edge to customer. Customer will not be able to query edge afterwards." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/edge/{edgeId}", method = RequestMethod.DELETE)
     @ResponseBody
@@ -253,8 +248,7 @@ public class EdgeController extends BaseController {
     @ApiOperation(value = "Make edge publicly available (assignEdgeToPublicCustomer)",
             notes = "Edge will be available for non-authorized (not logged-in) users. " +
                     "This is useful to create dashboards that you plan to share/embed on a publicly available website. " +
-                    "However, users that are logged-in and belong to different tenant will not be able to access the edge." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "However, users that are logged-in and belong to different tenant will not be able to access the edge." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/public/edge/{edgeId}", method = RequestMethod.POST)
     @ResponseBody
@@ -268,7 +262,7 @@ public class EdgeController extends BaseController {
 
     @ApiOperation(value = "Get Tenant Edges (getTenantEdges)",
             notes = "Returns a page of edges owned by tenant. " +
-                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/edges", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -296,8 +290,7 @@ public class EdgeController extends BaseController {
 
     @ApiOperation(value = "Get Tenant Edge Infos (getTenantEdgeInfos)",
             notes = "Returns a page of edges info objects owned by tenant. " +
-                    PAGE_DATA_PARAMETERS + EDGE_INFO_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + EDGE_INFO_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/edgeInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -325,8 +318,7 @@ public class EdgeController extends BaseController {
 
     @ApiOperation(value = "Get Tenant Edge (getTenantEdge)",
             notes = "Requested edge must be owned by tenant or customer that the user belongs to. " +
-                    "Edge name is an unique property of edge. So it can be used to identify the edge." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Edge name is an unique property of edge. So it can be used to identify the edge." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/edges", params = {"edgeName"}, method = RequestMethod.GET)
     @ResponseBody
@@ -338,8 +330,7 @@ public class EdgeController extends BaseController {
 
     @ApiOperation(value = "Set root rule chain for provided edge (setEdgeRootRuleChain)",
             notes = "Change root rule chain of the edge to the new provided rule chain. \n" +
-                    "This operation will send a notification to update root rule chain on remote edge service." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "This operation will send a notification to update root rule chain on remote edge service." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/{ruleChainId}/root", method = RequestMethod.POST)
     @ResponseBody
@@ -359,7 +350,7 @@ public class EdgeController extends BaseController {
 
     @ApiOperation(value = "Get Customer Edges (getCustomerEdges)",
             notes = "Returns a page of edges objects assigned to customer. " +
-                    PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/customer/{customerId}/edges", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -395,7 +386,7 @@ public class EdgeController extends BaseController {
 
     @ApiOperation(value = "Get Customer Edge Infos (getCustomerEdgeInfos)",
             notes = "Returns a page of edges info objects assigned to customer. " +
-                    PAGE_DATA_PARAMETERS + EDGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + EDGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/customer/{customerId}/edgeInfos", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
@@ -430,8 +421,7 @@ public class EdgeController extends BaseController {
     }
 
     @ApiOperation(value = "Get Edges By Ids (getEdgesByIds)",
-            notes = "Requested edges must be owned by tenant or assigned to customer which user is performing the request." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Requested edges must be owned by tenant or assigned to customer which user is performing the request." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/edges", params = {"edgeIds"}, method = RequestMethod.GET)
     @ResponseBody
@@ -459,8 +449,7 @@ public class EdgeController extends BaseController {
     @ApiOperation(value = "Find related edges (findByQuery)",
             notes = "Returns all edges that are related to the specific entity. " +
                     "The entity id, relation type, edge types, depth of the search, and other query parameters defined using complex 'EdgeSearchQuery' object. " +
-                    "See 'Model' tab of the Parameters for more info." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "See 'Model' tab of the Parameters for more info." + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/edges", method = RequestMethod.POST)
     @ResponseBody
@@ -485,8 +474,7 @@ public class EdgeController extends BaseController {
 
     @ApiOperation(value = "Get Edge Types (getEdgeTypes)",
             notes = "Returns a set of unique edge types based on edges that are either owned by the tenant or assigned to the customer which user is performing the request."
-                    + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/edge/types", method = RequestMethod.GET)
     @ResponseBody
@@ -542,8 +530,7 @@ public class EdgeController extends BaseController {
     }
 
     @ApiOperation(value = "Import the bulk of edges (processEdgesBulkImport)",
-            notes = "There's an ability to import the bulk of edges using the only .csv file." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "There's an ability to import the bulk of edges using the only .csv file." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @PostMapping("/edge/bulk_import")
     public BulkImportResult<Edge> processEdgesBulkImport(@RequestBody BulkImportRequest request) throws Exception {
@@ -557,8 +544,7 @@ public class EdgeController extends BaseController {
     }
 
     @ApiOperation(value = "Get Edge Install Instructions (getEdgeInstallInstructions)",
-            notes = "Get an install instructions for provided edge id." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Get an install instructions for provided edge id." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/instructions/install/{edgeId}/{method}", method = RequestMethod.GET)
     @ResponseBody
@@ -579,8 +565,7 @@ public class EdgeController extends BaseController {
     }
 
     @ApiOperation(value = "Get Edge Upgrade Instructions (getEdgeUpgradeInstructions)",
-            notes = "Get an upgrade instructions for provided edge version." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Get an upgrade instructions for provided edge version." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/instructions/upgrade/{edgeVersion}/{method}", method = RequestMethod.GET)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/EdgeEventController.java b/application/src/main/java/org/thingsboard/server/controller/EdgeEventController.java
index 8828a714fc..d1912ba38f 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EdgeEventController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EdgeEventController.java
@@ -60,7 +60,7 @@ public class EdgeEventController extends BaseController {
 
     @ApiOperation(value = "Get Edge Events (getEdgeEvents)",
             notes = "Returns a page of edge events for the requested edge. " +
-                    PAGE_DATA_PARAMETERS, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/events", method = RequestMethod.GET)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
index e6e57e8b8c..505244539b 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
@@ -20,7 +20,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
index 3932e483d5..0cd31a729b 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java
@@ -135,8 +135,7 @@ public class EntityRelationController extends BaseController {
     }
 
     @ApiOperation(value = "Get Relation (getRelation)",
-            notes = "Returns relation object between two specified entities if present. Otherwise throws exception. " + SECURITY_CHECKS_ENTITIES_DESCRIPTION,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Returns relation object between two specified entities if present. Otherwise throws exception. " + SECURITY_CHECKS_ENTITIES_DESCRIPTION)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/relation", method = RequestMethod.GET, params = {FROM_ID, FROM_TYPE, RELATION_TYPE, TO_ID, TO_TYPE})
     @ResponseBody
@@ -161,8 +160,7 @@ public class EntityRelationController extends BaseController {
 
     @ApiOperation(value = "Get List of Relations (findByFrom)",
             notes = "Returns list of relation objects for the specified entity by the 'from' direction. " +
-                    SECURITY_CHECKS_ENTITY_DESCRIPTION,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    SECURITY_CHECKS_ENTITY_DESCRIPTION)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/relations", method = RequestMethod.GET, params = {FROM_ID, FROM_TYPE})
     @ResponseBody
@@ -180,8 +178,7 @@ public class EntityRelationController extends BaseController {
 
     @ApiOperation(value = "Get List of Relation Infos (findInfoByFrom)",
             notes = "Returns list of relation info objects for the specified entity by the 'from' direction. " +
-                    SECURITY_CHECKS_ENTITY_DESCRIPTION + " " + RELATION_INFO_DESCRIPTION,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    SECURITY_CHECKS_ENTITY_DESCRIPTION + " " + RELATION_INFO_DESCRIPTION)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/relations/info", method = RequestMethod.GET, params = {FROM_ID, FROM_TYPE})
     @ResponseBody
@@ -199,8 +196,7 @@ public class EntityRelationController extends BaseController {
 
     @ApiOperation(value = "Get List of Relations (findByFrom)",
             notes = "Returns list of relation objects for the specified entity by the 'from' direction and relation type. " +
-                    SECURITY_CHECKS_ENTITY_DESCRIPTION,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    SECURITY_CHECKS_ENTITY_DESCRIPTION)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/relations", method = RequestMethod.GET, params = {FROM_ID, FROM_TYPE, RELATION_TYPE})
     @ResponseBody
@@ -220,8 +216,7 @@ public class EntityRelationController extends BaseController {
 
     @ApiOperation(value = "Get List of Relations (findByTo)",
             notes = "Returns list of relation objects for the specified entity by the 'to' direction. " +
-                    SECURITY_CHECKS_ENTITY_DESCRIPTION,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    SECURITY_CHECKS_ENTITY_DESCRIPTION)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/relations", method = RequestMethod.GET, params = {TO_ID, TO_TYPE})
     @ResponseBody
@@ -239,8 +234,7 @@ public class EntityRelationController extends BaseController {
 
     @ApiOperation(value = "Get List of Relation Infos (findInfoByTo)",
             notes = "Returns list of relation info objects for the specified entity by the 'to' direction. " +
-                    SECURITY_CHECKS_ENTITY_DESCRIPTION + " " + RELATION_INFO_DESCRIPTION,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    SECURITY_CHECKS_ENTITY_DESCRIPTION + " " + RELATION_INFO_DESCRIPTION)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/relations/info", method = RequestMethod.GET, params = {TO_ID, TO_TYPE})
     @ResponseBody
@@ -258,8 +252,7 @@ public class EntityRelationController extends BaseController {
 
     @ApiOperation(value = "Get List of Relations (findByTo)",
             notes = "Returns list of relation objects for the specified entity by the 'to' direction and relation type. " +
-                    SECURITY_CHECKS_ENTITY_DESCRIPTION,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    SECURITY_CHECKS_ENTITY_DESCRIPTION)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/relations", method = RequestMethod.GET, params = {TO_ID, TO_TYPE, RELATION_TYPE})
     @ResponseBody
@@ -280,7 +273,7 @@ public class EntityRelationController extends BaseController {
     @ApiOperation(value = "Find related entities (findByQuery)",
             notes = "Returns all entities that are related to the specific entity. " +
                     "The entity id, relation type, entity types, depth of the search, and other query parameters defined using complex 'EntityRelationsQuery' object. " +
-                    "See 'Model' tab of the Parameters for more info.", responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "See 'Model' tab of the Parameters for more info.")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/relations", method = RequestMethod.POST)
     @ResponseBody
@@ -296,7 +289,7 @@ public class EntityRelationController extends BaseController {
     @ApiOperation(value = "Find related entity infos (findInfoByQuery)",
             notes = "Returns all entity infos that are related to the specific entity. " +
                     "The entity id, relation type, entity types, depth of the search, and other query parameters defined using complex 'EntityRelationsQuery' object. " +
-                    "See 'Model' tab of the Parameters for more info. " + RELATION_INFO_DESCRIPTION, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "See 'Model' tab of the Parameters for more info. " + RELATION_INFO_DESCRIPTION)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/relations/info", method = RequestMethod.POST)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java b/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
index 59877bd4d2..8b33aeeb15 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
@@ -97,8 +97,7 @@ public class EntityViewController extends BaseController {
 
     @ApiOperation(value = "Get entity view (getEntityViewById)",
             notes = "Fetch the EntityView object based on the provided entity view id. "
-                    + ENTITY_VIEW_DESCRIPTION + MODEL_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + ENTITY_VIEW_DESCRIPTION + MODEL_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/entityView/{entityViewId}", method = RequestMethod.GET)
     @ResponseBody
@@ -111,8 +110,7 @@ public class EntityViewController extends BaseController {
 
     @ApiOperation(value = "Get Entity View info (getEntityViewInfoById)",
             notes = "Fetch the Entity View info object based on the provided Entity View Id. "
-                    + ENTITY_VIEW_INFO_DESCRIPTION + MODEL_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + ENTITY_VIEW_INFO_DESCRIPTION + MODEL_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/entityView/info/{entityViewId}", method = RequestMethod.GET)
     @ResponseBody
@@ -127,8 +125,7 @@ public class EntityViewController extends BaseController {
     @ApiOperation(value = "Save or update entity view (saveEntityView)",
             notes = ENTITY_VIEW_DESCRIPTION + MODEL_DESCRIPTION +
                     "Remove 'id', 'tenantId' and optionally 'customerId' from the request body example (below) to create new Entity View entity." +
-                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/entityView", method = RequestMethod.POST)
     @ResponseBody
@@ -162,8 +159,7 @@ public class EntityViewController extends BaseController {
     }
 
     @ApiOperation(value = "Get Entity View by name (getTenantEntityView)",
-            notes = "Fetch the Entity View object based on the tenant id and entity view name. " + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+            notes = "Fetch the Entity View object based on the tenant id and entity view name. " + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/entityViews", params = {"entityViewName"}, method = RequestMethod.GET)
     @ResponseBody
@@ -399,8 +395,7 @@ public class EntityViewController extends BaseController {
                     EDGE_ASSIGN_ASYNC_FIRST_STEP_DESCRIPTION +
                     "Second, remote edge service will receive a copy of assignment entity view " +
                     EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION +
-                    "Third, once entity view will be delivered to edge service, it's going to be available for usage on remote edge instance.",
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Third, once entity view will be delivered to edge service, it's going to be available for usage on remote edge instance.")
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/entityView/{entityViewId}", method = RequestMethod.POST)
     @ResponseBody
@@ -424,8 +419,7 @@ public class EntityViewController extends BaseController {
                     EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION +
                     "Second, remote edge service will receive an 'unassign' command to remove entity view " +
                     EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION +
-                    "Third, once 'unassign' command will be delivered to edge service, it's going to remove entity view locally.",
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Third, once 'unassign' command will be delivered to edge service, it's going to remove entity view locally.")
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/entityView/{entityViewId}", method = RequestMethod.DELETE)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/EventController.java b/application/src/main/java/org/thingsboard/server/controller/EventController.java
index b1e2405ae6..372d724912 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EventController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EventController.java
@@ -108,7 +108,7 @@ public class EventController extends BaseController {
 
     @ApiOperation(value = "Get Events by type (getEvents)",
             notes = "Returns a page of events for specified entity by specifying event type. " +
-                    PAGE_DATA_PARAMETERS, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/events/{entityType}/{entityId}/{eventType}", method = RequestMethod.GET)
     @ResponseBody
@@ -150,7 +150,7 @@ public class EventController extends BaseController {
                     "The call was deprecated to improve the performance of the system. " +
                     "Current implementation will return 'Lifecycle' events only. " +
                     "Use 'Get events by type' or 'Get events by filter' instead. " +
-                    PAGE_DATA_PARAMETERS, responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/events/{entityType}/{entityId}", method = RequestMethod.GET)
     @ResponseBody
@@ -190,8 +190,7 @@ public class EventController extends BaseController {
     @ApiOperation(value = "Get Events by event filter (getEvents)",
             notes = "Returns a page of events for the chosen entity by specifying the event filter. " +
                     PAGE_DATA_PARAMETERS + NEW_LINE +
-                    EVENT_FILTER_DEFINITION,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    EVENT_FILTER_DEFINITION)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/events/{entityType}/{entityId}", method = RequestMethod.POST)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/Lwm2mController.java b/application/src/main/java/org/thingsboard/server/controller/Lwm2mController.java
index f6670193d9..25e49eb198 100644
--- a/application/src/main/java/org/thingsboard/server/controller/Lwm2mController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/Lwm2mController.java
@@ -59,8 +59,7 @@ public class Lwm2mController extends BaseController {
 
     @ApiOperation(value = "Get Lwm2m Bootstrap SecurityInfo (getLwm2mBootstrapSecurityInfo)",
             notes = "Get the Lwm2m Bootstrap SecurityInfo object (of the current server) based on the provided isBootstrapServer parameter. If isBootstrapServer == true, get the parameters of the current Bootstrap Server. If isBootstrapServer == false, get the parameters of the current Lwm2m Server. Used for client settings when starting the client in Bootstrap mode. " +
-                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/lwm2m/deviceProfile/bootstrap/{isBootstrapServer}", method = RequestMethod.GET)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/NotificationController.java b/application/src/main/java/org/thingsboard/server/controller/NotificationController.java
index 55f4e6d9fa..96f38daf35 100644
--- a/application/src/main/java/org/thingsboard/server/controller/NotificationController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/NotificationController.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.controller;
 
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -105,6 +106,8 @@ public class NotificationController extends BaseController {
     private final NotificationCenter notificationCenter;
     private final NotificationSettingsService notificationSettingsService;
 
+    private static final String DELIVERY_METHOD_ALLOWABLE_VALUES = "WEB,MOBILE_APP";
+
     @ApiOperation(value = "Get notifications (getNotifications)",
             notes = "Returns the page of notifications for current user." + NEW_LINE +
                     PAGE_DATA_PARAMETERS +
@@ -172,10 +175,23 @@ public class NotificationController extends BaseController {
                                                    @RequestParam(required = false) String sortOrder,
                                                    @Parameter(description = "To search for unread notifications only")
                                                    @RequestParam(defaultValue = "false") boolean unreadOnly,
+                                                   @Parameter(description = "Delivery method", schema = @Schema(allowableValues = {DELIVERY_METHOD_ALLOWABLE_VALUES}))
+                                                   @RequestParam(defaultValue = "WEB") NotificationDeliveryMethod deliveryMethod,
                                                    @AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
         // no permissions
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
-        return notificationService.findNotificationsByRecipientIdAndReadStatus(user.getTenantId(), user.getId(), unreadOnly, pageLink);
+        return notificationService.findNotificationsByRecipientIdAndReadStatus(user.getTenantId(), deliveryMethod, user.getId(), unreadOnly, pageLink);
+    }
+
+    @ApiOperation(value = "Get unread notifications count (getUnreadNotificationsCount)",
+            notes = "Returns unread notifications count for chosen delivery method." +
+                    AVAILABLE_FOR_ANY_AUTHORIZED_USER)
+    @GetMapping("/notifications/unread/count")
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
+    public Integer getUnreadNotificationsCount(@Parameter(description = "Delivery method", schema = @Schema(allowableValues = {DELIVERY_METHOD_ALLOWABLE_VALUES}))
+                                               @RequestParam(defaultValue = "MOBILE_APP") NotificationDeliveryMethod deliveryMethod,
+                                               @AuthenticationPrincipal SecurityUser user) {
+        return notificationService.countUnreadNotificationsByRecipientId(user.getTenantId(), deliveryMethod, user.getId());
     }
 
     @ApiOperation(value = "Mark notification as read (markNotificationAsRead)",
@@ -195,9 +211,11 @@ public class NotificationController extends BaseController {
                     AVAILABLE_FOR_ANY_AUTHORIZED_USER)
     @PutMapping("/notifications/read")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    public void markAllNotificationsAsRead(@AuthenticationPrincipal SecurityUser user) {
+    public void markAllNotificationsAsRead(@Parameter(description = "Delivery method", schema = @Schema(allowableValues = {DELIVERY_METHOD_ALLOWABLE_VALUES}))
+                                           @RequestParam(defaultValue = "WEB") NotificationDeliveryMethod deliveryMethod,
+                                           @AuthenticationPrincipal SecurityUser user) {
         // no permissions
-        notificationCenter.markAllNotificationsAsRead(user.getTenantId(), user.getId());
+        notificationCenter.markAllNotificationsAsRead(user.getTenantId(), deliveryMethod, user.getId());
     }
 
     @ApiOperation(value = "Delete notification (deleteNotification)",
diff --git a/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java b/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java
index 4ceb39534f..f2b77c3b7b 100644
--- a/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java
@@ -105,8 +105,7 @@ public class OtaPackageController extends BaseController {
 
     @ApiOperation(value = "Get OTA Package Info (getOtaPackageInfoById)",
             notes = "Fetch the OTA Package Info object based on the provided OTA Package Id. " +
-                    OTA_PACKAGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)))
+                    OTA_PACKAGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/otaPackage/info/{otaPackageId}", method = RequestMethod.GET)
     @ResponseBody
@@ -119,8 +118,7 @@ public class OtaPackageController extends BaseController {
 
     @ApiOperation(value = "Get OTA Package (getOtaPackageById)",
             notes = "Fetch the OTA Package object based on the provided OTA Package Id. " +
-                    "The server checks that the OTA Package is owned by the same tenant. " + OTA_PACKAGE_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)))
+                    "The server checks that the OTA Package is owned by the same tenant. " + OTA_PACKAGE_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/otaPackage/{otaPackageId}", method = RequestMethod.GET)
     @ResponseBody
@@ -136,8 +134,7 @@ public class OtaPackageController extends BaseController {
                     "The newly created OTA Package id will be present in the response. " +
                     "Specify existing OTA Package id to update the OTA Package Info. " +
                     "Referencing non-existing OTA Package Id will cause 'Not Found' error. " +
-                    "\n\nOTA Package combination of the title with the version is unique in the scope of tenant. " + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)))
+                    "\n\nOTA Package combination of the title with the version is unique in the scope of tenant. " + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/otaPackage", method = RequestMethod.POST)
     @ResponseBody
@@ -151,7 +148,6 @@ public class OtaPackageController extends BaseController {
 
     @ApiOperation(value = "Save OTA Package data (saveOtaPackageData)",
             notes = "Update the OTA Package. Adds the date to the existing OTA Package Info" + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)),
             requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(content = @Content(mediaType = MULTIPART_FORM_DATA_VALUE)))
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/otaPackage/{otaPackageId}", method = RequestMethod.POST, consumes = MULTIPART_FORM_DATA_VALUE)
@@ -176,8 +172,7 @@ public class OtaPackageController extends BaseController {
 
     @ApiOperation(value = "Get OTA Package Infos (getOtaPackages)",
             notes = "Returns a page of OTA Package Info objects owned by tenant. " +
-                    PAGE_DATA_PARAMETERS + OTA_PACKAGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + OTA_PACKAGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/otaPackages", method = RequestMethod.GET)
     @ResponseBody
@@ -197,8 +192,7 @@ public class OtaPackageController extends BaseController {
 
     @ApiOperation(value = "Get OTA Package Infos (getOtaPackages)",
             notes = "Returns a page of OTA Package Info objects owned by tenant. " +
-                    PAGE_DATA_PARAMETERS + OTA_PACKAGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + OTA_PACKAGE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/otaPackages/{deviceProfileId}/{type}", method = RequestMethod.GET)
     @ResponseBody
@@ -225,8 +219,7 @@ public class OtaPackageController extends BaseController {
 
     @ApiOperation(value = "Delete OTA Package (deleteOtaPackage)",
             notes = "Deletes the OTA Package. Referencing non-existing OTA Package Id will cause an error. " +
-                    "Can't delete the OTA Package if it is referenced by existing devices or device profile." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = APPLICATION_JSON_VALUE)))
+                    "Can't delete the OTA Package if it is referenced by existing devices or device profile." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/otaPackage/{otaPackageId}", method = RequestMethod.DELETE)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/QueueController.java b/application/src/main/java/org/thingsboard/server/controller/QueueController.java
index 089ba9bcca..6b90f8f8fd 100644
--- a/application/src/main/java/org/thingsboard/server/controller/QueueController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/QueueController.java
@@ -67,7 +67,7 @@ public class QueueController extends BaseController {
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @RequestMapping(value = "/queues", params = {"serviceType", "pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
-    public PageData<Queue> getTenantQueuesByServiceType(@Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, required = true))
+    public PageData<Queue> getTenantQueuesByServiceType(@Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, requiredMode = Schema.RequiredMode.REQUIRED))
                                                         @RequestParam String serviceType,
                                                         @Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
                                                         @RequestParam int pageSize,
@@ -126,7 +126,7 @@ public class QueueController extends BaseController {
     @ResponseBody
     public Queue saveQueue(@Parameter(description = "A JSON value representing the queue.")
                            @RequestBody Queue queue,
-                           @Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, required = true))
+                           @Parameter(description = QUEUE_SERVICE_TYPE_DESCRIPTION, schema = @Schema(allowableValues = {"TB-RULE-ENGINE", "TB-CORE", "TB-TRANSPORT", "JS-EXECUTOR"}, requiredMode = Schema.RequiredMode.REQUIRED))
                            @RequestParam String serviceType) throws ThingsboardException {
         checkParameter("serviceType", serviceType);
         queue.setTenantId(getCurrentUser().getTenantId());
diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
index e7c6e138ca..680633e103 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
@@ -47,8 +47,8 @@ import org.thingsboard.server.actors.tenant.DebugTbRateLimits;
 import org.thingsboard.server.common.data.EventInfo;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.edge.Edge;
-import org.thingsboard.server.common.data.event.EventType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.AssetProfileId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
@@ -80,6 +80,7 @@ import org.thingsboard.server.service.security.permission.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
@@ -340,18 +341,8 @@ public class RuleChainController extends BaseController {
         RuleNodeId ruleNodeId = new RuleNodeId(toUUID(strRuleNodeId));
         checkRuleNode(ruleNodeId, Operation.READ);
         TenantId tenantId = getCurrentUser().getTenantId();
-        List<EventInfo> events = eventService.findLatestEvents(tenantId, ruleNodeId, EventType.DEBUG_RULE_NODE, 2);
-        JsonNode result = null;
-        if (events != null) {
-            for (EventInfo event : events) {
-                JsonNode body = event.getBody();
-                if (body.has("type") && body.get("type").asText().equals("IN")) {
-                    result = body;
-                    break;
-                }
-            }
-        }
-        return result;
+        return Optional.ofNullable(eventService.findLatestDebugRuleNodeInEvent(tenantId, ruleNodeId))
+                .map(EventInfo::getBody).orElse(null);
     }
 
     @ApiOperation(value = "Is TBEL script executor enabled",
@@ -371,7 +362,7 @@ public class RuleChainController extends BaseController {
     public JsonNode testScript(
             @Parameter(description = "Script language: JS or TBEL")
             @RequestParam(required = false) ScriptLanguage scriptLang,
-            @Parameter(description = "Test JS request. See API call description above.")
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "Test JS request. See API call description above.")
             @RequestBody JsonNode inputParams) throws ThingsboardException, JsonProcessingException {
         String script = inputParams.get("script").asText();
         String scriptType = inputParams.get("scriptType").asText();
@@ -499,8 +490,7 @@ public class RuleChainController extends BaseController {
                     "Second, remote edge service will receive a copy of assignment rule chain " +
                     EDGE_ASSIGN_RECEIVE_STEP_DESCRIPTION +
                     "Third, once rule chain will be delivered to edge service, it's going to start processing messages locally. " +
-                    "\n\nOnly rule chain with type 'EDGE' can be assigned to edge." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "\n\nOnly rule chain with type 'EDGE' can be assigned to edge." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/ruleChain/{ruleChainId}", method = RequestMethod.POST)
     @ResponseBody
@@ -522,8 +512,7 @@ public class RuleChainController extends BaseController {
                     EDGE_UNASSIGN_ASYNC_FIRST_STEP_DESCRIPTION +
                     "Second, remote edge service will receive an 'unassign' command to remove rule chain " +
                     EDGE_UNASSIGN_RECEIVE_STEP_DESCRIPTION +
-                    "Third, once 'unassign' command will be delivered to edge service, it's going to remove rule chain locally." + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Third, once 'unassign' command will be delivered to edge service, it's going to remove rule chain locally." + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/edge/{edgeId}/ruleChain/{ruleChainId}", method = RequestMethod.DELETE)
     @ResponseBody
diff --git a/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java b/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
index bf59f78519..e646c34e4f 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
@@ -146,8 +146,7 @@ public class TbResourceController extends BaseController {
 
     @ApiOperation(value = "Get Resource Info (getResourceInfoById)",
             notes = "Fetch the Resource Info object based on the provided Resource Id. " +
-                    RESOURCE_INFO_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    RESOURCE_INFO_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @GetMapping(value = "/resource/info/{resourceId}")
     public TbResourceInfo getResourceInfoById(@Parameter(description = RESOURCE_ID_PARAM_DESCRIPTION)
@@ -159,8 +158,7 @@ public class TbResourceController extends BaseController {
 
     @ApiOperation(value = "Get Resource (getResourceById)",
             notes = "Fetch the Resource object based on the provided Resource Id. " +
-                    RESOURCE_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)), hidden = true)
+                    RESOURCE_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH, hidden = true)
     @Deprecated  // resource's data should be fetched with a download request
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @GetMapping(value = "/resource/{resourceId}")
@@ -178,8 +176,7 @@ public class TbResourceController extends BaseController {
                     "Referencing non-existing Resource Id will cause 'Not Found' error. " +
                     "\n\nResource combination of the title with the key is unique in the scope of tenant. " +
                     "Remove 'id', 'tenantId' from the request body example (below) to create new Resource entity." +
-                    SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @PostMapping(value = "/resource")
     public TbResourceInfo saveResource(@Parameter(description = "A JSON value representing the Resource.")
@@ -191,8 +188,7 @@ public class TbResourceController extends BaseController {
 
     @ApiOperation(value = "Get Resource Infos (getResources)",
             notes = "Returns a page of Resource Info objects owned by tenant or sysadmin. " +
-                    PAGE_DATA_PARAMETERS + RESOURCE_INFO_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + RESOURCE_INFO_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @GetMapping(value = "/resource")
     public PageData<TbResourceInfo> getResources(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@@ -227,8 +223,7 @@ public class TbResourceController extends BaseController {
 
     @ApiOperation(value = "Get All Resource Infos (getAllResources)",
             notes = "Returns a page of Resource Info objects owned by tenant. " +
-                    PAGE_DATA_PARAMETERS + RESOURCE_INFO_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + RESOURCE_INFO_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @GetMapping(value = "/resource/tenant")
     public PageData<TbResourceInfo> getTenantResources(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@@ -251,8 +246,7 @@ public class TbResourceController extends BaseController {
 
     @ApiOperation(value = "Get LwM2M Objects (getLwm2mListObjectsPage)",
             notes = "Returns a page of LwM2M objects parsed from Resources with type 'LWM2M_MODEL' owned by tenant or sysadmin. " +
-                    PAGE_DATA_PARAMETERS + LWM2M_OBJECT_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    PAGE_DATA_PARAMETERS + LWM2M_OBJECT_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @GetMapping(value = "/resource/lwm2m/page")
     public List<LwM2mObject> getLwm2mListObjectsPage(@Parameter(description = PAGE_SIZE_DESCRIPTION, required = true)
@@ -271,13 +265,12 @@ public class TbResourceController extends BaseController {
 
     @ApiOperation(value = "Get LwM2M Objects (getLwm2mListObjects)",
             notes = "Returns a page of LwM2M objects parsed from Resources with type 'LWM2M_MODEL' owned by tenant or sysadmin. " +
-                    "You can specify parameters to filter the results. " + LWM2M_OBJECT_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "You can specify parameters to filter the results. " + LWM2M_OBJECT_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
     @GetMapping(value = "/resource/lwm2m")
-    public List<LwM2mObject> getLwm2mListObjects(@Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}, required = true))
+    public List<LwM2mObject> getLwm2mListObjects(@Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}, requiredMode = Schema.RequiredMode.REQUIRED))
                                                  @RequestParam String sortOrder,
-                                                 @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"id", "name"}, required = true))
+                                                 @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"id", "name"}, requiredMode = Schema.RequiredMode.REQUIRED))
                                                  @RequestParam String sortProperty,
                                                  @Parameter(description = "LwM2M Object ids.", required = true)
                                                  @RequestParam(required = false) String[] objectIds) throws ThingsboardException {
@@ -322,4 +315,4 @@ public class TbResourceController extends BaseController {
                 .body(resource);
     }
 
-}
\ No newline at end of file
+}
diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
index 9ca600603c..5f1de4e3e3 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
@@ -25,7 +25,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
@@ -36,7 +35,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -49,9 +47,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
-import org.thingsboard.server.common.data.kv.AggregationParams;
-import org.thingsboard.server.common.data.kv.IntervalType;
-import org.thingsboard.server.common.msg.rule.engine.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
@@ -65,6 +60,7 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UUIDBased;
 import org.thingsboard.server.common.data.kv.Aggregation;
+import org.thingsboard.server.common.data.kv.AggregationParams;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BaseDeleteTsKvQuery;
@@ -74,6 +70,7 @@ import org.thingsboard.server.common.data.kv.BooleanDataEntry;
 import org.thingsboard.server.common.data.kv.DataType;
 import org.thingsboard.server.common.data.kv.DeleteTsKvQuery;
 import org.thingsboard.server.common.data.kv.DoubleDataEntry;
+import org.thingsboard.server.common.data.kv.IntervalType;
 import org.thingsboard.server.common.data.kv.JsonDataEntry;
 import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
@@ -177,8 +174,7 @@ public class TelemetryController extends BaseController {
                     "\n\n * SERVER_SCOPE - supported for all entity types;" +
                     "\n * CLIENT_SCOPE - supported for devices;" +
                     "\n * SHARED_SCOPE - supported for devices. "
-                    + "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/keys/attributes", method = RequestMethod.GET)
     @ResponseBody
@@ -193,8 +189,7 @@ public class TelemetryController extends BaseController {
                     "\n\n * SERVER_SCOPE - supported for all entity types;" +
                     "\n * CLIENT_SCOPE - supported for devices;" +
                     "\n * SHARED_SCOPE - supported for devices. "
-                    + "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/keys/attributes/{scope}", method = RequestMethod.GET)
     @ResponseBody
@@ -212,8 +207,7 @@ public class TelemetryController extends BaseController {
                     + MARKDOWN_CODE_BLOCK_START
                     + ATTRIBUTE_DATA_EXAMPLE
                     + MARKDOWN_CODE_BLOCK_END
-                    + "\n\n " + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + "\n\n " + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/values/attributes", method = RequestMethod.GET)
     @ResponseBody
@@ -235,15 +229,14 @@ public class TelemetryController extends BaseController {
                     + MARKDOWN_CODE_BLOCK_START
                     + ATTRIBUTE_DATA_EXAMPLE
                     + MARKDOWN_CODE_BLOCK_END
-                    + "\n\n " + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + "\n\n " + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/values/attributes/{scope}", method = RequestMethod.GET)
     @ResponseBody
     public DeferredResult<ResponseEntity> getAttributesByScope(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, required = true)) @PathVariable("scope") AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope") AttributeScope scope,
             @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION) @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
         SecurityUser user = getCurrentUser();
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
@@ -252,8 +245,7 @@ public class TelemetryController extends BaseController {
 
     @ApiOperation(value = "Get time-series keys (getTimeseriesKeys)",
             notes = "Returns a set of unique time-series key names for the selected entity. " +
-                    "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/keys/timeseries", method = RequestMethod.GET)
     @ResponseBody
@@ -275,8 +267,7 @@ public class TelemetryController extends BaseController {
                     + MARKDOWN_CODE_BLOCK_START
                     + LATEST_TS_STRICT_DATA_EXAMPLE
                     + MARKDOWN_CODE_BLOCK_END
-                    + "\n\n " + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + "\n\n " + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/values/timeseries", method = RequestMethod.GET)
     @ResponseBody
@@ -299,8 +290,7 @@ public class TelemetryController extends BaseController {
                     + MARKDOWN_CODE_BLOCK_START
                     + TS_STRICT_DATA_EXAMPLE
                     + MARKDOWN_CODE_BLOCK_END
-                    + "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + "\n\n" + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/{entityType}/{entityId}/values/timeseries", method = RequestMethod.GET, params = {"keys", "startTs", "endTs"})
     @ResponseBody
@@ -348,8 +338,7 @@ public class TelemetryController extends BaseController {
     @ApiOperation(value = "Save device attributes (saveDeviceAttributes)",
             notes = "Creates or updates the device attributes based on device id and specified attribute scope. " +
                     SAVE_ATTRIBUTES_REQUEST_PAYLOAD
-                    + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = SAVE_ATTIRIBUTES_STATUS_OK +
                     "Platform creates an audit log event about device attributes updates with action type 'ATTRIBUTES_UPDATED', " +
@@ -364,8 +353,8 @@ public class TelemetryController extends BaseController {
     @ResponseBody
     public DeferredResult<ResponseEntity> saveDeviceAttributes(
             @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable("deviceId") String deviceIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, required = true)) @PathVariable("scope") AttributeScope scope,
-            @Parameter(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope") AttributeScope scope,
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
         return saveAttributes(getTenantId(), entityId, scope, request);
     }
@@ -374,8 +363,7 @@ public class TelemetryController extends BaseController {
             notes = "Creates or updates the entity attributes based on Entity Id and the specified attribute scope. " +
                     ENTITY_SAVE_ATTRIBUTE_SCOPES +
                     SAVE_ATTRIBUTES_REQUEST_PAYLOAD
-                    + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = SAVE_ATTIRIBUTES_STATUS_OK + SAVE_ENTITY_ATTRIBUTES_STATUS_OK),
             @ApiResponse(responseCode = "400", description = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
@@ -388,8 +376,8 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityAttributesV1(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"})) @PathVariable("scope")AttributeScope scope,
-                    @Parameter(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true)@RequestBody JsonNode request) throws ThingsboardException {
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"})) @PathVariable("scope") AttributeScope scope,
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return saveAttributes(getTenantId(), entityId, scope, request);
     }
@@ -398,8 +386,7 @@ public class TelemetryController extends BaseController {
             notes = "Creates or updates the entity attributes based on Entity Id and the specified attribute scope. " +
                     ENTITY_SAVE_ATTRIBUTE_SCOPES +
                     SAVE_ATTRIBUTES_REQUEST_PAYLOAD
-                    + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = SAVE_ATTIRIBUTES_STATUS_OK + SAVE_ENTITY_ATTRIBUTES_STATUS_OK),
             @ApiResponse(responseCode = "400", description = SAVE_ATTIRIBUTES_STATUS_BAD_REQUEST),
@@ -412,8 +399,8 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityAttributesV2(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, required = true)) @PathVariable("scope")AttributeScope scope,
-                    @Parameter(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true)@RequestBody JsonNode request) throws ThingsboardException {
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope")AttributeScope scope,
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return saveAttributes(getTenantId(), entityId, scope, request);
     }
@@ -423,8 +410,7 @@ public class TelemetryController extends BaseController {
             notes = "Creates or updates the entity time-series data based on the Entity Id and request payload." +
                     SAVE_TIMESERIES_REQUEST_PAYLOAD +
                     "\n\n The scope parameter is not used in the API call implementation but should be specified whatever value because it is used as a path variable. "
-                    + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = SAVE_ENTITY_TIMESERIES_STATUS_OK),
             @ApiResponse(responseCode = "400", description = INVALID_STRUCTURE_OF_THE_REQUEST),
@@ -438,7 +424,7 @@ public class TelemetryController extends BaseController {
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
             @Parameter(description = TELEMETRY_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = "ANY")) @PathVariable("scope")String scope,
-                    @Parameter(description = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true)@RequestBody String requestBody) throws ThingsboardException {
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true)@RequestBody String requestBody) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return saveTelemetry(getTenantId(), entityId, requestBody, 0L);
     }
@@ -448,8 +434,7 @@ public class TelemetryController extends BaseController {
                     SAVE_TIMESERIES_REQUEST_PAYLOAD +
                     "\n\n The scope parameter is not used in the API call implementation but should be specified whatever value because it is used as a path variable. "
                     + "\n\nThe ttl parameter takes affect only in case of Cassandra DB."
-                    + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = SAVE_ENTITY_TIMESERIES_STATUS_OK),
             @ApiResponse(responseCode = "400", description = INVALID_STRUCTURE_OF_THE_REQUEST),
@@ -464,7 +449,7 @@ public class TelemetryController extends BaseController {
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
             @Parameter(description = TELEMETRY_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = "ANY")) @PathVariable("scope")AttributeScope scope,
                     @Parameter(description = "A long value representing TTL (Time to Live) parameter.", required = true)@PathVariable("ttl")Long ttl,
-                    @Parameter(description = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true)@RequestBody String requestBody) throws ThingsboardException {
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true)@RequestBody String requestBody) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return saveTelemetry(getTenantId(), entityId, requestBody, ttl);
     }
@@ -476,8 +461,7 @@ public class TelemetryController extends BaseController {
                     " Use 'deleteLatest' to delete latest value (stored in separate table for performance) if the value's timestamp matches the time-range. " +
                     " Use 'rewriteLatestIfDeleted' to rewrite latest value (stored in separate table for performance) if the value's timestamp matches the time-range and 'deleteLatest' param is true." +
                     " The replacement value will be fetched from the 'time-series' table, and its timestamp will be the most recent one before the defined time-range. " +
-                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "Timeseries for the selected keys in the request was removed. " +
                     "Platform creates an audit log event about entity timeseries removal with action type 'TIMESERIES_DELETED'."),
@@ -552,8 +536,7 @@ public class TelemetryController extends BaseController {
 
     @ApiOperation(value = "Delete device attributes (deleteDeviceAttributes)",
             notes = "Delete device attributes using provided Device Id, scope and a list of keys. " +
-                    "Referencing a non-existing Device Id will cause an error" + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "Referencing a non-existing Device Id will cause an error" + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "Device attributes was removed for the selected keys in the request. " +
                     "Platform creates an audit log event about device attributes removal with action type 'ATTRIBUTES_DELETED'."),
@@ -567,7 +550,7 @@ public class TelemetryController extends BaseController {
     @ResponseBody
     public DeferredResult<ResponseEntity> deleteDeviceAttributes(
             @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable(DEVICE_ID) String deviceIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, required = true)) @PathVariable("scope")AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope")AttributeScope scope,
                     @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION, required = true)@RequestParam(name = "keys")String keysStr) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
         return deleteAttributes(entityId, scope, keysStr);
@@ -575,8 +558,7 @@ public class TelemetryController extends BaseController {
 
     @ApiOperation(value = "Delete entity attributes (deleteEntityAttributes)",
             notes = "Delete entity attributes using provided Entity Id, scope and a list of keys. " +
-                    INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    INVALID_ENTITY_ID_OR_ENTITY_TYPE_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "Entity attributes was removed for the selected keys in the request. " +
                     "Platform creates an audit log event about entity attributes removal with action type 'ATTRIBUTES_DELETED'."),
@@ -665,7 +647,7 @@ public class TelemetryController extends BaseController {
         Map<Long, List<KvEntry>> telemetryRequest;
         JsonElement telemetryJson;
         try {
-            telemetryJson = new JsonParser().parse(requestBody);
+            telemetryJson = JsonParser.parseString(requestBody);
         } catch (Exception e) {
             return getImmediateDeferredResult("Unable to parse timeseries payload: Invalid JSON body!", HttpStatus.BAD_REQUEST);
         }
@@ -933,4 +915,5 @@ public class TelemetryController extends BaseController {
         }
         return entry.getValue();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthConfigController.java b/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthConfigController.java
index 7468e683ab..01487b20a0 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthConfigController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TwoFactorAuthConfigController.java
@@ -100,7 +100,7 @@ public class TwoFactorAuthConfigController extends BaseController {
                     ControllerConstants.AVAILABLE_FOR_ANY_AUTHORIZED_USER)
     @PostMapping("/account/config/generate")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    public TwoFaAccountConfig generateTwoFaAccountConfig(@Parameter(description = "2FA provider type to generate new account config for", schema = @Schema(defaultValue = "TOTP", required = true))
+    public TwoFaAccountConfig generateTwoFaAccountConfig(@Parameter(description = "2FA provider type to generate new account config for", schema = @Schema(defaultValue = "TOTP", requiredMode = Schema.RequiredMode.REQUIRED))
                                                          @RequestParam TwoFaProviderType providerType) throws Exception {
         SecurityUser user = getCurrentUser();
         return twoFactorAuthService.generateNewAccountConfig(user, providerType);
diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
index f999d31088..eb9d908bab 100644
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -128,8 +128,11 @@ public class ThingsboardInstallService {
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.2");
                             systemDataLoaderService.updateDefaultNotificationConfigs();
                         case "3.6.3":
-                            log.info("Upgrading ThingsBoard from version 3.6.3 to 3.7.0 ...");
+                            log.info("Upgrading ThingsBoard from version 3.6.3 to 3.6.4 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.6.3");
+                        case "3.6.4":
+                            log.info("Upgrading ThingsBoard from version 3.6.4 to 3.7.0 ...");
+                            databaseEntitiesUpgradeService.upgradeDatabase("3.6.4");
                             //TODO DON'T FORGET to update switch statement in the CacheCleanupService if you need to clear the cache
                             break;
                         default:
diff --git a/application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java b/application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
index db051ca0da..ab6d32fb44 100644
--- a/application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
@@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.cluster.TbClusterService;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasName;
@@ -127,20 +128,20 @@ public class EntityActionService {
                 } else {
                     entityNode = JacksonUtil.newObjectNode();
                     if (actionType == ActionType.ATTRIBUTES_UPDATED) {
-                        String scope = extractParameter(String.class, 0, additionalInfo);
+                        AttributeScope scope = extractParameter(AttributeScope.class, 0, additionalInfo);
                         @SuppressWarnings("unchecked")
                         List<AttributeKvEntry> attributes = extractParameter(List.class, 1, additionalInfo);
-                        metaData.putValue(DataConstants.SCOPE, scope);
+                        metaData.putValue(DataConstants.SCOPE, scope.name());
                         if (attributes != null) {
                             for (AttributeKvEntry attr : attributes) {
                                 JacksonUtil.addKvEntry(entityNode, attr);
                             }
                         }
                     } else if (actionType == ActionType.ATTRIBUTES_DELETED) {
-                        String scope = extractParameter(String.class, 0, additionalInfo);
+                        AttributeScope scope = extractParameter(AttributeScope.class, 0, additionalInfo);
                         @SuppressWarnings("unchecked")
                         List<String> keys = extractParameter(List.class, 1, additionalInfo);
-                        metaData.putValue(DataConstants.SCOPE, scope);
+                        metaData.putValue(DataConstants.SCOPE, scope.name());
                         ArrayNode attrsArrayNode = entityNode.putArray("attributes");
                         if (keys != null) {
                             keys.forEach(attrsArrayNode::add);
@@ -249,7 +250,7 @@ public class EntityActionService {
         return result;
     }
 
-    private void addTimeseries(ObjectNode entityNode, List<TsKvEntry> timeseries) throws Exception {
+    private void addTimeseries(ObjectNode entityNode, List<TsKvEntry> timeseries) {
         if (timeseries != null && !timeseries.isEmpty()) {
             ArrayNode result = entityNode.putArray("timeseries");
             Map<Long, List<TsKvEntry>> groupedTelemetry = timeseries.stream()
diff --git a/application/src/main/java/org/thingsboard/server/service/device/ClaimDevicesServiceImpl.java b/application/src/main/java/org/thingsboard/server/service/device/ClaimDevicesServiceImpl.java
index 974bc06a40..a77b7d0874 100644
--- a/application/src/main/java/org/thingsboard/server/service/device/ClaimDevicesServiceImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/device/ClaimDevicesServiceImpl.java
@@ -20,6 +20,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
+import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -28,7 +29,6 @@ import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
-import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
@@ -51,9 +51,7 @@ import org.thingsboard.server.dao.device.claim.ReclaimResult;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
-import jakarta.annotation.Nullable;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -89,16 +87,16 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
         Device device = deviceService.findDeviceById(tenantId, deviceId);
         Cache cache = cacheManager.getCache(CLAIM_DEVICES_CACHE);
         List<Object> key = constructCacheKey(device.getId());
+        String deviceName = device.getName();
         if (isAllowedClaimingByDefault) {
             if (device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
                 persistInCache(secretKey, durationMs, cache, key);
                 return Futures.immediateFuture(null);
             }
-            log.warn("The device [{}] has been already claimed!", device.getName());
-            return Futures.immediateFailedFuture(new IllegalArgumentException());
+            return Futures.immediateFailedFuture(new IllegalArgumentException("Device [" + deviceName + "] has been already claimed!"));
         } else {
             ListenableFuture<List<AttributeKvEntry>> claimingAllowedFuture = attributesService.find(tenantId, device.getId(),
-                    AttributeScope.SERVER_SCOPE, Collections.singletonList(CLAIM_ATTRIBUTE_NAME));
+                    AttributeScope.SERVER_SCOPE, List.of(CLAIM_ATTRIBUTE_NAME));
             return Futures.transform(claimingAllowedFuture, list -> {
                 if (list != null && !list.isEmpty()) {
                     Optional<Boolean> claimingAllowedOptional = list.get(0).getBooleanValue();
@@ -108,8 +106,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
                         return null;
                     }
                 }
-                log.warn("Failed to find claimingAllowed attribute for device or it is already claimed![{}]", device.getName());
-                throw new IllegalArgumentException();
+                throw new IllegalArgumentException("Failed to find claimingAllowed attribute for device [" + deviceName + "] or it is already claimed!");
             }, MoreExecutors.directExecutor());
         }
     }
@@ -182,7 +179,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
             }
             SettableFuture<ReclaimResult> result = SettableFuture.create();
             telemetryService.saveAndNotify(
-                    tenantId, savedDevice.getId(), AttributeScope.SERVER_SCOPE, Collections.singletonList(
+                    tenantId, savedDevice.getId(), AttributeScope.SERVER_SCOPE, List.of(
                             new BaseAttributeKvEntry(new BooleanDataEntry(CLAIM_ATTRIBUTE_NAME, true), System.currentTimeMillis())
                     ),
                     new FutureCallback<>() {
@@ -203,7 +200,7 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
     }
 
     private List<Object> constructCacheKey(DeviceId deviceId) {
-        return Collections.singletonList(deviceId);
+        return List.of(deviceId);
     }
 
     private void persistInCache(String secretKey, long durationMs, Cache cache, List<Object> key) {
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java b/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
index eede4a3afc..f29255e414 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
@@ -16,6 +16,8 @@
 package org.thingsboard.server.service.edge;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -42,6 +44,8 @@ import org.thingsboard.server.service.edge.rpc.processor.device.DeviceEdgeProces
 import org.thingsboard.server.service.edge.rpc.processor.device.profile.DeviceProfileEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.edge.EdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.entityview.EntityViewEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.notification.NotificationEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.oauth2.OAuth2EdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.ota.OtaPackageEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.queue.QueueEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.relation.RelationEdgeProcessor;
@@ -53,8 +57,6 @@ import org.thingsboard.server.service.edge.rpc.processor.user.UserEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.widget.WidgetBundleEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.widget.WidgetTypeEdgeProcessor;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -126,6 +128,12 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
     @Autowired
     private ResourceEdgeProcessor resourceEdgeProcessor;
 
+    @Autowired
+    private NotificationEdgeProcessor notificationEdgeProcessor;
+
+    @Autowired
+    private OAuth2EdgeProcessor oAuth2EdgeProcessor;
+
     @Autowired
     protected ApplicationEventPublisher eventPublisher;
 
@@ -171,68 +179,30 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
                     }
                     EdgeEventType type = EdgeEventType.valueOf(edgeNotificationMsg.getType());
                     switch (type) {
-                        case EDGE:
-                            edgeProcessor.processEdgeNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case ASSET:
-                            assetProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case ASSET_PROFILE:
-                            assetProfileEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case DEVICE:
-                            deviceProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case DEVICE_PROFILE:
-                            deviceProfileEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case ENTITY_VIEW:
-                            entityViewProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case DASHBOARD:
-                            dashboardProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case RULE_CHAIN:
-                            ruleChainProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case USER:
-                            userProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case CUSTOMER:
-                            customerProcessor.processCustomerNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case OTA_PACKAGE:
-                            otaPackageProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case WIDGETS_BUNDLE:
-                            widgetBundleProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case WIDGET_TYPE:
-                            widgetTypeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case QUEUE:
-                            queueProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case ALARM:
-                            alarmProcessor.processAlarmNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case ALARM_COMMENT:
-                            alarmProcessor.processAlarmCommentNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case RELATION:
-                            relationProcessor.processRelationNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case TENANT:
-                            tenantEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case TENANT_PROFILE:
-                            tenantProfileEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        case TB_RESOURCE:
-                            resourceEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
-                            break;
-                        default:
-                            log.warn("[{}] Edge event type [{}] is not designed to be pushed to edge", tenantId, type);
+                        case EDGE -> edgeProcessor.processEdgeNotification(tenantId, edgeNotificationMsg);
+                        case ASSET -> assetProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case ASSET_PROFILE -> assetProfileEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case DEVICE -> deviceProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case DEVICE_PROFILE -> deviceProfileEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case ENTITY_VIEW -> entityViewProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case DASHBOARD -> dashboardProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case RULE_CHAIN -> ruleChainProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case USER -> userProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case CUSTOMER -> customerProcessor.processCustomerNotification(tenantId, edgeNotificationMsg);
+                        case OTA_PACKAGE -> otaPackageProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case WIDGETS_BUNDLE -> widgetBundleProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case WIDGET_TYPE -> widgetTypeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case QUEUE -> queueProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case ALARM -> alarmProcessor.processAlarmNotification(tenantId, edgeNotificationMsg);
+                        case ALARM_COMMENT -> alarmProcessor.processAlarmCommentNotification(tenantId, edgeNotificationMsg);
+                        case RELATION -> relationProcessor.processRelationNotification(tenantId, edgeNotificationMsg);
+                        case TENANT -> tenantEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case TENANT_PROFILE -> tenantProfileEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case NOTIFICATION_RULE, NOTIFICATION_TARGET, NOTIFICATION_TEMPLATE ->
+                                notificationEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case TB_RESOURCE -> resourceEdgeProcessor.processEntityNotification(tenantId, edgeNotificationMsg);
+                        case OAUTH2 -> oAuth2EdgeProcessor.processOAuth2Notification(tenantId, edgeNotificationMsg);
+                        default -> log.warn("[{}] Edge event type [{}] is not designed to be pushed to edge", tenantId, type);
                     }
                 } catch (Exception e) {
                     callBackFailure(tenantId, edgeNotificationMsg, callback, e);
@@ -248,4 +218,5 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
         log.error("[{}] Can't push to edge updates, edgeNotificationMsg [{}]", tenantId, edgeNotificationMsg, throwable);
         callback.onFailure(throwable);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java b/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java
index f5b769e568..489fc6b6b8 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java
@@ -32,6 +32,10 @@ import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.edge.EdgeEventService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
+import org.thingsboard.server.dao.notification.NotificationRuleService;
+import org.thingsboard.server.dao.notification.NotificationTargetService;
+import org.thingsboard.server.dao.notification.NotificationTemplateService;
+import org.thingsboard.server.dao.oauth2.OAuth2Service;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.queue.QueueService;
 import org.thingsboard.server.dao.resource.ResourceService;
@@ -61,6 +65,8 @@ import org.thingsboard.server.service.edge.rpc.processor.device.profile.DevicePr
 import org.thingsboard.server.service.edge.rpc.processor.edge.EdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.entityview.EntityViewEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.entityview.EntityViewProcessorFactory;
+import org.thingsboard.server.service.edge.rpc.processor.notification.NotificationEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.oauth2.OAuth2EdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.ota.OtaPackageEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.queue.QueueEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.relation.RelationEdgeProcessor;
@@ -151,6 +157,18 @@ public class EdgeContextComponent {
     @Autowired
     private ResourceService resourceService;
 
+    @Autowired
+    private NotificationRuleService notificationRuleService;
+
+    @Autowired
+    private NotificationTargetService notificationTargetService;
+
+    @Autowired
+    private NotificationTemplateService notificationTemplateService;
+
+    @Autowired
+    private OAuth2Service oAuth2Service;
+
     @Autowired
     private RateLimitService rateLimitService;
 
@@ -220,6 +238,12 @@ public class EdgeContextComponent {
     @Autowired
     private ResourceEdgeProcessor resourceEdgeProcessor;
 
+    @Autowired
+    private NotificationEdgeProcessor notificationEdgeProcessor;
+
+    @Autowired
+    private OAuth2EdgeProcessor oAuth2EdgeProcessor;
+
     @Autowired
     private EdgeMsgConstructor edgeMsgConstructor;
 
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java b/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
index e54adb05fa..d975217e1f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
@@ -33,6 +33,7 @@ import org.thingsboard.server.common.data.alarm.AlarmComment;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.oauth2.OAuth2Info;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 import org.thingsboard.server.common.data.rule.RuleChain;
@@ -159,43 +160,41 @@ public class EdgeEventSourcingListener {
     private boolean isValidSaveEntityEventForEdgeProcessing(SaveEntityEvent<?> event) {
         Object entity = event.getEntity();
         Object oldEntity = event.getOldEntity();
-        switch (event.getEntityId().getEntityType()) {
-            case RULE_CHAIN:
-                if (entity instanceof RuleChain) {
-                    RuleChain ruleChain = (RuleChain) entity;
-                    return RuleChainType.EDGE.equals(ruleChain.getType());
-                }
-                break;
-            case USER:
-                if (entity instanceof User) {
-                    User user = (User) entity;
-                    if (Authority.SYS_ADMIN.equals(user.getAuthority())) {
-                        return false;
+        if (event.getEntityId() != null) {
+            switch (event.getEntityId().getEntityType()) {
+                case RULE_CHAIN:
+                    if (entity instanceof RuleChain ruleChain) {
+                        return RuleChainType.EDGE.equals(ruleChain.getType());
+                    }
+                    break;
+                case USER:
+                    if (entity instanceof User user) {
+                        if (Authority.SYS_ADMIN.equals(user.getAuthority())) {
+                            return false;
+                        }
+                        if (oldEntity != null) {
+                            User oldUser = (User) oldEntity;
+                            cleanUpUserAdditionalInfo(oldUser);
+                            cleanUpUserAdditionalInfo(user);
+                            return !user.equals(oldUser);
+                        }
                     }
-                    if (oldEntity != null) {
-                        User oldUser = (User) oldEntity;
-                        cleanUpUserAdditionalInfo(oldUser);
-                        cleanUpUserAdditionalInfo(user);
-                        return !user.equals(oldUser);
+                    break;
+                case OTA_PACKAGE:
+                    if (entity instanceof OtaPackageInfo otaPackageInfo) {
+                        return otaPackageInfo.hasUrl() || otaPackageInfo.isHasData();
+                    }
+                    break;
+                case ALARM:
+                    if (entity instanceof AlarmApiCallResult || entity instanceof Alarm) {
+                        return false;
                     }
-                }
-                break;
-            case OTA_PACKAGE:
-                if (entity instanceof OtaPackageInfo) {
-                    OtaPackageInfo otaPackageInfo = (OtaPackageInfo) entity;
-                    return otaPackageInfo.hasUrl() || otaPackageInfo.isHasData();
-                }
-                break;
-            case ALARM:
-                if (entity instanceof AlarmApiCallResult || entity instanceof Alarm) {
+                    break;
+                case TENANT:
+                    return !event.getCreated();
+                case API_USAGE_STATE, EDGE:
                     return false;
-                }
-                break;
-            case TENANT:
-                return !event.getCreated();
-            case API_USAGE_STATE:
-            case EDGE:
-                return false;
+            }
         }
         // Default: If the entity doesn't match any of the conditions, consider it as valid.
         return true;
@@ -206,8 +205,7 @@ public class EdgeEventSourcingListener {
         if (user.getAdditionalInfo() instanceof NullNode) {
             user.setAdditionalInfo(null);
         }
-        if (user.getAdditionalInfo() instanceof ObjectNode) {
-            ObjectNode additionalInfo = ((ObjectNode) user.getAdditionalInfo());
+        if (user.getAdditionalInfo() instanceof ObjectNode additionalInfo) {
             additionalInfo.remove(UserServiceImpl.FAILED_LOGIN_ATTEMPTS);
             additionalInfo.remove(UserServiceImpl.LAST_LOGIN_TS);
             if (additionalInfo.isEmpty()) {
@@ -221,6 +219,8 @@ public class EdgeEventSourcingListener {
     private EdgeEventType getEdgeEventTypeForEntityEvent(Object entity) {
         if (entity instanceof AlarmComment) {
             return EdgeEventType.ALARM_COMMENT;
+        } else if (entity instanceof OAuth2Info) {
+            return EdgeEventType.OAUTH2;
         }
         return null;
     }
@@ -228,6 +228,8 @@ public class EdgeEventSourcingListener {
     private String getBodyMsgForEntityEvent(Object entity) {
         if (entity instanceof AlarmComment) {
             return JacksonUtil.toString(entity);
+        } else if (entity instanceof OAuth2Info) {
+            return JacksonUtil.toString(entity);
         }
         return null;
     }
@@ -238,4 +240,5 @@ public class EdgeEventSourcingListener {
         }
         return isCreated ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
index a73d3a20ff..55e8e051ab 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
@@ -498,9 +498,9 @@ public final class EdgeGrpcSession implements Closeable {
                     log.trace("[{}][{}][{}] downlink msg(s) are going to be send.", this.tenantId, this.sessionId, copy.size());
                     for (DownlinkMsg downlinkMsg : copy) {
                         if (this.clientMaxInboundMessageSize != 0 && downlinkMsg.getSerializedSize() > this.clientMaxInboundMessageSize) {
-                            String error = String.format("Client max inbound message size [{%s}] is exceeded. Please increase value of CLOUD_RPC_MAX_INBOUND_MESSAGE_SIZE " +
+                            String error = String.format("Client max inbound message size %s is exceeded. Please increase value of CLOUD_RPC_MAX_INBOUND_MESSAGE_SIZE " +
                                     "env variable on the edge and restart it.", this.clientMaxInboundMessageSize);
-                            String message = String.format("Downlink msg size [{%s}] exceeds client max inbound message size [{%s}]. " +
+                            String message = String.format("Downlink msg size %s exceeds client max inbound message size %s. " +
                                     "Please increase value of CLOUD_RPC_MAX_INBOUND_MESSAGE_SIZE env variable on the edge and restart it.", downlinkMsg.getSerializedSize(), this.clientMaxInboundMessageSize);
                             log.error("[{}][{}][{}] {} Message {}", this.tenantId, edge.getId(), this.sessionId, message, downlinkMsg);
                             ctx.getNotificationRuleProcessor().process(EdgeCommunicationFailureTrigger.builder().tenantId(tenantId)
@@ -551,35 +551,13 @@ public final class EdgeGrpcSession implements Closeable {
             DownlinkMsg downlinkMsg = null;
             try {
                 switch (edgeEvent.getAction()) {
-                    case UPDATED:
-                    case ADDED:
-                    case DELETED:
-                    case ASSIGNED_TO_EDGE:
-                    case UNASSIGNED_FROM_EDGE:
-                    case ALARM_ACK:
-                    case ALARM_CLEAR:
-                    case ALARM_DELETE:
-                    case CREDENTIALS_UPDATED:
-                    case RELATION_ADD_OR_UPDATE:
-                    case RELATION_DELETED:
-                    case CREDENTIALS_REQUEST:
-                    case RPC_CALL:
-                    case ASSIGNED_TO_CUSTOMER:
-                    case UNASSIGNED_FROM_CUSTOMER:
-                    case ADDED_COMMENT:
-                    case UPDATED_COMMENT:
-                    case DELETED_COMMENT:
+                    case UPDATED, ADDED, DELETED, ASSIGNED_TO_EDGE, UNASSIGNED_FROM_EDGE, ALARM_ACK, ALARM_CLEAR, ALARM_DELETE, CREDENTIALS_UPDATED, RELATION_ADD_OR_UPDATE, RELATION_DELETED, CREDENTIALS_REQUEST, RPC_CALL, ASSIGNED_TO_CUSTOMER, UNASSIGNED_FROM_CUSTOMER, ADDED_COMMENT, UPDATED_COMMENT, DELETED_COMMENT -> {
                         downlinkMsg = convertEntityEventToDownlink(edgeEvent);
                         log.trace("[{}][{}] entity message processed [{}]", this.tenantId, this.sessionId, downlinkMsg);
-                        break;
-                    case ATTRIBUTES_UPDATED:
-                    case POST_ATTRIBUTES:
-                    case ATTRIBUTES_DELETED:
-                    case TIMESERIES_UPDATED:
-                        downlinkMsg = ctx.getTelemetryProcessor().convertTelemetryEventToDownlink(edgeEvent);
-                        break;
-                    default:
-                        log.warn("[{}][{}] Unsupported action type [{}]", this.tenantId, this.sessionId, edgeEvent.getAction());
+                    }
+                    case ATTRIBUTES_UPDATED, POST_ATTRIBUTES, ATTRIBUTES_DELETED, TIMESERIES_UPDATED ->
+                            downlinkMsg = ctx.getTelemetryProcessor().convertTelemetryEventToDownlink(edge, edgeEvent);
+                    default -> log.warn("[{}][{}] Unsupported action type [{}]", this.tenantId, this.sessionId, edgeEvent.getAction());
                 }
             } catch (Exception e) {
                 log.error("[{}][{}] Exception during converting edge event to downlink msg", this.tenantId, this.sessionId, e);
@@ -705,6 +683,14 @@ public final class EdgeGrpcSession implements Closeable {
                 return ctx.getTenantEdgeProcessor().convertTenantEventToDownlink(edgeEvent, this.edgeVersion);
             case TENANT_PROFILE:
                 return ctx.getTenantProfileEdgeProcessor().convertTenantProfileEventToDownlink(edgeEvent, this.edgeVersion);
+            case NOTIFICATION_RULE:
+                return ctx.getNotificationEdgeProcessor().convertNotificationRuleToDownlink(edgeEvent);
+            case NOTIFICATION_TARGET:
+                return ctx.getNotificationEdgeProcessor().convertNotificationTargetToDownlink(edgeEvent);
+            case NOTIFICATION_TEMPLATE:
+                return ctx.getNotificationEdgeProcessor().convertNotificationTemplateToDownlink(edgeEvent);
+            case OAUTH2:
+                return ctx.getOAuth2EdgeProcessor().convertOAuth2EventToDownlink(edgeEvent);
             default:
                 log.warn("[{}] Unsupported edge event type [{}]", this.tenantId, edgeEvent);
                 return null;
@@ -855,7 +841,7 @@ public final class EdgeGrpcSession implements Closeable {
                             .build();
                 }
                 String error = "Failed to validate the edge!";
-                String failureMsg = String.format("{%s} Provided request secret: %s", error, request.getEdgeSecret());
+                String failureMsg = String.format("%s Provided request secret: %s", error, request.getEdgeSecret());
                 ctx.getNotificationRuleProcessor().process(EdgeCommunicationFailureTrigger.builder().tenantId(tenantId).edgeId(edge.getId())
                         .customerId(edge.getCustomerId()).edgeName(edge.getName()).failureMsg(failureMsg).error(error).build());
                 return ConnectResponseMsg.newBuilder()
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeSyncCursor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeSyncCursor.java
index 8583e8725e..6321991586 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeSyncCursor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeSyncCursor.java
@@ -30,6 +30,10 @@ import org.thingsboard.server.service.edge.rpc.fetch.DeviceProfilesEdgeEventFetc
 import org.thingsboard.server.service.edge.rpc.fetch.DevicesEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.fetch.EdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.fetch.EntityViewsEdgeEventFetcher;
+import org.thingsboard.server.service.edge.rpc.fetch.NotificationRuleEdgeEventFetcher;
+import org.thingsboard.server.service.edge.rpc.fetch.NotificationTargetEdgeEventFetcher;
+import org.thingsboard.server.service.edge.rpc.fetch.NotificationTemplateEdgeEventFetcher;
+import org.thingsboard.server.service.edge.rpc.fetch.OAuth2EdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.fetch.OtaPackagesEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.fetch.QueuesEdgeEventFetcher;
 import org.thingsboard.server.service.edge.rpc.fetch.RuleChainsEdgeEventFetcher;
@@ -73,12 +77,16 @@ public class EdgeSyncCursor {
         fetchers.add(new AssetsEdgeEventFetcher(ctx.getAssetService()));
         fetchers.add(new EntityViewsEdgeEventFetcher(ctx.getEntityViewService()));
         if (fullSync) {
+            fetchers.add(new NotificationTemplateEdgeEventFetcher(ctx.getNotificationTemplateService()));
+            fetchers.add(new NotificationTargetEdgeEventFetcher(ctx.getNotificationTargetService()));
+            fetchers.add(new NotificationRuleEdgeEventFetcher(ctx.getNotificationRuleService()));
             fetchers.add(new SystemWidgetTypesEdgeEventFetcher(ctx.getWidgetTypeService()));
             fetchers.add(new TenantWidgetTypesEdgeEventFetcher(ctx.getWidgetTypeService()));
             fetchers.add(new SystemWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
             fetchers.add(new TenantWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
             fetchers.add(new OtaPackagesEdgeEventFetcher(ctx.getOtaPackageService()));
             fetchers.add(new TenantResourcesEdgeEventFetcher(ctx.getResourceService()));
+            fetchers.add(new OAuth2EdgeEventFetcher(ctx.getOAuth2Service()));
         }
     }
 
@@ -98,4 +106,5 @@ public class EdgeSyncCursor {
     public int getCurrentIdx() {
         return currentIdx;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/BaseMsgConstructorFactory.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/BaseMsgConstructorFactory.java
index 5253e5ac33..dd76f97d8f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/BaseMsgConstructorFactory.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/BaseMsgConstructorFactory.java
@@ -31,16 +31,10 @@ public abstract class BaseMsgConstructorFactory<T extends MsgConstructor, U exte
     protected U v2Constructor;
 
     public MsgConstructor getMsgConstructorByEdgeVersion(EdgeVersion edgeVersion) {
-        switch (edgeVersion) {
-            case V_3_3_0:
-            case V_3_3_3:
-            case V_3_4_0:
-            case V_3_6_0:
-            case V_3_6_1:
-                return v1Constructor;
-            case V_3_6_2:
-            default:
-                return v2Constructor;
-        }
+        return switch (edgeVersion) {
+            case V_3_3_0, V_3_3_3, V_3_4_0, V_3_6_0, V_3_6_1 -> v1Constructor;
+            default -> v2Constructor;
+        };
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/BaseDashboardMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/BaseDashboardMsgConstructor.java
index a61cc1fee3..f1314d9587 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/BaseDashboardMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/BaseDashboardMsgConstructor.java
@@ -28,4 +28,5 @@ public abstract class BaseDashboardMsgConstructor implements DashboardMsgConstru
                 .setIdMSB(dashboardId.getId().getMostSignificantBits())
                 .setIdLSB(dashboardId.getId().getLeastSignificantBits()).build();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructor.java
index 6e29ed1630..bdf4968692 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructor.java
@@ -26,4 +26,5 @@ public interface DashboardMsgConstructor extends MsgConstructor {
     DashboardUpdateMsg constructDashboardUpdatedMsg(UpdateMsgType msgType, Dashboard dashboard);
 
     DashboardUpdateMsg constructDashboardDeleteMsg(DashboardId dashboardId);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructorV2.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructorV2.java
index 9af71e8150..d1fb5ae703 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructorV2.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/dashboard/DashboardMsgConstructorV2.java
@@ -32,4 +32,5 @@ public class DashboardMsgConstructorV2 extends BaseDashboardMsgConstructor {
                 .setIdMSB(dashboard.getId().getId().getMostSignificantBits())
                 .setIdLSB(dashboard.getId().getId().getLeastSignificantBits()).build();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructor.java
index 2afdeacc67..854d0c80a8 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructor.java
@@ -43,4 +43,5 @@ public interface DeviceMsgConstructor extends MsgConstructor {
     DeviceProfileUpdateMsg constructDeviceProfileDeleteMsg(DeviceProfileId deviceProfileId);
 
     DeviceRpcCallMsg constructDeviceRpcCallMsg(UUID deviceId, JsonNode body);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructorV2.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructorV2.java
index 3d4e20ab3c..cf951e39a9 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructorV2.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/device/DeviceMsgConstructorV2.java
@@ -48,4 +48,5 @@ public class DeviceMsgConstructorV2 extends BaseDeviceMsgConstructor {
                 .setIdMSB(deviceProfile.getId().getId().getMostSignificantBits())
                 .setIdLSB(deviceProfile.getId().getId().getLeastSignificantBits()).build();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/edge/EdgeMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/edge/EdgeMsgConstructor.java
index 81b1df7ac9..4b45b0427f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/edge/EdgeMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/edge/EdgeMsgConstructor.java
@@ -43,4 +43,5 @@ public class EdgeMsgConstructor {
         }
         return builder.build();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/BaseEntityViewMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/BaseEntityViewMsgConstructor.java
index ec650849e1..7fa4a03c3e 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/BaseEntityViewMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/BaseEntityViewMsgConstructor.java
@@ -28,4 +28,5 @@ public abstract class BaseEntityViewMsgConstructor implements EntityViewMsgConst
                 .setIdMSB(entityViewId.getId().getMostSignificantBits())
                 .setIdLSB(entityViewId.getId().getLeastSignificantBits()).build();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructor.java
index 69ce0f6770..bec1d416d3 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructor.java
@@ -26,4 +26,5 @@ public interface EntityViewMsgConstructor extends MsgConstructor {
     EntityViewUpdateMsg constructEntityViewUpdatedMsg(UpdateMsgType msgType, EntityView entityView);
 
     EntityViewUpdateMsg constructEntityViewDeleteMsg(EntityViewId entityViewId);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructorV1.java
index feb0ab1d35..1b3bba22c0 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructorV1.java
@@ -51,13 +51,11 @@ public class EntityViewMsgConstructorV1 extends BaseEntityViewMsgConstructor {
     }
 
     private EdgeEntityType checkEntityType(EntityType entityType) {
-        switch (entityType) {
-            case DEVICE:
-                return EdgeEntityType.DEVICE;
-            case ASSET:
-                return EdgeEntityType.ASSET;
-            default:
-                throw new RuntimeException("Unsupported entity type [" + entityType + "]");
-        }
+        return switch (entityType) {
+            case DEVICE -> EdgeEntityType.DEVICE;
+            case ASSET -> EdgeEntityType.ASSET;
+            default -> throw new RuntimeException("Unsupported entity type [" + entityType + "]");
+        };
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructorV2.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructorV2.java
index ba793f621b..6db4818688 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructorV2.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/entityview/EntityViewMsgConstructorV2.java
@@ -32,4 +32,5 @@ public class EntityViewMsgConstructorV2 extends BaseEntityViewMsgConstructor {
                 .setIdMSB(entityView.getId().getId().getMostSignificantBits())
                 .setIdLSB(entityView.getId().getId().getLeastSignificantBits()).build();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/notification/NotificationMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/notification/NotificationMsgConstructor.java
new file mode 100644
index 0000000000..9c8f5a37e6
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/notification/NotificationMsgConstructor.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.edge.rpc.constructor.notification;
+
+import org.thingsboard.server.common.data.id.NotificationRuleId;
+import org.thingsboard.server.common.data.id.NotificationTargetId;
+import org.thingsboard.server.common.data.id.NotificationTemplateId;
+import org.thingsboard.server.common.data.notification.rule.NotificationRule;
+import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
+import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
+import org.thingsboard.server.gen.edge.v1.NotificationRuleUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTargetUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTemplateUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
+
+public interface NotificationMsgConstructor {
+
+    NotificationRuleUpdateMsg constructNotificationRuleUpdateMsg(UpdateMsgType msgType, NotificationRule notificationRule);
+
+    NotificationRuleUpdateMsg constructNotificationRuleDeleteMsg(NotificationRuleId notificationRuleId);
+
+    NotificationTargetUpdateMsg constructNotificationTargetUpdateMsg(UpdateMsgType msgType, NotificationTarget notificationTarget);
+
+    NotificationTargetUpdateMsg constructNotificationTargetDeleteMsg(NotificationTargetId notificationTargetId);
+
+    NotificationTemplateUpdateMsg constructNotificationTemplateUpdateMsg(UpdateMsgType msgType, NotificationTemplate notificationTemplate);
+
+    NotificationTemplateUpdateMsg constructNotificationTemplateDeleteMsg(NotificationTemplateId notificationTemplateId);
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/notification/NotificationMsgConstructorImpl.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/notification/NotificationMsgConstructorImpl.java
new file mode 100644
index 0000000000..8340bee693
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/notification/NotificationMsgConstructorImpl.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.edge.rpc.constructor.notification;
+
+import org.springframework.stereotype.Component;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.id.NotificationRuleId;
+import org.thingsboard.server.common.data.id.NotificationTargetId;
+import org.thingsboard.server.common.data.id.NotificationTemplateId;
+import org.thingsboard.server.common.data.notification.rule.NotificationRule;
+import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
+import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
+import org.thingsboard.server.gen.edge.v1.NotificationRuleUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTargetUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTemplateUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
+@Component
+@TbCoreComponent
+public class NotificationMsgConstructorImpl implements NotificationMsgConstructor {
+
+    @Override
+    public NotificationRuleUpdateMsg constructNotificationRuleUpdateMsg(UpdateMsgType msgType, NotificationRule notificationRule) {
+        return NotificationRuleUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(notificationRule)).build();
+    }
+
+    @Override
+    public NotificationRuleUpdateMsg constructNotificationRuleDeleteMsg(NotificationRuleId notificationRuleId) {
+        return NotificationRuleUpdateMsg.newBuilder()
+                .setMsgType(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE)
+                .setIdMSB(notificationRuleId.getId().getMostSignificantBits())
+                .setIdLSB(notificationRuleId.getId().getLeastSignificantBits()).build();
+    }
+
+    @Override
+    public NotificationTargetUpdateMsg constructNotificationTargetUpdateMsg(UpdateMsgType msgType, NotificationTarget notificationTarget) {
+        return NotificationTargetUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(notificationTarget)).build();
+    }
+
+    @Override
+    public NotificationTargetUpdateMsg constructNotificationTargetDeleteMsg(NotificationTargetId notificationTargetId) {
+        return NotificationTargetUpdateMsg.newBuilder()
+                .setMsgType(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE)
+                .setIdMSB(notificationTargetId.getId().getMostSignificantBits())
+                .setIdLSB(notificationTargetId.getId().getLeastSignificantBits()).build();
+    }
+
+    @Override
+    public NotificationTemplateUpdateMsg constructNotificationTemplateUpdateMsg(UpdateMsgType msgType, NotificationTemplate notificationTemplate) {
+        return NotificationTemplateUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(notificationTemplate)).build();
+    }
+
+    @Override
+    public NotificationTemplateUpdateMsg constructNotificationTemplateDeleteMsg(NotificationTemplateId notificationTemplateId) {
+        return NotificationTemplateUpdateMsg.newBuilder()
+                .setMsgType(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE)
+                .setIdMSB(notificationTemplateId.getId().getMostSignificantBits())
+                .setIdLSB(notificationTemplateId.getId().getLeastSignificantBits()).build();
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/oauth2/OAuth2MsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/oauth2/OAuth2MsgConstructor.java
new file mode 100644
index 0000000000..c628b042a2
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/oauth2/OAuth2MsgConstructor.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.edge.rpc.constructor.oauth2;
+
+import org.springframework.stereotype.Component;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.oauth2.OAuth2Info;
+import org.thingsboard.server.gen.edge.v1.OAuth2UpdateMsg;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
+@Component
+@TbCoreComponent
+public class OAuth2MsgConstructor {
+
+    public OAuth2UpdateMsg constructOAuth2UpdateMsg(OAuth2Info oAuth2Info) {
+        return OAuth2UpdateMsg.newBuilder().setEntity(JacksonUtil.toString(oAuth2Info)).build();
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/tenant/TenantMsgConstructorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/tenant/TenantMsgConstructorV1.java
index a7372ddfaf..fc244417bc 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/tenant/TenantMsgConstructorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/tenant/TenantMsgConstructorV1.java
@@ -73,6 +73,24 @@ public class TenantMsgConstructorV1 implements TenantMsgConstructor {
 
     @Override
     public TenantProfileUpdateMsg constructTenantProfileUpdateMsg(UpdateMsgType msgType, TenantProfile tenantProfile, EdgeVersion edgeVersion) {
+        tenantProfile = JacksonUtil.clone(tenantProfile);
+        // clear all config
+        var tenantProfileData = tenantProfile.getProfileData();
+        var configuration = tenantProfile.getDefaultProfileConfiguration();
+        configuration.setRpcTtlDays(0);
+        configuration.setMaxJSExecutions(0);
+        configuration.setMaxREExecutions(0);
+        configuration.setMaxDPStorageDays(0);
+        configuration.setMaxTbelExecutions(0);
+        configuration.setQueueStatsTtlDays(0);
+        configuration.setMaxTransportMessages(0);
+        configuration.setDefaultStorageTtlDays(0);
+        configuration.setMaxTransportDataPoints(0);
+        configuration.setRuleEngineExceptionsTtlDays(0);
+        configuration.setMaxRuleNodeExecutionsPerMessage(0);
+        tenantProfileData.setConfiguration(configuration);
+        tenantProfile.setProfileData(tenantProfileData);
+
         ByteString profileData = EdgeVersionUtils.isEdgeVersionOlderThan(edgeVersion, EdgeVersion.V_3_6_2) ?
                 ByteString.empty() : ByteString.copyFrom(tenantProfile.getProfileDataBytes());
         TenantProfileUpdateMsg.Builder builder = TenantProfileUpdateMsg.newBuilder()
@@ -88,4 +106,5 @@ public class TenantMsgConstructorV1 implements TenantMsgConstructor {
         }
         return builder.build();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/tenant/TenantMsgConstructorV2.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/tenant/TenantMsgConstructorV2.java
index c6ccb439ea..274e18e7f3 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/tenant/TenantMsgConstructorV2.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/tenant/TenantMsgConstructorV2.java
@@ -19,6 +19,7 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
 import org.thingsboard.server.gen.edge.v1.EdgeVersion;
 import org.thingsboard.server.gen.edge.v1.TenantProfileUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.TenantUpdateMsg;
@@ -36,6 +37,23 @@ public class TenantMsgConstructorV2 implements TenantMsgConstructor {
 
     @Override
     public TenantProfileUpdateMsg constructTenantProfileUpdateMsg(UpdateMsgType msgType, TenantProfile tenantProfile, EdgeVersion edgeVersion) {
+        tenantProfile = JacksonUtil.clone(tenantProfile);
+        // clear all config
+        var configuration = tenantProfile.getDefaultProfileConfiguration();
+        configuration.setRpcTtlDays(0);
+        configuration.setMaxJSExecutions(0);
+        configuration.setMaxREExecutions(0);
+        configuration.setMaxDPStorageDays(0);
+        configuration.setMaxTbelExecutions(0);
+        configuration.setQueueStatsTtlDays(0);
+        configuration.setMaxTransportMessages(0);
+        configuration.setDefaultStorageTtlDays(0);
+        configuration.setMaxTransportDataPoints(0);
+        configuration.setRuleEngineExceptionsTtlDays(0);
+        configuration.setMaxRuleNodeExecutionsPerMessage(0);
+        tenantProfile.getProfileData().setConfiguration(configuration);
+
         return TenantProfileUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(tenantProfile)).build();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AdminSettingsEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AdminSettingsEdgeEventFetcher.java
index 0e48077703..5554680dfe 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AdminSettingsEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AdminSettingsEdgeEventFetcher.java
@@ -62,4 +62,5 @@ public class AdminSettingsEdgeEventFetcher implements EdgeEventFetcher {
         }
         return result;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AssetProfilesEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AssetProfilesEdgeEventFetcher.java
index 240203a7e2..ec9e1f5bd9 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AssetProfilesEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AssetProfilesEdgeEventFetcher.java
@@ -35,7 +35,7 @@ public class AssetProfilesEdgeEventFetcher extends BasePageableEdgeEventFetcher<
     private final AssetProfileService assetProfileService;
 
     @Override
-    PageData<AssetProfile> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<AssetProfile> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return assetProfileService.findAssetProfiles(tenantId, pageLink);
     }
 
@@ -44,4 +44,5 @@ public class AssetProfilesEdgeEventFetcher extends BasePageableEdgeEventFetcher<
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.ASSET_PROFILE,
                 EdgeEventActionType.ADDED, assetProfile.getId(), null);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AssetsEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AssetsEdgeEventFetcher.java
index 01765c4196..7f896deb50 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AssetsEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AssetsEdgeEventFetcher.java
@@ -35,7 +35,7 @@ public class AssetsEdgeEventFetcher extends BasePageableEdgeEventFetcher<Asset>
     private final AssetService assetService;
 
     @Override
-    PageData<Asset> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<Asset> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return assetService.findAssetsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BasePageableEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BasePageableEdgeEventFetcher.java
index 5a5f842eaa..747dc5722f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BasePageableEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BasePageableEdgeEventFetcher.java
@@ -36,17 +36,18 @@ public abstract class BasePageableEdgeEventFetcher<T> implements EdgeEventFetche
     @Override
     public PageData<EdgeEvent> fetchEdgeEvents(TenantId tenantId, Edge edge, PageLink pageLink) {
         log.trace("[{}] start fetching edge events [{}]", tenantId, edge.getId());
-        PageData<T> pageData = fetchPageData(tenantId, edge, pageLink);
+        PageData<T> entities = fetchEntities(tenantId, edge, pageLink);
         List<EdgeEvent> result = new ArrayList<>();
-        if (!pageData.getData().isEmpty()) {
-            for (T entity : pageData.getData()) {
+        if (!entities.getData().isEmpty()) {
+            for (T entity : entities.getData()) {
                 result.add(constructEdgeEvent(tenantId, edge, entity));
             }
         }
-        return new PageData<>(result, pageData.getTotalPages(), pageData.getTotalElements(), pageData.hasNext());
+        return new PageData<>(result, entities.getTotalPages(), entities.getTotalElements(), entities.hasNext());
     }
 
-    abstract PageData<T> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink);
+    abstract PageData<T> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink);
 
     abstract EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, T entity);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BaseUsersEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BaseUsersEdgeEventFetcher.java
index b39d7e1209..51970c8556 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BaseUsersEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BaseUsersEdgeEventFetcher.java
@@ -35,7 +35,7 @@ public abstract class BaseUsersEdgeEventFetcher extends BasePageableEdgeEventFet
     protected final UserService userService;
 
     @Override
-    PageData<User> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<User> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return findUsers(tenantId, pageLink);
     }
 
@@ -46,4 +46,5 @@ public abstract class BaseUsersEdgeEventFetcher extends BasePageableEdgeEventFet
     }
 
     protected abstract PageData<User> findUsers(TenantId tenantId, PageLink pageLink);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BaseWidgetTypesEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BaseWidgetTypesEdgeEventFetcher.java
index cd6cb3fe7f..969ef98c7f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BaseWidgetTypesEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BaseWidgetTypesEdgeEventFetcher.java
@@ -25,11 +25,8 @@ import org.thingsboard.server.common.data.edge.EdgeEventType;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
-import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
 import org.thingsboard.server.common.data.widget.WidgetTypeInfo;
-import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.dao.widget.WidgetTypeService;
-import org.thingsboard.server.dao.widget.WidgetsBundleService;
 
 @Slf4j
 @AllArgsConstructor
@@ -38,7 +35,7 @@ public abstract class BaseWidgetTypesEdgeEventFetcher extends BasePageableEdgeEv
     protected final WidgetTypeService widgetTypeService;
 
     @Override
-    PageData<WidgetTypeInfo> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<WidgetTypeInfo> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return findWidgetTypes(tenantId, pageLink);
     }
 
@@ -49,4 +46,5 @@ public abstract class BaseWidgetTypesEdgeEventFetcher extends BasePageableEdgeEv
     }
 
     protected abstract PageData<WidgetTypeInfo> findWidgetTypes(TenantId tenantId, PageLink pageLink);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BaseWidgetsBundlesEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BaseWidgetsBundlesEdgeEventFetcher.java
index c14ad7821a..b12ec3fb79 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BaseWidgetsBundlesEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/BaseWidgetsBundlesEdgeEventFetcher.java
@@ -35,7 +35,7 @@ public abstract class BaseWidgetsBundlesEdgeEventFetcher extends BasePageableEdg
     protected final WidgetsBundleService widgetsBundleService;
 
     @Override
-    PageData<WidgetsBundle> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<WidgetsBundle> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return findWidgetsBundles(tenantId, pageLink);
     }
 
@@ -46,4 +46,5 @@ public abstract class BaseWidgetsBundlesEdgeEventFetcher extends BasePageableEdg
     }
 
     protected abstract PageData<WidgetsBundle> findWidgetsBundles(TenantId tenantId, PageLink pageLink);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/CustomerEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/CustomerEdgeEventFetcher.java
index 57596a76de..fa9fcf0d8a 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/CustomerEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/CustomerEdgeEventFetcher.java
@@ -46,7 +46,8 @@ public class CustomerEdgeEventFetcher implements EdgeEventFetcher {
         List<EdgeEvent> result = new ArrayList<>();
         result.add(EdgeUtils.constructEdgeEvent(edge.getTenantId(), edge.getId(),
                 EdgeEventType.CUSTOMER, EdgeEventActionType.ADDED, customerId, null));
-        // @voba - returns PageData object to be in sync with other fetchers
+        // returns PageData object to be in sync with other fetchers
         return new PageData<>(result, 1, result.size(), false);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/CustomerUsersEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/CustomerUsersEdgeEventFetcher.java
index da278e8053..a1c1752496 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/CustomerUsersEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/CustomerUsersEdgeEventFetcher.java
@@ -35,4 +35,5 @@ public class CustomerUsersEdgeEventFetcher extends BaseUsersEdgeEventFetcher {
     protected PageData<User> findUsers(TenantId tenantId, PageLink pageLink) {
         return userService.findCustomerUsers(tenantId, customerId, pageLink);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DashboardsEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DashboardsEdgeEventFetcher.java
index 16f4749478..663ada149b 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DashboardsEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DashboardsEdgeEventFetcher.java
@@ -35,7 +35,7 @@ public class DashboardsEdgeEventFetcher extends BasePageableEdgeEventFetcher<Das
     private final DashboardService dashboardService;
 
     @Override
-    PageData<DashboardInfo> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<DashboardInfo> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return dashboardService.findDashboardsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
     }
 
@@ -44,4 +44,5 @@ public class DashboardsEdgeEventFetcher extends BasePageableEdgeEventFetcher<Das
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.DASHBOARD,
                 EdgeEventActionType.ADDED, dashboardInfo.getId(), null);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DefaultProfilesEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DefaultProfilesEdgeEventFetcher.java
index 89454be76c..ee4bcfc3a0 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DefaultProfilesEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DefaultProfilesEdgeEventFetcher.java
@@ -59,4 +59,5 @@ public class DefaultProfilesEdgeEventFetcher implements EdgeEventFetcher {
 
         return new PageData<>(result, 1, result.size(), false);
     }
-}
\ No newline at end of file
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DeviceProfilesEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DeviceProfilesEdgeEventFetcher.java
index 8852850ca1..f86eb23f7f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DeviceProfilesEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DeviceProfilesEdgeEventFetcher.java
@@ -35,7 +35,7 @@ public class DeviceProfilesEdgeEventFetcher extends BasePageableEdgeEventFetcher
     private final DeviceProfileService deviceProfileService;
 
     @Override
-    PageData<DeviceProfile> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<DeviceProfile> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return deviceProfileService.findDeviceProfiles(tenantId, pageLink);
     }
 
@@ -44,4 +44,5 @@ public class DeviceProfilesEdgeEventFetcher extends BasePageableEdgeEventFetcher
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.DEVICE_PROFILE,
                 EdgeEventActionType.ADDED, deviceProfile.getId(), null);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DevicesEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DevicesEdgeEventFetcher.java
index 252373cfc1..f62f8edf97 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DevicesEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/DevicesEdgeEventFetcher.java
@@ -35,7 +35,7 @@ public class DevicesEdgeEventFetcher extends BasePageableEdgeEventFetcher<Device
     private final DeviceService deviceService;
 
     @Override
-    PageData<Device> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<Device> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return deviceService.findDevicesByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
     }
 
@@ -44,4 +44,5 @@ public class DevicesEdgeEventFetcher extends BasePageableEdgeEventFetcher<Device
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.DEVICE,
                 EdgeEventActionType.ADDED, device.getId(), null);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/EdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/EdgeEventFetcher.java
index 6f1fa1ae7b..54f0495bbc 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/EdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/EdgeEventFetcher.java
@@ -26,4 +26,5 @@ public interface EdgeEventFetcher {
     PageLink getPageLink(int pageSize);
 
     PageData<EdgeEvent> fetchEdgeEvents(TenantId tenantId, Edge edge, PageLink pageLink) throws Exception;
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/EntityViewsEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/EntityViewsEdgeEventFetcher.java
index 81e5c537dd..c32ab62229 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/EntityViewsEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/EntityViewsEdgeEventFetcher.java
@@ -35,7 +35,7 @@ public class EntityViewsEdgeEventFetcher extends BasePageableEdgeEventFetcher<En
     private final EntityViewService entityViewService;
 
     @Override
-    PageData<EntityView> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<EntityView> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return entityViewService.findEntityViewsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
     }
 
@@ -44,4 +44,5 @@ public class EntityViewsEdgeEventFetcher extends BasePageableEdgeEventFetcher<En
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.ENTITY_VIEW,
                 EdgeEventActionType.ADDED, entityView.getId(), null);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/GeneralEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/GeneralEdgeEventFetcher.java
index db8afc6c94..37bf860f60 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/GeneralEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/GeneralEdgeEventFetcher.java
@@ -73,4 +73,5 @@ public class GeneralEdgeEventFetcher implements EdgeEventFetcher {
         }
         return new PageData<>();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/NotificationRuleEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/NotificationRuleEdgeEventFetcher.java
new file mode 100644
index 0000000000..de4c34f600
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/NotificationRuleEdgeEventFetcher.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.edge.rpc.fetch;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.rule.NotificationRule;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.dao.notification.NotificationRuleService;
+
+@AllArgsConstructor
+@Slf4j
+public class NotificationRuleEdgeEventFetcher extends BasePageableEdgeEventFetcher<NotificationRule>{
+
+    private NotificationRuleService notificationRuleService;
+
+    @Override
+    PageData<NotificationRule> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
+        return notificationRuleService.findNotificationRulesByTenantId(tenantId, pageLink);
+    }
+
+    @Override
+    EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, NotificationRule notificationRule) {
+        return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.NOTIFICATION_RULE,
+                EdgeEventActionType.ADDED, notificationRule.getId(), null);
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/NotificationTargetEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/NotificationTargetEdgeEventFetcher.java
new file mode 100644
index 0000000000..ed59b375ab
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/NotificationTargetEdgeEventFetcher.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.edge.rpc.fetch;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.dao.notification.NotificationTargetService;
+
+@AllArgsConstructor
+@Slf4j
+public class NotificationTargetEdgeEventFetcher extends BasePageableEdgeEventFetcher<NotificationTarget> {
+
+    private NotificationTargetService notificationTargetService;
+
+    @Override
+    PageData<NotificationTarget> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
+        return notificationTargetService.findNotificationTargetsByTenantId(tenantId, pageLink);
+    }
+
+    @Override
+    EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, NotificationTarget notificationTarget) {
+        return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.NOTIFICATION_TARGET,
+                EdgeEventActionType.ADDED, notificationTarget.getId(), null);
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/NotificationTemplateEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/NotificationTemplateEdgeEventFetcher.java
new file mode 100644
index 0000000000..fefff805d3
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/NotificationTemplateEdgeEventFetcher.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.edge.rpc.fetch;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.NotificationType;
+import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.dao.notification.NotificationTemplateService;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Slf4j
+public class NotificationTemplateEdgeEventFetcher extends BasePageableEdgeEventFetcher<NotificationTemplate> {
+
+    private NotificationTemplateService notificationTemplateService;
+
+    @Override
+    PageData<NotificationTemplate> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
+        return notificationTemplateService.findNotificationTemplatesByTenantIdAndNotificationTypes(tenantId, List.of(NotificationType.values()), pageLink);
+    }
+
+    @Override
+    EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, NotificationTemplate notificationTemplate) {
+        return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.NOTIFICATION_TEMPLATE,
+                EdgeEventActionType.ADDED, notificationTemplate.getId(), null);
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/OAuth2EdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/OAuth2EdgeEventFetcher.java
new file mode 100644
index 0000000000..4412f91183
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/OAuth2EdgeEventFetcher.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.edge.rpc.fetch;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.oauth2.OAuth2Info;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.dao.oauth2.OAuth2Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@AllArgsConstructor
+@Slf4j
+public class OAuth2EdgeEventFetcher implements EdgeEventFetcher {
+
+    private final OAuth2Service oAuth2Service;
+
+    @Override
+    public PageLink getPageLink(int pageSize) {
+        return null;
+    }
+
+    @Override
+    public PageData<EdgeEvent> fetchEdgeEvents(TenantId tenantId, Edge edge, PageLink pageLink) {
+        List<EdgeEvent> result = new ArrayList<>();
+        OAuth2Info oAuth2Info = oAuth2Service.findOAuth2Info();
+        result.add(EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.OAUTH2,
+                EdgeEventActionType.ADDED, null, JacksonUtil.valueToTree(oAuth2Info)));
+        // returns PageData object to be in sync with other fetchers
+        return new PageData<>(result, 1, result.size(), false);
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/OtaPackagesEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/OtaPackagesEdgeEventFetcher.java
index 0330a9fec9..9f60c1ebd5 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/OtaPackagesEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/OtaPackagesEdgeEventFetcher.java
@@ -35,7 +35,7 @@ public class OtaPackagesEdgeEventFetcher extends BasePageableEdgeEventFetcher<Ot
     private final OtaPackageService otaPackageService;
 
     @Override
-    PageData<OtaPackageInfo> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<OtaPackageInfo> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return otaPackageService.findTenantOtaPackagesByTenantId(tenantId, pageLink);
     }
 
@@ -44,4 +44,5 @@ public class OtaPackagesEdgeEventFetcher extends BasePageableEdgeEventFetcher<Ot
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.OTA_PACKAGE,
                 EdgeEventActionType.ADDED, otaPackageInfo.getId(), null);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/QueuesEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/QueuesEdgeEventFetcher.java
index 467f6da7c1..ec18f283eb 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/QueuesEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/QueuesEdgeEventFetcher.java
@@ -35,7 +35,7 @@ public class QueuesEdgeEventFetcher extends BasePageableEdgeEventFetcher<Queue>
     private final QueueService queueService;
 
     @Override
-    PageData<Queue> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<Queue> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return queueService.findQueuesByTenantId(tenantId, pageLink);
     }
 
@@ -44,4 +44,5 @@ public class QueuesEdgeEventFetcher extends BasePageableEdgeEventFetcher<Queue>
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.QUEUE,
                 EdgeEventActionType.ADDED, queue.getId(), null);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/RuleChainsEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/RuleChainsEdgeEventFetcher.java
index d6e48ec6bd..5569c30018 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/RuleChainsEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/RuleChainsEdgeEventFetcher.java
@@ -39,7 +39,7 @@ public class RuleChainsEdgeEventFetcher extends BasePageableEdgeEventFetcher<Rul
     private final RuleChainService ruleChainService;
 
     @Override
-    PageData<RuleChain> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<RuleChain> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return ruleChainService.findRuleChainsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
     }
 
@@ -54,4 +54,5 @@ public class RuleChainsEdgeEventFetcher extends BasePageableEdgeEventFetcher<Rul
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.RULE_CHAIN,
                 EdgeEventActionType.ADDED, ruleChain.getId(), isRootBody);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/TenantEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/TenantEdgeEventFetcher.java
index f3859b51ab..44e38ab76a 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/TenantEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/TenantEdgeEventFetcher.java
@@ -37,7 +37,7 @@ public class TenantEdgeEventFetcher extends BasePageableEdgeEventFetcher<Tenant>
     private final TenantService tenantService;
 
     @Override
-    PageData<Tenant> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<Tenant> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         Tenant tenant = tenantService.findTenantById(tenantId);
         // returns PageData object to be in sync with other fetchers
         return new PageData<>(List.of(tenant), 1, 1, false);
@@ -48,4 +48,5 @@ public class TenantEdgeEventFetcher extends BasePageableEdgeEventFetcher<Tenant>
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.TENANT,
                 EdgeEventActionType.UPDATED, entity.getId(), null);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/TenantResourcesEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/TenantResourcesEdgeEventFetcher.java
index eef428bf8c..5dcf8d4cec 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/TenantResourcesEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/TenantResourcesEdgeEventFetcher.java
@@ -35,7 +35,7 @@ public class TenantResourcesEdgeEventFetcher extends BasePageableEdgeEventFetche
     private final ResourceService resourceService;
 
     @Override
-    PageData<TbResource> fetchPageData(TenantId tenantId, Edge edge, PageLink pageLink) {
+    PageData<TbResource> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
         return resourceService.findAllTenantResources(tenantId, pageLink);
     }
 
@@ -44,4 +44,5 @@ public class TenantResourcesEdgeEventFetcher extends BasePageableEdgeEventFetche
         return EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.TB_RESOURCE,
                 EdgeEventActionType.ADDED, tbResource.getId(), null);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java
index cd3eea4bef..f46c07ab5a 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java
@@ -25,7 +25,6 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Dashboard;
-import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EdgeUtils;
@@ -51,9 +50,8 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.msg.TbMsgType;
-import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageDataIterable;
 import org.thingsboard.server.common.data.page.PageDataIterableByTenantIdEntityId;
-import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 import org.thingsboard.server.common.data.rule.RuleChain;
@@ -75,6 +73,10 @@ import org.thingsboard.server.dao.edge.EdgeEventService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.edge.EdgeSynchronizationManager;
 import org.thingsboard.server.dao.entityview.EntityViewService;
+import org.thingsboard.server.dao.notification.NotificationRuleService;
+import org.thingsboard.server.dao.notification.NotificationTargetService;
+import org.thingsboard.server.dao.notification.NotificationTemplateService;
+import org.thingsboard.server.dao.oauth2.OAuth2Service;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.queue.QueueService;
 import org.thingsboard.server.dao.relation.RelationService;
@@ -93,7 +95,6 @@ import org.thingsboard.server.queue.TbQueueCallback;
 import org.thingsboard.server.queue.TbQueueMsgMetadata;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
-import org.thingsboard.server.service.entitiy.TbLogEntityActionService;
 import org.thingsboard.server.service.edge.rpc.constructor.alarm.AlarmMsgConstructorFactory;
 import org.thingsboard.server.service.edge.rpc.constructor.asset.AssetMsgConstructorFactory;
 import org.thingsboard.server.service.edge.rpc.constructor.customer.CustomerMsgConstructorFactory;
@@ -101,6 +102,8 @@ import org.thingsboard.server.service.edge.rpc.constructor.dashboard.DashboardMs
 import org.thingsboard.server.service.edge.rpc.constructor.device.DeviceMsgConstructorFactory;
 import org.thingsboard.server.service.edge.rpc.constructor.edge.EdgeMsgConstructor;
 import org.thingsboard.server.service.edge.rpc.constructor.entityview.EntityViewMsgConstructorFactory;
+import org.thingsboard.server.service.edge.rpc.constructor.notification.NotificationMsgConstructor;
+import org.thingsboard.server.service.edge.rpc.constructor.oauth2.OAuth2MsgConstructor;
 import org.thingsboard.server.service.edge.rpc.constructor.ota.OtaPackageMsgConstructorFactory;
 import org.thingsboard.server.service.edge.rpc.constructor.queue.QueueMsgConstructorFactory;
 import org.thingsboard.server.service.edge.rpc.constructor.relation.RelationMsgConstructorFactory;
@@ -114,6 +117,7 @@ import org.thingsboard.server.service.edge.rpc.constructor.widget.WidgetMsgConst
 import org.thingsboard.server.service.edge.rpc.processor.alarm.AlarmEdgeProcessorFactory;
 import org.thingsboard.server.service.edge.rpc.processor.asset.AssetEdgeProcessorFactory;
 import org.thingsboard.server.service.edge.rpc.processor.entityview.EntityViewProcessorFactory;
+import org.thingsboard.server.service.entitiy.TbLogEntityActionService;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
 import org.thingsboard.server.service.profile.TbAssetProfileCache;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
@@ -226,6 +230,18 @@ public abstract class BaseEdgeProcessor {
     @Autowired
     protected ResourceService resourceService;
 
+    @Autowired
+    protected NotificationRuleService notificationRuleService;
+
+    @Autowired
+    protected NotificationTargetService notificationTargetService;
+
+    @Autowired
+    protected NotificationTemplateService notificationTemplateService;
+
+    @Autowired
+    protected OAuth2Service oAuth2Service;
+
     @Autowired
     @Lazy
     protected TbQueueProducerProvider producerProvider;
@@ -257,6 +273,13 @@ public abstract class BaseEdgeProcessor {
     @Autowired
     protected EntityDataMsgConstructor entityDataMsgConstructor;
 
+    @Autowired
+    protected NotificationMsgConstructor notificationMsgConstructor;
+
+    @Autowired
+    protected OAuth2MsgConstructor oAuth2MsgConstructor;
+
+
     @Autowired
     protected RuleChainMsgConstructorFactory ruleChainMsgConstructorFactory;
 
@@ -349,35 +372,16 @@ public abstract class BaseEdgeProcessor {
 
     private boolean doSaveIfEdgeIsOffline(EdgeEventType type,
                                           EdgeEventActionType action) {
-        switch (action) {
-            case TIMESERIES_UPDATED:
-            case ALARM_ACK:
-            case ALARM_CLEAR:
-            case ALARM_ASSIGNED:
-            case ALARM_UNASSIGNED:
-            case CREDENTIALS_REQUEST:
-            case ADDED_COMMENT:
-            case UPDATED_COMMENT:
-                return true;
-        }
-        switch (type) {
-            case ALARM:
-            case ALARM_COMMENT:
-            case RULE_CHAIN:
-            case RULE_CHAIN_METADATA:
-            case USER:
-            case CUSTOMER:
-            case TENANT:
-            case TENANT_PROFILE:
-            case WIDGETS_BUNDLE:
-            case WIDGET_TYPE:
-            case ADMIN_SETTINGS:
-            case OTA_PACKAGE:
-            case QUEUE:
-            case RELATION:
-                return true;
-        }
-        return false;
+        return switch (action) {
+            case TIMESERIES_UPDATED, ALARM_ACK, ALARM_CLEAR, ALARM_ASSIGNED, ALARM_UNASSIGNED, CREDENTIALS_REQUEST, ADDED_COMMENT, UPDATED_COMMENT ->
+                    true;
+            default -> switch (type) {
+                case ALARM, ALARM_COMMENT, RULE_CHAIN, RULE_CHAIN_METADATA, USER, CUSTOMER, TENANT, TENANT_PROFILE, WIDGETS_BUNDLE, WIDGET_TYPE,
+                        ADMIN_SETTINGS, OTA_PACKAGE, QUEUE, RELATION, NOTIFICATION_TEMPLATE, NOTIFICATION_TARGET, NOTIFICATION_RULE ->
+                        true;
+                default -> false;
+            };
+        };
     }
 
     private ListenableFuture<Void> doSaveEdgeEvent(TenantId tenantId, EdgeId edgeId, EdgeEventType type, EdgeEventActionType action, EntityId entityId, JsonNode body) {
@@ -392,18 +396,13 @@ public abstract class BaseEdgeProcessor {
 
     protected ListenableFuture<Void> processActionForAllEdges(TenantId tenantId, EdgeEventType type,
                                                               EdgeEventActionType actionType, EntityId entityId,
-                                                              EdgeId sourceEdgeId) {
+                                                              JsonNode body, EdgeId sourceEdgeId) {
         List<ListenableFuture<Void>> futures = new ArrayList<>();
         if (TenantId.SYS_TENANT_ID.equals(tenantId)) {
-            PageLink pageLink = new PageLink(DEFAULT_PAGE_SIZE);
-            PageData<TenantId> tenantsIds;
-            do {
-                tenantsIds = tenantService.findTenantsIds(pageLink);
-                for (TenantId tenantId1 : tenantsIds.getData()) {
-                    futures.addAll(processActionForAllEdgesByTenantId(tenantId1, type, actionType, entityId, null, sourceEdgeId));
-                }
-                pageLink = pageLink.nextPageLink();
-            } while (tenantsIds.hasNext());
+            PageDataIterable<TenantId> tenantIds = new PageDataIterable<>(link -> tenantService.findTenantsIds(link), 1024);
+            for (TenantId tenantId1 : tenantIds) {
+                futures.addAll(processActionForAllEdgesByTenantId(tenantId1, type, actionType, entityId, body, sourceEdgeId));
+            }
         } else {
             futures = processActionForAllEdgesByTenantId(tenantId, type, actionType, entityId, null, sourceEdgeId);
         }
@@ -416,22 +415,13 @@ public abstract class BaseEdgeProcessor {
                                                                             EntityId entityId,
                                                                             JsonNode body,
                                                                             EdgeId sourceEdgeId) {
-        PageLink pageLink = new PageLink(DEFAULT_PAGE_SIZE);
-        PageData<Edge> pageData;
         List<ListenableFuture<Void>> futures = new ArrayList<>();
-        do {
-            pageData = edgeService.findEdgesByTenantId(tenantId, pageLink);
-            if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
-                for (Edge edge : pageData.getData()) {
-                    if (!edge.getId().equals(sourceEdgeId)) {
-                        futures.add(saveEdgeEvent(tenantId, edge.getId(), type, actionType, entityId, body));
-                    }
-                }
-                if (pageData.hasNext()) {
-                    pageLink = pageLink.nextPageLink();
-                }
+        PageDataIterable<Edge> edges = new PageDataIterable<>(link -> edgeService.findEdgesByTenantId(tenantId, link), 1024);
+        for (Edge edge : edges) {
+            if (!edge.getId().equals(sourceEdgeId)) {
+                futures.add(saveEdgeEvent(tenantId, edge.getId(), type, actionType, entityId, body));
             }
-        } while (pageData != null && pageData.hasNext());
+        }
         return futures;
     }
 
@@ -442,31 +432,15 @@ public abstract class BaseEdgeProcessor {
     }
 
     protected UpdateMsgType getUpdateMsgType(EdgeEventActionType actionType) {
-        switch (actionType) {
-            case UPDATED:
-            case CREDENTIALS_UPDATED:
-            case ASSIGNED_TO_CUSTOMER:
-            case UNASSIGNED_FROM_CUSTOMER:
-            case UPDATED_COMMENT:
-                return UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE;
-            case ADDED:
-            case ASSIGNED_TO_EDGE:
-            case RELATION_ADD_OR_UPDATE:
-            case ADDED_COMMENT:
-                return UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE;
-            case DELETED:
-            case UNASSIGNED_FROM_EDGE:
-            case RELATION_DELETED:
-            case DELETED_COMMENT:
-            case ALARM_DELETE:
-                return UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE;
-            case ALARM_ACK:
-                return UpdateMsgType.ALARM_ACK_RPC_MESSAGE;
-            case ALARM_CLEAR:
-                return UpdateMsgType.ALARM_CLEAR_RPC_MESSAGE;
-            default:
-                throw new RuntimeException("Unsupported actionType [" + actionType + "]");
-        }
+        return switch (actionType) {
+            case UPDATED, CREDENTIALS_UPDATED, ASSIGNED_TO_CUSTOMER, UNASSIGNED_FROM_CUSTOMER, UPDATED_COMMENT ->
+                    UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE;
+            case ADDED, ASSIGNED_TO_EDGE, RELATION_ADD_OR_UPDATE, ADDED_COMMENT -> UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE;
+            case DELETED, UNASSIGNED_FROM_EDGE, RELATION_DELETED, DELETED_COMMENT, ALARM_DELETE -> UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE;
+            case ALARM_ACK -> UpdateMsgType.ALARM_ACK_RPC_MESSAGE;
+            case ALARM_CLEAR -> UpdateMsgType.ALARM_CLEAR_RPC_MESSAGE;
+            default -> throw new RuntimeException("Unsupported actionType [" + actionType + "]");
+        };
     }
 
     public ListenableFuture<Void> processEntityNotification(TenantId tenantId, TransportProtos.EdgeNotificationMsgProto edgeNotificationMsg) {
@@ -539,74 +513,52 @@ public abstract class BaseEdgeProcessor {
     }
 
     private ListenableFuture<Void> updateDependentRuleChains(TenantId tenantId, RuleChainId processingRuleChainId, EdgeId edgeId) {
-        PageLink pageLink = new PageLink(DEFAULT_PAGE_SIZE);
-        PageData<RuleChain> pageData;
         List<ListenableFuture<Void>> futures = new ArrayList<>();
-        do {
-            pageData = ruleChainService.findRuleChainsByTenantIdAndEdgeId(tenantId, edgeId, pageLink);
-            if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
-                for (RuleChain ruleChain : pageData.getData()) {
-                    if (!ruleChain.getId().equals(processingRuleChainId)) {
-                        List<RuleChainConnectionInfo> connectionInfos =
-                                ruleChainService.loadRuleChainMetaData(ruleChain.getTenantId(), ruleChain.getId()).getRuleChainConnections();
-                        if (connectionInfos != null && !connectionInfos.isEmpty()) {
-                            for (RuleChainConnectionInfo connectionInfo : connectionInfos) {
-                                if (connectionInfo.getTargetRuleChainId().equals(processingRuleChainId)) {
-                                    futures.add(saveEdgeEvent(tenantId,
-                                            edgeId,
-                                            EdgeEventType.RULE_CHAIN_METADATA,
-                                            EdgeEventActionType.UPDATED,
-                                            ruleChain.getId(),
-                                            null));
-                                }
-                            }
-                        }
+        PageDataIterable<RuleChain> ruleChains = new PageDataIterable<>(link -> ruleChainService.findRuleChainsByTenantIdAndEdgeId(tenantId, edgeId, link), 1024);
+        for (RuleChain ruleChain : ruleChains) {
+            List<RuleChainConnectionInfo> connectionInfos =
+                    ruleChainService.loadRuleChainMetaData(ruleChain.getTenantId(), ruleChain.getId()).getRuleChainConnections();
+            if (connectionInfos != null && !connectionInfos.isEmpty()) {
+                for (RuleChainConnectionInfo connectionInfo : connectionInfos) {
+                    if (connectionInfo.getTargetRuleChainId().equals(processingRuleChainId)) {
+                        futures.add(saveEdgeEvent(tenantId,
+                                edgeId,
+                                EdgeEventType.RULE_CHAIN_METADATA,
+                                EdgeEventActionType.UPDATED,
+                                ruleChain.getId(),
+                                null));
                     }
                 }
-                if (pageData.hasNext()) {
-                    pageLink = pageLink.nextPageLink();
-                }
             }
-        } while (pageData != null && pageData.hasNext());
+        }
         return Futures.transform(Futures.allAsList(futures), voids -> null, dbCallbackExecutorService);
     }
 
     private ListenableFuture<Void> processEntityNotificationForAllEdges(TenantId tenantId, EdgeEventType type, EdgeEventActionType actionType, EntityId entityId, EdgeId sourceEdgeId) {
-        switch (actionType) {
-            case ADDED:
-            case UPDATED:
-            case DELETED:
-            case CREDENTIALS_UPDATED: // used by USER entity
-                return processActionForAllEdges(tenantId, type, actionType, entityId, sourceEdgeId);
-            default:
-                return Futures.immediateFuture(null);
-        }
+        return switch (actionType) {
+            case ADDED, UPDATED, DELETED, CREDENTIALS_UPDATED -> // used by USER entity
+                    processActionForAllEdges(tenantId, type, actionType, entityId, null, sourceEdgeId);
+            default -> Futures.immediateFuture(null);
+        };
     }
 
     protected EntityId constructEntityId(String entityTypeStr, long entityIdMSB, long entityIdLSB) {
         EntityType entityType = EntityType.valueOf(entityTypeStr);
-        switch (entityType) {
-            case DEVICE:
-                return new DeviceId(new UUID(entityIdMSB, entityIdLSB));
-            case ASSET:
-                return new AssetId(new UUID(entityIdMSB, entityIdLSB));
-            case ENTITY_VIEW:
-                return new EntityViewId(new UUID(entityIdMSB, entityIdLSB));
-            case DASHBOARD:
-                return new DashboardId(new UUID(entityIdMSB, entityIdLSB));
-            case TENANT:
-                return TenantId.fromUUID(new UUID(entityIdMSB, entityIdLSB));
-            case CUSTOMER:
-                return new CustomerId(new UUID(entityIdMSB, entityIdLSB));
-            case USER:
-                return new UserId(new UUID(entityIdMSB, entityIdLSB));
-            case EDGE:
-                return new EdgeId(new UUID(entityIdMSB, entityIdLSB));
-            default:
+        return switch (entityType) {
+            case DEVICE -> new DeviceId(new UUID(entityIdMSB, entityIdLSB));
+            case ASSET -> new AssetId(new UUID(entityIdMSB, entityIdLSB));
+            case ENTITY_VIEW -> new EntityViewId(new UUID(entityIdMSB, entityIdLSB));
+            case DASHBOARD -> new DashboardId(new UUID(entityIdMSB, entityIdLSB));
+            case TENANT -> TenantId.fromUUID(new UUID(entityIdMSB, entityIdLSB));
+            case CUSTOMER -> new CustomerId(new UUID(entityIdMSB, entityIdLSB));
+            case USER -> new UserId(new UUID(entityIdMSB, entityIdLSB));
+            case EDGE -> new EdgeId(new UUID(entityIdMSB, entityIdLSB));
+            default -> {
                 log.warn("Unsupported entity type [{}] during construct of entity id. entityIdMSB [{}], entityIdLSB [{}]",
                         entityTypeStr, entityIdMSB, entityIdLSB);
-                return null;
-        }
+                yield null;
+            }
+        };
     }
 
     protected UUID safeGetUUID(long mSB, long lSB) {
@@ -623,26 +575,17 @@ public abstract class BaseEdgeProcessor {
     }
 
     protected boolean isEntityExists(TenantId tenantId, EntityId entityId) {
-        switch (entityId.getEntityType()) {
-            case TENANT:
-                return tenantService.findTenantById(tenantId) != null;
-            case DEVICE:
-                return deviceService.findDeviceById(tenantId, new DeviceId(entityId.getId())) != null;
-            case ASSET:
-                return assetService.findAssetById(tenantId, new AssetId(entityId.getId())) != null;
-            case ENTITY_VIEW:
-                return entityViewService.findEntityViewById(tenantId, new EntityViewId(entityId.getId())) != null;
-            case CUSTOMER:
-                return customerService.findCustomerById(tenantId, new CustomerId(entityId.getId())) != null;
-            case USER:
-                return userService.findUserById(tenantId, new UserId(entityId.getId())) != null;
-            case DASHBOARD:
-                return dashboardService.findDashboardById(tenantId, new DashboardId(entityId.getId())) != null;
-            case EDGE:
-                return edgeService.findEdgeById(tenantId, new EdgeId(entityId.getId())) != null;
-            default:
-                return false;
-        }
+        return switch (entityId.getEntityType()) {
+            case TENANT -> tenantService.findTenantById(tenantId) != null;
+            case DEVICE -> deviceService.findDeviceById(tenantId, new DeviceId(entityId.getId())) != null;
+            case ASSET -> assetService.findAssetById(tenantId, new AssetId(entityId.getId())) != null;
+            case ENTITY_VIEW -> entityViewService.findEntityViewById(tenantId, new EntityViewId(entityId.getId())) != null;
+            case CUSTOMER -> customerService.findCustomerById(tenantId, new CustomerId(entityId.getId())) != null;
+            case USER -> userService.findUserById(tenantId, new UserId(entityId.getId())) != null;
+            case DASHBOARD -> dashboardService.findDashboardById(tenantId, new DashboardId(entityId.getId())) != null;
+            case EDGE -> edgeService.findEdgeById(tenantId, new EdgeId(entityId.getId())) != null;
+            default -> false;
+        };
     }
 
     protected void createRelationFromEdge(TenantId tenantId, EdgeId edgeId, EntityId entityId) {
@@ -681,37 +624,25 @@ public abstract class BaseEdgeProcessor {
     }
 
     protected AssetProfile checkIfAssetProfileDefaultFieldsAssignedToEdge(TenantId tenantId, EdgeId edgeId, AssetProfile assetProfile, EdgeVersion edgeVersion) {
-        switch (edgeVersion) {
-            case V_3_3_3:
-            case V_3_3_0:
-            case V_3_4_0:
-                if (assetProfile.getDefaultDashboardId() != null
-                        && isEntityNotAssignedToEdge(tenantId, assetProfile.getDefaultDashboardId(), edgeId)) {
-                    assetProfile.setDefaultDashboardId(null);
-                }
-                if (assetProfile.getDefaultEdgeRuleChainId() != null
-                        && isEntityNotAssignedToEdge(tenantId, assetProfile.getDefaultEdgeRuleChainId(), edgeId)) {
-                    assetProfile.setDefaultEdgeRuleChainId(null);
-                }
-                break;
+        if (EdgeVersion.V_3_3_0.equals(edgeVersion) || EdgeVersion.V_3_3_3.equals(edgeVersion) || EdgeVersion.V_3_4_0.equals(edgeVersion)) {
+            if (assetProfile.getDefaultDashboardId() != null && isEntityNotAssignedToEdge(tenantId, assetProfile.getDefaultDashboardId(), edgeId)) {
+                assetProfile.setDefaultDashboardId(null);
+            }
+            if (assetProfile.getDefaultEdgeRuleChainId() != null && isEntityNotAssignedToEdge(tenantId, assetProfile.getDefaultEdgeRuleChainId(), edgeId)) {
+                assetProfile.setDefaultEdgeRuleChainId(null);
+            }
         }
         return assetProfile;
     }
 
     protected DeviceProfile checkIfDeviceProfileDefaultFieldsAssignedToEdge(TenantId tenantId, EdgeId edgeId, DeviceProfile deviceProfile, EdgeVersion edgeVersion) {
-        switch (edgeVersion) {
-            case V_3_3_3:
-            case V_3_3_0:
-            case V_3_4_0:
-                if (deviceProfile.getDefaultDashboardId() != null
-                        && isEntityNotAssignedToEdge(tenantId, deviceProfile.getDefaultDashboardId(), edgeId)) {
-                    deviceProfile.setDefaultDashboardId(null);
-                }
-                if (deviceProfile.getDefaultEdgeRuleChainId() != null
-                        && isEntityNotAssignedToEdge(tenantId, deviceProfile.getDefaultEdgeRuleChainId(), edgeId)) {
-                    deviceProfile.setDefaultEdgeRuleChainId(null);
-                }
-                break;
+        if (EdgeVersion.V_3_3_0.equals(edgeVersion) || EdgeVersion.V_3_3_3.equals(edgeVersion) || EdgeVersion.V_3_4_0.equals(edgeVersion)) {
+            if (deviceProfile.getDefaultDashboardId() != null && isEntityNotAssignedToEdge(tenantId, deviceProfile.getDefaultDashboardId(), edgeId)) {
+                deviceProfile.setDefaultDashboardId(null);
+            }
+            if (deviceProfile.getDefaultEdgeRuleChainId() != null && isEntityNotAssignedToEdge(tenantId, deviceProfile.getDefaultEdgeRuleChainId(), edgeId)) {
+                deviceProfile.setDefaultEdgeRuleChainId(null);
+            }
         }
         return deviceProfile;
     }
@@ -726,4 +657,5 @@ public abstract class BaseEdgeProcessor {
         }
         return true;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorFactory.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorFactory.java
index a9ec97cf64..a8ca885c7b 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorFactory.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorFactory.java
@@ -31,16 +31,10 @@ public abstract class BaseEdgeProcessorFactory<T extends EdgeProcessor, U extend
     protected U v2Processor;
 
     public EdgeProcessor getProcessorByEdgeVersion(EdgeVersion edgeVersion) {
-        switch (edgeVersion) {
-            case V_3_3_0:
-            case V_3_3_3:
-            case V_3_4_0:
-            case V_3_6_0:
-            case V_3_6_1:
-                return v1Processor;
-            case V_3_6_2:
-            default:
-                return v2Processor;
-        }
+        return switch (edgeVersion) {
+            case V_3_3_0, V_3_3_3, V_3_4_0, V_3_6_0, V_3_6_1 -> v1Processor;
+            default -> v2Processor;
+        };
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessor.java
index b578325961..22d76dc86e 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessor.java
@@ -156,4 +156,5 @@ public abstract class AlarmEdgeProcessor extends BaseAlarmProcessor implements A
         }
         return futures;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessorV1.java
index 9f8738b075..30ee4efe5f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessorV1.java
@@ -58,15 +58,12 @@ public class AlarmEdgeProcessorV1 extends AlarmEdgeProcessor {
     }
 
     private EntityId getAlarmOriginator(TenantId tenantId, String entityName, EntityType entityType) {
-        switch (entityType) {
-            case DEVICE:
-                return deviceService.findDeviceByTenantIdAndName(tenantId, entityName).getId();
-            case ASSET:
-                return assetService.findAssetByTenantIdAndName(tenantId, entityName).getId();
-            case ENTITY_VIEW:
-                return entityViewService.findEntityViewByTenantIdAndName(tenantId, entityName).getId();
-            default:
-                return null;
-        }
+        return switch (entityType) {
+            case DEVICE -> deviceService.findDeviceByTenantIdAndName(tenantId, entityName).getId();
+            case ASSET -> assetService.findAssetByTenantIdAndName(tenantId, entityName).getId();
+            case ENTITY_VIEW -> entityViewService.findEntityViewByTenantIdAndName(tenantId, entityName).getId();
+            default -> null;
+        };
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessorV2.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessorV2.java
index a1d06e1b3b..dd49af252d 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessorV2.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmEdgeProcessorV2.java
@@ -40,4 +40,5 @@ public class AlarmEdgeProcessorV2 extends AlarmEdgeProcessor {
     protected Alarm constructAlarmFromUpdateMsg(TenantId tenantId, AlarmId alarmId, EntityId originatorId, AlarmUpdateMsg alarmUpdateMsg) {
         return JacksonUtil.fromString(alarmUpdateMsg.getEntity(), Alarm.class, true);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmProcessor.java
index 938269462d..d4f820b6c3 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/AlarmProcessor.java
@@ -34,4 +34,5 @@ public interface AlarmProcessor extends EdgeProcessor {
     ListenableFuture<Void> processAlarmCommentMsgFromEdge(TenantId tenantId, EdgeId edgeId, AlarmCommentUpdateMsg alarmCommentUpdateMsg);
 
     DownlinkMsg convertAlarmCommentEventToDownlink(EdgeEvent edgeEvent, EdgeVersion edgeVersion);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java
index ff2c0ca5f6..f6a05e363c 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java
@@ -144,23 +144,20 @@ public abstract class BaseAlarmProcessor extends BaseEdgeProcessor {
         AlarmId alarmId = new AlarmId(entityId);
         UpdateMsgType msgType = getUpdateMsgType(actionType);
         switch (actionType) {
-            case ADDED:
-            case UPDATED:
-            case ALARM_ACK:
-            case ALARM_CLEAR:
+            case ADDED, UPDATED, ALARM_ACK, ALARM_CLEAR -> {
                 Alarm alarm = alarmService.findAlarmById(tenantId, alarmId);
                 if (alarm != null) {
                     return ((AlarmMsgConstructor) alarmMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion))
                             .constructAlarmUpdatedMsg(msgType, alarm, findOriginatorEntityName(tenantId, alarm));
                 }
-                break;
-            case ALARM_DELETE:
-            case DELETED:
+            }
+            case ALARM_DELETE, DELETED -> {
                 Alarm deletedAlarm = JacksonUtil.convertValue(body, Alarm.class);
                 if (deletedAlarm != null) {
                     return ((AlarmMsgConstructor) alarmMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion))
                             .constructAlarmUpdatedMsg(msgType, deletedAlarm, findOriginatorEntityName(tenantId, deletedAlarm));
                 }
+            }
         }
         return null;
     }
@@ -168,25 +165,26 @@ public abstract class BaseAlarmProcessor extends BaseEdgeProcessor {
     private String findOriginatorEntityName(TenantId tenantId, Alarm alarm) {
         String entityName = null;
         switch (alarm.getOriginator().getEntityType()) {
-            case DEVICE:
+            case DEVICE -> {
                 Device deviceById = deviceService.findDeviceById(tenantId, new DeviceId(alarm.getOriginator().getId()));
                 if (deviceById != null) {
                     entityName = deviceById.getName();
                 }
-                break;
-            case ASSET:
+            }
+            case ASSET -> {
                 Asset assetById = assetService.findAssetById(tenantId, new AssetId(alarm.getOriginator().getId()));
                 if (assetById != null) {
                     entityName = assetById.getName();
                 }
-                break;
-            case ENTITY_VIEW:
+            }
+            case ENTITY_VIEW -> {
                 EntityView entityViewById = entityViewService.findEntityViewById(tenantId, new EntityViewId(alarm.getOriginator().getId()));
                 if (entityViewById != null) {
                     entityName = entityViewById.getName();
                 }
-                break;
+            }
         }
         return entityName;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessor.java
index 203c6466e0..5d264cd83d 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessor.java
@@ -32,7 +32,6 @@ import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.msg.TbMsgType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
-import org.thingsboard.server.dao.asset.BaseAssetService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.gen.edge.v1.AssetUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
@@ -109,13 +108,9 @@ public abstract class AssetEdgeProcessor extends BaseAssetProcessor implements A
         AssetId assetId = new AssetId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
-            case ASSIGNED_TO_EDGE:
-            case ASSIGNED_TO_CUSTOMER:
-            case UNASSIGNED_FROM_CUSTOMER:
+            case ADDED, UPDATED, ASSIGNED_TO_EDGE, ASSIGNED_TO_CUSTOMER, UNASSIGNED_FROM_CUSTOMER -> {
                 Asset asset = assetService.findAssetById(edgeEvent.getTenantId(), assetId);
-                if (asset != null && !BaseAssetService.TB_SERVICE_QUEUE.equals(asset.getType())) {
+                if (asset != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
                     AssetUpdateMsg assetUpdateMsg = ((AssetMsgConstructor)
                             assetMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructAssetUpdatedMsg(msgType, asset);
@@ -130,17 +125,17 @@ public abstract class AssetEdgeProcessor extends BaseAssetProcessor implements A
                     }
                     downlinkMsg = builder.build();
                 }
-                break;
-            case DELETED:
-            case UNASSIGNED_FROM_EDGE:
+            }
+            case DELETED, UNASSIGNED_FROM_EDGE -> {
                 AssetUpdateMsg assetUpdateMsg = ((AssetMsgConstructor)
                         assetMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructAssetDeleteMsg(assetId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addAssetUpdateMsg(assetUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessorV1.java
index e84b37cc14..8cd2de1cab 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessorV1.java
@@ -56,4 +56,5 @@ public class AssetEdgeProcessorV1 extends AssetEdgeProcessor {
         CustomerId customerUUID = safeGetCustomerId(assetUpdateMsg.getCustomerIdMSB(), assetUpdateMsg.getCustomerIdLSB());
         asset.setCustomerId(customerUUID != null ? customerUUID : customerId);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessorV2.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessorV2.java
index a8c558b88e..021507f5d7 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessorV2.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessorV2.java
@@ -40,4 +40,5 @@ public class AssetEdgeProcessorV2 extends AssetEdgeProcessor {
         CustomerId customerUUID = asset.getCustomerId() != null ? asset.getCustomerId() : customerId;
         asset.setCustomerId(customerUUID);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetProcessor.java
index 4d2f6ff52b..2685274bbf 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetProcessor.java
@@ -30,4 +30,5 @@ public interface AssetProcessor extends EdgeProcessor {
     ListenableFuture<Void> processAssetMsgFromEdge(TenantId tenantId, Edge edge, AssetUpdateMsg assetUpdateMsg);
 
     DownlinkMsg convertAssetEventToDownlink(EdgeEvent edgeEvent, EdgeId edgeId, EdgeVersion edgeVersion);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/BaseAssetProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/BaseAssetProcessor.java
index e84ffb730e..2588e52d5f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/BaseAssetProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/BaseAssetProcessor.java
@@ -72,4 +72,5 @@ public abstract class BaseAssetProcessor extends BaseEdgeProcessor {
     protected abstract Asset constructAssetFromUpdateMsg(TenantId tenantId, AssetId assetId, AssetUpdateMsg assetUpdateMsg);
 
     protected abstract void setCustomerId(TenantId tenantId, CustomerId customerId, Asset asset, AssetUpdateMsg assetUpdateMsg);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/profile/AssetProfileEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/profile/AssetProfileEdgeProcessor.java
index 9678dbcbad..b4d56ed20f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/profile/AssetProfileEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/profile/AssetProfileEdgeProcessor.java
@@ -97,8 +97,7 @@ public abstract class AssetProfileEdgeProcessor extends BaseAssetProfileProcesso
         AssetProfileId assetProfileId = new AssetProfileId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
+            case ADDED, UPDATED -> {
                 AssetProfile assetProfile = assetProfileService.findAssetProfileById(edgeEvent.getTenantId(), assetProfileId);
                 if (assetProfile != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -110,16 +109,17 @@ public abstract class AssetProfileEdgeProcessor extends BaseAssetProfileProcesso
                             .addAssetProfileUpdateMsg(assetProfileUpdateMsg)
                             .build();
                 }
-                break;
-            case DELETED:
+            }
+            case DELETED -> {
                 AssetProfileUpdateMsg assetProfileUpdateMsg = ((AssetMsgConstructor)
                         assetMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructAssetProfileDeleteMsg(assetProfileId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addAssetProfileUpdateMsg(assetProfileUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/customer/CustomerEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/customer/CustomerEdgeProcessor.java
index 46daccfbe4..e13c4c487f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/customer/CustomerEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/customer/CustomerEdgeProcessor.java
@@ -29,8 +29,7 @@ import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.page.PageData;
-import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.page.PageDataIterable;
 import org.thingsboard.server.gen.edge.v1.CustomerUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
 import org.thingsboard.server.gen.edge.v1.EdgeVersion;
@@ -53,8 +52,7 @@ public class CustomerEdgeProcessor extends BaseEdgeProcessor {
         CustomerId customerId = new CustomerId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
+            case ADDED, UPDATED -> {
                 Customer customer = customerService.findCustomerById(edgeEvent.getTenantId(), customerId);
                 if (customer != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -65,15 +63,15 @@ public class CustomerEdgeProcessor extends BaseEdgeProcessor {
                             .addCustomerUpdateMsg(customerUpdateMsg)
                             .build();
                 }
-                break;
-            case DELETED:
+            }
+            case DELETED -> {
                 CustomerUpdateMsg customerUpdateMsg = ((CustomerMsgConstructor)
                         customerMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructCustomerDeleteMsg(customerId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addCustomerUpdateMsg(customerUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
@@ -85,20 +83,11 @@ public class CustomerEdgeProcessor extends BaseEdgeProcessor {
         CustomerId customerId = new CustomerId(EntityIdFactory.getByEdgeEventTypeAndUuid(type, uuid).getId());
         switch (actionType) {
             case UPDATED:
-                PageLink pageLink = new PageLink(DEFAULT_PAGE_SIZE);
-                PageData<Edge> pageData;
                 List<ListenableFuture<Void>> futures = new ArrayList<>();
-                do {
-                    pageData = edgeService.findEdgesByTenantIdAndCustomerId(tenantId, customerId, pageLink);
-                    if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
-                        for (Edge edge : pageData.getData()) {
-                            futures.add(saveEdgeEvent(tenantId, edge.getId(), type, actionType, customerId, null));
-                        }
-                        if (pageData.hasNext()) {
-                            pageLink = pageLink.nextPageLink();
-                        }
-                    }
-                } while (pageData != null && pageData.hasNext());
+                PageDataIterable<Edge> edges = new PageDataIterable<>(link -> edgeService.findEdgesByTenantIdAndCustomerId(tenantId, customerId, link), 1024);
+                for (Edge edge : edges) {
+                    futures.add(saveEdgeEvent(tenantId, edge.getId(), type, actionType, customerId, null));
+                }
                 return Futures.transform(Futures.allAsList(futures), voids -> null, dbCallbackExecutorService);
             case DELETED:
                 EdgeId edgeId = new EdgeId(new UUID(edgeNotificationMsg.getEdgeIdMSB(), edgeNotificationMsg.getEdgeIdLSB()));
@@ -107,4 +96,5 @@ public class CustomerEdgeProcessor extends BaseEdgeProcessor {
                 return Futures.immediateFuture(null);
         }
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/DashboardEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/DashboardEdgeProcessor.java
index f50565b177..aab35f89d8 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/DashboardEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/DashboardEdgeProcessor.java
@@ -101,11 +101,7 @@ public abstract class DashboardEdgeProcessor extends BaseDashboardProcessor impl
         DashboardId dashboardId = new DashboardId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
-            case ASSIGNED_TO_EDGE:
-            case ASSIGNED_TO_CUSTOMER:
-            case UNASSIGNED_FROM_CUSTOMER:
+            case ADDED, UPDATED, ASSIGNED_TO_EDGE, ASSIGNED_TO_CUSTOMER, UNASSIGNED_FROM_CUSTOMER -> {
                 Dashboard dashboard = dashboardService.findDashboardById(edgeEvent.getTenantId(), dashboardId);
                 if (dashboard != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -116,16 +112,15 @@ public abstract class DashboardEdgeProcessor extends BaseDashboardProcessor impl
                             .addDashboardUpdateMsg(dashboardUpdateMsg)
                             .build();
                 }
-                break;
-            case DELETED:
-            case UNASSIGNED_FROM_EDGE:
+            }
+            case DELETED, UNASSIGNED_FROM_EDGE -> {
                 DashboardUpdateMsg dashboardUpdateMsg = ((DashboardMsgConstructor)
                         dashboardMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructDashboardDeleteMsg(dashboardId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addDashboardUpdateMsg(dashboardUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
@@ -135,4 +130,5 @@ public abstract class DashboardEdgeProcessor extends BaseDashboardProcessor impl
         // do nothing on cloud
         return assignedCustomers;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceEdgeProcessor.java
index 6981ad5ff3..5e73034b1c 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceEdgeProcessor.java
@@ -286,4 +286,5 @@ public abstract class DeviceEdgeProcessor extends BaseDeviceProcessor implements
                 .addDeviceCredentialsRequestMsg(deviceCredentialsRequestMsg);
         return builder.build();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/profile/DeviceProfileEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/profile/DeviceProfileEdgeProcessor.java
index 23ad24bb62..464fa3ba54 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/profile/DeviceProfileEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/profile/DeviceProfileEdgeProcessor.java
@@ -97,8 +97,7 @@ public abstract class DeviceProfileEdgeProcessor extends BaseDeviceProfileProces
         DeviceProfileId deviceProfileId = new DeviceProfileId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
+            case ADDED, UPDATED -> {
                 DeviceProfile deviceProfile = deviceProfileService.findDeviceProfileById(edgeEvent.getTenantId(), deviceProfileId);
                 if (deviceProfile != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -110,16 +109,17 @@ public abstract class DeviceProfileEdgeProcessor extends BaseDeviceProfileProces
                             .addDeviceProfileUpdateMsg(deviceProfileUpdateMsg)
                             .build();
                 }
-                break;
-            case DELETED:
+            }
+            case DELETED -> {
                 DeviceProfileUpdateMsg deviceProfileUpdateMsg = ((DeviceMsgConstructor)
                         deviceMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructDeviceProfileDeleteMsg(deviceProfileId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addDeviceProfileUpdateMsg(deviceProfileUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/edge/EdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/edge/EdgeProcessor.java
index e4a9189aad..7bb631b330 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/edge/EdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/edge/EdgeProcessor.java
@@ -50,8 +50,7 @@ public class EdgeProcessor extends BaseEdgeProcessor {
         EdgeId edgeId = new EdgeId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ASSIGNED_TO_CUSTOMER:
-            case UNASSIGNED_FROM_CUSTOMER:
+            case ASSIGNED_TO_CUSTOMER, UNASSIGNED_FROM_CUSTOMER -> {
                 Edge edge = edgeService.findEdgeById(edgeEvent.getTenantId(), edgeId);
                 if (edge != null) {
                     EdgeConfiguration edgeConfigMsg =
@@ -61,7 +60,7 @@ public class EdgeProcessor extends BaseEdgeProcessor {
                             .setEdgeConfiguration(edgeConfigMsg)
                             .build();
                 }
-                break;
+            }
         }
         return downlinkMsg;
     }
@@ -112,4 +111,5 @@ public class EdgeProcessor extends BaseEdgeProcessor {
             return Futures.immediateFailedFuture(e);
         }
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/BaseEntityViewProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/BaseEntityViewProcessor.java
index b221b1576f..9c2b9a37bd 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/BaseEntityViewProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/BaseEntityViewProcessor.java
@@ -64,4 +64,5 @@ public abstract class BaseEntityViewProcessor extends BaseEdgeProcessor {
     protected abstract EntityView constructEntityViewFromUpdateMsg(TenantId tenantId, EntityViewId entityViewId, EntityViewUpdateMsg entityViewUpdateMsg);
 
     protected abstract void setCustomerId(TenantId tenantId, CustomerId customerId, EntityView entityView, EntityViewUpdateMsg entityViewUpdateMsg);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewEdgeProcessor.java
index c85eb95e98..70d9d9686f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewEdgeProcessor.java
@@ -105,11 +105,7 @@ public abstract class EntityViewEdgeProcessor extends BaseEntityViewProcessor im
         EntityViewId entityViewId = new EntityViewId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
-            case ASSIGNED_TO_EDGE:
-            case ASSIGNED_TO_CUSTOMER:
-            case UNASSIGNED_FROM_CUSTOMER:
+            case ADDED, UPDATED, ASSIGNED_TO_EDGE, ASSIGNED_TO_CUSTOMER, UNASSIGNED_FROM_CUSTOMER -> {
                 EntityView entityView = entityViewService.findEntityViewById(edgeEvent.getTenantId(), entityViewId);
                 if (entityView != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -120,17 +116,17 @@ public abstract class EntityViewEdgeProcessor extends BaseEntityViewProcessor im
                             .addEntityViewUpdateMsg(entityViewUpdateMsg)
                             .build();
                 }
-                break;
-            case DELETED:
-            case UNASSIGNED_FROM_EDGE:
+            }
+            case DELETED, UNASSIGNED_FROM_EDGE -> {
                 EntityViewUpdateMsg entityViewUpdateMsg = ((EntityViewMsgConstructor)
                         entityViewMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructEntityViewDeleteMsg(entityViewId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addEntityViewUpdateMsg(entityViewUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessor.java
index 80803a2cd4..061cd89bf0 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessor.java
@@ -29,4 +29,5 @@ public interface EntityViewProcessor extends EdgeProcessor {
     ListenableFuture<Void> processEntityViewMsgFromEdge(TenantId tenantId, Edge edge, EntityViewUpdateMsg entityViewUpdateMsg);
 
     DownlinkMsg convertEntityViewEventToDownlink(EdgeEvent edgeEvent, EdgeVersion edgeVersion);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessorV1.java
index 3d1171cbfd..acb8877c03 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessorV1.java
@@ -62,4 +62,5 @@ public class EntityViewProcessorV1 extends EntityViewEdgeProcessor {
         CustomerId customerUUID = safeGetCustomerId(entityViewUpdateMsg.getCustomerIdMSB(), entityViewUpdateMsg.getCustomerIdLSB());
         entityView.setCustomerId(customerUUID != null ? customerUUID : customerId);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessorV2.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessorV2.java
index 72356276cf..fa4177552e 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessorV2.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewProcessorV2.java
@@ -40,4 +40,5 @@ public class EntityViewProcessorV2 extends EntityViewEdgeProcessor {
         CustomerId customerUUID = entityView.getCustomerId() != null ? entityView.getCustomerId() : customerId;
         entityView.setCustomerId(customerUUID);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/notification/NotificationEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/notification/NotificationEdgeProcessor.java
new file mode 100644
index 0000000000..6af039341f
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/notification/NotificationEdgeProcessor.java
@@ -0,0 +1,119 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.edge.rpc.processor.notification;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.id.NotificationRuleId;
+import org.thingsboard.server.common.data.id.NotificationTargetId;
+import org.thingsboard.server.common.data.id.NotificationTemplateId;
+import org.thingsboard.server.common.data.notification.rule.NotificationRule;
+import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
+import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
+import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationRuleUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTargetUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTemplateUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.edge.rpc.processor.BaseEdgeProcessor;
+
+@Slf4j
+@Component
+@TbCoreComponent
+public class NotificationEdgeProcessor extends BaseEdgeProcessor {
+
+    public DownlinkMsg convertNotificationRuleToDownlink(EdgeEvent edgeEvent) {
+        NotificationRuleId notificationRuleId = new NotificationRuleId(edgeEvent.getEntityId());
+        DownlinkMsg downlinkMsg = null;
+        switch (edgeEvent.getAction()) {
+            case ADDED, UPDATED -> {
+                NotificationRule notificationRule = notificationRuleService.findNotificationRuleById(edgeEvent.getTenantId(), notificationRuleId);
+                if (notificationRule != null) {
+                    UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
+                    NotificationRuleUpdateMsg notificationRuleUpdateMsg = notificationMsgConstructor.constructNotificationRuleUpdateMsg(msgType, notificationRule);
+                    downlinkMsg = DownlinkMsg.newBuilder()
+                            .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                            .addNotificationRuleUpdateMsg(notificationRuleUpdateMsg)
+                            .build();
+                }
+            }
+            case DELETED -> {
+                NotificationRuleUpdateMsg notificationRuleUpdateMsg = notificationMsgConstructor.constructNotificationRuleDeleteMsg(notificationRuleId);
+                downlinkMsg = DownlinkMsg.newBuilder()
+                        .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                        .addNotificationRuleUpdateMsg(notificationRuleUpdateMsg)
+                        .build();
+            }
+        }
+        return downlinkMsg;
+    }
+
+    public DownlinkMsg convertNotificationTargetToDownlink(EdgeEvent edgeEvent) {
+        NotificationTargetId notificationTargetId = new NotificationTargetId(edgeEvent.getEntityId());
+        DownlinkMsg downlinkMsg = null;
+        switch (edgeEvent.getAction()) {
+            case ADDED, UPDATED -> {
+                NotificationTarget notificationTarget = notificationTargetService.findNotificationTargetById(edgeEvent.getTenantId(), notificationTargetId);
+                if (notificationTarget != null) {
+                    UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
+                    NotificationTargetUpdateMsg notificationTargetUpdateMsg = notificationMsgConstructor.constructNotificationTargetUpdateMsg(msgType, notificationTarget);
+                    downlinkMsg = DownlinkMsg.newBuilder()
+                            .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                            .addNotificationTargetUpdateMsg(notificationTargetUpdateMsg)
+                            .build();
+                }
+            }
+            case DELETED -> {
+                NotificationTargetUpdateMsg notificationTargetUpdateMsg = notificationMsgConstructor.constructNotificationTargetDeleteMsg(notificationTargetId);
+                downlinkMsg = DownlinkMsg.newBuilder()
+                        .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                        .addNotificationTargetUpdateMsg(notificationTargetUpdateMsg)
+                        .build();
+            }
+        }
+        return downlinkMsg;
+    }
+
+    public DownlinkMsg convertNotificationTemplateToDownlink(EdgeEvent edgeEvent) {
+        NotificationTemplateId notificationTemplateId = new NotificationTemplateId(edgeEvent.getEntityId());
+        DownlinkMsg downlinkMsg = null;
+        switch (edgeEvent.getAction()) {
+            case ADDED, UPDATED -> {
+                NotificationTemplate notificationTemplate = notificationTemplateService.findNotificationTemplateById(edgeEvent.getTenantId(), notificationTemplateId);
+                if (notificationTemplate != null) {
+                    UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
+                    NotificationTemplateUpdateMsg notificationTemplateUpdateMsg = notificationMsgConstructor.constructNotificationTemplateUpdateMsg(msgType, notificationTemplate);
+                    downlinkMsg = DownlinkMsg.newBuilder()
+                            .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                            .addNotificationTemplateUpdateMsg(notificationTemplateUpdateMsg)
+                            .build();
+                }
+            }
+            case DELETED -> {
+                NotificationTemplateUpdateMsg notificationTemplateUpdateMsg = notificationMsgConstructor.constructNotificationTemplateDeleteMsg(notificationTemplateId);
+                downlinkMsg = DownlinkMsg.newBuilder()
+                        .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                        .addNotificationTemplateUpdateMsg(notificationTemplateUpdateMsg)
+                        .build();
+            }
+        }
+        return downlinkMsg;
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java
new file mode 100644
index 0000000000..ce0600b491
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.edge.rpc.processor.oauth2;
+
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.EdgeUtils;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.oauth2.OAuth2Info;
+import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
+import org.thingsboard.server.gen.edge.v1.OAuth2UpdateMsg;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.edge.rpc.processor.BaseEdgeProcessor;
+
+@Slf4j
+@Component
+@TbCoreComponent
+public class OAuth2EdgeProcessor extends BaseEdgeProcessor {
+
+    public DownlinkMsg convertOAuth2EventToDownlink(EdgeEvent edgeEvent) {
+        DownlinkMsg downlinkMsg = null;
+        OAuth2Info oAuth2Info = JacksonUtil.convertValue(edgeEvent.getBody(), OAuth2Info.class);
+        if (oAuth2Info != null) {
+            OAuth2UpdateMsg oAuth2UpdateMsg = oAuth2MsgConstructor.constructOAuth2UpdateMsg(oAuth2Info);
+            downlinkMsg = DownlinkMsg.newBuilder()
+                    .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                    .addOAuth2UpdateMsg(oAuth2UpdateMsg)
+                    .build();
+        }
+        return downlinkMsg;
+    }
+
+    public ListenableFuture<Void> processOAuth2Notification(TenantId tenantId, TransportProtos.EdgeNotificationMsgProto edgeNotificationMsg) {
+        OAuth2Info oAuth2Info = JacksonUtil.fromString(edgeNotificationMsg.getBody(), OAuth2Info.class);
+        if (oAuth2Info == null) {
+            return Futures.immediateFuture(null);
+        }
+        EdgeEventType type = EdgeEventType.valueOf(edgeNotificationMsg.getType());
+        EdgeEventActionType actionType = EdgeEventActionType.valueOf(edgeNotificationMsg.getAction());
+        return processActionForAllEdges(tenantId, type, actionType, null, JacksonUtil.toJsonNode(edgeNotificationMsg.getBody()), null);
+    }
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/ota/OtaPackageEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/ota/OtaPackageEdgeProcessor.java
index e5c9ed1779..34a7724fee 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/ota/OtaPackageEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/ota/OtaPackageEdgeProcessor.java
@@ -38,8 +38,7 @@ public class OtaPackageEdgeProcessor extends BaseEdgeProcessor {
         OtaPackageId otaPackageId = new OtaPackageId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
+            case ADDED, UPDATED -> {
                 OtaPackage otaPackage = otaPackageService.findOtaPackageById(edgeEvent.getTenantId(), otaPackageId);
                 if (otaPackage != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -50,16 +49,17 @@ public class OtaPackageEdgeProcessor extends BaseEdgeProcessor {
                             .addOtaPackageUpdateMsg(otaPackageUpdateMsg)
                             .build();
                 }
-                break;
-            case DELETED:
+            }
+            case DELETED -> {
                 OtaPackageUpdateMsg otaPackageUpdateMsg = ((OtaPackageMsgConstructor)
                         otaPackageMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructOtaPackageDeleteMsg(otaPackageId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addOtaPackageUpdateMsg(otaPackageUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/queue/QueueEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/queue/QueueEdgeProcessor.java
index d529b44850..bfa81361fa 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/queue/QueueEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/queue/QueueEdgeProcessor.java
@@ -38,8 +38,7 @@ public class QueueEdgeProcessor extends BaseEdgeProcessor {
         QueueId queueId = new QueueId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
+            case ADDED, UPDATED -> {
                 Queue queue = queueService.findQueueById(edgeEvent.getTenantId(), queueId);
                 if (queue != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -50,16 +49,17 @@ public class QueueEdgeProcessor extends BaseEdgeProcessor {
                             .addQueueUpdateMsg(queueUpdateMsg)
                             .build();
                 }
-                break;
-            case DELETED:
+            }
+            case DELETED -> {
                 QueueUpdateMsg queueDeleteMsg = ((QueueMsgConstructor)
                         queueMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructQueueDeleteMsg(queueId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addQueueUpdateMsg(queueDeleteMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/BaseRelationProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/BaseRelationProcessor.java
index 045e4148e6..a832f0b1e1 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/BaseRelationProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/BaseRelationProcessor.java
@@ -58,4 +58,5 @@ public abstract class BaseRelationProcessor extends BaseEdgeProcessor {
     }
 
     protected abstract EntityRelation constructEntityRelationFromUpdateMsg(RelationUpdateMsg relationUpdateMsg);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessor.java
index 4c2ba3d04f..780550ed95 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessor.java
@@ -91,4 +91,5 @@ public abstract class RelationEdgeProcessor extends BaseRelationProcessor implem
         }
         return Futures.transform(Futures.allAsList(futures), voids -> null, dbCallbackExecutorService);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessorV1.java
index 10bdd19acb..647cec120a 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessorV1.java
@@ -49,4 +49,5 @@ public class RelationEdgeProcessorV1 extends RelationEdgeProcessor {
         entityRelation.setAdditionalInfo(JacksonUtil.toJsonNode(relationUpdateMsg.getAdditionalInfo()));
         return entityRelation;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessorV2.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessorV2.java
index 13e2c40f4f..7b31da421d 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessorV2.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationEdgeProcessorV2.java
@@ -31,4 +31,5 @@ public class RelationEdgeProcessorV2 extends RelationEdgeProcessor {
     protected EntityRelation constructEntityRelationFromUpdateMsg(RelationUpdateMsg relationUpdateMsg) {
         return JacksonUtil.fromString(relationUpdateMsg.getEntity(), EntityRelation.class, true);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationProcessor.java
index f48fbefff8..82a893e9ba 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/relation/RelationProcessor.java
@@ -29,4 +29,5 @@ public interface RelationProcessor extends EdgeProcessor {
     ListenableFuture<Void> processRelationMsgFromEdge(TenantId tenantId, Edge edge, RelationUpdateMsg relationUpdateMsg);
 
     DownlinkMsg convertRelationEventToDownlink(EdgeEvent edgeEvent, EdgeVersion edgeVersion);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/BaseResourceProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/BaseResourceProcessor.java
index 1b55658183..7384130baf 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/BaseResourceProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/BaseResourceProcessor.java
@@ -72,4 +72,5 @@ public abstract class BaseResourceProcessor extends BaseEdgeProcessor {
     }
 
     protected abstract TbResource constructResourceFromUpdateMsg(TenantId tenantId, TbResourceId tbResourceId, ResourceUpdateMsg resourceUpdateMsg);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessor.java
index b67ad78888..0a83e439b5 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessor.java
@@ -74,8 +74,7 @@ public abstract class ResourceEdgeProcessor extends BaseResourceProcessor implem
         TbResourceId tbResourceId = new TbResourceId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
+            case ADDED, UPDATED -> {
                 TbResource tbResource = resourceService.findResourceById(edgeEvent.getTenantId(), tbResourceId);
                 if (tbResource != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -86,16 +85,17 @@ public abstract class ResourceEdgeProcessor extends BaseResourceProcessor implem
                             .addResourceUpdateMsg(resourceUpdateMsg)
                             .build() : null;
                 }
-                break;
-            case DELETED:
+            }
+            case DELETED -> {
                 ResourceUpdateMsg resourceUpdateMsg = ((ResourceMsgConstructor)
                         resourceMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructResourceDeleteMsg(tbResourceId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addResourceUpdateMsg(resourceUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessorV1.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessorV1.java
index 0dd87df856..f272d447a4 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessorV1.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessorV1.java
@@ -45,4 +45,5 @@ public class ResourceEdgeProcessorV1 extends ResourceEdgeProcessor {
         resource.setEtag(resourceUpdateMsg.hasEtag() ? resourceUpdateMsg.getEtag() : null);
         return resource;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessorV2.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessorV2.java
index ccbc6eec95..108a6c8ecb 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessorV2.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceEdgeProcessorV2.java
@@ -33,4 +33,5 @@ public class ResourceEdgeProcessorV2 extends ResourceEdgeProcessor {
     protected TbResource constructResourceFromUpdateMsg(TenantId tenantId, TbResourceId tbResourceId, ResourceUpdateMsg resourceUpdateMsg) {
         return JacksonUtil.fromString(resourceUpdateMsg.getEntity(), TbResource.class, true);
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceProcessor.java
index 7b8d777313..a52d31a98b 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/resource/ResourceProcessor.java
@@ -29,4 +29,5 @@ public interface ResourceProcessor extends EdgeProcessor {
     ListenableFuture<Void> processResourceMsgFromEdge(TenantId tenantId, Edge edge, ResourceUpdateMsg resourceUpdateMsg);
 
     DownlinkMsg convertResourceEventToDownlink(EdgeEvent edgeEvent, EdgeVersion edgeVersion);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java
index 118cc0ccd4..30f74ae42d 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java
@@ -43,16 +43,15 @@ public class RuleChainEdgeProcessor extends BaseEdgeProcessor {
         RuleChainId ruleChainId = new RuleChainId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
-            case ASSIGNED_TO_EDGE:
+            case ADDED, UPDATED, ASSIGNED_TO_EDGE -> {
                 RuleChain ruleChain = ruleChainService.findRuleChainById(edgeEvent.getTenantId(), ruleChainId);
                 if (ruleChain != null) {
                     boolean isRoot = false;
                     if (edgeEvent.getBody() != null && edgeEvent.getBody().get(EDGE_IS_ROOT_BODY_KEY) != null) {
                         try {
                             isRoot = Boolean.parseBoolean(edgeEvent.getBody().get(EDGE_IS_ROOT_BODY_KEY).asText());
-                        } catch (Exception ignored) {}
+                        } catch (Exception ignored) {
+                        }
                     }
                     if (!isRoot) {
                         Edge edge = edgeService.findEdgeById(edgeEvent.getTenantId(), edgeEvent.getEdgeId());
@@ -67,15 +66,12 @@ public class RuleChainEdgeProcessor extends BaseEdgeProcessor {
                             .addRuleChainUpdateMsg(ruleChainUpdateMsg)
                             .build();
                 }
-                break;
-            case DELETED:
-            case UNASSIGNED_FROM_EDGE:
-                downlinkMsg = DownlinkMsg.newBuilder()
-                        .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
-                        .addRuleChainUpdateMsg(((RuleChainMsgConstructor) ruleChainMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion))
-                                .constructRuleChainDeleteMsg(ruleChainId))
-                        .build();
-                break;
+            }
+            case DELETED, UNASSIGNED_FROM_EDGE -> downlinkMsg = DownlinkMsg.newBuilder()
+                    .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                    .addRuleChainUpdateMsg(((RuleChainMsgConstructor) ruleChainMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion))
+                            .constructRuleChainDeleteMsg(ruleChainId))
+                    .build();
         }
         return downlinkMsg;
     }
@@ -99,4 +95,5 @@ public class RuleChainEdgeProcessor extends BaseEdgeProcessor {
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/settings/AdminSettingsEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/settings/AdminSettingsEdgeProcessor.java
index 1f2c767010..d9b0a85056 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/settings/AdminSettingsEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/settings/AdminSettingsEdgeProcessor.java
@@ -45,4 +45,5 @@ public class AdminSettingsEdgeProcessor extends BaseEdgeProcessor {
                 .addAdminSettingsUpdateMsg(adminSettingsUpdateMsg)
                 .build();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/BaseTelemetryProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/BaseTelemetryProcessor.java
index 2a9af53807..2656ef622f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/BaseTelemetryProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/BaseTelemetryProcessor.java
@@ -23,10 +23,13 @@ import com.google.common.util.concurrent.SettableFuture;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
@@ -53,7 +56,6 @@ import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
-import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.msg.rule.engine.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.server.common.transport.util.JsonUtils;
 import org.thingsboard.server.dao.model.ModelConstants;
@@ -66,8 +68,6 @@ import org.thingsboard.server.queue.TbQueueProducer;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.service.edge.rpc.processor.BaseEdgeProcessor;
 
-import jakarta.annotation.Nullable;
-import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -138,41 +138,39 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
         TbMsgMetaData metaData = new TbMsgMetaData();
         CustomerId customerId = null;
         switch (entityId.getEntityType()) {
-            case DEVICE:
+            case DEVICE -> {
                 Device device = deviceService.findDeviceById(tenantId, new DeviceId(entityId.getId()));
                 if (device != null) {
                     customerId = device.getCustomerId();
                     metaData.putValue("deviceName", device.getName());
                     metaData.putValue("deviceType", device.getType());
                 }
-                break;
-            case ASSET:
+            }
+            case ASSET -> {
                 Asset asset = assetService.findAssetById(tenantId, new AssetId(entityId.getId()));
                 if (asset != null) {
                     customerId = asset.getCustomerId();
                     metaData.putValue("assetName", asset.getName());
                     metaData.putValue("assetType", asset.getType());
                 }
-                break;
-            case ENTITY_VIEW:
+            }
+            case ENTITY_VIEW -> {
                 EntityView entityView = entityViewService.findEntityViewById(tenantId, new EntityViewId(entityId.getId()));
                 if (entityView != null) {
                     customerId = entityView.getCustomerId();
                     metaData.putValue("entityViewName", entityView.getName());
                     metaData.putValue("entityViewType", entityView.getType());
                 }
-                break;
-            case EDGE:
+            }
+            case EDGE -> {
                 Edge edge = edgeService.findEdgeById(tenantId, new EdgeId(entityId.getId()));
                 if (edge != null) {
                     customerId = edge.getCustomerId();
                     metaData.putValue("edgeName", edge.getName());
                     metaData.putValue("edgeType", edge.getType());
                 }
-                break;
-            default:
-                log.debug("[{}] Using empty metadata for entityId [{}]", tenantId, entityId);
-                break;
+            }
+            default -> log.debug("[{}] Using empty metadata for entityId [{}]", tenantId, entityId);
         }
         return new ImmutablePair<>(metaData, customerId != null ? customerId : new CustomerId(ModelConstants.NULL_UUID));
     }
@@ -317,36 +315,22 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
                                                                   JsonNode body) {
         EntityId entityId;
         switch (entityType) {
-            case DEVICE:
-                entityId = new DeviceId(entityUUID);
-                break;
-            case ASSET:
-                entityId = new AssetId(entityUUID);
-                break;
-            case ENTITY_VIEW:
-                entityId = new EntityViewId(entityUUID);
-                break;
-            case DASHBOARD:
-                entityId = new DashboardId(entityUUID);
-                break;
-            case TENANT:
-                entityId = TenantId.fromUUID(entityUUID);
-                break;
-            case CUSTOMER:
-                entityId = new CustomerId(entityUUID);
-                break;
-            case USER:
-                entityId = new UserId(entityUUID);
-                break;
-            case EDGE:
-                entityId = new EdgeId(entityUUID);
-                break;
-            default:
+            case DEVICE -> entityId = new DeviceId(entityUUID);
+            case ASSET -> entityId = new AssetId(entityUUID);
+            case ENTITY_VIEW -> entityId = new EntityViewId(entityUUID);
+            case DASHBOARD -> entityId = new DashboardId(entityUUID);
+            case TENANT -> entityId = TenantId.fromUUID(entityUUID);
+            case CUSTOMER -> entityId = new CustomerId(entityUUID);
+            case USER -> entityId = new UserId(entityUUID);
+            case EDGE -> entityId = new EdgeId(entityUUID);
+            default -> {
                 log.warn("[{}] Unsupported edge event type [{}]", tenantId, entityType);
                 return null;
+            }
         }
         String bodyJackson = JacksonUtil.toString(body);
         return bodyJackson == null ? null :
                 entityDataMsgConstructor.constructEntityDataMsg(tenantId, entityId, actionType, JsonParser.parseString(bodyJackson));
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/TelemetryEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/TelemetryEdgeProcessor.java
index e69c479d93..4e9a0b82d8 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/TelemetryEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/TelemetryEdgeProcessor.java
@@ -16,12 +16,18 @@
 package org.thingsboard.server.service.edge.rpc.processor.telemetry;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EdgeUtils;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.notification.rule.trigger.EdgeCommunicationFailureTrigger;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
 import org.thingsboard.server.gen.edge.v1.EntityDataProto;
 import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -31,18 +37,28 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 @TbCoreComponent
 public class TelemetryEdgeProcessor extends BaseTelemetryProcessor {
 
+    @Value("${edges.rpc.max_telemetry_message_size:0}")
+    private int maxTelemetryMessageSize;
+
+    @Lazy
+    @Autowired
+    private NotificationRuleProcessor notificationRuleProcessor;
+
     @Override
     protected String getMsgSourceKey() {
         return DataConstants.EDGE_MSG_SOURCE;
     }
 
-    public DownlinkMsg convertTelemetryEventToDownlink(EdgeEvent edgeEvent) {
+    public DownlinkMsg convertTelemetryEventToDownlink(Edge edge, EdgeEvent edgeEvent) {
         if (edgeEvent.getBody() != null) {
             String bodyStr = edgeEvent.getBody().toString();
-            if (bodyStr.length() > 1000) {
-                log.debug("[{}][{}][{}] Conversion to a DownlinkMsg telemetry event failed due to a size limit violation. " +
-                                "Current size is {}, but the limit is 1000. {}", edgeEvent.getTenantId(), edgeEvent.getEdgeId(),
-                        edgeEvent.getEntityId(), bodyStr.length(), StringUtils.truncate(bodyStr, 100));
+            if (maxTelemetryMessageSize > 0 && bodyStr.length() > maxTelemetryMessageSize) {
+                String error = "Conversion to a DownlinkMsg telemetry event failed due to a size limit violation.";
+                String message = String.format("%s Current size is %s, but the limit is %s", error, bodyStr.length(), maxTelemetryMessageSize);
+                log.debug("[{}][{}][{}] {}. {}", edgeEvent.getTenantId(), edgeEvent.getEdgeId(),
+                        edgeEvent.getEntityId(), message, StringUtils.truncate(bodyStr, 100));
+                notificationRuleProcessor.process(EdgeCommunicationFailureTrigger.builder().tenantId(edgeEvent.getTenantId())
+                        .edgeId(edgeEvent.getEdgeId()).customerId(edge.getCustomerId()).edgeName(edge.getName()).failureMsg(message).error(error).build());
                 return null;
             }
         }
@@ -55,4 +71,5 @@ public class TelemetryEdgeProcessor extends BaseTelemetryProcessor {
                 .addEntityData(entityDataProto)
                 .build();
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/tenant/TenantEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/tenant/TenantEdgeProcessor.java
index 2c192fab1d..515dccb987 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/tenant/TenantEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/tenant/TenantEdgeProcessor.java
@@ -60,4 +60,5 @@ public class TenantEdgeProcessor extends BaseEdgeProcessor {
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/tenant/TenantProfileEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/tenant/TenantProfileEdgeProcessor.java
index 6b97fbcb37..6c3bc1733f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/tenant/TenantProfileEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/tenant/TenantProfileEdgeProcessor.java
@@ -53,4 +53,5 @@ public class TenantProfileEdgeProcessor extends BaseEdgeProcessor {
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/UserEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/UserEdgeProcessor.java
index be3d8308a6..607c5e665c 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/UserEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/UserEdgeProcessor.java
@@ -39,8 +39,7 @@ public class UserEdgeProcessor extends BaseEdgeProcessor {
         UserId userId = new UserId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
+            case ADDED, UPDATED -> {
                 User user = userService.findUserById(edgeEvent.getTenantId(), userId);
                 if (user != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -49,14 +48,12 @@ public class UserEdgeProcessor extends BaseEdgeProcessor {
                             .addUserUpdateMsg(((UserMsgConstructor) userMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructUserUpdatedMsg(msgType, user))
                             .build();
                 }
-                break;
-            case DELETED:
-                downlinkMsg = DownlinkMsg.newBuilder()
-                        .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
-                        .addUserUpdateMsg(((UserMsgConstructor) userMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructUserDeleteMsg(userId))
-                        .build();
-                break;
-            case CREDENTIALS_UPDATED:
+            }
+            case DELETED -> downlinkMsg = DownlinkMsg.newBuilder()
+                    .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
+                    .addUserUpdateMsg(((UserMsgConstructor) userMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructUserDeleteMsg(userId))
+                    .build();
+            case CREDENTIALS_UPDATED -> {
                 UserCredentials userCredentialsByUserId = userService.findUserCredentialsByUserId(edgeEvent.getTenantId(), userId);
                 if (userCredentialsByUserId != null && userCredentialsByUserId.isEnabled()) {
                     UserCredentialsUpdateMsg userCredentialsUpdateMsg =
@@ -66,8 +63,9 @@ public class UserEdgeProcessor extends BaseEdgeProcessor {
                             .addUserCredentialsUpdateMsg(userCredentialsUpdateMsg)
                             .build();
                 }
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/widget/WidgetBundleEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/widget/WidgetBundleEdgeProcessor.java
index 4f1aa9afcc..662b3677cc 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/widget/WidgetBundleEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/widget/WidgetBundleEdgeProcessor.java
@@ -40,8 +40,7 @@ public class WidgetBundleEdgeProcessor extends BaseEdgeProcessor {
         WidgetsBundleId widgetsBundleId = new WidgetsBundleId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
+            case ADDED, UPDATED -> {
                 WidgetsBundle widgetsBundle = widgetsBundleService.findWidgetsBundleById(edgeEvent.getTenantId(), widgetsBundleId);
                 if (widgetsBundle != null) {
                     List<String> widgets = widgetTypeService.findWidgetFqnsByWidgetsBundleId(edgeEvent.getTenantId(), widgetsBundleId);
@@ -53,16 +52,17 @@ public class WidgetBundleEdgeProcessor extends BaseEdgeProcessor {
                             .addWidgetsBundleUpdateMsg(widgetsBundleUpdateMsg)
                             .build();
                 }
-                break;
-            case DELETED:
+            }
+            case DELETED -> {
                 WidgetsBundleUpdateMsg widgetsBundleUpdateMsg =
                         ((WidgetMsgConstructor) widgetMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructWidgetsBundleDeleteMsg(widgetsBundleId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addWidgetsBundleUpdateMsg(widgetsBundleUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/widget/WidgetTypeEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/widget/WidgetTypeEdgeProcessor.java
index 552ae47f43..c1891b8fdb 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/widget/WidgetTypeEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/widget/WidgetTypeEdgeProcessor.java
@@ -38,8 +38,7 @@ public class WidgetTypeEdgeProcessor extends BaseEdgeProcessor {
         WidgetTypeId widgetTypeId = new WidgetTypeId(edgeEvent.getEntityId());
         DownlinkMsg downlinkMsg = null;
         switch (edgeEvent.getAction()) {
-            case ADDED:
-            case UPDATED:
+            case ADDED, UPDATED -> {
                 WidgetTypeDetails widgetTypeDetails = widgetTypeService.findWidgetTypeDetailsById(edgeEvent.getTenantId(), widgetTypeId);
                 if (widgetTypeDetails != null) {
                     UpdateMsgType msgType = getUpdateMsgType(edgeEvent.getAction());
@@ -50,16 +49,17 @@ public class WidgetTypeEdgeProcessor extends BaseEdgeProcessor {
                             .addWidgetTypeUpdateMsg(widgetTypeUpdateMsg)
                             .build();
                 }
-                break;
-            case DELETED:
+            }
+            case DELETED -> {
                 WidgetTypeUpdateMsg widgetTypeUpdateMsg =
                         ((WidgetMsgConstructor) widgetMsgConstructorFactory.getMsgConstructorByEdgeVersion(edgeVersion)).constructWidgetTypeDeleteMsg(widgetTypeId);
                 downlinkMsg = DownlinkMsg.newBuilder()
                         .setDownlinkMsgId(EdgeUtils.nextPositiveInt())
                         .addWidgetTypeUpdateMsg(widgetTypeUpdateMsg)
                         .build();
-                break;
+            }
         }
         return downlinkMsg;
     }
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/sync/DefaultEdgeRequestsService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/sync/DefaultEdgeRequestsService.java
index f76b9ec828..3f61734801 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/sync/DefaultEdgeRequestsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/sync/DefaultEdgeRequestsService.java
@@ -27,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EdgeUtils;
 import org.thingsboard.server.common.data.EntityType;
@@ -110,9 +109,6 @@ public class DefaultEdgeRequestsService implements EdgeRequestsService {
     @Autowired
     private DbCallbackExecutorService dbCallbackExecutorService;
 
-    @Autowired
-    private TbClusterService tbClusterService;
-
     @Override
     public ListenableFuture<Void> processRuleChainMetadataRequestMsg(TenantId tenantId, Edge edge, RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg) {
         log.trace("[{}] processRuleChainMetadataRequestMsg [{}][{}]", tenantId, edge.getName(), ruleChainMetadataRequestMsg);
@@ -292,8 +288,7 @@ public class DefaultEdgeRequestsService implements EdgeRequestsService {
         return futureToSet;
     }
 
-    private ListenableFuture<List<EntityRelation>> findRelationByQuery(TenantId tenantId, Edge edge,
-                                                                       EntityId entityId, EntitySearchDirection direction) {
+    private ListenableFuture<List<EntityRelation>> findRelationByQuery(TenantId tenantId, Edge edge, EntityId entityId, EntitySearchDirection direction) {
         EntityRelationsQuery query = new EntityRelationsQuery();
         query.setParameters(new RelationsSearchParameters(entityId, direction, 1, false));
         return relationService.findByQuery(tenantId, query);
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
index 2b6a8ef323..4d4d0170bf 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
@@ -25,10 +25,9 @@ import org.springframework.context.annotation.Lazy;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.alarm.AlarmInfo;
-import org.thingsboard.server.common.data.alarm.AlarmQuery;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -72,11 +71,11 @@ public abstract class AbstractTbEntityService {
     @Lazy
     private EntitiesVersionControlService vcService;
 
-    protected void removeAlarmsByEntityId(TenantId tenantId, EntityId entityId) {
-        PageData<AlarmInfo> alarms =
-                alarmService.findAlarms(tenantId, new AlarmQuery(entityId, new TimePageLink(Integer.MAX_VALUE), null, null, null, false));
+    protected void removeAlarmsByOriginatorId(TenantId tenantId, EntityId entityId) {
+        PageData<AlarmId> alarms =
+                alarmService.findAlarmIdsByOriginatorId(tenantId, entityId, new TimePageLink(Integer.MAX_VALUE));
 
-        alarms.getData().stream().map(AlarmInfo::getId).forEach(alarmId -> alarmService.delAlarm(tenantId, alarmId));
+        alarms.getData().forEach(alarmId -> alarmService.delAlarm(tenantId, alarmId));
     }
 
     protected <T> T checkNotNull(T reference) throws ThingsboardException {
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java b/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
index c699cd6c02..bc7dc62e78 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
@@ -69,80 +69,71 @@ public class EntityStateSourcingListener {
 
     @TransactionalEventListener(fallbackExecution = true)
     public void handleEvent(SaveEntityEvent<?> event) {
-        log.trace("[{}] SaveEntityEvent called: {}", event.getTenantId(), event);
         TenantId tenantId = event.getTenantId();
         EntityId entityId = event.getEntityId();
         EntityType entityType = entityId.getEntityType();
+        log.debug("[{}][{}][{}] Handling entity save event: {}", tenantId, entityType, entityId, event);
         boolean isCreated = event.getCreated() != null && event.getCreated();
         ComponentLifecycleEvent lifecycleEvent = isCreated ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED;
 
         switch (entityType) {
-            case ASSET:
-            case ASSET_PROFILE:
-            case ENTITY_VIEW:
-            case NOTIFICATION_RULE:
+            case ASSET, ASSET_PROFILE, ENTITY_VIEW, NOTIFICATION_RULE -> {
                 tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, lifecycleEvent);
-                break;
-            case RULE_CHAIN:
+            }
+            case RULE_CHAIN -> {
                 RuleChain ruleChain = (RuleChain) event.getEntity();
                 if (RuleChainType.CORE.equals(ruleChain.getType())) {
                     tbClusterService.broadcastEntityStateChangeEvent(ruleChain.getTenantId(), ruleChain.getId(), lifecycleEvent);
                 }
-                break;
-            case TENANT:
+            }
+            case TENANT -> {
                 Tenant tenant = (Tenant) event.getEntity();
                 onTenantUpdate(tenant, lifecycleEvent);
-                break;
-            case TENANT_PROFILE:
+            }
+            case TENANT_PROFILE -> {
                 TenantProfile tenantProfile = (TenantProfile) event.getEntity();
                 onTenantProfileUpdate(tenantProfile, lifecycleEvent);
-                break;
-            case DEVICE:
+            }
+            case DEVICE -> {
                 onDeviceUpdate(event.getEntity(), event.getOldEntity());
-                break;
-            case DEVICE_PROFILE:
+            }
+            case DEVICE_PROFILE -> {
                 DeviceProfile deviceProfile = (DeviceProfile) event.getEntity();
                 onDeviceProfileUpdate(deviceProfile, event.getOldEntity(), isCreated);
-                break;
-            case EDGE:
+            }
+            case EDGE -> {
                 handleEdgeEvent(tenantId, entityId, event.getEntity(), lifecycleEvent);
-                break;
-            case TB_RESOURCE:
+            }
+            case TB_RESOURCE -> {
                 TbResource tbResource = (TbResource) event.getEntity();
                 tbClusterService.onResourceChange(tbResource, null);
-                break;
-            case API_USAGE_STATE:
+            }
+            case API_USAGE_STATE -> {
                 ApiUsageState apiUsageState = (ApiUsageState) event.getEntity();
                 tbClusterService.onApiStateChange(apiUsageState, null);
-                break;
-            default:
-                break;
+            }
+            default -> {}
         }
     }
 
     @TransactionalEventListener(fallbackExecution = true)
     public void handleEvent(DeleteEntityEvent<?> event) {
-        log.trace("[{}] DeleteEntityEvent called: {}", event.getTenantId(), event);
         TenantId tenantId = event.getTenantId();
         EntityId entityId = event.getEntityId();
         EntityType entityType = entityId.getEntityType();
+        log.debug("[{}][{}][{}] Handling entity deletion event: {}", tenantId, entityType, entityId, event);
 
         switch (entityType) {
-            case ASSET:
-            case ASSET_PROFILE:
-            case ENTITY_VIEW:
-            case CUSTOMER:
-            case EDGE:
-            case NOTIFICATION_RULE:
+            case ASSET, ASSET_PROFILE, ENTITY_VIEW, CUSTOMER, EDGE, NOTIFICATION_RULE -> {
                 tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, ComponentLifecycleEvent.DELETED);
-                break;
-            case NOTIFICATION_REQUEST:
+            }
+            case NOTIFICATION_REQUEST -> {
                 NotificationRequest request = (NotificationRequest) event.getEntity();
                 if (request.isScheduled()) {
                     tbClusterService.broadcastEntityStateChangeEvent(tenantId, entityId, ComponentLifecycleEvent.DELETED);
                 }
-                break;
-            case RULE_CHAIN:
+            }
+            case RULE_CHAIN -> {
                 RuleChain ruleChain = (RuleChain) event.getEntity();
                 if (RuleChainType.CORE.equals(ruleChain.getType())) {
                     Set<RuleChainId> referencingRuleChainIds = JacksonUtil.fromString(event.getBody(), new TypeReference<>() {});
@@ -152,29 +143,28 @@ public class EntityStateSourcingListener {
                     }
                     tbClusterService.broadcastEntityStateChangeEvent(tenantId, ruleChain.getId(), ComponentLifecycleEvent.DELETED);
                 }
-                break;
-            case TENANT:
+            }
+            case TENANT -> {
                 Tenant tenant = (Tenant) event.getEntity();
                 onTenantDeleted(tenant);
-                break;
-            case TENANT_PROFILE:
+            }
+            case TENANT_PROFILE -> {
                 TenantProfile tenantProfile = (TenantProfile) event.getEntity();
                 tbClusterService.onTenantProfileDelete(tenantProfile, null);
-                break;
-            case DEVICE:
+            }
+            case DEVICE -> {
                 Device device = (Device) event.getEntity();
                 tbClusterService.onDeviceDeleted(tenantId, device, null);
-                break;
-            case DEVICE_PROFILE:
+            }
+            case DEVICE_PROFILE -> {
                 DeviceProfile deviceProfile = (DeviceProfile) event.getEntity();
                 onDeviceProfileDelete(event.getTenantId(), event.getEntityId(), deviceProfile);
-                break;
-            case TB_RESOURCE:
+            }
+            case TB_RESOURCE -> {
                 TbResourceInfo tbResource = (TbResourceInfo) event.getEntity();
                 tbClusterService.onResourceDeleted(tbResource, null);
-                break;
-            default:
-                break;
+            }
+            default -> {}
         }
     }
 
@@ -186,8 +176,7 @@ public class EntityStateSourcingListener {
                 && event.getEntity() instanceof DeviceCredentials) {
             tbClusterService.pushMsgToCore(new DeviceCredentialsUpdateNotificationMsg(event.getTenantId(),
                     (DeviceId) event.getEntityId(), (DeviceCredentials) event.getEntity()), null);
-        } else if (ActionType.ASSIGNED_TO_TENANT.equals(event.getActionType()) && event.getEntity() instanceof Device) {
-            Device device = (Device) event.getEntity();
+        } else if (ActionType.ASSIGNED_TO_TENANT.equals(event.getActionType()) && event.getEntity() instanceof Device device) {
             Tenant tenant = JacksonUtil.fromString(event.getBody(), Tenant.class);
             if (tenant != null) {
                 tbClusterService.onDeviceAssignedToTenant(tenant.getId(), device);
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java
index 4247edf7a3..ddc9164575 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java
@@ -22,10 +22,8 @@ import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.asset.Asset;
-import org.thingsboard.server.common.data.asset.AssetProfile;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.Edge;
-import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -33,30 +31,18 @@ import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.service.entitiy.AbstractTbEntityService;
-import org.thingsboard.server.service.profile.TbAssetProfileCache;
-
-import static org.thingsboard.server.dao.asset.BaseAssetService.TB_SERVICE_QUEUE;
 
 @Service
 @AllArgsConstructor
 public class DefaultTbAssetService extends AbstractTbEntityService implements TbAssetService {
 
     private final AssetService assetService;
-    private final TbAssetProfileCache assetProfileCache;
 
     @Override
     public Asset save(Asset asset, User user) throws Exception {
         ActionType actionType = asset.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
         TenantId tenantId = asset.getTenantId();
         try {
-            if (TB_SERVICE_QUEUE.equals(asset.getType())) {
-                throw new ThingsboardException("Unable to save asset with type " + TB_SERVICE_QUEUE, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
-            } else if (asset.getAssetProfileId() != null) {
-                AssetProfile assetProfile = assetProfileCache.get(tenantId, asset.getAssetProfileId());
-                if (assetProfile != null && TB_SERVICE_QUEUE.equals(assetProfile.getName())) {
-                    throw new ThingsboardException("Unable to save asset with profile " + TB_SERVICE_QUEUE, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
-                }
-            }
             Asset savedAsset = checkNotNull(assetService.saveAsset(asset));
             autoCommit(user, savedAsset.getId());
             logEntityActionService.logEntityAction(tenantId, savedAsset.getId(), savedAsset, asset.getCustomerId(),
@@ -75,7 +61,7 @@ public class DefaultTbAssetService extends AbstractTbEntityService implements Tb
         TenantId tenantId = asset.getTenantId();
         AssetId assetId = asset.getId();
         try {
-            removeAlarmsByEntityId(tenantId, assetId);
+            removeAlarmsByOriginatorId(tenantId, assetId);
             assetService.deleteAsset(tenantId, assetId);
             logEntityActionService.logEntityAction(tenantId, assetId, asset, asset.getCustomerId(), actionType, user, assetId.toString());
         } catch (Exception e) {
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/asset/profile/DefaultTbAssetProfileService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/asset/profile/DefaultTbAssetProfileService.java
index cfda5f8814..03850880ae 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/asset/profile/DefaultTbAssetProfileService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/asset/profile/DefaultTbAssetProfileService.java
@@ -22,7 +22,6 @@ import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.asset.AssetProfile;
 import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.AssetProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -30,8 +29,6 @@ import org.thingsboard.server.dao.asset.AssetProfileService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.AbstractTbEntityService;
 
-import static org.thingsboard.server.dao.asset.BaseAssetService.TB_SERVICE_QUEUE;
-
 @Service
 @TbCoreComponent
 @AllArgsConstructor
@@ -45,14 +42,6 @@ public class DefaultTbAssetProfileService extends AbstractTbEntityService implem
         ActionType actionType = assetProfile.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
         TenantId tenantId = assetProfile.getTenantId();
         try {
-            if (TB_SERVICE_QUEUE.equals(assetProfile.getName())) {
-                throw new ThingsboardException("Unable to save asset profile with name " + TB_SERVICE_QUEUE, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
-            } else if (assetProfile.getId() != null) {
-                AssetProfile foundAssetProfile = assetProfileService.findAssetProfileById(tenantId, assetProfile.getId());
-                if (foundAssetProfile != null && TB_SERVICE_QUEUE.equals(foundAssetProfile.getName())) {
-                    throw new ThingsboardException("Updating asset profile with name " + TB_SERVICE_QUEUE + " is prohibited!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
-                }
-            }
             AssetProfile savedAssetProfile = checkNotNull(assetProfileService.saveAssetProfile(assetProfile));
             autoCommit(user, savedAssetProfile.getId());
             logEntityActionService.logEntityAction(tenantId, savedAssetProfile.getId(), savedAssetProfile,
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
index aea603c30d..de9e757166 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
@@ -94,7 +94,7 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
         TenantId tenantId = device.getTenantId();
         DeviceId deviceId = device.getId();
         try {
-            removeAlarmsByEntityId(tenantId, deviceId);
+            removeAlarmsByOriginatorId(tenantId, deviceId);
             deviceService.deleteDevice(tenantId, deviceId);
             logEntityActionService.logEntityAction(tenantId, deviceId, device, device.getCustomerId(), actionType,
                     user, deviceId.toString());
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java
index 17d52329b2..8096722940 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java
@@ -16,12 +16,10 @@
 package org.thingsboard.server.service.entitiy.tenant;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -45,25 +43,19 @@ public class DefaultTbTenantService extends AbstractTbEntityService implements T
     private final TbQueueService tbQueueService;
     private final TenantProfileService tenantProfileService;
     private final EntitiesVersionControlService versionControlService;
-    private final ApplicationEventPublisher eventPublisher;
 
     @Override
     public Tenant save(Tenant tenant) throws Exception {
         boolean created = tenant.getId() == null;
         Tenant oldTenant = !created ? tenantService.findTenantById(tenant.getId()) : null;
 
-        Tenant savedTenant = checkNotNull(tenantService.saveTenant(tenant, !created));
-        if (created) {
-            installScripts.createDefaultRuleChains(savedTenant.getId());
-            installScripts.createDefaultEdgeRuleChains(savedTenant.getId());
-            installScripts.createDefaultTenantDashboards(savedTenant.getId(), null);
-        }
+        Tenant savedTenant = tenantService.saveTenant(tenant, tenantId -> {
+            installScripts.createDefaultRuleChains(tenantId);
+            installScripts.createDefaultEdgeRuleChains(tenantId);
+            installScripts.createDefaultTenantDashboards(tenantId, null);
+        });
         tenantProfileCache.evict(savedTenant.getId());
 
-        if (created) {
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(TenantId.SYS_TENANT_ID).entityId(savedTenant.getId()).entity(savedTenant).created(true).build());
-        }
-
         TenantProfile oldTenantProfile = oldTenant != null ? tenantProfileService.findTenantProfileById(TenantId.SYS_TENANT_ID, oldTenant.getTenantProfileId()) : null;
         TenantProfile newTenantProfile = tenantProfileService.findTenantProfileById(TenantId.SYS_TENANT_ID, savedTenant.getTenantProfileId());
         tbQueueService.updateQueuesByTenants(Collections.singletonList(savedTenant.getTenantId()), newTenantProfile, oldTenantProfile);
diff --git a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
index f5bb67bdce..999079e913 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
@@ -151,17 +151,18 @@ public class InstallScripts {
         }
     }
 
-    public void createDefaultRuleChains(TenantId tenantId) throws IOException {
+    public void createDefaultRuleChains(TenantId tenantId) {
         Path tenantChainsDir = getTenantRuleChainsDir();
         loadRuleChainsFromPath(tenantId, tenantChainsDir);
     }
 
-    public void createDefaultEdgeRuleChains(TenantId tenantId) throws IOException {
+    public void createDefaultEdgeRuleChains(TenantId tenantId) {
         Path edgeChainsDir = getEdgeRuleChainsDir();
         loadRuleChainsFromPath(tenantId, edgeChainsDir);
     }
 
-    private void loadRuleChainsFromPath(TenantId tenantId, Path ruleChainsPath) throws IOException {
+    @SneakyThrows
+    private void loadRuleChainsFromPath(TenantId tenantId, Path ruleChainsPath) {
         findRuleChainsFromPath(ruleChainsPath).forEach(path -> {
             try {
                 createRuleChainFromFile(tenantId, path, null);
@@ -329,17 +330,18 @@ public class InstallScripts {
         }
     }
 
-    public void loadDashboards(TenantId tenantId, CustomerId customerId) throws Exception {
+    public void loadDashboards(TenantId tenantId, CustomerId customerId) {
         Path dashboardsDir = Paths.get(getDataDir(), JSON_DIR, DEMO_DIR, DASHBOARDS_DIR);
         loadDashboardsFromDir(tenantId, customerId, dashboardsDir);
     }
 
-    public void createDefaultTenantDashboards(TenantId tenantId, CustomerId customerId) throws Exception {
+    public void createDefaultTenantDashboards(TenantId tenantId, CustomerId customerId) {
         Path dashboardsDir = Paths.get(getDataDir(), JSON_DIR, TENANT_DIR, DASHBOARDS_DIR);
         loadDashboardsFromDir(tenantId, customerId, dashboardsDir);
     }
 
-    private void loadDashboardsFromDir(TenantId tenantId, CustomerId customerId, Path dashboardsDir) throws IOException {
+    @SneakyThrows
+    private void loadDashboardsFromDir(TenantId tenantId, CustomerId customerId, Path dashboardsDir) {
         try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(dashboardsDir, path -> path.toString().endsWith(JSON_EXT))) {
             dirStream.forEach(
                     path -> {
@@ -414,7 +416,7 @@ public class InstallScripts {
                     }
             );
         } catch (Exception e) {
-            log.error("Unable to load resources lwm2m object model from file: [{}]", resourceLwm2mPath.toString());
+            log.error("Unable to load resources lwm2m object model from file: [{}]", resourceLwm2mPath);
             throw new RuntimeException("resource lwm2m object model from file", e);
         }
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
index d2925870c4..86d922c305 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
@@ -116,7 +116,10 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                 updateSchema("3.6.2", 3006002, "3.6.3", 3006003, null);
                 break;
             case "3.6.3":
-                updateSchema("3.6.3", 3006003, "3.7.0", 3007000, null);
+                updateSchema("3.6.3", 3006003, "3.6.4", 3006004, null);
+                break;
+            case "3.6.4":
+                updateSchema("3.6.4", 3006004, "3.7.0", 3007000, null);
                 break;
             default:
                 throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);
diff --git a/application/src/main/java/org/thingsboard/server/service/mail/RefreshTokenExpCheckService.java b/application/src/main/java/org/thingsboard/server/service/mail/RefreshTokenExpCheckService.java
index 32fe4eb15c..7c7edf2164 100644
--- a/application/src/main/java/org/thingsboard/server/service/mail/RefreshTokenExpCheckService.java
+++ b/application/src/main/java/org/thingsboard/server/service/mail/RefreshTokenExpCheckService.java
@@ -54,23 +54,35 @@ public class RefreshTokenExpCheckService {
         AdminSettings settings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail");
         if (settings != null && settings.getJsonValue().has("enableOauth2") && settings.getJsonValue().get("enableOauth2").asBoolean()) {
             JsonNode jsonValue = settings.getJsonValue();
-            if (OFFICE_365.name().equals(jsonValue.get("providerId").asText()) && jsonValue.has("refreshTokenExpires")) {
-                long expiresIn = jsonValue.get("refreshTokenExpires").longValue();
-                if ((expiresIn - System.currentTimeMillis()) < 604800000L) { //less than 7 days
-                    log.info("Trying to refresh refresh token.");
+            if (OFFICE_365.name().equals(jsonValue.get("providerId").asText()) && jsonValue.has("refreshToken")
+                    && jsonValue.has("refreshTokenExpires")) {
+                try {
+                    long expiresIn = jsonValue.get("refreshTokenExpires").longValue();
+                    long tokenLifeDuration = expiresIn - System.currentTimeMillis();
+                    if (tokenLifeDuration < 0) {
+                        ((ObjectNode) jsonValue).put("tokenGenerated", false);
+                        ((ObjectNode) jsonValue).remove("refreshToken");
+                        ((ObjectNode) jsonValue).remove("refreshTokenExpires");
 
-                    String clientId = jsonValue.get("clientId").asText();
-                    String clientSecret = jsonValue.get("clientSecret").asText();
-                    String refreshToken = jsonValue.get("refreshToken").asText();
-                    String tokenUri = jsonValue.get("tokenUri").asText();
+                        adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, settings);
+                    } else if (tokenLifeDuration < 604800000L) { //less than 7 days
+                        log.info("Trying to refresh refresh token.");
 
-                    TokenResponse tokenResponse = new RefreshTokenRequest(new NetHttpTransport(), new GsonFactory(),
-                            new GenericUrl(tokenUri), refreshToken)
-                            .setClientAuthentication(new ClientParametersAuthentication(clientId, clientSecret))
-                            .execute();
-                    ((ObjectNode) jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
-                    ((ObjectNode) jsonValue).put("refreshTokenExpires", Instant.now().plus(Duration.ofDays(AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS)).toEpochMilli());
-                    adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, settings);
+                        String clientId = jsonValue.get("clientId").asText();
+                        String clientSecret = jsonValue.get("clientSecret").asText();
+                        String refreshToken = jsonValue.get("refreshToken").asText();
+                        String tokenUri = jsonValue.get("tokenUri").asText();
+
+                        TokenResponse tokenResponse = new RefreshTokenRequest(new NetHttpTransport(), new GsonFactory(),
+                                new GenericUrl(tokenUri), refreshToken)
+                                .setClientAuthentication(new ClientParametersAuthentication(clientId, clientSecret))
+                                .execute();
+                        ((ObjectNode) jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
+                        ((ObjectNode) jsonValue).put("refreshTokenExpires", Instant.now().plus(Duration.ofDays(AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS)).toEpochMilli());
+                        adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, settings);
+                    }
+                } catch (Exception e) {
+                    log.error("Error occurred while checking token", e);
                 }
             }
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java b/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java
index 362d0d971e..e7964169fa 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java
@@ -81,6 +81,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import static org.thingsboard.server.common.data.notification.NotificationDeliveryMethod.WEB;
+
 @Service
 @Slf4j
 @RequiredArgsConstructor
@@ -191,7 +193,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
             NotificationProcessingContext ctx = NotificationProcessingContext.builder()
                     .tenantId(tenantId)
                     .request(notificationRequest)
-                    .deliveryMethods(Set.of(NotificationDeliveryMethod.WEB))
+                    .deliveryMethods(Set.of(WEB))
                     .template(template)
                     .build();
 
@@ -247,7 +249,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
     private void processForTarget(NotificationTarget target, NotificationProcessingContext ctx) {
         Iterable<? extends NotificationRecipient> recipients;
         switch (target.getConfiguration().getType()) {
-            case PLATFORM_USERS: {
+            case PLATFORM_USERS -> {
                 PlatformUsersNotificationTargetConfig targetConfig = (PlatformUsersNotificationTargetConfig) target.getConfiguration();
                 if (targetConfig.getUsersFilter().getType().isForRules() && ctx.getRequest().getInfo() instanceof RuleOriginatedNotificationInfo) {
                     recipients = new PageDataIterable<>(pageLink -> {
@@ -258,21 +260,16 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
                         return notificationTargetService.findRecipientsForNotificationTargetConfig(ctx.getTenantId(), targetConfig, pageLink);
                     }, 256);
                 }
-                break;
             }
-            case SLACK: {
+            case SLACK -> {
                 SlackNotificationTargetConfig targetConfig = (SlackNotificationTargetConfig) target.getConfiguration();
                 recipients = List.of(targetConfig.getConversation());
-                break;
             }
-            case MICROSOFT_TEAMS: {
+            case MICROSOFT_TEAMS -> {
                 MicrosoftTeamsNotificationTargetConfig targetConfig = (MicrosoftTeamsNotificationTargetConfig) target.getConfiguration();
                 recipients = List.of(targetConfig);
-                break;
-            }
-            default: {
-                recipients = Collections.emptyList();
             }
+            default -> recipients = Collections.emptyList();
         }
 
         Set<NotificationDeliveryMethod> deliveryMethods = new HashSet<>(ctx.getDeliveryMethods());
@@ -322,6 +319,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
                 .requestId(request.getId())
                 .recipientId(recipient.getId())
                 .type(ctx.getNotificationType())
+                .deliveryMethod(WEB)
                 .subject(processedTemplate.getSubject())
                 .text(processedTemplate.getBody())
                 .additionalConfig(processedTemplate.getAdditionalConfig())
@@ -347,19 +345,22 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
         boolean updated = notificationService.markNotificationAsRead(tenantId, recipientId, notificationId);
         if (updated) {
             log.trace("Marked notification {} as read (recipient id: {}, tenant id: {})", notificationId, recipientId, tenantId);
-            NotificationUpdate update = NotificationUpdate.builder()
-                    .updated(true)
-                    .notificationId(notificationId.getId())
-                    .newStatus(NotificationStatus.READ)
-                    .build();
-            onNotificationUpdate(tenantId, recipientId, update);
+            Notification notification = notificationService.findNotificationById(tenantId, notificationId);
+            if (notification.getDeliveryMethod() == WEB) {
+                NotificationUpdate update = NotificationUpdate.builder()
+                        .updated(true)
+                        .notificationId(notificationId.getId())
+                        .newStatus(NotificationStatus.READ)
+                        .build();
+                onNotificationUpdate(tenantId, recipientId, update);
+            }
         }
     }
 
     @Override
-    public void markAllNotificationsAsRead(TenantId tenantId, UserId recipientId) {
-        int updatedCount = notificationService.markAllNotificationsAsRead(tenantId, recipientId);
-        if (updatedCount > 0) {
+    public void markAllNotificationsAsRead(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId) {
+        int updatedCount = notificationService.markAllNotificationsAsRead(tenantId, deliveryMethod, recipientId);
+        if (updatedCount > 0 && deliveryMethod == WEB) {
             log.trace("Marked all notifications as read (recipient id: {}, tenant id: {})", recipientId, tenantId);
             NotificationUpdate update = NotificationUpdate.builder()
                     .updated(true)
@@ -374,7 +375,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
     public void deleteNotification(TenantId tenantId, UserId recipientId, NotificationId notificationId) {
         Notification notification = notificationService.findNotificationById(tenantId, notificationId);
         boolean deleted = notificationService.deleteNotification(tenantId, recipientId, notificationId);
-        if (deleted) {
+        if (deleted && notification.getDeliveryMethod() == WEB) {
             NotificationUpdate update = NotificationUpdate.builder()
                     .deleted(true)
                     .notification(notification)
@@ -451,7 +452,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
 
     @Override
     public NotificationDeliveryMethod getDeliveryMethod() {
-        return NotificationDeliveryMethod.WEB;
+        return WEB;
     }
 
     @Override
@@ -462,7 +463,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
     @Autowired
     public void setChannels(List<NotificationChannel> channels, NotificationCenter webNotificationChannel) {
         this.channels = channels.stream().collect(Collectors.toMap(NotificationChannel::getDeliveryMethod, c -> c));
-        this.channels.put(NotificationDeliveryMethod.WEB, (NotificationChannel) webNotificationChannel);
+        this.channels.put(WEB, (NotificationChannel) webNotificationChannel);
     }
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java b/application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java
index 646556372a..f796e2b440 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.service.notification.channels;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Strings;
 import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.MessagingErrorCode;
@@ -26,11 +27,15 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.notification.FirebaseService;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.notification.Notification;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
+import org.thingsboard.server.common.data.notification.NotificationRequest;
+import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.common.data.notification.info.NotificationInfo;
 import org.thingsboard.server.common.data.notification.settings.MobileAppNotificationDeliveryMethodConfig;
 import org.thingsboard.server.common.data.notification.settings.NotificationSettings;
 import org.thingsboard.server.common.data.notification.template.MobileAppDeliveryMethodNotificationTemplate;
+import org.thingsboard.server.dao.notification.NotificationService;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.service.notification.NotificationProcessingContext;
@@ -41,6 +46,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
+import static org.thingsboard.server.common.data.notification.NotificationDeliveryMethod.MOBILE_APP;
+
 @Component
 @RequiredArgsConstructor
 @Slf4j
@@ -48,25 +55,54 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
 
     private final FirebaseService firebaseService;
     private final UserService userService;
+    private final NotificationService notificationService;
     private final NotificationSettingsService notificationSettingsService;
 
     @Override
     public void sendNotification(User recipient, MobileAppDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) throws Exception {
+        NotificationRequest request = ctx.getRequest();
+        NotificationInfo info = request.getInfo();
+        if (info != null && info.getDashboardId() != null) {
+            ObjectNode additionalConfig = JacksonUtil.asObject(processedTemplate.getAdditionalConfig());
+            ObjectNode onClick = JacksonUtil.asObject(additionalConfig.get("onClick"));
+            if (onClick.get("enabled") == null || !Boolean.parseBoolean(onClick.get("enabled").asText())) {
+                onClick.put("enabled", true);
+                onClick.put("linkType", "DASHBOARD");
+                onClick.put("setEntityIdInState", true);
+                onClick.put("dashboardId", info.getDashboardId().toString());
+                additionalConfig.set("onClick", onClick);
+            }
+            processedTemplate.setAdditionalConfig(additionalConfig);
+        }
+        Notification notification = Notification.builder()
+                .requestId(request.getId())
+                .recipientId(recipient.getId())
+                .type(ctx.getNotificationType())
+                .deliveryMethod(MOBILE_APP)
+                .subject(processedTemplate.getSubject())
+                .text(processedTemplate.getBody())
+                .additionalConfig(processedTemplate.getAdditionalConfig())
+                .info(info)
+                .status(NotificationStatus.SENT)
+                .build();
+        notificationService.saveNotification(recipient.getTenantId(), notification);
+
         var mobileSessions = userService.findMobileSessions(recipient.getTenantId(), recipient.getId());
         if (mobileSessions.isEmpty()) {
             throw new IllegalArgumentException("User doesn't use the mobile app");
         }
 
-        MobileAppNotificationDeliveryMethodConfig config = ctx.getDeliveryMethodConfig(NotificationDeliveryMethod.MOBILE_APP);
+        MobileAppNotificationDeliveryMethodConfig config = ctx.getDeliveryMethodConfig(MOBILE_APP);
         String credentials = config.getFirebaseServiceAccountCredentials();
         Set<String> validTokens = new HashSet<>(mobileSessions.keySet());
 
         String subject = processedTemplate.getSubject();
         String body = processedTemplate.getBody();
         Map<String, String> data = getNotificationData(processedTemplate, ctx);
+        int unreadCount = notificationService.countUnreadNotificationsByRecipientId(ctx.getTenantId(), MOBILE_APP, recipient.getId());
         for (String token : mobileSessions.keySet()) {
             try {
-                firebaseService.sendMessage(ctx.getTenantId(), credentials, token, subject, body, data);
+                firebaseService.sendMessage(ctx.getTenantId(), credentials, token, subject, body, data, unreadCount);
             } catch (FirebaseMessagingException e) {
                 MessagingErrorCode errorCode = e.getMessagingErrorCode();
                 if (errorCode == MessagingErrorCode.UNREGISTERED || errorCode == MessagingErrorCode.INVALID_ARGUMENT) {
@@ -92,12 +128,6 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
         Optional.ofNullable(info.getStateEntityId()).ifPresent(stateEntityId -> {
             data.put("stateEntityId", stateEntityId.getId().toString());
             data.put("stateEntityType", stateEntityId.getEntityType().name());
-            if (!"true".equals(data.get("onClick.enabled")) && info.getDashboardId() != null) {
-                data.put("onClick.enabled", "true");
-                data.put("onClick.linkType", "DASHBOARD");
-                data.put("onClick.setEntityIdInState", "true");
-                data.put("onClick.dashboardId", info.getDashboardId().toString());
-            }
         });
         data.put("notificationType", ctx.getNotificationType().name());
         switch (ctx.getNotificationType()) {
@@ -116,14 +146,14 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
     @Override
     public void check(TenantId tenantId) throws Exception {
         NotificationSettings systemSettings = notificationSettingsService.findNotificationSettings(TenantId.SYS_TENANT_ID);
-        if (!systemSettings.getDeliveryMethodsConfigs().containsKey(NotificationDeliveryMethod.MOBILE_APP)) {
+        if (!systemSettings.getDeliveryMethodsConfigs().containsKey(MOBILE_APP)) {
             throw new RuntimeException("Push-notifications to mobile are not configured");
         }
     }
 
     @Override
     public NotificationDeliveryMethod getDeliveryMethod() {
-        return NotificationDeliveryMethod.MOBILE_APP;
+        return MOBILE_APP;
     }
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultFirebaseService.java b/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultFirebaseService.java
index b64d0b586d..11651f91c4 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultFirebaseService.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultFirebaseService.java
@@ -54,7 +54,8 @@ public class DefaultFirebaseService implements FirebaseService {
             .build();
 
     @Override
-    public void sendMessage(TenantId tenantId, String credentials, String fcmToken, String title, String body, Map<String, String> data) throws FirebaseMessagingException {
+    public void sendMessage(TenantId tenantId, String credentials, String fcmToken, String title, String body,
+                            Map<String, String> data, Integer badge) throws FirebaseMessagingException {
         FirebaseContext firebaseContext = contexts.asMap().compute(tenantId.toString(), (key, context) -> {
             if (context == null) {
                 return new FirebaseContext(key, credentials);
@@ -64,6 +65,12 @@ public class DefaultFirebaseService implements FirebaseService {
             }
         });
 
+        Aps.Builder apsConfig = Aps.builder()
+                .setSound("default");
+        if (badge != null) {
+            apsConfig.setBadge(badge);
+        }
+
         Message message = Message.builder()
                 .setToken(fcmToken)
                 .setNotification(Notification.builder()
@@ -74,14 +81,17 @@ public class DefaultFirebaseService implements FirebaseService {
                         .setPriority(AndroidConfig.Priority.HIGH)
                         .build())
                 .setApnsConfig(ApnsConfig.builder()
-                        .setAps(Aps.builder()
-                                .setContentAvailable(true)
-                                .build())
+                        .setAps(apsConfig.build())
                         .build())
                 .putAllData(data)
                 .build();
-        firebaseContext.getMessaging().send(message);
-        log.trace("[{}] Sent message for FCM token {}", tenantId, fcmToken);
+        try {
+            firebaseContext.getMessaging().send(message);
+            log.trace("[{}] Sent message for FCM token {}", tenantId, fcmToken);
+        } catch (Throwable t) {
+            log.debug("[{}] Failed to send message for FCM token {}", tenantId, fcmToken, t);
+            throw t;
+        }
     }
 
     public static class FirebaseContext {
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
index fd08b9da4d..cdb3f19601 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
@@ -18,6 +18,8 @@ package org.thingsboard.server.service.queue;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -50,9 +52,9 @@ import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.rpc.FromDeviceRpcResponse;
 import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequestActorMsg;
 import org.thingsboard.server.common.stats.StatsFactory;
+import org.thingsboard.server.common.util.KvProtoUtil;
 import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.dao.resource.ImageCacheKey;
-import org.thingsboard.server.common.util.KvProtoUtil;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.DeviceStateServiceMsgProto;
@@ -101,8 +103,6 @@ import org.thingsboard.server.service.transport.msg.TransportToDeviceActorMsgWra
 import org.thingsboard.server.service.ws.notification.sub.NotificationRequestUpdate;
 import org.thingsboard.server.service.ws.notification.sub.NotificationUpdate;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -583,7 +583,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
             subscriptionManagerService.onTimeSeriesUpdate(
                     toTenantId(tenantIdMSB, tenantIdLSB),
                     TbSubscriptionUtils.toEntityId(proto.getEntityType(), proto.getEntityIdMSB(), proto.getEntityIdLSB()),
-                    KvProtoUtil.toTsKvEntityList(proto.getDataList()), callback);
+                    KvProtoUtil.fromTsKvProtoList(proto.getDataList()), callback);
         } else if (msg.hasAttrUpdate()) {
             TbAttributeUpdateProto proto = msg.getAttrUpdate();
             subscriptionManagerService.onAttributesUpdate(
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java
index 77a11310e3..964207b382 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java
@@ -112,9 +112,17 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
             if (partitionService.isManagedByCurrentService(queueKey.getTenantId())) {
                 var consumer = getConsumer(queueKey).orElseGet(() -> {
                     Queue config = queueService.findQueueByTenantIdAndName(queueKey.getTenantId(), queueKey.getQueueName());
+                    if (config == null) {
+                        if (!partitions.isEmpty()) {
+                            log.error("[{}] Queue configuration is missing", queueKey, new RuntimeException("stacktrace"));
+                        }
+                        return null;
+                    }
                     return createConsumer(queueKey, config);
                 });
-                consumer.update(partitions);
+                if (consumer != null) {
+                    consumer.update(partitions);
+                }
             }
         });
         consumers.keySet().stream()
diff --git a/application/src/main/java/org/thingsboard/server/service/queue/TbRuleEngineConsumerStats.java b/application/src/main/java/org/thingsboard/server/service/queue/TbRuleEngineConsumerStats.java
index c860a00237..5479677f39 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/TbRuleEngineConsumerStats.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/TbRuleEngineConsumerStats.java
@@ -18,7 +18,6 @@ package org.thingsboard.server.service.queue;
 import io.micrometer.core.instrument.Timer;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.queue.Queue;
 import org.thingsboard.server.common.msg.queue.RuleEngineException;
 import org.thingsboard.server.common.stats.StatsCounter;
 import org.thingsboard.server.common.stats.StatsFactory;
@@ -45,6 +44,7 @@ public class TbRuleEngineConsumerStats {
     public static final String FAILED_MSGS = "failedMsgs";
     public static final String SUCCESSFUL_ITERATIONS = "successfulIterations";
     public static final String FAILED_ITERATIONS = "failedIterations";
+    public static final String TENANT_ID_TAG = "tenantId";
 
     private final StatsFactory statsFactory;
 
@@ -73,14 +73,15 @@ public class TbRuleEngineConsumerStats {
         this.statsFactory = statsFactory;
 
         String statsKey = StatsType.RULE_ENGINE.getName() + "." + queueName;
-        this.totalMsgCounter = statsFactory.createStatsCounter(statsKey, TOTAL_MSGS);
-        this.successMsgCounter = statsFactory.createStatsCounter(statsKey, SUCCESSFUL_MSGS);
-        this.timeoutMsgCounter = statsFactory.createStatsCounter(statsKey, TIMEOUT_MSGS);
-        this.failedMsgCounter = statsFactory.createStatsCounter(statsKey, FAILED_MSGS);
-        this.tmpTimeoutMsgCounter = statsFactory.createStatsCounter(statsKey, TMP_TIMEOUT);
-        this.tmpFailedMsgCounter = statsFactory.createStatsCounter(statsKey, TMP_FAILED);
-        this.successIterationsCounter = statsFactory.createStatsCounter(statsKey, SUCCESSFUL_ITERATIONS);
-        this.failedIterationsCounter = statsFactory.createStatsCounter(statsKey, FAILED_ITERATIONS);
+        String tenant = tenantId == null || tenantId.isSysTenantId() ? "system" : tenantId.toString();
+        this.totalMsgCounter = statsFactory.createStatsCounter(statsKey, TOTAL_MSGS, TENANT_ID_TAG, tenant);
+        this.successMsgCounter = statsFactory.createStatsCounter(statsKey, SUCCESSFUL_MSGS, TENANT_ID_TAG, tenant);
+        this.timeoutMsgCounter = statsFactory.createStatsCounter(statsKey, TIMEOUT_MSGS, TENANT_ID_TAG, tenant);
+        this.failedMsgCounter = statsFactory.createStatsCounter(statsKey, FAILED_MSGS, TENANT_ID_TAG, tenant);
+        this.tmpTimeoutMsgCounter = statsFactory.createStatsCounter(statsKey, TMP_TIMEOUT, TENANT_ID_TAG, tenant);
+        this.tmpFailedMsgCounter = statsFactory.createStatsCounter(statsKey, TMP_FAILED, TENANT_ID_TAG, tenant);
+        this.successIterationsCounter = statsFactory.createStatsCounter(statsKey, SUCCESSFUL_ITERATIONS, TENANT_ID_TAG, tenant);
+        this.failedIterationsCounter = statsFactory.createStatsCounter(statsKey, FAILED_ITERATIONS, TENANT_ID_TAG, tenant);
 
         counters.add(totalMsgCounter);
         counters.add(successMsgCounter);
@@ -93,7 +94,7 @@ public class TbRuleEngineConsumerStats {
         counters.add(failedIterationsCounter);
     }
 
-    public Timer getTimer(TenantId tenantId, String status){
+    public Timer getTimer(TenantId tenantId, String status) {
         return tenantMsgProcessTimers.computeIfAbsent(tenantId,
                 id -> statsFactory.createTimer(StatsType.RULE_ENGINE.getName() + "." + queueName,
                         "tenantId", tenantId.getId().toString(),
diff --git a/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java b/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java
index 2f5f2abd38..b42f57116c 100644
--- a/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java
+++ b/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java
@@ -95,7 +95,7 @@ public class DefaultTbResourceService extends AbstractTbEntityService implements
     @Override
     public List<LwM2mObject> findLwM2mObject(TenantId tenantId, String sortOrder, String sortProperty, String[] objectIds) {
         log.trace("Executing findByTenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         List<TbResource> resources = resourceService.findTenantResourcesByResourceTypeAndObjectIds(tenantId, ResourceType.LWM2M_MODEL,
                 objectIds);
         return resources.stream()
@@ -107,7 +107,7 @@ public class DefaultTbResourceService extends AbstractTbEntityService implements
     @Override
     public List<LwM2mObject> findLwM2mObjectPage(TenantId tenantId, String sortProperty, String sortOrder, PageLink pageLink) {
         log.trace("Executing findByTenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         PageData<TbResource> resourcePageData = resourceService.findTenantResourcesByResourceTypeAndPageLink(tenantId, ResourceType.LWM2M_MODEL, pageLink);
         return resourcePageData.getData().stream()
                 .flatMap(s -> Stream.ofNullable(toLwM2mObject(s, false)))
diff --git a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java
index 1542f4095e..ebbd29e589 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java
@@ -208,52 +208,22 @@ public class AccessValidator {
 
     public void validate(SecurityUser currentUser, Operation operation, EntityId entityId, FutureCallback<ValidationResult> callback) {
         switch (entityId.getEntityType()) {
-            case DEVICE:
-                validateDevice(currentUser, operation, entityId, callback);
-                return;
-            case DEVICE_PROFILE:
-                validateDeviceProfile(currentUser, operation, entityId, callback);
-                return;
-            case ASSET:
-                validateAsset(currentUser, operation, entityId, callback);
-                return;
-            case ASSET_PROFILE:
-                validateAssetProfile(currentUser, operation, entityId, callback);
-                return;
-            case RULE_CHAIN:
-                validateRuleChain(currentUser, operation, entityId, callback);
-                return;
-            case CUSTOMER:
-                validateCustomer(currentUser, operation, entityId, callback);
-                return;
-            case TENANT:
-                validateTenant(currentUser, operation, entityId, callback);
-                return;
-            case TENANT_PROFILE:
-                validateTenantProfile(currentUser, operation, entityId, callback);
-                return;
-            case USER:
-                validateUser(currentUser, operation, entityId, callback);
-                return;
-            case ENTITY_VIEW:
-                validateEntityView(currentUser, operation, entityId, callback);
-                return;
-            case EDGE:
-                validateEdge(currentUser, operation, entityId, callback);
-                return;
-            case API_USAGE_STATE:
-                validateApiUsageState(currentUser, operation, entityId, callback);
-                return;
-            case TB_RESOURCE:
-                validateResource(currentUser, operation, entityId, callback);
-                return;
-            case OTA_PACKAGE:
-                validateOtaPackage(currentUser, operation, entityId, callback);
-                return;
-            case RPC:
-                validateRpc(currentUser, operation, entityId, callback);
-                return;
-            default:
+            case DEVICE -> validateDevice(currentUser, operation, entityId, callback);
+            case DEVICE_PROFILE -> validateDeviceProfile(currentUser, operation, entityId, callback);
+            case ASSET -> validateAsset(currentUser, operation, entityId, callback);
+            case ASSET_PROFILE -> validateAssetProfile(currentUser, operation, entityId, callback);
+            case RULE_CHAIN -> validateRuleChain(currentUser, operation, entityId, callback);
+            case CUSTOMER -> validateCustomer(currentUser, operation, entityId, callback);
+            case TENANT -> validateTenant(currentUser, operation, entityId, callback);
+            case TENANT_PROFILE -> validateTenantProfile(currentUser, operation, entityId, callback);
+            case USER -> validateUser(currentUser, operation, entityId, callback);
+            case ENTITY_VIEW -> validateEntityView(currentUser, operation, entityId, callback);
+            case EDGE -> validateEdge(currentUser, operation, entityId, callback);
+            case API_USAGE_STATE -> validateApiUsageState(currentUser, operation, entityId, callback);
+            case TB_RESOURCE -> validateResource(currentUser, operation, entityId, callback);
+            case OTA_PACKAGE -> validateOtaPackage(currentUser, operation, entityId, callback);
+            case RPC -> validateRpc(currentUser, operation, entityId, callback);
+            default ->
                 //TODO: add support of other entities
                 throw new IllegalStateException("Not Implemented!");
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginRequest.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginRequest.java
index 5d001ccf6a..dbb930755d 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginRequest.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginRequest.java
@@ -32,12 +32,12 @@ public class LoginRequest {
         this.password = password;
     }
 
-    @Schema(required = true, description = "User email", example = "tenant@thingsboard.org")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "User email", example = "tenant@thingsboard.org")
     public String getUsername() {
         return username;
     }
 
-    @Schema(required = true, description = "User password", example = "tenant")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "User password", example = "tenant")
     public String getPassword() {
         return password;
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginResponse.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginResponse.java
index 239186cf45..503767106a 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginResponse.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginResponse.java
@@ -22,11 +22,11 @@ import lombok.Data;
 @Data
 public class LoginResponse {
 
-    @Schema(required = true, description = "JWT token",
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JWT token",
             example = "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0ZW5hbnRAdGhpbmdzYm9hcmQub3JnIi...")
     private String token;
 
-    @Schema(required = true, description = "Refresh token",
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Refresh token",
             example = "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0ZW5hbnRAdGhpbmdzYm9hcmQub3JnIi...")
     private String refreshToken;
 
diff --git a/application/src/main/java/org/thingsboard/server/service/stats/DefaultRuleEngineStatisticsService.java b/application/src/main/java/org/thingsboard/server/service/stats/DefaultRuleEngineStatisticsService.java
index 64ca544495..03747d3062 100644
--- a/application/src/main/java/org/thingsboard/server/service/stats/DefaultRuleEngineStatisticsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/stats/DefaultRuleEngineStatisticsService.java
@@ -21,15 +21,15 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.thingsboard.server.common.data.asset.Asset;
-import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.QueueStatsId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
 import org.thingsboard.server.common.data.kv.JsonDataEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.common.data.queue.QueueStats;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
-import org.thingsboard.server.dao.asset.AssetService;
+import org.thingsboard.server.dao.queue.QueueStatsService;
 import org.thingsboard.server.dao.usagerecord.ApiLimitService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 import org.thingsboard.server.queue.util.TbRuleEngineComponent;
@@ -52,7 +52,6 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class DefaultRuleEngineStatisticsService implements RuleEngineStatisticsService {
 
-    public static final String TB_SERVICE_QUEUE = "TbServiceQueue";
     public static final String RULE_ENGINE_EXCEPTION = "ruleEngineException";
     public static final FutureCallback<Integer> CALLBACK = new FutureCallback<Integer>() {
         @Override
@@ -68,10 +67,10 @@ public class DefaultRuleEngineStatisticsService implements RuleEngineStatisticsS
 
     private final TbServiceInfoProvider serviceInfoProvider;
     private final TelemetrySubscriptionService tsService;
-    private final AssetService assetService;
+    private final QueueStatsService queueStatsService;
     private final ApiLimitService apiLimitService;
     private final Lock lock = new ReentrantLock();
-    private final ConcurrentMap<TenantQueueKey, AssetId> tenantQueueAssets = new ConcurrentHashMap<>();
+    private final ConcurrentMap<TenantQueueKey, QueueStatsId> tenantQueueStats = new ConcurrentHashMap<>();
 
     @Value("${queue.rule-engine.stats.max-error-message-length:4096}")
     private int maxErrorMessageLength;
@@ -82,7 +81,7 @@ public class DefaultRuleEngineStatisticsService implements RuleEngineStatisticsS
         ruleEngineStats.getTenantStats().forEach((id, stats) -> {
             try {
                 TenantId tenantId = TenantId.fromUUID(id);
-                AssetId serviceAssetId = getServiceAssetId(tenantId, queueName);
+                QueueStatsId queueStatsId = getQueueStatsId(tenantId, queueName);
                 if (stats.getTotalMsgCounter().get() > 0) {
                     List<TsKvEntry> tsList = stats.getCounters().entrySet().stream()
                             .map(kv -> new BasicTsKvEntry(ts, new LongDataEntry(kv.getKey(), (long) kv.getValue().get())))
@@ -90,7 +89,7 @@ public class DefaultRuleEngineStatisticsService implements RuleEngineStatisticsS
                     if (!tsList.isEmpty()) {
                         long ttl = apiLimitService.getLimit(tenantId, DefaultTenantProfileConfiguration::getQueueStatsTtlDays);
                         ttl = TimeUnit.DAYS.toSeconds(ttl);
-                        tsService.saveAndNotifyInternal(tenantId, serviceAssetId, tsList, ttl, CALLBACK);
+                        tsService.saveAndNotifyInternal(tenantId, queueStatsId, tsList, ttl, CALLBACK);
                     }
                 }
             } catch (Exception e) {
@@ -104,7 +103,7 @@ public class DefaultRuleEngineStatisticsService implements RuleEngineStatisticsS
                 TsKvEntry tsKv = new BasicTsKvEntry(e.getTs(), new JsonDataEntry(RULE_ENGINE_EXCEPTION, e.toJsonString(maxErrorMessageLength)));
                 long ttl = apiLimitService.getLimit(tenantId, DefaultTenantProfileConfiguration::getRuleEngineExceptionsTtlDays);
                 ttl = TimeUnit.DAYS.toSeconds(ttl);
-                tsService.saveAndNotifyInternal(tenantId, getServiceAssetId(tenantId, queueName), Collections.singletonList(tsKv), ttl, CALLBACK);
+                tsService.saveAndNotifyInternal(tenantId, getQueueStatsId(tenantId, queueName), Collections.singletonList(tsKv), ttl, CALLBACK);
             } catch (Exception e2) {
                 if (!"Asset is referencing to non-existent tenant!".equalsIgnoreCase(e2.getMessage())) {
                     log.debug("[{}] Failed to store the statistics", tenantId, e2);
@@ -113,30 +112,30 @@ public class DefaultRuleEngineStatisticsService implements RuleEngineStatisticsS
         });
     }
 
-    private AssetId getServiceAssetId(TenantId tenantId, String queueName) {
+    private QueueStatsId getQueueStatsId(TenantId tenantId, String queueName) {
         TenantQueueKey key = new TenantQueueKey(tenantId, queueName);
-        AssetId assetId = tenantQueueAssets.get(key);
-        if (assetId == null) {
+        QueueStatsId queueStatsId = tenantQueueStats.get(key);
+        if (queueStatsId == null) {
             lock.lock();
             try {
-                assetId = tenantQueueAssets.get(key);
-                if (assetId == null) {
-                    Asset asset = assetService.findAssetByTenantIdAndName(tenantId, queueName + "_" + serviceInfoProvider.getServiceId());
-                    if (asset == null) {
-                        asset = new Asset();
-                        asset.setTenantId(tenantId);
-                        asset.setName(queueName + "_" + serviceInfoProvider.getServiceId());
-                        asset.setType(TB_SERVICE_QUEUE);
-                        asset = assetService.saveAsset(asset);
+                queueStatsId = tenantQueueStats.get(key);
+                if (queueStatsId == null) {
+                    QueueStats queueStats = queueStatsService.findByTenantIdAndNameAndServiceId(tenantId, queueName , serviceInfoProvider.getServiceId());
+                    if (queueStats == null) {
+                        queueStats = new QueueStats();
+                        queueStats.setTenantId(tenantId);
+                        queueStats.setQueueName(queueName);
+                        queueStats.setServiceId(serviceInfoProvider.getServiceId());
+                        queueStats = queueStatsService.save(tenantId, queueStats);
                     }
-                    assetId = asset.getId();
-                    tenantQueueAssets.put(key, assetId);
+                    queueStatsId = queueStats.getId();
+                    tenantQueueStats.put(key, queueStatsId);
                 }
             } finally {
                 lock.unlock();
             }
         }
-        return assetId;
+        return queueStatsId;
     }
 
     @Data
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java
index ff8b12a32f..2d8440fa20 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java
@@ -23,20 +23,9 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
-import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
-import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
-import org.thingsboard.server.common.data.kv.BooleanDataEntry;
-import org.thingsboard.server.common.data.kv.DataType;
-import org.thingsboard.server.common.data.kv.DoubleDataEntry;
-import org.thingsboard.server.common.data.kv.JsonDataEntry;
-import org.thingsboard.server.common.data.kv.KvEntry;
-import org.thingsboard.server.common.data.kv.LongDataEntry;
-import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.gen.transport.TransportProtos.KeyValueProto;
-import org.thingsboard.server.gen.transport.TransportProtos.KeyValueType;
 import org.thingsboard.server.gen.transport.TransportProtos.SubscriptionMgrMsgProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TbAlarmDeleteProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TbAlarmUpdateProto;
@@ -47,7 +36,6 @@ import org.thingsboard.server.gen.transport.TransportProtos.TbTimeSeriesDeletePr
 import org.thingsboard.server.gen.transport.TransportProtos.TbTimeSeriesUpdateProto;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreNotificationMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.TsKvProto;
 import org.thingsboard.server.service.ws.notification.sub.NotificationRequestUpdate;
 import org.thingsboard.server.service.ws.notification.sub.NotificationUpdate;
 import org.thingsboard.server.service.ws.notification.sub.NotificationsSubscriptionUpdate;
@@ -60,6 +48,10 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.UUID;
 
+import static org.thingsboard.server.common.util.KvProtoUtil.fromTsValueProtoList;
+import static org.thingsboard.server.common.util.KvProtoUtil.toTsKvProtoBuilder;
+import static org.thingsboard.server.common.util.KvProtoUtil.toTsValueProto;
+
 public class TbSubscriptionUtils {
 
     public static ToCoreMsg toSubEventProto(String serviceId, TbEntitySubEvent event) {
@@ -181,7 +173,7 @@ public class TbSubscriptionUtils {
         builder.setEntityIdLSB(entityId.getId().getLeastSignificantBits());
         builder.setTenantIdMSB(tenantId.getId().getMostSignificantBits());
         builder.setTenantIdLSB(tenantId.getId().getLeastSignificantBits());
-        ts.forEach(v -> builder.addData(toKeyValueProto(v.getTs(), v).build()));
+        ts.forEach(v -> builder.addData(toTsKvProtoBuilder(v.getTs(), v).build()));
         SubscriptionMgrMsgProto.Builder msgBuilder = SubscriptionMgrMsgProto.newBuilder();
         msgBuilder.setTsUpdate(builder);
         return ToCoreMsg.newBuilder().setToSubscriptionMgrMsg(msgBuilder.build()).build();
@@ -208,7 +200,7 @@ public class TbSubscriptionUtils {
         builder.setTenantIdMSB(tenantId.getId().getMostSignificantBits());
         builder.setTenantIdLSB(tenantId.getId().getLeastSignificantBits());
         builder.setScope(scope);
-        attributes.forEach(v -> builder.addData(toKeyValueProto(v.getLastUpdateTs(), v).build()));
+        attributes.forEach(v -> builder.addData(toTsKvProtoBuilder(v.getLastUpdateTs(), v).build()));
 
         SubscriptionMgrMsgProto.Builder msgBuilder = SubscriptionMgrMsgProto.newBuilder();
         msgBuilder.setAttrUpdate(builder);
@@ -231,123 +223,10 @@ public class TbSubscriptionUtils {
         return ToCoreMsg.newBuilder().setToSubscriptionMgrMsg(msgBuilder.build()).build();
     }
 
-    private static TsKvProto.Builder toKeyValueProto(long ts, KvEntry attr) {
-        KeyValueProto.Builder dataBuilder = KeyValueProto.newBuilder();
-        dataBuilder.setKey(attr.getKey());
-        dataBuilder.setType(KeyValueType.forNumber(attr.getDataType().ordinal()));
-        switch (attr.getDataType()) {
-            case BOOLEAN:
-                attr.getBooleanValue().ifPresent(dataBuilder::setBoolV);
-                break;
-            case LONG:
-                attr.getLongValue().ifPresent(dataBuilder::setLongV);
-                break;
-            case DOUBLE:
-                attr.getDoubleValue().ifPresent(dataBuilder::setDoubleV);
-                break;
-            case JSON:
-                attr.getJsonValue().ifPresent(dataBuilder::setJsonV);
-                break;
-            case STRING:
-                attr.getStrValue().ifPresent(dataBuilder::setStringV);
-                break;
-        }
-        return TsKvProto.newBuilder().setTs(ts).setKv(dataBuilder);
-    }
-
-    private static TransportProtos.TsValueProto toTsValueProto(long ts, KvEntry attr) {
-        TransportProtos.TsValueProto.Builder dataBuilder = TransportProtos.TsValueProto.newBuilder();
-        dataBuilder.setTs(ts);
-        dataBuilder.setType(KeyValueType.forNumber(attr.getDataType().ordinal()));
-        switch (attr.getDataType()) {
-            case BOOLEAN:
-                attr.getBooleanValue().ifPresent(dataBuilder::setBoolV);
-                break;
-            case LONG:
-                attr.getLongValue().ifPresent(dataBuilder::setLongV);
-                break;
-            case DOUBLE:
-                attr.getDoubleValue().ifPresent(dataBuilder::setDoubleV);
-                break;
-            case JSON:
-                attr.getJsonValue().ifPresent(dataBuilder::setJsonV);
-                break;
-            case STRING:
-                attr.getStrValue().ifPresent(dataBuilder::setStringV);
-                break;
-        }
-        return dataBuilder.build();
-    }
-
-
     public static EntityId toEntityId(String entityType, long entityIdMSB, long entityIdLSB) {
         return EntityIdFactory.getByTypeAndUuid(entityType, new UUID(entityIdMSB, entityIdLSB));
     }
 
-    public static List<TsKvEntry> toTsKvEntityList(List<TsKvProto> dataList) {
-        List<TsKvEntry> result = new ArrayList<>(dataList.size());
-        dataList.forEach(proto -> result.add(new BasicTsKvEntry(proto.getTs(), getKvEntry(proto.getKv()))));
-        return result;
-    }
-
-    public static List<AttributeKvEntry> toAttributeKvList(List<TsKvProto> dataList) {
-        List<AttributeKvEntry> result = new ArrayList<>(dataList.size());
-        dataList.forEach(proto -> result.add(new BaseAttributeKvEntry(getKvEntry(proto.getKv()), proto.getTs())));
-        return result;
-    }
-
-    private static KvEntry getKvEntry(KeyValueProto proto) {
-        KvEntry entry = null;
-        DataType type = DataType.values()[proto.getType().getNumber()];
-        switch (type) {
-            case BOOLEAN:
-                entry = new BooleanDataEntry(proto.getKey(), proto.getBoolV());
-                break;
-            case LONG:
-                entry = new LongDataEntry(proto.getKey(), proto.getLongV());
-                break;
-            case DOUBLE:
-                entry = new DoubleDataEntry(proto.getKey(), proto.getDoubleV());
-                break;
-            case STRING:
-                entry = new StringDataEntry(proto.getKey(), proto.getStringV());
-                break;
-            case JSON:
-                entry = new JsonDataEntry(proto.getKey(), proto.getJsonV());
-                break;
-        }
-        return entry;
-    }
-
-    public static List<TsKvEntry> toTsKvEntityList(String key, List<TransportProtos.TsValueProto> dataList) {
-        List<TsKvEntry> result = new ArrayList<>(dataList.size());
-        dataList.forEach(proto -> result.add(new BasicTsKvEntry(proto.getTs(), getKvEntry(key, proto))));
-        return result;
-    }
-
-    private static KvEntry getKvEntry(String key, TransportProtos.TsValueProto proto) {
-        KvEntry entry = null;
-        DataType type = DataType.values()[proto.getType().getNumber()];
-        switch (type) {
-            case BOOLEAN:
-                entry = new BooleanDataEntry(key, proto.getBoolV());
-                break;
-            case LONG:
-                entry = new LongDataEntry(key, proto.getLongV());
-                break;
-            case DOUBLE:
-                entry = new DoubleDataEntry(key, proto.getDoubleV());
-                break;
-            case STRING:
-                entry = new StringDataEntry(key, proto.getStringV());
-                break;
-            case JSON:
-                entry = new JsonDataEntry(key, proto.getJsonV());
-                break;
-        }
-        return entry;
-    }
-
     public static ToCoreMsg toAlarmUpdateProto(TenantId tenantId, EntityId entityId, AlarmInfo alarm) {
         TbAlarmUpdateProto.Builder builder = TbAlarmUpdateProto.newBuilder();
         builder.setEntityType(entityId.getEntityType().name());
@@ -405,7 +284,7 @@ public class TbSubscriptionUtils {
     public static List<TsKvEntry> fromProto(TransportProtos.TbSubUpdateProto proto) {
         List<TsKvEntry> result = new ArrayList<>();
         for (var p : proto.getDataList()) {
-            result.addAll(toTsKvEntityList(p.getKey(), p.getTsValueList()));
+            result.addAll(fromTsValueProtoList(p.getKey(), p.getTsValueList()));
         }
         return result;
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/DefaultEntitiesExportImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/DefaultEntitiesExportImportService.java
index 0aa71917d4..6df897c179 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/DefaultEntitiesExportImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/DefaultEntitiesExportImportService.java
@@ -101,7 +101,11 @@ public class DefaultEntitiesExportImportService implements EntitiesExportImportS
         ctx.putInternalId(exportData.getExternalId(), importResult.getSavedEntity().getId());
 
         ctx.addReferenceCallback(exportData.getExternalId(), importResult.getSaveReferencesCallback());
-        ctx.addEventCallback(importResult.getSendEventsCallback());
+        if (ctx.isRollbackOnError()) {
+            ctx.addEventCallback(importResult.getSendEventsCallback());
+        } else {
+            importResult.getSendEventsCallback().run();
+        }
         return importResult;
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/csv/AbstractBulkImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/csv/AbstractBulkImportService.java
index d4c80f730a..3890e5791d 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/csv/AbstractBulkImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/csv/AbstractBulkImportService.java
@@ -236,14 +236,14 @@ public abstract class AbstractBulkImportService<E extends HasId<? extends Entity
                 @Override
                 public void onSuccess(Void unused) {
                     entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null,
-                            null, ActionType.ATTRIBUTES_UPDATED, null, scope, attributes);
+                            null, ActionType.ATTRIBUTES_UPDATED, null, AttributeScope.valueOf(scope), attributes);
                 }
 
                 @Override
                 public void onFailure(Throwable throwable) {
                     entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null,
                             null, ActionType.ATTRIBUTES_UPDATED, BaseController.toException(throwable),
-                            scope, attributes);
+                            AttributeScope.valueOf(scope), attributes);
                     throw new RuntimeException(throwable);
                 }
 
@@ -301,18 +301,13 @@ public abstract class AbstractBulkImportService<E extends HasId<? extends Entity
         private final DataType dataType;
 
         public JsonPrimitive toJsonPrimitive() {
-            switch (dataType) {
-                case STRING:
-                    return new JsonPrimitive((String) value);
-                case LONG:
-                    return new JsonPrimitive((Long) value);
-                case DOUBLE:
-                    return new JsonPrimitive((Double) value);
-                case BOOLEAN:
-                    return new JsonPrimitive((Boolean) value);
-                default:
-                    return null;
-            }
+            return switch (dataType) {
+                case STRING -> new JsonPrimitive((String) value);
+                case LONG -> new JsonPrimitive((Long) value);
+                case DOUBLE -> new JsonPrimitive((Double) value);
+                case BOOLEAN -> new JsonPrimitive((Boolean) value);
+                default -> null;
+            };
         }
 
         public String stringValue() {
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java b/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
index 18969e4e0b..f81629c2fb 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
@@ -39,6 +39,7 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageDataIterable;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.sync.ie.EntityExportData;
 import org.thingsboard.server.common.data.sync.ie.EntityExportSettings;
@@ -89,6 +90,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
@@ -246,16 +248,18 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
         switch (request.getType()) {
             case SINGLE_ENTITY: {
                 SingleEntityVersionLoadRequest versionLoadRequest = (SingleEntityVersionLoadRequest) request;
+                ctx.setRollbackOnError(true);
                 VersionLoadConfig config = versionLoadRequest.getConfig();
                 ListenableFuture<EntityExportData> future = gitServiceQueue.getEntity(user.getTenantId(), request.getVersionId(), versionLoadRequest.getExternalEntityId());
                 DonAsynchron.withCallback(future,
-                        entityData -> doInTemplate(ctx, request, c -> loadSingleEntity(c, config, entityData)),
+                        entityData -> load(ctx, request, c -> loadSingleEntity(c, config, entityData)),
                         e -> processLoadError(ctx, e), executor);
                 break;
             }
             case ENTITY_TYPE: {
                 EntityTypeVersionLoadRequest versionLoadRequest = (EntityTypeVersionLoadRequest) request;
-                executor.submit(() -> doInTemplate(ctx, request, c -> loadMultipleEntities(c, versionLoadRequest)));
+                ctx.setRollbackOnError(versionLoadRequest.isRollbackOnError());
+                executor.submit(() -> load(ctx, request, c -> loadMultipleEntities(c, versionLoadRequest)));
                 break;
             }
             default:
@@ -265,19 +269,24 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
         return ctx.getRequestId();
     }
 
-    private <R> VersionLoadResult doInTemplate(EntitiesImportCtx ctx, VersionLoadRequest request, Function<EntitiesImportCtx, VersionLoadResult> function) {
+    private <R> VersionLoadResult load(EntitiesImportCtx ctx, VersionLoadRequest request, Function<EntitiesImportCtx, VersionLoadResult> loadFunction) {
         try {
-            VersionLoadResult result = transactionTemplate.execute(status -> {
-                try {
-                    return function.apply(ctx);
-                } catch (RuntimeException e) {
-                    throw e;
-                } catch (Exception e) {
-                    throw new RuntimeException(e); // to prevent UndeclaredThrowableException
+            VersionLoadResult result;
+            if (ctx.isRollbackOnError()) {
+                result = transactionTemplate.execute(status -> {
+                    try {
+                        return loadFunction.apply(ctx);
+                    } catch (RuntimeException e) {
+                        throw e;
+                    } catch (Exception e) {
+                        throw new RuntimeException(e); // to prevent UndeclaredThrowableException
+                    }
+                });
+                for (ThrowingRunnable eventCallback : ctx.getEventCallbacks()) {
+                    eventCallback.run();
                 }
-            });
-            for (ThrowingRunnable throwingRunnable : ctx.getEventCallbacks()) {
-                throwingRunnable.run();
+            } else {
+                result = loadFunction.apply(ctx);
             }
             result.setDone(true);
             return cachePut(ctx.getRequestId(), result);
@@ -324,7 +333,6 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
             sw.startNew("Entities " + entityType.name());
             ctx.setSettings(getEntityImportSettings(request, entityType));
             importEntities(ctx, entityType);
-            persistToCache(ctx);
         }
 
         sw.startNew("Reimport");
@@ -336,7 +344,6 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
                 .filter(entityType -> request.getEntityTypes().get(entityType).isRemoveOtherEntities())
                 .sorted(exportImportService.getEntityTypeComparatorForImport().reversed())
                 .forEach(entityType -> removeOtherEntities(ctx, entityType));
-        persistToCache(ctx);
 
         sw.startNew("References and Relations");
         exportImportService.saveReferencesAndRelations(ctx);
@@ -389,6 +396,8 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
                 ctx.getImportedEntities().computeIfAbsent(entityType, t -> new HashSet<>())
                         .add(importResult.getSavedEntity().getId());
             }
+
+            persistToCache(ctx);
             log.debug("Imported {} pack ({}) for tenant {}", entityType, entityDataList.size(), ctx.getTenantId());
             offset += limit;
         } while (entityDataList.size() == limit);
@@ -413,17 +422,34 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
     }
 
     private void removeOtherEntities(EntitiesImportCtx ctx, EntityType entityType) {
-        DaoUtil.processInBatches(pageLink -> {
-            return exportableEntitiesService.findEntitiesByTenantId(ctx.getTenantId(), entityType, pageLink);
-        }, 100, entity -> {
-            if (ctx.getImportedEntities().get(entityType) == null || !ctx.getImportedEntities().get(entityType).contains(entity.getId())) {
-                exportableEntitiesService.removeById(ctx.getTenantId(), entity.getId());
-
-                ctx.addEventCallback(() -> logEntityActionService.logEntityAction(ctx.getTenantId(), entity.getId(), entity, null,
-                        ActionType.DELETED, ctx.getUser()));
-                ctx.registerDeleted(entityType);
+        var entities = new PageDataIterable<>(link -> exportableEntitiesService.findEntitiesIdsByTenantId(ctx.getTenantId(), entityType, link), 100);
+        Set<EntityId> toRemove = new HashSet<>();
+        for (EntityId entityId : entities) {
+            if (ctx.getImportedEntities().get(entityType) == null || !ctx.getImportedEntities().get(entityType).contains(entityId)) {
+                toRemove.add(entityId);
             }
-        });
+        }
+
+        for (EntityId entityId : toRemove) {
+            ExportableEntity<EntityId> entity = exportableEntitiesService.findEntityById(entityId);
+            exportableEntitiesService.removeById(ctx.getTenantId(), entityId);
+
+            ThrowingRunnable callback = () -> {
+                logEntityActionService.logEntityAction(ctx.getTenantId(), entity.getId(), entity, null,
+                        ActionType.DELETED, ctx.getUser());
+            };
+            if (ctx.isRollbackOnError()) {
+                ctx.addEventCallback(callback);
+            } else {
+                try {
+                    callback.run();
+                } catch (ThingsboardException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+            ctx.registerDeleted(entityType);
+        }
+        persistToCache(ctx);
     }
 
     private VersionLoadResult onError(EntityId externalId, Throwable e) {
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/vc/data/EntitiesImportCtx.java b/application/src/main/java/org/thingsboard/server/service/sync/vc/data/EntitiesImportCtx.java
index 0f0e3313b8..19999ea080 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/vc/data/EntitiesImportCtx.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/vc/data/EntitiesImportCtx.java
@@ -58,6 +58,7 @@ public class EntitiesImportCtx {
     private boolean finalImportAttempt = false;
     private EntityImportSettings settings;
     private EntityImportResult<?> currentImportResult;
+    private boolean rollbackOnError;
 
     public EntitiesImportCtx(UUID requestId, User user, String versionId) {
         this(requestId, user, versionId, null);
diff --git a/application/src/main/java/org/thingsboard/server/service/ttl/rpc/RpcCleanUpService.java b/application/src/main/java/org/thingsboard/server/service/ttl/rpc/RpcCleanUpService.java
index c8683972d9..57ba35628c 100644
--- a/application/src/main/java/org/thingsboard/server/service/ttl/rpc/RpcCleanUpService.java
+++ b/application/src/main/java/org/thingsboard/server/service/ttl/rpc/RpcCleanUpService.java
@@ -68,7 +68,7 @@ public class RpcCleanUpService {
                     long ttl = TimeUnit.DAYS.toMillis(tenantProfileConfiguration.get().getRpcTtlDays());
                     long expirationTime = System.currentTimeMillis() - ttl;
 
-                    long totalRemoved = rpcDao.deleteOutdatedRpcByTenantId(tenantId, expirationTime);
+                    int totalRemoved = rpcDao.deleteOutdatedRpcByTenantId(tenantId, expirationTime);
 
                     if (totalRemoved > 0) {
                         log.info("Removed {} outdated rpc(s) for tenant {} older than {}", totalRemoved, tenantId, new Date(expirationTime));
diff --git a/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java b/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java
index f868a9d4f3..6fa9111c3d 100644
--- a/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java
+++ b/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java
@@ -51,6 +51,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import static org.thingsboard.server.common.data.notification.NotificationDeliveryMethod.WEB;
+
 @Service
 @TbCoreComponent
 @RequiredArgsConstructor
@@ -104,7 +106,7 @@ public class DefaultNotificationCommandsHandler implements NotificationCommandsH
     private void fetchUnreadNotifications(NotificationsSubscription subscription) {
         log.trace("[{}, subId: {}] Fetching unread notifications from DB", subscription.getSessionId(), subscription.getSubscriptionId());
         PageData<Notification> notifications = notificationService.findLatestUnreadNotificationsByRecipientId(subscription.getTenantId(),
-                (UserId) subscription.getEntityId(), subscription.getLimit());
+                WEB, (UserId) subscription.getEntityId(), subscription.getLimit());
         subscription.getLatestUnreadNotifications().clear();
         notifications.getData().forEach(notification -> {
             subscription.getLatestUnreadNotifications().put(notification.getUuidId(), notification);
@@ -114,7 +116,7 @@ public class DefaultNotificationCommandsHandler implements NotificationCommandsH
 
     private void fetchUnreadNotificationsCount(NotificationsCountSubscription subscription) {
         log.trace("[{}, subId: {}] Fetching unread notifications count from DB", subscription.getSessionId(), subscription.getSubscriptionId());
-        int unreadCount = notificationService.countUnreadNotificationsByRecipientId(subscription.getTenantId(), (UserId) subscription.getEntityId());
+        int unreadCount = notificationService.countUnreadNotificationsByRecipientId(subscription.getTenantId(), WEB, (UserId) subscription.getEntityId());
         subscription.getTotalUnreadCounter().set(unreadCount);
     }
 
@@ -235,7 +237,7 @@ public class DefaultNotificationCommandsHandler implements NotificationCommandsH
     @Override
     public void handleMarkAllAsReadCmd(WebSocketSessionRef sessionRef, MarkAllNotificationsAsReadCmd cmd) {
         SecurityUser securityCtx = sessionRef.getSecurityCtx();
-        notificationCenter.markAllNotificationsAsRead(securityCtx.getTenantId(), securityCtx.getId());
+        notificationCenter.markAllNotificationsAsRead(securityCtx.getTenantId(), WEB, securityCtx.getId());
     }
 
     @Override
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 521be28f84..608bdaf9ea 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -193,7 +193,7 @@ ui:
   # Help parameters
   help:
     # Base URL for UI help assets
-    base-url: "${UI_HELP_BASE_URL:https://raw.githubusercontent.com/thingsboard/thingsboard-ui-help/release-3.6.3}"
+    base-url: "${UI_HELP_BASE_URL:https://raw.githubusercontent.com/thingsboard/thingsboard-ui-help/release-3.7}"
 
 # Database telemetry parameters
 database:
@@ -866,6 +866,8 @@ js:
     monitor_thread_pool_size: "${LOCAL_JS_SANDBOX_MONITOR_THREAD_POOL_SIZE:4}"
     # Maximum CPU time in milliseconds allowed for script execution
     max_cpu_time: "${LOCAL_JS_SANDBOX_MAX_CPU_TIME:8000}"
+    # Maximum memory in Bytes which JS executor thread can allocate (approximate calculation). A zero memory limit in combination with a non-zero CPU limit is not recommended due to the implementation of Nashorn 0.4.2. 100MiB is effectively unlimited for most cases
+    max_memory: "${LOCAL_JS_SANDBOX_MAX_MEMORY:104857600}"
     # Maximum allowed JavaScript execution errors before JavaScript will be blacklisted
     max_errors: "${LOCAL_JS_SANDBOX_MAX_ERRORS:3}"
     # JS Eval max request timeout. 0 - no timeout
@@ -1289,11 +1291,17 @@ edges:
   rpc:
     # RPC port bind
     port: "${EDGES_RPC_PORT:7070}"
-    # Maximum time of keeping alive client RPC connection. Time in seconds
+    # Specifies the minimum amount of time that should elapse between keepalive pings sent by the client
+    # This prevents clients from sending pings too frequently, which can be a nuisance to the server (potentially even a denial-of-service attack vector if abused)
+    # If a client sends pings more frequently than this interval, the server may terminate the connection.
     client_max_keep_alive_time_sec: "${EDGES_RPC_CLIENT_MAX_KEEP_ALIVE_TIME_SEC:1}"
-    # Maximum time of keep-alive connection. Time in seconds
+    # Sets the time of inactivity (no read operations on the connection) after which the server will send a keepalive ping to the client.
+    # This is used to ensure that the connection is still alive and to prevent network intermediaries from dropping connections due to inactivity.
+    # It's a way for the server to proactively check if the client is still responsive.
     keep_alive_time_sec: "${EDGES_RPC_KEEP_ALIVE_TIME_SEC:10}"
-    # Timeout of keep alive RPC connection. Time in seconds
+    # Specifies the maximum amount of time the server waits for a response to its keepalive ping.
+    # If the ping is not acknowledged within this time frame, the server considers the connection dead and may close it.
+    # This timeout helps detect unresponsive clients.
     keep_alive_timeout_sec: "${EDGES_RPC_KEEP_ALIVE_TIMEOUT_SEC:5}"
     ssl:
       # Enable/disable SSL support
@@ -1304,6 +1312,8 @@ edges:
       private_key: "${EDGES_RPC_SSL_PRIVATE_KEY:privateKeyFile.pem}"
     # Maximum size (in bytes) of inbound messages the cloud can handle from the edge. By default, it can handle messages up to 4 Megabytes
     max_inbound_message_size: "${EDGES_RPC_MAX_INBOUND_MESSAGE_SIZE:4194304}"
+    # Maximum length of telemetry (time-series and attributes) message the cloud sends to the edge. By default, there is no limitation.
+    max_telemetry_message_size: "${EDGES_RPC_MAX_TELEMETRY_MESSAGE_SIZE:0}"
   storage:
     # Max records of edge event to read from DB and sent to the edge
     max_read_records_count: "${EDGES_STORAGE_MAX_READ_RECORDS_COUNT:50}"
@@ -1332,6 +1342,8 @@ springdoc:
 swagger:
   # General swagger match pattern of swagger UI links
   api_path: "${SWAGGER_API_PATH:/api/**}"
+  # General swagger match pattern path of swagger UI links
+  security_path_regex: "${SWAGGER_SECURITY_PATH_REGEX:/api/.*}"
   # Nonsecurity API path match pattern of swagger UI links
   non_security_path_regex: "${SWAGGER_NON_SECURITY_PATH_REGEX:/api/(?:noauth|v1)/.*}"
   # The title on the API doc UI page
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
index 49c26b5c38..e14b041e62 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -41,6 +41,8 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -112,6 +114,7 @@ import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.config.ThingsboardSecurityConfiguration;
 import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.device.ClaimDevicesService;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.service.entitiy.tenant.profile.TbTenantProfileService;
@@ -149,6 +152,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+import static org.thingsboard.server.common.data.CacheConstants.CLAIM_DEVICES_CACHE;
 
 @Slf4j
 public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
@@ -230,6 +234,9 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     @Autowired
     protected DefaultActorService actorService;
 
+    @Autowired
+    protected ClaimDevicesService claimDevicesService;
+
     @SpyBean
     protected MailService mailService;
 
@@ -1055,6 +1062,16 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         });
     }
 
+    protected void awaitForClaimingInfoToBeRegistered(DeviceId deviceId) {
+        CacheManager cacheManager = (CacheManager) ReflectionTestUtils.getField(claimDevicesService, "cacheManager");
+        Cache cache = cacheManager.getCache(CLAIM_DEVICES_CACHE);
+        Awaitility.await("Claiming request from the transport was registered").atMost(5, TimeUnit.SECONDS).until(() -> {
+            Cache.ValueWrapper value = cache.get(List.of(deviceId));
+            log.warn("device {}, claimingRequest registered: {}", deviceId, value);
+            return value != null;
+        });
+    }
+
     protected static String getMapName(FeatureType featureType) {
         switch (featureType) {
             case ATTRIBUTES:
diff --git a/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java
index b41c8c3e78..06d15ddb44 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java
@@ -29,6 +29,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.ContextConfiguration;
 import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.StringUtils;
@@ -45,16 +46,17 @@ import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.dao.asset.AssetDao;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.service.stats.DefaultRuleEngineStatisticsService;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
@@ -327,6 +329,53 @@ public class AssetControllerTest extends AbstractControllerTest {
                 .andExpect(statusReason(containsString(msgErrorNoFound("Alarm", alarm.getId().getId().toString()))));
     }
 
+    @Test
+    public void testDeleteAssetWithPropagatedAlarm() throws Exception {
+        Device device = new Device();
+        device.setTenantId(savedTenant.getTenantId());
+        device.setName("Test device");
+        device.setLabel("Label");
+        device.setType("default");
+        device = doPost("/api/device", device, Device.class);
+
+        Asset asset = new Asset();
+        asset.setName("My asset");
+        asset.setType("default");
+        asset = doPost("/api/asset", asset, Asset.class);
+
+        EntityRelation entityRelation = new EntityRelation(asset.getId(), device.getId(), "CONTAINS");
+        doPost("/api/relation", entityRelation);
+
+        //create alarm
+        Alarm alarm = Alarm.builder()
+                .tenantId(savedTenant.getTenantId())
+                .originator(device.getId())
+                .severity(AlarmSeverity.CRITICAL)
+                .type("test_type")
+                .propagate(true)
+                .build();
+
+        alarm = doPost("/api/alarm", alarm, Alarm.class);
+        Assert.assertNotNull(alarm);
+
+        PageData<AlarmInfo> deviceAlarms = doGetTyped("/api/alarm/DEVICE/" + device.getUuidId() + "?page=0&pageSize=10", new TypeReference<>() {
+        });
+        assertThat(deviceAlarms.getData()).hasSize(1);
+
+        PageData<AlarmInfo> assetAlarms = doGetTyped("/api/alarm/ASSET/" + asset.getUuidId() + "?page=0&pageSize=10", new TypeReference<>() {
+        });
+        assertThat(assetAlarms.getData()).hasSize(1);
+
+        //delete asset
+        doDelete("/api/asset/" + asset.getId().getId().toString())
+                .andExpect(status().isOk());
+
+        //check device alarms
+        PageData<AlarmInfo> deviceAlarmsAfterAssetDeletion = doGetTyped("/api/alarm/DEVICE/" + device.getUuidId() + "?page=0&pageSize=10", new TypeReference<PageData<AlarmInfo>>() {
+        });
+        assertThat(deviceAlarmsAfterAssetDeletion.getData()).hasSize(1);
+    }
+
     @Test
     public void testDeleteAssetAssignedToEntityView() throws Exception {
         Asset asset1 = new Asset();
@@ -567,8 +616,6 @@ public class AssetControllerTest extends AbstractControllerTest {
                 savedTenant.getId(), tenantAdmin.getCustomerId(), tenantAdmin.getId(), tenantAdmin.getEmail(),
                 ActionType.ADDED, cntEntity, cntEntity, cntEntity);
 
-        loadedAssets.removeIf(asset -> asset.getType().equals(DefaultRuleEngineStatisticsService.TB_SERVICE_QUEUE));
-
         assets.sort(idComparator);
         loadedAssets.sort(idComparator);
 
diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java
index 772a3c5ecb..b0a6db944c 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java
@@ -25,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
@@ -34,12 +33,13 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.queue.ProcessingStrategy;
 import org.thingsboard.server.common.data.queue.ProcessingStrategyType;
 import org.thingsboard.server.common.data.queue.Queue;
+import org.thingsboard.server.common.data.queue.QueueStats;
 import org.thingsboard.server.common.data.queue.SubmitStrategy;
 import org.thingsboard.server.common.data.queue.SubmitStrategyType;
 import org.thingsboard.server.common.msg.queue.RuleEngineException;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.stats.StatsFactory;
-import org.thingsboard.server.dao.asset.AssetService;
+import org.thingsboard.server.dao.queue.QueueStatsService;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.timeseries.TimeseriesDao;
 import org.thingsboard.server.gen.transport.TransportProtos;
@@ -50,6 +50,7 @@ import org.thingsboard.server.service.queue.processing.TbRuleEngineProcessingRes
 import org.thingsboard.server.service.stats.DefaultRuleEngineStatisticsService;
 import org.thingsboard.server.service.stats.RuleEngineStatisticsService;
 
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -66,7 +67,6 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.thingsboard.server.dao.asset.BaseAssetService.TB_SERVICE_QUEUE;
 
 @DaoSqlTest
 @TestPropertySource(properties = {
@@ -81,7 +81,7 @@ public class BaseQueueControllerTest extends AbstractControllerTest {
     @SpyBean
     private TimeseriesDao timeseriesDao;
     @Autowired
-    private AssetService assetService;
+    private QueueStatsService queueStatsService;
 
     @Test
     public void testQueueWithServiceTypeRE() throws Exception {
@@ -176,16 +176,17 @@ public class BaseQueueControllerTest extends AbstractControllerTest {
         });
         ruleEngineStatisticsService.reportQueueStats(System.currentTimeMillis(), testStats);
 
-        Asset serviceAsset = assetService.findAssetsByTenantIdAndType(tenantId, TB_SERVICE_QUEUE, new PageLink(100)).getData()
-                .stream().filter(asset -> asset.getName().startsWith(queue.getName()))
-                .findFirst().get();
+        List<QueueStats> queueStatsList = queueStatsService.findByTenantId(tenantId);
+        assertThat(queueStatsList).hasSize(1);
+        QueueStats queueStats = queueStatsList.get(0);
+        assertThat(queueStats.getQueueName()).isEqualTo(queue.getName());
 
         ArgumentCaptor<Long> ttlCaptor = ArgumentCaptor.forClass(Long.class);
-        verify(timeseriesDao).save(eq(tenantId), eq(serviceAsset.getId()), argThat(tsKvEntry -> {
+        verify(timeseriesDao).save(eq(tenantId), eq(queueStats.getId()), argThat(tsKvEntry -> {
             return tsKvEntry.getKey().equals(TbRuleEngineConsumerStats.SUCCESSFUL_MSGS) &&
                     tsKvEntry.getLongValue().get().equals(5L);
         }), ttlCaptor.capture());
-        verify(timeseriesDao).save(eq(tenantId), eq(serviceAsset.getId()), argThat(tsKvEntry -> {
+        verify(timeseriesDao).save(eq(tenantId), eq(queueStats.getId()), argThat(tsKvEntry -> {
             return tsKvEntry.getKey().equals(TbRuleEngineConsumerStats.FAILED_MSGS) &&
                     tsKvEntry.getLongValue().get().equals(5L);
         }), ttlCaptor.capture());
@@ -193,7 +194,7 @@ public class BaseQueueControllerTest extends AbstractControllerTest {
             assertThat(usedTtl).isEqualTo(TimeUnit.DAYS.toSeconds(queueStatsTtlDays));
         });
 
-        verify(timeseriesDao).save(eq(tenantId), eq(serviceAsset.getId()), argThat(tsKvEntry -> {
+        verify(timeseriesDao).save(eq(tenantId), eq(queueStats.getId()), argThat(tsKvEntry -> {
             return tsKvEntry.getKey().equals(DefaultRuleEngineStatisticsService.RULE_ENGINE_EXCEPTION) &&
                     tsKvEntry.getJsonValue().get().equals(ruleEngineException.toJsonString(0));
         }), ttlCaptor.capture());
diff --git a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
index 61d86994eb..73a3a2e25e 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
@@ -76,6 +76,7 @@ import org.thingsboard.server.gen.edge.v1.CustomerUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.EdgeVersion;
+import org.thingsboard.server.gen.edge.v1.OAuth2UpdateMsg;
 import org.thingsboard.server.gen.edge.v1.QueueUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.RuleChainUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.SyncCompletedMsg;
@@ -631,7 +632,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
         List<Edge> loadedEdges = new ArrayList<>();
         PageLink pageLink = new PageLink(23);
-        PageData<Edge> pageData = null;
+        PageData<Edge> pageData;
         do {
             pageData = doGetTypedWithPageLink("/api/customer/" + customerId.getId().toString() + "/edges?",
                     new TypeReference<>() {
@@ -885,6 +886,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
         EdgeImitator edgeImitator = new EdgeImitator(EDGE_HOST, EDGE_PORT, edge.getRoutingKey(), edge.getSecret());
         edgeImitator.ignoreType(UserCredentialsUpdateMsg.class);
+        edgeImitator.ignoreType(OAuth2UpdateMsg.class);
 
         edgeImitator.expectMessageAmount(24);
         edgeImitator.connect();
@@ -973,8 +975,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
     private boolean popQueueMsg(List<AbstractMessage> messages, UpdateMsgType msgType, String name) {
         for (AbstractMessage message : messages) {
-            if (message instanceof QueueUpdateMsg) {
-                QueueUpdateMsg queueUpdateMsg = (QueueUpdateMsg) message;
+            if (message instanceof QueueUpdateMsg queueUpdateMsg) {
                 Queue queue = JacksonUtil.fromString(queueUpdateMsg.getEntity(), Queue.class, true);
                 Assert.assertNotNull(queue);
                 if (msgType.equals(queueUpdateMsg.getMsgType()) && name.equals(queue.getName())) {
@@ -988,8 +989,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
     private boolean popRuleChainMsg(List<AbstractMessage> messages, UpdateMsgType msgType, String name) {
         for (AbstractMessage message : messages) {
-            if (message instanceof RuleChainUpdateMsg) {
-                RuleChainUpdateMsg ruleChainUpdateMsg = (RuleChainUpdateMsg) message;
+            if (message instanceof RuleChainUpdateMsg ruleChainUpdateMsg) {
                 RuleChain ruleChain = JacksonUtil.fromString(ruleChainUpdateMsg.getEntity(), RuleChain.class, true);
                 Assert.assertNotNull(ruleChain);
                 if (msgType.equals(ruleChainUpdateMsg.getMsgType())
@@ -1005,8 +1005,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
     private boolean popAdminSettingsMsg(List<AbstractMessage> messages, String key) {
         for (AbstractMessage message : messages) {
-            if (message instanceof AdminSettingsUpdateMsg) {
-                AdminSettingsUpdateMsg adminSettingsUpdateMsg = (AdminSettingsUpdateMsg) message;
+            if (message instanceof AdminSettingsUpdateMsg adminSettingsUpdateMsg) {
                 AdminSettings adminSettings = JacksonUtil.fromString(adminSettingsUpdateMsg.getEntity(), AdminSettings.class, true);
                 Assert.assertNotNull(adminSettings);
                 if (key.equals(adminSettings.getKey())) {
@@ -1020,8 +1019,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
     private boolean popDeviceProfileMsg(List<AbstractMessage> messages, UpdateMsgType msgType, String name) {
         for (AbstractMessage message : messages) {
-            if (message instanceof DeviceProfileUpdateMsg) {
-                DeviceProfileUpdateMsg deviceProfileUpdateMsg = (DeviceProfileUpdateMsg) message;
+            if (message instanceof DeviceProfileUpdateMsg deviceProfileUpdateMsg) {
                 DeviceProfile deviceProfile = JacksonUtil.fromString(deviceProfileUpdateMsg.getEntity(), DeviceProfile.class, true);
                 Assert.assertNotNull(deviceProfile);
                 if (msgType.equals(deviceProfileUpdateMsg.getMsgType())
@@ -1036,8 +1034,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
     private boolean popDeviceMsg(List<AbstractMessage> messages, UpdateMsgType msgType, String name) {
         for (AbstractMessage message : messages) {
-            if (message instanceof DeviceUpdateMsg) {
-                DeviceUpdateMsg deviceUpdateMsg = (DeviceUpdateMsg) message;
+            if (message instanceof DeviceUpdateMsg deviceUpdateMsg) {
                 Device device = JacksonUtil.fromString(deviceUpdateMsg.getEntity(), Device.class, true);
                 Assert.assertNotNull(device);
                 if (msgType.equals(deviceUpdateMsg.getMsgType())
@@ -1052,8 +1049,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
     private boolean popAssetProfileMsg(List<AbstractMessage> messages, UpdateMsgType msgType, String name) {
         for (AbstractMessage message : messages) {
-            if (message instanceof AssetProfileUpdateMsg) {
-                AssetProfileUpdateMsg assetProfileUpdateMsg = (AssetProfileUpdateMsg) message;
+            if (message instanceof AssetProfileUpdateMsg assetProfileUpdateMsg) {
                 AssetProfile assetProfile = JacksonUtil.fromString(assetProfileUpdateMsg.getEntity(), AssetProfile.class, true);
                 Assert.assertNotNull(assetProfile);
                 if (msgType.equals(assetProfileUpdateMsg.getMsgType())
@@ -1068,8 +1064,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
     private boolean popAssetMsg(List<AbstractMessage> messages, UpdateMsgType msgType, String name) {
         for (AbstractMessage message : messages) {
-            if (message instanceof AssetUpdateMsg) {
-                AssetUpdateMsg assetUpdateMsg = (AssetUpdateMsg) message;
+            if (message instanceof AssetUpdateMsg assetUpdateMsg) {
                 Asset asset = JacksonUtil.fromString(assetUpdateMsg.getEntity(), Asset.class, true);
                 Assert.assertNotNull(asset);
                 if (msgType.equals(assetUpdateMsg.getMsgType())
@@ -1084,8 +1079,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
     private boolean popUserMsg(List<AbstractMessage> messages, UpdateMsgType msgType, String email, Authority authority) {
         for (AbstractMessage message : messages) {
-            if (message instanceof UserUpdateMsg) {
-                UserUpdateMsg userUpdateMsg = (UserUpdateMsg) message;
+            if (message instanceof UserUpdateMsg userUpdateMsg) {
                 User user = JacksonUtil.fromString(userUpdateMsg.getEntity(), User.class, true);
                 Assert.assertNotNull(user);
                 if (msgType.equals(userUpdateMsg.getMsgType())
@@ -1101,8 +1095,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
     private boolean popCustomerMsg(List<AbstractMessage> messages, UpdateMsgType msgType, String title) {
         for (AbstractMessage message : messages) {
-            if (message instanceof CustomerUpdateMsg) {
-                CustomerUpdateMsg customerUpdateMsg = (CustomerUpdateMsg) message;
+            if (message instanceof CustomerUpdateMsg customerUpdateMsg) {
                 Customer customer = JacksonUtil.fromString(customerUpdateMsg.getEntity(), Customer.class, true);
                 Assert.assertNotNull(customer);
                 if (msgType.equals(customerUpdateMsg.getMsgType())
@@ -1117,8 +1110,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
     private boolean popTenantMsg(List<AbstractMessage> messages, TenantId tenantId1) {
         for (AbstractMessage message : messages) {
-            if (message instanceof TenantUpdateMsg) {
-                TenantUpdateMsg tenantUpdateMsg = (TenantUpdateMsg) message;
+            if (message instanceof TenantUpdateMsg tenantUpdateMsg) {
                 Tenant tenant = JacksonUtil.fromString(tenantUpdateMsg.getEntity(), Tenant.class, true);
                 Assert.assertNotNull(tenant);
                 if (UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE.equals(tenantUpdateMsg.getMsgType())
@@ -1133,8 +1125,7 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
     private boolean popTenantProfileMsg(List<AbstractMessage> messages, TenantProfileId tenantProfileId) {
         for (AbstractMessage message : messages) {
-            if (message instanceof TenantProfileUpdateMsg) {
-                TenantProfileUpdateMsg tenantProfileUpdateMsg = (TenantProfileUpdateMsg) message;
+            if (message instanceof TenantProfileUpdateMsg tenantProfileUpdateMsg) {
                 TenantProfile tenantProfile = JacksonUtil.fromString(tenantProfileUpdateMsg.getEntity(), TenantProfile.class, true);
                 Assert.assertNotNull(tenantProfile);
                 if (UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE.equals(tenantProfileUpdateMsg.getMsgType())
@@ -1236,4 +1227,5 @@ public class EdgeControllerTest extends AbstractControllerTest {
         edgeUpgradeInstructionsService.setAppVersion("3.6.2.6");
         Assert.assertTrue(edgeUpgradeInstructionsService.isUpgradeAvailable(savedEdge.getTenantId(), savedEdge.getId()));
     }
+
 }
diff --git a/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java
index 67ad2cbe55..8de8514e5b 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java
@@ -22,11 +22,13 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.web.servlet.ResultActions;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.Alarm;
@@ -51,10 +53,13 @@ import org.thingsboard.server.common.data.query.FilterPredicateValue;
 import org.thingsboard.server.common.data.query.KeyFilter;
 import org.thingsboard.server.common.data.query.NumericFilterPredicate;
 import org.thingsboard.server.common.data.query.TsValue;
+import org.thingsboard.server.common.data.queue.QueueStats;
 import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.dao.queue.QueueStatsService;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -69,6 +74,9 @@ public class EntityQueryControllerTest extends AbstractControllerTest {
     private Tenant savedTenant;
     private User tenantAdmin;
 
+    @Autowired
+    private QueueStatsService queueStatsService;
+
     @Before
     public void beforeTest() throws Exception {
         loginSysAdmin();
@@ -593,4 +601,47 @@ public class EntityQueryControllerTest extends AbstractControllerTest {
         assertThat(getErrorMessage(result)).contains("Invalid").contains("sort property");
     }
 
+    @Test
+    public void testFindQueueStatsEntitiesByQuery() throws Exception {
+        List<QueueStats> queueStatsList = new ArrayList<>();
+        for (int i = 0; i < 97; i++) {
+            QueueStats queueStats = new QueueStats();
+            queueStats.setQueueName(StringUtils.randomAlphabetic(5));
+            queueStats.setServiceId(StringUtils.randomAlphabetic(5));
+            queueStats.setTenantId(savedTenant.getTenantId());
+            queueStatsList.add(queueStatsService.save(savedTenant.getId(), queueStats));
+            Thread.sleep(1);
+        }
+
+        EntityTypeFilter entityTypeFilter = new EntityTypeFilter();
+        entityTypeFilter.setEntityType(EntityType.QUEUE_STATS);
+
+        EntityDataSortOrder sortOrder = new EntityDataSortOrder(
+                new EntityKey(EntityKeyType.ENTITY_FIELD, "queueName"), EntityDataSortOrder.Direction.ASC
+        );
+        EntityDataPageLink pageLink = new EntityDataPageLink(10, 0, null, sortOrder);
+        List<EntityKey> entityFields = Arrays.asList(new EntityKey(EntityKeyType.ENTITY_FIELD, "queueName"),
+                new EntityKey(EntityKeyType.ENTITY_FIELD, "serviceId"));
+
+        EntityDataQuery query = new EntityDataQuery(entityTypeFilter, pageLink, entityFields, null, null);
+
+        PageData<EntityData> data =
+                doPostWithTypedResponse("/api/entitiesQuery/find", query, new TypeReference<PageData<EntityData>>() {
+                });
+
+        Assert.assertEquals(97, data.getTotalElements());
+        Assert.assertEquals(10, data.getTotalPages());
+        Assert.assertTrue(data.hasNext());
+        Assert.assertEquals(10, data.getData().size());
+        data.getData().forEach(entityData -> {
+            assertThat(entityData.getLatest().get(EntityKeyType.ENTITY_FIELD).get("queueName")).asString().isNotBlank();
+            assertThat(entityData.getLatest().get(EntityKeyType.ENTITY_FIELD).get("serviceId")).asString().isNotBlank();
+        });
+
+        EntityCountQuery countQuery = new EntityCountQuery(entityTypeFilter);
+
+        Long count = doPostWithResponse("/api/entitiesQuery/count", countQuery, Long.class);
+        Assert.assertEquals(97, count.longValue());
+    }
+
 }
diff --git a/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java b/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
index 8b0854983a..717c17d437 100644
--- a/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
@@ -494,7 +494,7 @@ public class HomePageApiTest extends AbstractControllerTest {
     }
 
     private OAuth2Info createDefaultOAuth2Info() {
-        return new OAuth2Info(true, Lists.newArrayList(
+        return new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("domain").scheme(SchemeType.MIXED).build()
diff --git a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
index cd47988658..63747d2c19 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
@@ -663,7 +663,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         savedDifferentTenant.setTenantProfileId(tenantProfile.getId());
         savedDifferentTenant = doPost("/api/tenant", savedDifferentTenant, Tenant.class);
         TenantId tenantId = differentTenantId;
-        await().atMost(10, TimeUnit.SECONDS)
+        await().atMost(30, TimeUnit.SECONDS)
                 .until(() -> {
                     TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_RULE_ENGINE, MAIN_QUEUE_NAME, tenantId, tenantId);
                     return !tpi.getTenantId().get().isSysTenantId();
@@ -677,7 +677,7 @@ public class TenantControllerTest extends AbstractControllerTest {
         tenantProfile.setIsolatedTbRuleEngine(false);
         tenantProfile.getProfileData().setQueueConfiguration(Collections.emptyList());
         tenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
-        await().atMost(10, TimeUnit.SECONDS)
+        await().atMost(30, TimeUnit.SECONDS)
                 .until(() -> partitionService.resolve(ServiceType.TB_RULE_ENGINE, MAIN_QUEUE_NAME, tenantId, tenantId)
                         .getTenantId().get().isSysTenantId());
 
@@ -689,11 +689,11 @@ public class TenantControllerTest extends AbstractControllerTest {
             submittedMsgs.add(tbMsg.getId());
             Thread.sleep(timeLeft / msgs);
         }
-        await().atMost(15, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             verify(queueAdmin, times(1)).deleteTopic(eq(isolatedTopic));
         });
 
-        await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
             for (UUID msgId : submittedMsgs) {
                 verify(actorContext).tell(argThat(msg -> {
                     return msg instanceof QueueToRuleEngineMsg && ((QueueToRuleEngineMsg) msg).getMsg().getId().equals(msgId);
@@ -718,13 +718,13 @@ public class TenantControllerTest extends AbstractControllerTest {
         savedDifferentTenant.setTenantProfileId(tenantProfile.getId());
         savedDifferentTenant = doPost("/api/tenant", savedDifferentTenant, Tenant.class);
         TenantId tenantId = differentTenantId;
-        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(partitionService.getMyPartitions(new QueueKey(ServiceType.TB_RULE_ENGINE, tenantId))).isNotNull();
         });
         TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_RULE_ENGINE, tenantId, tenantId);
         assertThat(tpi.getTenantId()).hasValue(tenantId);
         TbMsg tbMsg = publishTbMsg(tenantId, tpi);
-        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             verify(actorContext).tell(argThat(msg -> {
                 return msg instanceof QueueToRuleEngineMsg && ((QueueToRuleEngineMsg) msg).getMsg().getId().equals(tbMsg.getId());
             }));
@@ -732,7 +732,7 @@ public class TenantControllerTest extends AbstractControllerTest {
 
         deleteDifferentTenant();
 
-        await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(partitionService.getMyPartitions(new QueueKey(ServiceType.TB_RULE_ENGINE, tenantId))).isNull();
             assertThatThrownBy(() -> partitionService.resolve(ServiceType.TB_RULE_ENGINE, tenantId, tenantId))
                     .isInstanceOf(TenantNotFoundException.class);
@@ -752,7 +752,7 @@ public class TenantControllerTest extends AbstractControllerTest {
     }
 
     private void verifyUsedQueueAndMessage(String queue, TenantId tenantId, EntityId entityId, String msgType, Runnable action, Consumer<TopicPartitionInfo> tpiAssert) {
-        await().atMost(15, TimeUnit.SECONDS)
+        await().atMost(30, TimeUnit.SECONDS)
                 .untilAsserted(() -> {
                     TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_RULE_ENGINE, queue, tenantId, entityId);
                     tpiAssert.accept(tpi);
diff --git a/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
index d9c35826d4..72930e0327 100644
--- a/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
@@ -1109,13 +1109,14 @@ public class UserControllerTest extends AbstractControllerTest {
 
     private List<UserEmailInfo> getUsersInfo(PageLink pageLink) throws Exception {
         List<UserEmailInfo> loadedCustomerUsers = new ArrayList<>();
-        PageData<UserEmailInfo> pageData = null;
+        PageData<UserEmailInfo> pageData;
         do {
             pageData = doGetTypedWithPageLink("/api/users/info?", new TypeReference<>() {
             }, pageLink);
             loadedCustomerUsers.addAll(pageData.getData());
             if (pageData.hasNext()) {
                 pageLink = pageLink.nextPageLink();
+                Assert.assertEquals(pageLink.getPageSize(), pageData.getData().size());
             }
         } while (pageData.hasNext());
         return loadedCustomerUsers;
diff --git a/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
index 0787d08fa7..e7f664477c 100644
--- a/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
@@ -63,6 +63,7 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.oauth2.OAuth2Info;
 import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.page.PageData;
@@ -85,6 +86,7 @@ import org.thingsboard.server.gen.edge.v1.CustomerUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.EdgeConfiguration;
+import org.thingsboard.server.gen.edge.v1.OAuth2UpdateMsg;
 import org.thingsboard.server.gen.edge.v1.QueueUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.RuleChainMetadataRequestMsg;
 import org.thingsboard.server.gen.edge.v1.RuleChainMetadataUpdateMsg;
@@ -140,6 +142,7 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
         installation();
 
         edgeImitator = new EdgeImitator("localhost", 7070, edge.getRoutingKey(), edge.getSecret());
+        edgeImitator.ignoreType(OAuth2UpdateMsg.class);
         edgeImitator.expectMessageAmount(21);
         edgeImitator.connect();
 
@@ -538,6 +541,18 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
         Assert.assertTrue(customer.isPublic());
     }
 
+    private void validateOAuth2() throws Exception {
+        Optional<OAuth2UpdateMsg> oAuth2UpdateMsgOpt = edgeImitator.findMessageByType(OAuth2UpdateMsg.class);
+        Assert.assertTrue(oAuth2UpdateMsgOpt.isPresent());
+        OAuth2UpdateMsg oAuth2UpdateMsg = oAuth2UpdateMsgOpt.get();
+        OAuth2Info oAuth2Info = JacksonUtil.fromString(oAuth2UpdateMsg.getEntity(), OAuth2Info.class, true);
+        Assert.assertNotNull(oAuth2Info);
+        OAuth2Info auth2Info = doGet("/api/oauth2/config", OAuth2Info.class);
+        Assert.assertNotNull(auth2Info);
+        Assert.assertEquals(oAuth2Info, auth2Info);
+        testAutoGeneratedCodeByProtobuf(oAuth2UpdateMsg);
+    }
+
     private void validateSyncCompleted() {
         Optional<SyncCompletedMsg> syncCompletedMsgOpt = edgeImitator.findMessageByType(SyncCompletedMsg.class);
         Assert.assertTrue(syncCompletedMsgOpt.isPresent());
diff --git a/application/src/test/java/org/thingsboard/server/edge/NotificationEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/NotificationEdgeTest.java
new file mode 100644
index 0000000000..890ec00913
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/edge/NotificationEdgeTest.java
@@ -0,0 +1,290 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.edge;
+
+import com.google.protobuf.AbstractMessage;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.test.context.TestPropertySource;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
+import org.thingsboard.server.common.data.notification.NotificationType;
+import org.thingsboard.server.common.data.notification.rule.EscalatedNotificationRuleRecipientsConfig;
+import org.thingsboard.server.common.data.notification.rule.NotificationRule;
+import org.thingsboard.server.common.data.notification.rule.trigger.config.AlarmNotificationRuleTriggerConfig;
+import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
+import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
+import org.thingsboard.server.common.data.notification.targets.platform.PlatformUsersNotificationTargetConfig;
+import org.thingsboard.server.common.data.notification.targets.platform.TenantAdministratorsFilter;
+import org.thingsboard.server.common.data.notification.template.DeliveryMethodNotificationTemplate;
+import org.thingsboard.server.common.data.notification.template.EmailDeliveryMethodNotificationTemplate;
+import org.thingsboard.server.common.data.notification.template.HasSubject;
+import org.thingsboard.server.common.data.notification.template.MobileAppDeliveryMethodNotificationTemplate;
+import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
+import org.thingsboard.server.common.data.notification.template.NotificationTemplateConfig;
+import org.thingsboard.server.common.data.notification.template.SmsDeliveryMethodNotificationTemplate;
+import org.thingsboard.server.common.data.notification.template.WebDeliveryMethodNotificationTemplate;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.gen.edge.v1.NotificationRuleUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTargetUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTemplateUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@DaoSqlTest
+public class NotificationEdgeTest extends AbstractEdgeTest {
+
+    @Test
+    public void testNotificationTemplate() throws Exception {
+        // create notification template
+        edgeImitator.expectMessageAmount(1);
+        NotificationDeliveryMethod[] deliveryMethods = new NotificationDeliveryMethod[]{
+                NotificationDeliveryMethod.WEB
+        };
+        NotificationTemplate template = createNotificationTemplate(NotificationType.GENERAL, deliveryMethods);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        AbstractMessage latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof NotificationTemplateUpdateMsg);
+        NotificationTemplateUpdateMsg notificationTemplateUpdateMsg = (NotificationTemplateUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, notificationTemplateUpdateMsg.getMsgType());
+        NotificationTemplate notificationTemplate = JacksonUtil.fromString(notificationTemplateUpdateMsg.getEntity(), NotificationTemplate.class, true);
+        Assert.assertNotNull(notificationTemplate);
+        Assert.assertEquals(template.getId(), notificationTemplate.getId());
+        Assert.assertEquals(template.getName(), notificationTemplate.getName());
+        Assert.assertEquals(template.getNotificationType(), notificationTemplate.getNotificationType());
+
+        // update notification template
+        edgeImitator.expectMessageAmount(1);
+        template.setName(StringUtils.randomAlphanumeric(15));
+        saveNotificationTemplate(template);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof NotificationTemplateUpdateMsg);
+        notificationTemplateUpdateMsg = (NotificationTemplateUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE, notificationTemplateUpdateMsg.getMsgType());
+        notificationTemplate = JacksonUtil.fromString(notificationTemplateUpdateMsg.getEntity(), NotificationTemplate.class, true);
+        Assert.assertNotNull(notificationTemplate);
+        Assert.assertEquals(template.getId(), notificationTemplate.getId());
+        Assert.assertEquals(template.getName(), notificationTemplate.getName());
+        Assert.assertEquals(template.getNotificationType(), notificationTemplate.getNotificationType());
+
+        // delete notification template
+        edgeImitator.expectMessageAmount(1);
+        doDelete("/api/notification/template/" + notificationTemplate.getUuidId())
+                .andExpect(status().isOk());
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof NotificationTemplateUpdateMsg);
+        notificationTemplateUpdateMsg = (NotificationTemplateUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE, notificationTemplateUpdateMsg.getMsgType());
+        Assert.assertEquals(notificationTemplate.getUuidId().getMostSignificantBits(), notificationTemplateUpdateMsg.getIdMSB());
+        Assert.assertEquals(notificationTemplate.getUuidId().getLeastSignificantBits(), notificationTemplateUpdateMsg.getIdLSB());
+    }
+
+    @Test
+    public void testNotificationTarget() throws Exception {
+        // create notification target
+        edgeImitator.expectMessageAmount(1);
+        NotificationTarget target = createNotificationTarget();
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        AbstractMessage latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof NotificationTargetUpdateMsg);
+        NotificationTargetUpdateMsg notificationTargetUpdateMsg = (NotificationTargetUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, notificationTargetUpdateMsg.getMsgType());
+        NotificationTarget notificationTarget = JacksonUtil.fromString(notificationTargetUpdateMsg.getEntity(), NotificationTarget.class, true);
+        Assert.assertNotNull(notificationTarget);
+        Assert.assertEquals(target, notificationTarget);
+
+        // update notification target
+        edgeImitator.expectMessageAmount(1);
+        target.setName(StringUtils.randomAlphanumeric(15));
+        target = saveNotificationTarget(target);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof NotificationTargetUpdateMsg);
+        notificationTargetUpdateMsg = (NotificationTargetUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE, notificationTargetUpdateMsg.getMsgType());
+        notificationTarget = JacksonUtil.fromString(notificationTargetUpdateMsg.getEntity(), NotificationTarget.class, true);
+        Assert.assertNotNull(notificationTarget);
+        Assert.assertEquals(target, notificationTarget);
+
+        // delete notification target
+        edgeImitator.expectMessageAmount(1);
+        doDelete("/api/notification/target/" + notificationTarget.getUuidId())
+                .andExpect(status().isOk());
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof NotificationTargetUpdateMsg);
+        notificationTargetUpdateMsg = (NotificationTargetUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE, notificationTargetUpdateMsg.getMsgType());
+        Assert.assertEquals(notificationTarget.getUuidId().getMostSignificantBits(), notificationTargetUpdateMsg.getIdMSB());
+        Assert.assertEquals(notificationTarget.getUuidId().getLeastSignificantBits(), notificationTargetUpdateMsg.getIdLSB());
+    }
+
+    @Test
+    public void testNotificationRule() throws Exception {
+        // create notification template for notification rule
+        edgeImitator.expectMessageAmount(1);
+        NotificationDeliveryMethod[] deliveryMethods = new NotificationDeliveryMethod[]{
+                NotificationDeliveryMethod.WEB, NotificationDeliveryMethod.EMAIL
+        };
+        NotificationTemplate template = createNotificationTemplate(NotificationType.EDGE_CONNECTION, deliveryMethods);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        AbstractMessage latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof NotificationTemplateUpdateMsg);
+        NotificationTemplateUpdateMsg notificationTemplateUpdateMsg = (NotificationTemplateUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, notificationTemplateUpdateMsg.getMsgType());
+        NotificationTemplate notificationTemplate = JacksonUtil.fromString(notificationTemplateUpdateMsg.getEntity(), NotificationTemplate.class, true);
+        Assert.assertNotNull(notificationTemplate);
+        Assert.assertEquals(template.getId(), notificationTemplate.getId());
+        Assert.assertEquals(template.getName(), notificationTemplate.getName());
+        Assert.assertEquals(template.getNotificationType(), notificationTemplate.getNotificationType());
+
+        // create notification rule
+        edgeImitator.expectMessageAmount(1);
+        NotificationRule rule = createNotificationRule(template);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof NotificationRuleUpdateMsg);
+        NotificationRuleUpdateMsg notificationRuleUpdateMsg = (NotificationRuleUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, notificationRuleUpdateMsg.getMsgType());
+        NotificationRule notificationRule = JacksonUtil.fromString(notificationRuleUpdateMsg.getEntity(), NotificationRule.class, true);
+        Assert.assertNotNull(notificationRule);
+        Assert.assertEquals(rule, notificationRule);
+
+        // update notification rule
+        edgeImitator.expectMessageAmount(1);
+        rule.setEnabled(false);
+        rule = saveNotificationRule(rule);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof NotificationRuleUpdateMsg);
+        notificationRuleUpdateMsg = (NotificationRuleUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE, notificationRuleUpdateMsg.getMsgType());
+        notificationRule = JacksonUtil.fromString(notificationRuleUpdateMsg.getEntity(), NotificationRule.class, true);
+        Assert.assertNotNull(notificationRule);
+        Assert.assertEquals(rule, notificationRule);
+
+        // delete notification rule
+        edgeImitator.expectMessageAmount(1);
+        doDelete("/api/notification/rule/" + notificationRule.getUuidId())
+                .andExpect(status().isOk());
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof NotificationRuleUpdateMsg);
+        notificationRuleUpdateMsg = (NotificationRuleUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE, notificationRuleUpdateMsg.getMsgType());
+        Assert.assertEquals(notificationRule.getUuidId().getMostSignificantBits(), notificationRuleUpdateMsg.getIdMSB());
+        Assert.assertEquals(notificationRule.getUuidId().getLeastSignificantBits(), notificationRuleUpdateMsg.getIdLSB());
+
+        // delete notification template
+        edgeImitator.expectMessageAmount(1);
+        doDelete("/api/notification/template/" + notificationTemplate.getUuidId())
+                .andExpect(status().isOk());
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof NotificationTemplateUpdateMsg);
+        notificationTemplateUpdateMsg = (NotificationTemplateUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE, notificationTemplateUpdateMsg.getMsgType());
+        Assert.assertEquals(notificationTemplate.getUuidId().getMostSignificantBits(), notificationTemplateUpdateMsg.getIdMSB());
+        Assert.assertEquals(notificationTemplate.getUuidId().getLeastSignificantBits(), notificationTemplateUpdateMsg.getIdLSB());
+    }
+
+    private NotificationTemplate createNotificationTemplate(NotificationType notificationType, NotificationDeliveryMethod... deliveryMethods) {
+        NotificationTemplate notificationTemplate = new NotificationTemplate();
+        notificationTemplate.setTenantId(tenantId);
+        notificationTemplate.setName(StringUtils.randomAlphanumeric(15));
+        notificationTemplate.setNotificationType(notificationType);
+        NotificationTemplateConfig config = new NotificationTemplateConfig();
+        config.setDeliveryMethodsTemplates(new HashMap<>());
+        for (NotificationDeliveryMethod deliveryMethod : deliveryMethods) {
+            DeliveryMethodNotificationTemplate deliveryMethodNotificationTemplate;
+            switch (deliveryMethod) {
+                case WEB -> deliveryMethodNotificationTemplate = new WebDeliveryMethodNotificationTemplate();
+                case EMAIL -> deliveryMethodNotificationTemplate = new EmailDeliveryMethodNotificationTemplate();
+                case SMS -> deliveryMethodNotificationTemplate = new SmsDeliveryMethodNotificationTemplate();
+                case MOBILE_APP -> deliveryMethodNotificationTemplate = new MobileAppDeliveryMethodNotificationTemplate();
+                default -> throw new IllegalArgumentException("Unsupported delivery method " + deliveryMethod);
+            }
+            deliveryMethodNotificationTemplate.setEnabled(true);
+            deliveryMethodNotificationTemplate.setBody("Test text");
+            if (deliveryMethodNotificationTemplate instanceof HasSubject) {
+                ((HasSubject) deliveryMethodNotificationTemplate).setSubject("Test subject");
+            }
+            config.getDeliveryMethodsTemplates().put(deliveryMethod, deliveryMethodNotificationTemplate);
+        }
+        notificationTemplate.setConfiguration(config);
+        return saveNotificationTemplate(notificationTemplate);
+    }
+
+    private NotificationTarget createNotificationTarget() {
+        NotificationTarget notificationTarget = new NotificationTarget();
+        notificationTarget.setTenantId(tenantId);
+        notificationTarget.setName("Test target");
+
+        PlatformUsersNotificationTargetConfig targetConfig = new PlatformUsersNotificationTargetConfig();
+        TenantAdministratorsFilter tenantAdministratorsFilter = new TenantAdministratorsFilter();
+        tenantAdministratorsFilter.setTenantsIds(Set.of());
+        tenantAdministratorsFilter.setTenantProfilesIds(Set.of());
+        targetConfig.setUsersFilter(tenantAdministratorsFilter);
+        notificationTarget.setConfiguration(targetConfig);
+        return saveNotificationTarget(notificationTarget);
+    }
+
+    private NotificationRule createNotificationRule(NotificationTemplate notificationTemplate) {
+        NotificationRule notificationRule = new NotificationRule();
+        notificationRule.setName("Web notification on any alarm");
+        notificationRule.setEnabled(true);
+        notificationRule.setTemplateId(notificationTemplate.getId());
+        notificationRule.setTriggerType(NotificationRuleTriggerType.ALARM);
+
+        AlarmNotificationRuleTriggerConfig triggerConfig = new AlarmNotificationRuleTriggerConfig();
+        triggerConfig.setAlarmTypes(null);
+        triggerConfig.setAlarmSeverities(null);
+        triggerConfig.setNotifyOn(Set.of(AlarmNotificationRuleTriggerConfig.AlarmAction.CREATED, AlarmNotificationRuleTriggerConfig.AlarmAction.SEVERITY_CHANGED, AlarmNotificationRuleTriggerConfig.AlarmAction.ACKNOWLEDGED, AlarmNotificationRuleTriggerConfig.AlarmAction.CLEARED));
+        notificationRule.setTriggerConfig(triggerConfig);
+
+        EscalatedNotificationRuleRecipientsConfig recipientsConfig = new EscalatedNotificationRuleRecipientsConfig();
+        recipientsConfig.setTriggerType(NotificationRuleTriggerType.ALARM);
+        Map<Integer, List<UUID>> escalationTable = new HashMap<>();
+        escalationTable.put(Integer.valueOf("1"), new ArrayList<>());
+        recipientsConfig.setEscalationTable(escalationTable);
+        notificationRule.setRecipientsConfig(recipientsConfig);
+        return saveNotificationRule(notificationRule);
+    }
+
+    private NotificationTemplate saveNotificationTemplate(NotificationTemplate notificationTemplate) {
+        return doPost("/api/notification/template", notificationTemplate, NotificationTemplate.class);
+    }
+
+    private NotificationTarget saveNotificationTarget(NotificationTarget notificationTarget) {
+        return doPost("/api/notification/target", notificationTarget, NotificationTarget.class);
+    }
+
+    private NotificationRule saveNotificationRule(NotificationRule notificationRule) {
+        return doPost("/api/notification/rule", notificationRule, NotificationRule.class);
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/edge/OAuth2EdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/OAuth2EdgeTest.java
new file mode 100644
index 0000000000..c25410b562
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/edge/OAuth2EdgeTest.java
@@ -0,0 +1,113 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.edge;
+
+import com.google.common.collect.Lists;
+import com.google.protobuf.AbstractMessage;
+import org.junit.Assert;
+import org.junit.Test;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.oauth2.MapperType;
+import org.thingsboard.server.common.data.oauth2.OAuth2CustomMapperConfig;
+import org.thingsboard.server.common.data.oauth2.OAuth2DomainInfo;
+import org.thingsboard.server.common.data.oauth2.OAuth2Info;
+import org.thingsboard.server.common.data.oauth2.OAuth2MapperConfig;
+import org.thingsboard.server.common.data.oauth2.OAuth2ParamsInfo;
+import org.thingsboard.server.common.data.oauth2.OAuth2RegistrationInfo;
+import org.thingsboard.server.common.data.oauth2.SchemeType;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.gen.edge.v1.OAuth2UpdateMsg;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.UUID;
+
+@DaoSqlTest
+public class OAuth2EdgeTest extends AbstractEdgeTest {
+
+    @Test
+    public void testOAuth2Support() throws Exception {
+        loginSysAdmin();
+
+        // enable oauth
+        edgeImitator.allowIgnoredTypes();
+        edgeImitator.expectMessageAmount(1);
+        OAuth2Info oAuth2Info = createDefaultOAuth2Info();
+        oAuth2Info = doPost("/api/oauth2/config", oAuth2Info, OAuth2Info.class);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        AbstractMessage latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof OAuth2UpdateMsg);
+        OAuth2UpdateMsg oAuth2UpdateMsg = (OAuth2UpdateMsg) latestMessage;
+        OAuth2Info result = JacksonUtil.fromString(oAuth2UpdateMsg.getEntity(), OAuth2Info.class, true);
+        Assert.assertEquals(oAuth2Info, result);
+
+        // disable oauth support
+        edgeImitator.expectMessageAmount(1);
+        oAuth2Info.setEnabled(false);
+        oAuth2Info.setEdgeEnabled(false);
+        doPost("/api/oauth2/config", oAuth2Info, OAuth2Info.class);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof OAuth2UpdateMsg);
+        oAuth2UpdateMsg = (OAuth2UpdateMsg) latestMessage;
+        result = JacksonUtil.fromString(oAuth2UpdateMsg.getEntity(), OAuth2Info.class, true);
+        Assert.assertEquals(oAuth2Info, result);
+
+        edgeImitator.ignoreType(OAuth2UpdateMsg.class);
+        loginTenantAdmin();
+    }
+
+    private OAuth2Info createDefaultOAuth2Info() {
+        return new OAuth2Info(true, true, Lists.newArrayList(
+                OAuth2ParamsInfo.builder()
+                        .domainInfos(Lists.newArrayList(
+                                OAuth2DomainInfo.builder().name("domain").scheme(SchemeType.MIXED).build()
+                        ))
+                        .mobileInfos(Collections.emptyList())
+                        .clientRegistrations(Lists.newArrayList(
+                                validRegistrationInfo()
+                        ))
+                        .build()
+        ));
+    }
+
+    private OAuth2RegistrationInfo validRegistrationInfo() {
+        return OAuth2RegistrationInfo.builder()
+                .clientId(UUID.randomUUID().toString())
+                .clientSecret(UUID.randomUUID().toString())
+                .authorizationUri(UUID.randomUUID().toString())
+                .accessTokenUri(UUID.randomUUID().toString())
+                .scope(Arrays.asList(UUID.randomUUID().toString(), UUID.randomUUID().toString()))
+                .platforms(Collections.emptyList())
+                .userInfoUri(UUID.randomUUID().toString())
+                .userNameAttributeName(UUID.randomUUID().toString())
+                .jwkSetUri(UUID.randomUUID().toString())
+                .clientAuthenticationMethod(UUID.randomUUID().toString())
+                .loginButtonLabel(UUID.randomUUID().toString())
+                .mapperConfig(
+                        OAuth2MapperConfig.builder()
+                                .type(MapperType.CUSTOM)
+                                .custom(
+                                        OAuth2CustomMapperConfig.builder()
+                                                .url(UUID.randomUUID().toString())
+                                                .build()
+                                )
+                                .build()
+                )
+                .build();
+    }
+
+}
diff --git a/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java b/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
index 916e5790e9..d470ee686f 100644
--- a/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
+++ b/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
@@ -44,6 +44,10 @@ import org.thingsboard.server.gen.edge.v1.DownlinkResponseMsg;
 import org.thingsboard.server.gen.edge.v1.EdgeConfiguration;
 import org.thingsboard.server.gen.edge.v1.EntityDataProto;
 import org.thingsboard.server.gen.edge.v1.EntityViewUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationRuleUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTargetUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.NotificationTemplateUpdateMsg;
+import org.thingsboard.server.gen.edge.v1.OAuth2UpdateMsg;
 import org.thingsboard.server.gen.edge.v1.OtaPackageUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.QueueUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.RelationUpdateMsg;
@@ -73,16 +77,16 @@ import java.util.stream.Collectors;
 @Slf4j
 public class EdgeImitator {
 
-    private String routingKey;
-    private String routingSecret;
+    private final String routingKey;
+    private final String routingSecret;
 
-    private EdgeRpcClient edgeRpcClient;
+    private final EdgeRpcClient edgeRpcClient;
 
     private final Lock lock = new ReentrantLock();
 
     private CountDownLatch messagesLatch;
     private CountDownLatch responsesLatch;
-    private List<Class<? extends AbstractMessage>> ignoredTypes;
+    private final List<Class<? extends AbstractMessage>> ignoredTypes;
 
     @Setter
     private boolean randomFailuresOnTimeseriesDownlink = false;
@@ -92,7 +96,7 @@ public class EdgeImitator {
     @Getter
     private EdgeConfiguration configuration;
     @Getter
-    private List<AbstractMessage> downlinkMsgs;
+    private final List<AbstractMessage> downlinkMsgs;
 
     @Getter
     private UplinkResponseMsg latestResponseMsg;
@@ -314,6 +318,26 @@ public class EdgeImitator {
                 result.add(saveDownlinkMsg(resourceUpdateMsg));
             }
         }
+        if (downlinkMsg.getOAuth2UpdateMsgCount() > 0) {
+            for (OAuth2UpdateMsg oAuth2UpdateMsg : downlinkMsg.getOAuth2UpdateMsgList()) {
+                result.add(saveDownlinkMsg(oAuth2UpdateMsg));
+            }
+        }
+        if (downlinkMsg.getNotificationTemplateUpdateMsgCount() > 0) {
+            for (NotificationTemplateUpdateMsg notificationTemplateUpdateMsg : downlinkMsg.getNotificationTemplateUpdateMsgList()) {
+                result.add(saveDownlinkMsg(notificationTemplateUpdateMsg));
+            }
+        }
+        if (downlinkMsg.getNotificationRuleUpdateMsgCount() > 0) {
+            for (NotificationRuleUpdateMsg notificationRuleUpdateMsg : downlinkMsg.getNotificationRuleUpdateMsgList()) {
+                result.add(saveDownlinkMsg(notificationRuleUpdateMsg));
+            }
+        }
+        if (downlinkMsg.getNotificationTargetUpdateMsgCount() > 0) {
+            for (NotificationTargetUpdateMsg notificationTargetUpdateMsg : downlinkMsg.getNotificationTargetUpdateMsgList()) {
+                result.add(saveDownlinkMsg(notificationTargetUpdateMsg));
+            }
+        }
         if (downlinkMsg.hasEdgeConfiguration()) {
             result.add(saveDownlinkMsg(downlinkMsg.getEdgeConfiguration()));
         }
diff --git a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java
index ba8eda3879..9e4fd65ab4 100644
--- a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java
@@ -46,6 +46,10 @@ import org.thingsboard.server.dao.edge.EdgeEventService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.edge.EdgeSynchronizationManager;
 import org.thingsboard.server.dao.entityview.EntityViewService;
+import org.thingsboard.server.dao.notification.NotificationRuleService;
+import org.thingsboard.server.dao.notification.NotificationTargetService;
+import org.thingsboard.server.dao.notification.NotificationTemplateService;
+import org.thingsboard.server.dao.oauth2.OAuth2Service;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.queue.QueueService;
 import org.thingsboard.server.dao.relation.RelationService;
@@ -81,6 +85,8 @@ import org.thingsboard.server.service.edge.rpc.constructor.edge.EdgeMsgConstruct
 import org.thingsboard.server.service.edge.rpc.constructor.entityview.EntityViewMsgConstructorFactory;
 import org.thingsboard.server.service.edge.rpc.constructor.entityview.EntityViewMsgConstructorV1;
 import org.thingsboard.server.service.edge.rpc.constructor.entityview.EntityViewMsgConstructorV2;
+import org.thingsboard.server.service.edge.rpc.constructor.notification.NotificationMsgConstructor;
+import org.thingsboard.server.service.edge.rpc.constructor.oauth2.OAuth2MsgConstructor;
 import org.thingsboard.server.service.edge.rpc.constructor.ota.OtaPackageMsgConstructorFactory;
 import org.thingsboard.server.service.edge.rpc.constructor.ota.OtaPackageMsgConstructorV1;
 import org.thingsboard.server.service.edge.rpc.constructor.ota.OtaPackageMsgConstructorV2;
@@ -128,6 +134,8 @@ import org.thingsboard.server.service.edge.rpc.processor.device.profile.DevicePr
 import org.thingsboard.server.service.edge.rpc.processor.entityview.EntityViewProcessorFactory;
 import org.thingsboard.server.service.edge.rpc.processor.entityview.EntityViewProcessorV1;
 import org.thingsboard.server.service.edge.rpc.processor.entityview.EntityViewProcessorV2;
+import org.thingsboard.server.service.edge.rpc.processor.notification.NotificationEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.oauth2.OAuth2EdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.processor.relation.RelationEdgeProcessorFactory;
 import org.thingsboard.server.service.edge.rpc.processor.relation.RelationEdgeProcessorV1;
 import org.thingsboard.server.service.edge.rpc.processor.relation.RelationEdgeProcessorV2;
@@ -194,6 +202,15 @@ public abstract class BaseEdgeProcessorTest {
     @MockBean
     protected UserService userService;
 
+    @MockBean
+    protected NotificationRuleService notificationRuleService;
+
+    @MockBean
+    protected NotificationTargetService notificationTargetService;
+
+    @MockBean
+    protected NotificationTemplateService notificationTemplateService;
+
     @MockBean
     protected DeviceProfileService deviceProfileService;
 
@@ -239,6 +256,9 @@ public abstract class BaseEdgeProcessorTest {
     @MockBean
     protected ResourceService resourceService;
 
+    @MockBean
+    protected OAuth2Service oAuth2Service;
+
     @MockBean
     @Lazy
     protected TbQueueProducerProvider producerProvider;
@@ -360,6 +380,12 @@ public abstract class BaseEdgeProcessorTest {
     @MockBean
     protected WidgetMsgConstructorV2 widgetMsgConstructorV2;
 
+    @MockBean
+    protected NotificationMsgConstructor notificationMsgConstructor;
+
+    @MockBean
+    protected OAuth2MsgConstructor oAuth2MsgConstructor;
+
     @MockBean
     protected AlarmEdgeProcessorV1 alarmProcessorV1;
 
@@ -417,6 +443,12 @@ public abstract class BaseEdgeProcessorTest {
     @MockBean
     protected RelationEdgeProcessorV2 relationEdgeProcessorV2;
 
+    @MockBean
+    protected OAuth2EdgeProcessor oAuth2EdgeProcessor;
+
+    @MockBean
+    protected NotificationEdgeProcessor notificationEdgeProcessor;
+
     @SpyBean
     protected RuleChainMsgConstructorFactory ruleChainMsgConstructorFactory;
 
@@ -514,17 +546,18 @@ public abstract class BaseEdgeProcessorTest {
     }
 
     protected static Stream<Arguments> provideParameters() {
-        UUID dashoboardUUID = UUID.randomUUID();
-        UUID ruleChaindUUID = UUID.randomUUID();
+        UUID dashboardUUID = UUID.randomUUID();
+        UUID ruleChainUUID = UUID.randomUUID();
         return Stream.of(
                 Arguments.of(EdgeVersion.V_3_3_0, 0, 0, 0, 0),
                 Arguments.of(EdgeVersion.V_3_3_3, 0, 0, 0, 0),
                 Arguments.of(EdgeVersion.V_3_4_0, 0, 0, 0, 0),
                 Arguments.of(EdgeVersion.V_3_6_0,
-                        dashoboardUUID.getMostSignificantBits(),
-                        dashoboardUUID.getLeastSignificantBits(),
-                        ruleChaindUUID.getMostSignificantBits(),
-                        ruleChaindUUID.getLeastSignificantBits())
+                        dashboardUUID.getMostSignificantBits(),
+                        dashboardUUID.getLeastSignificantBits(),
+                        ruleChainUUID.getMostSignificantBits(),
+                        ruleChainUUID.getLeastSignificantBits())
         );
     }
+
 }
diff --git a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/TelemetryEdgeProcessorTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/TelemetryEdgeProcessorTest.java
index a6e28e7968..94714af463 100644
--- a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/TelemetryEdgeProcessorTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/TelemetryEdgeProcessorTest.java
@@ -16,27 +16,51 @@
 package org.thingsboard.server.service.edge.rpc.processor.telemetry;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.Mockito;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
+import org.thingsboard.server.service.edge.rpc.processor.BaseEdgeProcessorTest;
 
-@Slf4j
-@RunWith(MockitoJUnitRunner.class)
-public class TelemetryEdgeProcessorTest {
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {TelemetryEdgeProcessor.class})
+@TestPropertySource(properties = {
+        "edges.rpc.max_telemetry_message_size=1000"
+})
+public class TelemetryEdgeProcessorTest extends BaseEdgeProcessorTest {
+
+    @SpyBean
+    private TelemetryEdgeProcessor telemetryEdgeProcessor;
+
+    @MockBean
+    private NotificationRuleProcessor notificationRuleProcessor;
 
     @Test
-    public void testConvert_maxSizeLimit() throws Exception {
+    public void testConvert_maxSizeLimit() {
+        Edge edge = new Edge();
         EdgeEvent edgeEvent = new EdgeEvent();
         ObjectNode body = JacksonUtil.newObjectNode();
-        body.put("value", StringUtils.randomAlphanumeric(10000));
+        body.put("value", StringUtils.randomAlphanumeric(1000));
         edgeEvent.setBody(body);
-        DownlinkMsg downlinkMsg = new TelemetryEdgeProcessor().convertTelemetryEventToDownlink(edgeEvent);
+
+        DownlinkMsg downlinkMsg = telemetryEdgeProcessor.convertTelemetryEventToDownlink(edge, edgeEvent);
         Assert.assertNull(downlinkMsg);
+
+        verify(notificationRuleProcessor, Mockito.times(1)).process(any());
     }
+
 }
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java
index b945c162df..ae9dbe92c4 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java
@@ -145,7 +145,7 @@ public abstract class AbstractNotificationApiTest extends AbstractControllerTest
 
     protected NotificationRequest submitNotificationRequest(List<NotificationTargetId> targets, String text, int delayInSec, NotificationDeliveryMethod... deliveryMethods) {
         if (deliveryMethods.length == 0) {
-            deliveryMethods = new NotificationDeliveryMethod[]{NotificationDeliveryMethod.WEB};
+            deliveryMethods = new NotificationDeliveryMethod[]{NotificationDeliveryMethod.WEB, NotificationDeliveryMethod.MOBILE_APP};
         }
         NotificationTemplate notificationTemplate = createNotificationTemplate(DEFAULT_NOTIFICATION_TYPE, DEFAULT_NOTIFICATION_SUBJECT, text, deliveryMethods);
         return submitNotificationRequest(targets, notificationTemplate.getId(), delayInSec);
@@ -247,8 +247,12 @@ public abstract class AbstractNotificationApiTest extends AbstractControllerTest
     }
 
     protected List<Notification> getMyNotifications(boolean unreadOnly, int limit) throws Exception {
-        return doGetTypedWithPageLink("/api/notifications?unreadOnly={unreadOnly}&", new TypeReference<PageData<Notification>>() {},
-                new PageLink(limit, 0), unreadOnly).getData();
+        return getMyNotifications(NotificationDeliveryMethod.WEB, unreadOnly, limit);
+    }
+
+    protected List<Notification> getMyNotifications(NotificationDeliveryMethod deliveryMethod, boolean unreadOnly, int limit) throws Exception {
+        return doGetTypedWithPageLink("/api/notifications?unreadOnly={unreadOnly}&deliveryMethod={deliveryMethod}&", new TypeReference<PageData<Notification>>() {},
+                new PageLink(limit, 0), unreadOnly, deliveryMethod).getData();
     }
 
     protected NotificationRule createNotificationRule(NotificationRuleTriggerConfig triggerConfig, String subject, String text, NotificationTargetId... targets) {
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
index d3b79029ba..060af9eac1 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
@@ -37,6 +37,7 @@ import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmComment;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.NotificationRequestId;
 import org.thingsboard.server.common.data.id.NotificationRuleId;
@@ -52,6 +53,7 @@ import org.thingsboard.server.common.data.notification.NotificationRequestPrevie
 import org.thingsboard.server.common.data.notification.NotificationRequestStats;
 import org.thingsboard.server.common.data.notification.NotificationRequestStatus;
 import org.thingsboard.server.common.data.notification.NotificationType;
+import org.thingsboard.server.common.data.notification.info.AlarmCommentNotificationInfo;
 import org.thingsboard.server.common.data.notification.info.EntityActionNotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.trigger.config.AlarmCommentNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.settings.MobileAppNotificationDeliveryMethodConfig;
@@ -81,7 +83,6 @@ import org.thingsboard.server.common.data.notification.template.WebDeliveryMetho
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.dao.notification.DefaultNotifications;
-import org.thingsboard.server.dao.notification.NotificationDao;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.service.notification.channels.MicrosoftTeamsNotificationChannel;
 import org.thingsboard.server.service.ws.notification.cmd.UnreadNotificationsUpdate;
@@ -116,17 +117,25 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
     @Autowired
     private NotificationCenter notificationCenter;
     @Autowired
-    private NotificationDao notificationDao;
-    @Autowired
     private MicrosoftTeamsNotificationChannel microsoftTeamsNotificationChannel;
     @MockBean
     private FirebaseService firebaseService;
 
+    private static final String TEST_MOBILE_TOKEN = "tenantFcmToken";
+
     @Before
     public void beforeEach() throws Exception {
         loginCustomerUser();
         wsClient = getWsClient();
+
+        loginSysAdmin();
+        MobileAppNotificationDeliveryMethodConfig config = new MobileAppNotificationDeliveryMethodConfig();
+        config.setFirebaseServiceAccountCredentials("testCredentials");
+        saveNotificationSettings(config);
+
         loginTenantAdmin();
+        mobileToken = TEST_MOBILE_TOKEN;
+        doPost("/api/user/mobile/session", new MobileSessionInfo()).andExpect(status().isOk());
     }
 
     @Test
@@ -242,7 +251,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         int notificationsCount = 20;
         wsClient.registerWaitForUpdate(notificationsCount);
         for (int i = 1; i <= notificationsCount; i++) {
-            submitNotificationRequest(target.getId(), "Test " + i, NotificationDeliveryMethod.WEB);
+            submitNotificationRequest(target.getId(), "Test " + i, NotificationDeliveryMethod.WEB, NotificationDeliveryMethod.MOBILE_APP);
         }
         wsClient.waitForUpdate(true);
         assertThat(wsClient.getLastDataUpdate().getTotalUnreadCount()).isEqualTo(notificationsCount);
@@ -306,7 +315,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         NotificationTarget target = createNotificationTarget(savedDifferentTenantUser.getId());
         int notificationsCount = 20;
         for (int i = 0; i < notificationsCount; i++) {
-            NotificationRequest request = submitNotificationRequest(target.getId(), "Test " + i, NotificationDeliveryMethod.WEB);
+            NotificationRequest request = submitNotificationRequest(target.getId(), "Test " + i, NotificationDeliveryMethod.WEB, NotificationDeliveryMethod.MOBILE_APP);
             awaitNotificationRequest(request.getId());
         }
         List<NotificationRequest> requests = notificationRequestService.findNotificationRequestsByTenantIdAndOriginatorType(tenantId, EntityType.USER, new PageLink(100)).getData();
@@ -500,7 +509,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
     @Test
     public void testNotificationRequestInfo() throws Exception {
         NotificationDeliveryMethod[] deliveryMethods = new NotificationDeliveryMethod[]{
-                NotificationDeliveryMethod.WEB
+                NotificationDeliveryMethod.WEB, NotificationDeliveryMethod.MOBILE_APP
         };
         NotificationTemplate template = createNotificationTemplate(NotificationType.GENERAL, "Test subject", "Test text", deliveryMethods);
         NotificationTarget target = createNotificationTarget(tenantAdminUserId);
@@ -525,7 +534,6 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         await().atMost(2, TimeUnit.SECONDS)
                 .until(() -> findNotificationRequest(notificationRequest.getId()).isSent());
         NotificationRequestStats stats = getStats(notificationRequest.getId());
-
         assertThat(stats.getSent().get(NotificationDeliveryMethod.WEB)).hasValue(1);
     }
 
@@ -727,17 +735,12 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
 
     @Test
     public void testMobileAppNotifications() throws Exception {
-        loginSysAdmin();
-        MobileAppNotificationDeliveryMethodConfig config = new MobileAppNotificationDeliveryMethodConfig();
-        config.setFirebaseServiceAccountCredentials("testCredentials");
-        saveNotificationSettings(config);
-
         loginCustomerUser();
         mobileToken = "customerFcmToken";
         doPost("/api/user/mobile/session", new MobileSessionInfo()).andExpect(status().isOk());
 
         loginTenantAdmin();
-        mobileToken = "tenantFcmToken1";
+        mobileToken = TEST_MOBILE_TOKEN;
         doPost("/api/user/mobile/session", new MobileSessionInfo()).andExpect(status().isOk());
         mobileToken = "tenantFcmToken2";
         doPost("/api/user/mobile/session", new MobileSessionInfo()).andExpect(status().isOk());
@@ -746,7 +749,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
 
         loginTenantAdmin();
         NotificationTarget target = createNotificationTarget(new AllUsersFilter());
-        NotificationTemplate template = createNotificationTemplate(NotificationType.GENERAL, "Title", "Message", NotificationDeliveryMethod.MOBILE_APP);
+        NotificationTemplate template = createNotificationTemplate(NotificationType.GENERAL, "Title", "Message", NotificationDeliveryMethod.MOBILE_APP, NotificationDeliveryMethod.WEB);
         ((MobileAppDeliveryMethodNotificationTemplate) template.getConfiguration().getDeliveryMethodsTemplates().get(NotificationDeliveryMethod.MOBILE_APP))
                 .setAdditionalConfig(JacksonUtil.newObjectNode().set("test", JacksonUtil.newObjectNode().put("test", "test")));
         saveNotificationTemplate(template);
@@ -758,11 +761,19 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
                 .contains("doesn't use the mobile app");
 
         verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
-                eq("tenantFcmToken1"), eq("Title"), eq("Message"), argThat(data -> "test".equals(data.get("test.test"))));
+                eq(TEST_MOBILE_TOKEN), eq("Title"), eq("Message"), argThat(data -> "test".equals(data.get("test.test"))), eq(1));
         verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
-                eq("tenantFcmToken2"), eq("Title"), eq("Message"), argThat(data -> "test".equals(data.get("test.test"))));
+                eq("tenantFcmToken2"), eq("Title"), eq("Message"), argThat(data -> "test".equals(data.get("test.test"))), eq(1));
         verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
-                eq("customerFcmToken"), eq("Title"), eq("Message"), argThat(data -> "test".equals(data.get("test.test"))));
+                eq("customerFcmToken"), eq("Title"), eq("Message"), argThat(data -> "test".equals(data.get("test.test"))), eq(1));
+        assertThat(getMyNotifications(NotificationDeliveryMethod.MOBILE_APP, true, 10)).singleElement().satisfies(notification -> {
+            assertThat(notification.getDeliveryMethod()).isEqualTo(NotificationDeliveryMethod.MOBILE_APP);
+            assertThat(notification.getText()).isEqualTo("Message");
+            assertThat(notification.getSubject()).isEqualTo("Title");
+        });
+        assertThat(getMyNotifications(true, 10)).singleElement().satisfies(notification -> {
+            assertThat(notification.getDeliveryMethod()).isEqualTo(NotificationDeliveryMethod.WEB);
+        });
         verifyNoMoreInteractions(firebaseService);
         clearInvocations(firebaseService);
 
@@ -770,26 +781,24 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         request = submitNotificationRequest(List.of(target.getId()), template.getId(), 0);
         awaitNotificationRequest(request.getId());
         verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
-                eq("tenantFcmToken1"), eq("Title"), eq("Message"), anyMap());
+                eq(TEST_MOBILE_TOKEN), eq("Title"), eq("Message"), anyMap(), eq(2));
         verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
-                eq("customerFcmToken"), eq("Title"), eq("Message"), anyMap());
+                eq("customerFcmToken"), eq("Title"), eq("Message"), anyMap(), eq(2));
         verifyNoMoreInteractions(firebaseService);
+
+        Integer unreadCount = doGet("/api/notifications/unread/count", Integer.class);
+        assertThat(unreadCount).isEqualTo(2);
     }
 
     @Test
     public void testMobileAppNotifications_ruleBased() throws Exception {
-        loginSysAdmin();
-        MobileAppNotificationDeliveryMethodConfig config = new MobileAppNotificationDeliveryMethodConfig();
-        config.setFirebaseServiceAccountCredentials("testCredentials");
-        saveNotificationSettings(config);
-
         loginTenantAdmin();
-        mobileToken = "tenantFcmToken";
+        mobileToken = TEST_MOBILE_TOKEN;
         doPost("/api/user/mobile/session", new MobileSessionInfo()).andExpect(status().isOk());
 
         createNotificationRule(AlarmCommentNotificationRuleTriggerConfig.builder().onlyUserComments(true).build(),
                 DefaultNotifications.alarmComment.getSubject(), DefaultNotifications.alarmComment.getText(),
-                List.of(createNotificationTarget(tenantAdminUserId).getId()), NotificationDeliveryMethod.MOBILE_APP);
+                List.of(createNotificationTarget(tenantAdminUserId).getId()), NotificationDeliveryMethod.MOBILE_APP, NotificationDeliveryMethod.WEB);
 
         Device device = createDevice("test", "test");
         UUID alarmDashboardId = UUID.randomUUID();
@@ -802,18 +811,21 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
                         .put("dashboardId", alarmDashboardId.toString()))
                 .build();
         alarm = doPost("/api/alarm", alarm, Alarm.class);
+        AlarmId alarmId = alarm.getId();
 
         AlarmComment comment = new AlarmComment();
         comment.setComment(JacksonUtil.newObjectNode()
                 .put("text", "text"));
-        doPost("/api/alarm/" + alarm.getId() + "/comment", comment, AlarmComment.class);
+        doPost("/api/alarm/" + alarmId + "/comment", comment, AlarmComment.class);
 
+        String expectedSubject = "Comment on 'test' alarm";
+        String expectedBody = TENANT_ADMIN_EMAIL + " added comment: text";
         ArgumentCaptor<Map<String, String>> msgCaptor = ArgumentCaptor.forClass(Map.class);
         await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
-                    eq("tenantFcmToken"), eq("Comment on 'test' alarm"),
-                    eq(TENANT_ADMIN_EMAIL + " added comment: text"),
-                    msgCaptor.capture());
+                    eq(TEST_MOBILE_TOKEN), eq(expectedSubject),
+                    eq(expectedBody),
+                    msgCaptor.capture(), eq(1));
         });
         Map<String, String> firebaseMessageData = msgCaptor.getValue();
         assertThat(firebaseMessageData.keySet()).doesNotContainNull().doesNotContain("");
@@ -823,6 +835,14 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         assertThat(firebaseMessageData.get("onClick.enabled")).isEqualTo("true");
         assertThat(firebaseMessageData.get("onClick.linkType")).isEqualTo("DASHBOARD");
         assertThat(firebaseMessageData.get("onClick.dashboardId")).isEqualTo(alarmDashboardId.toString());
+
+        assertThat(getMyNotifications(NotificationDeliveryMethod.MOBILE_APP, true, 10)).singleElement().satisfies(notification -> {
+            assertThat(notification.getDeliveryMethod()).isEqualTo(NotificationDeliveryMethod.MOBILE_APP);
+            assertThat(notification.getSubject()).isEqualTo(expectedSubject);
+            assertThat(notification.getText()).isEqualTo(expectedBody);
+            assertThat(notification.getInfo()).asInstanceOf(type(AlarmCommentNotificationInfo.class))
+                    .matches(info -> info.getAlarmId().equals(alarmId.getId()) && info.getDashboardId().getId().equals(alarmDashboardId));
+        });
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/service/script/NashornJsInvokeServiceTest.java b/application/src/test/java/org/thingsboard/server/service/script/NashornJsInvokeServiceTest.java
index 55c521c309..28834a0ab7 100644
--- a/application/src/test/java/org/thingsboard/server/service/script/NashornJsInvokeServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/script/NashornJsInvokeServiceTest.java
@@ -15,23 +15,29 @@
  */
 package org.thingsboard.server.service.script;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.test.context.TestPropertySource;
-import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.common.util.TbStopWatch;
 import org.thingsboard.script.api.ScriptType;
 import org.thingsboard.script.api.js.NashornJsInvokeService;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.controller.AbstractControllerTest;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.thingsboard.server.common.data.msg.TbMsgType.POST_TELEMETRY_REQUEST;
 
@@ -41,8 +47,9 @@ import static org.thingsboard.server.common.data.msg.TbMsgType.POST_TELEMETRY_RE
         "js.max_script_body_size=50",
         "js.max_total_args_size=50",
         "js.max_result_size=50",
-        "js.local.max_errors=2"
+        "js.local.max_errors=2",
 })
+@Slf4j
 class NashornJsInvokeServiceTest extends AbstractControllerTest {
 
     @Autowired
@@ -56,23 +63,64 @@ class NashornJsInvokeServiceTest extends AbstractControllerTest {
         int iterations = 1000;
         UUID scriptId = evalScript("return msg.temperature > 20");
         // warmup
-        ObjectNode msg = JacksonUtil.newObjectNode();
-        for (int i = 0; i < 100; i++) {
-            msg.put("temperature", i);
+        log.info("Warming up 1000 times...");
+        var warmupWatch = TbStopWatch.create();
+        for (int i = 0; i < 1000; i++) {
             boolean expected = i > 20;
-            boolean result = Boolean.valueOf(invokeScript(scriptId, JacksonUtil.toString(msg)));
+            boolean result = Boolean.parseBoolean(invokeScript(scriptId, "{\"temperature\":" + i + "}"));
             Assert.assertEquals(expected, result);
         }
-        long startTs = System.currentTimeMillis();
+        log.info("Warming up finished in {} ms", warmupWatch.stopAndGetTotalTimeMillis());
+        log.info("Starting performance test...");
+        var watch = TbStopWatch.create();
         for (int i = 0; i < iterations; i++) {
-            msg.put("temperature", i);
             boolean expected = i > 20;
-            boolean result = Boolean.valueOf(invokeScript(scriptId, JacksonUtil.toString(msg)));
+            boolean result = Boolean.parseBoolean(invokeScript(scriptId, "{\"temperature\":" + i + "}"));
+            log.debug("asserting result");
             Assert.assertEquals(expected, result);
         }
-        long duration = System.currentTimeMillis() - startTs;
-        System.out.println(iterations + " invocations took: " + duration + "ms");
-        Assert.assertTrue(duration < TimeUnit.MINUTES.toMillis(4));
+        long duration = watch.stopAndGetTotalTimeMillis();
+        log.info("Performance test with {} invocations took: {} ms", iterations, duration);
+        assertThat(duration).as("duration ms")
+                .isLessThan(TimeUnit.MINUTES.toMillis(1)); // effective exec time is about 500ms
+    }
+
+    @Test
+    void givenSimpleScriptMultiThreadTestPerformance() throws ExecutionException, InterruptedException, TimeoutException {
+        int iterations = 1000*4;
+        List<ListenableFuture<Object>> futures = new ArrayList<>(iterations);
+        UUID scriptId = evalScript("return msg.temperature > 20 ;");
+        // warmup
+        log.info("Warming up 1000 times...");
+
+        var warmupWatch = TbStopWatch.create();
+        for (int i = 0; i < 1000; i++) {
+            futures.add(invokeScriptAsync(scriptId, "{\"temperature\":" + i + "}"));
+        }
+        List<Object> results = Futures.allAsList(futures).get(1, TimeUnit.MINUTES);
+        for (int i = 0; i < 1000; i++) {
+            boolean expected = i > 20;
+            boolean result = Boolean.parseBoolean(results.get(i).toString());
+            Assert.assertEquals(expected, result);
+        }
+        log.info("Warming up finished in {} ms", warmupWatch.stopAndGetTotalTimeMillis());
+        futures.clear();
+
+        log.info("Starting performance test...");
+        var watch = TbStopWatch.create();
+        for (int i = 0; i < iterations; i++) {
+            futures.add(invokeScriptAsync(scriptId, "{\"temperature\":" + i + "}"));
+        }
+        results = Futures.allAsList(futures).get(1, TimeUnit.MINUTES);
+        for (int i = 0; i < iterations; i++) {
+            boolean expected = i > 20;
+            boolean result = Boolean.parseBoolean(results.get(i).toString());
+            Assert.assertEquals(expected, result);
+        }
+        long duration = watch.stopAndGetTotalTimeMillis();
+        log.info("Performance test with {} invocations took: {} ms", iterations, duration);
+        assertThat(duration).as("duration ms")
+                .isLessThan(TimeUnit.MINUTES.toMillis(1)); // effective exec time is about 500ms
     }
 
     @Test
@@ -122,7 +170,11 @@ class NashornJsInvokeServiceTest extends AbstractControllerTest {
     }
 
     private String invokeScript(UUID scriptId, String msg) throws ExecutionException, InterruptedException {
-        return invokeService.invokeScript(TenantId.SYS_TENANT_ID, null, scriptId, msg, "{}", POST_TELEMETRY_REQUEST.name()).get().toString();
+        return invokeScriptAsync(scriptId, msg).get().toString();
+    }
+
+    private ListenableFuture<Object> invokeScriptAsync(UUID scriptId, String msg) {
+        return invokeService.invokeScript(TenantId.SYS_TENANT_ID, null, scriptId, msg, "{}", POST_TELEMETRY_REQUEST.name());
     }
 
 }
diff --git a/application/src/test/java/org/thingsboard/server/service/sql/SequentialTimeseriesPersistenceTest.java b/application/src/test/java/org/thingsboard/server/service/sql/SequentialTimeseriesPersistenceTest.java
index 7f1df3fdd1..5cae75ef0d 100644
--- a/application/src/test/java/org/thingsboard/server/service/sql/SequentialTimeseriesPersistenceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/sql/SequentialTimeseriesPersistenceTest.java
@@ -147,7 +147,7 @@ public class SequentialTimeseriesPersistenceTest extends AbstractControllerTest
     void checkDiffBetweenLatestTsForDevicesAndAsset(List<Device> devices, Asset asset) throws ExecutionException, InterruptedException, TimeoutException {
         TsKvEntry assetTsKvEntry = getTsKvLatest(asset.getId(), GENERIC_CUMULATIVE_OBJ);
         Assert.assertTrue(assetTsKvEntry.getJsonValue().isPresent());
-        JsonObject assetJsonObject = new JsonParser().parse(assetTsKvEntry.getJsonValue().get()).getAsJsonObject();
+        JsonObject assetJsonObject = JsonParser.parseString(assetTsKvEntry.getJsonValue().get()).getAsJsonObject();
         for (Device device : devices) {
             Long assetValue = assetJsonObject.get(device.getName()).getAsLong();
             TsKvEntry deviceLatest = getTsKvLatest(device.getId(), TOTALIZER);
@@ -182,7 +182,7 @@ public class SequentialTimeseriesPersistenceTest extends AbstractControllerTest
     JsonObject getJsonObject(String key, long value, Optional<String> tsKvEntryOpt) {
         JsonObject jsonObject = new JsonObject();
         if (tsKvEntryOpt.isPresent()) {
-            jsonObject = new JsonParser().parse(tsKvEntryOpt.get()).getAsJsonObject();
+            jsonObject = JsonParser.parseString(tsKvEntryOpt.get()).getAsJsonObject();
         }
         jsonObject.addProperty(key, value);
         return jsonObject;
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesIntegrationTest.java
index a7de7eb571..9ac2d5fc11 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesIntegrationTest.java
@@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.eclipse.californium.core.server.resources.Resource;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.coapserver.DefaultCoapServerService;
@@ -60,15 +59,11 @@ public class CoapAttributesUpdatesIntegrationTest extends AbstractCoapAttributes
         processAfterTest();
     }
 
-
-
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
         processJsonTestSubscribeToAttributesUpdates(false);
     }
 
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testSubscribeToAttributesUpdatesFromTheServerWithEmptyCurrentStateNotification() throws Exception {
         processJsonTestSubscribeToAttributesUpdates(true);
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesJsonIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesJsonIntegrationTest.java
index 4755ba134d..3fa625796c 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesJsonIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesJsonIntegrationTest.java
@@ -18,7 +18,6 @@ package org.thingsboard.server.transport.coap.attributes.updates;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.common.data.CoapDeviceType;
 import org.thingsboard.server.common.data.TransportPayloadType;
@@ -45,12 +44,11 @@ public class CoapAttributesUpdatesJsonIntegrationTest extends AbstractCoapAttrib
         processAfterTest();
     }
 
-    @Ignore  // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
         processJsonTestSubscribeToAttributesUpdates(false);
     }
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
+
     @Test
     public void testSubscribeToAttributesUpdatesFromTheServerWithEmptyCurrentStateNotification() throws Exception {
         processJsonTestSubscribeToAttributesUpdates(true);
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesProtoIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesProtoIntegrationTest.java
index 1c9589bba9..4b07c8dcc2 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesProtoIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/attributes/updates/CoapAttributesUpdatesProtoIntegrationTest.java
@@ -18,7 +18,6 @@ package org.thingsboard.server.transport.coap.attributes.updates;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.common.data.CoapDeviceType;
 import org.thingsboard.server.common.data.TransportPayloadType;
@@ -44,12 +43,10 @@ public class CoapAttributesUpdatesProtoIntegrationTest extends AbstractCoapAttri
     public void afterTest() throws Exception {
         processAfterTest();
     }
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testSubscribeToAttributesUpdatesFromTheServer() throws Exception {
         processProtoTestSubscribeToAttributesUpdates(false);
     }
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testSubscribeToAttributesUpdatesFromTheServerWithEmptyCurrentStateNotification() throws Exception {
         processProtoTestSubscribeToAttributesUpdates(true);
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimDeviceTest.java
index 924792fca1..26bef40c48 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimDeviceTest.java
@@ -23,10 +23,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.thingsboard.server.common.data.ClaimRequest;
-import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.dao.device.claim.ClaimResponse;
 import org.thingsboard.server.dao.device.claim.ClaimResult;
@@ -45,37 +42,12 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @DaoSqlTest
 public class CoapClaimDeviceTest extends AbstractCoapIntegrationTest {
 
-    protected static final String CUSTOMER_USER_PASSWORD = "customerUser123!";
-
-    protected User customerAdmin;
-    protected Customer savedCustomer;
-
     @Before
     public void beforeTest() throws Exception {
         CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
                 .deviceName("Test Claim device")
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
-    }
-
-    protected void createCustomerAndUser() throws Exception {
-        Customer customer = new Customer();
-        customer.setTenantId(tenantId);
-        customer.setTitle("Test Claiming Customer");
-        savedCustomer = doPost("/api/customer", customer, Customer.class);
-        assertNotNull(savedCustomer);
-        assertEquals(tenantId, savedCustomer.getTenantId());
-
-        User user = new User();
-        user.setAuthority(Authority.CUSTOMER_USER);
-        user.setTenantId(tenantId);
-        user.setCustomerId(savedCustomer.getId());
-        user.setEmail("customer@thingsboard.org");
-
-        customerAdmin = createUser(user, CUSTOMER_USER_PASSWORD);
-        assertNotNull(customerAdmin);
-        assertEquals(customerAdmin.getCustomerId(), savedCustomer.getId());
     }
 
     @After
@@ -110,8 +82,9 @@ public class CoapClaimDeviceTest extends AbstractCoapIntegrationTest {
 
     protected void validateClaimResponse(boolean emptyPayload, CoapTestClient client, byte[] payloadBytes, byte[] failurePayloadBytes) throws Exception {
         postClaimRequest(client, failurePayloadBytes);
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
-        loginUser(customerAdmin.getName(), CUSTOMER_USER_PASSWORD);
+        loginCustomerUser();
         ClaimRequest claimRequest;
         if (!emptyPayload) {
             claimRequest = new ClaimRequest("value");
@@ -128,6 +101,7 @@ public class CoapClaimDeviceTest extends AbstractCoapIntegrationTest {
         assertEquals(claimResponse, ClaimResponse.FAILURE);
 
         postClaimRequest(client, payloadBytes);
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
         ClaimResult claimResult = doExecuteWithRetriesAndInterval(
                 () -> doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResult.class, status().isOk()),
@@ -138,7 +112,7 @@ public class CoapClaimDeviceTest extends AbstractCoapIntegrationTest {
         Device claimedDevice = claimResult.getDevice();
         assertNotNull(claimedDevice);
         assertNotNull(claimedDevice.getCustomerId());
-        assertEquals(customerAdmin.getCustomerId(), claimedDevice.getCustomerId());
+        assertEquals(customerId, claimedDevice.getCustomerId());
 
         claimResponse = doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResponse.class, status().isBadRequest());
         assertEquals(claimResponse, ClaimResponse.CLAIMED);
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimJsonDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimJsonDeviceTest.java
index 89ef5e57fe..8e1d663565 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimJsonDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimJsonDeviceTest.java
@@ -36,7 +36,6 @@ public class CoapClaimJsonDeviceTest extends CoapClaimDeviceTest {
                 .transportPayloadType(TransportPayloadType.JSON)
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
     }
 
     @After
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimProtoDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimProtoDeviceTest.java
index 7dbebac847..eb66e63190 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimProtoDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/claim/CoapClaimProtoDeviceTest.java
@@ -39,7 +39,6 @@ public class CoapClaimProtoDeviceTest extends CoapClaimDeviceTest {
                 .transportPayloadType(TransportPayloadType.PROTOBUF)
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
     }
 
     @After
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/client/CoapClientIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/client/CoapClientIntegrationTest.java
index e7a7485ef5..112d3e6aa5 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/client/CoapClientIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/client/CoapClientIntegrationTest.java
@@ -26,7 +26,6 @@ import org.eclipse.californium.core.coap.CoAP;
 import org.eclipse.californium.core.coap.MediaTypeRegistry;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -69,7 +68,6 @@ public class CoapClientIntegrationTest extends AbstractCoapIntegrationTest {
     private static final List<String> EXPECTED_KEYS = Arrays.asList("key1", "key2", "key3", "key4", "key5");
     private static final String DEVICE_RESPONSE = "{\"value1\":\"A\",\"value2\":\"B\"}";
 
-
     @Before
     public void beforeTest() throws Exception {
         CoapTestConfigProperties configProperties = CoapTestConfigProperties.builder()
@@ -83,7 +81,6 @@ public class CoapClientIntegrationTest extends AbstractCoapIntegrationTest {
         processAfterTest();
     }
 
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testConfirmableRequests() throws Exception {
         boolean confirmable = true;
@@ -92,7 +89,6 @@ public class CoapClientIntegrationTest extends AbstractCoapIntegrationTest {
         processTestRequestAttributesValuesFromTheServer(confirmable);
     }
 
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testNonConfirmableRequests() throws Exception {
         boolean confirmable = false;
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/rpc/CoapServerSideRpcDefaultIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/rpc/CoapServerSideRpcDefaultIntegrationTest.java
index 8f9d3379ef..df1159b128 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/rpc/CoapServerSideRpcDefaultIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/rpc/CoapServerSideRpcDefaultIntegrationTest.java
@@ -20,7 +20,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.service.security.AccessValidator;
@@ -83,13 +82,11 @@ public class CoapServerSideRpcDefaultIntegrationTest extends AbstractCoapServerS
         Assert.assertEquals(AccessValidator.DEVICE_WITH_REQUESTED_ID_NOT_FOUND, result);
     }
 
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testServerCoapOneWayRpc() throws Exception {
         processOneWayRpcTest(false);
     }
 
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testServerCoapTwoWayRpc() throws Exception {
         processTwoWayRpcTest("{\"value1\":\"A\",\"value2\":\"B\"}", false);
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/rpc/CoapServerSideRpcJsonIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/rpc/CoapServerSideRpcJsonIntegrationTest.java
index 34d678b5b5..5c94e91b72 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/rpc/CoapServerSideRpcJsonIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/rpc/CoapServerSideRpcJsonIntegrationTest.java
@@ -18,7 +18,6 @@ package org.thingsboard.server.transport.coap.rpc;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.common.data.CoapDeviceType;
 import org.thingsboard.server.common.data.TransportPayloadType;
@@ -44,13 +43,11 @@ public class CoapServerSideRpcJsonIntegrationTest extends AbstractCoapServerSide
         processAfterTest();
     }
 
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testServerCoapOneWayRpc() throws Exception {
         processOneWayRpcTest(false);
     }
 
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testServerCoapTwoWayRpc() throws Exception {
         processTwoWayRpcTest("{\"value1\":\"A\",\"value2\":\"B\"}", false);
diff --git a/application/src/test/java/org/thingsboard/server/transport/coap/rpc/CoapServerSideRpcProtoIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/coap/rpc/CoapServerSideRpcProtoIntegrationTest.java
index 138f87e964..2f7d46a390 100644
--- a/application/src/test/java/org/thingsboard/server/transport/coap/rpc/CoapServerSideRpcProtoIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/coap/rpc/CoapServerSideRpcProtoIntegrationTest.java
@@ -18,7 +18,6 @@ package org.thingsboard.server.transport.coap.rpc;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.common.data.CoapDeviceType;
 import org.thingsboard.server.common.data.TransportPayloadType;
@@ -45,13 +44,11 @@ public class CoapServerSideRpcProtoIntegrationTest extends AbstractCoapServerSid
         processAfterTest();
     }
 
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testServerCoapOneWayRpc() throws Exception {
         processOneWayRpcTest(true);
     }
 
-    @Ignore // Uncomment when Californium 3.11 is released with https://github.com/eclipse-californium/californium/pull/2215
     @Test
     public void testServerCoapTwoWayRpc() throws Exception {
         processTwoWayRpcTest("{\"payload\":\"{\\\"value1\\\":\\\"A\\\",\\\"value2\\\":\\\"B\\\"}\"}", true);
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2MTestClient.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2MTestClient.java
index 54a21da51e..00a5510788 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2MTestClient.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2MTestClient.java
@@ -67,6 +67,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CONNECTION_ID_LENGTH;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY;
@@ -147,9 +148,9 @@ public class LwM2MTestClient {
             initializer.setClassForObject(SECURITY, Security.class);
             initializer.setInstancesForObject(SECURITY, instances);
             // SERVER
-           Server lwm2mServer = new Server(shortServerId, 300);
+           Server lwm2mServer = new Server(shortServerId, TimeUnit.MINUTES.toSeconds(60));
             lwm2mServer.setId(serverId);
-            Server  serverBs = new Server(shortServerIdBs0, 300);
+            Server  serverBs = new Server(shortServerIdBs0, TimeUnit.MINUTES.toSeconds(60));
             serverBs.setId(serverIdBs);
              instances = new LwM2mInstanceEnabler[]{serverBs, lwm2mServer};
             initializer.setClassForObject(SERVER, Server.class);
@@ -163,7 +164,7 @@ public class LwM2MTestClient {
             // SECURITY
             initializer.setInstancesForObject(SECURITY, security);
             // SERVER
-            Server lwm2mServer = new Server(shortServerId, 300);
+            Server lwm2mServer = new Server(shortServerId, TimeUnit.MINUTES.toSeconds(60));
             lwm2mServer.setId(serverId);
             initializer.setInstancesForObject(SERVER, lwm2mServer );
         }
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
index e61b1afb6c..9e9a38925c 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
@@ -22,8 +22,6 @@ import org.eclipse.leshan.core.peer.SocketIdentity;
 import org.eclipse.leshan.server.registration.RegistrationStore;
 import org.eclipse.leshan.server.registration.RegistrationUpdate;
 import org.junit.Assert;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
 import org.thingsboard.server.dao.service.DaoSqlTest;
@@ -50,6 +48,17 @@ public abstract class AbstractLwM2MIntegrationDiffPortTest extends AbstractSecur
     protected void basicTestConnectionDifferentPort(Lwm2mDeviceProfileTransportConfiguration transportConfiguration,
                                                     String awaitAlias) throws Exception {
 
+        doAnswer((invocation) -> {
+            Object[] arguments = invocation.getArguments();
+            log.trace("doAnswer for registrationStoreTest.updateRegistration with args {}", arguments);
+            int portOld = ((RegistrationUpdate) arguments[0]).getPort();
+            int portValueChange = 5;
+            arguments[0] = registrationUpdateNewPort((RegistrationUpdate) arguments[0], portValueChange);
+            int portNew =  ((RegistrationUpdate) arguments[0]).getPort();
+            Assert.assertEquals((portNew - portOld), portValueChange);
+            return invocation.callRealMethod();
+        }).when(registrationStoreTest).updateRegistration(any(RegistrationUpdate.class));
+
         createDeviceProfile(transportConfiguration);
         createDevice(deviceCredentials, clientEndpoint);
         createNewClient(security, null, true, clientEndpoint);
@@ -61,23 +70,8 @@ public abstract class AbstractLwM2MIntegrationDiffPortTest extends AbstractSecur
 
         await(awaitAlias)
                 .atMost(40, TimeUnit.SECONDS)
-                .until(() -> {
-                    doAnswer(new Answer<Object>() {
-                        @Override
-                        public Object answer(InvocationOnMock invocation) throws Throwable {
-                            Object[] arguments = invocation.getArguments();
-                            if (arguments.length > 0 && arguments[0] instanceof RegistrationUpdate) {
-                                int portOld = ((RegistrationUpdate) arguments[0]).getPort();
-                                int portValueChange = 5;
-                                arguments[0] = registrationUpdateNewPort((RegistrationUpdate) arguments[0], portValueChange);
-                                int portNew =  ((RegistrationUpdate) arguments[0]).getPort();
-                                Assert.assertEquals((portNew - portOld), portValueChange);
-                            }
-                            return invocation.callRealMethod();
-                        }
-                    }).when(registrationStoreTest).updateRegistration(any(RegistrationUpdate.class));
-                    return  lwM2MTestClient.getClientStates().contains(ON_UPDATE_SUCCESS);
-                });
+                .until(() -> lwM2MTestClient.getClientStates().contains(ON_UPDATE_SUCCESS));
+
         Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesRegistrationLwm2mSuccessUpdate));
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
index 510854d759..c0aeaf37ef 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
@@ -189,9 +189,9 @@ public abstract class AbstractMqttIntegrationTest extends AbstractTransportInteg
         subscribeAndWait(client, attrSubTopic, deviceId, featureType, MqttQoS.AT_MOST_ONCE);
     }
 
-    protected void subscribeAndWait(MqttTestClient client, String attrSubTopic, DeviceId deviceId, FeatureType featureType, MqttQoS mqttQoS) throws MqttException {
+    protected void subscribeAndWait(MqttTestClient client, String subTopic, DeviceId deviceId, FeatureType featureType, MqttQoS mqttQoS) throws MqttException {
         int subscriptionCount = getDeviceActorSubscriptionCount(deviceId, featureType);
-        client.subscribeAndWait(attrSubTopic, mqttQoS);
+        client.subscribeAndWait(subTopic, mqttQoS);
         // TODO: This test awaits for the device actor to receive the subscription. Ideally it should not happen. See details below:
         // The transport layer acknowledge subscription request once the message about subscription is in the queue.
         // Test sends data immediately after acknowledgement.
@@ -200,8 +200,8 @@ public abstract class AbstractMqttIntegrationTest extends AbstractTransportInteg
         awaitForDeviceActorToReceiveSubscription(deviceId, featureType, subscriptionCount + 1);
     }
 
-    protected void subscribeAndCheckSubscription(MqttTestClient client, String attrSubTopic, DeviceId deviceId, FeatureType featureType) throws MqttException {
-        client.subscribeAndWait(attrSubTopic, MqttQoS.AT_MOST_ONCE);
+    protected void subscribeAndCheckSubscription(MqttTestClient client, String subTopic, DeviceId deviceId, FeatureType featureType) throws MqttException {
+        client.subscribeAndWait(subTopic, MqttQoS.AT_MOST_ONCE);
         // TODO: This test awaits for the device actor to receive the subscription. Ideally it should not happen. See details below:
         // The transport layer acknowledge subscription request once the message about subscription is in the queue.
         // Test sends data immediately after acknowledgement.
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimBackwardCompatibilityDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimBackwardCompatibilityDeviceTest.java
index feab658a9b..96e45d51c0 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimBackwardCompatibilityDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimBackwardCompatibilityDeviceTest.java
@@ -36,7 +36,6 @@ public class MqttClaimBackwardCompatibilityDeviceTest extends MqttClaimDeviceTes
                 .useJsonPayloadFormatForDefaultDownlinkTopics(true)
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimDeviceTest.java
index b253136b6e..fbc12e48ba 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimDeviceTest.java
@@ -19,10 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Before;
 import org.junit.Test;
 import org.thingsboard.server.common.data.ClaimRequest;
-import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.dao.device.claim.ClaimResponse;
 import org.thingsboard.server.dao.device.claim.ClaimResult;
 import org.thingsboard.server.dao.service.DaoSqlTest;
@@ -41,11 +38,6 @@ import static org.thingsboard.server.common.data.device.profile.MqttTopics.GATEW
 @DaoSqlTest
 public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
 
-    protected static final String CUSTOMER_USER_PASSWORD = "customerUser123!";
-
-    protected User customerAdmin;
-    protected Customer savedCustomer;
-
     @Before
     public void beforeTest() throws Exception {
         MqttTestConfigProperties configProperties = MqttTestConfigProperties.builder()
@@ -53,26 +45,6 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
                 .gatewayName("Test Claim gateway")
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
-    }
-
-    protected void createCustomerAndUser() throws Exception {
-        Customer customer = new Customer();
-        customer.setTenantId(tenantId);
-        customer.setTitle("Test Claiming Customer");
-        savedCustomer = doPost("/api/customer", customer, Customer.class);
-        assertNotNull(savedCustomer);
-        assertEquals(tenantId, savedCustomer.getTenantId());
-
-        User user = new User();
-        user.setAuthority(Authority.CUSTOMER_USER);
-        user.setTenantId(tenantId);
-        user.setCustomerId(savedCustomer.getId());
-        user.setEmail("customer@thingsboard.org");
-
-        customerAdmin = createUser(user, CUSTOMER_USER_PASSWORD);
-        assertNotNull(customerAdmin);
-        assertEquals(customerAdmin.getCustomerId(), savedCustomer.getId());
     }
 
     @Test
@@ -113,8 +85,9 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
 
     protected void validateClaimResponse(boolean emptyPayload, MqttTestClient client, byte[] payloadBytes, byte[] failurePayloadBytes) throws Exception {
         client.publishAndWait(DEVICE_CLAIM_TOPIC, failurePayloadBytes);
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
-        loginUser(customerAdmin.getName(), CUSTOMER_USER_PASSWORD);
+        loginCustomerUser();
         ClaimRequest claimRequest;
         if (!emptyPayload) {
             claimRequest = new ClaimRequest("value");
@@ -132,6 +105,7 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
 
         client.publishAndWait(DEVICE_CLAIM_TOPIC, payloadBytes);
         client.disconnect();
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
         ClaimResult claimResult = doExecuteWithRetriesAndInterval(
                 () -> doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResult.class, status().isOk()),
@@ -142,7 +116,7 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
         Device claimedDevice = claimResult.getDevice();
         assertNotNull(claimedDevice);
         assertNotNull(claimedDevice.getCustomerId());
-        assertEquals(customerAdmin.getCustomerId(), claimedDevice.getCustomerId());
+        assertEquals(customerId, claimedDevice.getCustomerId());
 
         claimResponse = doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResponse.class, status().isBadRequest());
         assertEquals(claimResponse, ClaimResponse.CLAIMED);
@@ -158,8 +132,9 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
         );
 
         assertNotNull(savedDevice);
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
-        loginUser(customerAdmin.getName(), CUSTOMER_USER_PASSWORD);
+        loginCustomerUser();
         ClaimRequest claimRequest;
         if (!emptyPayload) {
             claimRequest = new ClaimRequest("value");
@@ -172,6 +147,7 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
 
         client.publishAndWait(GATEWAY_CLAIM_TOPIC, payloadBytes);
         client.disconnect();
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
         ClaimResult claimResult = doExecuteWithRetriesAndInterval(
                 () -> doPostClaimAsync("/api/customer/device/" + deviceName + "/claim", claimRequest, ClaimResult.class, status().isOk()),
@@ -183,7 +159,7 @@ public class MqttClaimDeviceTest extends AbstractMqttIntegrationTest {
         Device claimedDevice = claimResult.getDevice();
         assertNotNull(claimedDevice);
         assertNotNull(claimedDevice.getCustomerId());
-        assertEquals(customerAdmin.getCustomerId(), claimedDevice.getCustomerId());
+        assertEquals(customerId, claimedDevice.getCustomerId());
 
         claimResponse = doPostClaimAsync("/api/customer/device/" + deviceName + "/claim", claimRequest, ClaimResponse.class, status().isBadRequest());
         assertEquals(claimResponse, ClaimResponse.CLAIMED);
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimJsonDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimJsonDeviceTest.java
index a591933cf7..c567ef25d1 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimJsonDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimJsonDeviceTest.java
@@ -34,7 +34,6 @@ public class MqttClaimJsonDeviceTest extends MqttClaimDeviceTest {
                 .transportPayloadType(TransportPayloadType.JSON)
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimProtoDeviceTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimProtoDeviceTest.java
index d4276eb211..a8bc81cee5 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimProtoDeviceTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/claim/MqttClaimProtoDeviceTest.java
@@ -36,7 +36,6 @@ public class MqttClaimProtoDeviceTest extends MqttClaimDeviceTest {
                 .transportPayloadType(TransportPayloadType.PROTOBUF)
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
     }
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/AbstractMqttV5ClaimTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/AbstractMqttV5ClaimTest.java
index 7213ecafb5..00a190f6d0 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/AbstractMqttV5ClaimTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/AbstractMqttV5ClaimTest.java
@@ -17,10 +17,7 @@ package org.thingsboard.server.transport.mqtt.mqttv5.claim;
 
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.ClaimRequest;
-import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.dao.device.claim.ClaimResponse;
 import org.thingsboard.server.dao.device.claim.ClaimResult;
 import org.thingsboard.server.transport.mqtt.mqttv5.AbstractMqttV5Test;
@@ -33,10 +30,6 @@ import static org.thingsboard.server.common.data.device.profile.MqttTopics.DEVIC
 
 @Slf4j
 public abstract class AbstractMqttV5ClaimTest extends AbstractMqttV5Test {
-    protected static final String CUSTOMER_USER_PASSWORD = "customerUser123!";
-
-    protected User customerAdmin;
-    protected Customer savedCustomer;
 
     protected void processTestClaimingDevice() throws Exception {
         MqttV5TestClient client = new MqttV5TestClient();
@@ -50,8 +43,9 @@ public abstract class AbstractMqttV5ClaimTest extends AbstractMqttV5Test {
 
     protected void validateClaimResponse(MqttV5TestClient client, byte[] payloadBytes, byte[] failurePayloadBytes) throws Exception {
         client.publishAndWait(DEVICE_CLAIM_TOPIC, failurePayloadBytes);
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
-        loginUser(customerAdmin.getName(), CUSTOMER_USER_PASSWORD);
+        loginCustomerUser();
         ClaimRequest claimRequest = new ClaimRequest("value");
 
         ClaimResponse claimResponse = doExecuteWithRetriesAndInterval(
@@ -64,6 +58,7 @@ public abstract class AbstractMqttV5ClaimTest extends AbstractMqttV5Test {
 
         client.publishAndWait(DEVICE_CLAIM_TOPIC, payloadBytes);
         client.disconnect();
+        awaitForClaimingInfoToBeRegistered(savedDevice.getId());
 
         ClaimResult claimResult = doExecuteWithRetriesAndInterval(
                 () -> doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResult.class, status().isOk()),
@@ -74,28 +69,10 @@ public abstract class AbstractMqttV5ClaimTest extends AbstractMqttV5Test {
         Device claimedDevice = claimResult.getDevice();
         assertNotNull(claimedDevice);
         assertNotNull(claimedDevice.getCustomerId());
-        assertEquals(customerAdmin.getCustomerId(), claimedDevice.getCustomerId());
+        assertEquals(customerId, claimedDevice.getCustomerId());
 
         claimResponse = doPostClaimAsync("/api/customer/device/" + savedDevice.getName() + "/claim", claimRequest, ClaimResponse.class, status().isBadRequest());
         assertEquals(claimResponse, ClaimResponse.CLAIMED);
     }
 
-    protected void createCustomerAndUser() throws Exception {
-        Customer customer = new Customer();
-        customer.setTenantId(tenantId);
-        customer.setTitle("Test Claiming Customer");
-        savedCustomer = doPost("/api/customer", customer, Customer.class);
-        assertNotNull(savedCustomer);
-        assertEquals(tenantId, savedCustomer.getTenantId());
-
-        User user = new User();
-        user.setAuthority(Authority.CUSTOMER_USER);
-        user.setTenantId(tenantId);
-        user.setCustomerId(savedCustomer.getId());
-        user.setEmail("customer@thingsboard.org");
-
-        customerAdmin = createUser(user, CUSTOMER_USER_PASSWORD);
-        assertNotNull(customerAdmin);
-        assertEquals(customerAdmin.getCustomerId(), savedCustomer.getId());
-    }
 }
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/MqttV5ClaimTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/MqttV5ClaimTest.java
index dcabe07de1..75e884f9fd 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/MqttV5ClaimTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv5/claim/MqttV5ClaimTest.java
@@ -29,7 +29,6 @@ public class MqttV5ClaimTest extends AbstractMqttV5ClaimTest {
                 .deviceName("Test Claim device")
                 .build();
         processBeforeTest(configProperties);
-        createCustomerAndUser();
     }
 
     @Test
diff --git a/application/src/test/resources/logback-test.xml b/application/src/test/resources/logback-test.xml
index 981bcab132..8b20a2817a 100644
--- a/application/src/test/resources/logback-test.xml
+++ b/application/src/test/resources/logback-test.xml
@@ -16,7 +16,7 @@
     <logger name="org.testcontainers" level="INFO" />
     <logger name="org.eclipse.leshan" level="INFO"/>
     <logger name="org.thingsboard.server.controller.AbstractWebTest" level="INFO"/>
-
+    <logger name="org.thingsboard.server.service.script" level="INFO"/>
 
     <!-- mute TelemetryEdgeSqlTest that causes a lot of randomly generated errors -->
     <logger name="org.thingsboard.server.service.edge.rpc.EdgeGrpcSession" level="OFF"/>
@@ -37,6 +37,9 @@
 
     <!-- Device actor message processor debug for the test scope -->
     <!--    <logger name="org.thingsboard.server.actors.device.DeviceActorMessageProcessor" level="DEBUG" />-->
+    <!--    <logger name="org.thingsboard.server.transport.lwm2m.server.store.TbInMemoryRegistrationStore" level="TRACE"/>-->
+    <!--    <logger name="org.thingsboard.server.transport.lwm2m.server.store.TbLwM2mRedisRegistrationStore" level="TRACE"/>-->
+    <!--    <logger name="org.thingsboard.server.transport.lwm2m.security.diffPort" level="TRACE"/>-->
 
     <root level="WARN">
         <appender-ref ref="console"/>
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java
index 203fe8e744..a6e6e2390b 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java
@@ -106,6 +106,8 @@ public interface AlarmService extends EntityDaoService {
 
     PageData<AlarmId> findAlarmIdsByAssigneeId(TenantId tenantId, UserId userId, PageLink pageLink);
 
+    PageData<AlarmId> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, PageLink pageLink);
+
     void deleteEntityAlarmRelations(TenantId tenantId, EntityId entityId);
 
     void deleteEntityAlarmRecordsByTenantId(TenantId tenantId);
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/event/EventService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/event/EventService.java
index 9b0d5a280d..ef6ebdcdd7 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/event/EventService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/event/EventService.java
@@ -35,6 +35,8 @@ public interface EventService {
 
     List<EventInfo> findLatestEvents(TenantId tenantId, EntityId entityId, EventType eventType, int limit);
 
+    EventInfo findLatestDebugRuleNodeInEvent(TenantId tenantId, EntityId entityId);
+
     PageData<EventInfo> findEventsByFilter(TenantId tenantId, EntityId entityId, EventFilter eventFilter, TimePageLink pageLink);
 
     void removeEvents(TenantId tenantId, EntityId entityId);
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationService.java
index 18c9d4a7fb..91f6f7a379 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/notification/NotificationService.java
@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.id.NotificationId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.Notification;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 
@@ -30,13 +31,13 @@ public interface NotificationService {
 
     boolean markNotificationAsRead(TenantId tenantId, UserId recipientId, NotificationId notificationId);
 
-    int markAllNotificationsAsRead(TenantId tenantId, UserId recipientId);
+    int markAllNotificationsAsRead(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId);
 
-    PageData<Notification> findNotificationsByRecipientIdAndReadStatus(TenantId tenantId, UserId recipientId, boolean unreadOnly, PageLink pageLink);
+    PageData<Notification> findNotificationsByRecipientIdAndReadStatus(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, boolean unreadOnly, PageLink pageLink);
 
-    PageData<Notification> findLatestUnreadNotificationsByRecipientId(TenantId tenantId, UserId recipientId, int limit);
+    PageData<Notification> findLatestUnreadNotificationsByRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, int limit);
 
-    int countUnreadNotificationsByRecipientId(TenantId tenantId, UserId recipientId);
+    int countUnreadNotificationsByRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId);
 
     boolean deleteNotification(TenantId tenantId, UserId recipientId, NotificationId notificationId);
 
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java
index 941432b879..11129002e7 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.UUID;
 
 public interface OAuth2Service {
+
     List<OAuth2ClientInfo> getOAuth2Clients(String domainScheme, String domainName, String pkgName, PlatformType platformType);
 
     void saveOAuth2Info(OAuth2Info oauth2Info);
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/queue/QueueStatsService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/queue/QueueStatsService.java
new file mode 100644
index 0000000000..9ab67c73a7
--- /dev/null
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/queue/QueueStatsService.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.queue;
+
+import org.thingsboard.server.common.data.id.QueueStatsId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.queue.QueueStats;
+import org.thingsboard.server.dao.entity.EntityDaoService;
+
+import java.util.List;
+
+public interface QueueStatsService extends EntityDaoService {
+
+    QueueStats save(TenantId tenantId, QueueStats queueStats);
+
+    QueueStats findQueueStatsById(TenantId tenantId, QueueStatsId queueStatsId);
+
+    QueueStats findByTenantIdAndNameAndServiceId(TenantId tenantId, String queueName, String serviceId);
+
+    List<QueueStats> findByTenantId(TenantId tenantId);
+
+    void deleteByTenantId(TenantId tenantId);
+
+}
\ No newline at end of file
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java
index 11a71eaff5..bef82f921f 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.entity.EntityDaoService;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 public interface TenantService extends EntityDaoService {
 
@@ -36,7 +37,7 @@ public interface TenantService extends EntityDaoService {
 
     Tenant saveTenant(Tenant tenant);
 
-    Tenant saveTenant(Tenant tenant, boolean publishSaveEvent);
+    Tenant saveTenant(Tenant tenant, Consumer<TenantId> defaultEntitiesCreator);
 
     boolean tenantExists(TenantId tenantId);
 
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java
index 096a39bff6..ffea217da7 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java
@@ -38,12 +38,10 @@ public interface TimeseriesService {
 
     ListenableFuture<List<TsKvEntry>> findAll(TenantId tenantId, EntityId entityId, List<ReadTsKvQuery> queries);
 
-    ListenableFuture<Optional<TsKvEntry>> findLatest(TenantId tenantId, EntityId entityId, String keys);
+    ListenableFuture<Optional<TsKvEntry>> findLatest(TenantId tenantId, EntityId entityId, String key);
 
     ListenableFuture<List<TsKvEntry>> findLatest(TenantId tenantId, EntityId entityId, Collection<String> keys);
 
-    List<TsKvEntry> findLatestSync(TenantId tenantId, EntityId entityId, Collection<String> keys);
-
     ListenableFuture<List<TsKvEntry>> findAllLatest(TenantId tenantId, EntityId entityId);
 
     ListenableFuture<Integer> save(TenantId tenantId, EntityId entityId, TsKvEntry tsKvEntry);
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java b/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
index 9f0100dbb1..398cd17aa1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
@@ -36,7 +36,7 @@ public class Customer extends ContactBased<CustomerId> implements HasTenantId, E
 
     @NoXss
     @Length(fieldName = "title")
-    @Schema(required = true, description = "Title of the customer", example = "Company A")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Title of the customer", example = "Company A")
     private String title;
     @Schema(description = "JSON object with Tenant Id")
     private TenantId tenantId;
@@ -132,7 +132,7 @@ public class Customer extends ContactBased<CustomerId> implements HasTenantId, E
         return super.getPhone();
     }
 
-    @Schema(required = true, description = "Email", example = "example@company.com")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Email", example = "example@company.com")
     @Override
     public String getEmail() {
         return super.getEmail();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java
index be0f7ce109..238ef8744c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java
@@ -85,7 +85,7 @@ public class DashboardInfo extends BaseData<DashboardId> implements HasName, Has
         this.tenantId = tenantId;
     }
 
-    @Schema(required = true, description = "Title of the dashboard.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Title of the dashboard.")
     public String getTitle() {
         return title;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Device.java b/common/data/src/main/java/org/thingsboard/server/common/data/Device.java
index 13df99ca50..e7c37d3ed1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/Device.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/Device.java
@@ -136,7 +136,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         this.customerId = customerId;
     }
 
-    @Schema(required = true, description = "Unique Device Name in scope of Tenant", example = "A4B72CCDFF33")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Unique Device Name in scope of Tenant", example = "A4B72CCDFF33")
     @Override
     public String getName() {
         return name;
@@ -164,7 +164,7 @@ public class Device extends BaseDataWithAdditionalInfo<DeviceId> implements HasL
         this.label = label;
     }
 
-    @Schema(required = true, description = "JSON object with Device Profile Id.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with Device Profile Id.")
     public DeviceProfileId getDeviceProfileId() {
         return deviceProfileId;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
index fb4fe1011e..bb43bf4d11 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
@@ -58,7 +58,8 @@ public enum EntityType {
     NOTIFICATION_TEMPLATE (30),
     NOTIFICATION_REQUEST (31),
     NOTIFICATION (32),
-    NOTIFICATION_RULE (33);
+    NOTIFICATION_RULE (33),
+    QUEUE_STATS(34);
 
     @Getter
     private final int protoNumber; // Corresponds to EntityTypeProto
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
index 4a4e785dac..344045134e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
@@ -40,17 +40,17 @@ public class EntityView extends BaseDataWithAdditionalInfo<EntityViewId>
 
     private static final long serialVersionUID = 5582010124562018986L;
 
-    @Schema(required = true, description = "JSON object with the referenced Entity Id (Device or Asset).")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with the referenced Entity Id (Device or Asset).")
     private EntityId entityId;
     private TenantId tenantId;
     private CustomerId customerId;
     @NoXss
     @Length(fieldName = "name")
-    @Schema(required = true, description = "Entity View name", example = "A4B72CCDFF33")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Entity View name", example = "A4B72CCDFF33")
     private String name;
     @NoXss
     @Length(fieldName = "type")
-    @Schema(required = true, description = "Device Profile Name", example = "Temperature Sensor")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Device Profile Name", example = "Temperature Sensor")
     private String type;
     @Schema(description = "Set of telemetry and attribute keys to expose via Entity View.")
     private TelemetryEntityView keys;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/SaveDeviceWithCredentialsRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/SaveDeviceWithCredentialsRequest.java
index bc40710aed..24991bb71d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/SaveDeviceWithCredentialsRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/SaveDeviceWithCredentialsRequest.java
@@ -25,10 +25,10 @@ import jakarta.validation.constraints.NotNull;;
 @Data
 public class SaveDeviceWithCredentialsRequest {
 
-    @Schema(description = "The JSON with device entity.", required = true)
+    @Schema(description = "The JSON with device entity.", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull
     private final Device device;
-    @Schema(description = "The JSON with credentials entity.", required = true)
+    @Schema(description = "The JSON with credentials entity.", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull
     private final DeviceCredentials credentials;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java b/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java
index 1f649f69e6..7cb7e15395 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/Tenant.java
@@ -33,7 +33,7 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId, HasTi
 
     @Length(fieldName = "title")
     @NoXss
-    @Schema(required = true, description = "Title of the tenant", example = "Company A")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Title of the tenant", example = "Company A")
     private String title;
     @NoXss
     @Length(fieldName = "region")
@@ -152,7 +152,7 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId, HasTi
         return super.getPhone();
     }
 
-    @Schema(required = true, description = "Email", example = "example@company.com")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Email", example = "example@company.com")
     @Override
     public String getEmail() {
         return super.getEmail();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/User.java b/common/data/src/main/java/org/thingsboard/server/common/data/User.java
index 2027de62be..678b7cdac6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/User.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/User.java
@@ -103,7 +103,7 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
         this.customerId = customerId;
     }
 
-    @Schema(required = true, description = "Email of the user", example = "user@example.com")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Email of the user", example = "user@example.com")
     public String getEmail() {
         return email;
     }
@@ -119,7 +119,7 @@ public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName,
         return email;
     }
 
-    @Schema(required = true, description = "Authority", example = "SYS_ADMIN, TENANT_ADMIN or CUSTOMER_USER")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Authority", example = "SYS_ADMIN, TENANT_ADMIN or CUSTOMER_USER")
     public Authority getAuthority() {
         return authority;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
index 04d2b9231c..19e0bc29b1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
@@ -59,16 +59,16 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
     private CustomerId customerId;
 
     @NoXss
-    @Schema(required = true, description = "representing type of the Alarm", example = "High Temperature Alarm")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "representing type of the Alarm", example = "High Temperature Alarm")
     @Length(fieldName = "type")
     private String type;
-    @Schema(required = true, description = "JSON object with alarm originator id")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with alarm originator id")
     private EntityId originator;
-    @Schema(required = true, description = "Alarm severity", example = "CRITICAL")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Alarm severity", example = "CRITICAL")
     private AlarmSeverity severity;
-    @Schema(required = true, description = "Acknowledged", example = "true")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Acknowledged", example = "true")
     private boolean acknowledged;
-    @Schema(required = true, description = "Cleared", example = "false")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Cleared", example = "false")
     private boolean cleared;
     @Schema(description = "Alarm assignee user id")
     private UserId assigneeId;
@@ -128,7 +128,7 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
 
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @Schema(required = true, description = "representing type of the Alarm", example = "High Temperature Alarm")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "representing type of the Alarm", example = "High Temperature Alarm")
     public String getName() {
         return type;
     }
@@ -150,7 +150,7 @@ public class Alarm extends BaseData<AlarmId> implements HasName, HasTenantId, Ha
     }
 
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @Schema(required = true, description = "status of the Alarm", example = "ACTIVE_UNACK", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "status of the Alarm", example = "ACTIVE_UNACK", accessMode = Schema.AccessMode.READ_ONLY)
     public AlarmStatus getStatus() {
         return toStatus(cleared, acknowledged);
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
index 23b6c9b76d..0bd8e3a687 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
@@ -25,6 +25,7 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.id.AlarmCommentId;
+import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.validation.Length;
@@ -36,21 +37,21 @@ import org.thingsboard.server.common.data.validation.NoXss;
 @AllArgsConstructor
 public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {
     @Schema(description = "JSON object with Alarm id.", accessMode = Schema.AccessMode.READ_ONLY)
-    private EntityId alarmId;
+    private AlarmId alarmId;
     @Schema(description = "JSON object with User id.", accessMode = Schema.AccessMode.READ_ONLY)
     private UserId userId;
     @Schema(description = "Defines origination of comment. System type means comment was created by TB. OTHER type means comment was created by user.", example = "SYSTEM/OTHER", accessMode = Schema.AccessMode.READ_ONLY)
     private AlarmCommentType type;
-    @Schema(description = "JSON object with text of comment.",implementation = com.fasterxml.jackson.databind.JsonNode.class)
+    @Schema(description = "JSON object with text of comment.")
     @NoXss
     @Length(fieldName = "comment", max = 10000)
     @EqualsAndHashCode.Include
-    private transient JsonNode comment;
+    private JsonNode comment;
 
     @Schema(description = "JSON object with the alarm comment Id. " +
             "Specify this field to update the alarm comment. " +
             "Referencing non-existing alarm Id will cause error. " +
-            "Omit this field to create new alarm." )
+            "Omit this field to create new alarm.", accessMode = Schema.AccessMode.READ_ONLY)
     @Override
     public AlarmCommentId getId() {
         return super.getId();
@@ -72,7 +73,7 @@ public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {
 
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    @Schema(required = true, description = "representing comment text", example = "Please take a look")
+    @Schema(accessMode = Schema.AccessMode.READ_ONLY, description = "representing comment text", example = "Please take a look")
     public String getName() {
         return comment.toString();
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCreateOrUpdateActiveRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCreateOrUpdateActiveRequest.java
index 54dd8ba71b..c39c603a9e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCreateOrUpdateActiveRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCreateOrUpdateActiveRequest.java
@@ -40,14 +40,14 @@ public class AlarmCreateOrUpdateActiveRequest implements AlarmModificationReques
     @Schema(description = "JSON object with Customer Id", accessMode = Schema.AccessMode.READ_ONLY)
     private CustomerId customerId;
     @NotNull
-    @Schema(required = true, description = "representing type of the Alarm", example = "High Temperature Alarm")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "representing type of the Alarm", example = "High Temperature Alarm")
     @Length(fieldName = "type")
     private String type;
     @NotNull
-    @Schema(required = true, description = "JSON object with alarm originator id")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with alarm originator id")
     private EntityId originator;
     @NotNull
-    @Schema(required = true, description = "Alarm severity", example = "CRITICAL")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Alarm severity", example = "CRITICAL")
     private AlarmSeverity severity;
     @Schema(description = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
     private long startTs;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmUpdateRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmUpdateRequest.java
index 544d200a27..8eb418d6dc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmUpdateRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmUpdateRequest.java
@@ -41,7 +41,7 @@ public class AlarmUpdateRequest implements AlarmModificationRequest {
             "Omit this field to create new alarm.")
     private AlarmId alarmId;
     @NotNull
-    @Schema(required = true, description = "Alarm severity", example = "CRITICAL")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Alarm severity", example = "CRITICAL")
     private AlarmSeverity severity;
     @Schema(description = "Timestamp of the alarm start time, in milliseconds", example = "1634058704565")
     private long startTs;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java b/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java
index 753a83fbaf..16518bc618 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java
@@ -120,7 +120,7 @@ public class Asset extends BaseDataWithAdditionalInfo<AssetId> implements HasLab
         this.customerId = customerId;
     }
 
-    @Schema(required = true, description = "Unique Asset Name in scope of Tenant", example = "Empire State Building")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Unique Asset Name in scope of Tenant", example = "Empire State Building")
     @Override
     public String getName() {
         return name;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
index d281589734..67d32d6e89 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
@@ -120,13 +120,13 @@ public class Edge extends BaseDataWithAdditionalInfo<EdgeId> implements HasLabel
         return this.rootRuleChainId;
     }
 
-    @Schema(required = true, description = "Unique Edge Name in scope of Tenant", example = "Silo_A_Edge")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Unique Edge Name in scope of Tenant", example = "Silo_A_Edge")
     @Override
     public String getName() {
         return this.name;
     }
 
-    @Schema(required = true, description = "Edge type", example = "Silos")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Edge type", example = "Silos")
     public String getType() {
         return this.type;
     }
@@ -136,12 +136,12 @@ public class Edge extends BaseDataWithAdditionalInfo<EdgeId> implements HasLabel
         return this.label;
     }
 
-    @Schema(required = true, description = "Edge routing key ('username') to authorize on cloud")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Edge routing key ('username') to authorize on cloud")
     public String getRoutingKey() {
         return this.routingKey;
     }
 
-    @Schema(required = true, description = "Edge secret ('password') to authorize on cloud")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Edge secret ('password') to authorize on cloud")
     public String getSecret() {
         return this.secret;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventType.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventType.java
index 6fc255501f..44a3ed8efe 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeEventType.java
@@ -41,7 +41,11 @@ public enum EdgeEventType {
     ADMIN_SETTINGS(true, null),
     OTA_PACKAGE(true, EntityType.OTA_PACKAGE),
     QUEUE(true, EntityType.QUEUE),
-    TB_RESOURCE(true, EntityType.TB_RESOURCE);
+    NOTIFICATION_RULE (true, EntityType.NOTIFICATION_RULE),
+    NOTIFICATION_TARGET (true, EntityType.NOTIFICATION_TARGET),
+    NOTIFICATION_TEMPLATE (true, EntityType.NOTIFICATION_TEMPLATE),
+    TB_RESOURCE(true, EntityType.TB_RESOURCE),
+    OAUTH2(true, null);
 
     private final boolean allEdgesRelated;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/EventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/EventFilter.java
index dc7f632037..6d2a110cf7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/EventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/EventFilter.java
@@ -33,7 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 })
 public interface EventFilter {
 
-    @Schema(required = true, description = "String value representing the event type", example = "STATS")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "String value representing the event type", example = "STATS")
     EventType getEventType();
 
     boolean isNotEmpty();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmId.java
index aae2e3726a..02b4d602ce 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmId.java
@@ -36,7 +36,7 @@ public class AlarmId extends UUIDBased implements EntityId {
         return new AlarmId(UUID.fromString(alarmId));
     }
 
-    @Schema(required = true, description = "string", example = "ALARM", allowableValues = "ALARM")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "ALARM", allowableValues = "ALARM")
     @Override
     public EntityType getEntityType() {
         return EntityType.ALARM;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/ApiUsageStateId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/ApiUsageStateId.java
index 228b4160a0..ec942731f3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/ApiUsageStateId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/ApiUsageStateId.java
@@ -34,7 +34,7 @@ public class ApiUsageStateId extends UUIDBased implements EntityId {
         return new ApiUsageStateId(UUID.fromString(userId));
     }
 
-    @Schema(required = true, description = "string", example = "API_USAGE_STATE", allowableValues = "API_USAGE_STATE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "API_USAGE_STATE", allowableValues = "API_USAGE_STATE")
     @Override
     public EntityType getEntityType() {
         return EntityType.API_USAGE_STATE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetId.java
index 2c70920aeb..a45668e9bd 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetId.java
@@ -36,7 +36,7 @@ public class AssetId extends UUIDBased implements EntityId {
         return new AssetId(UUID.fromString(assetId));
     }
 
-    @Schema(required = true, description = "string", example = "ASSET", allowableValues = "ASSET")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "ASSET", allowableValues = "ASSET")
     @Override
     public EntityType getEntityType() {
         return EntityType.ASSET;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetProfileId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetProfileId.java
index 0efd6dcf71..d2377c19e6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetProfileId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/AssetProfileId.java
@@ -35,7 +35,7 @@ public class AssetProfileId extends UUIDBased implements EntityId {
         return new AssetProfileId(UUID.fromString(assetProfileId));
     }
 
-    @Schema(required = true, description = "string", example = "ASSET_PROFILE", allowableValues = "ASSET_PROFILE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "ASSET_PROFILE", allowableValues = "ASSET_PROFILE")
     @Override
     public EntityType getEntityType() {
         return EntityType.ASSET_PROFILE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/CustomerId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/CustomerId.java
index 72f380a4bd..d8ef7fd09e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/CustomerId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/CustomerId.java
@@ -32,7 +32,7 @@ public final class CustomerId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "CUSTOMER", allowableValues = "CUSTOMER")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "CUSTOMER", allowableValues = "CUSTOMER")
     @Override
     public EntityType getEntityType() {
         return EntityType.CUSTOMER;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/DashboardId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/DashboardId.java
index 7220919b14..a7c21821ff 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/DashboardId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/DashboardId.java
@@ -34,7 +34,7 @@ public class DashboardId extends UUIDBased implements EntityId {
         return new DashboardId(UUID.fromString(dashboardId));
     }
 
-    @Schema(required = true, description = "string", example = "DASHBOARD", allowableValues = "DASHBOARD")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "DASHBOARD", allowableValues = "DASHBOARD")
     @Override
     public EntityType getEntityType() {
         return EntityType.DASHBOARD;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceId.java
index d59de6cb07..8fe48b9836 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceId.java
@@ -37,7 +37,7 @@ public class DeviceId extends UUIDBased implements EntityId {
     }
 
     @Override
-    @Schema(required = true, description = "string", example = "DEVICE", allowableValues = "DEVICE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "DEVICE", allowableValues = "DEVICE")
     public EntityType getEntityType() {
         return EntityType.DEVICE;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceProfileId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceProfileId.java
index 11679436f5..7050fa7ff3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceProfileId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/DeviceProfileId.java
@@ -35,7 +35,7 @@ public class DeviceProfileId extends UUIDBased implements EntityId {
         return new DeviceProfileId(UUID.fromString(deviceProfileId));
     }
 
-    @Schema(required = true, description = "string", example = "DEVICE_PROFILE", allowableValues = "DEVICE_PROFILE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "DEVICE_PROFILE", allowableValues = "DEVICE_PROFILE")
     @Override
     public EntityType getEntityType() {
         return EntityType.DEVICE_PROFILE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java
index 1d6c1dad49..5c29c210df 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java
@@ -41,7 +41,7 @@ public class EdgeId extends UUIDBased implements EntityId {
         return new EdgeId(UUID.fromString(edgeId));
     }
 
-    @Schema(required = true, description = "string", example = "EDGE", allowableValues = "EDGE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "EDGE", allowableValues = "EDGE")
     @Override
     public EntityType getEntityType() {
         return EntityType.EDGE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityId.java
index 8b4b1f156d..64c6b03427 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityId.java
@@ -35,10 +35,10 @@ public interface EntityId extends HasUUID, Serializable { //NOSONAR, the constan
 
     UUID NULL_UUID = UUID.fromString("13814000-1dd2-11b2-8080-808080808080");
 
-    @Schema(required = true, description = "ID of the entity, time-based UUID v1", example = "784f394c-42b6-435a-983c-b7beff2784f9")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "ID of the entity, time-based UUID v1", example = "784f394c-42b6-435a-983c-b7beff2784f9")
     UUID getId();
 
-    @Schema(required = true, example = "DEVICE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, example = "DEVICE")
     EntityType getEntityType();
 
     @JsonIgnore
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
index eb8b337c7d..ad2df69349 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
@@ -103,6 +103,8 @@ public class EntityIdFactory {
                 return new NotificationTemplateId(uuid);
             case NOTIFICATION:
                 return new NotificationId(uuid);
+            case QUEUE_STATS:
+                return new QueueStatsId(uuid);
         }
         throw new IllegalArgumentException("EntityType " + type + " is not supported!");
     }
@@ -145,6 +147,12 @@ public class EntityIdFactory {
                 return new QueueId(uuid);
             case TB_RESOURCE:
                 return new TbResourceId(uuid);
+            case NOTIFICATION_RULE:
+                return new NotificationRuleId(uuid);
+            case NOTIFICATION_TARGET:
+                return new NotificationTargetId(uuid);
+            case NOTIFICATION_TEMPLATE:
+                return new NotificationTemplateId(uuid);
         }
         throw new IllegalArgumentException("EdgeEventType " + edgeEventType + " is not supported!");
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityViewId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityViewId.java
index a44f35e5d3..7c5f7be1e8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityViewId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/EntityViewId.java
@@ -38,7 +38,7 @@ public class EntityViewId extends UUIDBased implements EntityId {
         return new EntityViewId(UUID.fromString(entityViewID));
     }
 
-    @Schema(required = true, description = "string", example = "ENTITY_VIEW", allowableValues = "ENTITY_VIEW")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "ENTITY_VIEW", allowableValues = "ENTITY_VIEW")
     @Override
     public EntityType getEntityType() {
         return EntityType.ENTITY_VIEW;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationId.java
index be8aa8e9cd..8fc12993b2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationId.java
@@ -29,7 +29,7 @@ public class NotificationId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "NOTIFICATION", allowableValues = "NOTIFICATION")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "NOTIFICATION", allowableValues = "NOTIFICATION")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRequestId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRequestId.java
index afcb27f0c9..30c7336b79 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRequestId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRequestId.java
@@ -29,7 +29,7 @@ public class NotificationRequestId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "NOTIFICATION_REQUEST", allowableValues = "NOTIFICATION_REQUEST")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "NOTIFICATION_REQUEST", allowableValues = "NOTIFICATION_REQUEST")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_REQUEST;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRuleId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRuleId.java
index dc5e6c8671..c17e42a759 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRuleId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRuleId.java
@@ -29,7 +29,7 @@ public class NotificationRuleId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "NOTIFICATION_RULE", allowableValues = "NOTIFICATION_RULE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "NOTIFICATION_RULE", allowableValues = "NOTIFICATION_RULE")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_RULE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTargetId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTargetId.java
index 3966dbbbd7..2984bc7644 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTargetId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTargetId.java
@@ -29,7 +29,7 @@ public class NotificationTargetId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "NOTIFICATION_TARGET", allowableValues = "NOTIFICATION_TARGET")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "NOTIFICATION_TARGET", allowableValues = "NOTIFICATION_TARGET")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_TARGET;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTemplateId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTemplateId.java
index 65f312b7e0..9fb99a578e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTemplateId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTemplateId.java
@@ -29,7 +29,7 @@ public class NotificationTemplateId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "NOTIFICATION_TEMPLATE", allowableValues = "NOTIFICATION_TEMPLATE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "NOTIFICATION_TEMPLATE", allowableValues = "NOTIFICATION_TEMPLATE")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_TEMPLATE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/OtaPackageId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/OtaPackageId.java
index 3225a72f6f..bc042883ce 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/OtaPackageId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/OtaPackageId.java
@@ -35,7 +35,7 @@ public class OtaPackageId extends UUIDBased implements EntityId {
         return new OtaPackageId(UUID.fromString(firmwareId));
     }
 
-    @Schema(required = true, description = "string", example = "OTA_PACKAGE", allowableValues = "OTA_PACKAGE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "OTA_PACKAGE", allowableValues = "OTA_PACKAGE")
     @Override
     public EntityType getEntityType() {
         return EntityType.OTA_PACKAGE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueId.java
index 7f415fc451..48987a0539 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueId.java
@@ -35,9 +35,9 @@ public class QueueId extends UUIDBased implements EntityId {
         return new QueueId(UUID.fromString(queueId));
     }
 
-    @Schema(required = true, description = "string", example = "QUEUE", allowableValues = "QUEUE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "QUEUE", allowableValues = "QUEUE")
     @Override
     public EntityType getEntityType() {
         return EntityType.QUEUE;
     }
-}
\ No newline at end of file
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueStatsId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueStatsId.java
new file mode 100644
index 0000000000..dd36f09313
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/QueueStatsId.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.id;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.thingsboard.server.common.data.EntityType;
+
+import java.util.UUID;
+
+public class QueueStatsId extends UUIDBased implements EntityId {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonCreator
+    public QueueStatsId(@JsonProperty("id") UUID id) {
+        super(id);
+    }
+
+    public static QueueStatsId fromString(String queueId) {
+        return new QueueStatsId(UUID.fromString(queueId));
+    }
+
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "QUEUE_STATS", allowableValues = "QUEUE_STATS")
+    @Override
+    public EntityType getEntityType() {
+        return EntityType.QUEUE_STATS;
+    }
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/RpcId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/RpcId.java
index b544971d98..c6bf1aff87 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/RpcId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/RpcId.java
@@ -31,7 +31,7 @@ public final class RpcId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "RPC", allowableValues = "RPC")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "RPC", allowableValues = "RPC")
     @Override
     public EntityType getEntityType() {
         return EntityType.RPC;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleChainId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleChainId.java
index 379d1f608e..1557b053c2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleChainId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleChainId.java
@@ -29,7 +29,7 @@ public class RuleChainId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "RULE_CHAIN", allowableValues = "RULE_CHAIN")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "RULE_CHAIN", allowableValues = "RULE_CHAIN")
     @Override
     public EntityType getEntityType() {
         return EntityType.RULE_CHAIN;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleNodeId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleNodeId.java
index b0c1d1c8e5..945c99a89a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleNodeId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/RuleNodeId.java
@@ -29,7 +29,7 @@ public class RuleNodeId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "RULE_NODE", allowableValues = "RULE_NODE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "RULE_NODE", allowableValues = "RULE_NODE")
     @Override
     public EntityType getEntityType() {
         return EntityType.RULE_NODE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/TbResourceId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/TbResourceId.java
index 28d22d04f5..a2ef70b75b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/TbResourceId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/TbResourceId.java
@@ -31,7 +31,7 @@ public class TbResourceId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "TB_RESOURCE", allowableValues = "TB_RESOURCE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "TB_RESOURCE", allowableValues = "TB_RESOURCE")
     @Override
     public EntityType getEntityType() {
         return EntityType.TB_RESOURCE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java
index aead099818..e160eb59d0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantId.java
@@ -50,7 +50,7 @@ public final class TenantId extends UUIDBased implements EntityId {
         return this.equals(SYS_TENANT_ID);
     }
 
-    @Schema(required = true, description = "string", example = "TENANT", allowableValues = "TENANT")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "TENANT", allowableValues = "TENANT")
     @Override
     public EntityType getEntityType() {
         return EntityType.TENANT;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantProfileId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantProfileId.java
index ea2aaa1ac1..7b40eb01ed 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantProfileId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/TenantProfileId.java
@@ -35,7 +35,7 @@ public class TenantProfileId extends UUIDBased implements EntityId {
         return new TenantProfileId(UUID.fromString(tenantProfileId));
     }
 
-    @Schema(required = true, description = "string", example = "TENANT_PROFILE", allowableValues = "TENANT_PROFILE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "TENANT_PROFILE", allowableValues = "TENANT_PROFILE")
     @Override
     public EntityType getEntityType() {
         return EntityType.TENANT_PROFILE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/UUIDBased.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/UUIDBased.java
index ac56ccef12..e0a1abf9ff 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/UUIDBased.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/UUIDBased.java
@@ -36,7 +36,7 @@ public abstract class UUIDBased implements HasUUID, Serializable {
         this.id = id;
     }
 
-    @Schema(required = true, description = "string", example = "784f394c-42b6-435a-983c-b7beff2784f9")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "784f394c-42b6-435a-983c-b7beff2784f9")
     public UUID getId() {
         return id;
     }
@@ -68,7 +68,7 @@ public abstract class UUIDBased implements HasUUID, Serializable {
 
     @Override
     public String toString() {
-        return id.toString();
+        return String.valueOf(id);
     }
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/UserId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/UserId.java
index 1f18f5a78e..65658246d2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/UserId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/UserId.java
@@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
 
+@Schema
 public class UserId extends UUIDBased implements EntityId {
 
     @JsonCreator
@@ -33,7 +34,7 @@ public class UserId extends UUIDBased implements EntityId {
         return new UserId(UUID.fromString(userId));
     }
 
-    @Schema(required = true, description = "string", example = "USER", allowableValues = "USER")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "USER", allowableValues = "USER")
     @Override
     public EntityType getEntityType() {
         return EntityType.USER;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetTypeId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetTypeId.java
index dfa1934499..76a631d4fb 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetTypeId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetTypeId.java
@@ -31,7 +31,7 @@ public final class WidgetTypeId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "WIDGET_TYPE", allowableValues = "WIDGET_TYPE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "WIDGET_TYPE", allowableValues = "WIDGET_TYPE")
     @Override
     public EntityType getEntityType() {
         return EntityType.WIDGET_TYPE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetsBundleId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetsBundleId.java
index eaa679bc6a..fd9d3e9db7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetsBundleId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/WidgetsBundleId.java
@@ -31,7 +31,7 @@ public final class WidgetsBundleId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    @Schema(required = true, description = "string", example = "WIDGETS_BUNDLE", allowableValues = "WIDGETS_BUNDLE")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "WIDGETS_BUNDLE", allowableValues = "WIDGETS_BUNDLE")
     @Override
     public EntityType getEntityType() {
         return EntityType.WIDGETS_BUNDLE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/DataType.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/DataType.java
index a9d857ca9e..a8ad9b42c1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/DataType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/kv/DataType.java
@@ -15,8 +15,21 @@
  */
 package org.thingsboard.server.common.data.kv;
 
+import lombok.Getter;
+
 public enum DataType {
 
-    STRING, LONG, BOOLEAN, DOUBLE, JSON;
+    BOOLEAN(0),
+    LONG(1),
+    DOUBLE(2),
+    STRING(3),
+    JSON(4);
+
+    @Getter
+    private final int protoNumber; // Corresponds to KeyValueType
+
+    DataType(int protoNumber) {
+        this.protoNumber = protoNumber;
+    }
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/Notification.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/Notification.java
index 0f7095c755..6335cb671d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/Notification.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/Notification.java
@@ -36,13 +36,12 @@ public class Notification extends BaseData<NotificationId> {
 
     private NotificationRequestId requestId;
     private UserId recipientId;
-
     private NotificationType type;
+    private NotificationDeliveryMethod deliveryMethod;
     private String subject;
     private String text;
     private JsonNode additionalConfig;
     private NotificationInfo info;
-
     private NotificationStatus status;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
index 3d419caea8..926e063f8d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2BasicMapperConfig.java
@@ -38,7 +38,7 @@ public class OAuth2BasicMapperConfig {
     @Length(fieldName = "lastNameAttributeKey", max = 31)
     @Schema(description = "Last name attribute key")
     private final String lastNameAttributeKey;
-    @Schema(description = "Tenant naming strategy. For DOMAIN type, domain for tenant name will be taken from the email (substring before '@')", required = true)
+    @Schema(description = "Tenant naming strategy. For DOMAIN type, domain for tenant name will be taken from the email (substring before '@')", requiredMode = Schema.RequiredMode.REQUIRED)
     private final TenantNameStrategyType tenantNameStrategy;
     @Length(fieldName = "tenantNamePattern")
     @Schema(description = "Tenant name pattern for CUSTOM naming strategy. " +
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java
index 0f9f580264..aa15466d0e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ClientRegistrationTemplate.java
@@ -36,7 +36,7 @@ import java.util.List;
 public class OAuth2ClientRegistrationTemplate extends BaseDataWithAdditionalInfo<OAuth2ClientRegistrationTemplateId> implements HasName {
 
     @Length(fieldName = "providerId")
-    @Schema(description = "OAuth2 provider identifier (e.g. its name)", required = true)
+    @Schema(description = "OAuth2 provider identifier (e.g. its name)", requiredMode = Schema.RequiredMode.REQUIRED)
     private String providerId;
     @Valid
     @Schema(description = "Default config for mapping OAuth2 log in response to platform entities")
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2DomainInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2DomainInfo.java
index 9ddc3c8492..dc70213e95 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2DomainInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2DomainInfo.java
@@ -31,8 +31,8 @@ import lombok.ToString;
 @Builder
 @Schema
 public class OAuth2DomainInfo {
-    @Schema(description = "Domain scheme. Mixed scheme means than both HTTP and HTTPS are going to be used", required = true)
+    @Schema(description = "Domain scheme. Mixed scheme means than both HTTP and HTTPS are going to be used", requiredMode = Schema.RequiredMode.REQUIRED)
     private SchemeType scheme;
-    @Schema(description = "Domain name. Cannot be empty", required = true)
+    @Schema(description = "Domain name. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String name;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Info.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Info.java
index c163647d49..0a2ace050c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Info.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Info.java
@@ -35,6 +35,8 @@ import java.util.List;
 public class OAuth2Info {
     @Schema(description = "Whether OAuth2 settings are enabled or not")
     private boolean enabled;
-    @Schema(description = "List of configured OAuth2 clients. Cannot contain null values", required = true)
+    @Schema(description = "Whether OAuth2 settings are enabled on Edge or not")
+    private boolean edgeEnabled;
+    @Schema(description = "List of configured OAuth2 clients. Cannot contain null values", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<OAuth2ParamsInfo> oauth2ParamsInfos;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MapperConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MapperConfig.java
index ad39cdad04..be13a032e2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MapperConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MapperConfig.java
@@ -32,7 +32,7 @@ public class OAuth2MapperConfig {
     private boolean allowUserCreation;
     @Schema(description = "Whether user credentials should be activated when user is created after successful authentication")
     private boolean activateUser;
-    @Schema(description = "Type of OAuth2 mapper. Depending on this param, different mapper config fields must be specified", required = true)
+    @Schema(description = "Type of OAuth2 mapper. Depending on this param, different mapper config fields must be specified", requiredMode = Schema.RequiredMode.REQUIRED)
     private MapperType type;
     @Valid
     @Schema(description = "Mapper config for BASIC and GITHUB mapper types")
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MobileInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MobileInfo.java
index 8aaffb80aa..053762bdf0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MobileInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2MobileInfo.java
@@ -31,8 +31,8 @@ import lombok.ToString;
 @Builder
 @Schema
 public class OAuth2MobileInfo {
-    @Schema(description = "Application package name. Cannot be empty", required = true)
+    @Schema(description = "Application package name. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String pkgName;
-    @Schema(description = "Application secret. The length must be at least 16 characters", required = true)
+    @Schema(description = "Application secret. The length must be at least 16 characters", requiredMode = Schema.RequiredMode.REQUIRED)
     private String appSecret;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Params.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Params.java
index 3f847c2f9e..70020fc7cd 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Params.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2Params.java
@@ -30,11 +30,13 @@ import org.thingsboard.server.common.data.id.TenantId;
 public class OAuth2Params extends BaseData<OAuth2ParamsId> {
 
     private boolean enabled;
+    private boolean edgeEnabled;
     private TenantId tenantId;
 
     public OAuth2Params(OAuth2Params oauth2Params) {
         super(oauth2Params);
         this.enabled = oauth2Params.enabled;
+        this.edgeEnabled = oauth2Params.edgeEnabled;
         this.tenantId = oauth2Params.tenantId;
     }
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ParamsInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ParamsInfo.java
index 76dca282cf..c1b6124b8f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ParamsInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2ParamsInfo.java
@@ -36,11 +36,11 @@ public class OAuth2ParamsInfo {
 
     @Schema(description = "List of configured domains where OAuth2 platform will redirect a user after successful " +
             "authentication. Cannot be empty. There have to be only one domain with specific name with scheme type 'MIXED'. " +
-            "Configured domains with the same name must have different scheme types", required = true)
+            "Configured domains with the same name must have different scheme types", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<OAuth2DomainInfo> domainInfos;
-    @Schema(description = "Mobile applications settings. Application package name must be unique within the list", required = true)
+    @Schema(description = "Mobile applications settings. Application package name must be unique within the list", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<OAuth2MobileInfo> mobileInfos;
-    @Schema(description = "List of OAuth2 provider settings. Cannot be empty", required = true)
+    @Schema(description = "List of OAuth2 provider settings. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<OAuth2RegistrationInfo> clientRegistrations;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2RegistrationInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2RegistrationInfo.java
index 1773583ffc..36bae12b23 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2RegistrationInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/OAuth2RegistrationInfo.java
@@ -34,17 +34,17 @@ import java.util.List;
 @Builder
 @Schema
 public class OAuth2RegistrationInfo {
-    @Schema(description = "Config for mapping OAuth2 log in response to platform entities", required = true)
+    @Schema(description = "Config for mapping OAuth2 log in response to platform entities", requiredMode = Schema.RequiredMode.REQUIRED)
     private OAuth2MapperConfig mapperConfig;
-    @Schema(description = "OAuth2 client ID. Cannot be empty", required = true)
+    @Schema(description = "OAuth2 client ID. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String clientId;
-    @Schema(description = "OAuth2 client secret. Cannot be empty", required = true)
+    @Schema(description = "OAuth2 client secret. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String clientSecret;
-    @Schema(description = "Authorization URI of the OAuth2 provider. Cannot be empty", required = true)
+    @Schema(description = "Authorization URI of the OAuth2 provider. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String authorizationUri;
-    @Schema(description = "Access token URI of the OAuth2 provider. Cannot be empty", required = true)
+    @Schema(description = "Access token URI of the OAuth2 provider. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String accessTokenUri;
-    @Schema(description = "OAuth scopes that will be requested from OAuth2 platform. Cannot be empty", required = true)
+    @Schema(description = "OAuth scopes that will be requested from OAuth2 platform. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<String> scope;
     @Schema(description = "User info URI of the OAuth2 provider")
     private String userInfoUri;
@@ -52,14 +52,14 @@ public class OAuth2RegistrationInfo {
     private String userNameAttributeName;
     @Schema(description = "JSON Web Key URI of the OAuth2 provider")
     private String jwkSetUri;
-    @Schema(description = "Client authentication method to use: 'BASIC' or 'POST'. Cannot be empty", required = true)
+    @Schema(description = "Client authentication method to use: 'BASIC' or 'POST'. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String clientAuthenticationMethod;
-    @Schema(description = "OAuth2 provider label. Cannot be empty", required = true)
+    @Schema(description = "OAuth2 provider label. Cannot be empty", requiredMode = Schema.RequiredMode.REQUIRED)
     private String loginButtonLabel;
     @Schema(description = "Log in button icon for OAuth2 provider")
     private String loginButtonIcon;
     @Schema(description = "List of platforms for which usage of the OAuth2 client is allowed (empty for all allowed)")
     private List<PlatformType> platforms;
-    @Schema(description = "Additional info of OAuth2 client (e.g. providerName)", required = true)
+    @Schema(description = "Additional info of OAuth2 client (e.g. providerName)", requiredMode = Schema.RequiredMode.REQUIRED)
     private JsonNode additionalInfo;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java
index a6f504577b..309385d5e4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java
@@ -31,11 +31,11 @@ import java.util.List;
 @NoArgsConstructor
 public class AttributesEntityView implements Serializable {
 
-    @Schema(required = true, description = "List of client-side attribute keys to expose", example = "currentConfiguration")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of client-side attribute keys to expose", example = "currentConfiguration")
     private List<String> cs = new ArrayList<>();
-    @Schema(required = true, description = "List of server-side attribute keys to expose", example = "model")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of server-side attribute keys to expose", example = "model")
     private List<String> ss = new ArrayList<>();
-    @Schema(required = true, description = "List of shared attribute keys to expose", example = "targetConfiguration")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of shared attribute keys to expose", example = "targetConfiguration")
     private List<String> sh = new ArrayList<>();
 
     public AttributesEntityView(List<String> cs,
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java
index 609d185f9c..a2484b0707 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java
@@ -31,9 +31,9 @@ import java.util.List;
 @NoArgsConstructor
 public class TelemetryEntityView implements Serializable {
 
-    @Schema(required = true, description = "List of time-series data keys to expose", example = "temperature, humidity")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of time-series data keys to expose", example = "temperature, humidity")
     private List<String> timeseries;
-    @Schema(required = true, description = "JSON object with attributes to expose")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with attributes to expose")
     private AttributesEntityView attributes;
 
     public TelemetryEntityView(List<String> timeseries, AttributesEntityView attributes) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java b/common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java
index 14f98ca97d..042a9b1896 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/page/PageLink.java
@@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.springframework.data.domain.Sort;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -65,19 +66,19 @@ public class PageLink {
         return new PageLink(this.pageSize, this.page+1, this.textSearch, this.sortOrder);
     }
 
-    public Sort toSort(SortOrder sortOrder, Map<String,String> columnMap) {
+    public Sort toSort(SortOrder sortOrder, Map<String,String> columnMap, boolean addDefaultSorting) {
         if (sortOrder == null) {
             return DEFAULT_SORT;
         } else {
-            String property = sortOrder.getProperty();
-            if (columnMap.containsKey(property)) {
-                property = columnMap.get(property);
-            }
-            return Sort.by(Sort.Direction.fromString(sortOrder.getDirection().name()), property);
+            return toSort(List.of(sortOrder), columnMap, addDefaultSorting);
         }
     }
 
-    public Sort toSort(List<SortOrder> sortOrders, Map<String,String> columnMap) {
+    public Sort toSort(List<SortOrder> sortOrders, Map<String,String> columnMap, boolean addDefaultSorting) {
+        if (addDefaultSorting && !isDefaultSortOrderAvailable(sortOrders)) {
+            sortOrders = new ArrayList<>(sortOrders);
+            sortOrders.add(new SortOrder(DEFAULT_SORT_PROPERTY, SortOrder.Direction.ASC));
+        }
         return Sort.by(sortOrders.stream().map(s -> toSortOrder(s, columnMap)).collect(Collectors.toList()));
     }
 
@@ -86,7 +87,16 @@ public class PageLink {
         if (columnMap.containsKey(property)) {
             property = columnMap.get(property);
         }
-        return new Sort.Order(Sort.Direction.fromString(sortOrder.getDirection().name()), property, Sort.NullHandling.NULLS_LAST);
+        return new Sort.Order(Sort.Direction.fromString(sortOrder.getDirection().name()), property);
+    }
+
+    public boolean isDefaultSortOrderAvailable(List<SortOrder> sortOrders) {
+        for (SortOrder sortOrder : sortOrders) {
+            if (DEFAULT_SORT_PROPERTY.equals(sortOrder.getProperty())) {
+                return true;
+            }
+        }
+        return false;
     }
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/page/TimePageLink.java b/common/data/src/main/java/org/thingsboard/server/common/data/page/TimePageLink.java
index c9dacbff40..365d4f7e35 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/page/TimePageLink.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/page/TimePageLink.java
@@ -19,11 +19,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.springframework.data.domain.Sort;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 
 @Data
 @ToString(callSuper = true)
@@ -67,29 +62,4 @@ public class TimePageLink extends PageLink {
                 this.startTime, this.endTime);
     }
 
-    @Override
-    public Sort toSort(SortOrder sortOrder, Map<String,String> columnMap) {
-        if (sortOrder == null) {
-            return super.toSort(sortOrder, columnMap);
-        } else {
-            return toSort(new ArrayList<>(List.of(sortOrder)), columnMap);
-        }
-    }
-
-    @Override
-    public Sort toSort(List<SortOrder> sortOrders, Map<String,String> columnMap) {
-        if (!isDefaultSortOrderAvailable(sortOrders)) {
-            sortOrders.add(new SortOrder(DEFAULT_SORT_PROPERTY, SortOrder.Direction.ASC));
-        }
-        return super.toSort(sortOrders, columnMap);
-    }
-
-    private boolean isDefaultSortOrderAvailable(List<SortOrder> sortOrders) {
-        for (SortOrder sortOrder : sortOrders) {
-            if (DEFAULT_SORT_PROPERTY.equals(sortOrder.getProperty())) {
-                return true;
-            }
-        }
-        return false;
-    }
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/queue/QueueStats.java b/common/data/src/main/java/org/thingsboard/server/common/data/queue/QueueStats.java
new file mode 100644
index 0000000000..04d50dfe6a
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/queue/QueueStats.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.queue;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.BaseData;
+import org.thingsboard.server.common.data.HasTenantId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.QueueStatsId;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class QueueStats extends BaseData<QueueStatsId> implements HasTenantId {
+    private TenantId tenantId;
+    private String queueName;
+    private String serviceId;
+
+    public QueueStats() {
+    }
+
+    public QueueStats(QueueStatsId id) {
+        super(id);
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/DefaultRuleChainCreateRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/DefaultRuleChainCreateRequest.java
index d984fd244d..cda3072101 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/DefaultRuleChainCreateRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/DefaultRuleChainCreateRequest.java
@@ -28,7 +28,7 @@ public class DefaultRuleChainCreateRequest implements Serializable {
 
     private static final long serialVersionUID = 5600333716030561537L;
 
-    @Schema(required = true, description = "Name of the new rule chain", example = "Root Rule Chain")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Name of the new rule chain", example = "Root Rule Chain")
     private String name;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/NodeConnectionInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/NodeConnectionInfo.java
index 82be10c121..fe80293d16 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/NodeConnectionInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/NodeConnectionInfo.java
@@ -24,10 +24,10 @@ import lombok.Data;
 @Schema
 @Data
 public class NodeConnectionInfo {
-    @Schema(required = true, description = "Index of rule node in the 'nodes' array of the RuleChainMetaData. Indicates the 'from' part of the connection.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Index of rule node in the 'nodes' array of the RuleChainMetaData. Indicates the 'from' part of the connection.")
     private int fromIndex;
-    @Schema(required = true, description = "Index of rule node in the 'nodes' array of the RuleChainMetaData. Indicates the 'to' part of the connection.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Index of rule node in the 'nodes' array of the RuleChainMetaData. Indicates the 'to' part of the connection.")
     private int toIndex;
-    @Schema(required = true, description = "Type of the relation. Typically indicated the result of processing by the 'from' rule node. For example, 'Success' or 'Failure'")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the relation. Typically indicated the result of processing by the 'from' rule node. For example, 'Success' or 'Failure'")
     private String type;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
index be901a9176..c293e6f570 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
@@ -39,11 +39,11 @@ public class RuleChain extends BaseDataWithAdditionalInfo<RuleChainId> implement
 
     private static final long serialVersionUID = -5656679015121935465L;
 
-    @Schema(required = true, description = "JSON object with Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with Tenant Id.", accessMode = Schema.AccessMode.READ_ONLY)
     private TenantId tenantId;
     @NoXss
     @Length(fieldName = "name")
-    @Schema(required = true, description = "Rule Chain name", example = "Humidity data processing")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Chain name", example = "Humidity data processing")
     private String name;
     @Schema(description = "Rule Chain type. 'EDGE' rule chains are processing messages on the edge devices only.", example = "A4B72CCDFF33")
     private RuleChainType type;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainConnectionInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainConnectionInfo.java
index 654f296c63..029cfb9976 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainConnectionInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainConnectionInfo.java
@@ -26,12 +26,12 @@ import org.thingsboard.server.common.data.id.RuleChainId;
 @Schema
 @Data
 public class RuleChainConnectionInfo {
-    @Schema(required = true, description = "Index of rule node in the 'nodes' array of the RuleChainMetaData. Indicates the 'from' part of the connection.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Index of rule node in the 'nodes' array of the RuleChainMetaData. Indicates the 'from' part of the connection.")
     private int fromIndex;
-    @Schema(required = true, description = "JSON object with the Rule Chain Id.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with the Rule Chain Id.")
     private RuleChainId targetRuleChainId;
-    @Schema(required = true, description = "JSON object with the additional information about the connection.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with the additional information about the connection.")
     private JsonNode additionalInfo;
-    @Schema(required = true, description = "Type of the relation. Typically indicated the result of processing by the 'from' rule node. For example, 'Success' or 'Failure'")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the relation. Typically indicated the result of processing by the 'from' rule node. For example, 'Success' or 'Failure'")
     private String type;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainData.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainData.java
index e9899d6019..e75d830e84 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainData.java
@@ -24,8 +24,8 @@ import java.util.List;
 @Data
 public class RuleChainData {
 
-    @Schema(required = true, description = "List of the Rule Chain objects.", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of the Rule Chain objects.", accessMode = Schema.AccessMode.READ_ONLY)
     List<RuleChain> ruleChains;
-    @Schema(required = true, description = "List of the Rule Chain metadata objects.", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of the Rule Chain metadata objects.", accessMode = Schema.AccessMode.READ_ONLY)
     List<RuleChainMetaData> metadata;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java
index 9a7bc70a7f..eb18e28c8c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java
@@ -29,19 +29,19 @@ import java.util.List;
 @Data
 public class RuleChainMetaData {
 
-    @Schema(required = true, description = "JSON object with Rule Chain Id.", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with Rule Chain Id.", accessMode = Schema.AccessMode.READ_ONLY)
     private RuleChainId ruleChainId;
 
-    @Schema(required = true, description = "Index of the first rule node in the 'nodes' list")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Index of the first rule node in the 'nodes' list")
     private Integer firstNodeIndex;
 
-    @Schema(required = true, description = "List of rule node JSON objects")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of rule node JSON objects")
     private List<RuleNode> nodes;
 
-    @Schema(required = true, description = "List of JSON objects that represent connections between rule nodes")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of JSON objects that represent connections between rule nodes")
     private List<NodeConnectionInfo> connections;
 
-    @Schema(required = true, description = "List of JSON objects that represent connections between rule nodes and other rule chains.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "List of JSON objects that represent connections between rule nodes and other rule chains.")
     private List<RuleChainConnectionInfo> ruleChainConnections;
 
     public void addConnectionInfo(int fromIndex, int toIndex, String type) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainOutputLabelsUsage.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainOutputLabelsUsage.java
index d0c7186501..b9fb1fc6d8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainOutputLabelsUsage.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainOutputLabelsUsage.java
@@ -28,16 +28,16 @@ import java.util.Set;
 @Slf4j
 public class RuleChainOutputLabelsUsage {
 
-    @Schema(required = true, description = "Rule Chain Id", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Chain Id", accessMode = Schema.AccessMode.READ_ONLY)
     private RuleChainId ruleChainId;
-    @Schema(required = true, description = "Rule Node Id", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Node Id", accessMode = Schema.AccessMode.READ_ONLY)
     private RuleNodeId ruleNodeId;
 
-    @Schema(required = true, description = "Rule Chain Name", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Chain Name", accessMode = Schema.AccessMode.READ_ONLY)
     private String ruleChainName;
-    @Schema(required = true, description = "Rule Node Name", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Rule Node Name", accessMode = Schema.AccessMode.READ_ONLY)
     private String ruleNodeName;
-    @Schema(required = true, description = "Output labels", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Output labels", accessMode = Schema.AccessMode.READ_ONLY)
     private Set<String> labels;
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentials.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentials.java
index f59b86af63..24d8cc1175 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentials.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentials.java
@@ -47,7 +47,7 @@ public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements
         this.credentialsValue = deviceCredentials.getCredentialsValue();
     }
 
-    @Schema(required = true, accessMode = Schema.AccessMode.READ_ONLY, description = "The Id is automatically generated during device creation. " +
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, accessMode = Schema.AccessMode.READ_ONLY, description = "The Id is automatically generated during device creation. " +
             "Use 'getDeviceCredentialsByDeviceId' to obtain the id based on device id. " +
             "Use 'updateDeviceCredentials' to update device credentials. ", example = "784f394c-42b6-435a-983c-b7beff2784f9")
     @Override
@@ -61,7 +61,7 @@ public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements
         return super.getCreatedTime();
     }
 
-    @Schema(required = true, description = "JSON object with the device Id.")
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "JSON object with the device Id.")
     public DeviceId getDeviceId() {
         return deviceId;
     }
@@ -80,7 +80,7 @@ public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements
         this.credentialsType = credentialsType;
     }
 
-    @Schema(required = true, description = "Unique Credentials Id per platform instance. " +
+    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Unique Credentials Id per platform instance. " +
             "Used to lookup credentials from the database. " +
             "By default, new access token for your device. " +
             "Depends on the type of the credentials."
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java
index 8ed16a1c1c..5fc0c14d61 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java
@@ -20,27 +20,27 @@ import lombok.Data;
 
 @Data
 public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
-    @Schema(description = "SMPP version", allowableValues = "3.3, 3.4", required = true)
+    @Schema(description = "SMPP version", allowableValues = "3.3, 3.4", requiredMode = Schema.RequiredMode.REQUIRED)
     private String protocolVersion;
 
-    @Schema(description = "SMPP host", required = true)
+    @Schema(description = "SMPP host", requiredMode = Schema.RequiredMode.REQUIRED)
     private String host;
-    @Schema(description = "SMPP port", required = true)
+    @Schema(description = "SMPP port", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer port;
 
-    @Schema(description = "System ID", required = true)
+    @Schema(description = "System ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private String systemId;
-    @Schema(description = "Password", required = true)
+    @Schema(description = "Password", requiredMode = Schema.RequiredMode.REQUIRED)
     private String password;
 
-    @Schema(description = "System type", required = false)
+    @Schema(description = "System type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String systemType;
-    @Schema(description = "TX - Transmitter, RX - Receiver, TRX - Transciever. By default TX is used", required = false)
+    @Schema(description = "TX - Transmitter, RX - Receiver, TRX - Transciever. By default TX is used", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private SmppBindType bindType;
-    @Schema(description = "Service type", required = false)
+    @Schema(description = "Service type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String serviceType;
 
-    @Schema(description = "Source address", required = false)
+    @Schema(description = "Source address", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String sourceAddress;
     @Schema(description = "Source TON (Type of Number). Needed is source address is set. 5 by default.\n" +
             "0 - Unknown\n" +
@@ -49,7 +49,7 @@ public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
             "3 - Network Specific\n" +
             "4 - Subscriber Number\n" +
             "5 - Alphanumeric\n" +
-            "6 - Abbreviated", required = false)
+            "6 - Abbreviated", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Byte sourceTon;
     @Schema(description = "Source NPI (Numbering Plan Identification). Needed is source address is set. 0 by default.\n" +
             "0 - Unknown\n" +
@@ -61,7 +61,7 @@ public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
             "9 - Private numbering plan\n" +
             "10 - ERMES numbering plan (ETSI DE/PS 3 01-3)\n" +
             "13 - Internet (IP)\n" +
-            "18 - WAP Client Id (to be defined by WAP Forum)", required = false)
+            "18 - WAP Client Id (to be defined by WAP Forum)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Byte sourceNpi;
 
     @Schema(description = "Destination TON (Type of Number). 5 by default.\n" +
@@ -71,7 +71,7 @@ public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
             "3 - Network Specific\n" +
             "4 - Subscriber Number\n" +
             "5 - Alphanumeric\n" +
-            "6 - Abbreviated", required = false)
+            "6 - Abbreviated", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Byte destinationTon;
     @Schema(description = "Destination NPI (Numbering Plan Identification). 0 by default.\n" +
             "0 - Unknown\n" +
@@ -83,10 +83,10 @@ public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
             "9 - Private numbering plan\n" +
             "10 - ERMES numbering plan (ETSI DE/PS 3 01-3)\n" +
             "13 - Internet (IP)\n" +
-            "18 - WAP Client Id (to be defined by WAP Forum)", required = false)
+            "18 - WAP Client Id (to be defined by WAP Forum)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Byte destinationNpi;
 
-    @Schema(description = "Address range", required = false)
+    @Schema(description = "Address range", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String addressRange;
 
     @Schema(allowableValues = "0-10,13-14",
@@ -102,7 +102,7 @@ public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
                     "9 - Pictogram Encoding\n" +
                     "10 - Music Codes (ISO-2022-JP)\n" +
                     "13 - Extended Kanji JIS (X 0212-1990)\n" +
-                    "14 - Korean Graphic Character Set (KS C 5601/KS X 1001)", required = false)
+                    "14 - Korean Graphic Character Set (KS C 5601/KS X 1001)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Byte codingScheme;
 
     @Override
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/EntityTypeVersionLoadRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/EntityTypeVersionLoadRequest.java
index bcc6fc9c5b..7eca2c04de 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/EntityTypeVersionLoadRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/EntityTypeVersionLoadRequest.java
@@ -26,6 +26,7 @@ import java.util.Map;
 public class EntityTypeVersionLoadRequest extends VersionLoadRequest {
 
     private Map<EntityType, EntityTypeVersionLoadConfig> entityTypes;
+    private boolean rollbackOnError;
 
     @Override
     public VersionLoadRequestType getType() {
diff --git a/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java b/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
index 3c4a1e6be9..23bfe55f1b 100644
--- a/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
+++ b/common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java
@@ -111,7 +111,7 @@ public class EdgeGrpcClient implements EdgeRpcClient {
                 .setConnectRequestMsg(ConnectRequestMsg.newBuilder()
                         .setEdgeRoutingKey(edgeKey)
                         .setEdgeSecret(edgeSecret)
-                        .setEdgeVersion(EdgeVersion.V_3_6_2)
+                        .setEdgeVersion(EdgeVersion.V_3_7_0)
                         .setMaxInboundMessageSize(maxInboundMessageSize)
                         .build())
                 .build());
@@ -248,4 +248,5 @@ public class EdgeGrpcClient implements EdgeRpcClient {
             uplinkMsgLock.unlock();
         }
     }
+
 }
diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
index 34a8c6f093..7c60985683 100644
--- a/common/edge-api/src/main/proto/edge.proto
+++ b/common/edge-api/src/main/proto/edge.proto
@@ -37,6 +37,8 @@ enum EdgeVersion {
   V_3_6_0 = 3;
   V_3_6_1 = 4;
   V_3_6_2 = 5;
+  V_3_6_4 = 6;
+  V_3_7_0 = 7;
 }
 
 /**
@@ -467,6 +469,31 @@ message ResourceUpdateMsg {
   string entity = 11;
 }
 
+message OAuth2UpdateMsg {
+  string entity = 1;
+}
+
+message NotificationRuleUpdateMsg {
+  UpdateMsgType msgType = 1;
+  optional int64 idMSB = 2;
+  optional int64 idLSB = 3;
+  optional string entity = 4;
+}
+
+message NotificationTargetUpdateMsg {
+  UpdateMsgType msgType = 1;
+  optional int64 idMSB = 2;
+  optional int64 idLSB = 3;
+  optional string entity = 4;
+}
+
+message NotificationTemplateUpdateMsg {
+  UpdateMsgType msgType = 1;
+  optional int64 idMSB = 2;
+  optional int64 idLSB = 3;
+  optional string entity = 4;
+}
+
 message RuleChainMetadataRequestMsg {
   int64 ruleChainIdMSB = 1;
   int64 ruleChainIdLSB = 2;
@@ -668,5 +695,9 @@ message DownlinkMsg {
   repeated TenantProfileUpdateMsg tenantProfileUpdateMsg = 27;
   repeated ResourceUpdateMsg resourceUpdateMsg = 28;
   repeated AlarmCommentUpdateMsg alarmCommentUpdateMsg = 29;
+  repeated OAuth2UpdateMsg oAuth2UpdateMsg = 30;
+  repeated NotificationRuleUpdateMsg notificationRuleUpdateMsg = 31;
+  repeated NotificationTargetUpdateMsg notificationTargetUpdateMsg = 32;
+  repeated NotificationTemplateUpdateMsg notificationTemplateUpdateMsg = 33;
 }
 
diff --git a/common/proto/src/main/java/org/thingsboard/server/common/adaptor/JsonConverter.java b/common/proto/src/main/java/org/thingsboard/server/common/adaptor/JsonConverter.java
index 42da1d740f..72ae3a0871 100644
--- a/common/proto/src/main/java/org/thingsboard/server/common/adaptor/JsonConverter.java
+++ b/common/proto/src/main/java/org/thingsboard/server/common/adaptor/JsonConverter.java
@@ -66,7 +66,6 @@ import java.util.stream.Collectors;
 public class JsonConverter {
 
     private static final Gson GSON = new Gson();
-    private static final JsonParser JSON_PARSER = new JsonParser();
     private static final String CAN_T_PARSE_VALUE = "Can't parse value: ";
     private static final String DEVICE_PROPERTY = "device";
 
@@ -111,7 +110,7 @@ public class JsonConverter {
     public static ClaimDeviceMsg convertToClaimDeviceProto(DeviceId deviceId, String json) {
         long durationMs = 0L;
         if (json != null && !json.isEmpty()) {
-            return convertToClaimDeviceProto(deviceId, JSON_PARSER.parse(json));
+            return convertToClaimDeviceProto(deviceId, JsonParser.parseString(json));
         }
         return buildClaimDeviceMsg(deviceId, DataConstants.DEFAULT_SECRET_KEY, durationMs);
     }
@@ -160,7 +159,7 @@ public class JsonConverter {
             result.addProperty("id", msg.getRequestId());
         }
         result.addProperty("method", msg.getMethodName());
-        result.add("params", JSON_PARSER.parse(msg.getParams()));
+        result.add("params", JsonParser.parseString(msg.getParams()));
         return result;
     }
 
@@ -367,7 +366,7 @@ public class JsonConverter {
                 json.addProperty(name, entry.getLongV());
                 break;
             case JSON_V:
-                json.add(name, JSON_PARSER.parse(entry.getJsonV()));
+                json.add(name, JsonParser.parseString(entry.getJsonV()));
                 break;
         }
     }
@@ -388,7 +387,7 @@ public class JsonConverter {
                     result.add(de.getKv().getKey(), new JsonPrimitive(de.getKv().getStringV()));
                     break;
                 case JSON_V:
-                    result.add(de.getKv().getKey(), JSON_PARSER.parse(de.getKv().getJsonV()));
+                    result.add(de.getKv().getKey(), JsonParser.parseString(de.getKv().getJsonV()));
                     break;
                 default:
                     throw new IllegalArgumentException("Unsupported data type: " + de.getKv().getType());
@@ -412,7 +411,7 @@ public class JsonConverter {
                     result.add(de.getKey(), new JsonPrimitive(de.getStrValue().get()));
                     break;
                 case JSON:
-                    result.add(de.getKey(), JSON_PARSER.parse(de.getJsonValue().get()));
+                    result.add(de.getKey(), JsonParser.parseString(de.getJsonValue().get()));
                     break;
                 default:
                     throw new IllegalArgumentException("Unsupported data type: " + de.getDataType());
@@ -422,7 +421,7 @@ public class JsonConverter {
 
     public static JsonElement toJson(TransportProtos.ToServerRpcResponseMsg msg) {
         if (StringUtils.isEmpty(msg.getError())) {
-            return JSON_PARSER.parse(msg.getPayload());
+            return JsonParser.parseString(msg.getPayload());
         } else {
             JsonObject errorMsg = new JsonObject();
             errorMsg.addProperty("error", msg.getError());
@@ -456,7 +455,7 @@ public class JsonConverter {
                     result.addProperty("credentialsValue", payload.getCredentialsValue());
                     break;
                 case MQTT_BASIC:
-                    result.add("credentialsValue", JSON_PARSER.parse(payload.getCredentialsValue()).getAsJsonObject());
+                    result.add("credentialsValue", JsonParser.parseString(payload.getCredentialsValue()).getAsJsonObject());
                     break;
                 case LWM2M_CREDENTIALS:
                     break;
@@ -572,7 +571,7 @@ public class JsonConverter {
     }
 
     public static JsonElement parse(String json) {
-        return JSON_PARSER.parse(json);
+        return JsonParser.parseString(json);
     }
 
     public static <T> T parse(String json, Class<T> clazz) {
@@ -600,7 +599,7 @@ public class JsonConverter {
     }
 
     public static TransportProtos.ProvisionDeviceRequestMsg convertToProvisionRequestMsg(String json) {
-        JsonElement jsonElement = JSON_PARSER.parse(json);
+        JsonElement jsonElement = JsonParser.parseString(json);
         if (jsonElement.isJsonObject()) {
             return buildProvisionRequestMsg(jsonElement.getAsJsonObject());
         } else {
diff --git a/common/proto/src/main/java/org/thingsboard/server/common/adaptor/ProtoConverter.java b/common/proto/src/main/java/org/thingsboard/server/common/adaptor/ProtoConverter.java
index b90b5f054f..2aa73928e5 100644
--- a/common/proto/src/main/java/org/thingsboard/server/common/adaptor/ProtoConverter.java
+++ b/common/proto/src/main/java/org/thingsboard/server/common/adaptor/ProtoConverter.java
@@ -39,7 +39,6 @@ import java.util.List;
 public class ProtoConverter {
 
     public static final Gson GSON = new Gson();
-    public static final JsonParser JSON_PARSER = new JsonParser();
 
     public static TransportProtos.PostTelemetryMsg convertToTelemetryProto(byte[] payload) throws InvalidProtocolBufferException, IllegalArgumentException {
         TransportProtos.TsKvListProto protoPayload = TransportProtos.TsKvListProto.parseFrom(payload);
@@ -165,7 +164,7 @@ public class ProtoConverter {
                     break;
                 case JSON_V:
                     try {
-                        JSON_PARSER.parse(keyValueProto.getJsonV());
+                        JsonParser.parseString(keyValueProto.getJsonV());
                     } catch (Exception e) {
                         throw new IllegalArgumentException("Can't parse value: " + keyValueProto.getJsonV() + " for key: " + key + "!");
                     }
@@ -184,7 +183,7 @@ public class ProtoConverter {
         rpcRequestJson.addProperty("requestId", toDeviceRpcRequestMsg.getRequestId());
         String params = toDeviceRpcRequestMsg.getParams();
         try {
-            JsonElement paramsElement = JSON_PARSER.parse(params);
+            JsonElement paramsElement = JsonParser.parseString(params);
             rpcRequestJson.add("params", paramsElement);
             DynamicMessage dynamicRpcRequest = DynamicProtoUtils.jsonToDynamicMessage(rpcRequestDynamicMessageBuilder, GSON.toJson(rpcRequestJson));
             return dynamicRpcRequest.toByteArray();
diff --git a/common/proto/src/main/java/org/thingsboard/server/common/util/KvProtoUtil.java b/common/proto/src/main/java/org/thingsboard/server/common/util/KvProtoUtil.java
index 504ffe368d..74674e1e45 100644
--- a/common/proto/src/main/java/org/thingsboard/server/common/util/KvProtoUtil.java
+++ b/common/proto/src/main/java/org/thingsboard/server/common/util/KvProtoUtil.java
@@ -29,11 +29,26 @@ import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.gen.transport.TransportProtos;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 public class KvProtoUtil {
 
+    private static final DataType[] dataTypeByProtoNumber;
+
+    static {
+        int arraySize = Arrays.stream(DataType.values()).mapToInt(DataType::getProtoNumber).max().orElse(0);
+        dataTypeByProtoNumber = new DataType[arraySize + 1];
+        Arrays.stream(DataType.values()).forEach(dataType -> dataTypeByProtoNumber[dataType.getProtoNumber()] = dataType);
+    }
+
+    public static List<AttributeKvEntry> toAttributeKvList(List<TransportProtos.TsKvProto> dataList) {
+        List<AttributeKvEntry> result = new ArrayList<>(dataList.size());
+        dataList.forEach(proto -> result.add(new BaseAttributeKvEntry(fromTsKvProto(proto.getKv()), proto.getTs())));
+        return result;
+    }
+
     public static List<TransportProtos.TsKvProto> attrToTsKvProtos(List<AttributeKvEntry> result) {
         List<TransportProtos.TsKvProto> clientAttributes;
         if (result == null || result.isEmpty()) {
@@ -47,8 +62,7 @@ public class KvProtoUtil {
         return clientAttributes;
     }
 
-
-    public static List<TransportProtos.TsKvProto> tsToTsKvProtos(List<TsKvEntry> result) {
+    public static List<TransportProtos.TsKvProto> toTsKvProtoList(List<TsKvEntry> result) {
         List<TransportProtos.TsKvProto> ts;
         if (result == null || result.isEmpty()) {
             ts = Collections.emptyList();
@@ -61,95 +75,85 @@ public class KvProtoUtil {
         return ts;
     }
 
+    public static List<TsKvEntry> fromTsKvProtoList(List<TransportProtos.TsKvProto> dataList) {
+        List<TsKvEntry> result = new ArrayList<>(dataList.size());
+        dataList.forEach(proto -> result.add(new BasicTsKvEntry(proto.getTs(), fromTsKvProto(proto.getKv()))));
+        return result;
+    }
+
     public static TransportProtos.TsKvProto toTsKvProto(long ts, KvEntry kvEntry) {
         return TransportProtos.TsKvProto.newBuilder().setTs(ts)
-                .setKv(KvProtoUtil.toKeyValueProto(kvEntry)).build();
+                .setKv(KvProtoUtil.toKeyValueTypeProto(kvEntry)).build();
+    }
+
+    public static TsKvEntry fromTsKvProto(TransportProtos.TsKvProto proto) {
+        return new BasicTsKvEntry(proto.getTs(), fromTsKvProto(proto.getKv()));
     }
 
-    public static TransportProtos.KeyValueProto toKeyValueProto(KvEntry kvEntry) {
+    public static TransportProtos.KeyValueProto toKeyValueTypeProto(KvEntry kvEntry) {
         TransportProtos.KeyValueProto.Builder builder = TransportProtos.KeyValueProto.newBuilder();
         builder.setKey(kvEntry.getKey());
+        builder.setType(toKeyValueTypeProto(kvEntry.getDataType()));
         switch (kvEntry.getDataType()) {
-            case BOOLEAN:
-                builder.setType(TransportProtos.KeyValueType.BOOLEAN_V);
-                builder.setBoolV(kvEntry.getBooleanValue().get());
-                break;
-            case DOUBLE:
-                builder.setType(TransportProtos.KeyValueType.DOUBLE_V);
-                builder.setDoubleV(kvEntry.getDoubleValue().get());
-                break;
-            case LONG:
-                builder.setType(TransportProtos.KeyValueType.LONG_V);
-                builder.setLongV(kvEntry.getLongValue().get());
-                break;
-            case STRING:
-                builder.setType(TransportProtos.KeyValueType.STRING_V);
-                builder.setStringV(kvEntry.getStrValue().get());
-                break;
-            case JSON:
-                builder.setType(TransportProtos.KeyValueType.JSON_V);
-                builder.setJsonV(kvEntry.getJsonValue().get());
-                break;
+            case BOOLEAN -> kvEntry.getBooleanValue().ifPresent(builder::setBoolV);
+            case LONG -> kvEntry.getLongValue().ifPresent(builder::setLongV);
+            case DOUBLE -> kvEntry.getDoubleValue().ifPresent(builder::setDoubleV);
+            case JSON -> kvEntry.getJsonValue().ifPresent(builder::setJsonV);
+            case STRING -> kvEntry.getStrValue().ifPresent(builder::setStringV);
         }
         return builder.build();
     }
 
-    public static TransportProtos.TsKvProto.Builder toKeyValueProto(long ts, KvEntry attr) {
-        TransportProtos.KeyValueProto.Builder dataBuilder = TransportProtos.KeyValueProto.newBuilder();
-        dataBuilder.setKey(attr.getKey());
-        dataBuilder.setType(TransportProtos.KeyValueType.forNumber(attr.getDataType().ordinal()));
-        switch (attr.getDataType()) {
-            case BOOLEAN:
-                attr.getBooleanValue().ifPresent(dataBuilder::setBoolV);
-                break;
-            case LONG:
-                attr.getLongValue().ifPresent(dataBuilder::setLongV);
-                break;
-            case DOUBLE:
-                attr.getDoubleValue().ifPresent(dataBuilder::setDoubleV);
-                break;
-            case JSON:
-                attr.getJsonValue().ifPresent(dataBuilder::setJsonV);
-                break;
-            case STRING:
-                attr.getStrValue().ifPresent(dataBuilder::setStringV);
-                break;
-        }
-        return TransportProtos.TsKvProto.newBuilder().setTs(ts).setKv(dataBuilder);
+    public static KvEntry fromTsKvProto(TransportProtos.KeyValueProto proto) {
+        return switch (fromKeyValueTypeProto(proto.getType())) {
+            case BOOLEAN -> new BooleanDataEntry(proto.getKey(), proto.getBoolV());
+            case LONG -> new LongDataEntry(proto.getKey(), proto.getLongV());
+            case DOUBLE -> new DoubleDataEntry(proto.getKey(), proto.getDoubleV());
+            case STRING -> new StringDataEntry(proto.getKey(), proto.getStringV());
+            case JSON -> new JsonDataEntry(proto.getKey(), proto.getJsonV());
+        };
     }
 
-    public static List<TsKvEntry> toTsKvEntityList(List<TransportProtos.TsKvProto> dataList) {
-        List<TsKvEntry> result = new ArrayList<>(dataList.size());
-        dataList.forEach(proto -> result.add(new BasicTsKvEntry(proto.getTs(), getKvEntry(proto.getKv()))));
-        return result;
+    public static TransportProtos.TsKvProto.Builder toTsKvProtoBuilder(long ts, KvEntry kvEntry) {
+        return TransportProtos.TsKvProto.newBuilder().setTs(ts).setKv(KvProtoUtil.toKeyValueTypeProto(kvEntry));
     }
 
-    public static List<AttributeKvEntry> toAttributeKvList(List<TransportProtos.TsKvProto> dataList) {
-        List<AttributeKvEntry> result = new ArrayList<>(dataList.size());
-        dataList.forEach(proto -> result.add(new BaseAttributeKvEntry(getKvEntry(proto.getKv()), proto.getTs())));
+    public static List<TsKvEntry> fromTsValueProtoList(String key, List<TransportProtos.TsValueProto> dataList) {
+        List<TsKvEntry> result = new ArrayList<>(dataList.size());
+        dataList.forEach(proto -> result.add(new BasicTsKvEntry(proto.getTs(), fromTsValueProto(key, proto))));
         return result;
     }
 
-    private static KvEntry getKvEntry(TransportProtos.KeyValueProto proto) {
-        KvEntry entry = null;
-        DataType type = DataType.values()[proto.getType().getNumber()];
-        switch (type) {
-            case BOOLEAN:
-                entry = new BooleanDataEntry(proto.getKey(), proto.getBoolV());
-                break;
-            case LONG:
-                entry = new LongDataEntry(proto.getKey(), proto.getLongV());
-                break;
-            case DOUBLE:
-                entry = new DoubleDataEntry(proto.getKey(), proto.getDoubleV());
-                break;
-            case STRING:
-                entry = new StringDataEntry(proto.getKey(), proto.getStringV());
-                break;
-            case JSON:
-                entry = new JsonDataEntry(proto.getKey(), proto.getJsonV());
-                break;
+    public static TransportProtos.TsValueProto toTsValueProto(long ts, KvEntry attr) {
+        TransportProtos.TsValueProto.Builder dataBuilder = TransportProtos.TsValueProto.newBuilder();
+        dataBuilder.setTs(ts);
+        dataBuilder.setType(toKeyValueTypeProto(attr.getDataType()));
+        switch (attr.getDataType()) {
+            case BOOLEAN -> attr.getBooleanValue().ifPresent(dataBuilder::setBoolV);
+            case LONG -> attr.getLongValue().ifPresent(dataBuilder::setLongV);
+            case DOUBLE -> attr.getDoubleValue().ifPresent(dataBuilder::setDoubleV);
+            case JSON -> attr.getJsonValue().ifPresent(dataBuilder::setJsonV);
+            case STRING -> attr.getStrValue().ifPresent(dataBuilder::setStringV);
         }
-        return entry;
+        return dataBuilder.build();
     }
+
+    public static KvEntry fromTsValueProto(String key, TransportProtos.TsValueProto proto) {
+        return switch (fromKeyValueTypeProto(proto.getType())) {
+            case BOOLEAN -> new BooleanDataEntry(key, proto.getBoolV());
+            case LONG -> new LongDataEntry(key, proto.getLongV());
+            case DOUBLE -> new DoubleDataEntry(key, proto.getDoubleV());
+            case STRING -> new StringDataEntry(key, proto.getStringV());
+            case JSON -> new JsonDataEntry(key, proto.getJsonV());
+        };
+    }
+
+    public static TransportProtos.KeyValueType toKeyValueTypeProto(DataType dataType) {
+        return TransportProtos.KeyValueType.forNumber(dataType.getProtoNumber());
+    }
+
+    public static DataType fromKeyValueTypeProto(TransportProtos.KeyValueType keyValueType) {
+        return dataTypeByProtoNumber[keyValueType.getNumber()];
+    }
+
 }
diff --git a/common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java b/common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
index ca6e826cac..e89ce5634c 100644
--- a/common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
+++ b/common/proto/src/main/java/org/thingsboard/server/common/util/ProtoUtils.java
@@ -258,31 +258,31 @@ public class ProtoUtils {
                         .setLastUpdateTs(attributeKvEntry.getLastUpdateTs())
                         .setKey(attributeKvEntry.getKey());
                 switch (attributeKvEntry.getDataType()) {
-                    case BOOLEAN:
+                    case BOOLEAN -> {
                         attributeKvEntry.getBooleanValue().ifPresent(attributeValueBuilder::setBoolV);
                         attributeValueBuilder.setHasV(attributeKvEntry.getBooleanValue().isPresent());
                         attributeValueBuilder.setType(TransportProtos.KeyValueType.BOOLEAN_V);
-                        break;
-                    case STRING:
+                    }
+                    case STRING -> {
                         attributeKvEntry.getStrValue().ifPresent(attributeValueBuilder::setStringV);
                         attributeValueBuilder.setHasV(attributeKvEntry.getStrValue().isPresent());
                         attributeValueBuilder.setType(TransportProtos.KeyValueType.STRING_V);
-                        break;
-                    case DOUBLE:
+                    }
+                    case DOUBLE -> {
                         attributeKvEntry.getDoubleValue().ifPresent(attributeValueBuilder::setDoubleV);
                         attributeValueBuilder.setHasV(attributeKvEntry.getDoubleValue().isPresent());
                         attributeValueBuilder.setType(TransportProtos.KeyValueType.DOUBLE_V);
-                        break;
-                    case LONG:
+                    }
+                    case LONG -> {
                         attributeKvEntry.getLongValue().ifPresent(attributeValueBuilder::setLongV);
                         attributeValueBuilder.setHasV(attributeKvEntry.getLongValue().isPresent());
                         attributeValueBuilder.setType(TransportProtos.KeyValueType.LONG_V);
-                        break;
-                    case JSON:
+                    }
+                    case JSON -> {
                         attributeKvEntry.getJsonValue().ifPresent(attributeValueBuilder::setJsonV);
                         attributeValueBuilder.setHasV(attributeKvEntry.getJsonValue().isPresent());
                         attributeValueBuilder.setType(TransportProtos.KeyValueType.JSON_V);
-                        break;
+                    }
                 }
                 builder.addValues(attributeValueBuilder.build());
             }
@@ -434,36 +434,28 @@ public class ProtoUtils {
     }
 
     public static TransportProtos.ToDeviceActorNotificationMsgProto toProto(ToDeviceActorNotificationMsg msg) {
-        if (msg instanceof DeviceEdgeUpdateMsg) {
-            DeviceEdgeUpdateMsg updateMsg = (DeviceEdgeUpdateMsg) msg;
+        if (msg instanceof DeviceEdgeUpdateMsg updateMsg) {
             TransportProtos.DeviceEdgeUpdateMsgProto proto = toProto(updateMsg);
             return TransportProtos.ToDeviceActorNotificationMsgProto.newBuilder().setDeviceEdgeUpdateMsg(proto).build();
-        } else if (msg instanceof DeviceNameOrTypeUpdateMsg) {
-            DeviceNameOrTypeUpdateMsg updateMsg = (DeviceNameOrTypeUpdateMsg) msg;
+        } else if (msg instanceof DeviceNameOrTypeUpdateMsg updateMsg) {
             TransportProtos.DeviceNameOrTypeUpdateMsgProto proto = toProto(updateMsg);
             return TransportProtos.ToDeviceActorNotificationMsgProto.newBuilder().setDeviceNameOrTypeMsg(proto).build();
-        } else if (msg instanceof DeviceAttributesEventNotificationMsg) {
-            DeviceAttributesEventNotificationMsg updateMsg = (DeviceAttributesEventNotificationMsg) msg;
+        } else if (msg instanceof DeviceAttributesEventNotificationMsg updateMsg) {
             TransportProtos.DeviceAttributesEventMsgProto proto = toProto(updateMsg);
             return TransportProtos.ToDeviceActorNotificationMsgProto.newBuilder().setDeviceAttributesEventMsg(proto).build();
-        } else if (msg instanceof DeviceCredentialsUpdateNotificationMsg) {
-            DeviceCredentialsUpdateNotificationMsg updateMsg = (DeviceCredentialsUpdateNotificationMsg) msg;
+        } else if (msg instanceof DeviceCredentialsUpdateNotificationMsg updateMsg) {
             TransportProtos.DeviceCredentialsUpdateMsgProto proto = toProto(updateMsg);
             return TransportProtos.ToDeviceActorNotificationMsgProto.newBuilder().setDeviceCredentialsUpdateMsg(proto).build();
-        } else if (msg instanceof ToDeviceRpcRequestActorMsg) {
-            ToDeviceRpcRequestActorMsg updateMsg = (ToDeviceRpcRequestActorMsg) msg;
+        } else if (msg instanceof ToDeviceRpcRequestActorMsg updateMsg) {
             TransportProtos.ToDeviceRpcRequestActorMsgProto proto = toProto(updateMsg);
             return TransportProtos.ToDeviceActorNotificationMsgProto.newBuilder().setToDeviceRpcRequestMsg(proto).build();
-        } else if (msg instanceof FromDeviceRpcResponseActorMsg) {
-            FromDeviceRpcResponseActorMsg updateMsg = (FromDeviceRpcResponseActorMsg) msg;
+        } else if (msg instanceof FromDeviceRpcResponseActorMsg updateMsg) {
             TransportProtos.FromDeviceRpcResponseActorMsgProto proto = toProto(updateMsg);
             return TransportProtos.ToDeviceActorNotificationMsgProto.newBuilder().setFromDeviceRpcResponseMsg(proto).build();
-        } else if (msg instanceof RemoveRpcActorMsg) {
-            RemoveRpcActorMsg updateMsg = (RemoveRpcActorMsg) msg;
+        } else if (msg instanceof RemoveRpcActorMsg updateMsg) {
             TransportProtos.RemoveRpcActorMsgProto proto = toProto(updateMsg);
             return TransportProtos.ToDeviceActorNotificationMsgProto.newBuilder().setRemoveRpcActorMsg(proto).build();
-        } else if (msg instanceof DeviceDeleteMsg) {
-            DeviceDeleteMsg updateMsg = (DeviceDeleteMsg) msg;
+        } else if (msg instanceof DeviceDeleteMsg updateMsg) {
             TransportProtos.DeviceDeleteMsgProto proto = toProto(updateMsg);
             return TransportProtos.ToDeviceActorNotificationMsgProto.newBuilder().setDeviceDeleteMsg(proto).build();
         }
@@ -507,24 +499,14 @@ public class ProtoUtils {
         List<AttributeKvEntry> result = new ArrayList<>();
         for (TransportProtos.AttributeValueProto kvEntry : valuesList) {
             boolean hasValue = kvEntry.getHasV();
-            KvEntry entry = null;
-            switch (kvEntry.getType()) {
-                case BOOLEAN_V:
-                    entry = new BooleanDataEntry(kvEntry.getKey(), hasValue ? kvEntry.getBoolV() : null);
-                    break;
-                case LONG_V:
-                    entry = new LongDataEntry(kvEntry.getKey(), hasValue ? kvEntry.getLongV() : null);
-                    break;
-                case DOUBLE_V:
-                    entry = new DoubleDataEntry(kvEntry.getKey(), hasValue ? kvEntry.getDoubleV() : null);
-                    break;
-                case STRING_V:
-                    entry = new StringDataEntry(kvEntry.getKey(), hasValue ? kvEntry.getStringV() : null);
-                    break;
-                case JSON_V:
-                    entry = new JsonDataEntry(kvEntry.getKey(), hasValue ? kvEntry.getJsonV() : null);
-                    break;
-            }
+            KvEntry entry = switch (kvEntry.getType()) {
+                case BOOLEAN_V -> new BooleanDataEntry(kvEntry.getKey(), hasValue ? kvEntry.getBoolV() : null);
+                case LONG_V -> new LongDataEntry(kvEntry.getKey(), hasValue ? kvEntry.getLongV() : null);
+                case DOUBLE_V -> new DoubleDataEntry(kvEntry.getKey(), hasValue ? kvEntry.getDoubleV() : null);
+                case STRING_V -> new StringDataEntry(kvEntry.getKey(), hasValue ? kvEntry.getStringV() : null);
+                case JSON_V -> new JsonDataEntry(kvEntry.getKey(), hasValue ? kvEntry.getJsonV() : null);
+                default -> null;
+            };
             result.add(new BaseAttributeKvEntry(kvEntry.getLastUpdateTs(), entry));
         }
         return result;
@@ -1029,15 +1011,11 @@ public class ProtoUtils {
                 .setDeviceProfileIdLSB(device.getDeviceProfileId().getId().getLeastSignificantBits())
                 .setAdditionalInfo(JacksonUtil.toString(device.getAdditionalInfo()));
 
-        PowerSavingConfiguration psmConfiguration = null;
-        switch (device.getDeviceData().getTransportConfiguration().getType()) {
-            case LWM2M:
-                psmConfiguration = (Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration();
-                break;
-            case COAP:
-                psmConfiguration = (CoapDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration();
-                break;
-        }
+        PowerSavingConfiguration psmConfiguration = switch (device.getDeviceData().getTransportConfiguration().getType()) {
+            case LWM2M -> (Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration();
+            case COAP -> (CoapDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration();
+            default -> null;
+        };
 
         if (psmConfiguration != null) {
             PowerMode powerMode = psmConfiguration.getPowerMode();
@@ -1079,4 +1057,5 @@ public class ProtoUtils {
     private static Long checkLong(Long l) {
         return isNotNull(l) ? l : 0;
     }
+
 }
diff --git a/common/proto/src/main/proto/queue.proto b/common/proto/src/main/proto/queue.proto
index 888e31209c..44f0b0caf0 100644
--- a/common/proto/src/main/proto/queue.proto
+++ b/common/proto/src/main/proto/queue.proto
@@ -54,6 +54,7 @@ enum EntityTypeProto {
   NOTIFICATION_REQUEST  = 31;
   NOTIFICATION          = 32;
   NOTIFICATION_RULE     = 33;
+  QUEUE_STATS     = 34;
 }
 
 /**
diff --git a/common/proto/src/test/java/org/thingsboard/server/common/adaptor/JsonConverterTest.java b/common/proto/src/test/java/org/thingsboard/server/common/adaptor/JsonConverterTest.java
index 773ebbea3d..eb11a11f5c 100644
--- a/common/proto/src/test/java/org/thingsboard/server/common/adaptor/JsonConverterTest.java
+++ b/common/proto/src/test/java/org/thingsboard/server/common/adaptor/JsonConverterTest.java
@@ -26,8 +26,6 @@ import java.util.ArrayList;
 
 public class JsonConverterTest {
 
-    private final JsonParser JSON_PARSER = new JsonParser();
-
     @BeforeEach
     public void before() {
         JsonConverter.setTypeCastEnabled(true);
@@ -35,55 +33,55 @@ public class JsonConverterTest {
 
     @Test
     public void testParseBigDecimalAsLong() {
-        var result = JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 1E+1}"), 0L);
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 1E+1}"), 0L);
         Assert.assertEquals(10L, result.get(0L).get(0).getLongValue().get().longValue());
     }
 
     @Test
     public void testParseBigDecimalAsDouble() {
-        var result = JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 101E-1}"), 0L);
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 101E-1}"), 0L);
         Assert.assertEquals(10.1, result.get(0L).get(0).getDoubleValue().get(), 0.0);
     }
 
     @Test
     public void testParseAttributesBigDecimalAsLong() {
-        var result = new ArrayList<>(JsonConverter.convertToAttributes(JSON_PARSER.parse("{\"meterReadingDelta\": 1E1}")));
+        var result = new ArrayList<>(JsonConverter.convertToAttributes(JsonParser.parseString("{\"meterReadingDelta\": 1E1}")));
         Assert.assertEquals(10L, result.get(0).getLongValue().get().longValue());
     }
 
     @Test
     public void testParseAsDoubleWithZero() {
-        var result = JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 42.0}"), 0L);
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 42.0}"), 0L);
         Assert.assertEquals(42.0, result.get(0L).get(0).getDoubleValue().get(), 0.0);
     }
 
     @Test
     public void testParseAsDouble() {
-        var result = JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 1.1}"), 0L);
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 1.1}"), 0L);
         Assert.assertEquals(1.1, result.get(0L).get(0).getDoubleValue().get(), 0.0);
     }
 
     @Test
     public void testParseAsLong() {
-        var result = JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 11}"), 0L);
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 11}"), 0L);
         Assert.assertEquals(11L, result.get(0L).get(0).getLongValue().get().longValue());
     }
 
     @Test
     public void testParseBigDecimalAsStringOutOfLongRange() {
-        var result = JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 9.9701010061400066E19}"), 0L);
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 9.9701010061400066E19}"), 0L);
         Assert.assertEquals("99701010061400066000", result.get(0L).get(0).getStrValue().get());
     }
 
     @Test
     public void testParseBigDecimalAsStringOutOfLongRange2() {
-        var result = JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 99701010061400066001}"), 0L);
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 99701010061400066001}"), 0L);
         Assert.assertEquals("99701010061400066001", result.get(0L).get(0).getStrValue().get());
     }
 
     @Test
     public void testParseBigDecimalAsStringOutOfLongRange3() {
-        var result = JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 1E19}"), 0L);
+        var result = JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 1E19}"), 0L);
         Assert.assertEquals("10000000000000000000", result.get(0L).get(0).getStrValue().get());
     }
 
@@ -91,7 +89,7 @@ public class JsonConverterTest {
     public void testParseBigDecimalOutOfLongRangeWithoutParsing() {
         JsonConverter.setTypeCastEnabled(false);
         Assertions.assertThrows(JsonSyntaxException.class, () -> {
-            JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 89701010051400054084}"), 0L);
+            JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 89701010051400054084}"), 0L);
         });
     }
 
@@ -99,7 +97,7 @@ public class JsonConverterTest {
     public void testParseBigDecimalOutOfLongRangeWithoutParsing2() {
         JsonConverter.setTypeCastEnabled(false);
         Assertions.assertThrows(JsonSyntaxException.class, () -> {
-            JsonConverter.convertToTelemetry(JSON_PARSER.parse("{\"meterReadingDelta\": 9.9701010061400066E19}"), 0L);
+            JsonConverter.convertToTelemetry(JsonParser.parseString("{\"meterReadingDelta\": 9.9701010061400066E19}"), 0L);
         });
     }
 }
diff --git a/common/proto/src/test/java/org/thingsboard/server/common/util/KvProtoUtilTest.java b/common/proto/src/test/java/org/thingsboard/server/common/util/KvProtoUtilTest.java
new file mode 100644
index 0000000000..72d71c7c93
--- /dev/null
+++ b/common/proto/src/test/java/org/thingsboard/server/common/util/KvProtoUtilTest.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.util;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.thingsboard.server.common.data.kv.AggTsKvEntry;
+import org.thingsboard.server.common.data.kv.AttributeKvEntry;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
+import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.BooleanDataEntry;
+import org.thingsboard.server.common.data.kv.DataType;
+import org.thingsboard.server.common.data.kv.DoubleDataEntry;
+import org.thingsboard.server.common.data.kv.JsonDataEntry;
+import org.thingsboard.server.common.data.kv.KvEntry;
+import org.thingsboard.server.common.data.kv.LongDataEntry;
+import org.thingsboard.server.common.data.kv.StringDataEntry;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class KvProtoUtilTest {
+
+    private static final long TS = System.currentTimeMillis();
+
+    private static Stream<KvEntry> kvEntryData() {
+        String key = "key";
+        return Stream.of(
+                new BooleanDataEntry(key, true),
+                new LongDataEntry(key, 23L),
+                new DoubleDataEntry(key, 23.0),
+                new StringDataEntry(key, "stringValue"),
+                new JsonDataEntry(key, "jsonValue")
+        );
+    }
+
+    private static Stream<KvEntry> basicTsKvEntryData() {
+        return kvEntryData().map(kvEntry -> new BasicTsKvEntry(TS, kvEntry));
+    }
+
+    private static Stream<List<BaseAttributeKvEntry>> attributeKvEntryData() {
+        return Stream.of(kvEntryData().map(kvEntry -> new BaseAttributeKvEntry(TS, kvEntry)).toList());
+    }
+
+    private static List<TsKvEntry> createTsKvEntryList(boolean withAggregation) {
+        return kvEntryData().map(kvEntry -> {
+                    if (withAggregation) {
+                        return new AggTsKvEntry(TS, kvEntry, 0);
+                    } else {
+                        return new BasicTsKvEntry(TS, kvEntry);
+                    }
+                }).collect(Collectors.toList());
+    }
+
+    @ParameterizedTest
+    @EnumSource(DataType.class)
+    void protoDataTypeSerialization(DataType dataType) {
+        assertThat(KvProtoUtil.fromKeyValueTypeProto(KvProtoUtil.toKeyValueTypeProto(dataType)))
+                .as(dataType.name()).isEqualTo(dataType);
+    }
+
+    @ParameterizedTest
+    @MethodSource("kvEntryData")
+    void protoKeyValueProtoSerialization(KvEntry kvEntry) {
+        assertThat(KvProtoUtil.fromTsKvProto(KvProtoUtil.toKeyValueTypeProto(kvEntry)))
+                .as("deserialized").isEqualTo(kvEntry);
+    }
+
+    @ParameterizedTest
+    @MethodSource("basicTsKvEntryData")
+    void protoTsKvEntrySerialization(KvEntry kvEntry) {
+        assertThat(KvProtoUtil.fromTsKvProto(KvProtoUtil.toTsKvProto(TS, kvEntry)))
+                .as("deserialized").isEqualTo(kvEntry);
+    }
+
+    @ParameterizedTest
+    @MethodSource("kvEntryData")
+    void protoTsValueSerialization(KvEntry kvEntry) {
+        assertThat(KvProtoUtil.fromTsValueProto(kvEntry.getKey(), KvProtoUtil.toTsValueProto(TS, kvEntry)))
+                .as("deserialized").isEqualTo(kvEntry);
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void protoListTsKvEntrySerialization(boolean withAggregation) {
+        List<TsKvEntry> tsKvEntries = createTsKvEntryList(withAggregation);
+        assertThat(KvProtoUtil.fromTsKvProtoList(KvProtoUtil.toTsKvProtoList(tsKvEntries)))
+                .as("deserialized").isEqualTo(tsKvEntries);
+    }
+
+    @ParameterizedTest
+    @MethodSource("attributeKvEntryData")
+    void protoListAttributeKvSerialization(List<AttributeKvEntry> attributeKvEntries) {
+        assertThat(KvProtoUtil.toAttributeKvList(KvProtoUtil.attrToTsKvProtos(attributeKvEntries)))
+                .as("deserialized")
+                .isEqualTo(attributeKvEntries);
+    }
+
+}
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubMonolithQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubMonolithQueueFactory.java
index c7c59974cd..61c2614fc7 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubMonolithQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubMonolithQueueFactory.java
@@ -109,40 +109,40 @@ public class PubSubMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEng
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, transportNotificationSettings.getNotificationsTopic());
+        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbPubSubProducerTemplate<>(ruleEngineAdmin, pubSubSettings, ruleEngineSettings.getTopic());
+        return new TbPubSubProducerTemplate<>(ruleEngineAdmin, pubSubSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
 
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, ruleEngineSettings.getTopic());
+        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getTopic());
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, coreSettings.getTopic());
+        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
     }
 
     @Override
     public TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToVersionControlServiceMsg>> createToVersionControlMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(vcAdmin, pubSubSettings, vcSettings.getTopic(),
+        return new TbPubSubConsumerTemplate<>(vcAdmin, pubSubSettings, topicService.buildTopicName(vcSettings.getTopic()),
                 msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportProtos.ToVersionControlServiceMsg.parseFrom(msg.getData()), msg.getHeaders())
         );
     }
 
     @Override
     public TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> createToRuleEngineMsgConsumer(Queue configuration) {
-        return new TbPubSubConsumerTemplate<>(ruleEngineAdmin, pubSubSettings, configuration.getTopic(),
+        return new TbPubSubConsumerTemplate<>(ruleEngineAdmin, pubSubSettings, topicService.buildTopicName(configuration.getTopic()),
                 msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
 
@@ -155,7 +155,7 @@ public class PubSubMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEng
 
     @Override
     public TbQueueConsumer<TbProtoQueueMsg<ToCoreMsg>> createToCoreMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getTopic(),
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()),
                 msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
 
@@ -168,13 +168,13 @@ public class PubSubMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEng
 
     @Override
     public TbQueueConsumer<TbProtoQueueMsg<TransportApiRequestMsg>> createTransportApiRequestConsumer() {
-        return new TbPubSubConsumerTemplate<>(transportApiAdmin, pubSubSettings, transportApiSettings.getRequestsTopic(),
+        return new TbPubSubConsumerTemplate<>(transportApiAdmin, pubSubSettings, topicService.buildTopicName(transportApiSettings.getRequestsTopic()),
                 msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiRequestMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiResponseProducer() {
-        return new TbPubSubProducerTemplate<>(transportApiAdmin, pubSubSettings, transportApiSettings.getResponsesTopic());
+        return new TbPubSubProducerTemplate<>(transportApiAdmin, pubSubSettings, topicService.buildTopicName(transportApiSettings.getResponsesTopic()));
     }
 
     @Override
@@ -202,29 +202,29 @@ public class PubSubMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEng
 
     @Override
     public TbQueueConsumer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getUsageStatsTopic(),
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()),
                 msg -> new TbProtoQueueMsg<>(msg.getKey(), ToUsageStatsServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
 
     @Override
     public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getOtaPackageTopic(),
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()),
                 msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getOtaPackageTopic());
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getUsageStatsTopic());
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToVersionControlServiceMsg>> createVersionControlMsgProducer() {
-        return new TbPubSubProducerTemplate<>(vcAdmin, pubSubSettings, vcSettings.getTopic());
+        return new TbPubSubProducerTemplate<>(vcAdmin, pubSubSettings, topicService.buildTopicName(vcSettings.getTopic()));
     }
 
     @PreDestroy
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbCoreQueueFactory.java b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbCoreQueueFactory.java
index a6b9e44022..63975e3116 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbCoreQueueFactory.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/PubSubTbCoreQueueFactory.java
@@ -100,32 +100,32 @@ public class PubSubTbCoreQueueFactory implements TbCoreQueueFactory {
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> createTransportNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, transportNotificationSettings.getNotificationsTopic());
+        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(transportNotificationSettings.getNotificationsTopic()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineMsg>> createRuleEngineMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getTopic());
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> createRuleEngineNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, ruleEngineSettings.getTopic());
+        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(ruleEngineSettings.getTopic()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToCoreMsg>> createTbCoreMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getTopic());
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> createTbCoreNotificationsMsgProducer() {
-        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, coreSettings.getTopic());
+        return new TbPubSubProducerTemplate<>(notificationAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()));
     }
 
     @Override
     public TbQueueConsumer<TbProtoQueueMsg<ToCoreMsg>> createToCoreMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getTopic(),
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getTopic()),
                 msg -> new TbProtoQueueMsg<>(msg.getKey(), ToCoreMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
 
@@ -138,13 +138,13 @@ public class PubSubTbCoreQueueFactory implements TbCoreQueueFactory {
 
     @Override
     public TbQueueConsumer<TbProtoQueueMsg<TransportApiRequestMsg>> createTransportApiRequestConsumer() {
-        return new TbPubSubConsumerTemplate<>(transportApiAdmin, pubSubSettings, transportApiSettings.getRequestsTopic(),
+        return new TbPubSubConsumerTemplate<>(transportApiAdmin, pubSubSettings, topicService.buildTopicName(transportApiSettings.getRequestsTopic()),
                 msg -> new TbProtoQueueMsg<>(msg.getKey(), TransportApiRequestMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<TransportApiResponseMsg>> createTransportApiResponseProducer() {
-        return new TbPubSubProducerTemplate<>(transportApiAdmin, pubSubSettings, transportApiSettings.getResponsesTopic());
+        return new TbPubSubProducerTemplate<>(transportApiAdmin, pubSubSettings, topicService.buildTopicName(transportApiSettings.getResponsesTopic()));
     }
 
     @Override
@@ -172,24 +172,24 @@ public class PubSubTbCoreQueueFactory implements TbCoreQueueFactory {
 
     @Override
     public TbQueueConsumer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getUsageStatsTopic(),
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()),
                 msg -> new TbProtoQueueMsg<>(msg.getKey(), ToUsageStatsServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
 
     @Override
     public TbQueueConsumer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgConsumer() {
-        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getOtaPackageTopic(),
+        return new TbPubSubConsumerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()),
                 msg -> new TbProtoQueueMsg<>(msg.getKey(), ToOtaPackageStateServiceMsg.parseFrom(msg.getData()), msg.getHeaders()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToOtaPackageStateServiceMsg>> createToOtaPackageStateServiceMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getOtaPackageTopic());
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getOtaPackageTopic()));
     }
 
     @Override
     public TbQueueProducer<TbProtoQueueMsg<ToUsageStatsServiceMsg>> createToUsageStatsServiceMsgProducer() {
-        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, coreSettings.getUsageStatsTopic());
+        return new TbPubSubProducerTemplate<>(coreAdmin, pubSubSettings, topicService.buildTopicName(coreSettings.getUsageStatsTopic()));
     }
 
     @Override
diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/AbstractScriptInvokeService.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/AbstractScriptInvokeService.java
index f88625f7fd..32e209b2ea 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/AbstractScriptInvokeService.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/AbstractScriptInvokeService.java
@@ -145,14 +145,14 @@ public abstract class AbstractScriptInvokeService implements ScriptInvokeService
                 log.trace("[{}] InvokeScript uuid {} with timeout {}ms", tenantId, scriptId, getMaxInvokeRequestsTimeout());
                 var task = doInvokeFunction(scriptId, args);
 
-                var resultFuture = Futures.transformAsync(task.getResultFuture(), output -> {
+                var resultFuture = Futures.transform(task.getResultFuture(), output -> {
                     String result = JacksonUtil.toString(output);
                     if (resultSizeExceeded(result)) {
                         throw new TbScriptException(scriptId, TbScriptException.ErrorCode.OTHER, null, new RuntimeException(
                                 format("Script invocation result exceeds maximum allowed size of %s symbols", getMaxResultSize())
                         ));
                     }
-                    return Futures.immediateFuture(output);
+                    return output;
                 }, MoreExecutors.directExecutor());
 
                 return withTimeoutAndStatsCallback(scriptId, task, resultFuture, invokeCallback, getMaxInvokeRequestsTimeout());
diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/js/NashornJsInvokeService.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/js/NashornJsInvokeService.java
index 0e37bd89d6..dc83b08af4 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/js/NashornJsInvokeService.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/js/NashornJsInvokeService.java
@@ -41,7 +41,6 @@ import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.locks.ReentrantLock;
 
 @Slf4j
@@ -62,9 +61,12 @@ public class NashornJsInvokeService extends AbstractJsInvokeService {
     @Value("${js.local.monitor_thread_pool_size}")
     private int monitorThreadPoolSize;
 
-    @Value("${js.local.max_cpu_time}")
+    @Value("${js.local.max_cpu_time:8000}") // 8 seconds
     private long maxCpuTime;
 
+    @Value("${js.local.max_memory:104857600}") // 100 MiB
+    private long maxMemory;
+
     @Getter
     @Value("${js.local.max_errors}")
     private int maxErrors;
@@ -107,12 +109,13 @@ public class NashornJsInvokeService extends AbstractJsInvokeService {
     @Override
     public void init() {
         super.init();
-        jsExecutor = MoreExecutors.listeningDecorator(Executors.newWorkStealingPool(jsExecutorThreadPoolSize));
+        jsExecutor = MoreExecutors.listeningDecorator(ThingsBoardExecutors.newWorkStealingPool(jsExecutorThreadPoolSize, "nashorn-js-executor"));
         if (useJsSandbox) {
             sandbox = NashornSandboxes.create();
             monitorExecutorService = ThingsBoardExecutors.newWorkStealingPool(monitorThreadPoolSize, "nashorn-js-monitor");
             sandbox.setExecutor(monitorExecutorService);
             sandbox.setMaxCPUTime(maxCpuTime);
+            sandbox.setMaxMemory(maxMemory);
             sandbox.allowNoBraces(false);
             sandbox.allowLoadFunctions(true);
             sandbox.setMaxPreparedStatements(30);
diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java
index bbcdd1bf00..283044b279 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java
@@ -16,6 +16,7 @@
 package org.thingsboard.script.api.tbel;
 
 import com.google.common.primitives.Bytes;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.mvel2.ExecutionContext;
 import org.mvel2.ParserConfiguration;
@@ -29,32 +30,49 @@ import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalAccessor;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
 
+@Slf4j
 public class TbUtils {
 
     private static final byte[] HEX_ARRAY = "0123456789ABCDEF".getBytes(StandardCharsets.US_ASCII);
 
+    private static final LinkedHashMap<String, String> mdnEncodingReplacements = new LinkedHashMap<>();
+
+    static {
+        mdnEncodingReplacements.put("\\+", "%20");
+        mdnEncodingReplacements.put("%21", "!");
+        mdnEncodingReplacements.put("%27", "'");
+        mdnEncodingReplacements.put("%28", "\\(");
+        mdnEncodingReplacements.put("%29", "\\)");
+        mdnEncodingReplacements.put("%7E", "~");
+        mdnEncodingReplacements.put("%3B", ";");
+        mdnEncodingReplacements.put("%2C", ",");
+        mdnEncodingReplacements.put("%2F", "/");
+        mdnEncodingReplacements.put("%3F", "\\?");
+        mdnEncodingReplacements.put("%3A", ":");
+        mdnEncodingReplacements.put("%40", "@");
+        mdnEncodingReplacements.put("%26", "&");
+        mdnEncodingReplacements.put("%3D", "=");
+        mdnEncodingReplacements.put("%2B", "\\+");
+        mdnEncodingReplacements.put("%24", Matcher.quoteReplacement("$"));
+        mdnEncodingReplacements.put("%23", "#");
+    }
+
     public static void register(ParserConfiguration parserConfig) throws Exception {
         parserConfig.addImport("btoa", new MethodStub(TbUtils.class.getMethod("btoa",
                 String.class)));
@@ -175,6 +193,10 @@ public class TbUtils {
                 ExecutionContext.class, Map.class, List.class)));
         parserConfig.addImport("toFlatMap", new MethodStub(TbUtils.class.getMethod("toFlatMap",
                 ExecutionContext.class, Map.class, List.class, boolean.class)));
+        parserConfig.addImport("encodeURI", new MethodStub(TbUtils.class.getMethod("encodeURI",
+                String.class)));
+        parserConfig.addImport("decodeURI", new MethodStub(TbUtils.class.getMethod("decodeURI",
+                String.class)));
     }
 
     public static String btoa(String input) {
@@ -589,22 +611,6 @@ public class TbUtils {
         return BigDecimal.valueOf(value).setScale(precision, RoundingMode.HALF_UP).floatValue();
     }
 
-    private static boolean isHexadecimal(String value) {
-        return value != null && (value.contains("0x") || value.contains("0X"));
-    }
-
-    private static String prepareNumberString(String value) {
-        if (value != null) {
-            value = value.trim();
-            if (isHexadecimal(value)) {
-                value = value.replace("0x", "");
-                value = value.replace("0X", "");
-            }
-            value = value.replace(",", ".");
-        }
-        return value;
-    }
-
     public static ExecutionHashMap<String, Object> toFlatMap(ExecutionContext ctx, Map<String, Object> json) {
         return toFlatMap(ctx, json, new ArrayList<>(), true);
     }
@@ -623,6 +629,24 @@ public class TbUtils {
         return map;
     }
 
+
+    public static String encodeURI(String uri) {
+        String encoded = URLEncoder.encode(uri, StandardCharsets.UTF_8);
+        for (var entry : mdnEncodingReplacements.entrySet()) {
+            encoded = encoded.replaceAll(entry.getKey(), entry.getValue());
+        }
+        return encoded;
+    }
+
+    public static String decodeURI(String uri) {
+        ArrayList<String> allKeys = new ArrayList<>(mdnEncodingReplacements.keySet());
+        Collections.reverse(allKeys);
+        for (String strKey : allKeys) {
+            uri = uri.replaceAll(mdnEncodingReplacements.get(strKey), strKey);
+        }
+        return URLDecoder.decode(uri, StandardCharsets.UTF_8);
+    }
+
     private static void parseRecursive(Object json, Map<String, Object> map, List<String> excludeList, String path, boolean pathInKey) {
         if (json instanceof Map.Entry) {
             Map.Entry<?, ?> entry = (Map.Entry<?, ?>) json;
@@ -663,6 +687,22 @@ public class TbUtils {
         }
     }
 
+    private static boolean isHexadecimal(String value) {
+        return value != null && (value.contains("0x") || value.contains("0X"));
+    }
+
+    private static String prepareNumberString(String value) {
+        if (value != null) {
+            value = value.trim();
+            if (isHexadecimal(value)) {
+                value = value.replace("0x", "");
+                value = value.replace("0X", "");
+            }
+            value = value.replace(",", ".");
+        }
+        return value;
+    }
+
     private static boolean isValidRadix(String value, int radix) {
         for (int i = 0; i < value.length(); i++) {
             if (i == 0 && value.charAt(i) == '-') {
diff --git a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java
index c140559a0f..8325e69f66 100644
--- a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java
+++ b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java
@@ -31,13 +31,11 @@ import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Random;
 
 @Slf4j
-
 public class TbUtilsTest {
 
     private ExecutionContext ctx;
@@ -474,7 +472,16 @@ public class TbUtilsTest {
         }
     }
 
-
+    @Test
+    public void encodeDecodeUri_Test() {
+        String uriOriginal = "-_.!~*'();/?:@&=+$,#ht://example.ж д a/path with spaces/?param1=Київ 1&param2=Україна2";
+        String uriEncodeExpected = "-_.!~*'();/?:@&=+$,#ht://example.%D0%B6%20%D0%B4%20a/path%20with%20spaces/?param1=%D0%9A%D0%B8%D1%97%D0%B2%201&param2=%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D0%B02";
+        String uriEncodeActual = TbUtils.encodeURI(uriOriginal);
+        Assert.assertEquals(uriEncodeExpected, uriEncodeActual);
+
+        String uriDecodeActual = TbUtils.decodeURI(uriEncodeActual);
+        Assert.assertEquals(uriOriginal, uriDecodeActual);
+    }
     private static List<Byte> toList(byte[] data) {
         List<Byte> result = new ArrayList<>(data.length);
         for (Byte b : data) {
diff --git a/common/stats/src/main/java/org/thingsboard/server/common/stats/DefaultStatsFactory.java b/common/stats/src/main/java/org/thingsboard/server/common/stats/DefaultStatsFactory.java
index 8fa362e52a..be0c4fe19f 100644
--- a/common/stats/src/main/java/org/thingsboard/server/common/stats/DefaultStatsFactory.java
+++ b/common/stats/src/main/java/org/thingsboard/server/common/stats/DefaultStatsFactory.java
@@ -19,6 +19,7 @@ import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.Timer;
+import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -61,12 +62,17 @@ public class DefaultStatsFactory implements StatsFactory {
 
 
     @Override
-    public StatsCounter createStatsCounter(String key, String statsName) {
+    public StatsCounter createStatsCounter(String key, String statsName, String... otherTags) {
+        String[] tags = new String[]{STATS_NAME_TAG, statsName};
+        if (otherTags.length > 0) {
+            if (otherTags.length % 2 != 0) {
+                throw new IllegalArgumentException("Invalid tags array size");
+            }
+            tags = ArrayUtils.addAll(tags, otherTags);
+        }
         return new StatsCounter(
                 new AtomicInteger(0),
-                metricsEnabled ?
-                        meterRegistry.counter(key, STATS_NAME_TAG, statsName)
-                        : STUB_COUNTER,
+                metricsEnabled ? meterRegistry.counter(key, tags) : STUB_COUNTER,
                 statsName
         );
     }
diff --git a/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsFactory.java b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsFactory.java
index 8e6989016b..b9bf0b97fb 100644
--- a/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsFactory.java
+++ b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsFactory.java
@@ -18,7 +18,8 @@ package org.thingsboard.server.common.stats;
 import io.micrometer.core.instrument.Timer;
 
 public interface StatsFactory {
-    StatsCounter createStatsCounter(String key, String statsName);
+
+    StatsCounter createStatsCounter(String key, String statsName, String... otherTags);
 
     DefaultCounter createDefaultCounter(String key, String... tags);
 
@@ -27,4 +28,5 @@ public interface StatsFactory {
     MessagesStats createMessagesStats(String key);
 
     Timer createTimer(String key, String... tags);
+
 }
diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java
index e7100cac30..50dadd8e87 100644
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java
@@ -45,7 +45,7 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor {
     public TransportProtos.PostTelemetryMsg convertToPostTelemetry(UUID sessionId, Request inbound, Descriptors.Descriptor telemetryMsgDescriptor) throws AdaptorException {
         String payload = validatePayload(sessionId, inbound, false);
         try {
-            return JsonConverter.convertToTelemetryProto(new JsonParser().parse(payload));
+            return JsonConverter.convertToTelemetryProto(JsonParser.parseString(payload));
         } catch (IllegalStateException | JsonSyntaxException ex) {
             throw new AdaptorException(ex);
         }
@@ -55,7 +55,7 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor {
     public TransportProtos.PostAttributeMsg convertToPostAttributes(UUID sessionId, Request inbound, Descriptors.Descriptor attributesMsgDescriptor) throws AdaptorException {
         String payload = validatePayload(sessionId, inbound, false);
         try {
-            return JsonConverter.convertToAttributesProto(new JsonParser().parse(payload));
+            return JsonConverter.convertToAttributesProto(JsonParser.parseString(payload));
         } catch (IllegalStateException | JsonSyntaxException ex) {
             throw new AdaptorException(ex);
         }
@@ -70,7 +70,7 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor {
     public TransportProtos.ToDeviceRpcResponseMsg convertToDeviceRpcResponse(UUID sessionId, Request inbound, Descriptors.Descriptor rpcResponseMsgDescriptor) throws AdaptorException {
         Optional<Integer> requestId = CoapTransportResource.getRequestId(inbound);
         String payload = validatePayload(sessionId, inbound, false);
-        JsonObject response = new JsonParser().parse(payload).getAsJsonObject();
+        JsonObject response = JsonParser.parseString(payload).getAsJsonObject();
         return TransportProtos.ToDeviceRpcResponseMsg.newBuilder().setRequestId(requestId.orElseThrow(() -> new AdaptorException("Request id is missing!")))
                 .setPayload(response.toString()).build();
     }
@@ -78,7 +78,7 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor {
     @Override
     public TransportProtos.ToServerRpcRequestMsg convertToServerRpcRequest(UUID sessionId, Request inbound) throws AdaptorException {
         String payload = validatePayload(sessionId, inbound, false);
-        return JsonConverter.convertToServerRpcRequest(new JsonParser().parse(payload), 0);
+        return JsonConverter.convertToServerRpcRequest(JsonParser.parseString(payload), 0);
     }
 
     @Override
diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/ProtoCoapAdaptor.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/ProtoCoapAdaptor.java
index f686dc63cf..189620afa1 100644
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/ProtoCoapAdaptor.java
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/ProtoCoapAdaptor.java
@@ -45,7 +45,7 @@ public class ProtoCoapAdaptor implements CoapTransportAdaptor {
     public TransportProtos.PostTelemetryMsg convertToPostTelemetry(UUID sessionId, Request inbound, Descriptors.Descriptor telemetryMsgDescriptor) throws AdaptorException {
         ProtoConverter.validateDescriptor(telemetryMsgDescriptor);
         try {
-            return JsonConverter.convertToTelemetryProto(new JsonParser().parse(ProtoConverter.dynamicMsgToJson(inbound.getPayload(), telemetryMsgDescriptor)));
+            return JsonConverter.convertToTelemetryProto(JsonParser.parseString(ProtoConverter.dynamicMsgToJson(inbound.getPayload(), telemetryMsgDescriptor)));
         } catch (Exception e) {
             throw new AdaptorException(e);
         }
@@ -55,7 +55,7 @@ public class ProtoCoapAdaptor implements CoapTransportAdaptor {
     public TransportProtos.PostAttributeMsg convertToPostAttributes(UUID sessionId, Request inbound, Descriptors.Descriptor attributesMsgDescriptor) throws AdaptorException {
         ProtoConverter.validateDescriptor(attributesMsgDescriptor);
         try {
-            return JsonConverter.convertToAttributesProto(new JsonParser().parse(ProtoConverter.dynamicMsgToJson(inbound.getPayload(), attributesMsgDescriptor)));
+            return JsonConverter.convertToAttributesProto(JsonParser.parseString(ProtoConverter.dynamicMsgToJson(inbound.getPayload(), attributesMsgDescriptor)));
         } catch (Exception e) {
             throw new AdaptorException(e);
         }
@@ -74,7 +74,7 @@ public class ProtoCoapAdaptor implements CoapTransportAdaptor {
         } else {
             ProtoConverter.validateDescriptor(rpcResponseMsgDescriptor);
             try {
-                JsonElement response = new JsonParser().parse(ProtoConverter.dynamicMsgToJson(inbound.getPayload(), rpcResponseMsgDescriptor));
+                JsonElement response = JsonParser.parseString(ProtoConverter.dynamicMsgToJson(inbound.getPayload(), rpcResponseMsgDescriptor));
                 return TransportProtos.ToDeviceRpcResponseMsg.newBuilder().setRequestId(requestId.orElseThrow(() -> new AdaptorException("Request id is missing!")))
                         .setPayload(response.toString()).build();
             } catch (Exception e) {
diff --git a/common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java b/common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java
index 5e2d916397..58a5629dae 100644
--- a/common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java
+++ b/common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java
@@ -16,12 +16,11 @@
 package org.thingsboard.server.transport.http;
 
 import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +30,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -56,6 +56,7 @@ import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.AttributeUpdateNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetAttributeRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetAttributeResponseMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.GetOtaPackageResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionCloseNotificationProto;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
@@ -137,8 +138,7 @@ public class DeviceApiController implements TbTransportService {
                     + MARKDOWN_CODE_BLOCK_START
                     + ATTRIBUTE_PAYLOAD_EXAMPLE
                     + MARKDOWN_CODE_BLOCK_END
-                    + REQUIRE_ACCESS_TOKEN,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/attributes", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public DeferredResult<ResponseEntity> getDeviceAttributes(
             @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
@@ -174,19 +174,18 @@ public class DeviceApiController implements TbTransportService {
                     + MARKDOWN_CODE_BLOCK_START
                     + ATTRIBUTE_PAYLOAD_EXAMPLE
                     + MARKDOWN_CODE_BLOCK_END
-                    + REQUIRE_ACCESS_TOKEN,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/attributes", method = RequestMethod.POST)
     public DeferredResult<ResponseEntity> postDeviceAttributes(
             @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
-            @Parameter(description = "JSON with attribute key-value pairs. See API call description for example.")
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "JSON with attribute key-value pairs. See API call description for example.")
             @RequestBody String json) {
         DeferredResult<ResponseEntity> responseWriter = new DeferredResult<>();
         transportContext.getTransportService().process(DeviceTransportType.DEFAULT, ValidateDeviceTokenRequestMsg.newBuilder().setToken(deviceToken).build(),
                 new DeviceAuthCallback(transportContext, responseWriter, sessionInfo -> {
                     TransportService transportService = transportContext.getTransportService();
-                    transportService.process(sessionInfo, JsonConverter.convertToAttributesProto(new JsonParser().parse(json)),
+                    transportService.process(sessionInfo, JsonConverter.convertToAttributesProto(JsonParser.parseString(json)),
                             new HttpOkCallback(responseWriter));
                 }));
         return responseWriter;
@@ -196,8 +195,7 @@ public class DeviceApiController implements TbTransportService {
             description = "Post time-series data on behalf of device. "
                     + "\n Example of the request: "
                     + TS_PAYLOAD
-                    + REQUIRE_ACCESS_TOKEN,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/telemetry", method = RequestMethod.POST)
     public DeferredResult<ResponseEntity> postTelemetry(
             @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
@@ -207,7 +205,7 @@ public class DeviceApiController implements TbTransportService {
         transportContext.getTransportService().process(DeviceTransportType.DEFAULT, ValidateDeviceTokenRequestMsg.newBuilder().setToken(deviceToken).build(),
                 new DeviceAuthCallback(transportContext, responseWriter, sessionInfo -> {
                     TransportService transportService = transportContext.getTransportService();
-                    transportService.process(sessionInfo, JsonConverter.convertToTelemetryProto(new JsonParser().parse(json)),
+                    transportService.process(sessionInfo, JsonConverter.convertToTelemetryProto(JsonParser.parseString(json)),
                             new HttpOkCallback(responseWriter));
                 }));
         return responseWriter;
@@ -222,8 +220,7 @@ public class DeviceApiController implements TbTransportService {
                     + MARKDOWN_CODE_BLOCK_END
                     + "Note: both 'secretKey' and 'durationMs' is optional parameters. " +
                     "In case the secretKey is not specified, the empty string as a default value is used. In case the durationMs is not specified, the system parameter device.claim.duration is used.\n\n"
-                    + REQUIRE_ACCESS_TOKEN,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    + REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/claim", method = RequestMethod.POST)
     public DeferredResult<ResponseEntity> claimDevice(
             @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
@@ -244,8 +241,7 @@ public class DeviceApiController implements TbTransportService {
             description = "Subscribes to RPC commands using http long polling. " +
                     "Deprecated, since long polling is resource and network consuming. " +
                     "Consider using MQTT or CoAP protocol for light-weight real-time updates. \n\n" +
-                    REQUIRE_ACCESS_TOKEN,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/rpc", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public DeferredResult<ResponseEntity> subscribeToCommands(
             @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
@@ -268,15 +264,14 @@ public class DeviceApiController implements TbTransportService {
 
     @Operation(summary = "Reply to RPC commands (replyToCommand)",
             description = "Replies to server originated RPC command identified by 'requestId' parameter. The response is arbitrary JSON.\n\n" +
-                    REQUIRE_ACCESS_TOKEN,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/rpc/{requestId}", method = RequestMethod.POST)
     public DeferredResult<ResponseEntity> replyToCommand(
             @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
             @Parameter(description = "RPC request id from the incoming RPC request", required = true , schema = @Schema(defaultValue = "123"))
             @PathVariable("requestId") Integer requestId,
-            @Parameter(description = "Reply to the RPC request, JSON. For example: {\"status\":\"success\"}", required = true)
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "Reply to the RPC request, JSON. For example: {\"status\":\"success\"}", required = true)
             @RequestBody String json) {
         DeferredResult<ResponseEntity> responseWriter = new DeferredResult<ResponseEntity>();
         transportContext.getTransportService().process(DeviceTransportType.DEFAULT, ValidateDeviceTokenRequestMsg.newBuilder().setToken(deviceToken).build(),
@@ -296,18 +291,17 @@ public class DeviceApiController implements TbTransportService {
                     MARKDOWN_CODE_BLOCK_START +
                     "{\"result\": 4}" +
                     MARKDOWN_CODE_BLOCK_END +
-                    REQUIRE_ACCESS_TOKEN,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/rpc", method = RequestMethod.POST)
     public DeferredResult<ResponseEntity> postRpcRequest(
             @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
             @PathVariable("deviceToken") String deviceToken,
-            @Parameter(description = "The RPC request JSON", required = true)
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "The RPC request JSON", required = true)
             @RequestBody String json) {
         DeferredResult<ResponseEntity> responseWriter = new DeferredResult<ResponseEntity>();
         transportContext.getTransportService().process(DeviceTransportType.DEFAULT, ValidateDeviceTokenRequestMsg.newBuilder().setToken(deviceToken).build(),
                 new DeviceAuthCallback(transportContext, responseWriter, sessionInfo -> {
-                    JsonObject request = new JsonParser().parse(json).getAsJsonObject();
+                    JsonObject request = JsonParser.parseString(json).getAsJsonObject();
                     TransportService transportService = transportContext.getTransportService();
                     transportService.registerSyncSession(sessionInfo,
                             new HttpSessionListener(responseWriter, transportContext.getTransportService(), sessionInfo),
@@ -324,8 +318,7 @@ public class DeviceApiController implements TbTransportService {
             description = "Subscribes to client and shared scope attribute updates using http long polling. " +
                     "Deprecated, since long polling is resource and network consuming. " +
                     "Consider using MQTT or CoAP protocol for light-weight real-time updates. \n\n" +
-                    REQUIRE_ACCESS_TOKEN,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/attributes/updates", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public DeferredResult<ResponseEntity> subscribeToAttributes(
             @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
@@ -356,8 +349,7 @@ public class DeviceApiController implements TbTransportService {
                     "Optional 'chunk' and 'size' parameters may be used to download the firmware in chunks. " +
                     "For example, device may request first 16 KB of firmware using 'chunk'=0 and 'size'=16384. " +
                     "Next 16KB using 'chunk'=1 and 'size'=16384. The last chunk should have less bytes then requested using 'size' parameter. \n\n" +
-                    REQUIRE_ACCESS_TOKEN,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/firmware", method = RequestMethod.GET)
     public DeferredResult<ResponseEntity> getFirmware(
             @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
@@ -383,8 +375,7 @@ public class DeviceApiController implements TbTransportService {
                     "Optional 'chunk' and 'size' parameters may be used to download the software in chunks. " +
                     "For example, device may request first 16 KB of software using 'chunk'=0 and 'size'=16384. " +
                     "Next 16KB using 'chunk'=1 and 'size'=16384. The last chunk should have less bytes then requested using 'size' parameter. \n\n" +
-                    REQUIRE_ACCESS_TOKEN,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    REQUIRE_ACCESS_TOKEN)
     @RequestMapping(value = "/{deviceToken}/software", method = RequestMethod.GET)
     public DeferredResult<ResponseEntity> getSoftware(
             @Parameter(description = ACCESS_TOKEN_PARAM_DESCRIPTION, required = true , schema = @Schema(defaultValue = "YOUR_DEVICE_ACCESS_TOKEN"))
@@ -418,12 +409,10 @@ public class DeviceApiController implements TbTransportService {
                     "  \"credentialsType\":\"ACCESS_TOKEN\",\n" +
                     "  \"credentialsValue\":\"DEVICE_ACCESS_TOKEN\",\n" +
                     "  \"status\":\"SUCCESS\"\n" +
-                    "}" + MARKDOWN_CODE_BLOCK_END
-            ,
-            responses = @ApiResponse(content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE)))
+                    "}" + MARKDOWN_CODE_BLOCK_END)
     @RequestMapping(value = "/provision", method = RequestMethod.POST)
     public DeferredResult<ResponseEntity> provisionDevice(
-            @Parameter(description = "JSON with provision request. See API call description for example.")
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "JSON with provision request. See API call description for example.")
             @RequestBody String json) {
         DeferredResult<ResponseEntity> responseWriter = new DeferredResult<>();
         transportContext.getTransportService().process(JsonConverter.convertToProvisionRequestMsg(json),
@@ -441,22 +430,17 @@ public class DeviceApiController implements TbTransportService {
                             .setDeviceIdMSB(sessionInfo.getDeviceIdMSB())
                             .setDeviceIdLSB(sessionInfo.getDeviceIdLSB())
                             .setType(firmwareType.name()).build();
-                    transportContext.getTransportService().process(sessionInfo, requestMsg, new GetOtaPackageCallback(responseWriter, title, version, size, chunk));
+                    transportContext.getTransportService().process(sessionInfo, requestMsg, new GetOtaPackageCallback(transportContext, responseWriter, title, version, size, chunk));
                 }));
         return responseWriter;
     }
 
-    private static class DeviceAuthCallback implements TransportServiceCallback<ValidateDeviceCredentialsResponse> {
+    @RequiredArgsConstructor
+    static class DeviceAuthCallback implements TransportServiceCallback<ValidateDeviceCredentialsResponse> {
         private final TransportContext transportContext;
         private final DeferredResult<ResponseEntity> responseWriter;
         private final Consumer<SessionInfoProto> onSuccess;
 
-        DeviceAuthCallback(TransportContext transportContext, DeferredResult<ResponseEntity> responseWriter, Consumer<SessionInfoProto> onSuccess) {
-            this.transportContext = transportContext;
-            this.responseWriter = responseWriter;
-            this.onSuccess = onSuccess;
-        }
-
         @Override
         public void onSuccess(ValidateDeviceCredentialsResponse msg) {
             if (msg.hasDeviceInfo()) {
@@ -468,18 +452,21 @@ public class DeviceApiController implements TbTransportService {
 
         @Override
         public void onError(Throwable e) {
-            log.warn("Failed to process request", e);
-            responseWriter.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
+            String body = null;
+            if (e instanceof HttpMessageNotReadableException || e instanceof JsonParseException) {
+                body = e.getMessage();
+                log.debug("Failed to process request in DeviceAuthCallback: {}", body);
+            } else {
+                log.warn("Failed to process request in DeviceAuthCallback", e);
+            }
+            responseWriter.setResult(new ResponseEntity<>(body, HttpStatus.INTERNAL_SERVER_ERROR));
         }
     }
 
-    private static class DeviceProvisionCallback implements TransportServiceCallback<ProvisionDeviceResponseMsg> {
+    @RequiredArgsConstructor
+    static class DeviceProvisionCallback implements TransportServiceCallback<ProvisionDeviceResponseMsg> {
         private final DeferredResult<ResponseEntity> responseWriter;
 
-        DeviceProvisionCallback(DeferredResult<ResponseEntity> responseWriter) {
-            this.responseWriter = responseWriter;
-        }
-
         @Override
         public void onSuccess(ProvisionDeviceResponseMsg msg) {
             responseWriter.setResult(new ResponseEntity<>(JsonConverter.toJson(msg).toString(), HttpStatus.OK));
@@ -487,25 +474,25 @@ public class DeviceApiController implements TbTransportService {
 
         @Override
         public void onError(Throwable e) {
-            log.warn("Failed to process request", e);
-            responseWriter.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
+            String body = null;
+            if (e instanceof HttpMessageNotReadableException || e instanceof JsonParseException) {
+                body = e.getMessage();
+                log.debug("Failed to process request in DeviceProvisionCallback: {}", body);
+            } else {
+                log.warn("Failed to process request in DeviceProvisionCallback", e);
+            }
+            responseWriter.setResult(new ResponseEntity<>(body, HttpStatus.INTERNAL_SERVER_ERROR));
         }
     }
 
-    private class GetOtaPackageCallback implements TransportServiceCallback<TransportProtos.GetOtaPackageResponseMsg> {
+    @RequiredArgsConstructor
+    static class GetOtaPackageCallback implements TransportServiceCallback<GetOtaPackageResponseMsg> {
+        private final TransportContext transportContext;
         private final DeferredResult<ResponseEntity> responseWriter;
         private final String title;
         private final String version;
-        private final int chuckSize;
-        private final int chuck;
-
-        GetOtaPackageCallback(DeferredResult<ResponseEntity> responseWriter, String title, String version, int chuckSize, int chuck) {
-            this.responseWriter = responseWriter;
-            this.title = title;
-            this.version = version;
-            this.chuckSize = chuckSize;
-            this.chuck = chuck;
-        }
+        private final int chunkSize;
+        private final int chunk;
 
         @Override
         public void onSuccess(TransportProtos.GetOtaPackageResponseMsg otaPackageResponseMsg) {
@@ -513,7 +500,7 @@ public class DeviceApiController implements TbTransportService {
                 responseWriter.setResult(new ResponseEntity<>(HttpStatus.NOT_FOUND));
             } else if (title.equals(otaPackageResponseMsg.getTitle()) && version.equals(otaPackageResponseMsg.getVersion())) {
                 String otaPackageId = new UUID(otaPackageResponseMsg.getOtaPackageIdMSB(), otaPackageResponseMsg.getOtaPackageIdLSB()).toString();
-                ByteArrayResource resource = new ByteArrayResource(transportContext.getOtaPackageDataCache().get(otaPackageId, chuckSize, chuck));
+                ByteArrayResource resource = new ByteArrayResource(transportContext.getOtaPackageDataCache().get(otaPackageId, chunkSize, chunk));
                 ResponseEntity<ByteArrayResource> response = ResponseEntity.ok()
                         .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + otaPackageResponseMsg.getFileName())
                         .header("x-filename", otaPackageResponseMsg.getFileName())
@@ -528,8 +515,14 @@ public class DeviceApiController implements TbTransportService {
 
         @Override
         public void onError(Throwable e) {
-            log.warn("Failed to process request", e);
-            responseWriter.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
+            String body = null;
+            if (e instanceof HttpMessageNotReadableException || e instanceof JsonParseException) {
+                body = e.getMessage();
+                log.debug("Failed to process request in GetOtaPackageCallback: {}", body);
+            } else {
+                log.warn("Failed to process request in GetOtaPackageCallback", e);
+            }
+            responseWriter.setResult(new ResponseEntity<>(body, HttpStatus.INTERNAL_SERVER_ERROR));
         }
     }
 
diff --git a/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java b/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java
new file mode 100644
index 0000000000..ce1e2b2fde
--- /dev/null
+++ b/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java
@@ -0,0 +1,82 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.transport.http;
+
+import com.google.gson.JsonParseException;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.web.context.request.async.DeferredResult;
+import org.thingsboard.server.common.transport.TransportContext;
+import org.thingsboard.server.gen.transport.TransportProtos;
+
+import java.io.IOException;
+import java.util.function.Consumer;
+
+class DeviceApiControllerTest {
+
+    @Test
+    void deviceAuthCallbackTest() {
+        TransportContext transportContext = Mockito.mock(TransportContext.class);
+        DeferredResult<ResponseEntity> responseWriter = Mockito.mock(DeferredResult.class);
+        Consumer<TransportProtos.SessionInfoProto> onSuccess = x -> {
+        };
+        var callback = new DeviceApiController.DeviceAuthCallback(transportContext, responseWriter, onSuccess);
+
+        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax"));
+
+        callback.onError(new JsonParseException("Json ; expected"));
+
+        callback.onError(new IOException("not found"));
+
+        callback.onError(new RuntimeException("oops it is run time error"));
+    }
+
+    @Test
+    void deviceProvisionCallbackTest() {
+        DeferredResult<ResponseEntity> responseWriter = Mockito.mock(DeferredResult.class);
+        var callback = new DeviceApiController.DeviceProvisionCallback(responseWriter);
+
+        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax"));
+
+        callback.onError(new JsonParseException("Json ; expected"));
+
+        callback.onError(new IOException("not found"));
+
+        callback.onError(new RuntimeException("oops it is run time error"));
+    }
+
+    @Test
+    void getOtaPackageCallback() {
+        TransportContext transportContext = Mockito.mock(TransportContext.class);
+        DeferredResult<ResponseEntity> responseWriter = Mockito.mock(DeferredResult.class);
+        String title = "Title";
+        String version = "version";
+        int chunkSize = 11;
+        int chunk = 3;
+
+        var callback = new DeviceApiController.GetOtaPackageCallback(transportContext, responseWriter, title, version, chunkSize, chunk);
+
+        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax"));
+
+        callback.onError(new JsonParseException("Json ; expected"));
+
+        callback.onError(new IOException("not found"));
+
+        callback.onError(new RuntimeException("oops it is run time error"));
+    }
+}
diff --git a/common/transport/http/src/test/resources/logback-test.xml b/common/transport/http/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..359007da5a
--- /dev/null
+++ b/common/transport/http/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration>
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{ISO8601} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    logger name="org.thingsboard.server.transport.http.DeviceApiController" level="DEBUG" />
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServerHelper.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServerHelper.java
index a25ed11d94..86df96f40e 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServerHelper.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServerHelper.java
@@ -50,7 +50,6 @@ import static org.thingsboard.server.gen.transport.TransportProtos.KeyValueType.
 public class LwM2mTransportServerHelper {
 
     private final LwM2mTransportContext context;
-    private final static JsonParser JSON_PARSER = new JsonParser();
 
     public void sendParametersOnThingsboardAttribute(List<TransportProtos.KeyValueProto> result, SessionInfoProto sessionInfo) {
         PostAttributeMsg.Builder request = PostAttributeMsg.newBuilder();
@@ -231,7 +230,7 @@ public class LwM2mTransportServerHelper {
                 return kv.getStringV();
             case JSON_V:
                 try {
-                    return JSON_PARSER.parse(kv.getJsonV());
+                    return JsonParser.parseString(kv.getJsonV());
                 } catch (Exception e) {
                     return null;
                 }
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
index 29df8f7f65..cb391b27e9 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
@@ -229,7 +229,7 @@ public class LwM2mClient {
             this.resources.get(pathRezIdVer).updateLwM2mResource(resource, mode);
             return true;
         } else {
-            LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathRezIdVer));
+            LwM2mPath pathIds = getLwM2mPathFromString(pathRezIdVer);
             ResourceModel resourceModel = modelProvider.getObjectModel(registration).getResourceModel(pathIds.getObjectId(), pathIds.getResourceId());
             if (resourceModel != null) {
                 this.resources.put(pathRezIdVer, new ResourceValue(resource, resourceModel));
@@ -257,7 +257,7 @@ public class LwM2mClient {
     }
 
     public String getRezIdByResourceNameAndObjectInstanceId(String resourceName, String pathObjectInstanceIdVer, LwM2mModelProvider modelProvider) {
-        LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathObjectInstanceIdVer));
+        LwM2mPath pathIds = getLwM2mPathFromString(pathObjectInstanceIdVer);
         if (pathIds.isObjectInstance()) {
             Set<Integer> rezIds = modelProvider.getObjectModel(registration)
                     .getObjectModel(pathIds.getObjectId()).resources.entrySet()
@@ -271,7 +271,7 @@ public class LwM2mClient {
     }
 
     public ResourceModel getResourceModel(String pathIdVer, LwM2mModelProvider modelProvider) {
-        LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathIdVer));
+        LwM2mPath pathIds = getLwM2mPathFromString(pathIdVer);
         String verSupportedObject = String.valueOf(registration.getSupportedObject().get(pathIds.getObjectId()));
         String verRez = getVerFromPathIdVerOrId(pathIdVer);
         return verRez != null && verRez.equals(verSupportedObject) ? modelProvider.getObjectModel(registration)
@@ -289,7 +289,7 @@ public class LwM2mClient {
 
     public ObjectModel getObjectModel(String pathIdVer, LwM2mModelProvider modelProvider) {
         try {
-            LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathIdVer));
+            LwM2mPath pathIds = getLwM2mPathFromString(pathIdVer);
             String verSupportedObject = String.valueOf(registration.getSupportedObject().get(pathIds.getObjectId()));
             String verRez = getVerFromPathIdVerOrId(pathIdVer);
             return verRez != null && verRez.equals(verSupportedObject) ? modelProvider.getObjectModel(registration)
@@ -309,7 +309,7 @@ public class LwM2mClient {
 
     public Collection<LwM2mResource> getNewResourceForInstance(String pathRezIdVer, Object params, LwM2mModelProvider modelProvider,
                                                                LwM2mValueConverter converter) {
-        LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathRezIdVer));
+        LwM2mPath pathIds = getLwM2mPathFromString(pathRezIdVer);
         Collection<LwM2mResource> resources = ConcurrentHashMap.newKeySet();
         Map<Integer, ResourceModel> resourceModels = modelProvider.getObjectModel(registration)
                 .getObjectModel(pathIds.getObjectId()).resources;
@@ -329,7 +329,7 @@ public class LwM2mClient {
      */
     public Collection<LwM2mResource> getNewResourcesForInstance(String pathRezIdVer, Object params, LwM2mModelProvider modelProvider,
                                                                 LwM2mValueConverter converter) {
-        LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathRezIdVer));
+        LwM2mPath pathIds = getLwM2mPathFromString(pathRezIdVer);
         Collection<LwM2mResource> resources = ConcurrentHashMap.newKeySet();
         Map<Integer, ResourceModel> resourceModels = modelProvider.getObjectModel(registration)
                 .getObjectModel(pathIds.getObjectId()).resources;
@@ -370,7 +370,7 @@ public class LwM2mClient {
     }
 
     public String isValidObjectVersion(String path) {
-        LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(path));
+        LwM2mPath pathIds = getLwM2mPathFromString(path);
         LwM2m.Version verSupportedObject = registration.getSupportedObject().get(pathIds.getObjectId());
         if (verSupportedObject == null) {
             return String.format("Specified object id %s absent in the list supported objects of the client or is security object!", pathIds.getObjectId());
@@ -390,7 +390,7 @@ public class LwM2mClient {
     public void deleteResources(String pathIdVer, LwM2mModelProvider modelProvider) {
         Set<String> key = getKeysEqualsIdVer(pathIdVer);
         key.forEach(pathRez -> {
-            LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathRez));
+            LwM2mPath pathIds = getLwM2mPathFromString(pathRez);
             ResourceModel resourceModel = modelProvider.getObjectModel(registration).getResourceModel(pathIds.getObjectId(), pathIds.getResourceId());
             if (resourceModel != null) {
                 this.resources.get(pathRez).setResourceModel(resourceModel);
@@ -410,7 +410,7 @@ public class LwM2mClient {
     }
 
     private void saveResourceModel(String pathRez, LwM2mModelProvider modelProvider) {
-        LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathRez));
+        LwM2mPath pathIds = getLwM2mPathFromString(pathRez);
         ResourceModel resourceModel = modelProvider.getObjectModel(registration).getResourceModel(pathIds.getObjectId(), pathIds.getResourceId());
         this.resources.get(pathRez).setResourceModel(resourceModel);
     }
@@ -456,5 +456,9 @@ public class LwM2mClient {
         return result;
     }
 
+    public LwM2mPath getLwM2mPathFromString(String path) {
+        return new LwM2mPath(fromVersionedIdToObjectId(path));
+    }
+
 }
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbInMemoryRegistrationStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbInMemoryRegistrationStore.java
index 60afd76ffb..138d0d6af8 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbInMemoryRegistrationStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbInMemoryRegistrationStore.java
@@ -147,6 +147,7 @@ public class TbInMemoryRegistrationStore implements RegistrationStore, Startable
 
     @Override
     public UpdatedRegistration updateRegistration(RegistrationUpdate update) {
+        log.trace("updateRegistration [{}]", update);
         try {
             lock.writeLock().lock();
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
index 898fef7b2f..b52764187d 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
@@ -90,7 +90,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     private static final Logger LOG = LoggerFactory.getLogger(RedisRegistrationStore.class);
 
     // Redis key prefixes
-    private static final String REG_EP = "REG:EP:"; // (Endpoint => Registration)
+    public static final String REG_EP = "REG:EP:"; // (Endpoint => Registration)
     private static final String REG_EP_REGID_IDX = "EP:REGID:"; // secondary index key (Registration ID => Endpoint)
     private static final String REG_EP_ADDR_IDX = "EP:ADDR:"; // secondary index key (Socket Address => Endpoint)
     private static final String REG_EP_IDENTITY = "EP:IDENTITY:"; // secondary index key (Identity => Endpoint)
@@ -222,6 +222,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
 
     @Override
     public UpdatedRegistration updateRegistration(RegistrationUpdate update) {
+        log.trace("updateRegistration [{}]", update);
         Lock lock = null;
         try (var connection = connectionFactory.getConnection()) {
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisSecurityStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisSecurityStore.java
index ff72850c45..f837931b19 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisSecurityStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisSecurityStore.java
@@ -15,17 +15,24 @@
  */
 package org.thingsboard.server.transport.lwm2m.server.store;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.core.SecurityMode;
 import org.eclipse.leshan.core.peer.OscoreIdentity;
 import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
 import org.eclipse.leshan.server.security.SecurityInfo;
+import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.integration.redis.util.RedisLockRegistry;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.JavaSerDesUtil;
 import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MSecurityInfo;
 
 import java.util.concurrent.locks.Lock;
 
+import static org.thingsboard.server.transport.lwm2m.server.store.TbLwM2mRedisRegistrationStore.REG_EP;
+
+@Slf4j
 public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
     private static final String SEC_EP = "SEC#EP#";
     private static final String LOCK_EP = "LOCK#EP#";
@@ -49,11 +56,31 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
             if (data == null || data.length == 0) {
                 return null;
             } else {
-                if (SecurityMode.NO_SEC.equals(((TbLwM2MSecurityInfo) JavaSerDesUtil.decode(data)).getSecurityMode())) {
+                TbLwM2MSecurityInfo tbLwM2MSecurityInfo = JavaSerDesUtil.decode(data);
+                if (tbLwM2MSecurityInfo != null) {
+                    if (SecurityMode.NO_SEC.equals(tbLwM2MSecurityInfo.getSecurityMode())){
+
+                        // for tests: redis connect NoSec (securityInfo == null)
+                        log.info("lwm2m redis securityStore (decode -ok). Endpoint: [{}], secMode: [NoSec] key: [{}], data [{}]", endpoint, SEC_EP, data);
+
+                        return SecurityInfo.newPreSharedKeyInfo(SecurityMode.NO_SEC.toString(), SecurityMode.NO_SEC.toString(),
+                                SecurityMode.NO_SEC.toString().getBytes());
+                    } else {
+                        return tbLwM2MSecurityInfo.getSecurityInfo();
+                    }
+                } else if (SecurityMode.NO_SEC.equals(getSecurityModeByRegistration (connection,  endpoint))){
+
+                    // for tests: redis connect NoSec (securityInfo == null)
+                    log.info("lwm2m redis securityStore (decode - bad, registration - unsecure). Endpoint: [{}], secMode: [NoSec] key: [{}], data [{}]", endpoint, SEC_EP, data);
+
                     return SecurityInfo.newPreSharedKeyInfo(SecurityMode.NO_SEC.toString(), SecurityMode.NO_SEC.toString(),
                             SecurityMode.NO_SEC.toString().getBytes());
                 } else {
-                    return ((TbLwM2MSecurityInfo) JavaSerDesUtil.decode(data)).getSecurityInfo();
+
+                    // for tests: redis connect NoSec (securityInfo == null)
+                    log.info("lwm2m redis securityStore (decode - bad, registration is not unsecure) - return null. Endpoint: [{}], key: [{}], data [{}]", endpoint, SEC_EP, data);
+
+                    return null;
                 }
             }
         } finally {
@@ -112,6 +139,11 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
             }
 
             byte[] previousData = connection.getSet((SEC_EP + tbSecurityInfo.getEndpoint()).getBytes(), tbSecurityInfoSerialized);
+
+                // for tests: redis connect NoSec (securityInfo == null)
+            log.info("lwm2m redis connect. Endpoint: [{}], secMode: [{}] key: [{}], tbSecurityInfoSerialized [{}]",
+                    tbSecurityInfo.getEndpoint(), tbSecurityInfo.getSecurityMode().name(), SEC_EP, tbSecurityInfoSerialized);
+
             if (previousData != null && info != null) {
                 String previousIdentity = ((TbLwM2MSecurityInfo) JavaSerDesUtil.decode(previousData)).getSecurityInfo().getPskIdentity();
                 if (previousIdentity != null && !previousIdentity.equals(info.getPskIdentity())) {
@@ -168,4 +200,17 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
     private String toLockKey(String endpoint) {
         return LOCK_EP + endpoint;
     }
+
+    private SecurityMode getSecurityModeByRegistration (RedisConnection connection, String endpoint) {
+        try {
+            byte[] data = connection.get((REG_EP + endpoint).getBytes());
+            JsonNode registrationNode = JacksonUtil.fromString(new String(data != null ? data : new byte[0]), JsonNode.class);
+            String typeModeStr = registrationNode.get("transportdata").get("identity").get("type").asText();
+            return "unsecure".equals(typeModeStr) ? SecurityMode.NO_SEC : null;
+        } catch (Exception e) {
+            log.error("Redis: Failed get SecurityMode by Registration, endpoint: [{}]", endpoint, e);
+            return null;
+        }
+
+    }
 }
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStore.java
index 542327cccc..17f9b4a978 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStore.java
@@ -94,9 +94,13 @@ public class TbRedisLwM2MClientStore implements TbLwM2MClientStore {
         if (client.getState().equals(LwM2MClientState.UNREGISTERED)) {
             log.error("[{}] Client is in invalid state: {}!", client.getEndpoint(), client.getState(), new Exception());
         } else {
-            byte[] clientSerialized = serialize(client);
-            try (var connection = connectionFactory.getConnection()) {
-                connection.getSet(getKey(client.getEndpoint()), clientSerialized);
+            try {
+                byte[] clientSerialized = serialize(client);
+                try (var connection = connectionFactory.getConnection()) {
+                    connection.getSet(getKey(client.getEndpoint()), clientSerialized);
+                }
+            } catch (Exception e) {
+                log.warn("Failed to serialize client: {}", client, e);
             }
         }
     }
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDes.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDes.java
index 30800eb9ee..17fef8acb0 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDes.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDes.java
@@ -15,8 +15,12 @@
  */
 package org.thingsboard.server.transport.lwm2m.server.store.util;
 
-import com.fasterxml.jackson.annotation.JsonValue;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.google.protobuf.util.JsonFormat;
 import lombok.SneakyThrows;
 import org.eclipse.leshan.core.model.ResourceModel;
@@ -25,23 +29,35 @@ import org.eclipse.leshan.core.node.LwM2mNodeException;
 import org.eclipse.leshan.core.node.LwM2mResource;
 import org.eclipse.leshan.core.node.LwM2mSingleResource;
 import org.eclipse.leshan.core.node.ObjectLink;
+import org.eclipse.leshan.core.util.datatype.ULong;
 import org.eclipse.leshan.server.redis.serialization.RegistrationSerDes;
+import org.thingsboard.server.common.data.device.data.PowerMode;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.transport.lwm2m.server.client.LwM2MClientState;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
+import org.thingsboard.server.transport.lwm2m.server.client.ResourceValue;
 
 import java.lang.reflect.Field;
+import java.time.Instant;
 import java.util.Base64;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.thingsboard.common.util.JacksonUtil.toJsonNode;
 
 public class LwM2MClientSerDes {
     public static final String VALUE = "value";
+    private static final RegistrationSerDes registrationSerDes = new RegistrationSerDes();
 
     @SneakyThrows
     public static byte[] serialize(LwM2mClient client) {
         JsonObject o =  new JsonObject();
-        o.addProperty("nodeId", "client.getNodeId()");
+        o.addProperty("nodeId", client.getNodeId());
         o.addProperty("endpoint", client.getEndpoint());
 
         JsonObject resources = new JsonObject();
@@ -92,8 +108,15 @@ public class LwM2MClientSerDes {
             o.addProperty("pagingTransmissionWindow", client.getPagingTransmissionWindow());
         }
         if (client.getRegistration() != null) {
-            RegistrationSerDes regDez = new RegistrationSerDes();
-            o.addProperty("registration", regDez.jSerialize(client.getRegistration()).toString());
+            String registrationAddress = client.getRegistration().getAddress().toString();
+            JsonNode registrationNode = registrationSerDes.jSerialize(client.getRegistration());
+            if (!registrationAddress.equals(registrationNode.get("transportdata").get("address").asText())){
+                ObjectNode actualRegAddress = (ObjectNode)registrationNode.get("transportdata");
+                actualRegAddress.put("address", registrationAddress);
+                ObjectNode actualIdentity =  (ObjectNode) actualRegAddress.get("identity");
+                actualIdentity.put("address", registrationAddress);
+            }
+            o.addProperty("registration", registrationNode.toString());
         }
         o.addProperty("asleep", client.isAsleep());
         o.addProperty("lastUplinkTime", client.getLastUplinkTime());
@@ -138,33 +161,35 @@ public class LwM2MClientSerDes {
         ResourceModel.Type type = ResourceModel.Type.valueOf(o.get("type").getAsString());
         if (multiInstances) {
             Map<Integer, Object> instances = new HashMap<>();
-            o.get("instances").getAsJsonArray().forEach(entry -> {
-//                instances.put(Integer.valueOf(entry.getAsJsonObject().), parseValue(type, entry.getValue()));
-            });
+            for (Entry<String, JsonElement> entry : o.get("instances").getAsJsonObject().entrySet()) {
+                JsonObject instance = entry.getValue().getAsJsonObject();
+                instances.put(Integer.valueOf(instance.get("id").getAsString()), parseValue(type, instance.get(VALUE)));
+            }
             return LwM2mMultipleResource.newResource(id, instances, type);
         } else {
-            return LwM2mSingleResource.newResource(id, parseValue(type, (JsonValue) o.get(VALUE)));
+            return LwM2mSingleResource.newResource(id, parseValue(type, o.get(VALUE)));
         }
     }
 
-    private static Object parseValue(ResourceModel.Type type, JsonValue value) {
+
+    private static Object parseValue(ResourceModel.Type type, JsonElement value) {
         switch (type) {
             case INTEGER:
-                return value.value();
-//            case FLOAT:
-//                return value.value();
-//            case BOOLEAN:
-//                return value.asBoolean();
-//            case OPAQUE:
-//                return Base64.getDecoder().decode(value.asString());
-//            case STRING:
-//                return value.asString();
-//            case TIME:
-//                return new Date(value.asLong());
-//            case OBJLNK:
-//                return ObjectLink.decodeFromString(value.asString());
-//            case UNSIGNED_INTEGER:
-//                return ULong.valueOf(value.asString());
+                return value.getAsInt();
+            case FLOAT:
+                return value.getAsDouble();
+            case BOOLEAN:
+                return value.getAsBoolean();
+            case OPAQUE:
+                return Base64.getDecoder().decode(value.getAsString());
+            case STRING:
+                return value.getAsString();
+            case TIME:
+                return Instant.ofEpochMilli(value.getAsLong());
+            case OBJLNK:
+                return ObjectLink.decodeFromString(value.getAsString());
+            case UNSIGNED_INTEGER:
+                return ULong.valueOf(value.getAsString());
             default:
                 throw new LwM2mNodeException(String.format("Type %s is not supported", type.name()));
         }
@@ -212,7 +237,7 @@ public class LwM2MClientSerDes {
                 o.addProperty(VALUE, Base64.getEncoder().encodeToString((byte[]) value));
                 break;
             case STRING:
-                o.addProperty(VALUE, (String) value);
+                o.addProperty(VALUE, String.valueOf(value));
                 break;
             case TIME:
                 o.addProperty(VALUE, ((Date) value).getTime());
@@ -221,7 +246,7 @@ public class LwM2MClientSerDes {
                 o.addProperty(VALUE, ((ObjectLink) value).encodeToString());
                 break;
             case UNSIGNED_INTEGER:
-                o.addProperty(VALUE, value.toString());
+                o.addProperty(VALUE, Integer.toUnsignedString((int)value));
                 break;
             default:
                 throw new LwM2mNodeException(String.format("Type %s is not supported", type.name()));
@@ -230,111 +255,111 @@ public class LwM2MClientSerDes {
 
     @SneakyThrows
     public static LwM2mClient deserialize(byte[] data) {
-//        JsonObject o = new JsonObject(new String(data)));
-//        LwM2mClient lwM2mClient = new LwM2mClient(o.get("nodeId").getAsString(), o.get("endpoint").getAsString());
-        LwM2mClient lwM2mClient = new LwM2mClient("nodeId", "endpoint");
-//        o.get("resources").getAsJsonObject().forEach(entry -> {
-//            JsonObject resource = entry.getValue().asObject();
-//            LwM2mResource lwM2mResource = parseLwM2mResource(resource.get("lwM2mResource").getAsJsonObject());
-//            ResourceModel resourceModel = parseResourceModel(resource.get("resourceModel").asObject());
-//            ResourceValue resourceValue = new ResourceValue(lwM2mResource, resourceModel);
-//            lwM2mClient.getResources().put(entry.getName(), resourceValue);
-//        });
-//
-//        for (JsonObject.Member entry : o.get("sharedAttributes").asObject()) {
-//            TransportProtos.TsKvProto.Builder builder = TransportProtos.TsKvProto.newBuilder();
-//            JsonFormat.parser().merge(entry.getValue().getAsString(), builder);
-//            lwM2mClient.getSharedAttributes().put(entry.getName(), builder.build());
-//        }
-//
-//        o.get("keyTsLatestMap").asObject().forEach(entry -> {
-//            lwM2mClient.getKeyTsLatestMap().put(entry.getName(), new AtomicLong(entry.getValue().asLong()));
-//        });
-//
-//        lwM2mClient.setState(LwM2MClientState.valueOf(o.get("state").getAsString()));
-//
-//        Class<LwM2mClient> lwM2mClientClass = LwM2mClient.class;
-//
-//        JsonValue session = o.get("session");
-//        if (session != null) {
-//            TransportProtos.SessionInfoProto.Builder builder = TransportProtos.SessionInfoProto.newBuilder();
-//            JsonFormat.parser().merge(session.asString(), builder);
-//
-//            Field sessionField = lwM2mClientClass.getDeclaredField("session");
-//            sessionField.setAccessible(true);
-//            sessionField.set(lwM2mClient, builder.build());
-//        }
-//
-//        JsonValue tenantId = o.get("tenantId");
-//        if (tenantId != null) {
-//            Field tenantIdField = lwM2mClientClass.getDeclaredField("tenantId");
-//            tenantIdField.setAccessible(true);
-//            tenantIdField.set(lwM2mClient, new TenantId(UUID.fromString(tenantId.asString())));
-//        }
-//
-//        JsonValue deviceId = o.get("deviceId");
-//        if (tenantId != null) {
-//            Field deviceIdField = lwM2mClientClass.getDeclaredField("deviceId");
-//            deviceIdField.setAccessible(true);
-//            deviceIdField.set(lwM2mClient, UUID.fromString(deviceId.asString()));
-//        }
-//
-//        JsonValue profileId = o.get("profileId");
-//        if (tenantId != null) {
-//            Field profileIdField = lwM2mClientClass.getDeclaredField("profileId");
-//            profileIdField.setAccessible(true);
-//            profileIdField.set(lwM2mClient, UUID.fromString(profileId.asString()));
-//        }
-//
-//        JsonValue powerMode = o.get("powerMode");
-//        if (powerMode != null) {
-//            Field powerModeField = lwM2mClientClass.getDeclaredField("powerMode");
-//            powerModeField.setAccessible(true);
-//            powerModeField.set(lwM2mClient, PowerMode.valueOf(powerMode.asString()));
-//        }
-//
-//        JsonValue edrxCycle = o.get("edrxCycle");
-//        if (edrxCycle != null) {
-//            Field edrxCycleField = lwM2mClientClass.getDeclaredField("edrxCycle");
-//            edrxCycleField.setAccessible(true);
-//            edrxCycleField.set(lwM2mClient, edrxCycle.asLong());
-//        }
-//
-//        JsonValue psmActivityTimer = o.get("psmActivityTimer");
-//        if (psmActivityTimer != null) {
-//            Field psmActivityTimerField = lwM2mClientClass.getDeclaredField("psmActivityTimer");
-//            psmActivityTimerField.setAccessible(true);
-//            psmActivityTimerField.set(lwM2mClient, psmActivityTimer.asLong());
-//        }
-//
-//        JsonValue pagingTransmissionWindow = o.get("pagingTransmissionWindow");
-//        if (pagingTransmissionWindow != null) {
-//            Field pagingTransmissionWindowField = lwM2mClientClass.getDeclaredField("pagingTransmissionWindow");
-//            pagingTransmissionWindowField.setAccessible(true);
-//            pagingTransmissionWindowField.set(lwM2mClient, pagingTransmissionWindow.asLong());
-//        }
-//
-//        JsonValue registration = o.get("registration");
-//        if (registration != null) {
-//            lwM2mClient.setRegistration(RegistrationSerDes.deserialize(registration.asObject()));
-//        }
-//
-//        lwM2mClient.setAsleep(o.get("asleep").getAsBoolean());
-//
-//        Field lastUplinkTimeField = lwM2mClientClass.getDeclaredField("lastUplinkTime");
-//        lastUplinkTimeField.setAccessible(true);
-//        lastUplinkTimeField.setLong(lwM2mClient, o.get("lastUplinkTime").asLong());
-//
-//        Field firstEdrxDownlinkField = lwM2mClientClass.getDeclaredField("firstEdrxDownlink");
-//        firstEdrxDownlinkField.setAccessible(true);
-//        firstEdrxDownlinkField.setBoolean(lwM2mClient, o.get("firstEdrxDownlink").getAsBoolean());
-//
-//        lwM2mClient.getRetryAttempts().set(o.get("retryAttempts").asInt());
-//
-//        JsonValue lastSentRpcId = o.get("lastSentRpcId");
-//        if (lastSentRpcId != null) {
-//            lwM2mClient.setLastSentRpcId(UUID.fromString(lastSentRpcId.asString()));
-//        }
+        JsonObject o = JsonParser.parseString(new String(data)).getAsJsonObject();
+        LwM2mClient lwM2mClient = new LwM2mClient(o.get("nodeId").getAsString(), o.get("endpoint").getAsString());
+
+        o.get("resources").getAsJsonObject().entrySet().forEach(entry -> {
+            JsonObject resource = entry.getValue().getAsJsonObject();
+            LwM2mResource lwM2mResource = parseLwM2mResource(resource.get("lwM2mResource").getAsJsonObject());
+            ResourceModel resourceModel = parseResourceModel(resource.get("resourceModel").getAsJsonObject());
+            ResourceValue resourceValue = new ResourceValue(lwM2mResource, resourceModel);
+            lwM2mClient.getResources().put(String.valueOf(lwM2mResource.getId()), resourceValue);
+        });
+
+        for (Entry<String, JsonElement> entry : o.get("sharedAttributes").getAsJsonObject().entrySet()) {
+            TransportProtos.TsKvProto.Builder builder = TransportProtos.TsKvProto.newBuilder();
+            JsonFormat.parser().merge(entry.getValue().getAsString(), builder);
+            lwM2mClient.getSharedAttributes().put(entry.getKey(), builder.build());
+        }
+
+        o.get("keyTsLatestMap").getAsJsonObject().entrySet().forEach(entry -> {
+            lwM2mClient.getKeyTsLatestMap().put(entry.getKey(), new AtomicLong(entry.getValue().getAsLong()));
+        });
+
+        lwM2mClient.setState(LwM2MClientState.valueOf(o.get("state").getAsString()));
+
+        Class<LwM2mClient> lwM2mClientClass = LwM2mClient.class;
+
+        JsonElement session = o.get("session");
+        if (session != null) {
+            TransportProtos.SessionInfoProto.Builder builder = TransportProtos.SessionInfoProto.newBuilder();
+            JsonFormat.parser().merge(session.getAsString(), builder);
+
+            Field sessionField = lwM2mClientClass.getDeclaredField("session");
+            sessionField.setAccessible(true);
+            sessionField.set(lwM2mClient, builder.build());
+        }
+
+        JsonElement tenantId = o.get("tenantId");
+        if (tenantId != null) {
+            Field tenantIdField = lwM2mClientClass.getDeclaredField("tenantId");
+            tenantIdField.setAccessible(true);
+            tenantIdField.set(lwM2mClient, new TenantId(UUID.fromString(tenantId.getAsString())));
+        }
+
+        JsonElement deviceId = o.get("deviceId");
+        if (tenantId != null) {
+            Field deviceIdField = lwM2mClientClass.getDeclaredField("deviceId");
+            deviceIdField.setAccessible(true);
+            deviceIdField.set(lwM2mClient, UUID.fromString(deviceId.getAsString()));
+        }
+
+        JsonElement profileId = o.get("profileId");
+        if (tenantId != null) {
+            Field profileIdField = lwM2mClientClass.getDeclaredField("profileId");
+            profileIdField.setAccessible(true);
+            profileIdField.set(lwM2mClient, UUID.fromString(profileId.getAsString()));
+        }
+
+        JsonElement powerMode = o.get("powerMode");
+        if (powerMode != null) {
+            Field powerModeField = lwM2mClientClass.getDeclaredField("powerMode");
+            powerModeField.setAccessible(true);
+            powerModeField.set(lwM2mClient, PowerMode.valueOf(powerMode.getAsString()));
+        }
+
+        JsonElement edrxCycle = o.get("edrxCycle");
+        if (edrxCycle != null) {
+            Field edrxCycleField = lwM2mClientClass.getDeclaredField("edrxCycle");
+            edrxCycleField.setAccessible(true);
+            edrxCycleField.set(lwM2mClient, edrxCycle.getAsLong());
+        }
+
+        JsonElement psmActivityTimer = o.get("psmActivityTimer");
+        if (psmActivityTimer != null) {
+            Field psmActivityTimerField = lwM2mClientClass.getDeclaredField("psmActivityTimer");
+            psmActivityTimerField.setAccessible(true);
+            psmActivityTimerField.set(lwM2mClient, psmActivityTimer.getAsLong());
+        }
+
+        JsonElement pagingTransmissionWindow = o.get("pagingTransmissionWindow");
+        if (pagingTransmissionWindow != null) {
+            Field pagingTransmissionWindowField = lwM2mClientClass.getDeclaredField("pagingTransmissionWindow");
+            pagingTransmissionWindowField.setAccessible(true);
+            pagingTransmissionWindowField.set(lwM2mClient, pagingTransmissionWindow.getAsLong());
+        }
+
+        JsonElement registration = o.get("registration");
+        if (registration != null) {
+            lwM2mClient.setRegistration(registrationSerDes.deserialize(toJsonNode(registration.getAsString())));
+        }
+
+        lwM2mClient.setAsleep(o.get("asleep").getAsBoolean());
+
+        Field lastUplinkTimeField = lwM2mClientClass.getDeclaredField("lastUplinkTime");
+        lastUplinkTimeField.setAccessible(true);
+        lastUplinkTimeField.setLong(lwM2mClient, o.get("lastUplinkTime").getAsLong());
+
+        Field firstEdrxDownlinkField = lwM2mClientClass.getDeclaredField("firstEdrxDownlink");
+        firstEdrxDownlinkField.setAccessible(true);
+        firstEdrxDownlinkField.setBoolean(lwM2mClient, o.get("firstEdrxDownlink").getAsBoolean());
+
+        lwM2mClient.getRetryAttempts().set(o.get("retryAttempts").getAsInt());
+
+        JsonElement lastSentRpcId = o.get("lastSentRpcId");
+        if (lastSentRpcId != null) {
+            lwM2mClient.setLastSentRpcId(UUID.fromString(lastSentRpcId.getAsString()));
+        }
 
         return lwM2mClient;
     }
diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServiceTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServiceTest.java
deleted file mode 100644
index 9f49f3b138..0000000000
--- a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServiceTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright © 2016-2024 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.transport.lwm2m.bootstrap;
-
-import org.eclipse.californium.core.network.CoapEndpoint;
-import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
-import org.junit.Ignore;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.test.util.ReflectionTestUtils;
-import org.thingsboard.server.common.transport.TransportService;
-import org.thingsboard.server.transport.lwm2m.bootstrap.secure.TbLwM2MDtlsBootstrapCertificateVerifier;
-import org.thingsboard.server.transport.lwm2m.bootstrap.store.LwM2MBootstrapSecurityStore;
-import org.thingsboard.server.transport.lwm2m.bootstrap.store.LwM2MInMemoryBootstrapConfigStore;
-import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportBootstrapConfig;
-import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.when;
-
-@ExtendWith(MockitoExtension.class)
-public class LwM2MTransportBootstrapServiceTest {
-
-    @Mock
-    private LwM2MTransportServerConfig serverConfig;
-    @Mock
-    private LwM2MTransportBootstrapConfig bootstrapConfig;
-    @Mock
-    private LwM2MBootstrapSecurityStore lwM2MBootstrapSecurityStore;
-    @Mock
-    private LwM2MInMemoryBootstrapConfigStore lwM2MInMemoryBootstrapConfigStore;
-    @Mock
-    private TransportService transportService;
-    @Mock
-    private TbLwM2MDtlsBootstrapCertificateVerifier certificateVerifier;
-
-    @Disabled // fixme: nick
-    @Test
-    public void getLHServer_creates_ConnectionIdGenerator_when_connection_id_length_not_null(){
-        final Integer CONNECTION_ID_LENGTH = 6;
-        when(serverConfig.getDtlsCidLength()).thenReturn(CONNECTION_ID_LENGTH);
-        var lwM2MBootstrapService = createLwM2MBootstrapService();
-
-        var server = lwM2MBootstrapService.getLhBootstrapServer();
-        var securedEndpoint = (CoapEndpoint) ReflectionTestUtils.getField(server, "securedEndpoint");
-        assertThat(securedEndpoint).isNotNull();
-
-        var config = (DtlsConnectorConfig) ReflectionTestUtils.getField(securedEndpoint.getConnector(), "config");
-        assertThat(config).isNotNull();
-        assertThat(config.getConnectionIdGenerator()).isNotNull();
-        assertThat((Integer) ReflectionTestUtils.getField(config.getConnectionIdGenerator(), "connectionIdLength"))
-                .isEqualTo(CONNECTION_ID_LENGTH);
-    }
-
-    @Disabled // fixme: nick
-    @Test
-    public void getLHServer_creates_no_ConnectionIdGenerator_when_connection_id_length_is_null(){
-        when(serverConfig.getDtlsCidLength()).thenReturn(null);
-        var lwM2MBootstrapService = createLwM2MBootstrapService();
-
-        var server = lwM2MBootstrapService.getLhBootstrapServer();
-        var securedEndpoint = (CoapEndpoint) ReflectionTestUtils.getField(server, "securedEndpoint");
-        assertThat(securedEndpoint).isNotNull();
-
-        var config = (DtlsConnectorConfig) ReflectionTestUtils.getField(securedEndpoint.getConnector(), "config");
-        assertThat(config).isNotNull();
-        assertThat(config.getConnectionIdGenerator()).isNull();
-    }
-
-    private LwM2MTransportBootstrapService createLwM2MBootstrapService() {
-        setDefaultConfigVariables();
-        return new LwM2MTransportBootstrapService(serverConfig, bootstrapConfig, lwM2MBootstrapSecurityStore,
-                lwM2MInMemoryBootstrapConfigStore, transportService, certificateVerifier);
-    }
-
-    private void setDefaultConfigVariables(){
-        when(bootstrapConfig.getPort()).thenReturn(5683);
-        when(bootstrapConfig.getSecurePort()).thenReturn(5684);
-        when(serverConfig.isRecommendedCiphers()).thenReturn(false);
-        when(serverConfig.getDtlsRetransmissionTimeout()).thenReturn(9000);
-    }
-
-
-}
\ No newline at end of file
diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientTest.java
index 5bc334756d..8fe58a5276 100644
--- a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientTest.java
+++ b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientTest.java
@@ -15,9 +15,10 @@
  */
 package org.thingsboard.server.transport.lwm2m.server.client;
 
+import org.eclipse.leshan.core.endpoint.EndpointUriUtil;
 import org.eclipse.leshan.core.link.Link;
+import org.eclipse.leshan.core.peer.IpPeer;
 import org.eclipse.leshan.server.registration.Registration;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 
@@ -25,14 +26,14 @@ import java.net.InetSocketAddress;
 
 public class LwM2mClientTest {
 
-    @Ignore
     @Test
     public void setRegistration() {
         LwM2mClient client = new LwM2mClient("nodeId", "testEndpoint");
-        Registration registration = null; /*new Registration
-                .Builder("test", "testEndpoint", Identity.unsecure(new InetSocketAddress(1000))) // FIXME: nick
+        Registration registration = new Registration
+                .Builder("testId", "testEndpoint", new IpPeer(new InetSocketAddress(1000)),
+                        EndpointUriUtil.createUri("coap://localhost:5685"))
                 .objectLinks(new Link[0])
-                .build();*/
+                .build();
 
         Assertions.assertDoesNotThrow(() -> client.setRegistration(registration));
     }
diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java
index 43187f2a36..b3473a67b2 100644
--- a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java
+++ b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java
@@ -15,13 +15,17 @@
  */
 package org.thingsboard.server.transport.lwm2m.server.store.util;
 
+import org.eclipse.leshan.core.LwM2m.LwM2mVersion;
+import org.eclipse.leshan.core.endpoint.EndpointUriUtil;
+import org.eclipse.leshan.core.link.Link;
 import org.eclipse.leshan.core.node.LwM2mMultipleResource;
+import org.eclipse.leshan.core.node.LwM2mPath;
 import org.eclipse.leshan.core.node.LwM2mResource;
 import org.eclipse.leshan.core.node.LwM2mSingleResource;
+import org.eclipse.leshan.core.peer.IpPeer;
 import org.eclipse.leshan.core.request.WriteRequest;
 import org.eclipse.leshan.server.registration.Registration;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.device.data.PowerMode;
@@ -41,9 +45,12 @@ import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClientContext;
 import org.thingsboard.server.transport.lwm2m.server.client.ResourceValue;
 
+import java.net.Inet4Address;
+import java.net.InetSocketAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -56,10 +63,9 @@ import static org.mockito.Mockito.when;
 
 public class LwM2MClientSerDesTest {
 
-    @Ignore
     @Test
     public void serializeDeserialize() throws Exception {
-        LwM2mClient client = new LwM2mClient("nodeId", "testEndpoint");
+        LwM2mClient client = new LwM2mClient("nodeId", "endpoint");
 
         TransportDeviceInfo tdi = new TransportDeviceInfo();
         tdi.setPowerMode(PowerMode.PSM);
@@ -78,13 +84,13 @@ public class LwM2MClientSerDesTest {
 
         client.init(credentialsResponse, UUID.randomUUID());
 
-        Registration registration = null; // FIXME: nick
-//                new Registration.Builder("test", "testEndpoint", Identity
-//                        .unsecure(new InetSocketAddress(1000)))
-//                        .supportedContentFormats()
-//                        .supportedObjects(Map.of(15, "1.0", 17, "1.0"))
-//                        .objectLinks(new Link[]{new Link("/")})
-//                        .build();
+        Registration registration = new Registration
+                .Builder("test", "endpoint", new IpPeer(new InetSocketAddress(Inet4Address.getLoopbackAddress(), 1000)),
+                        EndpointUriUtil.createUri("coap://localhost:5685"))
+                .supportedContentFormats()
+                .supportedObjects(Map.of(15, LwM2mVersion.V1_0, 17, LwM2mVersion.V1_0))
+                .objectLinks(new Link[] { new Link("/15"),  new Link("/17") })
+                .build();
 
         client.setRegistration(registration);
         client.setState(LwM2MClientState.REGISTERED);
@@ -130,7 +136,12 @@ public class LwM2MClientSerDesTest {
         assertEquals(client.getPsmActivityTimer(), desClient.getPsmActivityTimer());
         assertEquals(client.getPagingTransmissionWindow(), desClient.getPagingTransmissionWindow());
         assertEquals(client.getEdrxCycle(), desClient.getEdrxCycle());
-        assertEquals(client.getRegistration(), desClient.getRegistration());
+        if (((IpPeer)desClient.getRegistration().getClientTransportData()).getSocketAddress().isUnresolved()) {
+            String actualReg = desClient.getRegistration().toString().replaceAll("/<unresolved>", "");
+            assertEquals(client.getRegistration().toString(), actualReg);
+        } else {
+            assertEquals(client.getRegistration(), desClient.getRegistration());
+        }
         assertEquals(client.isAsleep(), desClient.isAsleep());
         assertEquals(client.getLastUplinkTime(), desClient.getLastUplinkTime());
         assertEquals(client.getSleepTask(), desClient.getSleepTask());
@@ -143,7 +154,11 @@ public class LwM2MClientSerDesTest {
         Map<String, ResourceValue> actualResources = desClient.getResources();
         assertNotNull(actualResources);
         assertEquals(expectedResources.size(), actualResources.size());
-        expectedResources.forEach((key, value) -> assertEquals(value.toString(), actualResources.get(key).toString()));
+        for (Entry entry : expectedResources.entrySet()) {
+            LwM2mPath expectedPathId = client.getLwM2mPathFromString(entry.getKey().toString());
+            String actualOld = actualResources.get(String.valueOf(expectedPathId.getObjectId())).toString();
+            String actual = actualOld.replaceAll("\"", "");
+            assertEquals(entry.getValue().toString(), actual);
+        }
     }
-
 }
\ No newline at end of file
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java
index c8524ee6ce..90174616e6 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java
@@ -59,7 +59,7 @@ public class JsonMqttAdaptor implements MqttTransportAdaptor {
     public TransportProtos.PostTelemetryMsg convertToPostTelemetry(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), false);
         try {
-            return JsonConverter.convertToTelemetryProto(new JsonParser().parse(payload));
+            return JsonConverter.convertToTelemetryProto(JsonParser.parseString(payload));
         } catch (IllegalStateException | JsonSyntaxException ex) {
             log.debug("Failed to decode post telemetry request", ex);
             throw new AdaptorException(ex);
@@ -70,7 +70,7 @@ public class JsonMqttAdaptor implements MqttTransportAdaptor {
     public TransportProtos.PostAttributeMsg convertToPostAttributes(MqttDeviceAwareSessionContext ctx, MqttPublishMessage inbound) throws AdaptorException {
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), false);
         try {
-            return JsonConverter.convertToAttributesProto(new JsonParser().parse(payload));
+            return JsonConverter.convertToAttributesProto(JsonParser.parseString(payload));
         } catch (IllegalStateException | JsonSyntaxException ex) {
             log.debug("Failed to decode post attributes request", ex);
             throw new AdaptorException(ex);
@@ -162,7 +162,7 @@ public class JsonMqttAdaptor implements MqttTransportAdaptor {
     public static JsonElement validateJsonPayload(UUID sessionId, ByteBuf payloadData) throws AdaptorException {
         String payload = validatePayload(sessionId, payloadData, false);
         try {
-            return new JsonParser().parse(payload);
+            return JsonParser.parseString(payload);
         } catch (JsonSyntaxException ex) {
             log.debug("Payload is in incorrect format: {}", payload);
             throw new AdaptorException(ex);
@@ -175,7 +175,7 @@ public class JsonMqttAdaptor implements MqttTransportAdaptor {
             TransportProtos.GetAttributeRequestMsg.Builder result = TransportProtos.GetAttributeRequestMsg.newBuilder();
             result.setRequestId(getRequestId(topicName, topicBase));
             String payload = inbound.payload().toString(UTF8);
-            JsonElement requestBody = new JsonParser().parse(payload);
+            JsonElement requestBody = JsonParser.parseString(payload);
             Set<String> clientKeys = toStringSet(requestBody, "clientKeys");
             Set<String> sharedKeys = toStringSet(requestBody, "sharedKeys");
             if (clientKeys != null) {
@@ -208,7 +208,7 @@ public class JsonMqttAdaptor implements MqttTransportAdaptor {
         String payload = validatePayload(ctx.getSessionId(), inbound.payload(), false);
         try {
             int requestId = getRequestId(topicName, topicBase);
-            return JsonConverter.convertToServerRpcRequest(new JsonParser().parse(payload), requestId);
+            return JsonConverter.convertToServerRpcRequest(JsonParser.parseString(payload), requestId);
         } catch (IllegalStateException | JsonSyntaxException ex) {
             log.debug("Failed to decode to server rpc request", ex);
             throw new AdaptorException(ex);
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java
index ad86096a29..25113dedca 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java
@@ -50,7 +50,7 @@ public class ProtoMqttAdaptor implements MqttTransportAdaptor {
         byte[] bytes = toBytes(inbound.payload());
         Descriptors.Descriptor telemetryDynamicMsgDescriptor = ProtoConverter.validateDescriptor(deviceSessionCtx.getTelemetryDynamicMsgDescriptor());
         try {
-            return JsonConverter.convertToTelemetryProto(new JsonParser().parse(ProtoConverter.dynamicMsgToJson(bytes, telemetryDynamicMsgDescriptor)));
+            return JsonConverter.convertToTelemetryProto(JsonParser.parseString(ProtoConverter.dynamicMsgToJson(bytes, telemetryDynamicMsgDescriptor)));
         } catch (Exception e) {
             log.debug("Failed to decode post telemetry request", e);
             throw new AdaptorException(e);
@@ -63,7 +63,7 @@ public class ProtoMqttAdaptor implements MqttTransportAdaptor {
         byte[] bytes = toBytes(inbound.payload());
         Descriptors.Descriptor attributesDynamicMessageDescriptor = ProtoConverter.validateDescriptor(deviceSessionCtx.getAttributesDynamicMessageDescriptor());
         try {
-            return JsonConverter.convertToAttributesProto(new JsonParser().parse(ProtoConverter.dynamicMsgToJson(bytes, attributesDynamicMessageDescriptor)));
+            return JsonConverter.convertToAttributesProto(JsonParser.parseString(ProtoConverter.dynamicMsgToJson(bytes, attributesDynamicMessageDescriptor)));
         } catch (Exception e) {
             log.debug("Failed to decode post attributes request", e);
             throw new AdaptorException(e);
@@ -102,7 +102,7 @@ public class ProtoMqttAdaptor implements MqttTransportAdaptor {
         Descriptors.Descriptor rpcResponseDynamicMessageDescriptor = ProtoConverter.validateDescriptor(deviceSessionCtx.getRpcResponseDynamicMessageDescriptor());
         try {
             int requestId = getRequestId(topicName, topicBase);
-            JsonElement response = new JsonParser().parse(ProtoConverter.dynamicMsgToJson(bytes, rpcResponseDynamicMessageDescriptor));
+            JsonElement response = JsonParser.parseString(ProtoConverter.dynamicMsgToJson(bytes, rpcResponseDynamicMessageDescriptor));
             return TransportProtos.ToDeviceRpcResponseMsg.newBuilder().setRequestId(requestId).setPayload(response.toString()).build();
         } catch (Exception e) {
             log.debug("Failed to decode rpc response", e);
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java
index 2d58785cdd..05658fe97a 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/SparkplugNodeSessionHandler.java
@@ -94,7 +94,7 @@ public class SparkplugNodeSessionHandler extends AbstractGatewaySessionHandler<S
         byte[] bytes = getBytes(inbound.payload());
         Descriptors.Descriptor telemetryDynamicMsgDescriptor = ProtoConverter.validateDescriptor(deviceSessionCtx.getTelemetryDynamicMsgDescriptor());
         try {
-            return JsonConverter.convertToTelemetryProto(new JsonParser().parse(ProtoConverter.dynamicMsgToJson(bytes, telemetryDynamicMsgDescriptor)));
+            return JsonConverter.convertToTelemetryProto(JsonParser.parseString(ProtoConverter.dynamicMsgToJson(bytes, telemetryDynamicMsgDescriptor)));
         } catch (Exception e) {
             log.debug("Failed to decode post telemetry request", e);
             throw new AdaptorException(e);
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/util/JsonUtils.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/util/JsonUtils.java
index 3a7caf47d0..1f273e6f04 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/util/JsonUtils.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/util/JsonUtils.java
@@ -24,8 +24,6 @@ import java.util.List;
 
 public class JsonUtils {
 
-    private static final JsonParser jsonParser = new JsonParser();
-
     public static JsonObject getJsonObject(List<KeyValueProto> tsKv) {
         JsonObject json = new JsonObject();
         for (KeyValueProto kv : tsKv) {
@@ -43,7 +41,7 @@ public class JsonUtils {
                     json.addProperty(kv.getKey(), kv.getStringV());
                     break;
                 case JSON_V:
-                    json.add(kv.getKey(), jsonParser.parse(kv.getJsonV()));
+                    json.add(kv.getKey(), JsonParser.parseString(kv.getJsonV()));
                     break;
             }
         }
@@ -51,7 +49,7 @@ public class JsonUtils {
     }
 
     public static JsonElement parse(String params) {
-        return jsonParser.parse(params);
+        return JsonParser.parseString(params);
     }
 
 }
diff --git a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
index 4190c6bbc9..6817ec71f0 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
@@ -30,6 +30,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.kv.DataType;
 import org.thingsboard.server.common.data.kv.KvEntry;
 
@@ -50,6 +51,7 @@ import java.util.regex.Pattern;
 /**
  * Created by Valerii Sosliuk on 5/12/2017.
  */
+@Slf4j
 public class JacksonUtil {
 
     public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@@ -158,6 +160,20 @@ public class JacksonUtil {
         }
     }
 
+    public static String toPlainText(String data) {
+        if (data == null) {
+            return null;
+        }
+        if (data.startsWith("\"") && data.endsWith("\"") && data.length() >= 2) {
+            final String dataBefore = data;
+            try {
+                data = JacksonUtil.fromString(data, String.class);
+            } catch (Exception ignored) {}
+            log.trace("Trimming double quotes. Before trim: [{}], after trim: [{}]", dataBefore, data);
+        }
+        return data;
+    }
+
     public static <T> T treeToValue(JsonNode node, Class<T> clazz) {
         try {
             return OBJECT_MAPPER.treeToValue(node, clazz);
@@ -239,6 +255,10 @@ public class JacksonUtil {
         return node;
     }
 
+    public static ObjectNode asObject(JsonNode node) {
+        return node != null && node.isObject() ? ((ObjectNode) node) : newObjectNode();
+    }
+
     public static void replaceUuidsRecursively(JsonNode node, Set<String> skippedRootFields, Pattern includedFieldsPattern, UnaryOperator<UUID> replacer, boolean root) {
         if (node == null) {
             return;
diff --git a/common/util/src/main/java/org/thingsboard/common/util/SslUtil.java b/common/util/src/main/java/org/thingsboard/common/util/SslUtil.java
index a62870ea9b..1767c745bc 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/SslUtil.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/SslUtil.java
@@ -104,7 +104,7 @@ public class SslUtil {
     }
 
     private static PrivateKey readPrivateKey(Reader reader, String passStr) throws IOException, PKCSException {
-        char[] password = StringUtils.isEmpty(passStr) ? EMPTY_PASS : passStr.toCharArray();
+        char[] password = getPassword(passStr);
         PrivateKey privateKey = null;
         JcaPEMKeyConverter keyConverter = new JcaPEMKeyConverter();
         try (PEMParser pemParser = new PEMParser(reader)) {
@@ -130,4 +130,8 @@ public class SslUtil {
         return privateKey;
     }
 
+    public static char[] getPassword(String passStr) {
+        return StringUtils.isEmpty(passStr) ? EMPTY_PASS : passStr.toCharArray();
+    }
+
 }
diff --git a/common/util/src/test/java/org/thingsboard/common/util/JacksonUtilTest.java b/common/util/src/test/java/org/thingsboard/common/util/JacksonUtilTest.java
index 7e37d34509..dcddc6e07a 100644
--- a/common/util/src/test/java/org/thingsboard/common/util/JacksonUtilTest.java
+++ b/common/util/src/test/java/org/thingsboard/common/util/JacksonUtilTest.java
@@ -19,6 +19,9 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.id.AssetId;
 
@@ -55,4 +58,15 @@ public class JacksonUtilTest {
         Assert.assertEquals(asset.getName(), result.getName());
         Assert.assertEquals(asset.getType(), result.getType());
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = { "", "false", "\"", "\"\"", "\"This is a string with double quotes\"", "Path: /home/developer/test.txt",
+            "First line\nSecond line\n\nFourth line", "Before\rAfter", "Tab\tSeparated\tValues", "Test\bbackspace", "[]",
+            "[1, 2, 3]", "{\"key\": \"value\"}", "{\n\"temperature\": 25.5,\n\"humidity\": 50.2\n\"}", "Expression: (a + b) * c",
+            "世界", "Україна", "\u1F1FA\u1F1E6", "🇺🇦"})
+    public void toPlainTextTest(String original) {
+         String serialized = JacksonUtil.toString(original);
+        Assertions.assertNotNull(serialized);
+        Assertions.assertEquals(original, JacksonUtil.toPlainText(serialized));
+    }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
index 0e7fe8f108..865306c73b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
@@ -56,11 +56,19 @@ public abstract class DaoUtil {
     }
 
     public static Pageable toPageable(PageLink pageLink) {
-        return toPageable(pageLink, Collections.emptyMap());
+        return toPageable(pageLink, true);
+    }
+
+    public static Pageable toPageable(PageLink pageLink, boolean addDefaultSorting) {
+        return toPageable(pageLink, Collections.emptyMap(), addDefaultSorting);
     }
 
     public static Pageable toPageable(PageLink pageLink, Map<String, String> columnMap) {
-        return PageRequest.of(pageLink.getPage(), pageLink.getPageSize(), pageLink.toSort(pageLink.getSortOrder(), columnMap));
+        return toPageable(pageLink, columnMap, true);
+    }
+
+    public static Pageable toPageable(PageLink pageLink, Map<String, String> columnMap, boolean addDefaultSorting) {
+        return PageRequest.of(pageLink.getPage(), pageLink.getPageSize(), pageLink.toSort(pageLink.getSortOrder(), columnMap, addDefaultSorting));
     }
 
     public static Pageable toPageable(PageLink pageLink, List<SortOrder> sortOrders) {
@@ -68,7 +76,11 @@ public abstract class DaoUtil {
     }
 
     public static Pageable toPageable(PageLink pageLink, Map<String, String> columnMap, List<SortOrder> sortOrders) {
-        return PageRequest.of(pageLink.getPage(), pageLink.getPageSize(), pageLink.toSort(sortOrders, columnMap));
+        return toPageable(pageLink, columnMap, sortOrders, true);
+    }
+
+    public static Pageable toPageable(PageLink pageLink, Map<String, String> columnMap, List<SortOrder> sortOrders, boolean addDefaultSorting) {
+        return PageRequest.of(pageLink.getPage(), pageLink.getPageSize(), pageLink.toSort(sortOrders, columnMap, addDefaultSorting));
     }
 
     public static <T> List<T> convertDataList(Collection<? extends ToData<T>> toDataList) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java
index c752ae706d..19b02fc932 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java
@@ -80,6 +80,8 @@ public interface AlarmDao extends Dao<Alarm> {
 
     PageData<AlarmId> findAlarmIdsByAssigneeId(TenantId tenantId, UUID userId, PageLink pageLink);
 
+    PageData<AlarmId> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, PageLink pageLink);
+
     void createEntityAlarmRecord(EntityAlarm entityAlarm);
 
     List<EntityAlarm> findEntityAlarmRecords(TenantId tenantId, AlarmId id);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmCommentService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmCommentService.java
index ac6f4955d8..2c111151b3 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmCommentService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmCommentService.java
@@ -82,14 +82,14 @@ public class BaseAlarmCommentService extends AbstractEntityService implements Al
     @Override
     public ListenableFuture<AlarmComment> findAlarmCommentByIdAsync(TenantId tenantId, AlarmCommentId alarmCommentId) {
         log.trace("Executing findAlarmCommentByIdAsync by alarmCommentId [{}]", alarmCommentId);
-        validateId(alarmCommentId, "Incorrect alarmCommentId " + alarmCommentId);
+        validateId(alarmCommentId, id -> "Incorrect alarmCommentId " + id);
         return alarmCommentDao.findAlarmCommentByIdAsync(tenantId, alarmCommentId.getId());
     }
 
     @Override
     public AlarmComment findAlarmCommentById(TenantId tenantId, AlarmCommentId alarmCommentId) {
         log.trace("Executing findAlarmCommentByIdAsync by alarmCommentId [{}]", alarmCommentId);
-        validateId(alarmCommentId, "Incorrect alarmCommentId " + alarmCommentId);
+        validateId(alarmCommentId, id -> "Incorrect alarmCommentId " + id);
         return alarmCommentDao.findById(tenantId, alarmCommentId.getId());
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
index 72e1b9c7bf..d49cef22b7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
@@ -169,7 +169,7 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
     @Override
     public PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId,
                                                                AlarmDataQuery query, Collection<EntityId> orderedEntityIds) {
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validateEntityDataPageLink(query.getPageLink());
         return alarmDao.findAlarmDataByQueryForEntities(tenantId, query, orderedEntityIds);
     }
@@ -261,21 +261,21 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
     @Override
     public Alarm findAlarmById(TenantId tenantId, AlarmId alarmId) {
         log.trace("Executing findAlarmById [{}]", alarmId);
-        validateId(alarmId, "Incorrect alarmId " + alarmId);
+        validateId(alarmId, id -> "Incorrect alarmId " + id);
         return alarmDao.findAlarmById(tenantId, alarmId.getId());
     }
 
     @Override
     public ListenableFuture<Alarm> findAlarmByIdAsync(TenantId tenantId, AlarmId alarmId) {
         log.trace("Executing findAlarmByIdAsync [{}]", alarmId);
-        validateId(alarmId, "Incorrect alarmId " + alarmId);
+        validateId(alarmId, id -> "Incorrect alarmId " + id);
         return alarmDao.findAlarmByIdAsync(tenantId, alarmId.getId());
     }
 
     @Override
     public AlarmInfo findAlarmInfoById(TenantId tenantId, AlarmId alarmId) {
         log.trace("Executing findAlarmInfoByIdAsync [{}]", alarmId);
-        validateId(alarmId, "Incorrect alarmId " + alarmId);
+        validateId(alarmId, id -> "Incorrect alarmId " + id);
         return alarmDao.findAlarmInfoById(tenantId, alarmId.getId());
     }
 
@@ -302,10 +302,16 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
     @Override
     public PageData<AlarmId> findAlarmIdsByAssigneeId(TenantId tenantId, UserId userId, PageLink pageLink) {
         log.trace("[{}] Executing findAlarmIdsByAssigneeId [{}]", tenantId, userId);
-        validateId(userId, "Incorrect userId " + userId);
+        validateId(userId, id -> "Incorrect userId " + id);
         return alarmDao.findAlarmIdsByAssigneeId(tenantId, userId.getId(), pageLink);
     }
 
+    @Override
+    public PageData<AlarmId> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, PageLink pageLink) {
+        log.trace("[{}] Executing findAlarmsByOriginatorId [{}]", tenantId, originatorId);
+        return alarmDao.findAlarmIdsByOriginatorId(tenantId, originatorId, pageLink);
+    }
+
     @Override
     public AlarmSeverity findHighestAlarmSeverity(TenantId tenantId, EntityId entityId, AlarmSearchStatus alarmSearchStatus,
                                                   AlarmStatus alarmStatus, String assigneeId) {
@@ -336,14 +342,14 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
 
     @Override
     public long countAlarmsByQuery(TenantId tenantId, CustomerId customerId, AlarmCountQuery query) {
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return alarmDao.countAlarmsByQuery(tenantId, customerId, query);
     }
 
     @Override
     public PageData<EntitySubtype> findAlarmTypesByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findAlarmTypesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         if (DEFAULT_ALARM_TYPES_PAGE_LINK.equals(pageLink)) {
             return cache.getAndPutInTransaction(tenantId, () ->
                     alarmDao.findTenantAlarmTypes(tenantId.getId(), pageLink), false);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
index 5f298d5e76..fb5b799ae7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
@@ -103,7 +103,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     @Override
     public AssetProfile findAssetProfileById(TenantId tenantId, AssetProfileId assetProfileId, boolean putInCache) {
         log.trace("Executing findAssetProfileById [{}]", assetProfileId);
-        Validator.validateId(assetProfileId, INCORRECT_ASSET_PROFILE_ID + assetProfileId);
+        Validator.validateId(assetProfileId, id -> INCORRECT_ASSET_PROFILE_ID + id);
         return cache.getOrFetchFromDB(AssetProfileCacheKey.fromId(assetProfileId),
                 () -> assetProfileDao.findById(tenantId, assetProfileId.getId()), true, putInCache);
     }
@@ -116,7 +116,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     @Override
     public AssetProfile findAssetProfileByName(TenantId tenantId, String profileName, boolean putInCache) {
         log.trace("Executing findAssetProfileByName [{}][{}]", tenantId, profileName);
-        Validator.validateString(profileName, INCORRECT_ASSET_PROFILE_NAME + profileName);
+        Validator.validateString(profileName, s -> INCORRECT_ASSET_PROFILE_NAME + s);
         return cache.getOrFetchFromDB(AssetProfileCacheKey.fromName(tenantId, profileName),
                 () -> assetProfileDao.findByName(tenantId, profileName), false, putInCache);
     }
@@ -124,7 +124,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     @Override
     public AssetProfileInfo findAssetProfileInfoById(TenantId tenantId, AssetProfileId assetProfileId) {
         log.trace("Executing findAssetProfileInfoById [{}]", assetProfileId);
-        Validator.validateId(assetProfileId, INCORRECT_ASSET_PROFILE_ID + assetProfileId);
+        Validator.validateId(assetProfileId, id -> INCORRECT_ASSET_PROFILE_ID + id);
         return toAssetProfileInfo(findAssetProfileById(tenantId, assetProfileId));
     }
 
@@ -179,7 +179,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     @Transactional
     public void deleteAssetProfile(TenantId tenantId, AssetProfileId assetProfileId) {
         log.trace("Executing deleteAssetProfile [{}]", assetProfileId);
-        Validator.validateId(assetProfileId, INCORRECT_ASSET_PROFILE_ID + assetProfileId);
+        Validator.validateId(assetProfileId, id -> INCORRECT_ASSET_PROFILE_ID + id);
         AssetProfile assetProfile = assetProfileDao.findById(tenantId, assetProfileId.getId());
         if (assetProfile != null && assetProfile.isDefault()) {
             throw new DataValidationException("Deletion of Default Asset Profile is prohibited!");
@@ -208,7 +208,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     @Override
     public PageData<AssetProfile> findAssetProfiles(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findAssetProfiles tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         Validator.validatePageLink(pageLink);
         return assetProfileDao.findAssetProfiles(tenantId, pageLink);
     }
@@ -216,7 +216,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     @Override
     public PageData<AssetProfileInfo> findAssetProfileInfos(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findAssetProfileInfos tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         Validator.validatePageLink(pageLink);
         return assetProfileDao.findAssetProfileInfos(tenantId, pageLink);
     }
@@ -246,7 +246,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     }
 
     private AssetProfile doCreateDefaultAssetProfile(TenantId tenantId, String profileName, boolean defaultProfile, boolean publishSaveEvent) {
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         AssetProfile assetProfile = new AssetProfile();
         assetProfile.setTenantId(tenantId);
         assetProfile.setDefault(defaultProfile);
@@ -258,7 +258,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     @Override
     public AssetProfile findDefaultAssetProfile(TenantId tenantId) {
         log.trace("Executing findDefaultAssetProfile tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return cache.getAndPutInTransaction(AssetProfileCacheKey.defaultProfile(tenantId),
                 () -> assetProfileDao.findDefaultAssetProfile(tenantId), true);
     }
@@ -266,14 +266,14 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     @Override
     public AssetProfileInfo findDefaultAssetProfileInfo(TenantId tenantId) {
         log.trace("Executing findDefaultAssetProfileInfo tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return toAssetProfileInfo(findDefaultAssetProfile(tenantId));
     }
 
     @Override
     public boolean setDefaultAssetProfile(TenantId tenantId, AssetProfileId assetProfileId) {
         log.trace("Executing setDefaultAssetProfile [{}]", assetProfileId);
-        Validator.validateId(assetProfileId, INCORRECT_ASSET_PROFILE_ID + assetProfileId);
+        Validator.validateId(assetProfileId, id -> INCORRECT_ASSET_PROFILE_ID + id);
         AssetProfile assetProfile = assetProfileDao.findById(tenantId, assetProfileId.getId());
         if (!assetProfile.isDefault()) {
             assetProfile.setDefault(true);
@@ -299,7 +299,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     @Override
     public void deleteAssetProfilesByTenantId(TenantId tenantId) {
         log.trace("Executing deleteAssetProfilesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantAssetProfilesRemover.removeEntities(tenantId, tenantId);
     }
 
@@ -322,7 +322,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
     @Override
     public List<EntityInfo> findAssetProfileNamesByTenantId(TenantId tenantId, boolean activeOnly) {
         log.trace("Executing findAssetProfileNamesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return assetProfileDao.findTenantAssetProfileNames(tenantId.getId(), activeOnly)
                 .stream().sorted(Comparator.comparing(EntityInfo::getName))
                 .collect(Collectors.toList());
diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
index 96b104f097..f7342e7634 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
@@ -75,7 +75,6 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     public static final String INCORRECT_ASSET_PROFILE_ID = "Incorrect assetProfileId ";
     public static final String INCORRECT_CUSTOMER_ID = "Incorrect customerId ";
     public static final String INCORRECT_ASSET_ID = "Incorrect assetId ";
-    public static final String TB_SERVICE_QUEUE = "TbServiceQueue";
 
     @Autowired
     private AssetDao assetDao;
@@ -103,28 +102,28 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public AssetInfo findAssetInfoById(TenantId tenantId, AssetId assetId) {
         log.trace("Executing findAssetInfoById [{}]", assetId);
-        validateId(assetId, INCORRECT_ASSET_ID + assetId);
+        validateId(assetId, id -> INCORRECT_ASSET_ID + id);
         return assetDao.findAssetInfoById(tenantId, assetId.getId());
     }
 
     @Override
     public Asset findAssetById(TenantId tenantId, AssetId assetId) {
         log.trace("Executing findAssetById [{}]", assetId);
-        validateId(assetId, INCORRECT_ASSET_ID + assetId);
+        validateId(assetId, id -> INCORRECT_ASSET_ID + id);
         return assetDao.findById(tenantId, assetId.getId());
     }
 
     @Override
     public ListenableFuture<Asset> findAssetByIdAsync(TenantId tenantId, AssetId assetId) {
         log.trace("Executing findAssetById [{}]", assetId);
-        validateId(assetId, INCORRECT_ASSET_ID + assetId);
+        validateId(assetId, id -> INCORRECT_ASSET_ID + id);
         return assetDao.findByIdAsync(tenantId, assetId.getId());
     }
 
     @Override
     public Asset findAssetByTenantIdAndName(TenantId tenantId, String name) {
         log.trace("Executing findAssetByTenantIdAndName [{}][{}]", tenantId, name);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return cache.getAndPutInTransaction(new AssetCacheKey(tenantId, name),
                 () -> assetDao.findAssetsByTenantIdAndName(tenantId.getId(), name)
                         .orElse(null), true);
@@ -199,7 +198,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     @Transactional
     public void deleteAsset(TenantId tenantId, AssetId assetId) {
-        validateId(assetId, INCORRECT_ASSET_ID + assetId);
+        validateId(assetId, id -> INCORRECT_ASSET_ID + id);
         if (entityViewService.existsByTenantIdAndEntityId(tenantId, assetId)) {
             throw new DataValidationException("Can't delete asset that has entity views!");
         }
@@ -223,7 +222,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public PageData<Asset> findAssetsByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findAssetsByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return assetDao.findAssetsByTenantId(tenantId.getId(), pageLink);
     }
@@ -231,7 +230,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public PageData<AssetInfo> findAssetInfosByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findAssetInfosByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return assetDao.findAssetInfosByTenantId(tenantId.getId(), pageLink);
     }
@@ -239,8 +238,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public PageData<Asset> findAssetsByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink) {
         log.trace("Executing findAssetsByTenantIdAndType, tenantId [{}], type [{}], pageLink [{}]", tenantId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return assetDao.findAssetsByTenantIdAndType(tenantId.getId(), type, pageLink);
     }
@@ -248,8 +247,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public PageData<AssetInfo> findAssetInfosByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink) {
         log.trace("Executing findAssetInfosByTenantIdAndType, tenantId [{}], type [{}], pageLink [{}]", tenantId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return assetDao.findAssetInfosByTenantIdAndType(tenantId.getId(), type, pageLink);
     }
@@ -257,8 +256,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public PageData<AssetInfo> findAssetInfosByTenantIdAndAssetProfileId(TenantId tenantId, AssetProfileId assetProfileId, PageLink pageLink) {
         log.trace("Executing findAssetInfosByTenantIdAndAssetProfileId, tenantId [{}], assetProfileId [{}], pageLink [{}]", tenantId, assetProfileId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(assetProfileId, INCORRECT_ASSET_PROFILE_ID + assetProfileId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(assetProfileId, id -> INCORRECT_ASSET_PROFILE_ID + id);
         validatePageLink(pageLink);
         return assetDao.findAssetInfosByTenantIdAndAssetProfileId(tenantId.getId(), assetProfileId.getId(), pageLink);
     }
@@ -266,23 +265,23 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public ListenableFuture<List<Asset>> findAssetsByTenantIdAndIdsAsync(TenantId tenantId, List<AssetId> assetIds) {
         log.trace("Executing findAssetsByTenantIdAndIdsAsync, tenantId [{}], assetIds [{}]", tenantId, assetIds);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateIds(assetIds, "Incorrect assetIds " + assetIds);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateIds(assetIds, ids -> "Incorrect assetIds " + ids);
         return assetDao.findAssetsByTenantIdAndIdsAsync(tenantId.getId(), toUUIDs(assetIds));
     }
 
     @Override
     public void deleteAssetsByTenantId(TenantId tenantId) {
         log.trace("Executing deleteAssetsByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantAssetsRemover.removeEntities(tenantId, tenantId);
     }
 
     @Override
     public PageData<Asset> findAssetsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findAssetsByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         validatePageLink(pageLink);
         return assetDao.findAssetsByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink);
     }
@@ -290,8 +289,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public PageData<AssetInfo> findAssetInfosByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findAssetInfosByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         validatePageLink(pageLink);
         return assetDao.findAssetInfosByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink);
     }
@@ -299,9 +298,9 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public PageData<Asset> findAssetsByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId, String type, PageLink pageLink) {
         log.trace("Executing findAssetsByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}], type [{}], pageLink [{}]", tenantId, customerId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return assetDao.findAssetsByTenantIdAndCustomerIdAndType(tenantId.getId(), customerId.getId(), type, pageLink);
     }
@@ -309,9 +308,9 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public PageData<AssetInfo> findAssetInfosByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId, String type, PageLink pageLink) {
         log.trace("Executing findAssetInfosByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}], type [{}], pageLink [{}]", tenantId, customerId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return assetDao.findAssetInfosByTenantIdAndCustomerIdAndType(tenantId.getId(), customerId.getId(), type, pageLink);
     }
@@ -319,9 +318,9 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public PageData<AssetInfo> findAssetInfosByTenantIdAndCustomerIdAndAssetProfileId(TenantId tenantId, CustomerId customerId, AssetProfileId assetProfileId, PageLink pageLink) {
         log.trace("Executing findAssetInfosByTenantIdAndCustomerIdAndAssetProfileId, tenantId [{}], customerId [{}], assetProfileId [{}], pageLink [{}]", tenantId, customerId, assetProfileId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
-        validateId(assetProfileId, INCORRECT_ASSET_PROFILE_ID + assetProfileId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
+        validateId(assetProfileId, id -> INCORRECT_ASSET_PROFILE_ID + id);
         validatePageLink(pageLink);
         return assetDao.findAssetInfosByTenantIdAndCustomerIdAndAssetProfileId(tenantId.getId(), customerId.getId(), assetProfileId.getId(), pageLink);
     }
@@ -329,17 +328,17 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public ListenableFuture<List<Asset>> findAssetsByTenantIdCustomerIdAndIdsAsync(TenantId tenantId, CustomerId customerId, List<AssetId> assetIds) {
         log.trace("Executing findAssetsByTenantIdAndCustomerIdAndIdsAsync, tenantId [{}], customerId [{}], assetIds [{}]", tenantId, customerId, assetIds);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
-        validateIds(assetIds, "Incorrect assetIds " + assetIds);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
+        validateIds(assetIds, ids -> "Incorrect assetIds " + ids);
         return assetDao.findAssetsByTenantIdAndCustomerIdAndIdsAsync(tenantId.getId(), customerId.getId(), toUUIDs(assetIds));
     }
 
     @Override
     public void unassignCustomerAssets(TenantId tenantId, CustomerId customerId) {
         log.trace("Executing unassignCustomerAssets, tenantId [{}], customerId [{}]", tenantId, customerId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         customerAssetsUnasigner.removeEntities(tenantId, customerId);
     }
 
@@ -371,7 +370,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public ListenableFuture<List<EntitySubtype>> findAssetTypesByTenantId(TenantId tenantId) {
         log.trace("Executing findAssetTypesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return assetDao.findTenantAssetTypesAsync(tenantId.getId());
     }
 
@@ -420,8 +419,8 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public PageData<Asset> findAssetsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) {
         log.trace("Executing findAssetsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
         validatePageLink(pageLink);
         return assetDao.findAssetsByTenantIdAndEdgeId(tenantId.getId(), edgeId.getId(), pageLink);
     }
@@ -429,9 +428,9 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
     @Override
     public PageData<Asset> findAssetsByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, PageLink pageLink) {
         log.trace("Executing findAssetsByTenantIdAndEdgeIdAndType, tenantId [{}], edgeId [{}], type [{}] pageLink [{}]", tenantId, edgeId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return assetDao.findAssetsByTenantIdAndEdgeIdAndType(tenantId.getId(), edgeId.getId(), type, pageLink);
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributeUtils.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributeUtils.java
index 65e52e06d2..7e705c2278 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributeUtils.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributeUtils.java
@@ -28,12 +28,12 @@ public class AttributeUtils {
 
     @Deprecated(since = "3.7.0")
     public static void validate(EntityId id, String scope) {
-        Validator.validateId(id.getId(), "Incorrect id " + id);
-        Validator.validateString(scope, "Incorrect scope " + scope);
+        Validator.validateId(id.getId(), uuid -> "Incorrect id " + uuid);
+        Validator.validateString(scope, sc -> "Incorrect scope " + sc);
     }
 
     public static void validate(EntityId id, AttributeScope scope) {
-        Validator.validateId(id.getId(), "Incorrect id " + id);
+        Validator.validateId(id.getId(), uuid -> "Incorrect id " + uuid);
         Validator.checkNotNull(scope, "Incorrect scope " + scope);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java
index 6fb63613dc..5869ad9261 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java
@@ -58,28 +58,28 @@ public class BaseAttributesService implements AttributesService {
     @Override
     public ListenableFuture<Optional<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, String scope, String attributeKey) {
         validate(entityId, scope);
-        Validator.validateString(attributeKey, "Incorrect attribute key " + attributeKey);
+        Validator.validateString(attributeKey, k -> "Incorrect attribute key " + k);
         return Futures.immediateFuture(attributesDao.find(tenantId, entityId, AttributeScope.valueOf(scope), attributeKey));
     }
 
     @Override
     public ListenableFuture<Optional<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, AttributeScope scope, String attributeKey) {
         validate(entityId, scope);
-        Validator.validateString(attributeKey, "Incorrect attribute key " + attributeKey);
+        Validator.validateString(attributeKey, k -> "Incorrect attribute key " + k);
         return Futures.immediateFuture(attributesDao.find(tenantId, entityId, scope, attributeKey));
     }
 
     @Override
     public ListenableFuture<List<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, String scope, Collection<String> attributeKeys) {
         validate(entityId, scope);
-        attributeKeys.forEach(attributeKey -> Validator.validateString(attributeKey, "Incorrect attribute key " + attributeKey));
+        attributeKeys.forEach(attributeKey -> Validator.validateString(attributeKey, k -> "Incorrect attribute key " + k));
         return Futures.immediateFuture(attributesDao.find(tenantId, entityId, AttributeScope.valueOf(scope), attributeKeys));
     }
 
     @Override
     public ListenableFuture<List<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, AttributeScope scope, Collection<String> attributeKeys) {
         validate(entityId, scope);
-        attributeKeys.forEach(attributeKey -> Validator.validateString(attributeKey, "Incorrect attribute key " + attributeKey));
+        attributeKeys.forEach(attributeKey -> Validator.validateString(attributeKey, k -> "Incorrect attribute key " + k));
         return Futures.immediateFuture(attributesDao.find(tenantId, entityId, scope, attributeKeys));
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java
index 1aafdf9583..dcd13fb168 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java
@@ -117,7 +117,7 @@ public class CachedAttributesService implements AttributesService {
     @Override
     public ListenableFuture<Optional<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, AttributeScope scope, String attributeKey) {
         validate(entityId, scope);
-        Validator.validateString(attributeKey, "Incorrect attribute key " + attributeKey);
+        Validator.validateString(attributeKey, k -> "Incorrect attribute key " + k);
 
         return cacheExecutor.submit(() -> {
             AttributeCacheKey attributeCacheKey = new AttributeCacheKey(scope, entityId, attributeKey);
@@ -152,7 +152,7 @@ public class CachedAttributesService implements AttributesService {
     public ListenableFuture<List<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, AttributeScope scope, final Collection<String> attributeKeysNonUnique) {
         validate(entityId, scope);
         final var attributeKeys = new LinkedHashSet<>(attributeKeysNonUnique); // deduplicate the attributes
-        attributeKeys.forEach(attributeKey -> Validator.validateString(attributeKey, "Incorrect attribute key " + attributeKey));
+        attributeKeys.forEach(attributeKey -> Validator.validateString(attributeKey, k ->"Incorrect attribute key " + k));
 
         //CacheExecutor for Redis or DirectExecutor for local Caffeine
         return Futures.transformAsync(cacheExecutor.submit(() -> findCachedAttributes(entityId, scope, attributeKeys)),
diff --git a/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java
index ddaebef6e8..29b097bfab 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.StringUtils;
@@ -85,31 +86,31 @@ public class AuditLogServiceImpl implements AuditLogService {
     @Override
     public PageData<AuditLog> findAuditLogsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, List<ActionType> actionTypes, TimePageLink pageLink) {
         log.trace("Executing findAuditLogsByTenantIdAndCustomerId [{}], [{}], [{}]", tenantId, customerId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, "Incorrect customerId " + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> "Incorrect customerId " + id);
         return auditLogDao.findAuditLogsByTenantIdAndCustomerId(tenantId.getId(), customerId, actionTypes, pageLink);
     }
 
     @Override
     public PageData<AuditLog> findAuditLogsByTenantIdAndUserId(TenantId tenantId, UserId userId, List<ActionType> actionTypes, TimePageLink pageLink) {
         log.trace("Executing findAuditLogsByTenantIdAndUserId [{}], [{}], [{}]", tenantId, userId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(userId, "Incorrect userId" + userId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(userId, id -> "Incorrect userId" + id);
         return auditLogDao.findAuditLogsByTenantIdAndUserId(tenantId.getId(), userId, actionTypes, pageLink);
     }
 
     @Override
     public PageData<AuditLog> findAuditLogsByTenantIdAndEntityId(TenantId tenantId, EntityId entityId, List<ActionType> actionTypes, TimePageLink pageLink) {
         log.trace("Executing findAuditLogsByTenantIdAndEntityId [{}], [{}], [{}]", tenantId, entityId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateEntityId(entityId, INCORRECT_TENANT_ID + entityId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateEntityId(entityId, id -> "Incorrect entityId" + id);
         return auditLogDao.findAuditLogsByTenantIdAndEntityId(tenantId.getId(), entityId, actionTypes, pageLink);
     }
 
     @Override
     public PageData<AuditLog> findAuditLogsByTenantId(TenantId tenantId, List<ActionType> actionTypes, TimePageLink pageLink) {
         log.trace("Executing findAuditLogs [{}]", pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return auditLogDao.findAuditLogsByTenantId(tenantId.getId(), actionTypes, pageLink);
     }
 
@@ -200,10 +201,10 @@ public class AuditLogServiceImpl implements AuditLogService {
                 break;
             case ATTRIBUTES_UPDATED:
                 actionData.put("entityId", entityId.toString());
-                String scope = extractParameter(String.class, 0, additionalInfo);
+                AttributeScope scope = extractParameter(AttributeScope.class, 0, additionalInfo);
                 @SuppressWarnings("unchecked")
                 List<AttributeKvEntry> attributes = extractParameter(List.class, 1, additionalInfo);
-                actionData.put("scope", scope);
+                actionData.put("scope", scope.name());
                 ObjectNode attrsNode = JacksonUtil.newObjectNode();
                 if (attributes != null) {
                     for (AttributeKvEntry attr : attributes) {
@@ -215,8 +216,8 @@ public class AuditLogServiceImpl implements AuditLogService {
             case ATTRIBUTES_DELETED:
             case ATTRIBUTES_READ:
                 actionData.put("entityId", entityId.toString());
-                scope = extractParameter(String.class, 0, additionalInfo);
-                actionData.put("scope", scope);
+                scope = extractParameter(AttributeScope.class, 0, additionalInfo);
+                actionData.put("scope", scope.name());
                 @SuppressWarnings("unchecked")
                 List<String> keys = extractParameter(List.class, 1, additionalInfo);
                 ArrayNode attrsArrayNode = actionData.putArray("attributes");
diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
index 633333dcbd..04308cbb2e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
@@ -84,21 +84,21 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
     @Override
     public Customer findCustomerById(TenantId tenantId, CustomerId customerId) {
         log.trace("Executing findCustomerById [{}]", customerId);
-        Validator.validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        Validator.validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         return customerDao.findById(tenantId, customerId.getId());
     }
 
     @Override
     public Optional<Customer> findCustomerByTenantIdAndTitle(TenantId tenantId, String title) {
         log.trace("Executing findCustomerByTenantIdAndTitle [{}] [{}]", tenantId, title);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return customerDao.findCustomersByTenantIdAndTitle(tenantId.getId(), title);
     }
 
     @Override
     public ListenableFuture<Customer> findCustomerByIdAsync(TenantId tenantId, CustomerId customerId) {
         log.trace("Executing findCustomerByIdAsync [{}]", customerId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         return customerDao.findByIdAsync(tenantId, customerId.getId());
     }
 
@@ -126,7 +126,7 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
     @Transactional
     public void deleteCustomer(TenantId tenantId, CustomerId customerId) {
         log.trace("Executing deleteCustomer [{}]", customerId);
-        Validator.validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        Validator.validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         Customer customer = findCustomerById(tenantId, customerId);
         if (customer == null) {
             throw new IncorrectParameterException("Unable to delete non-existent customer.");
@@ -147,7 +147,7 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
     @Override
     public Customer findOrCreatePublicCustomer(TenantId tenantId) {
         log.trace("Executing findOrCreatePublicCustomer, tenantId [{}]", tenantId);
-        Validator.validateId(tenantId, INCORRECT_CUSTOMER_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_CUSTOMER_ID + id);
         Optional<Customer> publicCustomerOpt = customerDao.findCustomersByTenantIdAndTitle(tenantId.getId(), PUBLIC_CUSTOMER_TITLE);
         if (publicCustomerOpt.isPresent()) {
             return publicCustomerOpt.get();
@@ -169,7 +169,7 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
     @Override
     public PageData<Customer> findCustomersByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findCustomersByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validateId(tenantId, id -> "Incorrect tenantId " + id);
         Validator.validatePageLink(pageLink);
         return customerDao.findCustomersByTenantId(tenantId.getId(), pageLink);
     }
@@ -177,7 +177,7 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom
     @Override
     public void deleteCustomersByTenantId(TenantId tenantId) {
         log.trace("Executing deleteCustomersByTenantId, tenantId [{}]", tenantId);
-        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validateId(tenantId, id -> "Incorrect tenantId " + id);
         customersByTenantRemover.removeEntities(tenantId, tenantId);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
index 5d2e6658fa..7f90d82af7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
@@ -110,21 +110,21 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
     @Override
     public Dashboard findDashboardById(TenantId tenantId, DashboardId dashboardId) {
         log.trace("Executing findDashboardById [{}]", dashboardId);
-        Validator.validateId(dashboardId, INCORRECT_DASHBOARD_ID + dashboardId);
+        Validator.validateId(dashboardId, id -> INCORRECT_DASHBOARD_ID + id);
         return dashboardDao.findById(tenantId, dashboardId.getId());
     }
 
     @Override
     public ListenableFuture<Dashboard> findDashboardByIdAsync(TenantId tenantId, DashboardId dashboardId) {
         log.trace("Executing findDashboardByIdAsync [{}]", dashboardId);
-        validateId(dashboardId, INCORRECT_DASHBOARD_ID + dashboardId);
+        validateId(dashboardId, id -> INCORRECT_DASHBOARD_ID + id);
         return dashboardDao.findByIdAsync(tenantId, dashboardId.getId());
     }
 
     @Override
     public DashboardInfo findDashboardInfoById(TenantId tenantId, DashboardId dashboardId) {
         log.trace("Executing findDashboardInfoById [{}]", dashboardId);
-        Validator.validateId(dashboardId, INCORRECT_DASHBOARD_ID + dashboardId);
+        Validator.validateId(dashboardId, id -> INCORRECT_DASHBOARD_ID + id);
         return dashboardInfoDao.findById(tenantId, dashboardId.getId());
     }
 
@@ -137,7 +137,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
     @Override
     public ListenableFuture<DashboardInfo> findDashboardInfoByIdAsync(TenantId tenantId, DashboardId dashboardId) {
         log.trace("Executing findDashboardInfoByIdAsync [{}]", dashboardId);
-        validateId(dashboardId, INCORRECT_DASHBOARD_ID + dashboardId);
+        validateId(dashboardId, id -> INCORRECT_DASHBOARD_ID + id);
         return dashboardInfoDao.findByIdAsync(tenantId, dashboardId.getId());
     }
 
@@ -229,7 +229,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
     @Transactional
     public void deleteDashboard(TenantId tenantId, DashboardId dashboardId) {
         log.trace("Executing deleteDashboard [{}]", dashboardId);
-        Validator.validateId(dashboardId, INCORRECT_DASHBOARD_ID + dashboardId);
+        Validator.validateId(dashboardId, id -> INCORRECT_DASHBOARD_ID + id);
         deleteEntityRelations(tenantId, dashboardId);
         try {
             dashboardDao.removeById(tenantId, dashboardId.getId());
@@ -249,7 +249,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
     @Override
     public PageData<DashboardInfo> findDashboardsByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findDashboardsByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         Validator.validatePageLink(pageLink);
         return dashboardInfoDao.findDashboardsByTenantId(tenantId.getId(), pageLink);
     }
@@ -257,7 +257,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
     @Override
     public PageData<DashboardInfo> findMobileDashboardsByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findMobileDashboardsByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         Validator.validatePageLink(pageLink);
         return dashboardInfoDao.findMobileDashboardsByTenantId(tenantId.getId(), pageLink);
     }
@@ -265,15 +265,15 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
     @Override
     public void deleteDashboardsByTenantId(TenantId tenantId) {
         log.trace("Executing deleteDashboardsByTenantId, tenantId [{}]", tenantId);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantDashboardsRemover.removeEntities(tenantId, tenantId);
     }
 
     @Override
     public PageData<DashboardInfo> findDashboardsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findDashboardsByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        Validator.validateId(customerId, "Incorrect customerId " + customerId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        Validator.validateId(customerId, id -> "Incorrect customerId " + id);
         Validator.validatePageLink(pageLink);
         return dashboardInfoDao.findDashboardsByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink);
     }
@@ -281,8 +281,8 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
     @Override
     public PageData<DashboardInfo> findMobileDashboardsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findMobileDashboardsByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        Validator.validateId(customerId, "Incorrect customerId " + customerId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        Validator.validateId(customerId, id -> "Incorrect customerId " + id);
         Validator.validatePageLink(pageLink);
         return dashboardInfoDao.findMobileDashboardsByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink);
     }
@@ -290,7 +290,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
     @Override
     public void unassignCustomerDashboards(TenantId tenantId, CustomerId customerId) {
         log.trace("Executing unassignCustomerDashboards, customerId [{}]", customerId);
-        Validator.validateId(customerId, "Incorrect customerId " + customerId);
+        Validator.validateId(customerId, id -> "Incorrect customerId " + id);
         Customer customer = customerDao.findById(tenantId, customerId.getId());
         if (customer == null) {
             throw new DataValidationException("Can't unassign dashboards from non-existent customer!");
@@ -301,7 +301,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
     @Override
     public void updateCustomerDashboards(TenantId tenantId, CustomerId customerId) {
         log.trace("Executing updateCustomerDashboards, customerId [{}]", customerId);
-        Validator.validateId(customerId, "Incorrect customerId " + customerId);
+        Validator.validateId(customerId, id -> "Incorrect customerId " + id);
         Customer customer = customerDao.findById(tenantId, customerId.getId());
         if (customer == null) {
             throw new DataValidationException("Can't update dashboards for non-existent customer!");
@@ -351,8 +351,8 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
     @Override
     public PageData<DashboardInfo> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) {
         log.trace("Executing findDashboardsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        Validator.validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        Validator.validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
         Validator.validatePageLink(pageLink);
         return dashboardInfoDao.findDashboardsByTenantIdAndEdgeId(tenantId.getId(), edgeId.getId(), pageLink);
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityServiceImpl.java
index 4367163ded..67af118d0b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityServiceImpl.java
@@ -88,7 +88,7 @@ public class DeviceConnectivityServiceImpl implements DeviceConnectivityService
     public JsonNode findDevicePublishTelemetryCommands(String baseUrl, Device device) throws URISyntaxException {
         DeviceId deviceId = device.getId();
         log.trace("Executing findDevicePublishTelemetryCommands [{}]", deviceId);
-        validateId(deviceId, INCORRECT_DEVICE_ID + deviceId);
+        validateId(deviceId, id -> INCORRECT_DEVICE_ID + id);
 
         DeviceCredentials creds = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getTenantId(), deviceId);
         DeviceProfile deviceProfile = deviceProfileService.findDeviceProfileById(device.getTenantId(), device.getDeviceProfileId());
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
index 60167f04f2..6025e7c820 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
@@ -72,14 +72,14 @@ public class DeviceCredentialsServiceImpl extends AbstractCachedEntityService<St
     @Override
     public DeviceCredentials findDeviceCredentialsByDeviceId(TenantId tenantId, DeviceId deviceId) {
         log.trace("Executing findDeviceCredentialsByDeviceId [{}]", deviceId);
-        validateId(deviceId, "Incorrect deviceId " + deviceId);
+        validateId(deviceId, id -> "Incorrect deviceId " + id);
         return deviceCredentialsDao.findByDeviceId(tenantId, deviceId.getId());
     }
 
     @Override
     public DeviceCredentials findDeviceCredentialsByCredentialsId(String credentialsId) {
         log.trace("Executing findDeviceCredentialsByCredentialsId [{}]", credentialsId);
-        validateString(credentialsId, "Incorrect credentialsId " + credentialsId);
+        validateString(credentialsId, id -> "Incorrect credentialsId " + id);
         return cache.getAndPutInTransaction(credentialsId,
                 () -> deviceCredentialsDao.findByCredentialsId(TenantId.SYS_TENANT_ID, credentialsId),
                 true); // caching null values is essential for permanently invalid requests
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
index 608da9d28d..7e6d79d9a7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
@@ -126,7 +126,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Override
     public DeviceProfile findDeviceProfileById(TenantId tenantId, DeviceProfileId deviceProfileId, boolean putInCache) {
         log.trace("Executing findDeviceProfileById [{}]", deviceProfileId);
-        validateId(deviceProfileId, INCORRECT_DEVICE_PROFILE_ID + deviceProfileId);
+        validateId(deviceProfileId, id -> INCORRECT_DEVICE_PROFILE_ID + id);
         return cache.getOrFetchFromDB(DeviceProfileCacheKey.fromId(deviceProfileId),
                 () -> deviceProfileDao.findById(tenantId, deviceProfileId.getId()), true, putInCache);
     }
@@ -139,7 +139,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Override
     public DeviceProfile findDeviceProfileByName(TenantId tenantId, String profileName, boolean putInCache) {
         log.trace("Executing findDeviceProfileByName [{}][{}]", tenantId, profileName);
-        validateString(profileName, INCORRECT_DEVICE_PROFILE_NAME + profileName);
+        validateString(profileName, pn -> INCORRECT_DEVICE_PROFILE_NAME + pn);
         return cache.getOrFetchFromDB(DeviceProfileCacheKey.fromName(tenantId, profileName),
                 () -> deviceProfileDao.findByName(tenantId, profileName), true, putInCache);
     }
@@ -147,7 +147,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Override
     public DeviceProfile findDeviceProfileByProvisionDeviceKey(String provisionDeviceKey) {
         log.trace("Executing findDeviceProfileByProvisionDeviceKey provisionKey [{}]", provisionDeviceKey);
-        validateString(provisionDeviceKey, INCORRECT_PROVISION_DEVICE_KEY + provisionDeviceKey);
+        validateString(provisionDeviceKey, dk -> INCORRECT_PROVISION_DEVICE_KEY + dk);
         return cache.getAndPutInTransaction(DeviceProfileCacheKey.fromProvisionDeviceKey(provisionDeviceKey),
                 () -> deviceProfileDao.findByProvisionDeviceKey(provisionDeviceKey), false);
     }
@@ -155,7 +155,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Override
     public DeviceProfileInfo findDeviceProfileInfoById(TenantId tenantId, DeviceProfileId deviceProfileId) {
         log.trace("Executing findDeviceProfileById [{}]", deviceProfileId);
-        validateId(deviceProfileId, INCORRECT_DEVICE_PROFILE_ID + deviceProfileId);
+        validateId(deviceProfileId, id -> INCORRECT_DEVICE_PROFILE_ID + id);
         return toDeviceProfileInfo(findDeviceProfileById(tenantId, deviceProfileId));
     }
 
@@ -222,7 +222,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Transactional
     public void deleteDeviceProfile(TenantId tenantId, DeviceProfileId deviceProfileId) {
         log.trace("Executing deleteDeviceProfile [{}]", deviceProfileId);
-        validateId(deviceProfileId, INCORRECT_DEVICE_PROFILE_ID + deviceProfileId);
+        validateId(deviceProfileId, id -> INCORRECT_DEVICE_PROFILE_ID + id);
         DeviceProfile deviceProfile = deviceProfileDao.findById(tenantId, deviceProfileId.getId());
         if (deviceProfile != null && deviceProfile.isDefault()) {
             throw new DataValidationException("Deletion of Default Device Profile is prohibited!");
@@ -252,7 +252,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Override
     public PageData<DeviceProfile> findDeviceProfiles(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findDeviceProfiles tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         Validator.validatePageLink(pageLink);
         return deviceProfileDao.findDeviceProfiles(tenantId, pageLink);
     }
@@ -260,7 +260,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Override
     public PageData<DeviceProfileInfo> findDeviceProfileInfos(TenantId tenantId, PageLink pageLink, String transportType) {
         log.trace("Executing findDeviceProfileInfos tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         Validator.validatePageLink(pageLink);
         return deviceProfileDao.findDeviceProfileInfos(tenantId, pageLink, transportType);
     }
@@ -290,7 +290,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     }
 
     private DeviceProfile doCreateDefaultDeviceProfile(TenantId tenantId, String profileName, boolean defaultProfile, boolean publishSaveEvent) {
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         DeviceProfile deviceProfile = new DeviceProfile();
         deviceProfile.setTenantId(tenantId);
         deviceProfile.setDefault(defaultProfile);
@@ -313,7 +313,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Override
     public DeviceProfile findDefaultDeviceProfile(TenantId tenantId) {
         log.trace("Executing findDefaultDeviceProfile tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return cache.getAndPutInTransaction(DeviceProfileCacheKey.defaultProfile(tenantId),
                 () -> deviceProfileDao.findDefaultDeviceProfile(tenantId), true);
     }
@@ -321,14 +321,14 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Override
     public DeviceProfileInfo findDefaultDeviceProfileInfo(TenantId tenantId) {
         log.trace("Executing findDefaultDeviceProfileInfo tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return toDeviceProfileInfo(findDefaultDeviceProfile(tenantId));
     }
 
     @Override
     public boolean setDefaultDeviceProfile(TenantId tenantId, DeviceProfileId deviceProfileId) {
         log.trace("Executing setDefaultDeviceProfile [{}]", deviceProfileId);
-        validateId(deviceProfileId, INCORRECT_DEVICE_PROFILE_ID + deviceProfileId);
+        validateId(deviceProfileId, id -> INCORRECT_DEVICE_PROFILE_ID + id);
         DeviceProfile deviceProfile = deviceProfileDao.findById(tenantId, deviceProfileId.getId());
         if (!deviceProfile.isDefault()) {
             deviceProfile.setDefault(true);
@@ -354,7 +354,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Override
     public void deleteDeviceProfilesByTenantId(TenantId tenantId) {
         log.trace("Executing deleteDeviceProfilesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantDeviceProfilesRemover.removeEntities(tenantId, tenantId);
     }
 
@@ -377,7 +377,7 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
     @Override
     public List<EntityInfo> findDeviceProfileNamesByTenantId(TenantId tenantId, boolean activeOnly) {
         log.trace("Executing findDeviceProfileNamesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return deviceProfileDao.findTenantDeviceProfileNames(tenantId.getId(), activeOnly)
                 .stream().sorted(Comparator.comparing(EntityInfo::getName))
                 .collect(Collectors.toList());
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
index da25bf91d5..ff00db3564 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
@@ -126,14 +126,14 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public DeviceInfo findDeviceInfoById(TenantId tenantId, DeviceId deviceId) {
         log.trace("Executing findDeviceInfoById [{}]", deviceId);
-        validateId(deviceId, INCORRECT_DEVICE_ID + deviceId);
+        validateId(deviceId, id -> INCORRECT_DEVICE_ID + id);
         return deviceDao.findDeviceInfoById(tenantId, deviceId.getId());
     }
 
     @Override
     public Device findDeviceById(TenantId tenantId, DeviceId deviceId) {
         log.trace("Executing findDeviceById [{}]", deviceId);
-        validateId(deviceId, INCORRECT_DEVICE_ID + deviceId);
+        validateId(deviceId, id -> INCORRECT_DEVICE_ID + id);
         if (TenantId.SYS_TENANT_ID.equals(tenantId)) {
             return cache.getAndPutInTransaction(new DeviceCacheKey(deviceId),
                     () -> deviceDao.findById(tenantId, deviceId.getId()), true);
@@ -146,7 +146,7 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public ListenableFuture<Device> findDeviceByIdAsync(TenantId tenantId, DeviceId deviceId) {
         log.trace("Executing findDeviceById [{}]", deviceId);
-        validateId(deviceId, INCORRECT_DEVICE_ID + deviceId);
+        validateId(deviceId, id -> INCORRECT_DEVICE_ID + id);
         if (TenantId.SYS_TENANT_ID.equals(tenantId)) {
             return deviceDao.findByIdAsync(tenantId, deviceId.getId());
         } else {
@@ -157,7 +157,7 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public Device findDeviceByTenantIdAndName(TenantId tenantId, String name) {
         log.trace("Executing findDeviceByTenantIdAndName [{}][{}]", tenantId, name);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return cache.getAndPutInTransaction(new DeviceCacheKey(tenantId, name),
                 () -> deviceDao.findDeviceByTenantIdAndName(tenantId.getId(), name).orElse(null), true);
     }
@@ -321,7 +321,7 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Transactional
     @Override
     public void deleteDevice(final TenantId tenantId, final DeviceId deviceId) {
-        validateId(deviceId, INCORRECT_DEVICE_ID + deviceId);
+        validateId(deviceId, id -> INCORRECT_DEVICE_ID + id);
         if (entityViewService.existsByTenantIdAndEntityId(tenantId, deviceId)) {
             throw new DataValidationException("Can't delete device that has entity views!");
         }
@@ -347,7 +347,7 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public PageData<Device> findDevicesByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findDevicesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id ->INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return deviceDao.findDevicesByTenantId(tenantId.getId(), pageLink);
     }
@@ -359,7 +359,7 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
         if (filter == null) {
             throw new IncorrectParameterException("Filter is empty!");
         }
-        validateId(filter.getTenantId(), INCORRECT_TENANT_ID + filter.getTenantId());
+        validateId(filter.getTenantId(), id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return deviceDao.findDeviceInfosByFilter(filter, pageLink);
 
@@ -375,8 +375,8 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public PageData<Device> findDevicesByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink) {
         log.trace("Executing findDevicesByTenantIdAndType, tenantId [{}], type [{}], pageLink [{}]", tenantId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return deviceDao.findDevicesByTenantIdAndType(tenantId.getId(), type, pageLink);
     }
@@ -388,8 +388,8 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
                                                                            PageLink pageLink) {
         log.trace("Executing findDevicesByTenantIdAndTypeAndEmptyOtaPackage, tenantId [{}], deviceProfileId [{}], type [{}], pageLink [{}]",
                 tenantId, deviceProfileId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(tenantId, INCORRECT_DEVICE_PROFILE_ID + deviceProfileId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(deviceProfileId, id -> INCORRECT_DEVICE_PROFILE_ID + id);
         validatePageLink(pageLink);
         return deviceDao.findDevicesByTenantIdAndTypeAndEmptyOtaPackage(tenantId.getId(), deviceProfileId.getId(), type, pageLink);
     }
@@ -397,30 +397,30 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public Long countDevicesByTenantIdAndDeviceProfileIdAndEmptyOtaPackage(TenantId tenantId, DeviceProfileId deviceProfileId, OtaPackageType type) {
         log.trace("Executing countDevicesByTenantIdAndDeviceProfileIdAndEmptyOtaPackage, tenantId [{}], deviceProfileId [{}], type [{}]", tenantId, deviceProfileId, type);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(tenantId, INCORRECT_DEVICE_PROFILE_ID + deviceProfileId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(deviceProfileId, id -> INCORRECT_DEVICE_PROFILE_ID + id);
         return deviceDao.countDevicesByTenantIdAndDeviceProfileIdAndEmptyOtaPackage(tenantId.getId(), deviceProfileId.getId(), type);
     }
 
     @Override
     public ListenableFuture<List<Device>> findDevicesByTenantIdAndIdsAsync(TenantId tenantId, List<DeviceId> deviceIds) {
         log.trace("Executing findDevicesByTenantIdAndIdsAsync, tenantId [{}], deviceIds [{}]", tenantId, deviceIds);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateIds(deviceIds, "Incorrect deviceIds " + deviceIds);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateIds(deviceIds, ids -> "Incorrect deviceIds " + ids);
         return deviceDao.findDevicesByTenantIdAndIdsAsync(tenantId.getId(), toUUIDs(deviceIds));
     }
 
     @Override
     public List<Device> findDevicesByIds(List<DeviceId> deviceIds) {
         log.trace("Executing findDevicesByIdsAsync, deviceIds [{}]", deviceIds);
-        validateIds(deviceIds, "Incorrect deviceIds " + deviceIds);
+        validateIds(deviceIds, ids-> "Incorrect deviceIds " + ids);
         return deviceDao.findDevicesByIds(toUUIDs(deviceIds));
     }
 
     @Override
     public ListenableFuture<List<Device>> findDevicesByIdsAsync(List<DeviceId> deviceIds) {
         log.trace("Executing findDevicesByIdsAsync, deviceIds [{}]", deviceIds);
-        validateIds(deviceIds, "Incorrect deviceIds " + deviceIds);
+        validateIds(deviceIds, ids-> "Incorrect deviceIds " + ids);
         return deviceDao.findDevicesByIdsAsync(toUUIDs(deviceIds));
     }
 
@@ -428,15 +428,15 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public void deleteDevicesByTenantId(TenantId tenantId) {
         log.trace("Executing deleteDevicesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantDevicesRemover.removeEntities(tenantId, tenantId);
     }
 
     @Override
     public PageData<Device> findDevicesByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findDevicesByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         validatePageLink(pageLink);
         return deviceDao.findDevicesByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink);
     }
@@ -444,9 +444,9 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public PageData<Device> findDevicesByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId, String type, PageLink pageLink) {
         log.trace("Executing findDevicesByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}], type [{}], pageLink [{}]", tenantId, customerId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return deviceDao.findDevicesByTenantIdAndCustomerIdAndType(tenantId.getId(), customerId.getId(), type, pageLink);
     }
@@ -454,9 +454,9 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public ListenableFuture<List<Device>> findDevicesByTenantIdCustomerIdAndIdsAsync(TenantId tenantId, CustomerId customerId, List<DeviceId> deviceIds) {
         log.trace("Executing findDevicesByTenantIdCustomerIdAndIdsAsync, tenantId [{}], customerId [{}], deviceIds [{}]", tenantId, customerId, deviceIds);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
-        validateIds(deviceIds, "Incorrect deviceIds " + deviceIds);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
+        validateIds(deviceIds, ids -> "Incorrect deviceIds " + ids);
         return deviceDao.findDevicesByTenantIdCustomerIdAndIdsAsync(tenantId.getId(),
                 customerId.getId(), toUUIDs(deviceIds));
     }
@@ -464,8 +464,8 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public void unassignCustomerDevices(TenantId tenantId, CustomerId customerId) {
         log.trace("Executing unassignCustomerDevices, tenantId [{}], customerId [{}]", tenantId, customerId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         customerDevicesRemover.removeEntities(tenantId, customerId);
     }
 
@@ -491,7 +491,7 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public ListenableFuture<List<EntitySubtype>> findDeviceTypesByTenantId(TenantId tenantId) {
         log.trace("Executing findDeviceTypesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return deviceDao.findTenantDeviceTypesAsync(tenantId.getId());
     }
 
@@ -627,8 +627,8 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public PageData<Device> findDevicesByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) {
         log.trace("Executing findDevicesByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
         validatePageLink(pageLink);
         return deviceDao.findDevicesByTenantIdAndEdgeId(tenantId.getId(), edgeId.getId(), pageLink);
     }
@@ -636,9 +636,9 @@ public class DeviceServiceImpl extends AbstractCachedEntityService<DeviceCacheKe
     @Override
     public PageData<Device> findDevicesByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, PageLink pageLink) {
         log.trace("Executing findDevicesByTenantIdAndEdgeIdAndType, tenantId [{}], edgeId [{}], type [{}] pageLink [{}]", tenantId, edgeId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return deviceDao.findDevicesByTenantIdAndEdgeIdAndType(tenantId.getId(), edgeId.getId(), type, pageLink);
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
index 2db4d2ba92..94aa3380ee 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
@@ -21,6 +21,7 @@ import com.google.common.base.Function;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import jakarta.annotation.Nullable;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.exception.ConstraintViolationException;
@@ -31,7 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.event.TransactionalEventListener;
 import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
@@ -71,7 +72,6 @@ import org.thingsboard.server.dao.service.Validator;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.user.UserService;
 
-import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -138,28 +138,28 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public Edge findEdgeById(TenantId tenantId, EdgeId edgeId) {
         log.trace("Executing findEdgeById [{}]", edgeId);
-        validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
+        validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
         return edgeDao.findById(tenantId, edgeId.getId());
     }
 
     @Override
     public EdgeInfo findEdgeInfoById(TenantId tenantId, EdgeId edgeId) {
         log.trace("Executing findEdgeInfoById [{}]", edgeId);
-        validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
+        validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
         return edgeDao.findEdgeInfoById(tenantId, edgeId.getId());
     }
 
     @Override
     public ListenableFuture<Edge> findEdgeByIdAsync(TenantId tenantId, EdgeId edgeId) {
         log.trace("Executing findEdgeById [{}]", edgeId);
-        validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
+        validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
         return edgeDao.findByIdAsync(tenantId, edgeId.getId());
     }
 
     @Override
     public Edge findEdgeByTenantIdAndName(TenantId tenantId, String name) {
         log.trace("Executing findEdgeByTenantIdAndName [{}][{}]", tenantId, name);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return cache.getAndPutInTransaction(new EdgeCacheKey(tenantId, name),
                 () -> edgeDao.findEdgeByTenantIdAndName(tenantId.getId(), name)
                         .orElse(null), true);
@@ -221,7 +221,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Transactional
     public void deleteEdge(TenantId tenantId, EdgeId edgeId) {
         log.trace("Executing deleteEdge [{}]", edgeId);
-        validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
+        validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
 
         Edge edge = edgeDao.findById(tenantId, edgeId.getId());
 
@@ -236,7 +236,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public PageData<Edge> findEdgesByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findEdgesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return edgeDao.findEdgesByTenantId(tenantId.getId(), pageLink);
     }
@@ -244,8 +244,8 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public PageData<Edge> findEdgesByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink) {
         log.trace("Executing findEdgesByTenantIdAndType, tenantId [{}], type [{}], pageLink [{}]", tenantId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return edgeDao.findEdgesByTenantIdAndType(tenantId.getId(), type, pageLink);
     }
@@ -253,8 +253,8 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public PageData<EdgeInfo> findEdgeInfosByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink) {
         log.trace("Executing findEdgeInfosByTenantIdAndType, tenantId [{}], type [{}], pageLink [{}]", tenantId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return edgeDao.findEdgeInfosByTenantIdAndType(tenantId.getId(), type, pageLink);
     }
@@ -262,7 +262,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public PageData<EdgeInfo> findEdgeInfosByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findEdgeInfosByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return edgeDao.findEdgeInfosByTenantId(tenantId.getId(), pageLink);
     }
@@ -270,23 +270,23 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public ListenableFuture<List<Edge>> findEdgesByTenantIdAndIdsAsync(TenantId tenantId, List<EdgeId> edgeIds) {
         log.trace("Executing findEdgesByTenantIdAndIdsAsync, tenantId [{}], edgeIds [{}]", tenantId, edgeIds);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateIds(edgeIds, "Incorrect edgeIds " + edgeIds);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateIds(edgeIds, ids -> "Incorrect edgeIds " + ids);
         return edgeDao.findEdgesByTenantIdAndIdsAsync(tenantId.getId(), toUUIDs(edgeIds));
     }
 
     @Override
     public void deleteEdgesByTenantId(TenantId tenantId) {
         log.trace("Executing deleteEdgesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantEdgesRemover.removeEntities(tenantId, tenantId);
     }
 
     @Override
     public PageData<Edge> findEdgesByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findEdgesByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         validatePageLink(pageLink);
         return edgeDao.findEdgesByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink);
     }
@@ -294,9 +294,9 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public PageData<Edge> findEdgesByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId, String type, PageLink pageLink) {
         log.trace("Executing findEdgesByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}], type [{}], pageLink [{}]", tenantId, customerId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return edgeDao.findEdgesByTenantIdAndCustomerIdAndType(tenantId.getId(), customerId.getId(), type, pageLink);
     }
@@ -304,8 +304,8 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public PageData<EdgeInfo> findEdgeInfosByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findEdgeInfosByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         validatePageLink(pageLink);
         return edgeDao.findEdgeInfosByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink);
     }
@@ -313,9 +313,9 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public PageData<EdgeInfo> findEdgeInfosByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId, String type, PageLink pageLink) {
         log.trace("Executing findEdgeInfosByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}], type [{}], pageLink [{}]", tenantId, customerId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return edgeDao.findEdgeInfosByTenantIdAndCustomerIdAndType(tenantId.getId(), customerId.getId(), type, pageLink);
     }
@@ -323,9 +323,9 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public ListenableFuture<List<Edge>> findEdgesByTenantIdCustomerIdAndIdsAsync(TenantId tenantId, CustomerId customerId, List<EdgeId> edgeIds) {
         log.trace("Executing findEdgesByTenantIdCustomerIdAndIdsAsync, tenantId [{}], customerId [{}], edgeIds [{}]", tenantId, customerId, edgeIds);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
-        validateIds(edgeIds, "Incorrect edgeIds " + edgeIds);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
+        validateIds(edgeIds, ids -> "Incorrect edgeIds " + ids);
         return edgeDao.findEdgesByTenantIdCustomerIdAndIdsAsync(tenantId.getId(),
                 customerId.getId(), toUUIDs(edgeIds));
     }
@@ -333,8 +333,8 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public void unassignCustomerEdges(TenantId tenantId, CustomerId customerId) {
         log.trace("Executing unassignCustomerEdges, tenantId [{}], customerId [{}]", tenantId, customerId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         customerEdgeUnassigner.removeEntities(tenantId, customerId);
     }
 
@@ -354,7 +354,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
             return Futures.successfulAsList(futures);
         }, MoreExecutors.directExecutor());
 
-        edges = Futures.transform(edges, new Function<List<Edge>, List<Edge>>() {
+        edges = Futures.transform(edges, new Function<>() {
             @Nullable
             @Override
             public List<Edge> apply(@Nullable List<Edge> edgeList) {
@@ -370,7 +370,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public ListenableFuture<List<EntitySubtype>> findEdgeTypesByTenantId(TenantId tenantId) {
         log.trace("Executing findEdgeTypesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         ListenableFuture<List<EntitySubtype>> tenantEdgeTypes = edgeDao.findTenantEdgeTypesAsync(tenantId.getId());
         return Futures.transform(tenantEdgeTypes,
                 edgeTypes -> {
@@ -400,7 +400,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public PageData<Edge> findEdgesByTenantIdAndEntityId(TenantId tenantId, EntityId entityId, PageLink pageLink) {
         log.trace("Executing findEdgesByTenantIdAndEntityId, tenantId [{}], entityId [{}], pageLink [{}]", tenantId, entityId, pageLink);
-        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return edgeDao.findEdgesByTenantIdAndEntityId(tenantId.getId(), entityId.getId(), entityId.getEntityType(), pageLink);
     }
@@ -408,13 +408,13 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public PageData<Edge> findEdgesByTenantProfileId(TenantProfileId tenantProfileId, PageLink pageLink) {
         log.trace("Executing findEdgesByTenantProfileId, tenantProfileId [{}], pageLink [{}]", tenantProfileId, pageLink);
-        Validator.validateId(tenantProfileId, "Incorrect tenantProfileId " + tenantProfileId);
+        Validator.validateId(tenantProfileId, id -> "Incorrect tenantProfileId " + id);
         validatePageLink(pageLink);
         return edgeDao.findEdgesByTenantProfileId(tenantProfileId.getId(), pageLink);
     }
 
     private PaginatedRemover<TenantId, Edge> tenantEdgesRemover =
-            new PaginatedRemover<TenantId, Edge>() {
+            new PaginatedRemover<>() {
 
                 @Override
                 protected PageData<Edge> findEntities(TenantId tenantId, TenantId id, PageLink pageLink) {
@@ -427,7 +427,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
                 }
             };
 
-    private PaginatedRemover<CustomerId, Edge> customerEdgeUnassigner = new PaginatedRemover<CustomerId, Edge>() {
+    private PaginatedRemover<CustomerId, Edge> customerEdgeUnassigner = new PaginatedRemover<>() {
 
         @Override
         protected PageData<Edge> findEntities(TenantId tenantId, CustomerId id, PageLink pageLink) {
@@ -513,7 +513,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     @Override
     public String findMissingToRelatedRuleChains(TenantId tenantId, EdgeId edgeId, String tbRuleChainInputNodeClassName) {
         List<RuleChain> edgeRuleChains = findEdgeRuleChains(tenantId, edgeId);
-        List<RuleChainId> edgeRuleChainIds = edgeRuleChains.stream().map(IdBased::getId).collect(Collectors.toList());
+        List<RuleChainId> edgeRuleChainIds = edgeRuleChains.stream().map(IdBased::getId).toList();
         ObjectNode result = JacksonUtil.newObjectNode();
         for (RuleChain edgeRuleChain : edgeRuleChains) {
             List<RuleNode> ruleNodes =
@@ -522,8 +522,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
                 List<RuleChainId> connectedRuleChains =
                         ruleNodes.stream()
                                 .filter(rn -> rn.getType().equals(tbRuleChainInputNodeClassName))
-                                .map(rn -> new RuleChainId(UUID.fromString(rn.getConfiguration().get("ruleChainId").asText())))
-                                .collect(Collectors.toList());
+                                .map(rn -> new RuleChainId(UUID.fromString(rn.getConfiguration().get("ruleChainId").asText()))).toList();
                 List<String> missingRuleChains = new ArrayList<>();
                 for (RuleChainId connectedRuleChain : connectedRuleChains) {
                     if (!edgeRuleChainIds.contains(connectedRuleChain)) {
@@ -549,7 +548,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
         if (persistToTelemetry) {
             futureKvEntry = timeseriesService.findLatest(tenantId, edgeId, key);
         } else {
-            futureKvEntry = attributesService.find(tenantId, edgeId, DataConstants.SERVER_SCOPE, key);
+            futureKvEntry = attributesService.find(tenantId, edgeId, AttributeScope.SERVER_SCOPE, key);
         }
         return Futures.transformAsync(futureKvEntry, kvEntryOpt ->
                 Futures.immediateFuture(kvEntryOpt.flatMap(KvEntry::getBooleanValue).orElse(false)), MoreExecutors.directExecutor());
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
index 4ee812a26b..3cdcf5e874 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
@@ -17,8 +17,10 @@ package org.thingsboard.server.dao.entity;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasCustomerId;
 import org.thingsboard.server.common.data.HasEmail;
 import org.thingsboard.server.common.data.HasLabel;
@@ -33,13 +35,23 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.EntityCountQuery;
 import org.thingsboard.server.common.data.query.EntityData;
+import org.thingsboard.server.common.data.query.EntityDataPageLink;
 import org.thingsboard.server.common.data.query.EntityDataQuery;
 import org.thingsboard.server.common.data.query.EntityFilterType;
+import org.thingsboard.server.common.data.query.EntityKey;
+import org.thingsboard.server.common.data.query.EntityListFilter;
+import org.thingsboard.server.common.data.query.KeyFilter;
 import org.thingsboard.server.common.data.query.RelationsQueryFilter;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static org.thingsboard.server.common.data.id.EntityId.NULL_UUID;
 import static org.thingsboard.server.dao.service.Validator.validateEntityDataPageLink;
@@ -56,17 +68,22 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
     public static final String INCORRECT_CUSTOMER_ID = "Incorrect customerId ";
     public static final CustomerId NULL_CUSTOMER_ID = new CustomerId(NULL_UUID);
 
+    private static final int MAX_ENTITY_IDS_SIZE = 1024;
+    private static final Set<EntityFilterType> EXCLUDED_TYPES_FROM_OPTIMIZATION = Set.of(
+            EntityFilterType.ENTITY_LIST, EntityFilterType.SINGLE_ENTITY, EntityFilterType.RELATIONS_QUERY);
+
     @Autowired
     private EntityQueryDao entityQueryDao;
 
     @Autowired
+    @Lazy
     EntityServiceRegistry entityServiceRegistry;
 
     @Override
     public long countEntitiesByQuery(TenantId tenantId, CustomerId customerId, EntityCountQuery query) {
         log.trace("Executing countEntitiesByQuery, tenantId [{}], customerId [{}], query [{}]", tenantId, customerId, query);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         validateEntityCountQuery(query);
         return this.entityQueryDao.countEntitiesByQuery(tenantId, customerId, query);
     }
@@ -74,10 +91,23 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
     @Override
     public PageData<EntityData> findEntityDataByQuery(TenantId tenantId, CustomerId customerId, EntityDataQuery query) {
         log.trace("Executing findEntityDataByQuery, tenantId [{}], customerId [{}], query [{}]", tenantId, customerId, query);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         validateEntityDataQuery(query);
-        return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, query);
+
+        if (!isValidForOptimization(query)) {
+            return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, query);
+        }
+
+        // 1 step - find entity data by filter and sort columns
+        PageData<EntityData> entityDataByQuery = findEntityIdsByFilterAndSorterColumns(tenantId, customerId, query);
+        if (entityDataByQuery == null || entityDataByQuery.getData().isEmpty()) {
+            return entityDataByQuery;
+        }
+
+        // 2 step - find entity data by entity ids from the 1st step
+        List<EntityData> result = fetchEntityDataByIdsFromInitialQuery(tenantId, customerId, query, entityDataByQuery.getData());
+        return new PageData<>(result, entityDataByQuery.getTotalPages(), entityDataByQuery.getTotalElements(), entityDataByQuery.hasNext());
     }
 
     @Override
@@ -131,8 +161,7 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
     }
 
     private CustomerId getCustomerId(HasId<?> entity) {
-        if (entity instanceof HasCustomerId) {
-            HasCustomerId hasCustomerId = (HasCustomerId) entity;
+        if (entity instanceof HasCustomerId hasCustomerId) {
             CustomerId customerId = hasCustomerId.getCustomerId();
             if (customerId == null) {
                 customerId = NULL_CUSTOMER_ID;
@@ -174,4 +203,76 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
             throw new IncorrectParameterException("Relation query filter root entity should not be blank");
         }
     }
+
+    private boolean isValidForOptimization(EntityDataQuery query) {
+        if (StringUtils.isNotEmpty(query.getPageLink().getTextSearch())) {
+            return false;
+        }
+
+        if (EXCLUDED_TYPES_FROM_OPTIMIZATION.contains(query.getEntityFilter().getType())) {
+            return false;
+        }
+
+        if ((query.getEntityFields() == null || query.getEntityFields().isEmpty()) &&
+                (query.getLatestValues() == null || query.getLatestValues().isEmpty())) {
+            return false;
+        }
+
+        Set<EntityKey> filteringKeys = new HashSet<>(Optional.ofNullable(query.getKeyFilters()).orElse(Collections.emptyList()).stream().map(KeyFilter::getKey).toList());
+        Set<EntityKey> entityFields = new HashSet<>(Optional.ofNullable(query.getEntityFields()).orElse(Collections.emptyList()));
+        Set<EntityKey> latestValues = new HashSet<>(Optional.ofNullable(query.getLatestValues()).orElse(Collections.emptyList()));
+
+        return !(filteringKeys.containsAll(entityFields) && filteringKeys.containsAll(latestValues));
+    }
+
+    private PageData<EntityData> findEntityIdsByFilterAndSorterColumns(TenantId tenantId, CustomerId customerId, EntityDataQuery query) {
+        List<EntityKey> entityFields = null;
+        List<EntityKey> latestValues = null;
+        if (query.getPageLink().getSortOrder() != null) {
+            if (query.getEntityFields() != null) {
+                entityFields = query.getEntityFields().stream()
+                        .filter(entityKey -> entityKey.getKey().equals(query.getPageLink().getSortOrder().getKey().getKey()))
+                        .collect(Collectors.toList());
+            }
+            if (query.getLatestValues() != null) {
+                latestValues = query.getLatestValues().stream()
+                        .filter(entityKey -> entityKey.getKey().equals(query.getPageLink().getSortOrder().getKey().getKey()))
+                        .collect(Collectors.toList());
+            }
+        }
+        EntityDataQuery entityQuery = new EntityDataQuery(query.getEntityFilter(), query.getPageLink(), entityFields, latestValues, query.getKeyFilters());
+        return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, entityQuery);
+    }
+
+    private List<EntityData> fetchEntityDataByIdsFromInitialQuery(TenantId tenantId, CustomerId customerId, EntityDataQuery query, List<EntityData> initialQueryResult) {
+        List<EntityData> result = new ArrayList<>();
+
+        List<String> entityIds = initialQueryResult.stream().map(d -> d.getEntityId().getId().toString()).collect(Collectors.toList());
+        EntityType entityType = initialQueryResult.get(0).getEntityId().getEntityType();
+
+        if (entityIds.size() > MAX_ENTITY_IDS_SIZE) {
+            List<List<String>> chunks = new ArrayList<>();
+            for (int i = 0; i < entityIds.size(); i += MAX_ENTITY_IDS_SIZE) {
+                chunks.add(entityIds.subList(i, Math.min(entityIds.size(), i + MAX_ENTITY_IDS_SIZE)));
+            }
+            for (List<String> chunk : chunks) {
+                result.addAll(findEntityDataByEntityIds(tenantId, customerId, query, chunk, entityType, chunk.size()));
+            }
+        } else {
+            result.addAll(findEntityDataByEntityIds(tenantId, customerId, query, entityIds, entityType, query.getPageLink().getPageSize()));
+        }
+        return result;
+    }
+
+    private List<EntityData> findEntityDataByEntityIds(TenantId tenantId, CustomerId customerId, EntityDataQuery query,
+                                                       List<String> entityIds, EntityType entityType, int pageSize) {
+        EntityListFilter filter = new EntityListFilter();
+        filter.setEntityType(entityType);
+        filter.setEntityList(entityIds);
+
+        EntityDataPageLink pageLink = new EntityDataPageLink(pageSize, 0, null, query.getPageLink().getSortOrder());
+        EntityDataQuery entityQuery = new EntityDataQuery(filter, pageLink, query.getEntityFields(), query.getLatestValues(), null);
+        return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, entityQuery).getData();
+    }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java b/dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java
index 6e6233b1b2..8202d49db8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java
@@ -15,17 +15,14 @@
  */
 package org.thingsboard.server.dao.entity;
 
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.context.event.EventListener;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -33,14 +30,13 @@ import java.util.Map;
 @Slf4j
 public class DefaultEntityServiceRegistry implements EntityServiceRegistry {
 
-    private final ApplicationContext applicationContext;
+    private final List<EntityDaoService> entityDaoServices;
     private final Map<EntityType, EntityDaoService> entityDaoServicesMap = new HashMap<>();
 
-    @EventListener(ContextRefreshedEvent.class)
-    @Order(Ordered.HIGHEST_PRECEDENCE)
+    @PostConstruct
     public void init() {
         log.debug("Initializing EntityServiceRegistry on ContextRefreshedEvent");
-        applicationContext.getBeansOfType(EntityDaoService.class).values().forEach(entityDaoService -> {
+        entityDaoServices.forEach(entityDaoService -> {
             EntityType entityType = entityDaoService.getEntityType();
             entityDaoServicesMap.put(entityType, entityDaoService);
             if (EntityType.RULE_CHAIN.equals(entityType)) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
index 5804650ec6..9d3c33dcc2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
@@ -145,15 +145,15 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     @Override
     public void unassignCustomerEntityViews(TenantId tenantId, CustomerId customerId) {
         log.trace("Executing unassignCustomerEntityViews, tenantId [{}], customerId [{}]", tenantId, customerId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         customerEntityViewsUnAssigner.removeEntities(tenantId, customerId);
     }
 
     @Override
     public EntityViewInfo findEntityViewInfoById(TenantId tenantId, EntityViewId entityViewId) {
         log.trace("Executing findEntityViewInfoById [{}]", entityViewId);
-        validateId(entityViewId, INCORRECT_ENTITY_VIEW_ID + entityViewId);
+        validateId(entityViewId, id -> INCORRECT_ENTITY_VIEW_ID + id);
         return entityViewDao.findEntityViewInfoById(tenantId, entityViewId.getId());
     }
 
@@ -165,7 +165,7 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     @Override
     public EntityView findEntityViewById(TenantId tenantId, EntityViewId entityViewId, boolean putInCache) {
         log.trace("Executing findEntityViewById [{}]", entityViewId);
-        validateId(entityViewId, INCORRECT_ENTITY_VIEW_ID + entityViewId);
+        validateId(entityViewId, id -> INCORRECT_ENTITY_VIEW_ID + id);
         return cache.getOrFetchFromDB(EntityViewCacheKey.byId(entityViewId),
                 () -> entityViewDao.findById(tenantId, entityViewId.getId())
                 , EntityViewCacheValue::getEntityView, v -> new EntityViewCacheValue(v, null), true, putInCache);
@@ -174,7 +174,7 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     @Override
     public EntityView findEntityViewByTenantIdAndName(TenantId tenantId, String name) {
         log.trace("Executing findEntityViewByTenantIdAndName [{}][{}]", tenantId, name);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return cache.getAndPutInTransaction(EntityViewCacheKey.byName(tenantId, name),
                 () -> entityViewDao.findEntityViewByTenantIdAndName(tenantId.getId(), name).orElse(null)
                 , EntityViewCacheValue::getEntityView, v -> new EntityViewCacheValue(v, null), true);
@@ -184,7 +184,7 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     @Override
     public PageData<EntityView> findEntityViewByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findEntityViewsByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return entityViewDao.findEntityViewsByTenantId(tenantId.getId(), pageLink);
     }
@@ -192,7 +192,7 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     @Override
     public PageData<EntityViewInfo> findEntityViewInfosByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findEntityViewInfosByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return entityViewDao.findEntityViewInfosByTenantId(tenantId.getId(), pageLink);
     }
@@ -200,18 +200,18 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     @Override
     public PageData<EntityView> findEntityViewByTenantIdAndType(TenantId tenantId, PageLink pageLink, String type) {
         log.trace("Executing findEntityViewByTenantIdAndType, tenantId [{}], pageLink [{}], type [{}]", tenantId, pageLink, type);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
-        validateString(type, "Incorrect type " + type);
+        validateString(type, t -> "Incorrect type " + t);
         return entityViewDao.findEntityViewsByTenantIdAndType(tenantId.getId(), type, pageLink);
     }
 
     @Override
     public PageData<EntityViewInfo> findEntityViewInfosByTenantIdAndType(TenantId tenantId, String type, PageLink pageLink) {
         log.trace("Executing findEntityViewInfosByTenantIdAndType, tenantId [{}], pageLink [{}], type [{}]", tenantId, pageLink, type);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
-        validateString(type, "Incorrect type " + type);
+        validateString(type, t -> "Incorrect type " + t);
         return entityViewDao.findEntityViewInfosByTenantIdAndType(tenantId.getId(), type, pageLink);
     }
 
@@ -220,8 +220,8 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
                                                                        PageLink pageLink) {
         log.trace("Executing findEntityViewByTenantIdAndCustomerId, tenantId [{}], customerId [{}]," +
                 " pageLink [{}]", tenantId, customerId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id ->INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         validatePageLink(pageLink);
         return entityViewDao.findEntityViewsByTenantIdAndCustomerId(tenantId.getId(),
                 customerId.getId(), pageLink);
@@ -231,8 +231,8 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     public PageData<EntityViewInfo> findEntityViewInfosByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findEntityViewInfosByTenantIdAndCustomerId, tenantId [{}], customerId [{}]," +
                 " pageLink [{}]", tenantId, customerId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         validatePageLink(pageLink);
         return entityViewDao.findEntityViewInfosByTenantIdAndCustomerId(tenantId.getId(),
                 customerId.getId(), pageLink);
@@ -242,10 +242,10 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     public PageData<EntityView> findEntityViewsByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId, PageLink pageLink, String type) {
         log.trace("Executing findEntityViewsByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}]," +
                 " pageLink [{}], type [{}]", tenantId, customerId, pageLink, type);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         validatePageLink(pageLink);
-        validateString(type, "Incorrect type " + type);
+        validateString(type, t -> "Incorrect type " + t);
         return entityViewDao.findEntityViewsByTenantIdAndCustomerIdAndType(tenantId.getId(),
                 customerId.getId(), type, pageLink);
     }
@@ -254,10 +254,10 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     public PageData<EntityViewInfo> findEntityViewInfosByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId, String type, PageLink pageLink) {
         log.trace("Executing findEntityViewInfosByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}]," +
                 " pageLink [{}], type [{}]", tenantId, customerId, pageLink, type);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> INCORRECT_CUSTOMER_ID + id);
         validatePageLink(pageLink);
-        validateString(type, "Incorrect type " + type);
+        validateString(type, t -> "Incorrect type " + t);
         return entityViewDao.findEntityViewInfosByTenantIdAndCustomerIdAndType(tenantId.getId(),
                 customerId.getId(), type, pageLink);
     }
@@ -291,15 +291,15 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     @Override
     public ListenableFuture<EntityView> findEntityViewByIdAsync(TenantId tenantId, EntityViewId entityViewId) {
         log.trace("Executing findEntityViewById [{}]", entityViewId);
-        validateId(entityViewId, INCORRECT_ENTITY_VIEW_ID + entityViewId);
+        validateId(entityViewId, id -> INCORRECT_ENTITY_VIEW_ID + id);
         return entityViewDao.findByIdAsync(tenantId, entityViewId.getId());
     }
 
     @Override
     public ListenableFuture<List<EntityView>> findEntityViewsByTenantIdAndEntityIdAsync(TenantId tenantId, EntityId entityId) {
         log.trace("Executing findEntityViewsByTenantIdAndEntityIdAsync, tenantId [{}], entityId [{}]", tenantId, entityId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(entityId.getId(), "Incorrect entityId" + entityId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(entityId.getId(), id -> "Incorrect entityId" + id);
 
         return service.submit(() -> cache.getAndPutInTransaction(EntityViewCacheKey.byEntityId(tenantId, entityId),
                 () -> entityViewDao.findEntityViewsByTenantIdAndEntityId(tenantId.getId(), entityId.getId()),
@@ -309,8 +309,8 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     @Override
     public List<EntityView> findEntityViewsByTenantIdAndEntityId(TenantId tenantId, EntityId entityId) {
         log.trace("Executing findEntityViewsByTenantIdAndEntityId, tenantId [{}], entityId [{}]", tenantId, entityId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(entityId.getId(), "Incorrect entityId" + entityId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(entityId.getId(), id -> "Incorrect entityId" + id);
 
         return cache.getAndPutInTransaction(EntityViewCacheKey.byEntityId(tenantId, entityId),
                 () -> entityViewDao.findEntityViewsByTenantIdAndEntityId(tenantId.getId(), entityId.getId()),
@@ -326,7 +326,7 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     @Transactional
     public void deleteEntityView(TenantId tenantId, EntityViewId entityViewId) {
         log.trace("Executing deleteEntityView [{}]", entityViewId);
-        validateId(entityViewId, INCORRECT_ENTITY_VIEW_ID + entityViewId);
+        validateId(entityViewId, id -> INCORRECT_ENTITY_VIEW_ID + id);
         deleteEntityRelations(tenantId, entityViewId);
         EntityView entityView = entityViewDao.findById(tenantId, entityViewId.getId());
         entityViewDao.removeById(tenantId, entityViewId.getId());
@@ -337,14 +337,14 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     @Override
     public void deleteEntityViewsByTenantId(TenantId tenantId) {
         log.trace("Executing deleteEntityViewsByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantEntityViewRemover.removeEntities(tenantId, tenantId);
     }
 
     @Override
     public ListenableFuture<List<EntitySubtype>> findEntityViewTypesByTenantId(TenantId tenantId) {
         log.trace("Executing findEntityViewTypesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         ListenableFuture<List<EntitySubtype>> tenantEntityViewTypes = entityViewDao.findTenantEntityViewTypesAsync(tenantId.getId());
         return Futures.transform(tenantEntityViewTypes,
                 entityViewTypes -> {
@@ -402,8 +402,8 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     @Override
     public PageData<EntityView> findEntityViewsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) {
         log.trace("Executing findEntityViewsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
         validatePageLink(pageLink);
         return entityViewDao.findEntityViewsByTenantIdAndEdgeId(tenantId.getId(), edgeId.getId(), pageLink);
     }
@@ -411,9 +411,9 @@ public class EntityViewServiceImpl extends AbstractCachedEntityService<EntityVie
     @Override
     public PageData<EntityView> findEntityViewsByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, PageLink pageLink) {
         log.trace("Executing findEntityViewsByTenantIdAndEdgeIdAndType, tenantId [{}], edgeId [{}], type [{}], pageLink [{}]", tenantId, edgeId, type, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
-        validateString(type, "Incorrect type " + type);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(edgeId, id -> INCORRECT_EDGE_ID + id);
+        validateString(type, t -> "Incorrect type " + t);
         validatePageLink(pageLink);
         return entityViewDao.findEntityViewsByTenantIdAndEdgeIdAndType(tenantId.getId(), edgeId.getId(), type, pageLink);
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java
index 88834eecbc..5314dcd405 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java
@@ -37,6 +37,7 @@ import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.dao.service.DataValidator;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -106,6 +107,11 @@ public class BaseEventService implements EventService {
         return convert(entityId.getEntityType(), eventDao.findLatestEvents(tenantId.getId(), entityId.getId(), eventType, limit));
     }
 
+    @Override
+    public EventInfo findLatestDebugRuleNodeInEvent(TenantId tenantId, EntityId entityId) {
+        return convert(entityId.getEntityType(), eventDao.findLatestDebugRuleNodeInEvent(tenantId.getId(), entityId.getId()));
+    }
+
     @Override
     public PageData<EventInfo> findEventsByFilter(TenantId tenantId, EntityId entityId, EventFilter eventFilter, TimePageLink pageLink) {
         return convert(entityId.getEntityType(), eventDao.findEventByFilter(tenantId.getId(), entityId.getId(), eventFilter, pageLink));
@@ -140,4 +146,8 @@ public class BaseEventService implements EventService {
         return list == null ? null : list.stream().map(e -> e.toInfo(entityType)).collect(Collectors.toList());
     }
 
+    private EventInfo convert(EntityType entityType, Event event) {
+        return Optional.ofNullable(event).map(e -> e.toInfo(entityType)).orElse(null);
+    }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java
index 2db5a7012d..6b3febf502 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java
@@ -62,6 +62,15 @@ public interface EventDao {
      */
     List<? extends Event> findLatestEvents(UUID tenantId, UUID entityId, EventType eventType, int limit);
 
+    /**
+     * Find latest debug IN event by tenantId, entityId.
+     *
+     * @param tenantId the tenantId
+     * @param entityId the entityId
+     * @return the latest debug IN event
+     */
+    Event findLatestDebugRuleNodeInEvent(UUID tenantId, UUID entityId);
+
     /**
      * Executes stored procedure to cleanup old events. Uses separate ttl for debug and other events.
      * @param regularEventExpTs the expiration time of the regular events
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
index 2fe56f5d1f..ae15c2d029 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
@@ -427,6 +427,7 @@ public class ModelConstants {
      */
     public static final String OAUTH2_PARAMS_TABLE_NAME = "oauth2_params";
     public static final String OAUTH2_PARAMS_ENABLED_PROPERTY = "enabled";
+    public static final String OAUTH2_PARAMS_EDGE_ENABLED_PROPERTY = "edge_enabled";
     public static final String OAUTH2_PARAMS_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY;
 
     public static final String OAUTH2_REGISTRATION_TABLE_NAME = "oauth2_registration";
@@ -610,6 +611,14 @@ public class ModelConstants {
     public static final String QUEUE_TABLE_NAME = "queue";
     public static final String QUEUE_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY;
 
+    /**
+     * Tenant queue stats constants.
+     */
+    public static final String QUEUE_STATS_TABLE_NAME = "queue_stats";
+    public static final String QUEUE_STATS_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY;
+    public static final String QUEUE_STATS_QUEUE_NAME_PROPERTY = "queue_name";
+    public static final String QUEUE_STATS_SERVICE_ID_PROPERTY = "service_id";
+
     /**
      * Notification constants
      */
@@ -620,6 +629,7 @@ public class ModelConstants {
     public static final String NOTIFICATION_REQUEST_ID_PROPERTY = "request_id";
     public static final String NOTIFICATION_RECIPIENT_ID_PROPERTY = "recipient_id";
     public static final String NOTIFICATION_TYPE_PROPERTY = "type";
+    public static final String NOTIFICATION_DELIVERY_METHOD_PROPERTY = "delivery_method";
     public static final String NOTIFICATION_SUBJECT_PROPERTY = "subject";
     public static final String NOTIFICATION_TEXT_PROPERTY = "body";
     public static final String NOTIFICATION_ADDITIONAL_CONFIG_PROPERTY = "additional_config";
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationEntity.java
index 169af3b4c1..7d84f03e46 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/NotificationEntity.java
@@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.id.NotificationId;
 import org.thingsboard.server.common.data.id.NotificationRequestId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.Notification;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.common.data.notification.NotificationType;
 import org.thingsboard.server.common.data.notification.info.NotificationInfo;
@@ -54,6 +55,10 @@ public class NotificationEntity extends BaseSqlEntity<Notification> {
     @Column(name = ModelConstants.NOTIFICATION_TYPE_PROPERTY, nullable = false)
     private NotificationType type;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name = ModelConstants.NOTIFICATION_DELIVERY_METHOD_PROPERTY, nullable = false)
+    private NotificationDeliveryMethod deliveryMethod;
+
     @Column(name = ModelConstants.NOTIFICATION_SUBJECT_PROPERTY)
     private String subject;
 
@@ -80,6 +85,7 @@ public class NotificationEntity extends BaseSqlEntity<Notification> {
         setRequestId(getUuid(notification.getRequestId()));
         setRecipientId(getUuid(notification.getRecipientId()));
         setType(notification.getType());
+        setDeliveryMethod(notification.getDeliveryMethod());
         setSubject(notification.getSubject());
         setText(notification.getText());
         setAdditionalConfig(notification.getAdditionalConfig());
@@ -95,6 +101,7 @@ public class NotificationEntity extends BaseSqlEntity<Notification> {
         notification.setRequestId(getEntityId(requestId, NotificationRequestId::new));
         notification.setRecipientId(getEntityId(recipientId, UserId::new));
         notification.setType(type);
+        notification.setDeliveryMethod(deliveryMethod);
         notification.setSubject(subject);
         notification.setText(text);
         notification.setAdditionalConfig(additionalConfig);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ParamsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ParamsEntity.java
index adbbeb7fd8..4983172d3e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ParamsEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/OAuth2ParamsEntity.java
@@ -39,6 +39,9 @@ public class OAuth2ParamsEntity extends BaseSqlEntity<OAuth2Params> {
     @Column(name = ModelConstants.OAUTH2_PARAMS_ENABLED_PROPERTY)
     private Boolean enabled;
 
+    @Column(name = ModelConstants.OAUTH2_PARAMS_EDGE_ENABLED_PROPERTY)
+    private Boolean edgeEnabled;
+
     @Column(name = ModelConstants.OAUTH2_PARAMS_TENANT_ID_PROPERTY)
     private UUID tenantId;
 
@@ -48,6 +51,7 @@ public class OAuth2ParamsEntity extends BaseSqlEntity<OAuth2Params> {
         }
         this.setCreatedTime(oauth2Params.getCreatedTime());
         this.enabled = oauth2Params.isEnabled();
+        this.edgeEnabled = oauth2Params.isEdgeEnabled();
         if (oauth2Params.getTenantId() != null) {
             this.tenantId = oauth2Params.getTenantId().getId();
         }
@@ -60,6 +64,7 @@ public class OAuth2ParamsEntity extends BaseSqlEntity<OAuth2Params> {
         oauth2Params.setCreatedTime(createdTime);
         oauth2Params.setTenantId(TenantId.fromUUID(tenantId));
         oauth2Params.setEnabled(enabled);
+        oauth2Params.setEdgeEnabled(edgeEnabled);
         return oauth2Params;
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/QueueStatsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/QueueStatsEntity.java
new file mode 100644
index 0000000000..5b9ec291a2
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/QueueStatsEntity.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model.sql;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.id.QueueStatsId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.queue.QueueStats;
+import org.thingsboard.server.dao.DaoUtil;
+import org.thingsboard.server.dao.model.BaseSqlEntity;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import java.util.UUID;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = ModelConstants.QUEUE_STATS_TABLE_NAME)
+public class QueueStatsEntity extends BaseSqlEntity<QueueStats> {
+
+    @Column(name = ModelConstants.QUEUE_STATS_TENANT_ID_PROPERTY)
+    private UUID tenantId;
+
+    @Column(name = ModelConstants.QUEUE_STATS_QUEUE_NAME_PROPERTY)
+    private String queueName;
+
+    @Column(name = ModelConstants.QUEUE_STATS_SERVICE_ID_PROPERTY)
+    private String serviceId;
+
+    public QueueStatsEntity() {
+    }
+
+    public QueueStatsEntity(QueueStats queueStats) {
+        if (queueStats.getId() != null) {
+            this.setId(queueStats.getId().getId());
+        }
+        this.setCreatedTime(queueStats.getCreatedTime());
+        this.tenantId = DaoUtil.getId(queueStats.getTenantId());
+        this.queueName = queueStats.getQueueName();
+        this.serviceId = queueStats.getServiceId();
+    }
+
+    @Override
+    public QueueStats toData() {
+        QueueStats queueStats = new QueueStats(new QueueStatsId(getUuid()));
+        queueStats.setCreatedTime(createdTime);
+        queueStats.setTenantId(new TenantId(tenantId));
+        queueStats.setQueueName(queueName);
+        queueStats.setServiceId(serviceId);
+        return queueStats;
+    }
+}
\ No newline at end of file
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationService.java
index b62d9a83ad..38a8cb4178 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationService.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.id.NotificationId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.Notification;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -57,29 +58,29 @@ public class DefaultNotificationService implements NotificationService, EntityDa
     }
 
     @Override
-    public int markAllNotificationsAsRead(TenantId tenantId, UserId recipientId) {
-        return notificationDao.updateStatusByRecipientId(tenantId, recipientId, NotificationStatus.READ);
+    public int markAllNotificationsAsRead(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId) {
+        return notificationDao.updateStatusByDeliveryMethodAndRecipientId(tenantId, deliveryMethod, recipientId, NotificationStatus.READ);
     }
 
     @Override
-    public PageData<Notification> findNotificationsByRecipientIdAndReadStatus(TenantId tenantId, UserId recipientId, boolean unreadOnly, PageLink pageLink) {
+    public PageData<Notification> findNotificationsByRecipientIdAndReadStatus(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, boolean unreadOnly, PageLink pageLink) {
         if (unreadOnly) {
-            return notificationDao.findUnreadByRecipientIdAndPageLink(tenantId, recipientId, pageLink);
+            return notificationDao.findUnreadByDeliveryMethodAndRecipientIdAndPageLink(tenantId, deliveryMethod, recipientId, pageLink);
         } else {
-            return notificationDao.findByRecipientIdAndPageLink(tenantId, recipientId, pageLink);
+            return notificationDao.findByDeliveryMethodAndRecipientIdAndPageLink(tenantId, deliveryMethod, recipientId, pageLink);
         }
     }
 
     @Override
-    public PageData<Notification> findLatestUnreadNotificationsByRecipientId(TenantId tenantId, UserId recipientId, int limit) {
+    public PageData<Notification> findLatestUnreadNotificationsByRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, int limit) {
         SortOrder sortOrder = new SortOrder(EntityKeyMapping.CREATED_TIME, SortOrder.Direction.DESC);
         PageLink pageLink = new PageLink(limit, 0, null, sortOrder);
-        return findNotificationsByRecipientIdAndReadStatus(tenantId, recipientId, true, pageLink);
+        return findNotificationsByRecipientIdAndReadStatus(tenantId, deliveryMethod, recipientId, true, pageLink);
     }
 
     @Override
-    public int countUnreadNotificationsByRecipientId(TenantId tenantId, UserId recipientId) {
-        return notificationDao.countUnreadByRecipientId(tenantId, recipientId);
+    public int countUnreadNotificationsByRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId) {
+        return notificationDao.countUnreadByDeliveryMethodAndRecipientId(tenantId, deliveryMethod, recipientId);
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java
index b719de0192..5b6f464ea6 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java
@@ -20,7 +20,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AdminSettings;
@@ -157,7 +156,7 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS
         return new UserNotificationSettings(prefs);
     }
 
-    @Transactional(propagation = Propagation.NOT_SUPPORTED) // so that parent transaction is not aborted on method failure
+    @Transactional
     @Override
     public void createDefaultNotificationConfigs(TenantId tenantId) {
         NotificationTarget allUsers = createTarget(tenantId, "All users", new AllUsersFilter(),
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTargetService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTargetService.java
index a92e4f6a4e..90f54a316a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTargetService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTargetService.java
@@ -42,6 +42,8 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.entity.EntityDaoService;
+import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
+import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.user.UserService;
 
 import java.util.List;
@@ -65,7 +67,10 @@ public class DefaultNotificationTargetService extends AbstractEntityService impl
     @Override
     public NotificationTarget saveNotificationTarget(TenantId tenantId, NotificationTarget notificationTarget) {
         try {
-            return notificationTargetDao.saveAndFlush(tenantId, notificationTarget);
+            NotificationTarget savedTarget = notificationTargetDao.saveAndFlush(tenantId, notificationTarget);
+            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId).entityId(savedTarget.getId())
+                    .created(notificationTarget.getId() == null).build());
+            return savedTarget;
         } catch (Exception e) {
             checkConstraintViolation(e, Map.of(
                     "uq_notification_target_name", "Recipients group with such name already exists"
@@ -158,19 +163,21 @@ public class DefaultNotificationTargetService extends AbstractEntityService impl
     @Override
     public PageData<User> findRecipientsForRuleNotificationTargetConfig(TenantId tenantId, PlatformUsersNotificationTargetConfig targetConfig, RuleOriginatedNotificationInfo info, PageLink pageLink) {
         switch (targetConfig.getUsersFilter().getType()) {
-            case ORIGINATOR_ENTITY_OWNER_USERS:
+            case ORIGINATOR_ENTITY_OWNER_USERS -> {
                 CustomerId customerId = info.getAffectedCustomerId();
                 if (customerId != null && !customerId.isNullUid()) {
                     return userService.findCustomerUsers(tenantId, customerId, pageLink);
                 } else {
                     return userService.findTenantAdmins(tenantId, pageLink);
                 }
-            case AFFECTED_USER:
+            }
+            case AFFECTED_USER -> {
                 UserId userId = info.getAffectedUserId();
                 if (userId != null) {
                     return new PageData<>(List.of(userService.findUserById(tenantId, userId)), 1, 1, false);
                 }
-            case AFFECTED_TENANT_ADMINISTRATORS:
+            }
+            case AFFECTED_TENANT_ADMINISTRATORS -> {
                 TenantId affectedTenantId = info.getAffectedTenantId();
                 if (affectedTenantId == null) {
                     affectedTenantId = tenantId;
@@ -178,9 +185,8 @@ public class DefaultNotificationTargetService extends AbstractEntityService impl
                 if (!affectedTenantId.isNullUid()) {
                     return userService.findTenantAdmins(affectedTenantId, pageLink);
                 }
-                break;
-            default:
-                throw new IllegalArgumentException("Recipient type not supported");
+            }
+            default -> throw new IllegalArgumentException("Recipient type not supported");
         }
         return new PageData<>();
     }
@@ -194,6 +200,7 @@ public class DefaultNotificationTargetService extends AbstractEntityService impl
             throw new IllegalArgumentException("Recipients group is being used in notification rule");
         }
         notificationTargetDao.removeById(tenantId, id.getId());
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(id).build());
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTemplateService.java b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTemplateService.java
index 17b166c3ec..58ec572b7f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTemplateService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationTemplateService.java
@@ -29,6 +29,8 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.entity.EntityDaoService;
+import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
+import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 
 import java.util.List;
 import java.util.Map;
@@ -55,7 +57,10 @@ public class DefaultNotificationTemplateService extends AbstractEntityService im
             }
         }
         try {
-            return notificationTemplateDao.saveAndFlush(tenantId, notificationTemplate);
+            NotificationTemplate savedTemplate = notificationTemplateDao.saveAndFlush(tenantId, notificationTemplate);
+            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId).entityId(savedTemplate.getId())
+                    .created(notificationTemplate.getId() == null).build());
+            return savedTemplate;
         } catch (Exception e) {
             checkConstraintViolation(e, Map.of(
                     "uq_notification_template_name", "Notification template with such name already exists"
@@ -82,6 +87,7 @@ public class DefaultNotificationTemplateService extends AbstractEntityService im
             ));
             throw e;
         }
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(id).build());
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationDao.java b/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationDao.java
index 02bfe11fde..2233840058 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/notification/NotificationDao.java
@@ -20,6 +20,7 @@ import org.thingsboard.server.common.data.id.NotificationRequestId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.Notification;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -27,19 +28,17 @@ import org.thingsboard.server.dao.Dao;
 
 public interface NotificationDao extends Dao<Notification> {
 
-    PageData<Notification> findUnreadByRecipientIdAndPageLink(TenantId tenantId, UserId recipientId, PageLink pageLink);
+    PageData<Notification> findUnreadByDeliveryMethodAndRecipientIdAndPageLink(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, PageLink pageLink);
 
-    PageData<Notification> findByRecipientIdAndPageLink(TenantId tenantId, UserId recipientId, PageLink pageLink);
+    PageData<Notification> findByDeliveryMethodAndRecipientIdAndPageLink(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, PageLink pageLink);
 
     boolean updateStatusByIdAndRecipientId(TenantId tenantId, UserId recipientId, NotificationId notificationId, NotificationStatus status);
 
-    int countUnreadByRecipientId(TenantId tenantId, UserId recipientId);
-
-    PageData<Notification> findByRequestId(TenantId tenantId, NotificationRequestId notificationRequestId, PageLink pageLink);
+    int countUnreadByDeliveryMethodAndRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId);
 
     boolean deleteByIdAndRecipientId(TenantId tenantId, UserId recipientId, NotificationId notificationId);
 
-    int updateStatusByRecipientId(TenantId tenantId, UserId recipientId, NotificationStatus status);
+    int updateStatusByDeliveryMethodAndRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, NotificationStatus status);
 
     void deleteByRequestId(TenantId tenantId, NotificationRequestId requestId);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/HybridClientRegistrationRepository.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/HybridClientRegistrationRepository.java
index 4c90583e19..004c89bd54 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/HybridClientRegistrationRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/HybridClientRegistrationRepository.java
@@ -52,7 +52,8 @@ public class HybridClientRegistrationRepository implements ClientRegistrationRep
                 .userInfoUri(registration.getUserInfoUri())
                 .userNameAttributeName(registration.getUserNameAttributeName())
                 .jwkSetUri(registration.getJwkSetUri())
-                .clientAuthenticationMethod(new ClientAuthenticationMethod(registration.getClientAuthenticationMethod()))
+                .clientAuthenticationMethod(registration.getClientAuthenticationMethod().equals("POST") ?
+                        ClientAuthenticationMethod.CLIENT_SECRET_POST : ClientAuthenticationMethod.CLIENT_SECRET_BASIC)
                 .redirectUri(defaultRedirectUriTemplate)
                 .build();
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ConfigTemplateServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ConfigTemplateServiceImpl.java
index ed456a93cf..8d0faaca92 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ConfigTemplateServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ConfigTemplateServiceImpl.java
@@ -64,14 +64,14 @@ public class OAuth2ConfigTemplateServiceImpl extends AbstractEntityService imple
     @Override
     public Optional<OAuth2ClientRegistrationTemplate> findClientRegistrationTemplateByProviderId(String providerId) {
         log.trace("Executing findClientRegistrationTemplateByProviderId [{}]", providerId);
-        validateString(providerId, INCORRECT_CLIENT_REGISTRATION_PROVIDER_ID + providerId);
+        validateString(providerId, id -> INCORRECT_CLIENT_REGISTRATION_PROVIDER_ID + id);
         return clientRegistrationTemplateDao.findByProviderId(providerId);
     }
 
     @Override
     public OAuth2ClientRegistrationTemplate findClientRegistrationTemplateById(OAuth2ClientRegistrationTemplateId templateId) {
         log.trace("Executing findClientRegistrationTemplateById [{}]", templateId);
-        validateId(templateId, INCORRECT_CLIENT_REGISTRATION_TEMPLATE_ID + templateId);
+        validateId(templateId, id -> INCORRECT_CLIENT_REGISTRATION_TEMPLATE_ID + id);
         return clientRegistrationTemplateDao.findById(TenantId.SYS_TENANT_ID, templateId.getId());
     }
 
@@ -84,7 +84,7 @@ public class OAuth2ConfigTemplateServiceImpl extends AbstractEntityService imple
     @Override
     public void deleteClientRegistrationTemplateById(OAuth2ClientRegistrationTemplateId templateId) {
         log.trace("Executing deleteClientRegistrationTemplateById [{}]", templateId);
-        validateId(templateId, INCORRECT_CLIENT_REGISTRATION_TEMPLATE_ID + templateId);
+        validateId(templateId, id -> INCORRECT_CLIENT_REGISTRATION_TEMPLATE_ID + id);
         clientRegistrationTemplateDao.removeById(TenantId.SYS_TENANT_ID, templateId.getId());
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
index 58be6a0770..6535b54a2c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
@@ -40,6 +40,7 @@ import org.thingsboard.server.common.data.oauth2.PlatformType;
 import org.thingsboard.server.common.data.oauth2.SchemeType;
 import org.thingsboard.server.common.data.oauth2.TenantNameStrategyType;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
+import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 
@@ -58,6 +59,7 @@ import static org.thingsboard.server.dao.service.Validator.validateString;
 @Slf4j
 @Service
 public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Service {
+
     public static final String INCORRECT_TENANT_ID = "Incorrect tenantId ";
     public static final String INCORRECT_CLIENT_REGISTRATION_ID = "Incorrect clientRegistrationId ";
     public static final String INCORRECT_DOMAIN_NAME = "Incorrect domainName ";
@@ -84,7 +86,7 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se
         } catch (IllegalArgumentException e){
             throw new IncorrectParameterException(INCORRECT_DOMAIN_SCHEME);
         }
-        validateString(domainName, INCORRECT_DOMAIN_NAME + domainName);
+        validateString(domainName, dn -> INCORRECT_DOMAIN_NAME + dn);
         return oauth2RegistrationDao.findEnabledByDomainSchemesDomainNameAndPkgNameAndPlatformType(
                 Arrays.asList(domainScheme, SchemeType.MIXED), domainName, pkgName, platformType)
                 .stream()
@@ -116,6 +118,7 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se
                 });
             }
         });
+        eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(TenantId.SYS_TENANT_ID).entity(oauth2Info).build());
     }
 
     @Override
@@ -123,7 +126,8 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se
         log.trace("Executing findOAuth2Info");
         OAuth2Info oauth2Info = new OAuth2Info();
         List<OAuth2Params> oauth2ParamsList = oauth2ParamsDao.find(TenantId.SYS_TENANT_ID);
-        oauth2Info.setEnabled(oauth2ParamsList.stream().anyMatch(param -> param.isEnabled()));
+        oauth2Info.setEnabled(oauth2ParamsList.stream().anyMatch(OAuth2Params::isEnabled));
+        oauth2Info.setEdgeEnabled(oauth2ParamsList.stream().anyMatch(OAuth2Params::isEdgeEnabled));
         List<OAuth2ParamsInfo> oauth2ParamsInfos = new ArrayList<>();
         oauth2Info.setOauth2ParamsInfos(oauth2ParamsInfos);
         oauth2ParamsList.stream().sorted(Comparator.comparing(BaseData::getUuidId)).forEach(oauth2Params -> {
@@ -138,14 +142,14 @@ public class OAuth2ServiceImpl extends AbstractEntityService implements OAuth2Se
     @Override
     public OAuth2Registration findRegistration(UUID id) {
         log.trace("Executing findRegistration [{}]", id);
-        validateId(id, INCORRECT_CLIENT_REGISTRATION_ID + id);
+        validateId(id, uuid -> INCORRECT_CLIENT_REGISTRATION_ID + uuid);
         return oauth2RegistrationDao.findById(null, id);
     }
 
     @Override
     public String findAppSecret(UUID id, String pkgName) {
         log.trace("Executing findAppSecret [{}][{}]", id, pkgName);
-        validateId(id, INCORRECT_CLIENT_REGISTRATION_ID + id);
+        validateId(id, uuid -> INCORRECT_CLIENT_REGISTRATION_ID + uuid);
         validateString(pkgName, "Incorrect package name");
         return oauth2RegistrationDao.findAppSecret(id, pkgName);
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Utils.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Utils.java
index 4e22ea858b..8d30fc905d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Utils.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Utils.java
@@ -88,6 +88,7 @@ public class OAuth2Utils {
     public static OAuth2Params infoToOAuth2Params(OAuth2Info oauth2Info) {
         OAuth2Params oauth2Params = new OAuth2Params();
         oauth2Params.setEnabled(oauth2Info.isEnabled());
+        oauth2Params.setEdgeEnabled(oauth2Info.isEdgeEnabled());
         oauth2Params.setTenantId(TenantId.SYS_TENANT_ID);
         return oauth2Params;
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java b/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java
index 53a585c358..b2fa1a3788 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/ota/BaseOtaPackageService.java
@@ -159,14 +159,14 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
     @Override
     public OtaPackage findOtaPackageById(TenantId tenantId, OtaPackageId otaPackageId) {
         log.trace("Executing findOtaPackageById [{}]", otaPackageId);
-        validateId(otaPackageId, INCORRECT_OTA_PACKAGE_ID + otaPackageId);
+        validateId(otaPackageId, id -> INCORRECT_OTA_PACKAGE_ID + id);
         return otaPackageDao.findById(tenantId, otaPackageId.getId());
     }
 
     @Override
     public OtaPackageInfo findOtaPackageInfoById(TenantId tenantId, OtaPackageId otaPackageId) {
         log.trace("Executing findOtaPackageInfoById [{}]", otaPackageId);
-        validateId(otaPackageId, INCORRECT_OTA_PACKAGE_ID + otaPackageId);
+        validateId(otaPackageId, id -> INCORRECT_OTA_PACKAGE_ID + id);
         return cache.getAndPutInTransaction(new OtaPackageCacheKey(otaPackageId),
                 () -> otaPackageInfoDao.findById(tenantId, otaPackageId.getId()), true);
     }
@@ -174,14 +174,14 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
     @Override
     public ListenableFuture<OtaPackageInfo> findOtaPackageInfoByIdAsync(TenantId tenantId, OtaPackageId otaPackageId) {
         log.trace("Executing findOtaPackageInfoByIdAsync [{}]", otaPackageId);
-        validateId(otaPackageId, INCORRECT_OTA_PACKAGE_ID + otaPackageId);
+        validateId(otaPackageId, id -> INCORRECT_OTA_PACKAGE_ID + id);
         return otaPackageInfoDao.findByIdAsync(tenantId, otaPackageId.getId());
     }
 
     @Override
     public PageData<OtaPackageInfo> findTenantOtaPackagesByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findTenantOtaPackagesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return otaPackageInfoDao.findOtaPackageInfoByTenantId(tenantId, pageLink);
     }
@@ -189,7 +189,7 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
     @Override
     public PageData<OtaPackageInfo> findTenantOtaPackagesByTenantIdAndDeviceProfileIdAndTypeAndHasData(TenantId tenantId, DeviceProfileId deviceProfileId, OtaPackageType otaPackageType, PageLink pageLink) {
         log.trace("Executing findTenantOtaPackagesByTenantIdAndHasData, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return otaPackageInfoDao.findOtaPackageInfoByTenantIdAndDeviceProfileIdAndTypeAndHasData(tenantId, deviceProfileId, otaPackageType, pageLink);
     }
@@ -197,7 +197,7 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
     @Override
     public void deleteOtaPackage(TenantId tenantId, OtaPackageId otaPackageId) {
         log.trace("Executing deleteOtaPackage [{}]", otaPackageId);
-        validateId(otaPackageId, INCORRECT_OTA_PACKAGE_ID + otaPackageId);
+        validateId(otaPackageId, id -> INCORRECT_OTA_PACKAGE_ID + id);
         try {
             otaPackageDao.removeById(tenantId, otaPackageId.getId());
             publishEvictEvent(new OtaPackageCacheEvictEvent(otaPackageId));
@@ -226,7 +226,7 @@ public class BaseOtaPackageService extends AbstractCachedEntityService<OtaPackag
     @Override
     public void deleteOtaPackagesByTenantId(TenantId tenantId) {
         log.trace("Executing deleteOtaPackagesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantOtaPackageRemover.removeEntities(tenantId, tenantId);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueStatsService.java b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueStatsService.java
new file mode 100644
index 0000000000..2274a782bb
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/BaseQueueStatsService.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.queue;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.HasId;
+import org.thingsboard.server.common.data.id.QueueStatsId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.queue.QueueStats;
+import org.thingsboard.server.dao.entity.AbstractEntityService;
+import org.thingsboard.server.dao.service.DataValidator;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.thingsboard.server.dao.service.Validator.validateId;
+
+@Service("QueueStatsDaoService")
+@Slf4j
+@RequiredArgsConstructor
+public class BaseQueueStatsService extends AbstractEntityService implements QueueStatsService {
+
+    public static final String INCORRECT_TENANT_ID = "Incorrect tenantId ";
+
+    private final QueueStatsDao queueStatsDao;
+
+    private final DataValidator<QueueStats> queueStatsValidator;
+
+    @Override
+    public QueueStats save(TenantId tenantId, QueueStats queueStats) {
+        log.trace("Executing save [{}]", queueStats);
+        queueStatsValidator.validate(queueStats, QueueStats::getTenantId);
+        return queueStatsDao.save(tenantId, queueStats);
+    }
+
+    @Override
+    public QueueStats findQueueStatsById(TenantId tenantId, QueueStatsId queueStatsId) {
+        log.trace("Executing findQueueStatsById [{}]", queueStatsId);
+        validateId(queueStatsId, id -> "Incorrect queueStatsId " + id);
+        return queueStatsDao.findById(tenantId, queueStatsId.getId());
+    }
+
+    @Override
+    public QueueStats findByTenantIdAndNameAndServiceId(TenantId tenantId, String queueName, String serviceId) {
+        log.trace("Executing findByTenantIdAndNameAndServiceId, tenantId: [{}], queueName: [{}], serviceId: [{}]", tenantId, queueName, serviceId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        return queueStatsDao.findByTenantIdQueueNameAndServiceId(tenantId, queueName, serviceId);
+    }
+
+    @Override
+    public List<QueueStats> findByTenantId(TenantId tenantId) {
+        log.trace("Executing findByTenantId, tenantId: [{}]", tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        return queueStatsDao.findByTenantId(tenantId);
+    }
+
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        log.trace("Executing deleteByTenantId, tenantId [{}]", tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        queueStatsDao.deleteByTenantId(tenantId);
+    }
+
+    @Override
+    public Optional<HasId<?>> findEntity(TenantId tenantId, EntityId entityId) {
+        return Optional.ofNullable(findQueueStatsById(tenantId, new QueueStatsId(entityId.getId())));
+    }
+
+    @Override
+    public EntityType getEntityType() {
+        return EntityType.QUEUE_STATS;
+    }
+}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/queue/QueueStatsDao.java b/dao/src/main/java/org/thingsboard/server/dao/queue/QueueStatsDao.java
new file mode 100644
index 0000000000..1c3db8bb54
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/queue/QueueStatsDao.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.queue;
+
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.queue.QueueStats;
+import org.thingsboard.server.dao.Dao;
+
+import java.util.List;
+
+public interface QueueStatsDao extends Dao<QueueStats> {
+
+    QueueStats findByTenantIdQueueNameAndServiceId(TenantId tenantId, String queueName, String serviceId);
+
+    List<QueueStats> findByTenantId(TenantId tenantId);
+
+    void deleteByTenantId(TenantId tenantId);
+
+}
\ No newline at end of file
diff --git a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
index 89cfff08d1..ec6af730ea 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
@@ -513,7 +513,7 @@ public class BaseRelationService implements RelationService {
     @Override
     public List<EntityRelation> findRuleNodeToRuleChainRelations(TenantId tenantId, RuleChainType ruleChainType, int limit) {
         log.trace("Executing findRuleNodeToRuleChainRelations, tenantId [{}], ruleChainType {} and limit {}", tenantId, ruleChainType, limit);
-        validateId(tenantId, "Invalid tenant id: " + tenantId);
+        validateId(tenantId, id -> "Invalid tenant id: " + id);
         return relationDao.findRuleNodeToRuleChainRelations(ruleChainType, limit);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
index ef05229124..953037a864 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
@@ -256,7 +256,7 @@ public class BaseImageService extends BaseResourceService implements ImageServic
         var tenantId = imageInfo.getTenantId();
         var imageId = imageInfo.getId();
         log.trace("Executing deleteImage [{}] [{}]", tenantId, imageId);
-        Validator.validateId(imageId, INCORRECT_RESOURCE_ID + imageId);
+        Validator.validateId(imageId, id -> INCORRECT_RESOURCE_ID + id);
         TbImageDeleteResult.TbImageDeleteResultBuilder result = TbImageDeleteResult.builder();
         boolean success = true;
         if (!force) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
index a5a692e3d4..37b030996f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
@@ -116,14 +116,14 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
     @Override
     public TbResource findResourceById(TenantId tenantId, TbResourceId resourceId) {
         log.trace("Executing findResourceById [{}] [{}]", tenantId, resourceId);
-        Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId);
+        Validator.validateId(resourceId, id -> INCORRECT_RESOURCE_ID + id);
         return resourceDao.findById(tenantId, resourceId.getId());
     }
 
     @Override
     public TbResourceInfo findResourceInfoById(TenantId tenantId, TbResourceId resourceId) {
         log.trace("Executing findResourceInfoById [{}] [{}]", tenantId, resourceId);
-        Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId);
+        Validator.validateId(resourceId, id -> INCORRECT_RESOURCE_ID + id);
 
         return cache.getAndPutInTransaction(new ResourceInfoCacheKey(tenantId, resourceId),
                 () -> resourceInfoDao.findById(tenantId, resourceId.getId()), true);
@@ -138,7 +138,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
     @Override
     public ListenableFuture<TbResourceInfo> findResourceInfoByIdAsync(TenantId tenantId, TbResourceId resourceId) {
         log.trace("Executing findResourceInfoById [{}] [{}]", tenantId, resourceId);
-        Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId);
+        Validator.validateId(resourceId, id -> INCORRECT_RESOURCE_ID + id);
         return resourceInfoDao.findByIdAsync(tenantId, resourceId.getId());
     }
 
@@ -150,7 +150,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
     @Override
     public void deleteResource(TenantId tenantId, TbResourceId resourceId, boolean force) {
         log.trace("Executing deleteResource [{}] [{}]", tenantId, resourceId);
-        Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId);
+        Validator.validateId(resourceId, id -> INCORRECT_RESOURCE_ID + id);
         if (!force) {
             resourceValidator.validateDelete(tenantId, resourceId);
         }
@@ -163,7 +163,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
     public PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink) {
         TenantId tenantId = filter.getTenantId();
         log.trace("Executing findAllTenantResourcesByTenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return resourceInfoDao.findAllTenantResourcesByTenantId(filter, pageLink);
     }
 
@@ -171,35 +171,35 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
     public PageData<TbResourceInfo> findTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink) {
         TenantId tenantId = filter.getTenantId();
         log.trace("Executing findTenantResourcesByTenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return resourceInfoDao.findTenantResourcesByTenantId(filter, pageLink);
     }
 
     @Override
     public List<TbResource> findTenantResourcesByResourceTypeAndObjectIds(TenantId tenantId, ResourceType resourceType, String[] objectIds) {
         log.trace("Executing findTenantResourcesByResourceTypeAndObjectIds [{}][{}][{}]", tenantId, resourceType, objectIds);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return resourceDao.findResourcesByTenantIdAndResourceType(tenantId, resourceType, objectIds, null);
     }
 
     @Override
     public PageData<TbResource> findAllTenantResources(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findAllTenantResources [{}][{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return resourceDao.findAllByTenantId(tenantId, pageLink);
     }
 
     @Override
     public PageData<TbResource> findTenantResourcesByResourceTypeAndPageLink(TenantId tenantId, ResourceType resourceType, PageLink pageLink) {
         log.trace("Executing findTenantResourcesByResourceTypeAndPageLink [{}][{}][{}]", tenantId, resourceType, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return resourceDao.findResourcesByTenantIdAndResourceType(tenantId, resourceType, pageLink);
     }
 
     @Override
     public void deleteResourcesByTenantId(TenantId tenantId) {
         log.trace("Executing deleteResourcesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantResourcesRemover.removeEntities(tenantId, tenantId);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java b/dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java
index 54d7a2170c..2b314e82df 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rpc/BaseRpcService.java
@@ -54,38 +54,38 @@ public class BaseRpcService implements RpcService {
     @Override
     public void deleteRpc(TenantId tenantId, RpcId rpcId) {
         log.trace("Executing deleteRpc, tenantId [{}], rpcId [{}]", tenantId, rpcId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(rpcId, INCORRECT_RPC_ID + rpcId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(rpcId, id -> INCORRECT_RPC_ID + id);
         rpcDao.removeById(tenantId, rpcId.getId());
     }
 
     @Override
     public void deleteAllRpcByTenantId(TenantId tenantId) {
         log.trace("Executing deleteAllRpcByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantRpcRemover.removeEntities(tenantId, tenantId);
     }
 
     @Override
     public Rpc findById(TenantId tenantId, RpcId rpcId) {
         log.trace("Executing findById, tenantId [{}], rpcId [{}]", tenantId, rpcId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(rpcId, INCORRECT_RPC_ID + rpcId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(rpcId, id -> INCORRECT_RPC_ID + id);
         return rpcDao.findById(tenantId, rpcId.getId());
     }
 
     @Override
     public ListenableFuture<Rpc> findRpcByIdAsync(TenantId tenantId, RpcId rpcId) {
         log.trace("Executing findRpcByIdAsync, tenantId [{}], rpcId: [{}]", tenantId, rpcId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(rpcId, INCORRECT_RPC_ID + rpcId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(rpcId, id -> INCORRECT_RPC_ID + id);
         return rpcDao.findByIdAsync(tenantId, rpcId.getId());
     }
 
     @Override
     public PageData<Rpc> findAllByDeviceIdAndStatus(TenantId tenantId, DeviceId deviceId, RpcStatus rpcStatus, PageLink pageLink) {
         log.trace("Executing findAllByDeviceIdAndStatus, tenantId [{}], deviceId [{}], rpcStatus [{}], pageLink [{}]", tenantId, deviceId, rpcStatus, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return rpcDao.findAllByDeviceIdAndStatus(tenantId, deviceId, rpcStatus, pageLink);
     }
@@ -93,7 +93,7 @@ public class BaseRpcService implements RpcService {
     @Override
     public PageData<Rpc> findAllByDeviceId(TenantId tenantId, DeviceId deviceId, PageLink pageLink) {
         log.trace("Executing findAllByDeviceIdAndStatus, tenantId [{}], deviceId [{}], pageLink [{}]", tenantId, deviceId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return rpcDao.findAllByDeviceId(tenantId, deviceId, pageLink);
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/rpc/RpcDao.java b/dao/src/main/java/org/thingsboard/server/dao/rpc/RpcDao.java
index 79b73c69aa..d2e867e763 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rpc/RpcDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rpc/RpcDao.java
@@ -30,5 +30,6 @@ public interface RpcDao extends Dao<Rpc> {
 
     PageData<Rpc> findAllRpcByTenantId(TenantId tenantId, PageLink pageLink);
 
-    Long deleteOutdatedRpcByTenantId(TenantId tenantId, Long expirationTime);
+    int deleteOutdatedRpcByTenantId(TenantId tenantId, Long expirationTime);
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
index 2857436fc8..8e1af4a531 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
@@ -119,7 +119,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     public RuleChain saveRuleChain(RuleChain ruleChain, boolean publishSaveEvent) {
         ruleChainValidator.validate(ruleChain, RuleChain::getTenantId);
         try {
-            RuleChain savedRuleChain = ruleChainDao.save(ruleChain.getTenantId(), ruleChain);
+            RuleChain savedRuleChain = ruleChainDao.saveAndFlush(ruleChain.getTenantId(), ruleChain);
             if (ruleChain.getId() == null) {
                 entityCountService.publishCountEntityEvictEvent(ruleChain.getTenantId(), EntityType.RULE_CHAIN);
             }
@@ -645,8 +645,8 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Override
     public PageData<RuleChain> findRuleChainsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) {
         log.trace("Executing findRuleChainsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
-        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
-        Validator.validateId(edgeId, "Incorrect edgeId " + edgeId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        Validator.validateId(edgeId, id -> "Incorrect edgeId " + id);
         Validator.validatePageLink(pageLink);
         return ruleChainDao.findRuleChainsByTenantIdAndEdgeId(tenantId.getId(), edgeId.getId(), pageLink);
     }
@@ -705,14 +705,14 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Override
     public PageData<RuleChain> findAutoAssignToEdgeRuleChainsByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findAutoAssignToEdgeRuleChainsByTenantId, tenantId [{}], pageLink {}", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return ruleChainDao.findAutoAssignToEdgeRuleChainsByTenantId(tenantId.getId(), pageLink);
     }
 
     @Override
     public List<RuleNode> findRuleNodesByTenantIdAndType(TenantId tenantId, String type, String search) {
         log.trace("Executing findRuleNodes, tenantId [{}], type {}, search {}", tenantId, type, search);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validateString(type, "Incorrect type of the rule node");
         validateString(search, "Incorrect search text");
         return ruleNodeDao.findRuleNodesByTenantIdAndType(tenantId, type, search);
@@ -721,7 +721,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Override
     public List<RuleNode> findRuleNodesByTenantIdAndType(TenantId tenantId, String type) {
         log.trace("Executing findRuleNodes, tenantId [{}], type {}", tenantId, type);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validateString(type, "Incorrect type of the rule node");
         return ruleNodeDao.findRuleNodesByTenantIdAndType(tenantId, type, "");
     }
@@ -755,7 +755,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Override
     public List<RuleNode> findAllRuleNodesByIds(List<RuleNodeId> ruleNodeIds) {
         log.trace("Executing findAllRuleNodesByIds, ruleNodeIds {}", ruleNodeIds);
-        validateIds(ruleNodeIds, "Incorrect ruleNodeIds " + ruleNodeIds);
+        validateIds(ruleNodeIds, ids -> "Incorrect ruleNodeIds " + ids);
         assert ruleNodeIds.size() <= 1024;
         return ruleNodeDao.findAllRuleNodeByIds(ruleNodeIds);
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/Validator.java b/dao/src/main/java/org/thingsboard/server/dao/service/Validator.java
index b3a121baf6..dab28e298b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/Validator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/Validator.java
@@ -38,9 +38,10 @@ public class Validator {
      * This method validate <code>EntityId</code> entity id. If entity id is invalid than throw
      * <code>IncorrectParameterException</code> exception
      *
-     * @param entityId          the entityId
-     * @param errorMessage the error message for exception
+     * @param entityId      the entityId
+     * @param errorMessage  the error message for exception
      */
+    @Deprecated
     public static void validateEntityId(EntityId entityId, String errorMessage) {
         if (entityId == null || entityId.getId() == null) {
             throw new IncorrectParameterException(errorMessage);
@@ -51,8 +52,8 @@ public class Validator {
      * This method validate <code>EntityId</code> entity id. If entity id is invalid than throw
      * <code>IncorrectParameterException</code> exception
      *
-     * @param entityId                  the entityId
-     * @param errorMessageFunction      the error message for exception that apply entityId
+     * @param entityId              the entityId
+     * @param errorMessageFunction  the error message function for exception that applies entityId
      */
     public static void validateEntityId(EntityId entityId, Function<EntityId, String> errorMessageFunction) {
         if (entityId == null || entityId.getId() == null) {
@@ -64,8 +65,8 @@ public class Validator {
      * This method validate <code>String</code> string. If string is invalid than throw
      * <code>IncorrectParameterException</code> exception
      *
-     * @param val          the val
-     * @param errorMessage the error message for exception
+     * @param val           the val
+     * @param errorMessage  the error message for exception
      */
     public static void validateString(String val, String errorMessage) {
         if (val == null || val.isEmpty()) {
@@ -73,12 +74,12 @@ public class Validator {
         }
     }
 
-    /*
+    /**
      * This method validate <code>String</code> string. If string is invalid than throw
      * <code>IncorrectParameterException</code> exception
      *
-     * @param val                       the value
-     * @param errorMessageFunction      the error message function that apply value
+     * @param val                   the value
+     * @param errorMessageFunction  the error message function that applies value
      */
     public static void validateString(String val, Function<String, String> errorMessageFunction) {
         if (val == null || val.isEmpty()) {
@@ -90,8 +91,8 @@ public class Validator {
      * This method validate <code>long</code> value. If value isn't positive than throw
      * <code>IncorrectParameterException</code> exception
      *
-     * @param val          the val
-     * @param errorMessage the error message for exception
+     * @param val           the val
+     * @param errorMessage  the error message for exception
      */
     public static void validatePositiveNumber(long val, String errorMessage) {
         if (val <= 0) {
@@ -103,36 +104,78 @@ public class Validator {
      * This method validate <code>UUID</code> id. If id is null than throw
      * <code>IncorrectParameterException</code> exception
      *
-     * @param id           the id
-     * @param errorMessage the error message for exception
+     * @param id            the id
+     * @param errorMessage  the error message for exception
      */
+    @Deprecated
     public static void validateId(UUID id, String errorMessage) {
         if (id == null) {
             throw new IncorrectParameterException(errorMessage);
         }
     }
 
+    /**
+     * This method validate <code>UUID</code> id. If id is null than throw
+     * <code>IncorrectParameterException</code> exception
+     *
+     * @param id                    the id
+     * @param errorMessageFunction  the error message function for exception that applies id
+     */
+    public static void validateId(UUID id, Function<UUID, String> errorMessageFunction) {
+        if (id == null) {
+            throw new IncorrectParameterException(errorMessageFunction.apply(id));
+        }
+    }
 
     /**
      * This method validate <code>UUIDBased</code> id. If id is null than throw
      * <code>IncorrectParameterException</code> exception
      *
-     * @param id           the id
-     * @param errorMessage the error message for exception
+     * @param id            the id
+     * @param errorMessage  the error message for exception
      */
+    @Deprecated
     public static void validateId(UUIDBased id, String errorMessage) {
         if (id == null || id.getId() == null) {
             throw new IncorrectParameterException(errorMessage);
         }
     }
 
+    /**
+     * This method validate <code>UUIDBased</code> id. If id is null than throw
+     * <code>IncorrectParameterException</code> exception
+     *
+     * @param id                    the id
+     * @param errorMessageFunction  the error message function for exception that applies id
+     */
+    public static void validateId(UUIDBased id, Function<UUIDBased, String> errorMessageFunction) {
+        if (id == null || id.getId() == null) {
+            throw new IncorrectParameterException(errorMessageFunction.apply(id));
+        }
+    }
+
+    /**
+     * This method validate <code>UUIDBased</code> id. If id is null than throw
+     * <code>IncorrectParameterException</code> exception
+     *
+     * @param id                    the id
+     * @param ids                   the list of ids
+     * @param errorMessageFunction  the error message function for exception that applies ids
+     */
+    static void validateId(UUIDBased id, List<? extends UUIDBased> ids, Function<List<? extends UUIDBased>, String> errorMessageFunction) {
+        if (id == null) {
+            throw new IncorrectParameterException(errorMessageFunction.apply(ids));
+        }
+    }
+
     /**
      * This method validate list of <code>UUIDBased</code> ids. If at least one of the ids is null than throw
      * <code>IncorrectParameterException</code> exception
      *
-     * @param ids          the list of ids
-     * @param errorMessage the error message for exception
+     * @param ids           the list of ids
+     * @param errorMessage  the error message for exception
      */
+    @Deprecated
     public static void validateIds(List<? extends UUIDBased> ids, String errorMessage) {
         if (ids == null || ids.isEmpty()) {
             throw new IncorrectParameterException(errorMessage);
@@ -143,11 +186,28 @@ public class Validator {
         }
     }
 
+    /**
+     * This method validate list of <code>UUIDBased</code> ids. If at least one of the ids is null than throw
+     * <code>IncorrectParameterException</code> exception
+     *
+     * @param ids                   the list of ids
+     * @param errorMessageFunction  the error message function for exception that applies ids
+     */
+    public static void validateIds(List<? extends UUIDBased> ids, Function<List<? extends UUIDBased>, String> errorMessageFunction) {
+        if (ids == null || ids.isEmpty()) {
+            throw new IncorrectParameterException(errorMessageFunction.apply(ids));
+        } else {
+            for (UUIDBased id : ids) {
+                validateId(id, ids, errorMessageFunction);
+            }
+        }
+    }
+
     /**
      * This method validate <code>PageLink</code> page link. If pageLink is invalid than throw
      * <code>IncorrectParameterException</code> exception
      *
-     * @param pageLink     the page link
+     * @param pageLink           the page link
      */
     public static void validatePageLink(PageLink pageLink) {
         if (pageLink == null) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/AssetDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/AssetDataValidator.java
index 5ef0b7a2ba..2d0cdbd248 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/AssetDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/AssetDataValidator.java
@@ -47,9 +47,7 @@ public class AssetDataValidator extends DataValidator<Asset> {
 
     @Override
     protected void validateCreate(TenantId tenantId, Asset asset) {
-        if (!BaseAssetService.TB_SERVICE_QUEUE.equals(asset.getType())) {
-            validateNumberOfEntitiesPerTenant(tenantId, EntityType.ASSET);
-        }
+        validateNumberOfEntitiesPerTenant(tenantId, EntityType.ASSET);
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/QueueStatsDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/QueueStatsDataValidator.java
new file mode 100644
index 0000000000..92134b98d5
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/QueueStatsDataValidator.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service.validator;
+
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.queue.QueueStats;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.service.DataValidator;
+
+@Component
+public class QueueStatsDataValidator extends DataValidator<QueueStats> {
+
+    @Override
+    protected void validateDataImpl(TenantId tenantId, QueueStats queueStats) {
+        if (queueStats.getTenantId() == null) {
+            throw new DataValidationException("Tenant id should be specified!.");
+        }
+        if (queueStats.getQueueName() == null) {
+            throw new DataValidationException("Queue name should be specified!.");
+        }
+        if (StringUtils.isEmpty(queueStats.getServiceId())) {
+            throw new DataValidationException("Service id should be specified!.");
+        }
+    }
+}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
index bfc99d1b54..13aaba8751 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
@@ -39,14 +39,14 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
     @Override
     public AdminSettings findAdminSettingsById(TenantId tenantId, AdminSettingsId adminSettingsId) {
         log.trace("Executing findAdminSettingsById [{}]", adminSettingsId);
-        Validator.validateId(adminSettingsId, "Incorrect adminSettingsId " + adminSettingsId);
+        Validator.validateId(adminSettingsId, id -> "Incorrect adminSettingsId " + id);
         return  adminSettingsDao.findById(tenantId, adminSettingsId.getId());
     }
 
     @Override
     public AdminSettings findAdminSettingsByKey(TenantId tenantId, String key) {
         log.trace("Executing findAdminSettingsByKey [{}]", key);
-        Validator.validateString(key, "Incorrect key " + key);
+        Validator.validateString(key, k -> "Incorrect key " + k);
         return findAdminSettingsByTenantIdAndKey(TenantId.SYS_TENANT_ID, key);
     }
 
@@ -82,7 +82,7 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
     @Override
     public boolean deleteAdminSettingsByTenantIdAndKey(TenantId tenantId, String key) {
         log.trace("Executing deleteAdminSettings, tenantId [{}], key [{}]", tenantId, key);
-        Validator.validateString(key, "Incorrect key " + key);
+        Validator.validateString(key, k -> "Incorrect key " + k);
         return adminSettingsDao.removeByTenantIdAndKey(tenantId.getId(), key);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
index f216da4445..83827973ba 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
@@ -333,6 +333,9 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
     @Query("SELECT a.id FROM AlarmEntity a WHERE a.tenantId = :tenantId AND a.assigneeId = :assigneeId")
     Page<UUID> findAlarmIdsByAssigneeId(@Param("tenantId") UUID tenantId, @Param("assigneeId") UUID assigneeId, Pageable pageable);
 
+    @Query("SELECT a.id FROM AlarmEntity a WHERE a.tenantId = :tenantId AND a.originatorId = :originatorId")
+    Page<UUID> findAlarmIdsByOriginatorId(@Param("tenantId") UUID tenantId, @Param("originatorId") UUID originatorId, Pageable pageable);
+
     @Query(value = "SELECT create_or_update_active_alarm(:t_id, :c_id, :a_id, :a_created_ts, :a_o_id, :a_o_type, :a_type, :a_severity, " +
             ":a_start_ts, :a_end_ts, :a_details, :a_propagate, :a_propagate_to_owner, " +
             ":a_propagate_to_tenant, :a_propagation_types, :a_creation_enabled)", nativeQuery = true)
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
index 9430773ff9..cbadbb4951 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
@@ -296,6 +296,12 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
                 .mapData(AlarmId::new);
     }
 
+    @Override
+    public PageData<AlarmId> findAlarmIdsByOriginatorId(TenantId tenantId, EntityId originatorId, PageLink pageLink) {
+        return DaoUtil.pageToPageData(alarmRepository.findAlarmIdsByOriginatorId(tenantId.getId(), originatorId.getId(), DaoUtil.toPageable(pageLink)))
+                .mapData(AlarmId::new);
+    }
+
     @Override
     public void createEntityAlarmRecord(EntityAlarm entityAlarm) {
         log.debug("Saving entity {}", entityAlarm);
@@ -383,7 +389,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
 
     @Override
     public PageData<EntitySubtype> findTenantAlarmTypes(UUID tenantId, PageLink pageLink) {
-        Page<String> page = alarmRepository.findTenantAlarmTypes(tenantId, Objects.toString(pageLink.getTextSearch(), ""), toPageable(pageLink));
+        Page<String> page = alarmRepository.findTenantAlarmTypes(tenantId, Objects.toString(pageLink.getTextSearch(), ""), toPageable(pageLink, false));
         if (page.isEmpty()) {
             return PageData.emptyPageData();
         }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java
index bbe212fb0b..f65e0db1c6 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java
@@ -189,7 +189,7 @@ public interface AssetRepository extends JpaRepository<AssetEntity, UUID>, Expor
                                                      @Param("searchText") String searchText,
                                                      Pageable pageable);
 
-    Long countByTenantIdAndTypeIsNot(UUID tenantId, String type);
+    Long countByTenantId(UUID tenantId);
 
     @Query("SELECT externalId FROM AssetEntity WHERE id = :id")
     UUID getExternalIdById(@Param("id") UUID id);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
index b77559be7b..0ef4370f30 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
@@ -43,7 +43,6 @@ import java.util.Optional;
 import java.util.UUID;
 
 import static org.thingsboard.server.dao.DaoUtil.convertTenantEntityInfosToDto;
-import static org.thingsboard.server.dao.asset.BaseAssetService.TB_SERVICE_QUEUE;
 
 /**
  * Created by Valerii Sosliuk on 5/19/2017.
@@ -244,7 +243,7 @@ public class JpaAssetDao extends JpaAbstractDao<AssetEntity, Asset> implements A
 
     @Override
     public Long countByTenantId(TenantId tenantId) {
-        return assetRepository.countByTenantIdAndTypeIsNot(tenantId.getId(), TB_SERVICE_QUEUE);
+        return assetRepository.countByTenantId(tenantId.getId());
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
index 67bde161b6..afd6608774 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
@@ -392,6 +392,11 @@ public class JpaBaseEventDao implements EventDao {
         return DaoUtil.convertDataList(getEventRepository(eventType).findLatestEvents(tenantId, entityId, limit));
     }
 
+    @Override
+    public Event findLatestDebugRuleNodeInEvent(UUID tenantId, UUID entityId) {
+        return DaoUtil.getData(ruleNodeDebugEventRepository.findLatestDebugRuleNodeInEvent(tenantId, entityId));
+    }
+
     @Override
     public void cleanupEvents(long regularEventExpTs, long debugEventExpTs, boolean cleanupDb) {
         if (regularEventExpTs > 0) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/RuleNodeDebugEventRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/RuleNodeDebugEventRepository.java
index 7c13c923c8..05473d92f7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/RuleNodeDebugEventRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/RuleNodeDebugEventRepository.java
@@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.event.RuleNodeDebugEvent;
 import org.thingsboard.server.dao.model.sql.RuleNodeDebugEventEntity;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 
@@ -35,6 +36,9 @@ public interface RuleNodeDebugEventRepository extends EventRepository<RuleNodeDe
     @Query(nativeQuery = true,  value = "SELECT * FROM rule_node_debug_event e WHERE e.tenant_id = :tenantId AND e.entity_id = :entityId ORDER BY e.ts DESC LIMIT :limit")
     List<RuleNodeDebugEventEntity> findLatestEvents(@Param("tenantId") UUID tenantId, @Param("entityId") UUID entityId, @Param("limit") int limit);
 
+    @Query(nativeQuery = true,  value = "SELECT * FROM rule_node_debug_event e WHERE e.tenant_id = :tenantId AND e.entity_id = :entityId AND e.e_type = 'IN' ORDER BY e.ts DESC LIMIT 1")
+    Optional<RuleNodeDebugEventEntity> findLatestDebugRuleNodeInEvent(@Param("tenantId") UUID tenantId, @Param("entityId") UUID entityId);
+
     @Override
     @Query("SELECT e FROM RuleNodeDebugEventEntity e WHERE " +
             "e.tenantId = :tenantId " +
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationDao.java
index f095aad1ae..64d663b397 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/JpaNotificationDao.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.id.NotificationRequestId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.Notification;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
@@ -51,14 +52,14 @@ public class JpaNotificationDao extends JpaPartitionedAbstractDao<NotificationEn
     private int partitionSizeInHours;
 
     @Override
-    public PageData<Notification> findUnreadByRecipientIdAndPageLink(TenantId tenantId, UserId recipientId, PageLink pageLink) {
-        return DaoUtil.toPageData(notificationRepository.findByRecipientIdAndStatusNot(recipientId.getId(), NotificationStatus.READ,
-                pageLink.getTextSearch(), DaoUtil.toPageable(pageLink)));
+    public PageData<Notification> findUnreadByDeliveryMethodAndRecipientIdAndPageLink(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, PageLink pageLink) {
+        return DaoUtil.toPageData(notificationRepository.findByDeliveryMethodAndRecipientIdAndStatusNot(deliveryMethod,
+                recipientId.getId(), NotificationStatus.READ, pageLink.getTextSearch(), DaoUtil.toPageable(pageLink)));
     }
 
     @Override
-    public PageData<Notification> findByRecipientIdAndPageLink(TenantId tenantId, UserId recipientId, PageLink pageLink) {
-        return DaoUtil.toPageData(notificationRepository.findByRecipientId(recipientId.getId(),
+    public PageData<Notification> findByDeliveryMethodAndRecipientIdAndPageLink(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, PageLink pageLink) {
+        return DaoUtil.toPageData(notificationRepository.findByDeliveryMethodAndRecipientId(deliveryMethod, recipientId.getId(),
                 pageLink.getTextSearch(), DaoUtil.toPageable(pageLink)));
     }
 
@@ -71,13 +72,8 @@ public class JpaNotificationDao extends JpaPartitionedAbstractDao<NotificationEn
      * For this hot method, the partial index `idx_notification_recipient_id_unread` was introduced since 3.6.0
      * */
     @Override
-    public int countUnreadByRecipientId(TenantId tenantId, UserId recipientId) {
-        return notificationRepository.countByRecipientIdAndStatusNot(recipientId.getId(), NotificationStatus.READ);
-    }
-
-    @Override
-    public PageData<Notification> findByRequestId(TenantId tenantId, NotificationRequestId notificationRequestId, PageLink pageLink) {
-        return DaoUtil.toPageData(notificationRepository.findByRequestId(notificationRequestId.getId(), DaoUtil.toPageable(pageLink)));
+    public int countUnreadByDeliveryMethodAndRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId) {
+        return notificationRepository.countByDeliveryMethodAndRecipientIdAndStatusNot(deliveryMethod, recipientId.getId(), NotificationStatus.READ);
     }
 
     @Override
@@ -86,8 +82,8 @@ public class JpaNotificationDao extends JpaPartitionedAbstractDao<NotificationEn
     }
 
     @Override
-    public int updateStatusByRecipientId(TenantId tenantId, UserId recipientId, NotificationStatus status) {
-        return notificationRepository.updateStatusByRecipientId(recipientId.getId(), status);
+    public int updateStatusByDeliveryMethodAndRecipientId(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId, NotificationStatus status) {
+        return notificationRepository.updateStatusByDeliveryMethodAndRecipientIdAndStatusNot(deliveryMethod, recipientId.getId(), status);
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRepository.java
index 4baa6071c7..dc432a566e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRepository.java
@@ -23,6 +23,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.NotificationStatus;
 import org.thingsboard.server.dao.model.sql.NotificationEntity;
 
@@ -31,20 +32,23 @@ import java.util.UUID;
 @Repository
 public interface NotificationRepository extends JpaRepository<NotificationEntity, UUID> {
 
-    @Query("SELECT n FROM NotificationEntity n WHERE n.recipientId = :recipientId AND n.status <> :status " +
+    @Query("SELECT n FROM NotificationEntity n WHERE n.deliveryMethod = :deliveryMethod " +
+            "AND n.recipientId = :recipientId AND n.status <> :status " +
             "AND (:searchText is NULL OR ilike(n.subject, concat('%', :searchText, '%')) = true " +
             "OR ilike(n.text, concat('%', :searchText, '%')) = true)")
-    Page<NotificationEntity> findByRecipientIdAndStatusNot(@Param("recipientId") UUID recipientId,
-                                                           @Param("status") NotificationStatus status,
-                                                           @Param("searchText") String searchText,
-                                                           Pageable pageable);
+    Page<NotificationEntity> findByDeliveryMethodAndRecipientIdAndStatusNot(@Param("deliveryMethod") NotificationDeliveryMethod deliveryMethod,
+                                                                            @Param("recipientId") UUID recipientId,
+                                                                            @Param("status") NotificationStatus status,
+                                                                            @Param("searchText") String searchText,
+                                                                            Pageable pageable);
 
-    @Query("SELECT n FROM NotificationEntity n WHERE n.recipientId = :recipientId " +
+    @Query("SELECT n FROM NotificationEntity n WHERE n.deliveryMethod = :deliveryMethod AND n.recipientId = :recipientId " +
             "AND (:searchText is NULL OR ilike(n.subject, concat('%', :searchText, '%')) = true " +
             "OR ilike(n.text, concat('%', :searchText, '%')) = true)")
-    Page<NotificationEntity> findByRecipientId(@Param("recipientId") UUID recipientId,
-                                               @Param("searchText") String searchText,
-                                               Pageable pageable);
+    Page<NotificationEntity> findByDeliveryMethodAndRecipientId(@Param("deliveryMethod") NotificationDeliveryMethod deliveryMethod,
+                                                                @Param("recipientId") UUID recipientId,
+                                                                @Param("searchText") String searchText,
+                                                                Pageable pageable);
 
     @Modifying
     @Transactional
@@ -54,9 +58,7 @@ public interface NotificationRepository extends JpaRepository<NotificationEntity
                                        @Param("recipientId") UUID recipientId,
                                        @Param("status") NotificationStatus status);
 
-    int countByRecipientIdAndStatusNot(UUID recipientId, NotificationStatus status);
-
-    Page<NotificationEntity> findByRequestId(UUID requestId, Pageable pageable);
+    int countByDeliveryMethodAndRecipientIdAndStatusNot(NotificationDeliveryMethod deliveryMethod, UUID recipientId, NotificationStatus status);
 
     @Transactional
     @Modifying
@@ -76,8 +78,9 @@ public interface NotificationRepository extends JpaRepository<NotificationEntity
     @Modifying
     @Transactional
     @Query("UPDATE NotificationEntity n SET n.status = :status " +
-            "WHERE n.recipientId = :recipientId AND n.status <> :status")
-    int updateStatusByRecipientId(@Param("recipientId") UUID recipientId,
-                                  @Param("status") NotificationStatus status);
+            "WHERE n.deliveryMethod = :deliveryMethod AND n.recipientId = :recipientId AND n.status <> :status")
+    int updateStatusByDeliveryMethodAndRecipientIdAndStatusNot(@Param("deliveryMethod") NotificationDeliveryMethod deliveryMethod,
+                                                               @Param("recipientId") UUID recipientId,
+                                                               @Param("status") NotificationStatus status);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java
index d2b2567bd7..896fde6644 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java
@@ -244,6 +244,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
         entityTableMap.put(EntityType.DEVICE_PROFILE, "device_profile");
         entityTableMap.put(EntityType.ASSET_PROFILE, "asset_profile");
         entityTableMap.put(EntityType.TENANT_PROFILE, "tenant_profile");
+        entityTableMap.put(EntityType.QUEUE_STATS, "queue_stats");
 
         entityNameColumns.put(EntityType.DEVICE, "name");
         entityNameColumns.put(EntityType.CUSTOMER, "title");
@@ -262,6 +263,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
         entityNameColumns.put(EntityType.TB_RESOURCE, "search_text");
         entityNameColumns.put(EntityType.EDGE, "name");
         entityNameColumns.put(EntityType.QUEUE, "name");
+        entityNameColumns.put(EntityType.QUEUE_STATS, "queue_name");
     }
 
     public static EntityType[] RELATION_QUERY_ENTITY_TYPES = new EntityType[]{
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java
index b21d3a8de5..df285657b3 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java
@@ -75,6 +75,8 @@ public class EntityKeyMapping {
     public static final String PHONE = "phone";
     public static final String ADDITIONAL_INFO = "additionalInfo";
     public static final String RELATED_PARENT_ID = "parentId";
+    public static final String QUEUE_NAME = "queueName";
+    public static final String SERVICE_ID = "serviceId";
 
     public static final List<String> typedEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, NAME, TYPE, ADDITIONAL_INFO);
     public static final List<String> widgetEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, NAME);
@@ -106,6 +108,7 @@ public class EntityKeyMapping {
         allowedEntityFieldMap.put(EntityType.API_USAGE_STATE, apiUsageStateEntityFields);
         allowedEntityFieldMap.put(EntityType.DEVICE_PROFILE, Set.of(CREATED_TIME, NAME, TYPE));
         allowedEntityFieldMap.put(EntityType.ASSET_PROFILE, Set.of(CREATED_TIME, NAME));
+        allowedEntityFieldMap.put(EntityType.QUEUE_STATS, new HashSet<>(Arrays.asList(CREATED_TIME, QUEUE_NAME, SERVICE_ID)));
 
         entityFieldColumnMap.put(CREATED_TIME, ModelConstants.CREATED_TIME_PROPERTY);
         entityFieldColumnMap.put(ENTITY_TYPE, ModelConstants.ENTITY_TYPE_PROPERTY);
@@ -126,6 +129,8 @@ public class EntityKeyMapping {
         entityFieldColumnMap.put(PHONE, ModelConstants.PHONE_PROPERTY);
         entityFieldColumnMap.put(ADDITIONAL_INFO, ModelConstants.ADDITIONAL_INFO_PROPERTY);
         entityFieldColumnMap.put(RELATED_PARENT_ID, "parent_id");
+        entityFieldColumnMap.put(QUEUE_NAME, ModelConstants.QUEUE_STATS_QUEUE_NAME_PROPERTY);
+        entityFieldColumnMap.put(SERVICE_ID, ModelConstants.QUEUE_STATS_SERVICE_ID_PROPERTY);
 
         Map<String, String> contactBasedAliases = new HashMap<>();
         contactBasedAliases.put(NAME, TITLE);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueStatsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueStatsDao.java
new file mode 100644
index 0000000000..ac57d54e90
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueStatsDao.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.sql.queue;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.queue.QueueStats;
+import org.thingsboard.server.dao.DaoUtil;
+import org.thingsboard.server.dao.model.sql.QueueStatsEntity;
+import org.thingsboard.server.dao.queue.QueueStatsDao;
+import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
+
+import java.util.List;
+import java.util.UUID;
+
+@Slf4j
+@Component
+@SqlDao
+public class JpaQueueStatsDao extends JpaAbstractDao<QueueStatsEntity, QueueStats> implements QueueStatsDao {
+
+    @Autowired
+    private QueueStatsRepository queueStatsRepository;
+
+    @Override
+    protected Class<QueueStatsEntity> getEntityClass() {
+        return QueueStatsEntity.class;
+    }
+
+    @Override
+    protected JpaRepository<QueueStatsEntity, UUID> getRepository() {
+        return queueStatsRepository;
+    }
+
+    @Override
+    public QueueStats findByTenantIdQueueNameAndServiceId(TenantId tenantId, String queueName, String serviceId) {
+        return DaoUtil.getData(queueStatsRepository.findByTenantIdAndQueueNameAndServiceId(tenantId.getId(), queueName, serviceId));
+    }
+
+    @Override
+    public List<QueueStats> findByTenantId(TenantId tenantId) {
+        return DaoUtil.convertDataList(queueStatsRepository.findByTenantId(tenantId.getId()));
+    }
+
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        queueStatsRepository.deleteByTenantId(tenantId.getId());
+    }
+
+}
\ No newline at end of file
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/queue/QueueStatsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/QueueStatsRepository.java
new file mode 100644
index 0000000000..65df3a65fa
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/queue/QueueStatsRepository.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.sql.queue;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.dao.model.sql.QueueStatsEntity;
+
+import java.util.List;
+import java.util.UUID;
+
+public interface QueueStatsRepository extends JpaRepository<QueueStatsEntity, UUID> {
+
+    QueueStatsEntity findByTenantIdAndQueueNameAndServiceId(UUID tenantId, String queueName, String serviceId);
+
+    List<QueueStatsEntity> findByTenantId(UUID tenantId);
+
+    @Transactional
+    @Modifying
+    @Query("DELETE FROM QueueStatsEntity t WHERE t.tenantId = :tenantId")
+    void deleteByTenantId(@Param("tenantId") UUID tenantId);
+
+}
\ No newline at end of file
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDao.java
index 2c16db4d34..e1939a595c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDao.java
@@ -19,6 +19,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -67,8 +68,9 @@ public class JpaRpcDao extends JpaAbstractDao<RpcEntity, Rpc> implements RpcDao
         return DaoUtil.toPageData(rpcRepository.findAllByTenantId(tenantId.getId(), DaoUtil.toPageable(pageLink)));
     }
 
+    @Transactional
     @Override
-    public Long deleteOutdatedRpcByTenantId(TenantId tenantId, Long expirationTime) {
+    public int deleteOutdatedRpcByTenantId(TenantId tenantId, Long expirationTime) {
         return rpcRepository.deleteOutdatedRpcByTenantId(tenantId.getId(), expirationTime);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rpc/RpcRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rpc/RpcRepository.java
index e04d000a65..fe7c95d249 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/rpc/RpcRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rpc/RpcRepository.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.sql.rpc;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.thingsboard.server.common.data.rpc.RpcStatus;
@@ -32,7 +33,8 @@ public interface RpcRepository extends JpaRepository<RpcEntity, UUID> {
 
     Page<RpcEntity> findAllByTenantId(UUID tenantId, Pageable pageable);
 
-    @Query(value = "WITH deleted AS (DELETE FROM rpc WHERE (tenant_id = :tenantId AND created_time < :expirationTime) IS TRUE RETURNING *) SELECT count(*) FROM deleted",
+    @Modifying
+    @Query(value = "DELETE FROM rpc WHERE tenant_id = :tenantId AND created_time < :expirationTime",
             nativeQuery = true)
-    Long deleteOutdatedRpcByTenantId(@Param("tenantId") UUID tenantId, @Param("expirationTime") Long expirationTime);
+    int deleteOutdatedRpcByTenantId(@Param("tenantId") UUID tenantId, @Param("expirationTime") Long expirationTime);
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/SqlTimeseriesLatestDao.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/SqlTimeseriesLatestDao.java
index a9fb85560a..425bb10a0e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/SqlTimeseriesLatestDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/SqlTimeseriesLatestDao.java
@@ -19,6 +19,8 @@ import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -50,8 +52,6 @@ import org.thingsboard.server.dao.sqlts.latest.TsKvLatestRepository;
 import org.thingsboard.server.dao.timeseries.TimeseriesLatestDao;
 import org.thingsboard.server.dao.util.SqlTsLatestAnyDao;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -163,11 +163,6 @@ public class SqlTimeseriesLatestDao extends BaseAbstractSqlTimeseriesDao impleme
         return service.submit(() -> getLatestTsKvEntry(entityId, key));
     }
 
-    @Override
-    public TsKvEntry findLatestSync(TenantId tenantId, EntityId entityId, String key) {
-        return getLatestTsKvEntry(entityId, key);
-    }
-
     @Override
     public ListenableFuture<List<TsKvEntry>> findAllLatest(TenantId tenantId, EntityId entityId) {
         return getFindAllLatestFuture(entityId);
@@ -209,7 +204,7 @@ public class SqlTimeseriesLatestDao extends BaseAbstractSqlTimeseriesDao impleme
                 ReadTsKvQueryResult::getData, MoreExecutors.directExecutor());
     }
 
-   protected TsKvEntry doFindLatest(EntityId entityId, String key) {
+    protected TsKvEntry doFindLatest(EntityId entityId, String key) {
         TsKvLatestCompositeKey compositeKey =
                 new TsKvLatestCompositeKey(
                         entityId.getId(),
diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java
index ac7fb90024..7a6f5cd8f8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java
@@ -51,6 +51,7 @@ import static org.thingsboard.server.dao.service.Validator.validateId;
 public class TenantProfileServiceImpl extends AbstractCachedEntityService<TenantProfileCacheKey, TenantProfile, TenantProfileEvictEvent> implements TenantProfileService {
 
     private static final String INCORRECT_TENANT_PROFILE_ID = "Incorrect tenantProfileId ";
+    public static final String INCORRECT_TENANT_ID = "Incorrect tenantId ";
 
     @Autowired
     private TenantProfileDao tenantProfileDao;
@@ -74,7 +75,7 @@ public class TenantProfileServiceImpl extends AbstractCachedEntityService<Tenant
     @Override
     public TenantProfile findTenantProfileById(TenantId tenantId, TenantProfileId tenantProfileId) {
         log.trace("Executing findTenantProfileById [{}]", tenantProfileId);
-        Validator.validateId(tenantProfileId, INCORRECT_TENANT_PROFILE_ID + tenantProfileId);
+        Validator.validateId(tenantProfileId, id -> INCORRECT_TENANT_PROFILE_ID + id);
         return cache.getAndPutInTransaction(TenantProfileCacheKey.fromId(tenantProfileId),
                 () -> tenantProfileDao.findById(tenantId, tenantProfileId.getId()), true);
     }
@@ -111,7 +112,8 @@ public class TenantProfileServiceImpl extends AbstractCachedEntityService<Tenant
     @Override
     public void deleteTenantProfile(TenantId tenantId, TenantProfileId tenantProfileId) {
         log.trace("Executing deleteTenantProfile [{}]", tenantProfileId);
-        validateId(tenantId, INCORRECT_TENANT_PROFILE_ID + tenantProfileId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(tenantProfileId, id -> INCORRECT_TENANT_PROFILE_ID + id);
         TenantProfile tenantProfile = tenantProfileDao.findById(tenantId, tenantProfileId.getId());
         if (tenantProfile != null && tenantProfile.isDefault()) {
             throw new DataValidationException("Deletion of Default Tenant Profile is prohibited!");
@@ -186,7 +188,8 @@ public class TenantProfileServiceImpl extends AbstractCachedEntityService<Tenant
     @Override
     public boolean setDefaultTenantProfile(TenantId tenantId, TenantProfileId tenantProfileId) {
         log.trace("Executing setDefaultTenantProfile [{}]", tenantProfileId);
-        validateId(tenantId, INCORRECT_TENANT_PROFILE_ID + tenantProfileId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(tenantProfileId, id -> INCORRECT_TENANT_PROFILE_ID + id);
         TenantProfile tenantProfile = tenantProfileDao.findById(tenantId, tenantProfileId.getId());
         if (!tenantProfile.isDefault()) {
             tenantProfile.setDefault(true);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
index 72db458d66..8b3e65c927 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
@@ -49,6 +49,7 @@ import org.thingsboard.server.dao.notification.NotificationTargetService;
 import org.thingsboard.server.dao.notification.NotificationTemplateService;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.queue.QueueService;
+import org.thingsboard.server.dao.queue.QueueStatsService;
 import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rpc.RpcService;
 import org.thingsboard.server.dao.rule.RuleChainService;
@@ -63,6 +64,7 @@ import org.thingsboard.server.dao.widget.WidgetsBundleService;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Consumer;
 
 import static org.thingsboard.server.dao.service.Validator.validateId;
 
@@ -131,6 +133,10 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
     @Autowired
     private QueueService queueService;
 
+    @Lazy
+    @Autowired
+    private QueueStatsService queueStatsService;
+
     @Autowired
     private AdminSettingsService adminSettingsService;
 
@@ -165,7 +171,7 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
     @Override
     public Tenant findTenantById(TenantId tenantId) {
         log.trace("Executing findTenantById [{}]", tenantId);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
 
         return cache.getAndPutInTransaction(tenantId, () -> tenantDao.findById(tenantId, tenantId.getId()), true);
     }
@@ -173,26 +179,26 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
     @Override
     public TenantInfo findTenantInfoById(TenantId tenantId) {
         log.trace("Executing findTenantInfoById [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return tenantDao.findTenantInfoById(tenantId, tenantId.getId());
     }
 
     @Override
     public ListenableFuture<Tenant> findTenantByIdAsync(TenantId callerId, TenantId tenantId) {
         log.trace("Executing findTenantByIdAsync [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return tenantDao.findByIdAsync(callerId, tenantId.getId());
     }
 
     @Override
     @Transactional
     public Tenant saveTenant(Tenant tenant) {
-        return saveTenant(tenant, true);
+        return saveTenant(tenant, null);
     }
 
     @Override
     @Transactional
-    public Tenant saveTenant(Tenant tenant, boolean publishSaveEvent) {
+    public Tenant saveTenant(Tenant tenant, Consumer<TenantId> defaultEntitiesCreator) {
         log.trace("Executing saveTenant [{}]", tenant);
         tenant.setRegion(DEFAULT_TENANT_REGION);
         if (tenant.getTenantProfileId() == null) {
@@ -201,20 +207,20 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
         }
         tenantValidator.validate(tenant, Tenant::getId);
         boolean create = tenant.getId() == null;
+
         Tenant savedTenant = tenantDao.save(tenant.getId(), tenant);
-        publishEvictEvent(new TenantEvictEvent(savedTenant.getId(), create));
-        if (publishSaveEvent) {
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedTenant.getId())
-                    .entityId(savedTenant.getId()).entity(savedTenant).created(create).build());
-        }
-        if (tenant.getId() == null) {
-            deviceProfileService.createDefaultDeviceProfile(savedTenant.getId());
-            assetProfileService.createDefaultAssetProfile(savedTenant.getId());
-            apiUsageStateService.createDefaultApiUsageState(savedTenant.getId(), null);
-            try {
-                notificationSettingsService.createDefaultNotificationConfigs(savedTenant.getId());
-            } catch (Throwable e) {
-                log.error("Failed to create default notification configs for tenant {}", savedTenant.getId(), e);
+        TenantId tenantId = savedTenant.getId();
+        publishEvictEvent(new TenantEvictEvent(tenantId, create));
+        eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId)
+                .entityId(tenantId).entity(savedTenant).created(create).build());
+
+        if (create) {
+            deviceProfileService.createDefaultDeviceProfile(tenantId);
+            assetProfileService.createDefaultAssetProfile(tenantId);
+            apiUsageStateService.createDefaultApiUsageState(tenantId, null);
+            notificationSettingsService.createDefaultNotificationConfigs(tenantId);
+            if (defaultEntitiesCreator != null) {
+                defaultEntitiesCreator.accept(tenantId);
             }
         }
         return savedTenant;
@@ -229,7 +235,7 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
     public void deleteTenant(TenantId tenantId) {
         log.trace("Executing deleteTenant [{}]", tenantId);
         Tenant tenant = findTenantById(tenantId);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         entityViewService.deleteEntityViewsByTenantId(tenantId);
         widgetsBundleService.deleteWidgetsBundlesByTenantId(tenantId);
         widgetTypeService.deleteWidgetTypesByTenantId(tenantId);
@@ -259,6 +265,7 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
                 .entity(tenant).entityId(tenantId).build());
         relationService.deleteEntityRelations(tenantId, tenantId);
         alarmService.deleteEntityAlarmRecordsByTenantId(tenantId);
+        queueStatsService.deleteByTenantId(tenantId);
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
index cfba6786f3..60056b2b8f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
@@ -134,17 +134,6 @@ public class BaseTimeseriesService implements TimeseriesService {
         return Futures.allAsList(futures);
     }
 
-    @Override
-    public List<TsKvEntry> findLatestSync(TenantId tenantId, EntityId entityId, Collection<String> keys) {
-        validate(entityId);
-        List<TsKvEntry> latestEntries = new ArrayList<>(keys.size());
-        keys.forEach(key -> Validator.validateString(key, k -> "Incorrect key " + k));
-        for (String key : keys) {
-            latestEntries.add(timeseriesLatestDao.findLatestSync(tenantId, entityId, key));
-        }
-        return latestEntries;
-    }
-
     @Override
     public ListenableFuture<List<TsKvEntry>> findAllLatest(TenantId tenantId, EntityId entityId) {
         validate(entityId);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesLatestDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesLatestDao.java
index 342d4d9771..7a5904eb6b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesLatestDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesLatestDao.java
@@ -44,7 +44,6 @@ import org.thingsboard.server.dao.util.NoSqlTsLatestDao;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.ExecutionException;
 
 import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
 
@@ -70,16 +69,6 @@ public class CassandraBaseTimeseriesLatestDao extends AbstractCassandraBaseTimes
         return findLatest(tenantId, entityId, key, rs -> convertResultToTsKvEntry(key, rs.one()));
     }
 
-    @Override
-    public TsKvEntry findLatestSync(TenantId tenantId, EntityId entityId, String key) {
-        try {
-            return findLatest(tenantId, entityId, key, rs -> convertResultToTsKvEntry(key, rs.one())).get();
-        } catch (InterruptedException | ExecutionException e) {
-            log.error("[{}][{}] Failed to get latest entry for key: {} due to: ", tenantId, entityId, key, e);
-            throw new RuntimeException(e);
-        }
-    }
-
     private <T> ListenableFuture<T> findLatest(TenantId tenantId, EntityId entityId, String key, java.util.function.Function<TbResultSet, T> function) {
         BoundStatementBuilder stmtBuilder = new BoundStatementBuilder(getFindLatestStmt().bind());
         stmtBuilder.setString(0, entityId.getEntityType().name());
diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesLatestDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesLatestDao.java
index aad4074f85..d339f49e11 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesLatestDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesLatestDao.java
@@ -40,8 +40,6 @@ public interface TimeseriesLatestDao {
      */
     ListenableFuture<TsKvEntry> findLatest(TenantId tenantId, EntityId entityId, String key);
 
-    TsKvEntry findLatestSync(TenantId tenantId, EntityId entityId, String key);
-
     ListenableFuture<List<TsKvEntry>> findAllLatest(TenantId tenantId, EntityId entityId);
 
     ListenableFuture<Void> saveLatest(TenantId tenantId, EntityId entityId, TsKvEntry tsKvEntry);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java
index f4f24346d5..52195cf8db 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/usagerecord/ApiUsageStateServiceImpl.java
@@ -72,14 +72,14 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
     @Override
     public void deleteApiUsageStateByTenantId(TenantId tenantId) {
         log.trace("Executing deleteUsageRecordsByTenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         apiUsageStateDao.deleteApiUsageStateByTenantId(tenantId);
     }
 
     @Override
     public void deleteApiUsageStateByEntityId(EntityId entityId) {
         log.trace("Executing deleteApiUsageStateByEntityId [{}]", entityId);
-        validateId(entityId.getId(), "Invalid entity id");
+        validateId(entityId.getId(), id -> "Invalid entity id " + id);
         apiUsageStateDao.deleteApiUsageStateByEntityId(entityId);
     }
 
@@ -87,7 +87,7 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
     public ApiUsageState createDefaultApiUsageState(TenantId tenantId, EntityId entityId) {
         entityId = Objects.requireNonNullElse(entityId, tenantId);
         log.trace("Executing createDefaultUsageRecord [{}]", entityId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         ApiUsageState apiUsageState = new ApiUsageState();
         apiUsageState.setTenantId(tenantId);
         apiUsageState.setEntityId(entityId);
@@ -142,7 +142,7 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
     @Override
     public ApiUsageState update(ApiUsageState apiUsageState) {
         log.trace("Executing save [{}]", apiUsageState.getTenantId());
-        validateId(apiUsageState.getTenantId(), INCORRECT_TENANT_ID + apiUsageState.getTenantId());
+        validateId(apiUsageState.getTenantId(), id -> INCORRECT_TENANT_ID + id);
         validateId(apiUsageState.getId(), "Can't save new usage state. Only update is allowed!");
         ApiUsageState savedState = apiUsageStateDao.save(apiUsageState.getTenantId(), apiUsageState);
         eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedState.getTenantId()).entityId(savedState.getId())
@@ -153,21 +153,21 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
     @Override
     public ApiUsageState findTenantApiUsageState(TenantId tenantId) {
         log.trace("Executing findTenantUsageRecord, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         return apiUsageStateDao.findTenantApiUsageState(tenantId.getId());
     }
 
     @Override
     public ApiUsageState findApiUsageStateByEntityId(EntityId entityId) {
-        validateId(entityId.getId(), "Invalid entity id");
+        validateId(entityId.getId(), id -> "Invalid entity id " + id);
         return apiUsageStateDao.findApiUsageStateByEntityId(entityId);
     }
 
     @Override
     public ApiUsageState findApiUsageStateById(TenantId tenantId, ApiUsageStateId id) {
         log.trace("Executing findApiUsageStateById, tenantId [{}], apiUsageStateId [{}]", tenantId, id);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(id, "Incorrect apiUsageStateId " + id);
+        validateId(tenantId, t -> INCORRECT_TENANT_ID + t);
+        validateId(id, u -> "Incorrect apiUsageStateId " + u);
         return apiUsageStateDao.findById(tenantId, id.getId());
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
index e989b02caa..4b804353ad 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
@@ -100,7 +100,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
     @Override
     public User findUserByEmail(TenantId tenantId, String email) {
         log.trace("Executing findUserByEmail [{}]", email);
-        validateString(email, "Incorrect email " + email);
+        validateString(email, e -> "Incorrect email " + e);
         if (userLoginCaseSensitive) {
             return userDao.findByEmail(tenantId, email);
         } else {
@@ -111,22 +111,22 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
     @Override
     public User findUserByTenantIdAndEmail(TenantId tenantId, String email) {
         log.trace("Executing findUserByTenantIdAndEmail [{}][{}]", tenantId, email);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateString(email, "Incorrect email " + email);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateString(email, e -> "Incorrect email " + e);
         return userDao.findByTenantIdAndEmail(tenantId, email);
     }
 
     @Override
     public User findUserById(TenantId tenantId, UserId userId) {
         log.trace("Executing findUserById [{}]", userId);
-        validateId(userId, INCORRECT_USER_ID + userId);
+        validateId(userId, id -> INCORRECT_USER_ID + id);
         return userDao.findById(tenantId, userId.getId());
     }
 
     @Override
     public ListenableFuture<User> findUserByIdAsync(TenantId tenantId, UserId userId) {
         log.trace("Executing findUserByIdAsync [{}]", userId);
-        validateId(userId, INCORRECT_USER_ID + userId);
+        validateId(userId, id -> INCORRECT_USER_ID + id);
         return userDao.findByIdAsync(tenantId, userId.getId());
     }
 
@@ -159,21 +159,21 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
     @Override
     public UserCredentials findUserCredentialsByUserId(TenantId tenantId, UserId userId) {
         log.trace("Executing findUserCredentialsByUserId [{}]", userId);
-        validateId(userId, INCORRECT_USER_ID + userId);
+        validateId(userId, id -> INCORRECT_USER_ID + id);
         return userCredentialsDao.findByUserId(tenantId, userId.getId());
     }
 
     @Override
     public UserCredentials findUserCredentialsByActivateToken(TenantId tenantId, String activateToken) {
         log.trace("Executing findUserCredentialsByActivateToken [{}]", activateToken);
-        validateString(activateToken, "Incorrect activateToken " + activateToken);
+        validateString(activateToken, t -> "Incorrect activateToken " + t);
         return userCredentialsDao.findByActivateToken(tenantId, activateToken);
     }
 
     @Override
     public UserCredentials findUserCredentialsByResetToken(TenantId tenantId, String resetToken) {
         log.trace("Executing findUserCredentialsByResetToken [{}]", resetToken);
-        validateString(resetToken, "Incorrect resetToken " + resetToken);
+        validateString(resetToken, t -> "Incorrect resetToken " + t);
         return userCredentialsDao.findByResetToken(tenantId, resetToken);
     }
 
@@ -192,8 +192,8 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
     @Override
     public UserCredentials activateUserCredentials(TenantId tenantId, String activateToken, String password) {
         log.trace("Executing activateUserCredentials activateToken [{}], password [{}]", activateToken, password);
-        validateString(activateToken, "Incorrect activateToken " + activateToken);
-        validateString(password, "Incorrect password " + password);
+        validateString(activateToken, t -> "Incorrect activateToken " + t);
+        validateString(password, p -> "Incorrect password " + p);
         UserCredentials userCredentials = userCredentialsDao.findByActivateToken(tenantId, activateToken);
         if (userCredentials == null) {
             throw new IncorrectParameterException(String.format("Unable to find user credentials by activateToken [%s]", activateToken));
@@ -259,7 +259,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         Objects.requireNonNull(user, "User is null");
         UserId userId = user.getId();
         log.trace("[{}] Executing deleteUser [{}]", tenantId, userId);
-        validateId(userId, INCORRECT_USER_ID + userId);
+        validateId(userId, id -> INCORRECT_USER_ID + id);
         userCredentialsDao.removeByUserId(tenantId, userId);
         userAuthSettingsDao.removeByUserId(userId);
         deleteEntityRelations(tenantId, userId);
@@ -276,7 +276,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
     @Override
     public PageData<User> findUsersByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findUsersByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return userDao.findByTenantId(tenantId.getId(), pageLink);
     }
@@ -284,7 +284,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
     @Override
     public PageData<User> findTenantAdmins(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findTenantAdmins, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
         return userDao.findTenantAdmins(tenantId.getId(), pageLink);
     }
@@ -317,15 +317,15 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
     @Override
     public void deleteTenantAdmins(TenantId tenantId) {
         log.trace("Executing deleteTenantAdmins, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantAdminsRemover.removeEntities(tenantId, tenantId);
     }
 
     @Override
     public PageData<User> findCustomerUsers(TenantId tenantId, CustomerId customerId, PageLink pageLink) {
         log.trace("Executing findCustomerUsers, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, "Incorrect customerId " + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> "Incorrect customerId " + id);
         validatePageLink(pageLink);
         return userDao.findCustomerUsers(tenantId.getId(), customerId.getId(), pageLink);
     }
@@ -333,24 +333,24 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
     @Override
     public PageData<User> findUsersByCustomerIds(TenantId tenantId, List<CustomerId> customerIds, PageLink pageLink) {
         log.trace("Executing findTenantAndCustomerUsers, tenantId [{}], customerIds [{}], pageLink [{}]", tenantId, customerIds, pageLink);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         validatePageLink(pageLink);
-        customerIds.forEach(customerId -> {validateId(customerId, "Incorrect customerId " + customerId);});
+        customerIds.forEach(customerId -> validateId(customerId, id -> "Incorrect customerId " + id));
         return userDao.findUsersByCustomerIds(tenantId.getId(), customerIds, pageLink);
     }
 
     @Override
     public void deleteCustomerUsers(TenantId tenantId, CustomerId customerId) {
         log.trace("Executing deleteCustomerUsers, customerId [{}]", customerId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateId(customerId, "Incorrect customerId " + customerId);
+        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        validateId(customerId, id -> "Incorrect customerId " + id);
         customerUsersRemover.removeEntities(tenantId, customerId);
     }
 
     @Override
     public void setUserCredentialsEnabled(TenantId tenantId, UserId userId, boolean enabled) {
         log.trace("Executing setUserCredentialsEnabled [{}], [{}]", userId, enabled);
-        validateId(userId, INCORRECT_USER_ID + userId);
+        validateId(userId, id -> INCORRECT_USER_ID + id);
         UserCredentials userCredentials = userCredentialsDao.findByUserId(tenantId, userId.getId());
         userCredentials.setEnabled(enabled);
         saveUserCredentials(tenantId, userCredentials);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsServiceImpl.java
index adc1ce3a9a..9ed18eac38 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsServiceImpl.java
@@ -48,14 +48,14 @@ public class UserSettingsServiceImpl extends AbstractCachedService<UserSettingsC
     @Override
     public UserSettings saveUserSettings(TenantId tenantId, UserSettings userSettings) {
         log.trace("Executing saveUserSettings for user [{}], [{}]", userSettings.getUserId(), userSettings);
-        validateId(userSettings.getUserId(), INCORRECT_USER_ID + userSettings.getUserId());
+        validateId(userSettings.getUserId(), id -> INCORRECT_USER_ID + id);
         return doSaveUserSettings(tenantId, userSettings);
     }
 
     @Override
     public void updateUserSettings(TenantId tenantId, UserId userId, UserSettingsType type, JsonNode settings) {
         log.trace("Executing updateUserSettings for user [{}], [{}]", userId, settings);
-        validateId(userId, INCORRECT_USER_ID + userId);
+        validateId(userId, id -> INCORRECT_USER_ID + id);
 
         var key = new UserSettingsCompositeKey(userId.getId(), type.name());
         UserSettings oldSettings = userSettingsDao.findById(tenantId, key);
@@ -71,7 +71,7 @@ public class UserSettingsServiceImpl extends AbstractCachedService<UserSettingsC
     @Override
     public UserSettings findUserSettings(TenantId tenantId, UserId userId, UserSettingsType type) {
         log.trace("Executing findUserSettings for user [{}]", userId);
-        validateId(userId, INCORRECT_USER_ID + userId);
+        validateId(userId, id -> INCORRECT_USER_ID + id);
 
         var key = new UserSettingsCompositeKey(userId.getId(), type.name());
         return cache.getAndPutInTransaction(key,
@@ -81,7 +81,7 @@ public class UserSettingsServiceImpl extends AbstractCachedService<UserSettingsC
     @Override
     public void deleteUserSettings(TenantId tenantId, UserId userId, UserSettingsType type, List<String> jsonPaths) {
         log.trace("Executing deleteUserSettings for user [{}]", userId);
-        validateId(userId, INCORRECT_USER_ID + userId);
+        validateId(userId, id -> INCORRECT_USER_ID + id);
         var key = new UserSettingsCompositeKey(userId.getId(), type.name());
         UserSettings userSettings = userSettingsDao.findById(tenantId, key);
         if (userSettings == null) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java
index 7f7d4d5ae8..5321e4ba1c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java
@@ -71,21 +71,21 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
     @Override
     public WidgetType findWidgetTypeById(TenantId tenantId, WidgetTypeId widgetTypeId) {
         log.trace("Executing findWidgetTypeById [{}]", widgetTypeId);
-        Validator.validateId(widgetTypeId, "Incorrect widgetTypeId " + widgetTypeId);
+        Validator.validateId(widgetTypeId, id -> "Incorrect widgetTypeId " + id);
         return widgetTypeDao.findWidgetTypeById(tenantId, widgetTypeId.getId());
     }
 
     @Override
     public WidgetTypeDetails findWidgetTypeDetailsById(TenantId tenantId, WidgetTypeId widgetTypeId) {
         log.trace("Executing findWidgetTypeDetailsById [{}]", widgetTypeId);
-        Validator.validateId(widgetTypeId, "Incorrect widgetTypeId " + widgetTypeId);
+        Validator.validateId(widgetTypeId, id -> "Incorrect widgetTypeId " + id);
         return widgetTypeDao.findById(tenantId, widgetTypeId.getId());
     }
 
     @Override
     public boolean widgetTypeExistsByTenantIdAndWidgetTypeId(TenantId tenantId, WidgetTypeId widgetTypeId) {
         log.trace("Executing widgetTypeExistsByTenantIdAndWidgetTypeId, tenantId [{}],  widgetTypeId [{}]", tenantId, widgetTypeId);
-        Validator.validateId(widgetTypeId, "Incorrect widgetTypeId " + widgetTypeId);
+        Validator.validateId(widgetTypeId, id -> "Incorrect widgetTypeId " + id);
         return widgetTypeDao.existsByTenantIdAndId(tenantId, widgetTypeId.getId());
     }
 
@@ -110,7 +110,7 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
     @Override
     public void deleteWidgetType(TenantId tenantId, WidgetTypeId widgetTypeId) {
         log.trace("Executing deleteWidgetType [{}]", widgetTypeId);
-        Validator.validateId(widgetTypeId, "Incorrect widgetTypeId " + widgetTypeId);
+        Validator.validateId(widgetTypeId, id -> "Incorrect widgetTypeId " + id);
         widgetTypeDao.removeById(tenantId, widgetTypeId.getId());
         eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(widgetTypeId).build());
     }
@@ -126,7 +126,7 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
     public PageData<WidgetTypeInfo> findAllTenantWidgetTypesByTenantIdAndPageLink(TenantId tenantId, boolean fullSearch, DeprecatedFilter deprecatedFilter, List<String> widgetTypes, PageLink pageLink) {
         log.trace("Executing findAllTenantWidgetTypesByTenantIdAndPageLink, tenantId [{}], fullSearch [{}], deprecatedFilter [{}], widgetTypes [{}], pageLink [{}]",
                 tenantId, fullSearch, deprecatedFilter, widgetTypes, pageLink);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         Validator.validatePageLink(pageLink);
         return widgetTypeDao.findAllTenantWidgetTypesByTenantId(tenantId.getId(), fullSearch, deprecatedFilter, widgetTypes, pageLink);
     }
@@ -135,7 +135,7 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
     public PageData<WidgetTypeInfo> findTenantWidgetTypesByTenantIdAndPageLink(TenantId tenantId, boolean fullSearch, DeprecatedFilter deprecatedFilter, List<String> widgetTypes, PageLink pageLink) {
         log.trace("Executing findTenantWidgetTypesByTenantIdAndPageLink, tenantId [{}], fullSearch [{}], deprecatedFilter [{}], widgetTypes [{}], pageLink [{}]",
                 tenantId, fullSearch, deprecatedFilter, widgetTypes, pageLink);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         Validator.validatePageLink(pageLink);
         return widgetTypeDao.findTenantWidgetTypesByTenantId(tenantId.getId(), fullSearch, deprecatedFilter, widgetTypes, pageLink);
     }
@@ -143,16 +143,16 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
     @Override
     public List<WidgetType> findWidgetTypesByWidgetsBundleId(TenantId tenantId, WidgetsBundleId widgetsBundleId) {
         log.trace("Executing findWidgetTypesByWidgetsBundleId, tenantId [{}], widgetsBundleId [{}]", tenantId, widgetsBundleId);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        Validator.validateId(widgetsBundleId, INCORRECT_WIDGETS_BUNDLE_ID + widgetsBundleId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        Validator.validateId(widgetsBundleId, id -> INCORRECT_WIDGETS_BUNDLE_ID + id);
         return widgetTypeDao.findWidgetTypesByWidgetsBundleId(tenantId.getId(), widgetsBundleId.getId());
     }
 
     @Override
     public List<WidgetTypeDetails> findWidgetTypesDetailsByWidgetsBundleId(TenantId tenantId, WidgetsBundleId widgetsBundleId) {
         log.trace("Executing findWidgetTypesDetailsByWidgetsBundleId, tenantId [{}], widgetsBundleId [{}]", tenantId, widgetsBundleId);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        Validator.validateId(widgetsBundleId, INCORRECT_WIDGETS_BUNDLE_ID + widgetsBundleId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        Validator.validateId(widgetsBundleId, id -> INCORRECT_WIDGETS_BUNDLE_ID + id);
         return widgetTypeDao.findWidgetTypesDetailsByWidgetsBundleId(tenantId.getId(), widgetsBundleId.getId());
 
     }
@@ -162,8 +162,8 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
                                                                           DeprecatedFilter deprecatedFilter, List<String> widgetTypes, PageLink pageLink) {
         log.trace("Executing findWidgetTypesInfosByWidgetsBundleId, tenantId [{}], widgetsBundleId [{}], fullSearch [{}], deprecatedFilter [{}], widgetTypes [{}], pageLink [{}]",
                 tenantId, widgetsBundleId, fullSearch, deprecatedFilter, widgetTypes, pageLink);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        Validator.validateId(widgetsBundleId, INCORRECT_WIDGETS_BUNDLE_ID + widgetsBundleId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        Validator.validateId(widgetsBundleId, id -> INCORRECT_WIDGETS_BUNDLE_ID + id);
         Validator.validatePageLink(pageLink);
         return widgetTypeDao.findWidgetTypesInfosByWidgetsBundleId(tenantId.getId(), widgetsBundleId.getId(), fullSearch, deprecatedFilter, widgetTypes, pageLink);
     }
@@ -171,27 +171,27 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
     @Override
     public List<String> findWidgetFqnsByWidgetsBundleId(TenantId tenantId, WidgetsBundleId widgetsBundleId) {
         log.trace("Executing findWidgetTypesInfosByWidgetsBundleId, tenantId [{}], widgetsBundleId [{}]", tenantId, widgetsBundleId);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        Validator.validateId(widgetsBundleId, INCORRECT_WIDGETS_BUNDLE_ID + widgetsBundleId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        Validator.validateId(widgetsBundleId, id -> INCORRECT_WIDGETS_BUNDLE_ID + id);
         return widgetTypeDao.findWidgetFqnsByWidgetsBundleId(tenantId.getId(), widgetsBundleId.getId());
     }
 
     @Override
     public WidgetType findWidgetTypeByTenantIdAndFqn(TenantId tenantId, String fqn) {
         log.trace("Executing findWidgetTypeByTenantIdAndFqn, tenantId [{}], fqn [{}]", tenantId, fqn);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        Validator.validateString(fqn, "Incorrect fqn " + fqn);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        Validator.validateString(fqn, f -> "Incorrect fqn " + f);
         return widgetTypeDao.findByTenantIdAndFqn(tenantId.getId(), fqn);
     }
 
     @Override
     public void updateWidgetsBundleWidgetTypes(TenantId tenantId, WidgetsBundleId widgetsBundleId, List<WidgetTypeId> widgetTypeIds) {
         log.trace("Executing updateWidgetsBundleWidgetTypes, tenantId [{}], widgetsBundleId [{}], widgetTypeIds [{}]", tenantId, widgetsBundleId, widgetTypeIds);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        Validator.validateId(widgetsBundleId, INCORRECT_WIDGETS_BUNDLE_ID + widgetsBundleId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        Validator.validateId(widgetsBundleId, id -> INCORRECT_WIDGETS_BUNDLE_ID + id);
         Validator.checkNotNull(widgetTypeIds, "Incorrect widgetTypeIds " + widgetTypeIds);
         if (!widgetTypeIds.isEmpty()) {
-            validateIds(widgetTypeIds, "Incorrect widgetTypeIds " + widgetTypeIds);
+            validateIds(widgetTypeIds, ids -> "Incorrect widgetTypeIds " + ids);
         }
         List<WidgetsBundleWidget> bundleWidgets = new ArrayList<>();
         for (int index = 0; index < widgetTypeIds.size(); index++) {
@@ -222,7 +222,7 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
     @Override
     public void deleteWidgetTypesByTenantId(TenantId tenantId) {
         log.trace("Executing deleteWidgetTypesByTenantId, tenantId [{}]", tenantId);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantWidgetTypeRemover.removeEntities(tenantId, tenantId);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java
index 9d6960a7d1..2e67406df1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java
@@ -66,7 +66,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
     @Override
     public WidgetsBundle findWidgetsBundleById(TenantId tenantId, WidgetsBundleId widgetsBundleId) {
         log.trace("Executing findWidgetsBundleById [{}]", widgetsBundleId);
-        Validator.validateId(widgetsBundleId, "Incorrect widgetsBundleId " + widgetsBundleId);
+        Validator.validateId(widgetsBundleId, id -> "Incorrect widgetsBundleId " + id);
         return widgetsBundleDao.findById(tenantId, widgetsBundleId.getId());
     }
 
@@ -91,7 +91,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
     @Override
     public void deleteWidgetsBundle(TenantId tenantId, WidgetsBundleId widgetsBundleId) {
         log.trace("Executing deleteWidgetsBundle [{}]", widgetsBundleId);
-        Validator.validateId(widgetsBundleId, "Incorrect widgetsBundleId " + widgetsBundleId);
+        Validator.validateId(widgetsBundleId, id -> "Incorrect widgetsBundleId " + id);
         WidgetsBundle widgetsBundle = findWidgetsBundleById(tenantId, widgetsBundleId);
         if (widgetsBundle == null) {
             throw new IncorrectParameterException("Unable to delete non-existent widgets bundle.");
@@ -103,8 +103,8 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
     @Override
     public WidgetsBundle findWidgetsBundleByTenantIdAndAlias(TenantId tenantId, String alias) {
         log.trace("Executing findWidgetsBundleByTenantIdAndAlias, tenantId [{}], alias [{}]", tenantId, alias);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        Validator.validateString(alias, "Incorrect alias " + alias);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
+        Validator.validateString(alias, a -> "Incorrect alias " + a);
         return widgetsBundleDao.findWidgetsBundleByTenantIdAndAlias(tenantId.getId(), alias);
     }
 
@@ -134,7 +134,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
     @Override
     public PageData<WidgetsBundle> findTenantWidgetsBundlesByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findTenantWidgetsBundlesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         Validator.validatePageLink(pageLink);
         return widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId.getId(), pageLink);
     }
@@ -142,7 +142,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
     @Override
     public PageData<WidgetsBundle> findAllTenantWidgetsBundlesByTenantIdAndPageLink(TenantId tenantId, boolean fullSearch, PageLink pageLink) {
         log.trace("Executing findAllTenantWidgetsBundlesByTenantIdAndPageLink, tenantId [{}], fullSearch [{}], pageLink [{}]", tenantId, fullSearch, pageLink);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         Validator.validatePageLink(pageLink);
         return widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId.getId(), fullSearch, pageLink);
     }
@@ -150,7 +150,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
     @Override
     public PageData<WidgetsBundle> findTenantWidgetsBundlesByTenantIdAndPageLink(TenantId tenantId, boolean fullSearch, PageLink pageLink) {
         log.trace("Executing findTenantWidgetsBundlesByTenantIdAndPageLink, tenantId [{}], fullSearch [{}], pageLink [{}]", tenantId, fullSearch, pageLink);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         Validator.validatePageLink(pageLink);
         return widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId.getId(), fullSearch, pageLink);
     }
@@ -158,7 +158,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
     @Override
     public List<WidgetsBundle> findAllTenantWidgetsBundlesByTenantId(TenantId tenantId) {
         log.trace("Executing findAllTenantWidgetsBundlesByTenantId, tenantId [{}]", tenantId);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         List<WidgetsBundle> widgetsBundles = new ArrayList<>();
         PageLink pageLink = new PageLink(DEFAULT_WIDGETS_BUNDLE_LIMIT);
         PageData<WidgetsBundle> pageData;
@@ -175,7 +175,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
     @Override
     public void deleteWidgetsBundlesByTenantId(TenantId tenantId) {
         log.trace("Executing deleteWidgetsBundlesByTenantId, tenantId [{}]", tenantId);
-        Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        Validator.validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         tenantWidgetsBundleRemover.removeEntities(tenantId, tenantId);
     }
 
diff --git a/dao/src/main/resources/sql/schema-entities-idx.sql b/dao/src/main/resources/sql/schema-entities-idx.sql
index a177c1325f..6b4f1a6c09 100644
--- a/dao/src/main/resources/sql/schema-entities-idx.sql
+++ b/dao/src/main/resources/sql/schema-entities-idx.sql
@@ -118,9 +118,9 @@ CREATE INDEX IF NOT EXISTS idx_notification_id ON notification(id);
 
 CREATE INDEX IF NOT EXISTS idx_notification_notification_request_id ON notification(request_id);
 
-CREATE INDEX IF NOT EXISTS idx_notification_recipient_id_created_time ON notification(recipient_id, created_time DESC);
+CREATE INDEX IF NOT EXISTS idx_notification_delivery_method_recipient_id_created_time ON notification(delivery_method, recipient_id, created_time DESC);
 
-CREATE INDEX IF NOT EXISTS idx_notification_recipient_id_unread ON notification(recipient_id) WHERE status <> 'READ';
+CREATE INDEX IF NOT EXISTS idx_notification_delivery_method_recipient_id_unread ON notification(delivery_method, recipient_id) WHERE status <> 'READ';
 
 CREATE INDEX IF NOT EXISTS idx_resource_etag ON resource(tenant_id, etag);
 
diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql
index 2dce04d67f..1199f45181 100644
--- a/dao/src/main/resources/sql/schema-entities.sql
+++ b/dao/src/main/resources/sql/schema-entities.sql
@@ -25,7 +25,7 @@ CREATE OR REPLACE PROCEDURE insert_tb_schema_settings()
 $$
 BEGIN
     IF (SELECT COUNT(*) FROM tb_schema_settings) = 0 THEN
-        INSERT INTO tb_schema_settings (schema_version) VALUES (3006000);
+        INSERT INTO tb_schema_settings (schema_version) VALUES (3006004);
     END IF;
 END;
 $$;
@@ -559,6 +559,7 @@ CREATE TABLE IF NOT EXISTS key_dictionary
 CREATE TABLE IF NOT EXISTS oauth2_params (
     id uuid NOT NULL CONSTRAINT oauth2_params_pkey PRIMARY KEY,
     enabled boolean,
+    edge_enabled boolean,
     tenant_id uuid,
     created_time bigint NOT NULL
 );
@@ -863,6 +864,7 @@ CREATE TABLE IF NOT EXISTS notification (
     request_id UUID,
     recipient_id UUID NOT NULL,
     type VARCHAR(50) NOT NULL,
+    delivery_method VARCHAR(50) NOT NULL,
     subject VARCHAR(255),
     body VARCHAR(1000) NOT NULL,
     additional_config VARCHAR(1000),
@@ -883,3 +885,12 @@ CREATE TABLE IF NOT EXISTS alarm_types (
     CONSTRAINT tenant_id_type_unq_key UNIQUE (tenant_id, type),
     CONSTRAINT fk_entity_tenant_id FOREIGN KEY (tenant_id) REFERENCES tenant(id) ON DELETE CASCADE
 );
+
+CREATE TABLE IF NOT EXISTS queue_stats (
+    id uuid NOT NULL CONSTRAINT queue_stats_pkey PRIMARY KEY,
+    created_time bigint NOT NULL,
+    tenant_id uuid NOT NULL,
+    queue_name varchar(255) NOT NULL,
+    service_id varchar(255) NOT NULL,
+    CONSTRAINT queue_stats_name_unq_key UNIQUE (tenant_id, queue_name, service_id)
+);
\ No newline at end of file
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
index e8232af692..5eddc78661 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
@@ -98,6 +98,10 @@ public abstract class AbstractServiceTest {
 
 
     protected RuleNodeDebugEvent generateEvent(TenantId tenantId, EntityId entityId) throws IOException {
+        return generateEvent(tenantId, entityId, null);
+    }
+
+    protected RuleNodeDebugEvent generateEvent(TenantId tenantId, EntityId entityId, String eventType) throws IOException {
         if (tenantId == null) {
             tenantId = TenantId.fromUUID(Uuids.timeBased());
         }
@@ -105,6 +109,7 @@ public abstract class AbstractServiceTest {
                 .tenantId(tenantId)
                 .entityId(entityId.getId())
                 .serviceId("server A")
+                .eventType(eventType)
                 .data(JacksonUtil.toString(readFromResource("TestJsonData.json")))
                 .build();
     }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceTest.java
index 216d2abb07..d9b94fb26b 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.ResultSetExtractor;
 import org.thingsboard.server.common.data.AttributeScope;
-import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.StringUtils;
@@ -99,6 +98,8 @@ import java.util.stream.Stream;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.thingsboard.server.common.data.query.EntityKeyType.ATTRIBUTE;
+import static org.thingsboard.server.common.data.query.EntityKeyType.ENTITY_FIELD;
 
 @Slf4j
 @DaoSqlTest
@@ -2113,6 +2114,132 @@ public class EntityServiceTest extends AbstractServiceTest {
         deviceService.deleteDevicesByTenantId(tenantId);
     }
 
+    @Test
+    public void testFindEntityQuery_for_5000_devices_with_3000_pageSize() {
+        int pageSize = 3000;
+        int expectedDevicesSize = 4000;
+        int unexpectedDevicesSize = 1000;
+
+        for (int i = 0; i < expectedDevicesSize + unexpectedDevicesSize; i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            if (i < expectedDevicesSize) {
+                device.setName("Device_" + i); // match deviceNameFilter 'D%'
+            } else {
+                device.setName("Test_" + i); // does not match deviceNameFilter 'D%'
+            }
+            device.setType("default");
+            device.setLabel("testLabel" + (int) (Math.random() * 1000));
+            Device savedDevice = deviceService.saveDevice(device);
+
+            attributesService.save(tenantId, savedDevice.getId(), AttributeScope.CLIENT_SCOPE,
+                    new BaseAttributeKvEntry(System.currentTimeMillis(), new LongDataEntry("telemetry", (long) i)));
+        }
+
+        DeviceTypeFilter filter = new DeviceTypeFilter();
+        filter.setDeviceTypes(List.of("default"));
+        filter.setDeviceNameFilter("D%");
+
+        EntityDataSortOrder sortOrder = new EntityDataSortOrder(new EntityKey(ATTRIBUTE, "telemetry"), EntityDataSortOrder.Direction.DESC);
+
+        List<KeyFilter> deviceTypeFilters = createStringKeyFilters("type", ENTITY_FIELD, StringFilterPredicate.StringOperation.EQUAL, "default");
+
+        List<KeyFilter> attributeFilters = Collections.singletonList(createNumericKeyFilter("telemetry", ATTRIBUTE, NumericFilterPredicate.NumericOperation.LESS, expectedDevicesSize));
+
+        List<KeyFilter> nameFilters = createStringKeyFilters("name", ENTITY_FIELD, StringFilterPredicate.StringOperation.CONTAINS, "Device");
+
+        List<EntityKey> entityFields = Arrays.asList(new EntityKey(ENTITY_FIELD, "name"), new EntityKey(ENTITY_FIELD, "type"));
+
+        // 1. Device type filters:
+
+        // query with textSearch - optimization is not performing
+        EntityDataPageLink originalPageLink = new EntityDataPageLink(pageSize, 0, "Device", sortOrder);
+        EntityDataQuery originalQuery = new EntityDataQuery(filter, originalPageLink, entityFields, null, deviceTypeFilters);
+        PageData<EntityData> originalData = entityService.findEntityDataByQuery(tenantId, new CustomerId(CustomerId.NULL_UUID), originalQuery);
+
+        // query without textSearch - optimization is performing
+        EntityDataPageLink optimizedPageLink = new EntityDataPageLink(pageSize, 0, null, sortOrder);
+        EntityDataQuery optimizedQuery = new EntityDataQuery(filter, optimizedPageLink, entityFields, null, deviceTypeFilters);
+        PageData<EntityData> optimizedData = entityService.findEntityDataByQuery(tenantId, new CustomerId(CustomerId.NULL_UUID), optimizedQuery);
+        List<EntityData> loadedEntities = getLoadedEntities(optimizedData, optimizedQuery);
+        Assert.assertEquals(expectedDevicesSize, loadedEntities.size());
+        loadedEntities = getLoadedEntities(originalData, originalQuery);
+        Assert.assertEquals(expectedDevicesSize, loadedEntities.size());
+        Assert.assertEquals(pageSize, optimizedData.getData().size());
+
+        for (int i = 0; i < pageSize; i++) {
+            EntityData originalElement = originalData.getData().get(i);
+            EntityData optimizedElement = optimizedData.getData().get(i);
+            Assert.assertEquals(originalElement.getEntityId(), optimizedElement.getEntityId());
+            originalElement.getLatest().get(ENTITY_FIELD).forEach((key, value) -> {
+                Assert.assertEquals(value.getValue(), optimizedElement.getLatest().get(EntityKeyType.ENTITY_FIELD).get(key).getValue());
+                Assert.assertEquals(value.getCount(), optimizedElement.getLatest().get(EntityKeyType.ENTITY_FIELD).get(key).getCount());
+            });
+        }
+        Assert.assertEquals(originalData.getTotalPages(), optimizedData.getTotalPages());
+        Assert.assertEquals(originalData.getTotalElements(), optimizedData.getTotalElements());
+
+        // 2. Device attribute filters
+
+        // query with textSearch - optimization is not performing
+        originalPageLink = new EntityDataPageLink(pageSize, 0, "Device", sortOrder);
+        originalQuery = new EntityDataQuery(filter, originalPageLink, entityFields, null, attributeFilters);
+        originalData = entityService.findEntityDataByQuery(tenantId, new CustomerId(CustomerId.NULL_UUID), originalQuery);
+
+        // query without textSearch - optimization is performing
+        optimizedPageLink = new EntityDataPageLink(pageSize, 0, null, sortOrder);
+        optimizedQuery = new EntityDataQuery(filter, optimizedPageLink, entityFields, null, attributeFilters);
+        optimizedData = entityService.findEntityDataByQuery(tenantId, new CustomerId(CustomerId.NULL_UUID), optimizedQuery);
+        loadedEntities = getLoadedEntities(optimizedData, optimizedQuery);
+        Assert.assertEquals(expectedDevicesSize, loadedEntities.size());
+        loadedEntities = getLoadedEntities(originalData, originalQuery);
+        Assert.assertEquals(expectedDevicesSize, loadedEntities.size());
+        Assert.assertEquals(pageSize, optimizedData.getData().size());
+
+        for (int i = 0; i < pageSize; i++) {
+            EntityData originalElement = originalData.getData().get(i);
+            EntityData optimizedElement = optimizedData.getData().get(i);
+            Assert.assertEquals(originalElement.getEntityId(), optimizedElement.getEntityId());
+            originalElement.getLatest().get(ENTITY_FIELD).forEach((key, value) -> {
+                Assert.assertEquals(value.getValue(), optimizedElement.getLatest().get(EntityKeyType.ENTITY_FIELD).get(key).getValue());
+                Assert.assertEquals(value.getCount(), optimizedElement.getLatest().get(EntityKeyType.ENTITY_FIELD).get(key).getCount());
+            });
+        }
+        Assert.assertEquals(originalData.getTotalPages(), optimizedData.getTotalPages());
+        Assert.assertEquals(originalData.getTotalElements(), optimizedData.getTotalElements());
+
+        // 3. Device name filters
+
+        // query with textSearch - optimization is not performing
+        originalPageLink = new EntityDataPageLink(pageSize, 0, "Device", sortOrder);
+        originalQuery = new EntityDataQuery(filter, originalPageLink, entityFields, null, nameFilters);
+        originalData = entityService.findEntityDataByQuery(tenantId, new CustomerId(CustomerId.NULL_UUID), originalQuery);
+
+        // query without textSearch - optimization is performing
+        optimizedPageLink = new EntityDataPageLink(pageSize, 0, null, sortOrder);
+        optimizedQuery = new EntityDataQuery(filter, optimizedPageLink, entityFields, null, nameFilters);
+        optimizedData = entityService.findEntityDataByQuery(tenantId, new CustomerId(CustomerId.NULL_UUID), optimizedQuery);
+        loadedEntities = getLoadedEntities(optimizedData, optimizedQuery);
+        Assert.assertEquals(expectedDevicesSize, loadedEntities.size());
+        loadedEntities = getLoadedEntities(originalData, originalQuery);
+        Assert.assertEquals(expectedDevicesSize, loadedEntities.size());
+        Assert.assertEquals(pageSize, optimizedData.getData().size());
+
+        for (int i = 0; i < pageSize; i++) {
+            EntityData originalElement = originalData.getData().get(i);
+            EntityData optimizedElement = optimizedData.getData().get(i);
+            Assert.assertEquals(originalElement.getEntityId(), optimizedElement.getEntityId());
+            originalElement.getLatest().get(ENTITY_FIELD).forEach((key, value) -> {
+                Assert.assertEquals(value.getValue(), optimizedElement.getLatest().get(EntityKeyType.ENTITY_FIELD).get(key).getValue());
+                Assert.assertEquals(value.getCount(), optimizedElement.getLatest().get(EntityKeyType.ENTITY_FIELD).get(key).getCount());
+            });
+        }
+        Assert.assertEquals(originalData.getTotalPages(), optimizedData.getTotalPages());
+        Assert.assertEquals(originalData.getTotalElements(), optimizedData.getTotalElements());
+
+        deviceService.deleteDevicesByTenantId(tenantId);
+    }
+
     private Boolean listEqualWithoutOrder(List<String> A, List<String> B) {
         return A.containsAll(B) && B.containsAll(A);
     }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/OAuth2ServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/OAuth2ServiceTest.java
index ae9aa72be9..281709c9af 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/OAuth2ServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/OAuth2ServiceTest.java
@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
 
 @DaoSqlTest
 public class OAuth2ServiceTest extends AbstractServiceTest {
-    private static final OAuth2Info EMPTY_PARAMS = new OAuth2Info(false, Collections.emptyList());
+    private static final OAuth2Info EMPTY_PARAMS = new OAuth2Info(false, false, Collections.emptyList());
 
     @Autowired
     protected OAuth2Service oAuth2Service;
@@ -66,7 +66,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testSaveHttpAndMixedDomainsTogether() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -87,7 +87,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testSaveHttpsAndMixedDomainsTogether() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTPS).build(),
@@ -153,7 +153,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
         Assert.assertNotNull(foundOAuth2Info);
         Assert.assertEquals(oAuth2Info, foundOAuth2Info);
 
-        OAuth2Info newOAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info newOAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("another-domain").scheme(SchemeType.HTTPS).build()
@@ -194,7 +194,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
         List<OAuth2RegistrationInfo> thirdGroup = Lists.newArrayList(
                 validRegistrationInfo()
         );
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -318,7 +318,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
                 validRegistrationInfo(),
                 validRegistrationInfo()
         );
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -363,7 +363,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testGetDisabledOAuth2Clients() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -402,7 +402,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFindAllRegistrations() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -451,7 +451,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFindRegistrationById() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -495,7 +495,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFindAppSecret() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -547,7 +547,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFindClientsByPackageAndPlatform() {
-        OAuth2Info oAuth2Info = new OAuth2Info(true, Lists.newArrayList(
+        OAuth2Info oAuth2Info = new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -596,7 +596,7 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
     }
 
     private OAuth2Info createDefaultOAuth2Info() {
-        return new OAuth2Info(true, Lists.newArrayList(
+        return new OAuth2Info(true, false, Lists.newArrayList(
                 OAuth2ParamsInfo.builder()
                         .domainInfos(Lists.newArrayList(
                                 OAuth2DomainInfo.builder().name("first-domain").scheme(SchemeType.HTTP).build(),
@@ -664,4 +664,5 @@ public class OAuth2ServiceTest extends AbstractServiceTest {
                 .appSecret(appSecret != null ? appSecret : StringUtils.randomAlphanumeric(24))
                 .build();
     }
+
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/QueueStatsServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/QueueStatsServiceTest.java
new file mode 100644
index 0000000000..45a49ba5d2
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/QueueStatsServiceTest.java
@@ -0,0 +1,134 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.queue.QueueStats;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.queue.QueueStatsService;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+@DaoSqlTest
+public class QueueStatsServiceTest extends AbstractServiceTest {
+
+    @Autowired
+    QueueStatsService queueStatsService;
+
+    private TenantId tenantId;
+
+    @Before
+    public void before() throws NoSuchFieldException, IllegalAccessException {
+
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        Tenant savedTenant = tenantService.saveTenant(tenant);
+        Assert.assertNotNull(savedTenant);
+        tenantId = savedTenant.getId();
+    }
+
+    @After
+    public void after() {
+        tenantService.deleteTenant(tenantId);
+    }
+
+    @Test
+    public void testSaveQueueStats() {
+        QueueStats queueStats = new QueueStats();
+        queueStats.setTenantId(tenantId);
+        String queueName = StringUtils.randomAlphabetic(8);
+        queueStats.setQueueName(queueName);
+        queueStats.setServiceId(StringUtils.randomAlphabetic(8));
+
+        QueueStats savedQueueStats = queueStatsService.save(tenantId, queueStats);
+        Assert.assertNotNull(savedQueueStats);
+        Assert.assertNotNull(savedQueueStats.getId());
+        Assert.assertTrue(savedQueueStats.getCreatedTime() > 0);
+        Assert.assertEquals(queueStats.getTenantId(), savedQueueStats.getTenantId());
+        Assert.assertEquals(savedQueueStats.getQueueName(), queueStats.getQueueName());
+
+        QueueStats retrievedQueueStatsById = queueStatsService.findQueueStatsById(tenantId, savedQueueStats.getId());
+        Assert.assertEquals(retrievedQueueStatsById.getQueueName(), queueName);
+
+        String secondQueueName = StringUtils.randomAlphabetic(8);
+        queueStats.setQueueName(secondQueueName);
+        QueueStats savedQueueStats2 = queueStatsService.save(tenantId, queueStats);
+        QueueStats retrievedQueueStatsById2 = queueStatsService.findQueueStatsById(tenantId, savedQueueStats2.getId());
+        Assert.assertEquals(retrievedQueueStatsById2.getQueueName(), secondQueueName);
+
+        List<QueueStats> queueStatsList = queueStatsService.findByTenantId(tenantId);
+        Assert.assertEquals(2, queueStatsList.size());
+        assertThat(queueStatsList).containsOnly(retrievedQueueStatsById, retrievedQueueStatsById2);
+
+        queueStatsService.deleteByTenantId(tenantId);
+        QueueStats retrievedQueueStatsAfterDelete = queueStatsService.findQueueStatsById(tenantId, savedQueueStats.getId());
+        Assert.assertNull(retrievedQueueStatsAfterDelete);
+    }
+
+    @Test
+    public void testSaveWithNullQueueName() {
+        QueueStats queueStats = new QueueStats();
+        queueStats.setTenantId(tenantId);
+        queueStats.setQueueName(null);
+        queueStats.setServiceId(StringUtils.randomAlphabetic(8));
+
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueStatsService.save(tenantId, queueStats);
+        });
+    }
+
+    @Test
+    public void testSaveWithNullServiceId() {
+        QueueStats queueStats = new QueueStats();
+        queueStats.setTenantId(tenantId);
+        queueStats.setQueueName(StringUtils.randomAlphabetic(8));
+        queueStats.setServiceId(null);
+
+        Assertions.assertThrows(DataValidationException.class, () -> {
+            queueStatsService.save(tenantId, queueStats);
+        });
+    }
+
+    @Test
+    public void testFindByTenantIdAndNameAndServiceId() {
+        QueueStats queueStats = new QueueStats();
+        queueStats.setTenantId(tenantId);
+        queueStats.setQueueName(StringUtils.randomAlphabetic(8));
+        queueStats.setServiceId(StringUtils.randomAlphabetic(8));
+        QueueStats savedQueueStats = queueStatsService.save(tenantId, queueStats);
+
+        QueueStats queueStats2 = new QueueStats();
+        queueStats2.setTenantId(tenantId);
+        queueStats2.setQueueName(StringUtils.randomAlphabetic(8));
+        queueStats2.setServiceId(StringUtils.randomAlphabetic(8));
+        queueStatsService.save(tenantId, queueStats2);
+
+        QueueStats retrievedQueueStatsById = queueStatsService.findByTenantIdAndNameAndServiceId(tenantId, queueStats.getQueueName(), queueStats.getServiceId());
+        assertThat(retrievedQueueStatsById).isEqualTo(savedQueueStats);
+    }
+
+}
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/RuleChainServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/RuleChainServiceTest.java
index 50f46020d8..86b76bd5a5 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/RuleChainServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/RuleChainServiceTest.java
@@ -40,8 +40,11 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 import java.util.function.Function;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 /**
  * Created by igor on 3/13/18.
  */
@@ -560,4 +563,35 @@ public class RuleChainServiceTest extends AbstractServiceTest {
         Assert.assertFalse(pageData.hasNext());
         Assert.assertEquals(0, pageData.getData().size());
     }
+
+    @Test
+    public void testSaveRuleChainWithExistingExternalId() {
+        RuleChainId externalRuleChainId = new RuleChainId(UUID.fromString("2675d180-e1e5-11ee-9f06-71b6c7dc2cbf"));
+
+        RuleChain ruleChain = getRuleChain();
+        ruleChain.setTenantId(tenantId);
+        ruleChain.setExternalId(externalRuleChainId);
+        ruleChainService.saveRuleChain(ruleChain);
+
+        assertThatThrownBy(() -> ruleChainService.saveRuleChain(ruleChain))
+                .isInstanceOf(DataValidationException.class)
+                .hasMessage("Rule Chain with such external id already exists!");
+
+        ruleChainService.deleteRuleChainsByTenantId(tenantId);
+    }
+
+    private RuleChain getRuleChain() {
+        String ruleChainStr = "{\n" +
+                "  \"name\": \"Root Rule Chain\",\n" +
+                "  \"type\": \"CORE\",\n" +
+                "  \"firstRuleNodeId\": {\n" +
+                "    \"entityType\": \"RULE_NODE\",\n" +
+                "    \"id\": \"91ad0b00-e779-11ee-9cf0-15d8b6079fdb\"\n" +
+                "  },\n" +
+                "  \"debugMode\": false,\n" +
+                "  \"configuration\": null,\n" +
+                "  \"additionalInfo\": null\n" +
+                "}";
+        return JacksonUtil.fromString(ruleChainStr, RuleChain.class);
+    }
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/ValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/ValidatorTest.java
new file mode 100644
index 0000000000..4242cb69ae
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/ValidatorTest.java
@@ -0,0 +1,130 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import org.junit.jupiter.api.Test;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UUIDBased;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class ValidatorTest {
+
+    final DeviceId goodDeviceId = new DeviceId(UUID.fromString("18594c15-9f05-4cda-b58e-70172467c3e5"));
+    final UserId nullUserId = new UserId(null);
+
+    @Test
+    void validateEntityIdTest() {
+        Validator.validateEntityId(TenantId.SYS_TENANT_ID, id -> "Incorrect entityId " + id);
+        Validator.validateEntityId(goodDeviceId, id -> "Incorrect entityId " + id);
+
+        assertThatThrownBy(() -> Validator.validateEntityId(null, id -> "Incorrect entityId " + id))
+                .as("EntityId is null")
+                .isInstanceOf(IncorrectParameterException.class)
+                .hasMessageContaining("Incorrect entityId null");
+
+        assertThatThrownBy(() -> Validator.validateEntityId(nullUserId, id -> "Incorrect entityId " + id))
+                .as("EntityId with null UUID")
+                .isInstanceOf(IncorrectParameterException.class)
+                .hasMessageContaining("Incorrect entityId null");
+    }
+
+    @Test
+    void validateStringTest() {
+        Validator.validateString("Hello", s -> "Incorrect string " + s);
+        Validator.validateString(" ", s -> "Incorrect string " + s);
+        Validator.validateString("\n", s -> "Incorrect string " + s);
+
+        assertThatThrownBy(() -> Validator.validateString(null, s -> "Incorrect string " + s))
+                .as("String is null")
+                .isInstanceOf(IncorrectParameterException.class)
+                .hasMessageContaining("Incorrect string null");
+
+        assertThatThrownBy(() -> Validator.validateString("", s -> "Incorrect string " + s))
+                .as("String is empty")
+                .isInstanceOf(IncorrectParameterException.class)
+                .hasMessage("Incorrect string ");
+
+        assertThatThrownBy(() -> Validator.validateString("", s -> "Incorrect string [" + s + "]"))
+                .as("String is empty []")
+                .isInstanceOf(IncorrectParameterException.class)
+                .hasMessage("Incorrect string []");
+    }
+
+    @Test
+    void validateUUIDIdTest() {
+        Validator.validateId(UUID.randomUUID(), id -> "Incorrect Id " + id);
+
+        assertThatThrownBy(() -> Validator.validateId((UUID) null, id -> "Incorrect Id " + id))
+                .as("Id is null")
+                .isInstanceOf(IncorrectParameterException.class)
+                .hasMessageContaining("Incorrect Id null");
+    }
+
+    @Test
+    void validateUUIDBasedIdTest() {
+        Validator.validateId(TenantId.SYS_TENANT_ID, id -> "Incorrect Id " + id);
+        Validator.validateId(goodDeviceId, id -> "Incorrect Id " + id);
+
+        assertThatThrownBy(() -> Validator.validateId((UUIDBased) null, id -> "Incorrect Id " + id))
+                .as("Id is null")
+                .isInstanceOf(IncorrectParameterException.class)
+                .hasMessageContaining("Incorrect Id null");
+
+        assertThatThrownBy(() -> Validator.validateId(nullUserId, id -> "Incorrect Id " + id))
+                .as("Id with null UUIDBased")
+                .isInstanceOf(IncorrectParameterException.class)
+                .hasMessageContaining("Incorrect Id null");
+
+    }
+
+    @Test
+    void validateIdsTest() {
+        List<? extends UUIDBased> list = List.of(goodDeviceId);
+        Validator.validateIds(list, ids -> "Incorrect Id " + ids);
+
+        assertThatThrownBy(() -> Validator.validateIds(null, id -> "Incorrect Ids " + id))
+                .as("Ids are null")
+                .isInstanceOf(IncorrectParameterException.class)
+                .hasMessageContaining("Incorrect Ids null");
+
+        assertThatThrownBy(() -> Validator.validateIds(Collections.emptyList(), ids -> "Incorrect Ids " + ids))
+                .as("List is empty")
+                .isInstanceOf(IncorrectParameterException.class)
+                .hasMessageContaining("Incorrect Ids []");
+
+        List<UUIDBased> badList = new ArrayList<>(2);
+        badList.add(goodDeviceId);
+        badList.add(null);
+
+        // Incorrect Ids [18594c15-9f05-4cda-b58e-70172467c3e5, null]
+        assertThatThrownBy(() -> Validator.validateIds(badList, ids -> "Incorrect Ids " + ids))
+                .as("List contains null")
+                .isInstanceOf(IncorrectParameterException.class)
+                .hasMessageContaining("Incorrect Ids ")
+                .hasMessageContaining(goodDeviceId.getId().toString())
+                .hasMessageContaining("null");
+
+    }
+}
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java
index b73728d314..8aa943484d 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java
@@ -132,8 +132,28 @@ public abstract class BaseEventServiceTest extends AbstractServiceTest {
         eventService.cleanupEvents(timeBeforeStartTime - 1, timeAfterEndTime + 1, true);
     }
 
+    @Test
+    public void findLatestDebugRuleNodeInEvent() throws Exception {
+        CustomerId customerId = new CustomerId(Uuids.timeBased());
+        TenantId tenantId = TenantId.fromUUID(Uuids.timeBased());
+
+        Event event1 = saveEventWithProvidedTimeAndEventType(eventTime, "IN", customerId, tenantId);
+        Event event2 = saveEventWithProvidedTimeAndEventType(eventTime + 1, "IN", customerId, tenantId);
+
+        EventInfo event = eventService.findLatestDebugRuleNodeInEvent(tenantId, customerId);
+
+        Assert.assertNotNull(event);
+        Assert.assertEquals(event2.getUuidId(), event.getUuidId());
+
+        eventService.cleanupEvents(timeBeforeStartTime - 1, timeAfterEndTime + 1, true);
+    }
+
     private Event saveEventWithProvidedTime(long time, EntityId entityId, TenantId tenantId) throws Exception {
-        RuleNodeDebugEvent event = generateEvent(tenantId, entityId);
+        return saveEventWithProvidedTimeAndEventType(time, null, entityId, tenantId);
+    }
+
+    private Event saveEventWithProvidedTimeAndEventType(long time, String eventType, EntityId entityId, TenantId tenantId) throws Exception {
+        RuleNodeDebugEvent event = generateEvent(tenantId, entityId, eventType);
         event.setId(new EventId(Uuids.timeBased()));
         event.setCreatedTime(time);
         eventService.saveAsync(event).get();
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDaoTest.java
index f6ef6e8940..037377dc7a 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDaoTest.java
@@ -81,7 +81,7 @@ public class JpaAlarmCommentDaoTest extends AbstractJpaDaoTest {
     private void saveAlarmComment(UUID id, UUID alarmId, UUID userId, AlarmCommentType type) {
         AlarmComment alarmComment = new AlarmComment();
         alarmComment.setId(new AlarmCommentId(id));
-        alarmComment.setAlarmId(TenantId.fromUUID(alarmId));
+        alarmComment.setAlarmId(new AlarmId(alarmId));
         alarmComment.setUserId(new UserId(userId));
         alarmComment.setType(type);
         alarmComment.setComment(JacksonUtil.newObjectNode().put("text", RandomStringUtils.randomAlphanumeric(10)));
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
index 5c908fa1b4..b178d7c78f 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
@@ -27,6 +27,7 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.dao.AbstractJpaDaoTest;
 import org.thingsboard.server.dao.event.EventDao;
+import org.thingsboard.server.dao.model.sql.RuleNodeDebugEventEntity;
 
 import java.util.List;
 import java.util.UUID;
@@ -42,6 +43,10 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest {
 
     @Autowired
     private EventDao eventDao;
+
+    @Autowired
+    private RuleNodeDebugEventRepository ruleNodeDebugEventRepository;
+
     UUID tenantId = Uuids.timeBased();
 
 
@@ -106,6 +111,23 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest {
 
     }
 
+    @Test
+    public void findLatestDebugRuleNodeInEvent() throws Exception {
+
+        UUID entityId = Uuids.timeBased();
+
+        RuleNodeDebugEventEntity event = getDebugInEventEntity(Uuids.timeBased(), tenantId, entityId);
+        eventDao.saveAsync(event.toData()).get(1, TimeUnit.MINUTES);
+        Thread.sleep(2);
+        RuleNodeDebugEventEntity event2 = getDebugInEventEntity(Uuids.timeBased(), tenantId, entityId);
+        eventDao.saveAsync(event2.toData()).get(1, TimeUnit.MINUTES);
+
+        RuleNodeDebugEventEntity foundEvent = ruleNodeDebugEventRepository.findLatestDebugRuleNodeInEvent(tenantId, entityId).get();
+        assertNotNull("Events expected to be not null", foundEvent);
+        assertEquals(event2.getEventType(), foundEvent.getEventType());
+        assertEquals(event2.getId(), foundEvent.getId());
+    }
+
     private Event getStatsEvent(UUID eventId, UUID tenantId, UUID entityId) {
         StatisticsEvent.StatisticsEventBuilder event = StatisticsEvent.builder();
         event.id(eventId);
@@ -117,4 +139,13 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest {
         event.errorsOccurred(0);
         return event.build();
     }
+
+    private RuleNodeDebugEventEntity getDebugInEventEntity(UUID eventId, UUID tenantId, UUID entityId) {
+        RuleNodeDebugEventEntity event = new RuleNodeDebugEventEntity();
+        event.setId(eventId);
+        event.setEventType("IN");
+        event.setEntityId(entityId);
+        event.setTenantId(tenantId);
+        return event;
+    }
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDaoTest.java
new file mode 100644
index 0000000000..d2889dfb3c
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDaoTest.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.sql.rpc;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.rpc.Rpc;
+import org.thingsboard.server.common.data.rpc.RpcStatus;
+import org.thingsboard.server.dao.AbstractJpaDaoTest;
+
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class JpaRpcDaoTest extends AbstractJpaDaoTest {
+
+    @Autowired
+    JpaRpcDao rpcDao;
+
+    @Test
+    public void deleteOutdated() {
+        Rpc rpc = new Rpc();
+        rpc.setTenantId(TenantId.SYS_TENANT_ID);
+        rpc.setDeviceId(new DeviceId(UUID.randomUUID()));
+        rpc.setStatus(RpcStatus.QUEUED);
+        rpc.setRequest(JacksonUtil.toJsonNode("{}"));
+        rpcDao.saveAndFlush(rpc.getTenantId(), rpc);
+
+        rpc.setId(null);
+        rpcDao.saveAndFlush(rpc.getTenantId(), rpc);
+
+        TenantId tenantId = TenantId.fromUUID(UUID.fromString("3d193a7a-774b-4c05-84d5-f7fdcf7a37cf"));
+        rpc.setId(null);
+        rpc.setTenantId(tenantId);
+        rpc.setDeviceId(new DeviceId(UUID.randomUUID()));
+        rpcDao.saveAndFlush(rpc.getTenantId(), rpc);
+
+        assertThat(rpcDao.deleteOutdatedRpcByTenantId(TenantId.SYS_TENANT_ID, 0L)).isEqualTo(0);
+        assertThat(rpcDao.deleteOutdatedRpcByTenantId(TenantId.SYS_TENANT_ID, Long.MAX_VALUE)).isEqualTo(2);
+        assertThat(rpcDao.deleteOutdatedRpcByTenantId(tenantId, System.currentTimeMillis() + 1)).isEqualTo(1);
+    }
+
+}
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java
index acff0902f1..e8f3bba9db 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java
@@ -21,6 +21,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.WidgetsBundleId;
 import org.thingsboard.server.common.data.page.PageData;
@@ -43,6 +44,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -160,6 +162,30 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
         assertEquals(new WidgetTypeInfo(widgetTypeList.get(2)), widgetTypes.getData().get(0));
     }
 
+    @Test
+    public void testFindSystemWidgetTypesForSameName() throws InterruptedException {
+        List<WidgetTypeDetails> sameNameList = new ArrayList<>();
+
+        for (int i = 0; i < 20; i++) {
+            Thread.sleep(2);
+            var widgetType = saveWidgetType(TenantId.SYS_TENANT_ID, "widgetName");
+            sameNameList.add(widgetType);
+            widgetTypeList.add(widgetType);
+        }
+        sameNameList.sort(Comparator.comparing(BaseWidgetType::getName).thenComparing((BaseWidgetType baseWidgetType) -> baseWidgetType.getId().getId()));
+        List<WidgetTypeInfo> expected = sameNameList.stream().map(WidgetTypeInfo::new).collect(Collectors.toList());
+
+        PageData<WidgetTypeInfo> widgetTypesFirstPage = widgetTypeDao.findSystemWidgetTypes(TenantId.SYS_TENANT_ID, true, DeprecatedFilter.ALL, Collections.singletonList("static"),
+                new PageLink(10, 0, null, new SortOrder("name")));
+        assertEquals(10, widgetTypesFirstPage.getData().size());
+        assertThat(widgetTypesFirstPage.getData()).containsExactlyElementsOf(expected.subList(0, 10));
+
+        PageData<WidgetTypeInfo> widgetTypesSecondPage = widgetTypeDao.findSystemWidgetTypes(TenantId.SYS_TENANT_ID, true, DeprecatedFilter.ALL, Collections.singletonList("static"),
+                new PageLink(10, 1, null, new SortOrder("name")));
+        assertEquals(10, widgetTypesSecondPage.getData().size());
+        assertThat(widgetTypesSecondPage.getData()).containsExactlyElementsOf(expected.subList(10, 20));
+    }
+
     @Test
     public void testTagsSearchInFindBySystemWidgetTypes() {
         for (var entry : SHOULD_FIND_SEARCH_TO_TAGS_MAP.entrySet()) {
@@ -355,4 +381,15 @@ public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest {
         assertEquals(0, result.size());
         widgetTypeDao.removeById(tenantId, details.getUuidId());
     }
+
+    private WidgetTypeDetails saveWidgetType(TenantId tenantId, String name) {
+        WidgetTypeDetails widgetType = new WidgetTypeDetails();
+        widgetType.setTenantId(tenantId);
+        widgetType.setDescription("WIDGET_TYPE_DESCRIPTION" + StringUtils.randomAlphabetic(7));
+        widgetType.setName(name);
+        var descriptor = JacksonUtil.newObjectNode();
+        descriptor.put("type","static");
+        widgetType.setDescriptor(descriptor);
+        return widgetTypeDao.save(TenantId.SYS_TENANT_ID, widgetType);
+    }
 }
diff --git a/dao/src/test/resources/logback.xml b/dao/src/test/resources/logback.xml
index 61397ec6f1..5e293b2982 100644
--- a/dao/src/test/resources/logback.xml
+++ b/dao/src/test/resources/logback.xml
@@ -10,6 +10,9 @@
     <logger name="org.thingsboard.server.dao" level="WARN"/>
     <logger name="org.testcontainers" level="INFO" />
 
+    <!-- Log Hibernate SQL queries -->
+    <!-- <logger name="org.hibernate.SQL" level="DEBUG"/> -->
+
     <root level="WARN">
         <appender-ref ref="console"/>
     </root>
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 9ed8e015f1..18e80b425d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -220,6 +220,7 @@ services:
     image: "${DOCKER_REPO}/${LWM2M_TRANSPORT_DOCKER_NAME}:${TB_VERSION}"
     ports:
       - "5685:5685/udp"
+      - "5686:5686/udp"
     environment:
       TB_SERVICE_ID: tb-lwm2m-transport
       JAVA_OPTS: "${JAVA_OPTS}"
diff --git a/docker/haproxy/config/blocklist.txt b/docker/haproxy/config/blocklist.txt
new file mode 100644
index 0000000000..ff9429857f
--- /dev/null
+++ b/docker/haproxy/config/blocklist.txt
@@ -0,0 +1,3 @@
+# Blocked subnets and IPs. Use CIDR or IP by one per line
+5.136.0.0/13
+217.199.254.1
diff --git a/docker/haproxy/config/haproxy.cfg b/docker/haproxy/config/haproxy.cfg
index aa752502bf..757efe692f 100644
--- a/docker/haproxy/config/haproxy.cfg
+++ b/docker/haproxy/config/haproxy.cfg
@@ -41,6 +41,15 @@ listen stats
 listen mqtt-in
  bind *:${MQTT_PORT}
  mode tcp
+
+ stick-table type ip size 60k expire 60s store conn_cur
+
+ acl trustlist src -f /config/trustlist.txt
+ acl blocklist src -f /config/blocklist.txt
+ tcp-request connection accept if trustlist
+ tcp-request connection reject if blocklist or { src_conn_cur ge 50 }
+ tcp-request connection track-sc1 src
+
  option clitcpka # For TCP keep-alive
  timeout client 3h
  timeout server 3h
@@ -52,6 +61,15 @@ listen mqtt-in
 listen edges-rpc-in
  bind *:${EDGES_RPC_PORT}
  mode tcp
+
+ stick-table type ip size 60k expire 60s store conn_cur
+
+ acl trustlist src -f /config/trustlist.txt
+ acl blocklist src -f /config/blocklist.txt
+ tcp-request connection accept if trustlist
+ tcp-request connection reject if blocklist or { src_conn_cur ge 5 }
+ tcp-request connection track-sc1 src
+
  option clitcpka # For TCP keep-alive
  timeout client 3h
  timeout server 3h
@@ -63,18 +81,28 @@ listen edges-rpc-in
 frontend http-in
  bind *:${HTTP_PORT} alpn h2,http/1.1
 
+ stick-table type ip size 60k expire 60s store conn_cur
+
+ acl trustlist src -f /config/trustlist.txt
+ acl blocklist src -f /config/blocklist.txt
+ tcp-request connection accept if trustlist
+ tcp-request connection reject if blocklist or { src_conn_cur ge 50 }
+ tcp-request connection track-sc1 src
+
  option forwardfor
 
  http-request add-header "X-Forwarded-Proto" "http"
 
  acl transport_http_acl path_beg /api/v1/
  acl letsencrypt_http_acl path_beg /.well-known/acme-challenge/
+ acl tb_images_api_acl path_beg /api/images/
  acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /v3/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/widgets/
 
  redirect scheme https if !letsencrypt_http_acl !transport_http_acl { env(FORCE_HTTPS_REDIRECT) -m str true }
 
  use_backend letsencrypt_http if letsencrypt_http_acl
  use_backend tb-http-backend if transport_http_acl
+ use_backend tb-images-api-backend if tb_images_api_acl
  use_backend tb-api-backend if tb_api_acl
 
  default_backend tb-web-backend
@@ -82,14 +110,24 @@ frontend http-in
 frontend https_in
   bind *:${HTTPS_PORT} ssl crt /usr/local/etc/haproxy/default.pem crt /usr/local/etc/haproxy/certs.d ciphers ECDHE-RSA-AES256-SHA:RC4-SHA:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM alpn h2,http/1.1
 
+  stick-table type ip size 60k expire 60s store conn_cur
+
+  acl trustlist src -f /config/trustlist.txt
+  acl blocklist src -f /config/blocklist.txt
+  tcp-request connection accept if trustlist
+  tcp-request connection reject if blocklist or { src_conn_cur ge 50 }
+  tcp-request connection track-sc1 src
+
   option forwardfor
 
   http-request add-header "X-Forwarded-Proto" "https"
 
   acl transport_http_acl path_beg /api/v1/
+  acl tb_images_api_acl path_beg /api/images/
   acl tb_api_acl path_beg /api/ /swagger /webjars /v2/ /v3/ /static/rulenode/ /oauth2/ /login/oauth2/ /static/widgets/
 
   use_backend tb-http-backend if transport_http_acl
+  use_backend tb-images-api-backend if tb_images_api_acl
   use_backend tb-api-backend if tb_api_acl
 
   default_backend tb-web-backend
@@ -98,24 +136,76 @@ backend letsencrypt_http
   server letsencrypt_http_srv 127.0.0.1:8080
 
 backend tb-web-backend
+  timeout queue 60s
   balance leastconn
   option tcp-check
   option log-health-checks
-  server tbWeb1 tb-web-ui1:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
-  server tbWeb2 tb-web-ui2:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
+  server tbWeb1 tb-web-ui1:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4 maxconn 50
+  server tbWeb2 tb-web-ui2:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4 maxconn 50
   http-request set-header X-Forwarded-Port %[dst_port]
 
 backend tb-http-backend
+  timeout queue 60s
   balance leastconn
   option tcp-check
   option log-health-checks
-  server tbHttp1 tb-http-transport1:8081 check inter 5s resolvers docker_resolver resolve-prefer ipv4
-  server tbHttp2 tb-http-transport2:8081 check inter 5s resolvers docker_resolver resolve-prefer ipv4
+  server tbHttp1 tb-http-transport1:8081 check inter 5s resolvers docker_resolver resolve-prefer ipv4 maxconn 50
+  server tbHttp2 tb-http-transport2:8081 check inter 5s resolvers docker_resolver resolve-prefer ipv4 maxconn 50
+
+# Dummy backends for a stick-table purpose only.
+# There is only one stick-table per proxy. At the moment of writing this doc,
+# it does not seem useful to have multiple tables per proxy. If this happens
+# to be required, simply create a dummy backend with a stick-table in it and
+# reference it
+# https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/#stick-table
+backend st_src_rate10s
+    stick-table type ip size 60k expire 10s store http_req_rate(10s)
+
+backend st_src_rate1m
+    stick-table type ip size 60k expire 1m store http_req_rate(1m)
 
 backend tb-api-backend
+  timeout queue 60s
   balance source
   option tcp-check
   option log-health-checks
-  server tbApi1 tb-core1:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
-  server tbApi2 tb-core2:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4
+
+  http-request track-sc0 src table st_src_rate10s
+  http-request track-sc1 src table st_src_rate1m
+
+  acl trustlist src -f /config/trustlist.txt
+  http-request deny deny_status 429 if { sc_http_req_rate(0) gt 100 } !trustlist
+  http-request deny deny_status 429 if { sc_http_req_rate(1) gt 300 } !trustlist
+
+  http-request set-header X-Forwarded-Port %[dst_port]
+  server tbApi1 tb-core1:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4 maxconn 50
+  server tbApi2 tb-core2:8080 check inter 5s resolvers docker_resolver resolve-prefer ipv4 maxconn 50
+
+# Dummy backends for a stick-table purpose only.
+# There is only one stick-table per proxy. At the moment of writing this doc,
+# it does not seem useful to have multiple tables per proxy. If this happens
+# to be required, simply create a dummy backend with a stick-table in it and
+# reference it
+# https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/#stick-table
+backend st_images_src_rate10s
+    stick-table type ip size 60k expire 10s store http_req_rate(10s)
+
+backend st_images_src_rate1m
+    stick-table type ip size 60k expire 1m store http_req_rate(1m)
+
+backend tb-images-api-backend
+  timeout queue 60s
+  balance source
+  option tcp-check
+  option log-health-checks
+
+  http-request track-sc0 src table st_images_src_rate10s
+  http-request track-sc1 src table st_images_src_rate1m
+
+  acl trustlist src -f /config/trustlist.txt
+  http-request deny deny_status 429 if { sc_http_req_rate(0) gt 1000 } !trustlist
+  http-request deny deny_status 429 if { sc_http_req_rate(1) gt 3000 } !trustlist
+
   http-request set-header X-Forwarded-Port %[dst_port]
+  server tbImagesApi1 tb-core1:8080 check inter 10s resolvers docker_resolver resolve-prefer ipv4 maxconn 50
+  server tbImagesApi2 tb-core2:8080 check inter 10s resolvers docker_resolver resolve-prefer ipv4 maxconn 50
diff --git a/docker/haproxy/config/trustlist.txt b/docker/haproxy/config/trustlist.txt
new file mode 100644
index 0000000000..93716b46d5
--- /dev/null
+++ b/docker/haproxy/config/trustlist.txt
@@ -0,0 +1,12 @@
+# Trusted list is intended to do not apply any limitations for trustees
+#
+# Private subnet example
+# 10.0.0.0/8
+# Docker-compose subnet
+172.16.0.0/12
+# Local network subnet
+192.168.0.0/16
+# Allow loopback interface
+127.0.0.1
+::1
+# Allow trusted IPs or CIDRs below
diff --git a/docker/tb-lwm2m-transport.env b/docker/tb-lwm2m-transport.env
index f284803a46..bf1d612410 100644
--- a/docker/tb-lwm2m-transport.env
+++ b/docker/tb-lwm2m-transport.env
@@ -3,6 +3,8 @@ ZOOKEEPER_URL=zookeeper:2181
 
 LWM2M_BIND_ADDRESS=0.0.0.0
 LWM2M_BIND_PORT=5685
+LWM2M_SECURITY_BIND_ADDRESS=0.0.0.0
+LWM2M_SECURITY_BIND_PORT=5686
 LWM2M_TIMEOUT=10000
 
 METRICS_ENABLED=true
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/client/Lwm2mClient.java b/monitoring/src/main/java/org/thingsboard/monitoring/client/Lwm2mClient.java
index 3f32eb54b4..4b95ae1aac 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/client/Lwm2mClient.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/client/Lwm2mClient.java
@@ -51,6 +51,7 @@ import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static org.eclipse.leshan.client.object.Security.noSec;
 import static org.eclipse.leshan.core.LwM2mId.ACCESS_CONTROL;
@@ -95,7 +96,7 @@ public class Lwm2mClient extends BaseInstanceEnabler implements Destroyable {
         LwM2mModel model = new StaticModel(models);
         ObjectsInitializer initializer = new ObjectsInitializer(model);
         initializer.setInstancesForObject(SECURITY, security);
-        initializer.setInstancesForObject(SERVER, new Server(123, 300));
+        initializer.setInstancesForObject(SERVER, new Server(123, TimeUnit.MINUTES.toSeconds(60)));
         initializer.setInstancesForObject(DEVICE, this);
         initializer.setClassForObject(ACCESS_CONTROL, DummyInstanceEnabler.class);
         DtlsConnectorConfig.Builder dtlsConfig = new DtlsConnectorConfig.Builder();
diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml
index d13bb54557..cbbd76a1f6 100644
--- a/msa/black-box-tests/pom.xml
+++ b/msa/black-box-tests/pom.xml
@@ -186,6 +186,10 @@
             <artifactId>allure-testng</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.leshan</groupId>
+            <artifactId>leshan-client-cf</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractLwm2mClientTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractLwm2mClientTest.java
new file mode 100644
index 0000000000..d0a8b53c32
--- /dev/null
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractLwm2mClientTest.java
@@ -0,0 +1,321 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.msa;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.eclipse.leshan.client.object.Security;
+import org.eclipse.leshan.core.util.Hex;
+import org.junit.Assert;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.DeviceProfileProvisionType;
+import org.thingsboard.server.common.data.DeviceProfileType;
+import org.thingsboard.server.common.data.DeviceTransportType;
+import org.thingsboard.server.common.data.ResourceType;
+import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MBootstrapClientCredentials;
+import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MClientCredential;
+import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MDeviceCredentials;
+import org.thingsboard.server.common.data.device.credentials.lwm2m.NoSecBootstrapClientCredential;
+import org.thingsboard.server.common.data.device.credentials.lwm2m.NoSecClientCredential;
+import org.thingsboard.server.common.data.device.credentials.lwm2m.PSKBootstrapClientCredential;
+import org.thingsboard.server.common.data.device.credentials.lwm2m.PSKClientCredential;
+import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileConfiguration;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
+import org.thingsboard.server.common.data.device.profile.DisabledDeviceProfileProvisionConfiguration;
+import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.lwm2m.OtherConfiguration;
+import org.thingsboard.server.common.data.device.profile.lwm2m.TelemetryMappingConfiguration;
+import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.LwM2MBootstrapServerCredential;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.common.data.security.DeviceCredentialsType;
+import org.thingsboard.server.msa.connectivity.lwm2m.LwM2MTestClient;
+import org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState;
+
+import java.net.ServerSocket;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.eclipse.leshan.client.object.Security.psk;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.CLIENT_ENDPOINT_NO_SEC;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.CLIENT_ENDPOINT_PSK;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.CLIENT_LWM2M_SETTINGS;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.CLIENT_PSK_IDENTITY;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.CLIENT_PSK_KEY;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_INIT;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_REGISTRATION_STARTED;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_REGISTRATION_SUCCESS;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_UPDATE_SUCCESS;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.OBSERVE_ATTRIBUTES_WITHOUT_PARAMS;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.SECURE_URI;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.SECURITY_NO_SEC;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.resources;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.shortServerId;
+
+@Slf4j
+public class AbstractLwm2mClientTest extends AbstractContainerTest{
+    protected ScheduledExecutorService executor;
+
+    protected Security security;
+
+    protected final PageLink pageLink = new PageLink(30);
+    protected TenantId tenantId;
+    protected DeviceProfile lwm2mDeviceProfile;
+    protected Device lwM2MDeviceTest;
+    protected LwM2MTestClient lwM2MTestClient;
+
+    public final Set<LwM2MClientState> expectedStatusesRegistrationLwm2mSuccess = new HashSet<>(Arrays.asList(ON_INIT, ON_REGISTRATION_STARTED, ON_REGISTRATION_SUCCESS));
+
+    public void connectLwm2mClientNoSec() throws Exception {
+        LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(CLIENT_ENDPOINT_NO_SEC));
+        basicTestConnection(SECURITY_NO_SEC,
+                deviceCredentials,
+                CLIENT_ENDPOINT_NO_SEC,
+                "TestConnection Lwm2m NoSec (msa)");
+    }
+
+    public void connectLwm2mClientPsk() throws Exception {
+        String clientEndpoint = CLIENT_ENDPOINT_PSK;
+        String identity = CLIENT_PSK_IDENTITY;
+        String keyPsk = CLIENT_PSK_KEY;
+        PSKClientCredential clientCredentials = new PSKClientCredential();
+        clientCredentials.setEndpoint(clientEndpoint);
+        clientCredentials.setIdentity(identity);
+        clientCredentials.setKey(keyPsk);
+        Security security = psk(SECURE_URI,
+                shortServerId,
+                identity.getBytes(StandardCharsets.UTF_8),
+                Hex.decodeHex(keyPsk.toCharArray()));
+        LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsSecurePsk(clientCredentials);
+
+        basicTestConnection(security,
+                deviceCredentials,
+                clientEndpoint,
+                "TestConnection Lwm2m Rpc (msa)");
+    }
+
+    public void basicTestConnection(Security security,
+                                    LwM2MDeviceCredentials deviceCredentials,
+                                    String clientEndpoint, String alias) throws Exception {
+        // create lwm2mClient and lwM2MDevice
+        lwM2MDeviceTest = createDeviceWithCredentials(deviceCredentials, clientEndpoint);
+        lwM2MTestClient = createNewClient(security, clientEndpoint, executor);
+
+        LwM2MClientState finishState =  ON_REGISTRATION_SUCCESS;
+        await(alias + " - " + ON_REGISTRATION_STARTED)
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    log.warn("msa basicTestConnection started -> finishState: [{}] states: {}", finishState, lwM2MTestClient.getClientStates());
+                    return lwM2MTestClient.getClientStates().contains(finishState) || lwM2MTestClient.getClientStates().contains(ON_REGISTRATION_STARTED);
+                });
+        await(alias + " - " + ON_UPDATE_SUCCESS)
+                .atMost(40, TimeUnit.SECONDS)
+                .until(() -> {
+                    log.warn("msa basicTestConnection update -> finishState: [{}] states: {}", finishState, lwM2MTestClient.getClientStates());
+                    return lwM2MTestClient.getClientStates().contains(finishState) || lwM2MTestClient.getClientStates().contains(ON_UPDATE_SUCCESS);
+                });
+        Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesRegistrationLwm2mSuccess));
+    }
+
+    public LwM2MTestClient createNewClient(Security security,
+                                           String endpoint, ScheduledExecutorService executor) throws Exception {
+        this.executor = executor;
+        LwM2MTestClient lwM2MTestClient = new LwM2MTestClient(endpoint);
+        try (ServerSocket socket = new ServerSocket(0)) {
+            int clientPort = socket.getLocalPort();
+            lwM2MTestClient.init(security, clientPort);
+        }
+        return lwM2MTestClient;
+    }
+
+    protected void destroyAfter(){
+        clientDestroy();
+        deviceDestroy();
+        deviceProfileDestroy();
+        if (executor != null) {
+            executor.shutdown();
+        }
+    }
+
+    protected void clientDestroy() {
+        try {
+            if (lwM2MTestClient != null) {
+                lwM2MTestClient.destroy();
+            }
+        } catch (Exception e) {
+            log.error("Failed client Destroy", e);
+        }
+    }
+    protected void deviceDestroy() {
+        try {
+            if (lwM2MDeviceTest != null) {
+                testRestClient.deleteDeviceIfExists(lwM2MDeviceTest.getId());
+            }
+        } catch (Exception e) {
+            log.error("Failed device Delete", e);
+        }
+    }
+
+    protected void initTest(String deviceProfileName) throws Exception {
+        if (executor != null) {
+            executor.shutdown();
+        }
+        executor = Executors.newScheduledThreadPool(10, ThingsBoardThreadFactory.forName("test-scheduled-" + deviceProfileName));
+
+        lwm2mDeviceProfile = getDeviceProfile(deviceProfileName);
+        tenantId = lwm2mDeviceProfile.getTenantId();
+
+        for (String resourceName : resources) {
+            TbResource lwModel = new TbResource();
+            lwModel.setResourceType(ResourceType.LWM2M_MODEL);
+            lwModel.setTitle(resourceName);
+            lwModel.setFileName(resourceName);
+            lwModel.setTenantId(tenantId);
+            byte[] bytes = IOUtils.toByteArray(AbstractLwm2mClientTest.class.getClassLoader().getResourceAsStream("lwm2m-registry/" + resourceName));
+            lwModel.setData(bytes);
+            testRestClient.postTbResourceIfNotExists(lwModel);
+        }
+    }
+
+    protected DeviceProfile getDeviceProfile(String deviceProfileName) throws Exception {
+        DeviceProfile deviceProfile = getDeviceProfileIfExists(deviceProfileName);
+        if (deviceProfile == null) {
+            deviceProfile = testRestClient.postDeviceProfile(createDeviceProfile(deviceProfileName));
+        }
+        return deviceProfile;
+    }
+
+    protected DeviceProfile getDeviceProfileIfExists(String deviceProfileName) throws Exception {
+        return testRestClient.getDeviceProfiles(pageLink).getData().stream()
+                .filter(x -> x.getName().equals(deviceProfileName))
+                .findFirst()
+                .orElse(null);
+    }
+
+
+    protected DeviceProfile createDeviceProfile(String deviceProfileName) throws Exception {
+        DeviceProfile deviceProfile = new DeviceProfile();
+        deviceProfile.setName(deviceProfileName);
+        deviceProfile.setType(DeviceProfileType.DEFAULT);
+        deviceProfile.setTransportType(DeviceTransportType.LWM2M);
+        deviceProfile.setProvisionType(DeviceProfileProvisionType.DISABLED);
+        deviceProfile.setDescription(deviceProfile.getName());
+
+        DeviceProfileData deviceProfileData = new DeviceProfileData();
+        deviceProfileData.setConfiguration(new DefaultDeviceProfileConfiguration());
+        deviceProfileData.setProvisionConfiguration(new DisabledDeviceProfileProvisionConfiguration(null));
+        deviceProfileData.setTransportConfiguration(getTransportConfiguration());
+        deviceProfile.setProfileData(deviceProfileData);
+        return deviceProfile;
+    }
+
+    protected void deviceProfileDestroy(){
+        try {
+            if (lwm2mDeviceProfile != null) {
+                testRestClient.deleteDeviceProfileIfExists(lwm2mDeviceProfile);
+            }
+        } catch (Exception e) {
+            log.error("Failed deviceProfile Delete", e);
+        }
+    }
+
+    protected Device createDeviceWithCredentials(LwM2MDeviceCredentials deviceCredentials, String clientEndpoint) throws Exception {
+        Device device = createDevice(deviceCredentials, clientEndpoint);
+        return device;
+    }
+
+    protected Device createDevice(LwM2MDeviceCredentials credentials, String clientEndpoint) throws Exception {
+        Device device = testRestClient.getDeviceByNameIfExists(clientEndpoint);
+        if (device == null) {
+            device = new Device();
+            device.setName(clientEndpoint);
+            device.setDeviceProfileId(lwm2mDeviceProfile.getId());
+            device.setTenantId(tenantId);
+            device = testRestClient.postDevice("", device);
+        }
+
+        DeviceCredentials deviceCredentials = testRestClient.getDeviceCredentialsByDeviceId(device.getId());
+        deviceCredentials.setCredentialsType(DeviceCredentialsType.LWM2M_CREDENTIALS);
+        deviceCredentials.setCredentialsValue(JacksonUtil.toString(credentials));
+        deviceCredentials = testRestClient.postDeviceCredentials(deviceCredentials);
+        assertThat(deviceCredentials).isNotNull();
+        return device;
+    }
+
+    protected LwM2MDeviceCredentials getDeviceCredentialsNoSec(LwM2MClientCredential clientCredentials) {
+        LwM2MDeviceCredentials credentials = new LwM2MDeviceCredentials();
+        credentials.setClient(clientCredentials);
+        LwM2MBootstrapClientCredentials bootstrapCredentials = new LwM2MBootstrapClientCredentials();
+        NoSecBootstrapClientCredential serverCredentials = new NoSecBootstrapClientCredential();
+        bootstrapCredentials.setBootstrapServer(serverCredentials);
+        bootstrapCredentials.setLwm2mServer(serverCredentials);
+        credentials.setBootstrap(bootstrapCredentials);
+        return credentials;
+    }
+
+    public NoSecClientCredential createNoSecClientCredentials(String clientEndpoint) {
+        NoSecClientCredential clientCredentials = new NoSecClientCredential();
+        clientCredentials.setEndpoint(clientEndpoint);
+        return clientCredentials;
+    }
+
+    protected Lwm2mDeviceProfileTransportConfiguration getTransportConfiguration() {
+        List<LwM2MBootstrapServerCredential> bootstrapServerCredentials = new ArrayList<>();
+        Lwm2mDeviceProfileTransportConfiguration transportConfiguration = new Lwm2mDeviceProfileTransportConfiguration();
+        TelemetryMappingConfiguration observeAttrConfiguration = JacksonUtil.fromString(OBSERVE_ATTRIBUTES_WITHOUT_PARAMS, TelemetryMappingConfiguration.class);
+        OtherConfiguration clientLwM2mSettings = JacksonUtil.fromString(CLIENT_LWM2M_SETTINGS, OtherConfiguration.class);
+        transportConfiguration.setBootstrapServerUpdateEnable(true);
+        transportConfiguration.setObserveAttr(observeAttrConfiguration);
+        transportConfiguration.setClientLwM2mSettings(clientLwM2mSettings);
+        transportConfiguration.setBootstrap(bootstrapServerCredentials);
+        return transportConfiguration;
+    }
+
+    protected LwM2MDeviceCredentials getDeviceCredentialsSecurePsk(LwM2MClientCredential clientCredentials) {
+        LwM2MDeviceCredentials credentials = new LwM2MDeviceCredentials();
+        credentials.setClient(clientCredentials);
+        LwM2MBootstrapClientCredentials bootstrapCredentials;
+        bootstrapCredentials = getBootstrapClientCredentialsPsk(clientCredentials);
+        credentials.setBootstrap(bootstrapCredentials);
+        return credentials;
+    }
+
+    private LwM2MBootstrapClientCredentials getBootstrapClientCredentialsPsk(LwM2MClientCredential clientCredentials) {
+        LwM2MBootstrapClientCredentials bootstrapCredentials = new LwM2MBootstrapClientCredentials();
+        PSKBootstrapClientCredential serverCredentials = new PSKBootstrapClientCredential();
+        if (clientCredentials != null) {
+            serverCredentials.setClientSecretKey(((PSKClientCredential) clientCredentials).getKey());
+            serverCredentials.setClientPublicKeyOrId(((PSKClientCredential) clientCredentials).getIdentity());
+        }
+        bootstrapCredentials.setBootstrapServer(serverCredentials);
+        bootstrapCredentials.setLwm2mServer(serverCredentials);
+        return bootstrapCredentials;
+    }
+}
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java
index 83c9c927aa..c76627d3a1 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java
@@ -23,6 +23,7 @@ import io.restassured.config.RestAssuredConfig;
 import io.restassured.filter.log.RequestLoggingFilter;
 import io.restassured.filter.log.ResponseLoggingFilter;
 import io.restassured.http.ContentType;
+import io.restassured.internal.ValidatableResponseImpl;
 import io.restassured.path.json.JsonPath;
 import io.restassured.response.ValidatableResponse;
 import io.restassured.specification.RequestSpecification;
@@ -32,6 +33,7 @@ import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.EventInfo;
+import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.asset.Asset;
@@ -63,6 +65,7 @@ import java.util.List;
 import java.util.Map;
 
 import static io.restassured.RestAssured.given;
+import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 import static java.net.HttpURLConnection.HTTP_OK;
 import static org.hamcrest.Matchers.is;
@@ -548,6 +551,43 @@ public class TestRestClient {
                 .as(new TypeRef<>() {});
     }
 
+    public ValidatableResponse postTbResourceIfNotExists(TbResource lwModel) {
+        return given().spec(requestSpec).body(lwModel)
+                .post("/api/resource")
+                .then()
+                .statusCode(anyOf(is(HTTP_OK), is(HTTP_BAD_REQUEST)));
+    }
+    public void deleteDeviceProfileIfExists(DeviceProfile deviceProfile) {
+        given().spec(requestSpec)
+                .delete("/api/deviceProfile/" + deviceProfile.getId().getId().toString())
+                .then()
+                .statusCode(anyOf(is(HTTP_OK), is(HTTP_NOT_FOUND)));
+    }
+
+    public Device getDeviceByNameIfExists(String deviceName) {
+        ValidatableResponse response = given().spec(requestSpec)
+                .pathParams("deviceName", deviceName)
+                .get("/api/tenant/devices?deviceName={deviceName}")
+                .then()
+                .statusCode(anyOf(is(HTTP_OK), is(HTTP_NOT_FOUND)));
+        if(((ValidatableResponseImpl) response).extract().response().getStatusCode()==HTTP_OK){
+            return   response.extract()
+                    .as(Device.class);
+        } else {
+            return  null;
+        }
+    }
+
+    public DeviceCredentials postDeviceCredentials(DeviceCredentials deviceCredentials) {
+        return given().spec(requestSpec).body(deviceCredentials)
+                .post("/api/device/credentials")
+                .then()
+                .assertThat()
+                .statusCode(HTTP_OK)
+                .extract()
+                .as(DeviceCredentials.class);
+    }
+
     private void addTimePageLinkToParam(Map<String, String> params, TimePageLink pageLink) {
         this.addPageLinkToParam(params, pageLink);
         if (pageLink.getStartTime() != null) {
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/Lwm2mClientNoSecTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/Lwm2mClientNoSecTest.java
new file mode 100644
index 0000000000..15658140b0
--- /dev/null
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/Lwm2mClientNoSecTest.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.msa.connectivity;
+
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import org.thingsboard.server.msa.AbstractLwm2mClientTest;
+import org.thingsboard.server.msa.DisableUIListeners;
+
+import static org.thingsboard.server.msa.ui.utils.Const.TENANT_EMAIL;
+import static org.thingsboard.server.msa.ui.utils.Const.TENANT_PASSWORD;
+
+@DisableUIListeners
+public class Lwm2mClientNoSecTest extends AbstractLwm2mClientTest {
+
+    @BeforeMethod
+    public void setUp() throws Exception {
+        testRestClient.login(TENANT_EMAIL, TENANT_PASSWORD);
+        initTest("lwm2m-NoSec");
+    }
+
+    @AfterMethod
+    public void tearDown() {
+        destroyAfter();
+    }
+
+    @Test
+    public void connectLwm2mClientNoSecWithLwm2mServer() throws Exception {
+        connectLwm2mClientNoSec();
+    }
+}
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/Lwm2mClientPskTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/Lwm2mClientPskTest.java
new file mode 100644
index 0000000000..fbd8139d8f
--- /dev/null
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/Lwm2mClientPskTest.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.msa.connectivity;
+
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import org.thingsboard.server.msa.AbstractLwm2mClientTest;
+import org.thingsboard.server.msa.DisableUIListeners;
+
+import static org.thingsboard.server.msa.ui.utils.Const.TENANT_EMAIL;
+import static org.thingsboard.server.msa.ui.utils.Const.TENANT_PASSWORD;
+
+@DisableUIListeners
+public class Lwm2mClientPskTest extends AbstractLwm2mClientTest {
+
+    @BeforeMethod
+    public void setUp() throws Exception {
+        testRestClient.login(TENANT_EMAIL, TENANT_PASSWORD);
+        initTest("lwm2m-Psk");
+    }
+
+    @AfterMethod
+    public void tearDown() {
+        destroyAfter();
+    }
+
+    @Test
+    public void connectLwm2mClientPskWithLwm2mServer() throws Exception {
+        connectLwm2mClientPsk();
+    }
+}
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/FwLwM2MDevice.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/FwLwM2MDevice.java
new file mode 100644
index 0000000000..2910a2b7da
--- /dev/null
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/FwLwM2MDevice.java
@@ -0,0 +1,157 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.msa.connectivity.lwm2m;
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
+import org.eclipse.leshan.client.servers.LwM2mServer;
+import org.eclipse.leshan.core.model.ObjectModel;
+import org.eclipse.leshan.core.node.LwM2mResource;
+import org.eclipse.leshan.core.request.argument.Arguments;
+import org.eclipse.leshan.core.response.ExecuteResponse;
+import org.eclipse.leshan.core.response.ReadResponse;
+import org.eclipse.leshan.core.response.WriteResponse;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
+
+import javax.security.auth.Destroyable;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Slf4j
+public class FwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
+
+    private static final List<Integer> supportedResources = Arrays.asList(0, 1, 2, 3, 5, 6, 7, 9);
+
+    private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(ThingsBoardThreadFactory.forName(getClass().getSimpleName() + "-test-scope"));
+
+    private final AtomicInteger state = new AtomicInteger(0);
+
+    private final AtomicInteger updateResult = new AtomicInteger(0);
+
+    @Override
+    public ReadResponse read(LwM2mServer identity, int resourceId) {
+        if (!identity.isSystem())
+            log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
+        switch (resourceId) {
+            case 3:
+                return ReadResponse.success(resourceId, getState());
+            case 5:
+                return ReadResponse.success(resourceId, getUpdateResult());
+            case 6:
+                return ReadResponse.success(resourceId, getPkgName());
+            case 7:
+                return ReadResponse.success(resourceId, getPkgVersion());
+            case 9:
+                return ReadResponse.success(resourceId, getFirmwareUpdateDeliveryMethod());
+            default:
+                return super.read(identity, resourceId);
+        }
+    }
+
+    @Override
+    public ExecuteResponse execute(LwM2mServer identity, int resourceId, Arguments arguments) {
+        String withArguments = "";
+        if (!arguments.isEmpty())
+            withArguments = " with arguments " + arguments;
+        log.info("Execute on Device resource /{}/{}/{} {}", getModel().id, getId(), resourceId, withArguments);
+
+
+        switch (resourceId) {
+            case 2:
+                startUpdating();
+                return ExecuteResponse.success();
+            default:
+                return super.execute(identity, resourceId, arguments);
+        }
+    }
+
+    @Override
+    public WriteResponse write(LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) {
+        log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
+
+        switch (resourceId) {
+            case 0:
+                startDownloading();
+                return WriteResponse.success();
+            case 1:
+                startDownloading();
+                return WriteResponse.success();
+            default:
+                return super.write(identity, replace, resourceId, value);
+        }
+    }
+
+    private int getState() {
+        return state.get();
+    }
+
+    private int getUpdateResult() {
+        return updateResult.get();
+    }
+
+    private String getPkgName() {
+        return "firmware";
+    }
+
+    private String getPkgVersion() {
+        return "1.0.0";
+    }
+
+    private int getFirmwareUpdateDeliveryMethod() {
+        return 1;
+    }
+
+    @Override
+    public List<Integer> getAvailableResourceIds(ObjectModel model) {
+        return supportedResources;
+    }
+
+    @Override
+    public void destroy() {
+        scheduler.shutdownNow();
+    }
+
+    private void startDownloading() {
+        scheduler.schedule(() -> {
+            try {
+                state.set(1);
+                fireResourceChange(3);
+                Thread.sleep(100);
+                state.set(2);
+                fireResourceChange(3);
+            } catch (Exception e) {
+            }
+        }, 100, TimeUnit.MILLISECONDS);
+    }
+
+    private void startUpdating() {
+        scheduler.schedule(() -> {
+            try {
+                state.set(3);
+                fireResourceChange(3);
+                Thread.sleep(100);
+                updateResult.set(1);
+                fireResourceChange(5);
+            } catch (Exception e) {
+            }
+        }, 100, TimeUnit.MILLISECONDS);
+    }
+
+}
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/LwM2MTestClient.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/LwM2MTestClient.java
new file mode 100644
index 0000000000..9b1ab4bd22
--- /dev/null
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/LwM2MTestClient.java
@@ -0,0 +1,338 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.msa.connectivity.lwm2m;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.elements.config.Configuration;
+import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
+import org.eclipse.leshan.client.LeshanClient;
+import org.eclipse.leshan.client.LeshanClientBuilder;
+import org.eclipse.leshan.client.californium.endpoint.CaliforniumClientEndpointFactory;
+import org.eclipse.leshan.client.californium.endpoint.CaliforniumClientEndpointsProvider;
+import org.eclipse.leshan.client.californium.endpoint.ClientProtocolProvider;
+import org.eclipse.leshan.client.californium.endpoint.coap.CoapOscoreProtocolProvider;
+import org.eclipse.leshan.client.californium.endpoint.coaps.CoapsClientEndpointFactory;
+import org.eclipse.leshan.client.californium.endpoint.coaps.CoapsClientProtocolProvider;
+import org.eclipse.leshan.client.endpoint.LwM2mClientEndpointsProvider;
+import org.eclipse.leshan.client.engine.DefaultRegistrationEngineFactory;
+import org.eclipse.leshan.client.object.Security;
+import org.eclipse.leshan.client.object.Server;
+import org.eclipse.leshan.client.observer.LwM2mClientObserver;
+import org.eclipse.leshan.client.resource.DummyInstanceEnabler;
+import org.eclipse.leshan.client.resource.LwM2mObjectEnabler;
+import org.eclipse.leshan.client.resource.ObjectsInitializer;
+import org.eclipse.leshan.client.resource.listener.ObjectsListenerAdapter;
+import org.eclipse.leshan.client.send.ManualDataSender;
+import org.eclipse.leshan.client.servers.LwM2mServer;
+import org.eclipse.leshan.core.ResponseCode;
+import org.eclipse.leshan.core.model.InvalidDDFFileException;
+import org.eclipse.leshan.core.model.LwM2mModel;
+import org.eclipse.leshan.core.model.ObjectLoader;
+import org.eclipse.leshan.core.model.ObjectModel;
+import org.eclipse.leshan.core.model.StaticModel;
+import org.eclipse.leshan.core.node.codec.DefaultLwM2mDecoder;
+import org.eclipse.leshan.core.node.codec.DefaultLwM2mEncoder;
+import org.eclipse.leshan.core.request.BootstrapRequest;
+import org.eclipse.leshan.core.request.DeregisterRequest;
+import org.eclipse.leshan.core.request.RegisterRequest;
+import org.eclipse.leshan.core.request.UpdateRequest;
+import org.junit.Assert;
+import org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CONNECTION_ID_LENGTH;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY;
+import static org.eclipse.leshan.core.LwM2mId.ACCESS_CONTROL;
+import static org.eclipse.leshan.core.LwM2mId.DEVICE;
+import static org.eclipse.leshan.core.LwM2mId.FIRMWARE;
+import static org.eclipse.leshan.core.LwM2mId.SECURITY;
+import static org.eclipse.leshan.core.LwM2mId.SERVER;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_BOOTSTRAP_FAILURE;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_BOOTSTRAP_STARTED;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_BOOTSTRAP_SUCCESS;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_BOOTSTRAP_TIMEOUT;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_DEREGISTRATION_FAILURE;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_DEREGISTRATION_STARTED;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_DEREGISTRATION_SUCCESS;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_DEREGISTRATION_TIMEOUT;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_EXPECTED_ERROR;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_INIT;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_REGISTRATION_FAILURE;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_REGISTRATION_STARTED;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_REGISTRATION_SUCCESS;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_REGISTRATION_TIMEOUT;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_UPDATE_FAILURE;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_UPDATE_STARTED;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_UPDATE_SUCCESS;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.LwM2MClientState.ON_UPDATE_TIMEOUT;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.resources;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.serverId;
+import static org.thingsboard.server.msa.connectivity.lwm2m.Lwm2mTestHelper.shortServerId;
+
+
+@Slf4j
+@Data
+public class LwM2MTestClient {
+
+    private final String endpoint;
+    private LeshanClient leshanClient;
+    private SimpleLwM2MDevice lwM2MDevice;
+
+    private Set<LwM2MClientState> clientStates;
+
+    private FwLwM2MDevice fwLwM2MDevice;
+    private Map<LwM2MClientState, Integer> clientDtlsCid;
+
+    public void init(Security security, int clientPort) throws InvalidDDFFileException, IOException {
+        Assert.assertNull("client already initialized", leshanClient);
+
+        List<ObjectModel> models = new ArrayList<>();
+        for (String resourceName : resources) {
+            models.addAll(ObjectLoader.loadDdfFile(LwM2MTestClient.class.getClassLoader().getResourceAsStream("lwm2m-registry/" + resourceName), resourceName));
+        }
+        LwM2mModel model = new StaticModel(models);
+        ObjectsInitializer initializer = new ObjectsInitializer(model);
+
+        // SECURITY
+        initializer.setInstancesForObject(SECURITY, security);
+        // SERVER
+        Server lwm2mServer = new Server(shortServerId, TimeUnit.MINUTES.toSeconds(60));
+        lwm2mServer.setId(serverId);
+        initializer.setInstancesForObject(SERVER, lwm2mServer);
+
+        initializer.setInstancesForObject(DEVICE, lwM2MDevice = new SimpleLwM2MDevice());
+        initializer.setClassForObject(ACCESS_CONTROL, DummyInstanceEnabler.class);
+        initializer.setInstancesForObject(FIRMWARE, fwLwM2MDevice = new FwLwM2MDevice());
+
+        List<LwM2mObjectEnabler> enablers = initializer.createAll();
+
+        // Create Californium Endpoints Provider:
+        // --------------------------------------
+        // Define Custom CoAPS protocol provider
+        CoapsClientProtocolProvider customCoapsProtocolProvider = new CoapsClientProtocolProvider() {
+            @Override
+            public CaliforniumClientEndpointFactory createDefaultEndpointFactory() {
+                return new CoapsClientEndpointFactory() {
+
+                    @Override
+                    protected DtlsConnectorConfig.Builder createRootDtlsConnectorConfigBuilder(
+                            Configuration configuration) {
+                        DtlsConnectorConfig.Builder builder = super.createRootDtlsConnectorConfigBuilder(configuration);
+                        return builder;
+                    };
+                };
+            }
+        };
+
+        // Create client endpoints Provider
+        List<ClientProtocolProvider> protocolProvider = new ArrayList<>();
+
+        /**
+         * "Use java-coap for CoAP protocol instead of Californium."
+         */
+        protocolProvider.add(new CoapOscoreProtocolProvider());
+        protocolProvider.add(customCoapsProtocolProvider);
+        CaliforniumClientEndpointsProvider.Builder endpointsBuilder = new CaliforniumClientEndpointsProvider.Builder(
+                protocolProvider.toArray(new ClientProtocolProvider[protocolProvider.size()]));
+
+
+        // Create Californium Configuration
+        Configuration clientCoapConfig = endpointsBuilder.createDefaultConfiguration();
+
+        // Set some DTLS stuff
+        // These configuration values are always overwritten by CLI therefore set them to transient.
+        clientCoapConfig.setTransient(DTLS_RECOMMENDED_CIPHER_SUITES_ONLY);
+        clientCoapConfig.setTransient(DTLS_CONNECTION_ID_LENGTH);
+        boolean supportDeprecatedCiphers = false;
+        clientCoapConfig.set(DTLS_RECOMMENDED_CIPHER_SUITES_ONLY, !supportDeprecatedCiphers);
+
+        // Set Californium Configuration
+
+        endpointsBuilder.setConfiguration(clientCoapConfig);
+        endpointsBuilder.setClientAddress(new InetSocketAddress(clientPort).getAddress());
+
+
+        // creates EndpointsProvider
+        List<LwM2mClientEndpointsProvider> endpointsProvider = new ArrayList<>();
+        endpointsProvider.add(endpointsBuilder.build());
+
+        // Configure Registration Engine
+        DefaultRegistrationEngineFactory engineFactory = new DefaultRegistrationEngineFactory();
+        /**
+         * Force reconnection/rehandshake on registration update.
+         */
+        int comPeriodInSec = 5;
+        if (comPeriodInSec > 0)   engineFactory.setCommunicationPeriod(comPeriodInSec * 1000);
+
+        /**
+         * By default client will try to resume DTLS session by using abbreviated Handshake. This option force to always do a full handshake."
+         */
+        boolean reconnectOnUpdate = false;
+        engineFactory.setReconnectOnUpdate(reconnectOnUpdate);
+        engineFactory.setResumeOnConnect(true);
+
+        /**
+         * Client use queue mode.
+         */
+        engineFactory.setQueueMode(false);
+
+        // Create client
+        LeshanClientBuilder builder = new LeshanClientBuilder(endpoint);
+        builder.setObjects(enablers);
+        builder.setEndpointsProviders(endpointsProvider.toArray(new LwM2mClientEndpointsProvider[endpointsProvider.size()]));
+        builder.setDataSenders(new ManualDataSender());
+        builder.setRegistrationEngineFactory(engineFactory);
+        boolean supportOldFormat =  true;
+        if (supportOldFormat) {
+            builder.setDecoder(new DefaultLwM2mDecoder(supportOldFormat));
+            builder.setEncoder(new DefaultLwM2mEncoder(new LwM2mValueConverterImpl(), supportOldFormat));
+        }
+
+        builder.setRegistrationEngineFactory(engineFactory);
+//        builder.setSharedExecutor(executor);
+
+        clientStates = new HashSet<>();
+        clientDtlsCid = new HashMap<>();
+        clientStates.add(ON_INIT);
+        leshanClient = builder.build();
+
+        LwM2mClientObserver observer = new LwM2mClientObserver() {
+            @Override
+            public void onBootstrapStarted(LwM2mServer bsserver, BootstrapRequest request) {
+                clientStates.add(ON_BOOTSTRAP_STARTED);
+            }
+
+            @Override
+            public void onBootstrapSuccess(LwM2mServer bsserver, BootstrapRequest request) {
+                clientStates.add(ON_BOOTSTRAP_SUCCESS);
+            }
+
+            @Override
+            public void onBootstrapFailure(LwM2mServer bsserver, BootstrapRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
+                clientStates.add(ON_BOOTSTRAP_FAILURE);
+            }
+
+            @Override
+            public void onBootstrapTimeout(LwM2mServer bsserver, BootstrapRequest request) {
+                clientStates.add(ON_BOOTSTRAP_TIMEOUT);
+            }
+
+            @Override
+            public void onRegistrationStarted(LwM2mServer server, RegisterRequest request) {
+                clientStates.add(ON_REGISTRATION_STARTED);
+            }
+
+            @Override
+            public void onRegistrationSuccess(LwM2mServer server, RegisterRequest request, String registrationID) {
+                clientStates.add(ON_REGISTRATION_SUCCESS);
+            }
+
+            @Override
+            public void onRegistrationFailure(LwM2mServer server, RegisterRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
+                clientStates.add(ON_REGISTRATION_FAILURE);
+            }
+
+            @Override
+            public void onRegistrationTimeout(LwM2mServer server, RegisterRequest request) {
+                clientStates.add(ON_REGISTRATION_TIMEOUT);
+            }
+
+            @Override
+            public void onUpdateStarted(LwM2mServer server, UpdateRequest request) {
+                clientStates.add(ON_UPDATE_STARTED);
+            }
+
+            @Override
+            public void onUpdateSuccess(LwM2mServer server, UpdateRequest request) {
+                clientStates.add(ON_UPDATE_SUCCESS);
+            }
+
+            @Override
+            public void onUpdateFailure(LwM2mServer server, UpdateRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
+                clientStates.add(ON_UPDATE_FAILURE);
+            }
+
+            @Override
+            public void onUpdateTimeout(LwM2mServer server, UpdateRequest request) {
+                clientStates.add(ON_UPDATE_TIMEOUT);
+            }
+
+            @Override
+            public void onDeregistrationStarted(LwM2mServer server, DeregisterRequest request) {
+                clientStates.add(ON_DEREGISTRATION_STARTED);
+            }
+
+            @Override
+            public void onDeregistrationSuccess(LwM2mServer server, DeregisterRequest request) {
+                clientStates.add(ON_DEREGISTRATION_SUCCESS);
+            }
+
+            @Override
+            public void onDeregistrationFailure(LwM2mServer server, DeregisterRequest request, ResponseCode responseCode, String errorMessage, Exception cause) {
+                clientStates.add(ON_DEREGISTRATION_FAILURE);
+            }
+
+            @Override
+            public void onDeregistrationTimeout(LwM2mServer server, DeregisterRequest request) {
+                clientStates.add(ON_DEREGISTRATION_TIMEOUT);
+            }
+
+            @Override
+            public void onUnexpectedError(Throwable unexpectedError) {
+                clientStates.add(ON_EXPECTED_ERROR);
+            }
+        };
+        this.leshanClient.addObserver(observer);
+
+        // Add some log about object tree life cycle.
+        this.leshanClient.getObjectTree().addListener(new ObjectsListenerAdapter() {
+
+            @Override
+            public void objectRemoved(LwM2mObjectEnabler object) {
+                log.info("Object {} v{} disabled.", object.getId(), object.getObjectModel().version);
+            }
+
+            @Override
+            public void objectAdded(LwM2mObjectEnabler object) {
+                log.info("Object {} v{} enabled.", object.getId(), object.getObjectModel().version);
+            }
+        });
+
+        leshanClient.start();
+    }
+
+    public void destroy() {
+        if (leshanClient != null) {
+            leshanClient.destroy(true);
+        }
+        if (lwM2MDevice != null) {
+            lwM2MDevice.destroy();
+        }
+        if (fwLwM2MDevice != null) {
+            fwLwM2MDevice.destroy();
+        }
+    }
+}
\ No newline at end of file
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/LwM2mValueConverterImpl.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/LwM2mValueConverterImpl.java
new file mode 100644
index 0000000000..b49d54f27e
--- /dev/null
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/LwM2mValueConverterImpl.java
@@ -0,0 +1,192 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.msa.connectivity.lwm2m;
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.core.model.ResourceModel.Type;
+import org.eclipse.leshan.core.node.LwM2mPath;
+import org.eclipse.leshan.core.node.ObjectLink;
+import org.eclipse.leshan.core.node.codec.CodecException;
+import org.eclipse.leshan.core.node.codec.LwM2mValueConverter;
+import org.eclipse.leshan.core.util.Hex;
+import org.thingsboard.server.common.data.StringUtils;
+
+import java.math.BigInteger;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Base64;
+import java.util.Date;
+
+import static org.eclipse.leshan.core.model.ResourceModel.Type.OPAQUE;
+
+@Slf4j
+public class LwM2mValueConverterImpl implements LwM2mValueConverter {
+
+    private static final LwM2mValueConverterImpl INSTANCE = new LwM2mValueConverterImpl();
+
+    public static LwM2mValueConverterImpl getInstance() {
+        return INSTANCE;
+    }
+
+    @Override
+    public Object convertValue(Object value, Type currentType, Type expectedType, LwM2mPath resourcePath)
+            throws CodecException {
+        if (value == null) {
+            return null;
+        }
+        if (expectedType == null) {
+            /** unknown resource, trusted value */
+            return value;
+        }
+
+        if (currentType == expectedType) {
+            /** expected type */
+            return value;
+        }
+        if (currentType == null) {
+            currentType = OPAQUE;
+        }
+
+        switch (expectedType) {
+            case INTEGER:
+                switch (currentType) {
+                    case FLOAT:
+                        log.debug("Trying to convert float value [{}] to Integer", value);
+                        Long longValue = ((Double) value).longValue();
+                        if ((double) value == longValue.doubleValue()) {
+                            return longValue;
+                        }
+                    case STRING:
+                        log.debug("Trying to convert String value [{}] to Integer", value);
+                        return Long.parseLong((String) value);
+                    default:
+                        break;
+                }
+                break;
+            case FLOAT:
+                switch (currentType) {
+                    case INTEGER:
+                        log.debug("Trying to convert integer value [{}] to float", value);
+                        Double floatValue = ((Long) value).doubleValue();
+                        if ((long) value == floatValue.longValue()) {
+                            return floatValue;
+                        }
+                    case STRING:
+                        log.debug("Trying to convert String value [{}] to Float", value);
+                        return Float.valueOf((String) value);
+                    default:
+                        break;
+                }
+                break;
+            case BOOLEAN:
+                switch (currentType) {
+                    case STRING:
+                        log.debug("Trying to convert string value {} to boolean", value);
+                        if (StringUtils.equalsIgnoreCase((String) value, "true")) {
+                            return true;
+                        } else if (StringUtils.equalsIgnoreCase((String) value, "false")) {
+                            return false;
+                        }
+                        break;
+                    case INTEGER:
+                        log.debug("Trying to convert int value {} to boolean", value);
+                        Long val = (Long) value;
+                        if (val == 1) {
+                            return true;
+                        } else if (val == 0) {
+                            return false;
+                        }
+                        break;
+                    default:
+                        break;
+                }
+                break;
+            case TIME:
+                switch (currentType) {
+                    case INTEGER:
+                        log.debug("Trying to convert long value {} to date", value);
+                        /* let's assume we received the millisecond since 1970/1/1 */
+                        return new Date(((Number) value).longValue() * 1000L);
+                    case STRING:
+                        log.debug("Trying to convert string value {} to date", value);
+                        /** let's assume we received an ISO 8601 format date */
+                        try {
+                            return new Date(Long.decode(value.toString()));
+                            /**
+                             DatatypeFactory datatypeFactory = DatatypeFactory.newInstance();
+                             XMLGregorianCalendar cal = datatypeFactory.newXMLGregorianCalendar((String) value);
+                             return cal.toGregorianCalendar().getTime();
+                             **/
+                        } catch (IllegalArgumentException e) {
+                            log.debug("Unable to convert string to date", e);
+                            throw new CodecException("Unable to convert string (%s) to date for resource %s", value,
+                                    resourcePath);
+                        }
+                    default:
+                        break;
+                }
+                break;
+            case STRING:
+                switch (currentType) {
+                    case BOOLEAN:
+                    case INTEGER:
+                    case FLOAT:
+                        return String.valueOf(value);
+                    case TIME:
+                        String DATE_FORMAT = "MMM d, yyyy HH:mm a";
+                        Long timeValue;
+                        try {
+                            timeValue = ((Date) value).getTime();
+                        }
+                        catch (Exception e){
+                            timeValue = new BigInteger((byte [])value).longValue();
+                        }
+                        DateFormat formatter = new SimpleDateFormat(DATE_FORMAT);
+                        return formatter.format(new Date(timeValue));
+                    case OPAQUE:
+                        return Hex.encodeHexString((byte[])value);
+                    case OBJLNK:
+                        return ObjectLink.decodeFromString((String) value);
+                    default:
+                        break;
+                }
+                break;
+            case OPAQUE:
+                if (currentType == Type.STRING) {
+                    /** let's assume we received an hexadecimal string */
+                    log.debug("Trying to convert hexadecimal/base64 string [{}] to byte array", value);
+                    try {
+                        return Hex.decodeHex(((String)value).toCharArray());
+                    } catch (IllegalArgumentException e) {
+                        try {
+                            return Base64.getDecoder().decode((String) value);
+                        } catch (IllegalArgumentException ea) {
+                            throw new CodecException("Unable to convert hexastring or base64 [%s] to byte array for resource %s",
+                                    value, resourcePath);
+                        }
+                    }
+                }
+                break;
+            case OBJLNK:
+                if (currentType == Type.STRING) {
+                    return ObjectLink.fromPath(value.toString());
+                }
+            default:
+        }
+        throw new CodecException("Invalid value type for resource %s, expected %s, got %s", resourcePath, expectedType,
+                currentType);
+    }
+}
\ No newline at end of file
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/Lwm2mTestHelper.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/Lwm2mTestHelper.java
new file mode 100644
index 0000000000..dfb4c71a1e
--- /dev/null
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/Lwm2mTestHelper.java
@@ -0,0 +1,134 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.msa.connectivity.lwm2m;
+
+import org.eclipse.californium.elements.config.Configuration;
+import org.eclipse.leshan.client.object.Security;
+
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CONNECTION_ID_LENGTH;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CONNECTION_ID_NODE_ID;
+import static org.eclipse.leshan.client.object.Security.noSec;
+
+public class Lwm2mTestHelper {
+
+    // Models
+    public static final String[] resources = new String[]{ "0.xml", "1.xml", "2.xml", "3.xml", "5.xml"};
+    public static final int serverId = 1;
+
+    public static final int port = 5685;
+    public static final int securityPort = 5686;
+    public static final Integer shortServerId = 123;
+
+    public static final String host = "localhost";
+    public static final String COAP = "coap://";
+    public static final String COAPS = "coaps://";
+    public static final String URI = COAP + host + ":" + port;
+    public static final String SECURE_URI = COAPS + host + ":" + securityPort;
+    public static final String CLIENT_ENDPOINT_NO_SEC = "LwNoSec00000000";
+    public static final Security SECURITY_NO_SEC = noSec(URI, shortServerId);
+
+    public static final String CLIENT_ENDPOINT_PSK = "LwPsk00000000";
+    public static final String CLIENT_PSK_IDENTITY = "SOME_PSK_ID";
+    public static final String CLIENT_PSK_KEY = "73656372657450534b73656372657450";
+
+
+    public static final String OBSERVE_ATTRIBUTES_WITHOUT_PARAMS =
+            "    {\n" +
+                    "    \"keyName\": {},\n" +
+                    "    \"observe\": [],\n" +
+                    "    \"attribute\": [],\n" +
+                    "    \"telemetry\": [],\n" +
+                    "    \"attributeLwm2m\": {}\n" +
+                    "  }";
+
+    public static final String CLIENT_LWM2M_SETTINGS =
+            "     {\n" +
+                    "    \"edrxCycle\": null,\n" +
+                    "    \"powerMode\": \"DRX\",\n" +
+                    "    \"fwUpdateResource\": null,\n" +
+                    "    \"fwUpdateStrategy\": 1,\n" +
+                    "    \"psmActivityTimer\": null,\n" +
+                    "    \"swUpdateResource\": null,\n" +
+                    "    \"swUpdateStrategy\": 1,\n" +
+                    "    \"pagingTransmissionWindow\": null,\n" +
+                    "    \"clientOnlyObserveAfterConnect\": 1\n" +
+                    "  }";
+
+    public static final int BINARY_APP_DATA_CONTAINER = 19;
+    public static final int OBJECT_INSTANCE_ID_0 = 0;
+    public static final int OBJECT_INSTANCE_ID_1 = 1;
+
+    public enum LwM2MClientState {
+
+        ON_INIT(0, "onInit"),
+        ON_BOOTSTRAP_STARTED(1, "onBootstrapStarted"),
+        ON_BOOTSTRAP_SUCCESS(2, "onBootstrapSuccess"),
+        ON_BOOTSTRAP_FAILURE(3, "onBootstrapFailure"),
+        ON_BOOTSTRAP_TIMEOUT(4, "onBootstrapTimeout"),
+        ON_REGISTRATION_STARTED(5, "onRegistrationStarted"),
+        ON_REGISTRATION_SUCCESS(6, "onRegistrationSuccess"),
+        ON_REGISTRATION_FAILURE(7, "onRegistrationFailure"),
+        ON_REGISTRATION_TIMEOUT(7, "onRegistrationTimeout"),
+        ON_UPDATE_STARTED(8, "onUpdateStarted"),
+        ON_UPDATE_SUCCESS(9, "onUpdateSuccess"),
+        ON_UPDATE_FAILURE(10, "onUpdateFailure"),
+        ON_UPDATE_TIMEOUT(11, "onUpdateTimeout"),
+        ON_DEREGISTRATION_STARTED(12, "onDeregistrationStarted"),
+        ON_DEREGISTRATION_SUCCESS(13, "onDeregistrationSuccess"),
+        ON_DEREGISTRATION_FAILURE(14, "onDeregistrationFailure"),
+        ON_DEREGISTRATION_TIMEOUT(15, "onDeregistrationTimeout"),
+        ON_EXPECTED_ERROR(16, "onUnexpectedError"),
+        ON_READ_CONNECTION_ID (17, "onReadConnection"),
+        ON_WRITE_CONNECTION_ID (18, "onWriteConnection");
+
+        public int code;
+        public String type;
+
+        LwM2MClientState(int code, String type) {
+            this.code = code;
+            this.type = type;
+        }
+
+        public static LwM2MClientState fromLwM2MClientStateByType(String type) {
+            for (LwM2MClientState to : LwM2MClientState.values()) {
+                if (to.type.equals(type)) {
+                    return to;
+                }
+            }
+            throw new IllegalArgumentException(String.format("Unsupported Client State type  : %s", type));
+        }
+
+        public static LwM2MClientState fromLwM2MClientStateByCode(int code) {
+            for (LwM2MClientState to : LwM2MClientState.values()) {
+                if (to.code == code) {
+                    return to;
+                }
+            }
+            throw new IllegalArgumentException(String.format("Unsupported Client State code : %s", code));
+        }
+    }
+
+    public static void setDtlsConnectorConfigCidLength(Configuration serverCoapConfig, Integer cIdLength) {
+        serverCoapConfig.setTransient(DTLS_CONNECTION_ID_LENGTH);
+        serverCoapConfig.setTransient(DTLS_CONNECTION_ID_NODE_ID);
+        serverCoapConfig.set(DTLS_CONNECTION_ID_LENGTH, cIdLength);
+        if ( cIdLength > 4) {
+            serverCoapConfig.set(DTLS_CONNECTION_ID_NODE_ID, 0);
+        } else {
+            serverCoapConfig.set(DTLS_CONNECTION_ID_NODE_ID, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/SimpleLwM2MDevice.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/SimpleLwM2MDevice.java
new file mode 100644
index 0000000000..d2aa1af4d2
--- /dev/null
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/SimpleLwM2MDevice.java
@@ -0,0 +1,218 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.msa.connectivity.lwm2m;
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
+import org.eclipse.leshan.client.servers.LwM2mServer;
+import org.eclipse.leshan.core.Destroyable;
+import org.eclipse.leshan.core.model.ObjectModel;
+import org.eclipse.leshan.core.model.ResourceModel;
+import org.eclipse.leshan.core.node.LwM2mResource;
+import org.eclipse.leshan.core.request.argument.Arguments;
+import org.eclipse.leshan.core.response.ExecuteResponse;
+import org.eclipse.leshan.core.response.ReadResponse;
+import org.eclipse.leshan.core.response.WriteResponse;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.PrimitiveIterator;
+import java.util.Random;
+import java.util.TimeZone;
+
+@Slf4j
+public class SimpleLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
+
+
+    private static final Random RANDOM = new Random();
+    private static final int min = 5;
+    private static final int max = 50;
+    private static final  PrimitiveIterator.OfInt randomIterator = new Random().ints(min,max + 1).iterator();
+    private static final List<Integer> supportedResources = Arrays.asList(0, 1, 2, 3, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21);
+
+
+    public SimpleLwM2MDevice() {
+    }
+
+
+
+    @Override
+    public ReadResponse read(LwM2mServer identity, int resourceId) {
+        if (!identity.isSystem())
+            log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
+        switch (resourceId) {
+            case 0:
+                return ReadResponse.success(resourceId, getManufacturer());
+            case 1:
+                return ReadResponse.success(resourceId, getModelNumber());
+            case 2:
+                return ReadResponse.success(resourceId, getSerialNumber());
+            case 3:
+                return ReadResponse.success(resourceId, getFirmwareVersion());
+            case 6:
+                return ReadResponse.success(resourceId, getAvailablePowerSources(), ResourceModel.Type.INTEGER);
+            case 9:
+                return ReadResponse.success(resourceId, getBatteryLevel());
+            case 10:
+                return ReadResponse.success(resourceId, getMemoryFree());
+            case 11:
+                Map<Integer, Long> errorCodes = new HashMap<>();
+                errorCodes.put(0, getErrorCode());
+                return ReadResponse.success(resourceId, errorCodes, ResourceModel.Type.INTEGER);
+            case 14:
+                return ReadResponse.success(resourceId, getUtcOffset());
+            case 15:
+                return ReadResponse.success(resourceId, getTimezone());
+            case 16:
+                return ReadResponse.success(resourceId, getSupportedBinding());
+            case 17:
+                return ReadResponse.success(resourceId, getDeviceType());
+            case 18:
+                return ReadResponse.success(resourceId, getHardwareVersion());
+            case 19:
+                return ReadResponse.success(resourceId, getSoftwareVersion());
+            case 20:
+                return ReadResponse.success(resourceId, getBatteryStatus());
+            case 21:
+                return ReadResponse.success(resourceId, getMemoryTotal());
+            default:
+                return super.read(identity, resourceId);
+        }
+    }
+
+    @Override
+    public ExecuteResponse execute(LwM2mServer identity, int resourceId, Arguments arguments) {
+        String withArguments = "";
+        if (!arguments.isEmpty())
+            withArguments = " with arguments " + arguments;
+        log.info("Execute on Device resource /{}/{}/{} {}", getModel().id, getId(), resourceId, withArguments);
+        return ExecuteResponse.success();
+    }
+
+    @Override
+    public WriteResponse write(LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) {
+        log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
+
+        switch (resourceId) {
+            case 13:
+                return WriteResponse.notFound();
+            case 14:
+                setUtcOffset((String) value.getValue());
+                fireResourceChange(resourceId);
+                return WriteResponse.success();
+            case 15:
+                setTimezone((String) value.getValue());
+                fireResourceChange(resourceId);
+                return WriteResponse.success();
+            default:
+                return super.write(identity, replace, resourceId, value);
+        }
+    }
+
+    private String getManufacturer() {
+        return "Thingsboard Demo Lwm2mDevice";
+    }
+
+    private String getModelNumber() {
+        return "Model 500";
+    }
+
+    private String getSerialNumber() {
+        return "Thingsboard-500-000-0001";
+    }
+
+    private String getFirmwareVersion() {
+        return "1.0.2";
+    }
+
+    private long getErrorCode() {
+        return 0;
+    }
+
+    private Map<Integer, Long> getAvailablePowerSources() {
+        Map<Integer, Long> availablePowerSources = new HashMap<>();
+        availablePowerSources.put(0, 1L);
+        availablePowerSources.put(1, 2L);
+        availablePowerSources.put(2, 5L);
+        return availablePowerSources;
+    }
+
+    private int getBatteryLevel() {
+        return randomIterator.nextInt();
+//        return 42;
+    }
+
+    private long getMemoryFree() {
+        return Runtime.getRuntime().freeMemory() / 1024;
+    }
+
+    private String utcOffset = new SimpleDateFormat("X").format(Calendar.getInstance().getTime());
+
+    private String getUtcOffset() {
+        return utcOffset;
+    }
+
+    private void setUtcOffset(String t) {
+        utcOffset = t;
+    }
+
+    private String timeZone = TimeZone.getDefault().getID();
+
+    private String getTimezone() {
+        return timeZone;
+    }
+
+    private void setTimezone(String t) {
+        timeZone = t;
+    }
+
+    private String getSupportedBinding() {
+        return "U";
+    }
+
+    private String getDeviceType() {
+        return "Demo";
+    }
+
+    private String getHardwareVersion() {
+        return "1.0.1";
+    }
+
+    private String getSoftwareVersion() {
+        return "1.0.2";
+    }
+
+    private int getBatteryStatus() {
+        return RANDOM.nextInt(7);
+    }
+
+    private long getMemoryTotal() {
+        return Runtime.getRuntime().totalMemory() / 1024;
+    }
+
+    @Override
+    public List<Integer> getAvailableResourceIds(ObjectModel model) {
+        return supportedResources;
+    }
+
+    @Override
+    public void destroy() {
+    }
+}
diff --git a/msa/black-box-tests/src/test/resources/lwm2m-registry/0.xml b/msa/black-box-tests/src/test/resources/lwm2m-registry/0.xml
new file mode 100644
index 0000000000..81e8523880
--- /dev/null
+++ b/msa/black-box-tests/src/test/resources/lwm2m-registry/0.xml
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_0-V1_2-20201110-A.xml
+   Path: http://www.openmobilealliance.org/release/ObjLwM2M_Security/
+
+OMNA LwM2M Registry
+   Path: https://github.com/OpenMobileAlliance/lwm2m-registry
+   Name: 0.xml
+
+NORMATIVE INFORMATION
+
+  Information about this file can be found in the latest revision of
+
+  OMA-TS-LightweightM2M_Core-V1_2
+
+  This is available at http://www.openmobilealliance.org/release/LightweightM2M/
+
+  Send comments to https://github.com/OpenMobileAlliance/OMA_LwM2M_for_Developers/issues
+
+LEGAL DISCLAIMER
+
+  Copyright 2020 Open Mobile Alliance.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  The above license is used as a license under copyright only.  Please
+  reference the OMA IPR Policy for patent licensing terms:
+  https://www.omaspecworks.org/about/intellectual-property-rights/
+
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.openmobilealliance.org/tech/profiles/LWM2M-v1_1.xsd">
+  <Object ObjectType="MODefinition">
+		<Name>LWM2M Security</Name>
+		<Description1><![CDATA[This LwM2M Object provides the keying material of a LwM2M Client appropriate to access a specified LwM2M Server. One Object Instance SHOULD address a LwM2M Bootstrap-Server.
+These LwM2M Object Resources MUST only be changed by a LwM2M Bootstrap-Server or Bootstrap from Smartcard and MUST NOT be accessible by any other LwM2M Server.]]></Description1>
+		<ObjectID>0</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:oma:0:1.2</ObjectURN>
+	  	<LWM2MVersion>1.1</LWM2MVersion>
+		<ObjectVersion>1.2</ObjectVersion>
+		<MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Mandatory</Mandatory>
+		<Resources>
+			<Item ID="0">
+				<Name>LWM2M  Server URI</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Uniquely identifies the LwM2M Server or LwM2M Bootstrap-Server. The format of the CoAP URI is defined in Section 6 of RFC 7252.]]></Description>
+			</Item>
+			<Item ID="1">
+				<Name>Bootstrap-Server</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Determines if the current instance concerns a LwM2M Bootstrap-Server (true) or a standard LwM2M Server (false)]]></Description>
+			</Item>
+			<Item ID="2">
+				<Name>Security Mode</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..4</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Determines which security mode is used
+0: Pre-Shared Key mode
+1: Raw Public Key mode
+2: Certificate mode
+3: NoSec mode
+4: Certificate mode with EST]]></Description>
+			</Item>
+			<Item ID="3">
+				<Name>Public Key or Identity</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Opaque</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Stores the LwM2M Client's certificate, public key (RPK mode) or PSK Identity (PSK mode).]]></Description>
+			</Item>
+			<Item ID="4">
+				<Name>Server Public Key</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Opaque</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Stores the LwM2M Server's, respectively LwM2M Bootstrap-Server's, certificate, public key (RPK mode) or trust anchor. The Certificate Mode Resource determines the content of this resource.]]></Description>
+			</Item>
+			<Item ID="5">
+				<Name>Secret Key</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Opaque</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Stores the secret key (PSK mode) or private key (RPK or certificate mode).]]></Description>
+			</Item>
+			<Item ID="6">
+				<Name>SMS Security Mode</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..255</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Determines which SMS security mode is used: 
+0: Reserved for future use
+1: DTLS mode (Device terminated) PSK mode assumed
+2: Secure Packet Structure mode (Smartcard terminated)
+3: NoSec mode
+4: Reserved mode (DTLS mode with multiplexing Security Association support)
+5-203 : Reserved for future use
+204-255: Proprietary modes]]></Description>
+			</Item>
+			<Item ID="7">
+				<Name>SMS Binding Key Parameters</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Opaque</Type>
+				<RangeEnumeration>6</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Stores the KIc, KID, SPI and TAR.]]></Description>
+			</Item>
+			<Item ID="8">
+				<Name>SMS Binding Secret Key(s)</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Opaque</Type>
+				<RangeEnumeration>16,32,48</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Stores the values of the key(s) for the SMS binding.]]></Description>
+			</Item>
+			<Item ID="9">
+				<Name>LwM2M Server SMS Number</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[MSISDN used by the LwM2M Client to send messages to the LwM2M Server via the SMS binding.]]></Description>
+			</Item>
+			<Item ID="10">
+				<Name>Short Server ID</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>1..65534</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client.
+This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. 
+The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server.]]></Description>
+			</Item>
+			<Item ID="11">
+				<Name>Client Hold Off Time</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>s</Units>
+				<Description><![CDATA[The number of seconds to wait before initiating a Client Initiated Bootstrap once the LwM2M Client has determined it should initiate this bootstrap mode.
+In case client initiated bootstrap is supported by the LwM2M Client, this resource MUST be supported. This information is relevant for use with a Bootstrap-Server only.]]></Description>
+			</Item>
+			<Item ID="12">
+				<Name>Bootstrap-Server Account Timeout</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>s</Units>
+				<Description><![CDATA[The LwM2M Client MUST purge the LwM2M Bootstrap-Server Account after the timeout value given by this resource. The lowest timeout value is 1.
+If the value is set to 0, or if this resource is not instantiated, the Bootstrap-Server Account lifetime is infinite.]]></Description>
+			</Item>
+			<Item ID="13">
+				<Name>Matching Type</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..3</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[The Matching Type Resource specifies how the certificate or raw public key in in the Server Public Key is presented. Four values are currently defined:
+                0: Exact match. This is the default value and also corresponds to the functionality of LwM2M v1.0. Hence, if this resource is not present then the content of the Server Public Key Resource corresponds to this value.
+                1: SHA-256 hash [RFC6234]
+                2: SHA-384 hash [RFC6234]
+                3: SHA-512 hash [RFC6234]]]></Description>
+			</Item>
+			<Item ID="14">
+				<Name>SNI</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This resource holds the value of the Server Name Indication (SNI) value to be used during the TLS handshake. When this resource is present then the LwM2M Server URI acts as the address of the service while the SNI value is used for matching a presented certificate, or PSK identity.]]></Description>
+			</Item>
+			<Item ID="15">
+				<Name>Certificate Usage</Name>
+        <Operations></Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..3</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[The Certificate Usage Resource specifies the semantic of the certificate or 
+                raw public key stored in the Server Public Key Resource, which is used to match 
+                the certificate presented in the TLS/DTLS handshake. The currently defined values are 
+                0 for "CA constraint", 1 for "service certificate constraint", 2 for "trust anchor 
+                assertion", and 3 for "domain-issued certificate". When this resource is absent, 
+                value (3) for domain issued certificate mode is assumed. More details about the 
+                semantic of each value can be found in the security consideration section of the 
+                LwM2M specification.]]></Description>
+			</Item>
+			<Item ID="16">
+				<Name>DTLS/TLS Ciphersuite</Name>
+        <Operations></Operations>
+        <MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[When this resource is present it instructs the TLS/DTLS client to propose the indicated ciphersuite(s) in the ClientHello of the handshake. A ciphersuite is indicated as a 32-bit integer value. The IANA TLS ciphersuite registry is maintained at https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml. As an example, the TLS_PSK_WITH_AES_128_CCM_8 ciphersuite is represented with the following string "0xC0,0xA8". To form an integer value the two values are concatenated. In this example, the value is 0xc0a8 or 49320.]]></Description>
+            </Item>
+			<Item ID="17"><Name>OSCORE Security Mode</Name>
+				<Operations></Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it provides a link to the OSCORE Object Instance and OSCORE MUST be used by the LwM2M Client with the linked OSCORE Object Instance.]]></Description>
+			</Item>
+			<Item ID="18">
+				<Name>Groups To Use by Client</Name>
+				<Operations></Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..65535</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it indicates what groups the LwM2M Client should use with a LwM2M Server/LwM2M Bootstrap-Server (ordered from most preferred to least preferred). Resource instance 0 indicates the most preferred group. The values are taken from Section 4.2.7 of RFC 8446. An example is secp256r1 (0x0017).]]></Description>
+			</Item>
+			<Item ID="19">
+				<Name>Signature Algorithms Supported by Server</Name>
+				<Operations></Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..65535</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it indicates what signature algorithms the LwM2M Server/LwM2M Bootstrap-Server supports. The values are taken from Section 4.2.3 of RFC 8446. An example is ecdsa_secp256r1_sha256(0x0403).]]></Description>
+			</Item>
+				<Item ID="20"><Name>Signature Algorithms To Use by Client</Name>
+				<Operations></Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..65535</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it indicates what signature algorithms the LwM2M Client should use with a LwM2M Server/LwM2M Bootstrap-Server (ordered from most preferred to least preferred). Resource instance 0 indicates the most preferred group. The values are taken from Section 4.2.3 of RFC 8446. An example is ecdsa_secp256r1_sha256(0x0403).]]></Description>
+			</Item>            
+			<Item ID="21">
+				<Name>Signature Algorithm Certs Supported by Server</Name>
+				<Operations></Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..65535</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it indicates what certificate-specific signature algorithms the the LwM2M Server/LwM2M Bootstrap-Server supports. The values are taken from Section 4.2.3 of RFC 8446. An example is ecdsa_secp256r1_sha256(0x0403).]]></Description>
+			</Item>     
+			<Item ID="22">
+				<Name>TLS 1.3 Features To Use by Client</Name>
+				<Operations></Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..65535</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it indicates which features the LwM2M Client should use with the respective LwM2M Server/LwM2M Bootstrap-Server. The bitmask values listed below are defined. A bit value of '0' means the feature should not be used. bit(0) - PSK Plain, bit(1) - 0-RTT, bit(2) - PSK with PFS, bit(3) - Certificate-based Authentication. Bit(4) to bit(31) are reserved.]]></Description>
+			</Item>       
+			<Item ID="23">
+				<Name>TLS Extensions Supported by Server</Name>
+				<Operations></Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..65535</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it indicates what extensions the LwM2M Server/LwM2M Bootstrap-Server supports in form of a bitmap.  The following values are defined: bit(0) - Server Name Indication (RFC 6066), bit (1) - Max Fragment Length (RFC 6066), bit (2) - Status Request (RFC 6066), bit (3) - Heartbeat (RFC 6520), bit (4) - Application Layer Protocol Negotiation (RFC 7301), bit (5) - Signed Certificate Timestamp (RFC 6962), bit (6) - Certificate Compression (draft-ietf-tls-certificate-compression), bit (7) - Record Size Limit (RFC 8449), bit (8) - Ticket Pinning (draft-ietf-tls-pinning-ticket), bit (9) - Certificate Authorities (RFC 8446), bit (10) - OID Filters (RFC 8446), bit (11) - Post Handshake Auth (RFC 8446), bit (12) - Connection ID (draft-ietf-tls-dtls-connection-id/draft-ietf-tls-dtls13). Bit(13) to bit(31) are reserved. ]]></Description>
+			</Item>               
+			<Item ID="24">
+				<Name>TLS Extensions To Use by Client</Name>
+				<Operations></Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..65535</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it indicates what extensions the LwM2M Client should use with the LwM2M Server/LwM2M Bootstrap-Server in form of a bitmap. The following values are defined: bit(0) - Server Name Indication (RFC 6066), bit (1) - Max Fragment Length (RFC 6066), bit (2) - Status Request (RFC 6066), bit (3) - Heartbeat (RFC 6520), bit (4) - Application Layer Protocol Negotiation (RFC 7301), bit (5) - Signed Certificate Timestamp (RFC 6962), bit (6) - Certificate Compression (draft-ietf-tls-certificate-compression), bit (7) - Record Size Limit (RFC 8449), bit (8) - Ticket Pinning (draft-ietf-tls-pinning-ticket), bit (9) - Certificate Authorities (RFC 8446), bit (10) - OID Filters (RFC 8446), bit (11) - Post Handshake Auth (RFC 8446), bit (12) - Connection ID (draft-ietf-tls-dtls-connection-id/draft-ietf-tls-dtls13). Bit(13) to bit(31) are reserved. ]]></Description>
+			</Item>               
+			<Item ID="25">
+				<Name>Secondary LwM2M Server URI</Name>
+				<Operations></Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is present then the LwM2M Server URI in the Security Object, Resource ID 0, is augmented with information about further LwM2M Server URIs that can be used with the same security information found in the LwM2M Security Object. This is useful when a LwM2M Server is reachable via two different transport bindings (i.e. URIs). For example when the same server is reachable with two different URIs, such as a "coaps" and a "coaps+tcp" URI scheme.]]></Description>
+			</Item>
+			<Item ID="26"><Name>MQTT Server</Name>
+				<Operations></Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it provides a link to a MQTT Server Object Instance, which offers additional configuration information for use with this MQTT server. This Resource is used only when the URI scheme in the LwM2M Server URI Resource indicates the use of MQTT.]]></Description>
+			</Item>
+			<Item ID="27"><Name>LwM2M COSE Security</Name>
+				<Operations></Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it provides a links to LwM2M COSE Object Instances, which contain security-relevant configuration information for use with COSE.]]></Description>
+			</Item>
+			<Item ID="28"><Name>RDS Destination Port</Name>
+				<Operations></Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..15</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This resource provides the default RDS Destination Port Number (as defined in 3GPP TS 24.250) to use for contacting the LwM2M or Bootstrap Server when communicating through the SCEF across the Non-IP binding.]]></Description>
+			</Item>
+			<Item ID="29"><Name>RDS Source Port</Name>
+				<Operations></Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..15</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This resource provides the default RDS Source Port Number (as defined in 3GPP TS 24.250) to use for contacting the LwM2M or Bootstrap Server when communicating through the SCEF across the Non-IP binding.]]></Description>
+			</Item>
+			<Item ID="30"><Name>RDS Application ID</Name>
+				<Operations></Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This resource provides the Application ID (as defined in 3GPP TS 24.250) to use for querying the SCEF for the source and destination port numbers for contacting the LwM2M or Bootstrap Server when communicating through the SCEF across the Non-IP binding.]]></Description>
+			</Item>
+		</Resources>
+			<Description2><![CDATA[]]></Description2>
+	</Object>
+</LWM2M>
diff --git a/msa/black-box-tests/src/test/resources/lwm2m-registry/1.xml b/msa/black-box-tests/src/test/resources/lwm2m-registry/1.xml
new file mode 100644
index 0000000000..f31e839c96
--- /dev/null
+++ b/msa/black-box-tests/src/test/resources/lwm2m-registry/1.xml
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_1-V1_2-20201110-A.xml
+   Path: http://www.openmobilealliance.org/release/ObjLwM2M_Server/
+
+OMNA LwM2M Registry
+   Path: https://github.com/OpenMobileAlliance/lwm2m-registry
+   Name: 1.xml
+
+NORMATIVE INFORMATION
+
+  Information about this file can be found in the latest revision of
+
+    OMA-TS-LightweightM2M_Core-V1_2
+
+  This is available at http://www.openmobilealliance.org/release/LightweightM2M/
+
+  Send comments to https://github.com/OpenMobileAlliance/OMA_LwM2M_for_Developers/issues
+
+LEGAL DISCLAIMER
+
+  Copyright 2020 Open Mobile Alliance.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  The above license is used as a license under copyright only.  Please
+  reference the OMA IPR Policy for patent licensing terms:
+  https://www.omaspecworks.org/about/intellectual-property-rights/
+
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.openmobilealliance.org/tech/profiles/LWM2M-v1_1.xsd">
+  <Object ObjectType="MODefinition">
+		<Name>LwM2M Server</Name>
+		<Description1><![CDATA[This LwM2M Objects provides the data related to a LwM2M Server. A Bootstrap-Server has no such an Object Instance associated to it.]]></Description1>
+		<ObjectID>1</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:oma:1:1.2</ObjectURN>
+		<LWM2MVersion>1.2</LWM2MVersion>
+		<ObjectVersion>1.2</ObjectVersion>
+		<MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Mandatory</Mandatory>
+		<Resources>
+			<Item ID="0">
+				<Name>Short Server ID</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>1..65534</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Used as link to associate server Object Instance.]]></Description>
+			</Item>
+			<Item ID="1">
+				<Name>Lifetime</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>s</Units>
+				<Description><![CDATA[Specify the lifetime of the registration in seconds (see Client Registration Interface). If the value is set to 0, the lifetime is infinite.]]></Description>
+			</Item>
+			<Item ID="2">
+				<Name>Default Minimum Period</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>s</Units>
+				<Description><![CDATA[The default value the LwM2M Client should use for the Minimum Period of an Observation in the absence of this parameter being included in an Observation.
+If this Resource doesn’t exist, the default value is 0.]]></Description>
+			</Item>
+			<Item ID="3">
+				<Name>Default Maximum Period</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>s</Units>
+				<Description><![CDATA[The default value the LwM2M Client should use for the Maximum Period of an Observation in the absence of this parameter being included in an Observation.]]></Description>
+			</Item>
+			<Item ID="4">
+				<Name>Disable</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this Resource is executed, this LwM2M Server Object is disabled for a certain period defined in the Disabled Timeout Resource. After receiving "Execute" operation, LwM2M Client MUST send response of the operation and perform de-registration process, and underlying network connection between the Client and Server MUST be disconnected to disable the LwM2M Server account.
+After the above process, the LwM2M Client MUST NOT send any message to the Server and ignore all the messages from the LwM2M Server for the period.]]></Description>
+			</Item>
+			<Item ID="5">
+				<Name>Disable Timeout</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>s</Units>
+				<Description><![CDATA[A period to disable the Server. After this period, the LwM2M Client MUST perform registration process to the Server. If this Resource is not set, a default timeout value is 86400 (1 day).]]></Description>
+			</Item>
+			<Item ID="6">
+				<Name>Notification Storing When Disabled or Offline</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If true, the LwM2M Client stores "Notify" operations to the LwM2M Server while the LwM2M Server account is disabled or the LwM2M Client is offline. After the LwM2M Server account is enabled or the LwM2M Client is online, the LwM2M Client reports the stored "Notify" operations to the Server.
+If false, the LwM2M Client discards all the "Notify" operations or temporarily disables the Observe function while the LwM2M Server is disabled or the LwM2M Client is offline.
+The default value is true.
+The maximum number of storing Notifications per Server is up to the implementation.]]></Description>
+			</Item>
+			<Item ID="7">
+				<Name>Binding</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[The possible values are those listed in the LwM2M Core Specification. This Resource defines the transport binding configured for the LwM2M Client.
+If the LwM2M Client supports the binding specified in this Resource, the LwM2M Client MUST use that transport for the Current Binding Mode.]]></Description>
+			</Item>
+			<Item ID="8">
+				<Name>Registration Update Trigger</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this Resource is executed the LwM2M Client MUST perform an "Update" operation with this LwM2M Server. The LwM2M Client can use a transport binding supported in the Current Binding Mode, Preferred Transport resource or the transport specified as an argument in the Registration Update Trigger.]]></Description>
+			</Item>
+			<Item ID="9">
+				<Name>Bootstrap-Request Trigger</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[When this Resource is executed the LwM2M Client MUST initiate a "Client Initiated Bootstrap" procedure in using the LwM2M Bootstrap-Server Account.]]></Description>
+			</Item>
+			<Item ID="10">
+				<Name>APN Link</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it provides a link to the APN connection profile Object Instance (OMNA registered Object ID:11) to be used to communicate with this server.]]></Description>
+			</Item>
+			<Item ID="11">
+				<Name>TLS-DTLS Alert Code</Name>	 			
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..255</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it contains the most recent TLS / DTLS alert message received from the LwM2M Server respective represented by the AlertDescription defined in Section 7.2 of RFC 5246. This resource set by the LwM2M Client may help the LwM2M Bootstrap-Server to determine the cause of TLS/DTLS connection failure with the respective LwM2M Server.]]></Description>
+			</Item>			
+			<Item ID="12">
+				<Name>Last Bootstrapped</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Time</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it represents the last time that the bootstrap server updated this LwM2M Server Account. The LwM2M Client is responsible for updating this value. When the Bootstrap Server detects that this LwM2M Server Account is "out-of-date", the Bootstrap Server can update the LwM2M Server Account as represented by the LwM2M Server object instance.]]></Description>      
+			</Item>			
+			<Item ID="13">
+				<Name>Registration Priority Order</Name>
+			  <Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[The LwM2M Client sequences the LwM2M Server registrations in increasing order of this value. If this value is not defined, registration attempts to this server are not impacted by other server registrations.]]></Description>
+			</Item>
+			<Item ID="14">
+				<Name>Initial Registration Delay Timer</Name>
+			  <Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>s</Units>
+				<Description><![CDATA[The delay, in seconds, before registration is attempted for this LwM2M Server based upon the completion of registration of the previous LwM2M Server in the registration order. This is only applied until the first successful registration after a successful bootstrapping sequence.]]></Description>
+			</Item>
+			<Item ID="15">
+				<Name>Registration Failure Block</Name>
+			  <Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[When set to true and registration to this LwM2M server fails, the LwM2M Client blocks registration to other servers in the order. When set to false, the LwM2M Client proceeds with registration to the next server in the order.]]></Description>
+			</Item>
+			<Item ID="16">
+				<Name>Bootstrap on Registration Failure</Name>
+			  <Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If set to true, this indicates that the LwM2M Client should re-bootstrap when either registration is explicitly rejected by the LwM2M Server or registration is considered as failing as dictated by the other resource settings. If set to false, the LwM2M Client will continue with the registration attempts as dictated by the other resource settings.]]></Description>
+			</Item>
+			<Item ID="17">
+				<Name>Communication Retry Count</Name>
+			  <Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[The number of successive communication attempts before which a communication sequence is considered as failed.]]></Description>
+			</Item>
+			<Item ID="18">
+				<Name>Communication Retry Timer</Name>
+			  <Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>s</Units>
+				<Description><![CDATA[The delay, in seconds, between successive communication attempts in a communication sequence. This value is multiplied by two to the power of the communication retry attempt minus one (2**(retry attempt-1)) to create an exponential back-off.]]></Description>
+			</Item>
+			<Item ID="19">
+				<Name>Communication Sequence Delay Timer</Name>
+			  <Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units>s</Units>
+				<Description><![CDATA[The delay, in seconds, between successive communication sequences. A communication sequence is defined as the exhaustion of the Communication Retry Count and Communication Retry Timer values. A communication sequence can be applied to server registrations or bootstrapping attempts. MAX_VALUE means do not perform another communication sequence.]]></Description>
+			</Item>
+			<Item ID="20">
+				<Name>Communication Sequence Retry Count</Name>
+			  <Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[The number of successive communication sequences before which a registration attempt is considered as failed.]]></Description>
+			</Item>
+			<Item ID="21">
+				<Name>Trigger</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Using the Trigger Resource a LwM2M Client can indicate whether it is reachable over SMS (value set to 'true') or not (value set to 'false'). The default value (resource not present) is 'false'. When set to 'true' the LwM2M Server MAY, for example, request the LwM2M Client to perform operations, such as the "Update" operation by sending an "Execute" operation on "Registration Update Trigger" Resource via SMS. No SMS response is expected for such a message.]]></Description>
+			</Item>
+			<Item ID="22">
+				<Name>Preferred Transport</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>The possible values are those listed in the LwM2M Core Specification</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Only a single transport binding SHALL be present. When the LwM2M client supports multiple transports, it MAY use this transport to initiate a connection. This resource can also be used to switch between multiple transports e.g. a non-IP device can switch to UDP transport to perform firmware updates.]]></Description>
+			</Item>
+			<Item ID="23"><Name>Mute Send</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If true or the Resource is not present, the LwM2M Client Send command capability is de-activated. 
+If false, the LwM2M Client Send Command capability is activated.]]></Description>
+			</Item>
+			<Item ID="24">
+				<Name>Alternate APN Links</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this resource is defined, it provides links to alternate APN connection profile Object Instance (OMNA registered Object ID:11) to be used to communicate with this server if Resource 10 has configuration conflicts.]]></Description>
+			</Item>
+			<Item ID="25">
+				<Name>Supported Server Versions</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This resource provides the supported enabler versions of the server to the client as a set of strings. Format for each string is 1*DIGIT"."1*DIGIT"."1*DIGIT where the third DIGIT is optional.]]></Description>
+			</Item>
+			<Item ID="26">
+				<Name>Default Notification Mode</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..1</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This resource indicates the default mode for observations to be sent: 0 = Non-Confirmable, 1 = Confirmable.]]></Description>
+			</Item>
+			<Item ID="27">
+				<Name>Profile ID Hash Algorithm</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..255</RangeEnumeration>
+				<Units/>
+				<Description><![CDATA[If this resource is defined, it contains the hash algorithm the LwM2M Server would prefer the LwM2M Client to use with the dynamically generated mode of creating Profile IDs. The numerical ID value of the 'Suite Identifiers' registered by RFC 6920 is used in this Resource.]]></Description>
+                        </Item>
+		</Resources>
+		<Description2></Description2>
+	</Object>
+</LWM2M>
diff --git a/msa/black-box-tests/src/test/resources/lwm2m-registry/2.xml b/msa/black-box-tests/src/test/resources/lwm2m-registry/2.xml
new file mode 100644
index 0000000000..4ea5805b36
--- /dev/null
+++ b/msa/black-box-tests/src/test/resources/lwm2m-registry/2.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_2-V1_1-20201110-A.xml
+   Path: http://www.openmobilealliance.org/release/ObjLwM2M_ACL/
+
+OMNA LwM2M Registry
+   Path: https://github.com/OpenMobileAlliance/lwm2m-registry
+   Name: 2.xml
+
+NORMATIVE INFORMATION
+
+  Information about this file can be found in the latest revision of
+
+    OMA-TS-LightweightM2M_Core-V1_2
+
+  This is available at http://www.openmobilealliance.org/release/LightweightM2M/
+
+  Send comments to https://github.com/OpenMobileAlliance/OMA_LwM2M_for_Developers/issues
+
+LEGAL DISCLAIMER
+
+  Copyright 2020 Open Mobile Alliance.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  The above license is used as a license under copyright only.  Please
+  reference the OMA IPR Policy for patent licensing terms:
+  https://www.omaspecworks.org/about/intellectual-property-rights/
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>LwM2M Access Control</Name>
+		<Description1><![CDATA[Access Control Object is used to check whether the LwM2M Server has access right for performing an operation.]]></Description1>
+		<ObjectID>2</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:oma:2:1.1</ObjectURN>
+		<LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.1</ObjectVersion>
+		<MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0">
+				<Name>Object ID</Name>
+        <Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>1..65534</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Resources 0 and 1 point to the Object Instance for which the Instances of the ACL Resource of that Access Control Object Instance are applicable.]]></Description>
+			</Item>
+			<Item ID="1">
+				<Name>Object Instance ID</Name>
+        <Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..65535</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[See above]]></Description>
+			</Item>
+			<Item ID="2">
+				<Name>ACL</Name>
+        <Operations>RW</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..31</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[The Resource Instance ID MUST be the Short Server ID of a certain LwM2M Server for which associated access rights are contained in the Resource Instance value.
+The Resource Instance ID 0 is a specific ID, determining the ACL Instance which contains the default access rights.
+Each bit set in the Resource Instance value, grants an access right to the LwM2M Server to the corresponding operation.
+The bit order is specified as below.
+1st LSB: R(Read, Observe, Write-Attributes)
+2nd LSB: W(Write)
+3rd LSB: E(Execute)
+4th LSB: D(Delete)
+5th LSB: C(Create)
+Other bits are reserved for future use.]]></Description>
+			</Item>
+			<Item ID="3">
+				<Name>Access Control Owner</Name>
+        <Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..65535</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Short Server ID of a certain LwM2M Server; only such an LwM2M Server can manage the Resources of this Object Instance. 
+The specific value MAX_ID=65535 means this Access Control Object Instance is created and modified during a Bootstrap phase only.]]></Description>
+			</Item>
+		</Resources>
+		<Description2><![CDATA[]]></Description2>
+	</Object>
+</LWM2M>
diff --git a/msa/black-box-tests/src/test/resources/lwm2m-registry/3.xml b/msa/black-box-tests/src/test/resources/lwm2m-registry/3.xml
new file mode 100644
index 0000000000..e71c2045c2
--- /dev/null
+++ b/msa/black-box-tests/src/test/resources/lwm2m-registry/3.xml
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_3-V1_2-20201110-A.xml
+   Path: http://www.openmobilealliance.org/release/ObjLwM2M_Device/
+
+OMNA LwM2M Registry
+   Path: https://github.com/OpenMobileAlliance/lwm2m-registry
+   Name: 3.xml
+
+NORMATIVE INFORMATION
+
+  Information about this file can be found in the latest revision of
+
+    OMA-TS-LightweightM2M_Core-V1_2
+
+  This is available at http://www.openmobilealliance.org/release/LightweightM2M/
+
+  Send comments to https://github.com/OpenMobileAlliance/OMA_LwM2M_for_Developers/issues
+
+LEGAL DISCLAIMER
+
+  Copyright 2020 Open Mobile Alliance.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  The above license is used as a license under copyright only.  Please
+  reference the OMA IPR Policy for patent licensing terms:
+  https://www.omaspecworks.org/about/intellectual-property-rights/
+
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.openmobilealliance.org/tech/profiles/LWM2M-v1_1.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>Device</Name>
+		<Description1><![CDATA[This LwM2M Object provides a range of device related information which can be queried by the LwM2M Server, and a device reboot and factory reset function.]]></Description1>
+		<ObjectID>3</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:oma:3:1.0</ObjectURN>
+		<LWM2MVersion>1.1</LWM2MVersion>
+		<ObjectVersion>1.2</ObjectVersion>
+		<MultipleInstances>Single</MultipleInstances>
+		<Mandatory>Mandatory</Mandatory>
+		<Resources>
+			<Item ID="0">
+				<Name>Manufacturer</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Human readable manufacturer name]]></Description>
+			</Item>
+			<Item ID="1">
+				<Name>Model Number</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[A model identifier (manufacturer specified string)]]></Description>
+			</Item>
+			<Item ID="2">
+				<Name>Serial Number</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Serial Number]]></Description>
+			</Item>
+			<Item ID="3">
+				<Name>Firmware Version</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Current firmware version of the Device.The Firmware Management function could rely on this resource.]]></Description>
+			</Item>
+			<Item ID="4">
+				<Name>Reboot</Name>
+        <Operations>E</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Reboot the LwM2M Device to restore the Device from unexpected firmware failure.]]></Description>
+			</Item>
+			<Item ID="5">
+				<Name>Factory Reset</Name>
+        <Operations>E</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Perform factory reset of the LwM2M Device to make the LwM2M Device to go through initial deployment sequence where provisioning and bootstrap sequence is performed. This requires client ensuring post factory reset to have minimal information to allow it to carry out one of the bootstrap methods specified in section 5.2.3. 
+When this Resource is executed, "De-register" operation MAY be sent to the LwM2M Server(s) before factory reset of the LwM2M Device.]]></Description>
+			</Item>
+			<Item ID="6">
+				<Name>Available Power Sources</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..7</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[0: DC power
+1: Internal Battery
+2: External Battery
+3: Fuel Cell
+4: Power over Ethernet
+5: USB
+6: AC (Mains) power
+7: Solar
+The same Resource Instance ID MUST be used to associate a given Power Source (Resource ID:6) with its Present Voltage (Resource ID:7) and its Present Current (Resource ID:8)]]></Description>
+			</Item>
+			<Item ID="7">
+				<Name>Power Source Voltage</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Present voltage for each Available Power Sources Resource Instance. The unit used for this resource is in mV.]]></Description>
+			</Item>
+      <Item ID="8">
+        <Name>Power Source Current</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Multiple</MultipleInstances>
+        <Mandatory>Optional</Mandatory>
+        <Type>Integer</Type>
+        <RangeEnumeration></RangeEnumeration>
+        <Units></Units>
+        <Description><![CDATA[Present current for each Available Power Source. The unit used for this resource is in mA.]]></Description>
+      </Item>
+      <Item ID="9">
+        <Name>Battery Level</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+        <Mandatory>Optional</Mandatory>
+        <Type>Integer</Type>
+        <RangeEnumeration>0..100</RangeEnumeration>
+        <Units>/100</Units>
+        <Description><![CDATA[Contains the current battery level as a percentage (with a range from 0 to 100). This value is only valid for the Device internal Battery if present (one Available Power Sources Resource Instance is 1).]]></Description>
+      </Item>
+      <Item ID="10">
+        <Name>Memory Free</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+        <Mandatory>Optional</Mandatory>
+        <Type>Integer</Type>
+        <RangeEnumeration></RangeEnumeration>
+        <Units></Units>
+        <Description><![CDATA[Estimated current available amount of storage space which can store data and software in the LwM2M Device (expressed in kilobytes). Note: 1 kilobyte corresponds to 1000 bytes.]]></Description>
+	  </Item>
+      <Item ID="11">
+        <Name>Error Code</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Multiple</MultipleInstances>
+        <Mandatory>Mandatory</Mandatory>
+        <Type>Integer</Type>
+        <RangeEnumeration>0..32</RangeEnumeration>
+        <Units></Units>
+        <Description><![CDATA[0=No error
+1=Low battery power
+2=External power supply off
+3=GPS module failure
+4=Low received signal strength
+5=Out of memory
+6=SMS failure
+7=IP connectivity failure
+8=Peripheral malfunction
+9..15=Reserved for future use
+16..32=Device specific error codes
+
+When the single Device Object Instance is initiated, there is only one error code Resource Instance whose value is equal to 0 that means no error. When the first error happens, the LwM2M Client changes error code Resource Instance to any non-zero value to indicate the error type. When any other error happens, a new error code Resource Instance is created. When an error associated with a Resource Instance is no longer present, that Resource Instance is deleted. When the single existing error is no longer present, the LwM2M Client returns to the original no error state where Instance 0 has value 0.
+This error code Resource MAY be observed by the LwM2M Server. How to deal with LwM2M Client’s error report depends on the policy of the LwM2M Server. Error codes in between 16 and 32 are specific to the Device and may have different meanings among implementations.]]></Description>
+      </Item>
+      <Item ID="12">
+        <Name>Reset Error Code</Name>
+        <Operations>E</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+        <Mandatory>Optional</Mandatory>
+        <Type></Type>
+        <RangeEnumeration></RangeEnumeration>
+        <Units></Units>
+        <Description><![CDATA[Delete all error code Resource Instances and create only one zero-value error code that implies no error, then re-evaluate all error conditions and update and create Resources Instances to capture all current error conditions.]]></Description>
+      </Item>
+      <Item ID="13">
+        <Name>Current Time</Name>
+        <Operations>RW</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+        <Mandatory>Optional</Mandatory>
+        <Type>Time</Type>
+        <RangeEnumeration></RangeEnumeration>
+        <Units></Units>
+        <Description><![CDATA[Current UNIX time of the LwM2M Client.
+The LwM2M Client should be responsible to increase this time value as every second elapses.
+The LwM2M Server is able to write this Resource to make the LwM2M Client synchronized with the LwM2M Server.]]></Description>
+      </Item>
+      <Item ID="14">
+        <Name>UTC Offset</Name>
+        <Operations>RW</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+        <Mandatory>Optional</Mandatory>
+        <Type>String</Type>
+        <RangeEnumeration></RangeEnumeration>
+        <Units></Units>
+        <Description><![CDATA[Indicates the UTC offset currently in effect for this LwM2M Device. UTC+X [ISO 8601].]]></Description>
+      </Item>
+      <Item ID="15">
+        <Name>Timezone</Name>
+        <Operations>RW</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+        <Mandatory>Optional</Mandatory>
+        <Type>String</Type>
+        <RangeEnumeration></RangeEnumeration>
+        <Units></Units>
+        <Description><![CDATA[Indicates in which time zone the LwM2M Device is located, in IANA Timezone (TZ) database format.]]></Description>
+      </Item>
+      <Item ID="16">
+        <Name>Supported Binding and Modes</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+        <Mandatory>Mandatory</Mandatory>
+        <Type>String</Type>
+        <RangeEnumeration></RangeEnumeration>
+        <Units></Units>
+        <Description><![CDATA[Indicates which bindings and modes are supported in the LwM2M Client. The possible values are those listed in the LwM2M Core Specification.]]></Description>
+     </Item>    
+			<Item ID="17"><Name>Device Type</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Type of the device (manufacturer specified string: e.g. smart meters / dev Class / ...)]]></Description>
+			</Item>
+			<Item ID="18"><Name>Hardware Version</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Current hardware version of the device]]></Description>
+			</Item>
+			<Item ID="19"><Name>Software Version</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Current software version of the device (manufacturer specified string). On elaborated LwM2M device, SW could be split in 2 parts: a firmware one and a higher level software on top.
+Both pieces of Software are together managed by LwM2M Firmware Update Object (Object ID 5)]]></Description>
+			</Item>
+			<Item ID="20"><Name>Battery Status</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..6</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This value is only valid for the Device Internal Battery if present (one Available Power Sources Resource Instance value is 1).
+Battery
+Status	Meaning	Description
+0	Normal	The battery is operating normally and not on power.
+1	Charging	The battery is currently charging.
+2	Charge Complete	The battery is fully charged and still on power.
+3	Damaged	The battery has some problem.
+4	Low Battery	The battery is low on charge.
+5	Not Installed	The battery is not installed.
+6	Unknown	The battery information is not available.]]></Description>
+			</Item>
+			<Item ID="21"><Name>Memory Total</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Total amount of storage space which can store data and software in the LwM2M Device (expressed in kilobytes).  Note: 1 kilobyte corresponds to 1000 bytes.]]></Description>
+			</Item>
+			<Item ID="22"><Name>ExtDevInfo</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Reference to external "Device" object instance containing information. For example, such an external device can be a Host Device, which is a device into which the Device containing the LwM2M client is embedded. This Resource may be used to retrieve information about the Host Device.]]></Description>
+			</Item></Resources>
+			<Description2></Description2>
+	</Object>
+</LWM2M>
diff --git a/msa/black-box-tests/src/test/resources/lwm2m-registry/5.xml b/msa/black-box-tests/src/test/resources/lwm2m-registry/5.xml
new file mode 100644
index 0000000000..ddcea323b0
--- /dev/null
+++ b/msa/black-box-tests/src/test/resources/lwm2m-registry/5.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_LWM2M_Firmware_Update-V1_0_3-20190617-A
+   Type: xml
+   Date: 2019-Jun-17
+
+Public Reachable Information
+   Path: http://www.openmobilealliance.org/tech/profiles
+   Name: LWM2M_Firmware_Update-v1_0_3.xml
+
+NORMATIVE INFORMATION
+
+  Information about this file can be found in the latest revision of
+
+    OMA-TS-LightweightM2M-V1_0_2
+    OMA-TS-LightweightM2M_Core-V1_1_1
+
+  This is available at http://www.openmobilealliance.org/
+
+  Send comments to https://github.com/OpenMobileAlliance/OMA_LwM2M_for_Developers/issues
+
+LEGAL DISCLAIMER
+
+  Copyright 2019 Open Mobile Alliance.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  The above license is used as a license under copyright only.  Please
+  reference the OMA IPR Policy for patent licensing terms:
+  https://www.omaspecworks.org/about/intellectual-property-rights/
+
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>Firmware Update V_1_0</Name>
+		<Description1><![CDATA[This LwM2M Object enables management of firmware which is to be updated. This Object includes installing a firmware package, updating firmware, and performing actions after updating firmware. The firmware update MAY require to reboot the device; it will depend on a number of factors, such as the operating system architecture and the extent of the updated software.
+The envisioned functionality is to allow a LwM2M Client to connect to any LwM2M Server to obtain a firmware image using the object and resource structure defined in this section experiencing communication security protection using TLS/DTLS. There are, however, other design decisions that need to be taken into account to allow a manufacturer of a device to securely install firmware on a device. Examples for such design decisions are how to manage the firmware update repository at the server side (which may include user interface considerations), the techniques to provide additional application layer security protection of the firmware image, how many versions of firmware images to store on the device, and how to execute the firmware update process considering the hardware specific details of a given IoT hardware product. These aspects are considered to be outside the scope of this version of the specification.
+A LwM2M Server may also instruct a LwM2M Client to fetch a firmware image from a dedicated server (instead of pushing firmware images to the LwM2M Client). The Package URI resource is contained in the Firmware object and can be used for this purpose.
+A LwM2M Client MUST support block-wise transfer [CoAP_Blockwise] if it implements the Firmware Update object.
+A LwM2M Server MUST support block-wise transfer. Other protocols, such as HTTP/HTTPs, MAY also be used for downloading firmware updates (via the Package URI resource). For constrained devices it is, however, RECOMMENDED to use CoAP for firmware downloads to avoid the need for additional protocol implementations.]]></Description1>
+		<ObjectID>5</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:oma:5</ObjectURN>
+		<LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.2</ObjectVersion>
+		<MultipleInstances>Single</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0">
+				<Name>Package</Name>
+        <Operations>W</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Opaque</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Firmware package]]></Description>
+			</Item>
+			<Item ID="1">
+				<Name>Package URI</Name>
+        <Operations>RW</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[URI from where the device can download the firmware package by an alternative mechanism. As soon the device has received the Package URI it performs the download at the next practical opportunity.
+The URI format is defined in RFC 3986. For example, coaps://example.org/firmware is a syntactically valid URI. The URI scheme determines the protocol to be used. For CoAP this endpoint MAY be a LwM2M Server but does not necessarily need to be. A CoAP server implementing block-wise transfer is sufficient as a server hosting a firmware repository and the expectation is that this server merely serves as a separate file server making firmware images available to LwM2M Clients.]]></Description>
+			</Item>
+			<Item ID="2">
+				<Name>Update</Name>
+        <Operations>E</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Updates firmware by using the firmware package stored in Package, or, by using the firmware downloaded from the Package URI.
+This Resource is only executable when the value of the State Resource is Downloaded.]]></Description>
+			</Item>
+			<Item ID="3">
+				<Name>State</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..3</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Indicates current state with respect to this firmware update. This value is set by the LwM2M Client.
+0: Idle (before downloading or after successful updating)
+1: Downloading (The data sequence is on the way)
+2: Downloaded
+3: Updating
+If writing the firmware package to Package Resource has completed, or, if the device has downloaded the firmware package from the Package URI the state changes to Downloaded.
+Writing an empty string to Package URI Resource or setting the Package Resource to NULL (‘\0’), resets the Firmware Update State Machine: the State Resource value is set to Idle and the Update Result Resource value is set to 0.
+When in Downloaded state, and the executable Resource Update is triggered, the state changes to Updating.
+If the Update Resource failed, the state returns at Downloaded.
+If performing the Update Resource was successful, the state changes from Updating to Idle.
+The firmware update state machine is illustrated in Figure 29 of the LwM2M version 1.0 specification (and also in Figure E.6.1-1 of this specification).]]></Description>
+			</Item>
+			<Item ID="5">
+				<Name>Update Result</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..9</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains the result of downloading or updating the firmware
+0: Initial value. Once the updating process is initiated (Download /Update), this Resource MUST be reset to Initial value.
+1: Firmware updated successfully.
+2: Not enough flash memory for the new firmware package.
+3: Out of RAM during downloading process.
+4: Connection lost during downloading process.
+5: Integrity check failure for new downloaded package.
+6: Unsupported package type.
+7: Invalid URI.
+8: Firmware update failed.
+9: Unsupported protocol. A LwM2M client indicates the failure to retrieve the firmware image using the URI provided in the Package URI resource by writing the value 9 to the /5/0/5 (Update Result resource) when the URI contained a URI scheme unsupported by the client. Consequently, the LwM2M Client is unable to retrieve the firmware image using the URI provided by the LwM2M Server in the Package URI when it refers to an unsupported protocol.]]></Description>
+			</Item>
+			<Item ID="6">
+				<Name>PkgName</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Name of the Firmware Package]]></Description>
+			</Item>
+			<Item ID="7">
+				<Name>PkgVersion</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Version of the Firmware package]]></Description>
+			</Item>
+			<Item ID="8">
+				<Name>Firmware Update Protocol Support</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..5</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This resource indicates what protocols the LwM2M Client implements to retrieve firmware images. The LwM2M server uses this information to decide what URI to include in the Package URI. A LwM2M Server MUST NOT include a URI in the Package URI object that uses a protocol that is unsupported by the LwM2M client.
+For example, if a LwM2M client indicates that it supports CoAP and CoAPS then a LwM2M Server must not provide an HTTP URI in the Packet URI.
+The following values are defined by this version of the specification:
+0: CoAP (as defined in RFC 7252) with the additional support for block-wise transfer. CoAP is the default setting.
+1: CoAPS (as defined in RFC 7252) with the additional support for block-wise transfer
+2: HTTP 1.1 (as defined in RFC 7230)
+3: HTTPS 1.1 (as defined in RFC 7230)
+4: CoAP over TCP (as defined in RFC 8323)
+5: CoAP over TLS (as defined in RFC 8323)
+Additional values MAY be defined in the future. Any value not understood by the LwM2M Server MUST be ignored.]]></Description>
+			</Item>
+			<Item ID="9">
+				<Name>Firmware Update Delivery Method</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..2</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[The LwM2M Client uses this resource to indicate its support for transferring firmware images to the client either via the Package Resource (=push) or via the Package URI Resource (=pull) mechanism.
+0: Pull only
+1: Push only
+2: Both. In this case the LwM2M Server MAY choose the preferred mechanism for conveying the firmware image to the LwM2M Client.]]></Description>
+			</Item>
+    </Resources>
+		<Description2><![CDATA[]]></Description2>
+	</Object>
+</LWM2M>
diff --git a/msa/black-box-tests/src/test/resources/tb-transports/lwm2m/conf/logback.xml b/msa/black-box-tests/src/test/resources/tb-transports/lwm2m/conf/logback.xml
new file mode 100644
index 0000000000..f8ecd5d96f
--- /dev/null
+++ b/msa/black-box-tests/src/test/resources/tb-transports/lwm2m/conf/logback.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<!DOCTYPE configuration>
+<configuration scan="true" scanPeriod="10 seconds">
+
+    <appender name="fileLogAppender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>/var/log/tb-lwm2m-transport/${TB_SERVICE_ID}/tb-lwm2m-transport.log</file>
+        <rollingPolicy
+                class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>/var/log/tb-lwm2m-transport/${TB_SERVICE_ID}/tb-lwm2m-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+            <totalSizeCap>3GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{ISO8601} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{ISO8601} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.thingsboard.server" level="INFO" />
+
+    <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
+
+    <logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN"/>
+    <logger name="org.apache.kafka.clients" level="WARN"/>
+
+    <logger name="org.thingsboard.server.transport.lwm2m" level="TRACE"/>
+
+    <root level="INFO">
+        <appender-ref ref="fileLogAppender"/>
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>
\ No newline at end of file
diff --git a/msa/js-executor/package.json b/msa/js-executor/package.json
index f0869beffa..d0864c013a 100644
--- a/msa/js-executor/package.json
+++ b/msa/js-executor/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "@aws-sdk/client-sqs": "^3.121.0",
     "@azure/service-bus": "^7.5.1",
-    "@google-cloud/pubsub": "^3.0.1",
+    "@google-cloud/pubsub": "^4.3.3",
     "amqplib": "^0.10.0",
     "config": "^3.3.7",
     "express": "^4.18.1",
diff --git a/msa/js-executor/yarn.lock b/msa/js-executor/yarn.lock
index eb6443e53d..42a32a93c4 100644
--- a/msa/js-executor/yarn.lock
+++ b/msa/js-executor/yarn.lock
@@ -797,68 +797,68 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@google-cloud/paginator@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-4.0.0.tgz#9c3e01544717aecb9a922b4269ff298f30a0f1bb"
-  integrity sha512-wNmCZl+2G2DmgT/VlF+AROf80SoaC/CwS8trwmjNaq26VRNK8yPbU5F/Vy+R9oDAGKWQU2k8+Op5H4kFJVXFaQ==
+"@google-cloud/paginator@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-5.0.0.tgz#b8cc62f151685095d11467402cbf417c41bf14e6"
+  integrity sha512-87aeg6QQcEPxGCOthnpUjvw4xAZ57G7pL8FS0C4e/81fr3FjkpUpibf1s2v5XGyGhUVGF4Jfg7yEcxqn2iUw1w==
   dependencies:
     arrify "^2.0.0"
     extend "^3.0.2"
 
-"@google-cloud/precise-date@^2.0.0":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@google-cloud/precise-date/-/precise-date-2.0.3.tgz#14f6f28ce35dabf3882e7aeab1c9d51bd473faed"
-  integrity sha512-+SDJ3ZvGkF7hzo6BGa8ZqeK3F6Z4+S+KviC9oOK+XCs3tfMyJCh/4j93XIWINgMMDIh9BgEvlw4306VxlXIlYA==
+"@google-cloud/precise-date@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/precise-date/-/precise-date-4.0.0.tgz#e179893a3ad628b17a6fabdfcc9d468753aac11a"
+  integrity sha512-1TUx3KdaU3cN7nfCdNf+UVqA/PSX29Cjcox3fZZBtINlRrXVTmUkQnCKv2MbBUbCopbK4olAT1IHl76uZyCiVA==
 
-"@google-cloud/projectify@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-2.0.1.tgz#13350ee609346435c795bbfe133a08dfeab78d65"
-  integrity sha512-ZDG38U/Yy6Zr21LaR3BTiiLtpJl6RkPS/JwoRT453G+6Q1DhlV0waNf8Lfu+YVYGIIxgKnLayJRfYlFJfiI8iQ==
+"@google-cloud/projectify@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-4.0.0.tgz#d600e0433daf51b88c1fa95ac7f02e38e80a07be"
+  integrity sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==
 
-"@google-cloud/promisify@^2.0.0":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-2.0.2.tgz#81d654b4cb227c65c7ad2f9a7715262febd409ed"
-  integrity sha512-EvuabjzzZ9E2+OaYf+7P9OAiiwbTxKYL0oGLnREQd+Su2NTQBpomkdlkBowFvyWsaV0d1sSGxrKpSNcrhPqbxg==
+"@google-cloud/promisify@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-4.0.0.tgz#a906e533ebdd0f754dca2509933334ce58b8c8b1"
+  integrity sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==
 
-"@google-cloud/pubsub@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@google-cloud/pubsub/-/pubsub-3.0.1.tgz#3a6bb9649a1b4309d82d8670a9c01375e622692f"
-  integrity sha512-dznNbRd/Y8J0C0xvdvCPi3B1msK/dj/Nya+NQZ2doUOLT6eoa261tBwk9umOQs5L5GKcdlqQKbBjrNjDYVbzQA==
-  dependencies:
-    "@google-cloud/paginator" "^4.0.0"
-    "@google-cloud/precise-date" "^2.0.0"
-    "@google-cloud/projectify" "^2.0.0"
-    "@google-cloud/promisify" "^2.0.0"
-    "@opentelemetry/api" "^1.0.0"
-    "@opentelemetry/semantic-conventions" "^1.0.0"
+"@google-cloud/pubsub@^4.3.3":
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/@google-cloud/pubsub/-/pubsub-4.3.3.tgz#3d3f947ae8fca1694388592f22f77fdc3008ee8d"
+  integrity sha512-vJKh9L4dHf1XGSDKS1SB0IpqP/sUajQh4/QwhYasuq/NjzfHSxqSt+CuhrFGb5/gioTWE4gce0sn7h1SW7qESg==
+  dependencies:
+    "@google-cloud/paginator" "^5.0.0"
+    "@google-cloud/precise-date" "^4.0.0"
+    "@google-cloud/projectify" "^4.0.0"
+    "@google-cloud/promisify" "^4.0.0"
+    "@opentelemetry/api" "^1.6.0"
+    "@opentelemetry/semantic-conventions" "~1.21.0"
     "@types/duplexify" "^3.6.0"
     "@types/long" "^4.0.0"
     arrify "^2.0.0"
     extend "^3.0.2"
-    google-auth-library "^8.0.2"
-    google-gax "^3.0.1"
+    google-auth-library "^9.3.0"
+    google-gax "^4.3.1"
+    heap-js "^2.2.0"
     is-stream-ended "^0.1.4"
     lodash.snakecase "^4.1.1"
     p-defer "^3.0.0"
 
-"@grpc/grpc-js@~1.6.0":
-  version "1.6.7"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.6.7.tgz#4c4fa998ff719fe859ac19fe977fdef097bb99aa"
-  integrity sha512-eBM03pu9hd3VqDQG+kHahiG1x80RGkkqqRb1Pchcwqej/KkAH95gAvKs6laqaHCycYaPK+TKuNQnOz9UXYA8qw==
+"@grpc/grpc-js@~1.10.0":
+  version "1.10.6"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.10.6.tgz#1e3eb1af911dc888fbef7452f56a7573b8284d54"
+  integrity sha512-xP58G7wDQ4TCmN/cMUHh00DS7SRDv/+lC+xFLrTkMIN8h55X5NhZMLYbvy7dSELP15qlI6hPhNCRWVMtZMwqLA==
   dependencies:
-    "@grpc/proto-loader" "^0.6.4"
-    "@types/node" ">=12.12.47"
+    "@grpc/proto-loader" "^0.7.10"
+    "@js-sdsl/ordered-map" "^4.4.2"
 
-"@grpc/proto-loader@^0.6.12", "@grpc/proto-loader@^0.6.4":
-  version "0.6.13"
-  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.13.tgz#008f989b72a40c60c96cd4088522f09b05ac66bc"
-  integrity sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g==
+"@grpc/proto-loader@^0.7.0", "@grpc/proto-loader@^0.7.10":
+  version "0.7.12"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.12.tgz#787b58e3e3771df30b1567c057b6ab89e3a42911"
+  integrity sha512-DCVwMxqYzpUCiDMl7hQ384FqP4T3DbNpXU8pt681l3UWCip1WUiD5JrkImUwCB9a7f2cq4CUTmi5r/xIMRPY1Q==
   dependencies:
-    "@types/long" "^4.0.1"
     lodash.camelcase "^4.3.0"
-    long "^4.0.0"
-    protobufjs "^6.11.3"
-    yargs "^16.2.0"
+    long "^5.0.0"
+    protobufjs "^7.2.4"
+    yargs "^17.7.2"
 
 "@jridgewell/resolve-uri@^3.0.3":
   version "3.0.8"
@@ -878,6 +878,11 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@js-sdsl/ordered-map@^4.4.2":
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c"
+  integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==
+
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -899,15 +904,20 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
-"@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.0.1":
+"@opentelemetry/api@^1.0.1":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.1.0.tgz#563539048255bbe1a5f4f586a4a10a1bb737f44a"
   integrity sha512-hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ==
 
-"@opentelemetry/semantic-conventions@^1.0.0":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.3.1.tgz#ba07b864a3c955f061aa30ea3ef7f4ae4449794a"
-  integrity sha512-wU5J8rUoo32oSef/rFpOT1HIjLjAv3qIDHkw1QIhODV3OpAVHi5oVzlouozg9obUmZKtbZ0qUe/m7FP0y0yBzA==
+"@opentelemetry/api@^1.6.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.8.0.tgz#5aa7abb48f23f693068ed2999ae627d2f7d902ec"
+  integrity sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==
+
+"@opentelemetry/semantic-conventions@~1.21.0":
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.21.0.tgz#83f7479c524ab523ac2df702ade30b9724476c72"
+  integrity sha512-lkC8kZYntxVKr7b8xmjCVUgE0a8xgDakPyDo9uSWavXPyYqLgYYGdEd2j8NxihRyb6UwpX3G/hFUF4/9q2V+/g==
 
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
@@ -974,6 +984,11 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
 "@tsconfig/node10@^1.0.7":
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
@@ -1015,6 +1030,11 @@
     "@types/connect" "*"
     "@types/node" "*"
 
+"@types/caseless@*":
+  version "0.12.5"
+  resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.5.tgz#db9468cb1b1b5a925b8f34822f1669df0c5472f5"
+  integrity sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==
+
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -1088,7 +1108,7 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.1.tgz#fdf6f6c6c73d3d8eee9c98a9a0485bc524b048d7"
   integrity sha512-HnYlg/BRF8uC1FyKRFZwRaCPTPYKa+6I8QiUZFLredaGOou481cgFS4wKRFyKvQtX8xudqkSdBczJHIYSQYKrQ==
 
-"@types/node@>=12.12.47", "@types/node@>=13.7.0":
+"@types/node@>=13.7.0":
   version "17.0.42"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.42.tgz#d7e8f22700efc94d125103075c074396b5f41f9b"
   integrity sha512-Q5BPGyGKcvQgAMbsr7qEGN/kIPN6zZecYYABeTDBizOsau+2NMdSVTar9UQw21A2+JyA2KRNDYaYrPB0Rpk2oQ==
@@ -1108,6 +1128,16 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
+"@types/request@^2.48.8":
+  version "2.48.12"
+  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.12.tgz#0f590f615a10f87da18e9790ac94c29ec4c5ef30"
+  integrity sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==
+  dependencies:
+    "@types/caseless" "*"
+    "@types/node" "*"
+    "@types/tough-cookie" "*"
+    form-data "^2.5.0"
+
 "@types/serve-static@*":
   version "1.13.10"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
@@ -1116,6 +1146,11 @@
     "@types/mime" "^1"
     "@types/node" "*"
 
+"@types/tough-cookie@*":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.5.tgz#cb6e2a691b70cb177c6e3ae9c1d2e8b2ea8cd304"
+  integrity sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==
+
 "@types/tunnel@^0.0.3":
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.3.tgz#f109e730b072b3136347561fc558c9358bb8c6e9"
@@ -1167,6 +1202,13 @@ agent-base@6:
   dependencies:
     debug "4"
 
+agent-base@^7.0.2:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
+  dependencies:
+    debug "^4.3.4"
+
 amqplib@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.10.0.tgz#766d696f8ceae097ee9eb73e6796999e5d40a1db"
@@ -1462,6 +1504,15 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
 clone-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -1522,7 +1573,7 @@ colorspace@1.1.x:
     color "3.0.x"
     text-hex "1.0.x"
 
-combined-stream@^1.0.8:
+combined-stream@^1.0.6, combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -1609,7 +1660,7 @@ debug@2.6.9, debug@~2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.1:
+debug@4:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -1623,6 +1674,13 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
@@ -1921,11 +1979,6 @@ fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
-fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz#ec02ac8e01ab8a319af182dae2681213cfe9ce53"
-  integrity sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==
-
 fast-xml-parser@3.19.0:
   version "3.19.0"
   resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz#cb637ec3f3999f51406dd8ff0e6fc4d83e520d01"
@@ -1982,6 +2035,15 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
+form-data@^2.5.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
+  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 form-data@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
@@ -2081,34 +2143,23 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gaxios@^4.0.0:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.3.tgz#d44bdefe52d34b6435cc41214fdb160b64abfc22"
-  integrity sha512-gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA==
+gaxios@^6.0.0, gaxios@^6.1.1:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.4.0.tgz#08a42cb44d5123a72efaaf9f786c266e7f18be70"
+  integrity sha512-apAloYrY4dlBGlhauDAYSZveafb5U6+L9titing1wox6BvWM0TSXBp603zTrLpyLMGkrcFgohnUN150dFN/zOA==
   dependencies:
-    abort-controller "^3.0.0"
     extend "^3.0.2"
-    https-proxy-agent "^5.0.0"
+    https-proxy-agent "^7.0.1"
     is-stream "^2.0.0"
-    node-fetch "^2.6.7"
-
-gaxios@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-5.0.0.tgz#df11e5d0a45831dd39eb5fbbba0d6a6b09815e70"
-  integrity sha512-VD/yc5ln6XU8Ch1hyYY6kRMBE0Yc2np3fPyeJeYHhrPs1i8rgnsApPMWyrugkl7LLoSqpOJVBWlQIa87OAvt8Q==
-  dependencies:
-    abort-controller "^3.0.0"
-    extend "^3.0.2"
-    https-proxy-agent "^5.0.0"
-    is-stream "^2.0.0"
-    node-fetch "^2.6.7"
+    node-fetch "^2.6.9"
+    uuid "^9.0.1"
 
-gcp-metadata@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.0.0.tgz#a00f999f60a4461401e7c515f8a3267cfb401ee7"
-  integrity sha512-gfwuX3yA3nNsHSWUL4KG90UulNiq922Ukj3wLTrcnX33BB7PwB1o0ubR8KVvXu9nJH+P5w1j2SQSNNqto+H0DA==
+gcp-metadata@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-6.1.0.tgz#9b0dd2b2445258e7597f2024332d20611cbd6b8c"
+  integrity sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg==
   dependencies:
-    gaxios "^5.0.0"
+    gaxios "^6.0.0"
     json-bigint "^1.0.0"
 
 get-caller-file@^2.0.5:
@@ -2178,46 +2229,35 @@ globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-google-auth-library@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-8.0.2.tgz#5fa0f2d3795c3e4019d2bb315ade4454cc9c30b5"
-  integrity sha512-HoG+nWFAThLovKpvcbYzxgn+nBJPTfAwtq0GxPN821nOO+21+8oP7MoEHfd1sbDulUFFGfcjJr2CnJ4YssHcyg==
+google-auth-library@^9.3.0:
+  version "9.7.0"
+  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.7.0.tgz#dd99a08e2e3f70778de8be4ed8556460e237550a"
+  integrity sha512-I/AvzBiUXDzLOy4iIZ2W+Zq33W4lcukQv1nl7C8WUA6SQwyQwUwu3waNmWNAvzds//FG8SZ+DnKnW/2k6mQS8A==
   dependencies:
-    arrify "^2.0.0"
     base64-js "^1.3.0"
     ecdsa-sig-formatter "^1.0.11"
-    fast-text-encoding "^1.0.0"
-    gaxios "^5.0.0"
-    gcp-metadata "^5.0.0"
-    gtoken "^5.3.2"
+    gaxios "^6.1.1"
+    gcp-metadata "^6.1.0"
+    gtoken "^7.0.0"
     jws "^4.0.0"
-    lru-cache "^6.0.0"
 
-google-gax@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-3.1.0.tgz#a6fea06bfd0157969ddc0a6d04c47980978ead02"
-  integrity sha512-OHKVHZtaYHwxrjiI4BH+IzRWH2Q75sZg+q0/RatxLicbeeCCIug99+NKQiE39B5rLnGENtcbUjmXiqJHbSrkSg==
+google-gax@^4.3.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.3.2.tgz#417cbee97f2e68d78f641af19c0f15234c0dbd9c"
+  integrity sha512-2mw7qgei2LPdtGrmd1zvxQviOcduTnsvAWYzCxhOWXK4IQKmQztHnDQwD0ApB690fBQJemFKSU7DnceAy3RLzw==
   dependencies:
-    "@grpc/grpc-js" "~1.6.0"
-    "@grpc/proto-loader" "^0.6.12"
+    "@grpc/grpc-js" "~1.10.0"
+    "@grpc/proto-loader" "^0.7.0"
     "@types/long" "^4.0.0"
     abort-controller "^3.0.0"
     duplexify "^4.0.0"
-    fast-text-encoding "^1.0.3"
-    google-auth-library "^8.0.2"
-    is-stream-ended "^0.1.4"
+    google-auth-library "^9.3.0"
     node-fetch "^2.6.1"
     object-hash "^3.0.0"
-    proto3-json-serializer "^1.0.0"
-    protobufjs "6.11.3"
-    retry-request "^5.0.0"
-
-google-p12-pem@^3.1.3:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.4.tgz#123f7b40da204de4ed1fbf2fd5be12c047fc8b3b"
-  integrity sha512-HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg==
-  dependencies:
-    node-forge "^1.3.1"
+    proto3-json-serializer "^2.0.0"
+    protobufjs "7.2.6"
+    retry-request "^7.0.0"
+    uuid "^9.0.1"
 
 got@^9.6.0:
   version "9.6.0"
@@ -2241,13 +2281,12 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-gtoken@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.2.tgz#deb7dc876abe002178e0515e383382ea9446d58f"
-  integrity sha512-gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ==
+gtoken@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-7.1.0.tgz#d61b4ebd10132222817f7222b1e6064bd463fc26"
+  integrity sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==
   dependencies:
-    gaxios "^4.0.0"
-    google-p12-pem "^3.1.3"
+    gaxios "^6.0.0"
     jws "^4.0.0"
 
 has-bigints@^1.0.1, has-bigints@^1.0.2:
@@ -2301,6 +2340,11 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+heap-js@^2.2.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/heap-js/-/heap-js-2.5.0.tgz#487e268b1733b187ca04eccf52f8387be92b46cb"
+  integrity sha512-kUGoI3p7u6B41z/dp33G6OaL7J4DRqRYwVmeIlwLClx7yaaAy7hoDExnuejTKtuDwfcatGmddHDEOjf6EyIxtQ==
+
 http-cache-semantics@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
@@ -2317,6 +2361,15 @@ http-errors@2.0.0:
     statuses "2.0.1"
     toidentifier "1.0.1"
 
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
 https-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
@@ -2325,6 +2378,14 @@ https-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
+https-proxy-agent@^7.0.1:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
+  integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "4"
+
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -2728,6 +2789,11 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
+long@^5.0.0:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
+  integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
+
 long@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-5.2.0.tgz#2696dadf4b4da2ce3f6f6b89186085d94d52fd61"
@@ -2868,16 +2934,16 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
+ms@2.1.2, ms@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 ms@2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
 multistream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz#7bf00dfd119556fbc153cff3de4c6d477909f5a8"
@@ -2903,18 +2969,13 @@ node-abi@^2.21.0:
   dependencies:
     semver "^5.4.1"
 
-node-fetch@^2.6.1, node-fetch@^2.6.6, node-fetch@^2.6.7:
+node-fetch@^2.6.1, node-fetch@^2.6.6, node-fetch@^2.6.7, node-fetch@^2.6.9:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-forge@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
-  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
-
 nodemon@^2.0.16:
   version "2.0.16"
   resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.16.tgz#d71b31bfdb226c25de34afea53486c8ef225fdef"
@@ -3164,17 +3225,17 @@ progress@^2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-proto3-json-serializer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-1.0.1.tgz#5d2b0b3c85568edb62984c94ce2e726985de44be"
-  integrity sha512-jtnGKL8EE1mTOl2qgMZJQXbS22dlb2K07i4b5vp8yMGMJ6mFSgBg4Ossu/g9NCuamdYXHjp3XxyWw4tJ0G/uKw==
+proto3-json-serializer@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-2.0.1.tgz#da0b510f6d6e584b1b5c271f045c26728abe71e0"
+  integrity sha512-8awBvjO+FwkMd6gNoGFZyqkHZXCFd54CIYTb6De7dPaufGJ2XNW+QUNqbMr8MaAocMdb+KpsD4rxEOaTBDCffA==
   dependencies:
-    protobufjs "^6.11.3"
+    protobufjs "^7.2.5"
 
-protobufjs@6.11.3, protobufjs@^6.11.3:
-  version "6.11.3"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
-  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
+protobufjs@7.2.6, protobufjs@^7.2.4, protobufjs@^7.2.5:
+  version "7.2.6"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.6.tgz#4a0ccd79eb292717aacf07530a07e0ed20278215"
+  integrity sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -3186,9 +3247,8 @@ protobufjs@6.11.3, protobufjs@^6.11.3:
     "@protobufjs/path" "^1.1.2"
     "@protobufjs/pool" "^1.1.0"
     "@protobufjs/utf8" "^1.1.0"
-    "@types/long" "^4.0.1"
     "@types/node" ">=13.7.0"
-    long "^4.0.0"
+    long "^5.0.0"
 
 proxy-addr@~2.0.7:
   version "2.0.7"
@@ -3363,13 +3423,14 @@ responselike@^1.0.2:
   dependencies:
     lowercase-keys "^1.0.0"
 
-retry-request@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-5.0.0.tgz#886ff8ec0e77fffbe66a4d5e90fd8f6646b6eae4"
-  integrity sha512-vBZdBxUordje9253imlmGtppC5gdcwZmNz7JnU2ui+KKFPk25keR+0c020AVV20oesYxIFOI0Kh3HE88/59ieg==
+retry-request@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-7.0.2.tgz#60bf48cfb424ec01b03fca6665dee91d06dd95f3"
+  integrity sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==
   dependencies:
-    debug "^4.1.1"
+    "@types/request" "^2.48.8"
     extend "^3.0.2"
+    teeny-request "^9.0.0"
 
 reusify@^1.0.4:
   version "1.0.4"
@@ -3547,6 +3608,13 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
+stream-events@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/stream-events/-/stream-events-1.0.5.tgz#bbc898ec4df33a4902d892333d47da9bf1c406d5"
+  integrity sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==
+  dependencies:
+    stubs "^3.0.0"
+
 stream-meter@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/stream-meter/-/stream-meter-1.0.4.tgz#52af95aa5ea760a2491716704dbff90f73afdd1d"
@@ -3594,7 +3662,7 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string-width@^4.2.2:
+string-width@^4.2.2, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -3680,6 +3748,11 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
+stubs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
+  integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==
+
 supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -3720,6 +3793,17 @@ tar-stream@^2.1.4:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
+teeny-request@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-9.0.0.tgz#18140de2eb6595771b1b02203312dfad79a4716d"
+  integrity sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==
+  dependencies:
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    node-fetch "^2.6.9"
+    stream-events "^1.0.5"
+    uuid "^9.0.0"
+
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
@@ -3973,6 +4057,11 @@ uuid@^8.3.0, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^9.0.0, uuid@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
+  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
+
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
@@ -4138,6 +4227,11 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
 yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
@@ -4151,6 +4245,19 @@ yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
diff --git a/msa/tb/README.md b/msa/tb/README.md
index 6987c42bfa..2ece5a3e2b 100644
--- a/msa/tb/README.md
+++ b/msa/tb/README.md
@@ -21,7 +21,7 @@ In this example `thingsboard/tb` image will be used. You can choose any other im
 Execute the following command to run this docker directly:
 
 ` 
-$ docker run -it -p 9090:9090 -p 1883:1883 -p 5683:5683/udp  -p 5685:5685/udp -v ~/.mytb-data:/data --name mytb thingsboard/tb
+$ docker run -it -p 9090:9090 -p 1883:1883 -p 5683:5683/udp  -p 5685:5685/udp -p 5686:5686/udp -v ~/.mytb-data:/data --name mytb thingsboard/tb
 ` 
 
 Where: 
@@ -32,6 +32,7 @@ Where:
 - `-p 1883:1883`            - connect local port 1883 to exposed internal MQTT port 1883    
 - `-p 5683:5683`            - connect local port 5683 to exposed internal COAP port 5683 
 - `-p 5685:5685`            - connect local port 5685 to exposed internal COAP port 5685 (lwm2m) 
+- `-p 5686:5686`            - connect local port 5686 to exposed internal COAPS port 5686 (lwm2m) 
 - `-v ~/.mytb-data:/data`   - mounts the host's dir `~/.mytb-data` to ThingsBoard DataBase data directory
 - `--name mytb`             - friendly local name of this machine
 - `thingsboard/tb`          - docker image, can be also `thingsboard/tb-postgres` or `thingsboard/tb-cassandra`
@@ -47,6 +48,7 @@ Where:
 > $ VBoxManage controlvm "default" natpf1 "tcp-port1883,tcp,,1883,,1883"
 > $ VBoxManage controlvm "default" natpf1 "tcp-port5683,tcp,,5683,,5683"
 > $ VBoxManage controlvm "default" natpf1 "tcp-port5683,tcp,,5685,,5685"
+> $ VBoxManage controlvm "default" natpf1 "tcp-port5683,tcp,,5686,,5686"
 > ```
 
 After executing `docker run` command you can open `http://{your-host-ip}:9090` in you browser (for ex. `http://localhost:9090`). You should see ThingsBoard login page.
diff --git a/msa/tb/docker-cassandra/Dockerfile b/msa/tb/docker-cassandra/Dockerfile
index 3d4997dd88..18071b249b 100644
--- a/msa/tb/docker-cassandra/Dockerfile
+++ b/msa/tb/docker-cassandra/Dockerfile
@@ -87,6 +87,7 @@ EXPOSE 9090
 EXPOSE 1883
 EXPOSE 5683/udp
 EXPOSE 5685/udp
+EXPOSE 5686/udp
 
 VOLUME ["/data"]
 
diff --git a/msa/tb/docker-postgres/Dockerfile b/msa/tb/docker-postgres/Dockerfile
index dcf766f00e..984e390496 100644
--- a/msa/tb/docker-postgres/Dockerfile
+++ b/msa/tb/docker-postgres/Dockerfile
@@ -69,6 +69,7 @@ EXPOSE 9090
 EXPOSE 1883
 EXPOSE 5683/udp
 EXPOSE 5685/udp
+EXPOSE 5686/udp
 
 VOLUME ["/data"]
 
diff --git a/msa/tb/pom.xml b/msa/tb/pom.xml
index ad0fa66cb9..70fea2c0a5 100644
--- a/msa/tb/pom.xml
+++ b/msa/tb/pom.xml
@@ -38,7 +38,7 @@
         <tb-postgres.docker.name>tb-postgres</tb-postgres.docker.name>
         <tb-cassandra.docker.name>tb-cassandra</tb-cassandra.docker.name>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
-        <pkg.upgradeVersion>3.6.3</pkg.upgradeVersion>
+        <pkg.upgradeVersion>3.6.4</pkg.upgradeVersion>
     </properties>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index a9b7efc653..332a88b758 100755
--- a/pom.xml
+++ b/pom.xml
@@ -72,13 +72,13 @@
         <fasterxml-classmate.version>1.3.4</fasterxml-classmate.version>
         <auth0-jwt.version>4.2.1</auth0-jwt.version>
         <json-schema-validator.version>2.2.6</json-schema-validator.version>
-        <californium.version>3.10.0</californium.version>
+        <californium.version>3.11.0</californium.version>
         <leshan.version>2.0.0-M14</leshan.version>
         <gson.version>2.9.0</gson.version>
         <freemarker.version>2.3.30</freemarker.version>
         <mail.version>2.0.1</mail.version>
         <curator.version>5.5.0</curator.version>
-        <zookeeper.version>3.8.1</zookeeper.version>
+        <zookeeper.version>3.9.2</zookeeper.version>
         <protobuf.version>3.21.9</protobuf.version>
         <grpc.version>1.42.1</grpc.version>
         <tbel.version>1.2.0</tbel.version>
@@ -92,18 +92,18 @@
         <rabbitmq.version>4.8.0</rabbitmq.version>
         <surefire.version>3.0.0-M9</surefire.version>
         <jar-plugin.version>3.0.2</jar-plugin.version>
-        <springdoc-swagger.version>2.1.0</springdoc-swagger.version>
-        <swagger-annotations.version>2.2.9</swagger-annotations.version>
+        <springdoc-swagger.version>2.4.0TB</springdoc-swagger.version>
+        <swagger-annotations.version>2.2.20</swagger-annotations.version>
         <spatial4j.version>0.7</spatial4j.version>
         <jts.version>1.18.2</jts.version>
         <bouncycastle.version>1.69</bouncycastle.version>
         <winsw.version>2.0.1</winsw.version>
-        <postgresql.driver.version>42.5.0</postgresql.driver.version>
+        <postgresql.driver.version>42.7.3</postgresql.driver.version>
         <sonar.exclusions>org/thingsboard/server/gen/**/*,
             org/thingsboard/server/extensions/core/plugin/telemetry/gen/**/*
         </sonar.exclusions>
         <elasticsearch.version>5.0.2</elasticsearch.version>
-        <delight-nashorn-sandbox.version>0.2.1</delight-nashorn-sandbox.version>
+        <delight-nashorn-sandbox.version>0.4.2</delight-nashorn-sandbox.version>
         <nashorn-core.version>15.4</nashorn-core.version>
         <!-- IMPORTANT: If you change the version of the kafka client, make sure to synchronize our overwritten implementation of the
         org.apache.kafka.common.network.NetworkReceive class in the application module. It addresses the issue https://issues.apache.org/jira/browse/KAFKA-4090.
@@ -111,7 +111,7 @@
         <kafka.version>3.2.0</kafka.version>
         <bucket4j.version>4.1.1</bucket4j.version>
         <antlr.version>2.7.7</antlr.version>
-        <snakeyaml.version>2.0</snakeyaml.version>
+        <snakeyaml.version>2.2</snakeyaml.version>
         <aws.sdk.version>1.11.747</aws.sdk.version>
         <pubsub.client.version>1.105.0</pubsub.client.version>
         <google.common.protos.version>2.1.0</google.common.protos.version> <!-- required by io.grpc:grpc-protobuf:1.38.0-->
@@ -830,7 +830,6 @@
                             <exclude>src/main/scripts/control/**</exclude>
                             <exclude>src/main/scripts/windows/**</exclude>
                             <exclude>src/main/resources/public/static/rulenode/**</exclude>
-                            <exclude>src/main/java/org/eclipse/leshan/server/observation//**</exclude>
                             <exclude>**/*.proto.js</exclude>
                             <exclude>docker/haproxy/**</exclude>
                             <exclude>docker/tb-node/**</exclude>
@@ -1775,7 +1774,7 @@
                 <version>${curator.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.springdoc</groupId>
+                <groupId>org.thingsboard</groupId>
                 <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
                 <version>${springdoc-swagger.version}</version>
             </dependency>
diff --git a/rest-client/src/main/java/org/thingsboard/rest/client/utils/RestJsonConverter.java b/rest-client/src/main/java/org/thingsboard/rest/client/utils/RestJsonConverter.java
index 903983d00f..31a0c7b63b 100644
--- a/rest-client/src/main/java/org/thingsboard/rest/client/utils/RestJsonConverter.java
+++ b/rest-client/src/main/java/org/thingsboard/rest/client/utils/RestJsonConverter.java
@@ -62,7 +62,7 @@ public class RestJsonConverter {
                                 KvEntry entry = parseValue(key, ts.get(VALUE));
                                 return new BasicTsKvEntry(ts.get(TS).asLong(), entry);
                             }
-                    ).collect(Collectors.toList()))
+                    ).toList())
             );
             return result;
         } else {
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NotificationCenter.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NotificationCenter.java
index fd63ace9c4..d108a6981d 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NotificationCenter.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NotificationCenter.java
@@ -38,7 +38,7 @@ public interface NotificationCenter {
 
     void markNotificationAsRead(TenantId tenantId, UserId recipientId, NotificationId notificationId);
 
-    void markAllNotificationsAsRead(TenantId tenantId, UserId recipientId);
+    void markAllNotificationsAsRead(TenantId tenantId, NotificationDeliveryMethod deliveryMethod, UserId recipientId);
 
     void deleteNotification(TenantId tenantId, UserId recipientId, NotificationId notificationId);
 
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
index dbc652cb4e..fad13373c0 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
@@ -68,6 +68,7 @@ import org.thingsboard.server.dao.notification.NotificationTargetService;
 import org.thingsboard.server.dao.notification.NotificationTemplateService;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.queue.QueueService;
+import org.thingsboard.server.dao.queue.QueueStatsService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
@@ -315,6 +316,8 @@ public interface TbContext {
 
     QueueService getQueueService();
 
+    QueueStatsService getQueueStatsService();
+
     ListeningExecutor getMailExecutor();
 
     ListeningExecutor getSmsExecutor();
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/notification/FirebaseService.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/notification/FirebaseService.java
index 28aa4c96af..ef10d8cecc 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/notification/FirebaseService.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/notification/FirebaseService.java
@@ -21,6 +21,6 @@ import java.util.Map;
 
 public interface FirebaseService {
 
-    void sendMessage(TenantId tenantId, String credentials, String fcmToken, String title, String body, Map<String, String> data) throws Exception;
+    void sendMessage(TenantId tenantId, String credentials, String fcmToken, String title, String body, Map<String, String> data, Integer badge) throws Exception;
 
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java
index 9377fca636..7e535596cd 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java
@@ -176,7 +176,7 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
                 existingAlarm.setPropagateRelationTypes(relationTypes);
                 existingAlarm.setDetails(details);
             }
-            existingAlarm.setEndTs(System.currentTimeMillis());
+            existingAlarm.setEndTs(currentTimeMillis());
             return ctx.getAlarmService().updateAlarm(AlarmUpdateRequest.fromAlarm(existingAlarm));
         }, ctx.getDbCallbackExecutor());
         return Futures.transform(asyncUpdated, TbAlarmResult::fromAlarmResult, MoreExecutors.directExecutor());
@@ -209,4 +209,8 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
         return severity;
     }
 
+    long currentTimeMillis() {
+        return System.currentTimeMillis();
+    }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNode.java
index 4b957db9cd..1aad815dfa 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNode.java
@@ -72,7 +72,6 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
 public class TbSaveToCustomCassandraTableNode implements TbNode {
 
     private static final String TABLE_PREFIX = "cs_tb_";
-    private static final JsonParser parser = new JsonParser();
     private static final String ENTITY_ID = "$entityId";
 
     private TbSaveToCustomCassandraTableNodeConfiguration config;
@@ -168,7 +167,7 @@ public class TbSaveToCustomCassandraTableNode implements TbNode {
     }
 
     private ListenableFuture<Void> save(TbMsg msg, TbContext ctx) {
-        JsonElement data = parser.parse(msg.getData());
+        JsonElement data = JsonParser.parseString(msg.getData());
         if (!data.isJsonObject()) {
             throw new IllegalStateException("Invalid message structure, it is not a JSON Object:" + data);
         } else {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java
index 958957a3e2..40d899412d 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java
@@ -87,7 +87,7 @@ public class CertPemCredentials implements ClientCredentials {
 
     private KeyManagerFactory createAndInitKeyManagerFactory() throws Exception {
         KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-        kmf.init(loadKeyStore(), password.toCharArray());
+        kmf.init(loadKeyStore(), SslUtil.getPassword(password));
         return kmf;
     }
 
@@ -107,7 +107,7 @@ public class CertPemCredentials implements ClientCredentials {
             CertPath certPath = factory.generateCertPath(certificates);
             List<? extends Certificate> path = certPath.getCertificates();
             Certificate[] x509Certificates = path.toArray(new Certificate[0]);
-            keyStore.setKeyEntry(PRIVATE_KEY_ALIAS, privateKey, password.toCharArray(), x509Certificates);
+            keyStore.setKeyEntry(PRIVATE_KEY_ALIAS, privateKey, SslUtil.getPassword(password), x509Certificates);
         }
         return keyStore;
     }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java
index 4176ead31c..73368d40f5 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java
@@ -87,24 +87,23 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
             Map<String, Object> entityBody = new HashMap<>();
             JsonNode dataJson = JacksonUtil.toJsonNode(msg.getData());
             switch (actionType) {
-                case ATTRIBUTES_UPDATED:
-                case POST_ATTRIBUTES:
+                case ATTRIBUTES_UPDATED, POST_ATTRIBUTES -> {
                     entityBody.put("kv", dataJson);
                     entityBody.put(SCOPE, getScope(metadata));
                     if (EdgeEventActionType.POST_ATTRIBUTES.equals(actionType)) {
                         entityBody.put("isPostAttributes", true);
                     }
-                    break;
-                case ATTRIBUTES_DELETED:
+                }
+                case ATTRIBUTES_DELETED -> {
                     List<String> keys = JacksonUtil.convertValue(dataJson.get("attributes"), new TypeReference<>() {
                     });
                     entityBody.put("keys", keys);
                     entityBody.put(SCOPE, getScope(metadata));
-                    break;
-                case TIMESERIES_UPDATED:
+                }
+                case TIMESERIES_UPDATED -> {
                     entityBody.put("data", dataJson);
                     entityBody.put("ts", msg.getMetaDataTs());
-                    break;
+                }
             }
             return buildEvent(ctx.getTenantId(),
                     actionType,
@@ -179,4 +178,5 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
         return msg.isTypeOneOf(POST_TELEMETRY_REQUEST, POST_ATTRIBUTES_REQUEST, ATTRIBUTES_UPDATED, ATTRIBUTES_DELETED, TIMESERIES_UPDATED,
                 ALARM, CONNECT_EVENT, DISCONNECT_EVENT, ACTIVITY_EVENT, INACTIVITY_EVENT, TO_SERVER_RPC_REQUEST);
     }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/BaseTbMsgPushNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/BaseTbMsgPushNodeConfiguration.java
index 36b6a44c70..a509f1f578 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/BaseTbMsgPushNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/BaseTbMsgPushNodeConfiguration.java
@@ -30,4 +30,5 @@ public class BaseTbMsgPushNodeConfiguration implements NodeConfiguration<BaseTbM
         configuration.setScope(AttributeScope.SERVER_SCOPE.name());
         return configuration;
     }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNodeConfiguration.java
index 7c8e0d1f1c..563d78eccf 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToCloudNodeConfiguration.java
@@ -17,7 +17,7 @@ package org.thingsboard.rule.engine.edge;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -26,7 +26,8 @@ public class TbMsgPushToCloudNodeConfiguration extends BaseTbMsgPushNodeConfigur
     @Override
     public TbMsgPushToCloudNodeConfiguration defaultConfiguration() {
         TbMsgPushToCloudNodeConfiguration configuration = new TbMsgPushToCloudNodeConfiguration();
-        configuration.setScope(DataConstants.SERVER_SCOPE);
+        configuration.setScope(AttributeScope.SERVER_SCOPE.name());
         return configuration;
     }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
index e70c64134d..a43c4be9d2 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
@@ -155,4 +155,5 @@ public class TbMsgPushToEdgeNode extends AbstractTbMsgPushNode<TbMsgPushToEdgeNo
         edgeEvent.setEdgeId(edgeId);
         return ctx.getEdgeEventService().saveAsync(edgeEvent);
     }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeConfiguration.java
index 3b40d8ef30..b0d8ad113e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeConfiguration.java
@@ -17,7 +17,7 @@ package org.thingsboard.rule.engine.edge;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.AttributeScope;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -26,7 +26,8 @@ public class TbMsgPushToEdgeNodeConfiguration extends BaseTbMsgPushNodeConfigura
     @Override
     public TbMsgPushToEdgeNodeConfiguration defaultConfiguration() {
         TbMsgPushToEdgeNodeConfiguration configuration = new TbMsgPushToEdgeNodeConfiguration();
-        configuration.setScope(DataConstants.SERVER_SCOPE);
+        configuration.setScope(AttributeScope.SERVER_SCOPE.name());
         return configuration;
     }
+
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNode.java
index a62257245b..248dc1cfdb 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNode.java
@@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
 
 import jakarta.annotation.Nullable;
+import java.util.Objects;
 
 @Slf4j
 @RuleNode(
@@ -57,7 +58,7 @@ public class TbCheckAlarmStatusNode implements TbNode {
     public void onMsg(TbContext ctx, TbMsg msg) throws TbNodeException {
         try {
             Alarm alarm = JacksonUtil.fromString(msg.getData(), Alarm.class);
-
+            Objects.requireNonNull(alarm, "alarm is null");
             ListenableFuture<Alarm> latest = ctx.getAlarmService().findAlarmByIdAsync(ctx.getTenantId(), alarm.getId());
 
             Futures.addCallback(latest, new FutureCallback<>() {
@@ -78,7 +79,11 @@ public class TbCheckAlarmStatusNode implements TbNode {
                 }
             }, ctx.getDbCallbackExecutor());
         } catch (Exception e) {
-            log.error("Failed to parse alarm: [{}]", msg.getData());
+            if (e instanceof IllegalArgumentException || e instanceof NullPointerException) {
+                log.debug("[{}][{}] Failed to parse alarm: [{}] error [{}]", ctx.getTenantId(), ctx.getRuleChainName(), msg.getData(), e.getMessage());
+            } else {
+                log.error("[{}][{}] Failed to parse alarm: [{}]", ctx.getTenantId(), ctx.getRuleChainName(), msg.getData(), e);
+            }
             throw new TbNodeException(e);
         }
     }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNode.java
index 32404cdf81..b2d16434d5 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNode.java
@@ -25,7 +25,6 @@ import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.server.common.data.AttributeScope;
-import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
@@ -75,7 +74,6 @@ public class TbGpsGeofencingActionNode extends AbstractGeofencingNode<TbGpsGeofe
     private static final String REPORT_PRESENCE_STATUS_ON_EACH_MESSAGE = "reportPresenceStatusOnEachMessage";
     private final Map<EntityId, EntityGeofencingState> entityStates = new HashMap<>();
     private final Gson gson = new Gson();
-    private final JsonParser parser = new JsonParser();
 
     @Override
     public void onMsg(TbContext ctx, TbMsg msg) throws TbNodeException {
@@ -88,7 +86,7 @@ public class TbGpsGeofencingActionNode extends AbstractGeofencingNode<TbGpsGeofe
                         .find(ctx.getTenantId(), msg.getOriginator(), AttributeScope.SERVER_SCOPE, ctx.getServiceId())
                         .get(1, TimeUnit.MINUTES);
                 if (entry.isPresent()) {
-                    JsonObject element = parser.parse(entry.get().getValueAsString()).getAsJsonObject();
+                    JsonObject element = JsonParser.parseString(entry.get().getValueAsString()).getAsJsonObject();
                     return new EntityGeofencingState(element.get("inside").getAsBoolean(), element.get("stateSwitchTime").getAsLong(), element.get("stayed").getAsBoolean());
                 } else {
                     return new EntityGeofencingState(false, 0L, false);
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/math/TbMathNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/math/TbMathNode.java
index 3813195e23..4e64ad854e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/math/TbMathNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/math/TbMathNode.java
@@ -19,13 +19,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.objecthunter.exp4j.Expression;
 import net.objecthunter.exp4j.ExpressionBuilder;
 import org.springframework.util.ConcurrentReferenceHashMap;
-import org.thingsboard.common.util.DonAsynchron;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -33,6 +30,7 @@ import org.thingsboard.rule.engine.api.TbNode;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
+import org.thingsboard.rule.engine.util.SemaphoreWithTbMsgQueue;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -46,10 +44,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
 import java.util.Optional;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Semaphore;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -84,7 +79,7 @@ import static org.thingsboard.rule.engine.math.TbMathArgumentType.CONSTANT;
 )
 public class TbMathNode implements TbNode {
 
-    private static final ConcurrentMap<EntityId, SemaphoreWithQueue<TbMsgTbContextBiFunction>> locks = new ConcurrentReferenceHashMap<>(16, ConcurrentReferenceHashMap.ReferenceType.WEAK);
+    private static final ConcurrentMap<EntityId, SemaphoreWithTbMsgQueue> locks = new ConcurrentReferenceHashMap<>(16, ConcurrentReferenceHashMap.ReferenceType.WEAK);
     private final ThreadLocal<Expression> customExpression = new ThreadLocal<>();
     private TbMathNodeConfiguration config;
     private boolean msgBodyToJsonConversionRequired;
@@ -110,66 +105,8 @@ public class TbMathNode implements TbNode {
 
     @Override
     public void onMsg(TbContext ctx, TbMsg msg) {
-        var semaphoreWithQueue = locks.computeIfAbsent(msg.getOriginator(), SemaphoreWithQueue::new);
-        semaphoreWithQueue.getQueue().add(new TbMsgTbContextBiFunction(msg, ctx, this::processMsgAsync));
-
-        tryProcessQueue(semaphoreWithQueue);
-    }
-
-    void tryProcessQueue(SemaphoreWithQueue<TbMsgTbContextBiFunction> lockAndQueue) {
-        final Semaphore semaphore = lockAndQueue.getSemaphore();
-        final Queue<TbMsgTbContextBiFunction> queue = lockAndQueue.getQueue();
-        while (!queue.isEmpty()) {
-            // The semaphore have to be acquired before EACH poll and released before NEXT poll.
-            // Otherwise, some message will remain unprocessed in queue
-            if (!semaphore.tryAcquire()) {
-                return;
-            }
-            TbMsgTbContextBiFunction tbMsgTbContext = null;
-            try {
-                tbMsgTbContext = queue.poll();
-                if (tbMsgTbContext == null) {
-                    semaphore.release();
-                    continue;
-                }
-                final TbMsg msg = tbMsgTbContext.getMsg();
-                if (!msg.getCallback().isMsgValid()) {
-                    log.trace("[{}] Skipping non-valid message [{}]", lockAndQueue.getEntityId(), msg);
-                    semaphore.release();
-                    continue;
-                }
-                //DO PROCESSING
-                final TbContext ctx = tbMsgTbContext.getCtx();
-                final ListenableFuture<TbMsg> resultMsgFuture = tbMsgTbContext.getBiFunction().apply(ctx, msg);
-                DonAsynchron.withCallback(resultMsgFuture, resultMsg -> {
-                    try {
-                        ctx.tellSuccess(resultMsg);
-                    } finally {
-                        lockAndQueue.getSemaphore().release();
-                        tryProcessQueue(lockAndQueue);
-                    }
-                }, t -> {
-                    try {
-                        ctx.tellFailure(msg, t);
-                    } finally {
-                        lockAndQueue.getSemaphore().release();
-                        tryProcessQueue(lockAndQueue);
-                    }
-                }, ctx.getDbCallbackExecutor());
-            } catch (Throwable t) {
-                semaphore.release();
-                if (tbMsgTbContext == null) { // if no message polled, the loop become infinite, will throw exception
-                    log.error("[{}] Failed to process TbMsgTbContext queue", lockAndQueue.getEntityId(), t);
-                    throw t;
-                }
-                TbMsg msg = tbMsgTbContext.getMsg();
-                TbContext ctx = tbMsgTbContext.getCtx();
-                log.warn("[{}] Failed to process message: {}", lockAndQueue.getEntityId(), msg, t);
-                ctx.tellFailure(msg, t); // you are not allowed to throw here, because queue will remain unprocessed
-                continue; // We are probably the last who process the queue. We have to continue poll until get successful callback or queue is empty
-            }
-            break; //submitted async exact one task. next poll will try on callback
-        }
+        locks.computeIfAbsent(msg.getOriginator(), SemaphoreWithTbMsgQueue::new)
+                .addToQueueAndTryProcess(msg, ctx, this::processMsgAsync);
     }
 
     ListenableFuture<TbMsg> processMsgAsync(TbContext ctx, TbMsg msg) {
@@ -426,24 +363,4 @@ public class TbMathNode implements TbNode {
         }
     }
 
-    @Override
-    public void destroy() {
-    }
-
-    @Data
-    @RequiredArgsConstructor
-    static public class SemaphoreWithQueue<T> {
-        final EntityId entityId;
-        final Semaphore semaphore = new Semaphore(1);
-        final Queue<T> queue = new ConcurrentLinkedQueue<>();
-    }
-
-    @Data
-    @RequiredArgsConstructor
-    static public class TbMsgTbContextBiFunction {
-        final TbMsg msg;
-        final TbContext ctx;
-        final BiFunction<TbContext, TbMsg, ListenableFuture<TbMsg>> biFunction;
-    }
-
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java
index 609888db84..ac1741d044 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java
@@ -19,7 +19,9 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ConcurrentReferenceHashMap;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -27,26 +29,25 @@ import org.thingsboard.rule.engine.api.TbNode;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
+import org.thingsboard.rule.engine.util.SemaphoreWithTbMsgQueue;
+import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.msg.TbMsgType;
 import org.thingsboard.server.common.data.msg.TbNodeConnectionType;
 import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.common.msg.TbMsg;
-import org.thingsboard.server.dao.timeseries.TimeseriesService;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.thingsboard.common.util.DonAsynchron.withCallback;
 
 @Slf4j
 @RuleNode(type = ComponentType.ENRICHMENT,
-        name = "calculate delta", relationTypes = {TbNodeConnectionType.SUCCESS, TbNodeConnectionType.FAILURE, TbNodeConnectionType.OTHER},
+        name = "calculate delta",
+        version = 1,
+        relationTypes = {TbNodeConnectionType.SUCCESS, TbNodeConnectionType.FAILURE, TbNodeConnectionType.OTHER},
         configClazz = CalculateDeltaNodeConfiguration.class,
         nodeDescription = "Calculates delta and amount of time passed between previous timeseries key reading " +
                 "and current value for this key from the incoming message",
@@ -57,19 +58,25 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
 public class CalculateDeltaNode implements TbNode {
 
     private Map<EntityId, ValueWithTs> cache;
+    private Map<EntityId, SemaphoreWithTbMsgQueue> locks;
+
     private CalculateDeltaNodeConfiguration config;
-    private TbContext ctx;
-    private TimeseriesService timeseriesService;
-    private boolean useCache;
 
     @Override
     public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
         this.config = TbNodeUtils.convert(configuration, CalculateDeltaNodeConfiguration.class);
-        this.ctx = ctx;
-        this.timeseriesService = ctx.getTimeseriesService();
-        this.useCache = config.isUseCache();
-        if (useCache) {
-            cache = new ConcurrentHashMap<>();
+        if (StringUtils.isBlank(config.getInputValueKey())) {
+            throw new TbNodeException("Input value key should be specified!", true);
+        }
+        if (StringUtils.isBlank(config.getOutputValueKey())) {
+            throw new TbNodeException("Output value key should be specified!", true);
+        }
+        if (config.isAddPeriodBetweenMsgs() && StringUtils.isBlank(config.getPeriodValueKey())) {
+            throw new TbNodeException("Period value key should be specified!", true);
+        }
+        locks = new ConcurrentReferenceHashMap<>(16, ConcurrentReferenceHashMap.ReferenceType.WEAK);
+        if (config.isUseCache()) {
+            cache = new ConcurrentReferenceHashMap<>(16, ConcurrentReferenceHashMap.ReferenceType.SOFT);
         }
     }
 
@@ -79,79 +86,43 @@ public class CalculateDeltaNode implements TbNode {
             ctx.tellNext(msg, TbNodeConnectionType.OTHER);
             return;
         }
-        JsonNode json = JacksonUtil.toJsonNode(msg.getData());
-        String inputKey = config.getInputValueKey();
-        if (!json.has(inputKey)) {
+        JsonNode msgData = JacksonUtil.toJsonNode(msg.getData());
+        if (msgData == null || !msgData.has(config.getInputValueKey())) {
             ctx.tellNext(msg, TbNodeConnectionType.OTHER);
             return;
         }
-        withCallback(getLastValue(msg.getOriginator()),
-                previousData -> {
-                    double currentValue = json.get(inputKey).asDouble();
-                    long currentTs = msg.getMetaDataTs();
-
-                    if (useCache) {
-                        cache.put(msg.getOriginator(), new ValueWithTs(currentTs, currentValue));
-                    }
-
-                    BigDecimal delta = BigDecimal.valueOf(previousData != null ? currentValue - previousData.value : 0.0);
-
-                    if (config.isTellFailureIfDeltaIsNegative() && delta.doubleValue() < 0) {
-                        ctx.tellFailure(msg, new IllegalArgumentException("Delta value is negative!"));
-                        return;
-                    }
-
-                    if (config.getRound() != null) {
-                        delta = delta.setScale(config.getRound(), RoundingMode.HALF_UP);
-                    }
-
-                    ObjectNode result = (ObjectNode) json;
-                    if (delta.stripTrailingZeros().scale() > 0) {
-                        result.put(config.getOutputValueKey(), delta.doubleValue());
-                    } else {
-                        result.put(config.getOutputValueKey(), delta.longValueExact());
-                    }
-
-                    if (config.isAddPeriodBetweenMsgs()) {
-                        long period = previousData != null ? currentTs - previousData.ts : 0;
-                        result.put(config.getPeriodValueKey(), period);
-                    }
-                    ctx.tellSuccess(TbMsg.transformMsgData(msg, JacksonUtil.toString(result)));
-                },
-                t -> ctx.tellFailure(msg, t), ctx.getDbCallbackExecutor());
+        locks.computeIfAbsent(msg.getOriginator(), SemaphoreWithTbMsgQueue::new)
+                .addToQueueAndTryProcess(msg, ctx, this::processMsgAsync);
     }
 
     @Override
     public void destroy() {
-        if (useCache) {
+        locks.clear();
+        if (config.isUseCache()) {
             cache.clear();
         }
     }
 
-    private ListenableFuture<ValueWithTs> fetchLatestValueAsync(EntityId entityId) {
-        return Futures.transform(timeseriesService.findLatest(ctx.getTenantId(), entityId, Collections.singletonList(config.getInputValueKey())),
-                list -> extractValue(list.get(0))
-                , ctx.getDbCallbackExecutor());
-    }
-
-    private ValueWithTs fetchLatestValue(EntityId entityId) {
-        List<TsKvEntry> tsKvEntries = timeseriesService.findLatestSync(
-                ctx.getTenantId(),
-                entityId,
-                Collections.singletonList(config.getInputValueKey()));
-        return extractValue(tsKvEntries.get(0));
+    @Override
+    public TbPair<Boolean, JsonNode> upgrade(int fromVersion, JsonNode oldConfiguration) throws TbNodeException {
+        boolean hasChanges = false;
+        switch (fromVersion) {
+            case 0:
+                String excludeZeroDeltas = "excludeZeroDeltas";
+                if (!oldConfiguration.has(excludeZeroDeltas)) {
+                    hasChanges = true;
+                    ((ObjectNode) oldConfiguration).put(excludeZeroDeltas, false);
+                }
+                break;
+            default:
+                break;
+        }
+        return new TbPair<>(hasChanges, oldConfiguration);
     }
 
-    private ListenableFuture<ValueWithTs> getLastValue(EntityId entityId) {
-        if (useCache) {
-            ValueWithTs latestValue;
-            if ((latestValue = cache.get(entityId)) == null) {
-                latestValue = fetchLatestValue(entityId);
-            }
-            return Futures.immediateFuture(latestValue);
-        } else {
-            return fetchLatestValueAsync(entityId);
-        }
+    private ListenableFuture<ValueWithTs> fetchLatestValueAsync(TbContext ctx, EntityId entityId) {
+        return Futures.transform(ctx.getTimeseriesService().findLatest(ctx.getTenantId(), entityId, config.getInputValueKey()),
+                tsKvEntryOpt -> tsKvEntryOpt.map(this::extractValue).orElse(null), MoreExecutors.directExecutor());
     }
 
     private ValueWithTs extractValue(TsKvEntry kvEntry) {
@@ -161,36 +132,60 @@ public class CalculateDeltaNode implements TbNode {
         double result = 0.0;
         long ts = kvEntry.getTs();
         switch (kvEntry.getDataType()) {
-            case LONG:
-                result = kvEntry.getLongValue().get();
-                break;
-            case DOUBLE:
-                result = kvEntry.getDoubleValue().get();
-                break;
-            case STRING:
+            case LONG -> result = kvEntry.getLongValue().get();
+            case DOUBLE -> result = kvEntry.getDoubleValue().get();
+            case STRING -> {
                 try {
                     result = Double.parseDouble(kvEntry.getStrValue().get());
                 } catch (NumberFormatException e) {
                     throw new IllegalArgumentException("Calculation failed. Unable to parse value [" + kvEntry.getStrValue().get() + "]" +
                             " of telemetry [" + kvEntry.getKey() + "] to Double");
                 }
-                break;
-            case BOOLEAN:
-                throw new IllegalArgumentException("Calculation failed. Boolean values are not supported!");
-            case JSON:
-                throw new IllegalArgumentException("Calculation failed. JSON values are not supported!");
+            }
+            case BOOLEAN -> throw new IllegalArgumentException("Calculation failed. Boolean values are not supported!");
+            case JSON -> throw new IllegalArgumentException("Calculation failed. JSON values are not supported!");
         }
         return new ValueWithTs(ts, result);
     }
 
-    private static class ValueWithTs {
-        private final long ts;
-        private final double value;
+    protected ListenableFuture<TbMsg> processMsgAsync(TbContext ctx, TbMsg msg) {
+        ListenableFuture<ValueWithTs> latestValueFuture = getLatestFromCacheOrFetchFromDb(ctx, msg);
+        return Futures.transform(latestValueFuture, previousData -> {
+            ObjectNode json = (ObjectNode) JacksonUtil.toJsonNode(msg.getData());
+            double currentValue = json.get(config.getInputValueKey()).asDouble();
+            if (config.isUseCache()) {
+                cache.put(msg.getOriginator(), new ValueWithTs(msg.getMetaDataTs(), currentValue));
+            }
+            BigDecimal delta = BigDecimal.valueOf(previousData != null ? currentValue - previousData.value : 0.0);
+            if (config.isTellFailureIfDeltaIsNegative() && delta.doubleValue() < 0) {
+                throw new IllegalArgumentException("Delta value is negative!");
+            }
+            if (config.isExcludeZeroDeltas() && delta.doubleValue() == 0) {
+                return msg;
+            }
+            if (config.getRound() != null) {
+                delta = delta.setScale(config.getRound(), RoundingMode.HALF_UP);
+            }
+            if (delta.stripTrailingZeros().scale() > 0) {
+                json.put(config.getOutputValueKey(), delta.doubleValue());
+            } else {
+                json.put(config.getOutputValueKey(), delta.longValueExact());
+            }
+            if (config.isAddPeriodBetweenMsgs()) {
+                long period = previousData != null ? msg.getMetaDataTs() - previousData.ts : 0;
+                json.put(config.getPeriodValueKey(), period);
+            }
+            return TbMsg.transformMsgData(msg, JacksonUtil.toString(json));
+        }, MoreExecutors.directExecutor());
+    }
 
-        private ValueWithTs(long ts, double value) {
-            this.ts = ts;
-            this.value = value;
-        }
+    private ListenableFuture<ValueWithTs> getLatestFromCacheOrFetchFromDb(TbContext ctx, TbMsg msg) {
+        EntityId originator = msg.getOriginator();
+        ValueWithTs valueWithTs = cache.get(msg.getOriginator());
+        return valueWithTs != null ? Futures.immediateFuture(valueWithTs) : fetchLatestValueAsync(ctx, originator);
+    }
+
+    private record ValueWithTs(long ts, double value) {
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeConfiguration.java
index 0c4e6de556..0ae558718b 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeConfiguration.java
@@ -30,6 +30,7 @@ public class CalculateDeltaNodeConfiguration implements NodeConfiguration<Calcul
     private String periodValueKey;
     private Integer round;
     private boolean tellFailureIfDeltaIsNegative;
+    private boolean excludeZeroDeltas;
 
     @Override
     public CalculateDeltaNodeConfiguration defaultConfiguration() {
@@ -40,6 +41,7 @@ public class CalculateDeltaNodeConfiguration implements NodeConfiguration<Calcul
         configuration.setAddPeriodBetweenMsgs(false);
         configuration.setPeriodValueKey("periodInMs");
         configuration.setTellFailureIfDeltaIsNegative(true);
+        configuration.setExcludeZeroDeltas(false);
         return configuration;
     }
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java
index 6e80a1577b..5074024be5 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java
@@ -15,11 +15,14 @@
  */
 package org.thingsboard.rule.engine.mqtt;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.mqtt.MqttQoS;
 import io.netty.handler.ssl.SslContext;
 import io.netty.util.concurrent.Promise;
 import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.mqtt.MqttClient;
 import org.thingsboard.mqtt.MqttClientConfig;
 import org.thingsboard.mqtt.MqttConnectResult;
@@ -35,6 +38,7 @@ import org.thingsboard.rule.engine.external.TbAbstractExternalNode;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.plugin.ComponentClusteringMode;
 import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.common.data.util.TbPair;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 
@@ -81,7 +85,8 @@ public class TbMqttNode extends TbAbstractExternalNode {
     public void onMsg(TbContext ctx, TbMsg msg) {
         String topic = TbNodeUtils.processPattern(this.mqttNodeConfiguration.getTopicPattern(), msg);
         var tbMsg = ackIfNeeded(ctx, msg);
-        this.mqttClient.publish(topic, Unpooled.wrappedBuffer(tbMsg.getData().getBytes(UTF8)), MqttQoS.AT_LEAST_ONCE, mqttNodeConfiguration.isRetainedMessage())
+        this.mqttClient.publish(topic, Unpooled.wrappedBuffer(getData(tbMsg, mqttNodeConfiguration.isParseToPlainText()).getBytes(UTF8)),
+                        MqttQoS.AT_LEAST_ONCE, mqttNodeConfiguration.isRetainedMessage())
                 .addListener(future -> {
                             if (future.isSuccess()) {
                                 tellSuccess(ctx, tbMsg);
@@ -153,4 +158,27 @@ public class TbMqttNode extends TbAbstractExternalNode {
         return this.mqttNodeConfiguration.isSsl() ? this.mqttNodeConfiguration.getCredentials().initSslContext() : null;
     }
 
+    private String getData(TbMsg tbMsg, boolean parseToPlainText) {
+        if (parseToPlainText) {
+            return JacksonUtil.toPlainText(tbMsg.getData());
+        }
+        return tbMsg.getData();
+    }
+
+    @Override
+    public TbPair<Boolean, JsonNode> upgrade(int fromVersion, JsonNode oldConfiguration) throws TbNodeException {
+        boolean hasChanges = false;
+        switch (fromVersion) {
+            case 0:
+                String parseToPlainText = "parseToPlainText";
+                if (!oldConfiguration.has(parseToPlainText)) {
+                    hasChanges = true;
+                    ((ObjectNode) oldConfiguration).put(parseToPlainText, false);
+                }
+                break;
+            default:
+                break;
+        }
+        return new TbPair<>(hasChanges, oldConfiguration);
+    }
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeConfiguration.java
index 5f13b0e677..edf3618631 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeConfiguration.java
@@ -33,6 +33,7 @@ public class TbMqttNodeConfiguration implements NodeConfiguration<TbMqttNodeConf
 
     private boolean cleanSession;
     private boolean ssl;
+    private boolean parseToPlainText;
     private ClientCredentials credentials;
 
     @Override
@@ -44,6 +45,7 @@ public class TbMqttNodeConfiguration implements NodeConfiguration<TbMqttNodeConf
         configuration.setCleanSession(true);
         configuration.setSsl(false);
         configuration.setRetainedMessage(false);
+        configuration.setParseToPlainText(false);
         configuration.setCredentials(new AnonymousCredentials());
         return configuration;
     }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java
index 93ba7c4359..1db9dd2fc5 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java
@@ -238,23 +238,11 @@ public class TbHttpClient {
 
     private String getData(TbMsg tbMsg, boolean ignoreBody, boolean parseToPlainText) {
         if (!ignoreBody && parseToPlainText) {
-            return parseJsonStringToPlainText(tbMsg.getData());
+            return JacksonUtil.toPlainText(tbMsg.getData());
         }
         return tbMsg.getData();
     }
 
-    protected String parseJsonStringToPlainText(String data) {
-        if (data.startsWith("\"") && data.endsWith("\"") && data.length() >= 2) {
-            final String dataBefore = data;
-            try {
-                data = JacksonUtil.fromString(data, String.class);
-            } catch (Exception ignored) {}
-            log.trace("Trimming double quotes. Before trim: [{}], after trim: [{}]", dataBefore, data);
-        }
-
-        return data;
-    }
-
     private TbMsg processResponse(TbContext ctx, TbMsg origMsg, ResponseEntity<String> response) {
         TbMsgMetaData metaData = origMsg.getMetaData();
         HttpStatus httpStatus = (HttpStatus) response.getStatusCode();
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/SemaphoreWithTbMsgQueue.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/SemaphoreWithTbMsgQueue.java
new file mode 100644
index 0000000000..fa00856b4b
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/SemaphoreWithTbMsgQueue.java
@@ -0,0 +1,134 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.rule.engine.util;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.DonAsynchron;
+import org.thingsboard.rule.engine.api.TbContext;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.msg.TbMsg;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Semaphore;
+import java.util.function.BiFunction;
+
+/**
+ * A utility class designed to manage a queue of messages for a specific entity, ensuring that
+ * message processing is synchronized on a per-entity basis. This is achieved through the use of a semaphore,
+ * allowing only one message at a time to be processed for each entity ID, thus preventing race conditions
+ * and ensuring thread-safe operations.
+ * <p>
+ * This class is especially useful in scenarios where the order of message processing and
+ * resource access synchronization are crucial, such as updating caches or databases in a concurrent environment.
+ */
+@Data
+@Slf4j
+public class SemaphoreWithTbMsgQueue {
+
+    private final EntityId entityId;
+    private final Semaphore semaphore = new Semaphore(1);
+    private final Queue<TbMsgTbContextBiFunction> queue = new ConcurrentLinkedQueue<>();
+
+    /**
+     * Adds a message to the queue for asynchronous processing and attempts to process the queue if possible.
+     * This method is thread-safe and ensures that messages are processed in the order they were added,
+     * with each message for a specific entity being processed one at a time due to the semaphore control.
+     *
+     * @param msg                   The message to be processed.
+     * @param ctx                   The context in which the message should be processed.
+     * @param msgProcessingFunction The function that defines how the message will be processed.
+     */
+    public void addToQueueAndTryProcess(TbMsg msg, TbContext ctx, BiFunction<TbContext, TbMsg, ListenableFuture<TbMsg>> msgProcessingFunction) {
+        queue.add(new TbMsgTbContextBiFunction(msg, ctx, msgProcessingFunction));
+        tryProcessQueue();
+    }
+
+    /**
+     * Attempts to process the next message in the queue. If the semaphore is available (indicating
+     * that no other message for the same entity is currently being processed), this method will
+     * acquire the semaphore and start processing the message. If the semaphore is not available,
+     * this method will return immediately, ensuring that messages are processed sequentially
+     * for each entity.
+     * <p>
+     * This method is automatically called after adding a message to the queue to ensure
+     * that the queue is processed promptly.
+     */
+    private void tryProcessQueue() {
+        while (!queue.isEmpty()) {
+            // The semaphore have to be acquired before EACH poll and released before NEXT poll.
+            // Otherwise, some message will remain unprocessed in queue
+            if (!semaphore.tryAcquire()) {
+                return;
+            }
+            TbMsgTbContextBiFunction tbMsgTbContext = null;
+            try {
+                tbMsgTbContext = queue.poll();
+                if (tbMsgTbContext == null) {
+                    semaphore.release();
+                    continue;
+                }
+                final TbMsg msg = tbMsgTbContext.msg();
+                if (!msg.getCallback().isMsgValid()) {
+                    log.trace("[{}] Skipping non-valid message [{}]", entityId, msg);
+                    semaphore.release();
+                    continue;
+                }
+                //DO PROCESSING
+                final TbContext ctx = tbMsgTbContext.ctx();
+                final ListenableFuture<TbMsg> resultMsgFuture = tbMsgTbContext.biFunction().apply(ctx, msg);
+                DonAsynchron.withCallback(resultMsgFuture, resultMsg -> {
+                    try {
+                        ctx.tellSuccess(resultMsg);
+                    } finally {
+                        semaphore.release();
+                        tryProcessQueue();
+                    }
+                }, t -> {
+                    try {
+                        ctx.tellFailure(msg, t);
+                    } finally {
+                        semaphore.release();
+                        tryProcessQueue();
+                    }
+                }, ctx.getDbCallbackExecutor());
+            } catch (Throwable t) {
+                semaphore.release();
+                if (tbMsgTbContext == null) { // if no message polled, the loop become infinite, will throw exception
+                    log.error("[{}] Failed to process TbMsgTbContext queue", entityId, t);
+                    throw t;
+                }
+                TbMsg msg = tbMsgTbContext.msg();
+                TbContext ctx = tbMsgTbContext.ctx();
+                log.warn("[{}] Failed to process message: {}", entityId, msg, t);
+                ctx.tellFailure(msg, t); // you are not allowed to throw here, because queue will remain unprocessed
+                continue; // We are probably the last who process the queue. We have to continue poll until get successful callback or queue is empty
+            }
+            break; //submitted async exact one task. next poll will try on callback
+        }
+    }
+
+    /**
+     * A utility record to hold the tuple of a {@link TbMsg}, {@link TbContext}, and the message processing function.
+     * This facilitates passing these three elements as a single object within the queue.
+     */
+    private record TbMsgTbContextBiFunction(TbMsg msg, TbContext ctx,
+                                            BiFunction<TbContext, TbMsg, ListenableFuture<TbMsg>> biFunction) {
+    }
+
+}
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/TenantIdLoader.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/TenantIdLoader.java
index 0900137b73..152e193ea4 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/TenantIdLoader.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/TenantIdLoader.java
@@ -35,6 +35,7 @@ import org.thingsboard.server.common.data.id.NotificationTargetId;
 import org.thingsboard.server.common.data.id.NotificationTemplateId;
 import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.QueueId;
+import org.thingsboard.server.common.data.id.QueueStatsId;
 import org.thingsboard.server.common.data.id.RpcId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
@@ -141,6 +142,9 @@ public class TenantIdLoader {
             case NOTIFICATION_RULE:
                 tenantEntity = ctx.getNotificationRuleService().findNotificationRuleById(ctxTenantId, new NotificationRuleId(id));
                 break;
+            case QUEUE_STATS:
+                tenantEntity = ctx.getQueueStatsService().findQueueStatsById(ctxTenantId, new QueueStatsId(id));
+                break;
             default:
                 throw new RuntimeException("Unexpected entity type: " + entityId.getEntityType());
         }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java
deleted file mode 100644
index 837a80d626..0000000000
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java
+++ /dev/null
@@ -1,642 +0,0 @@
-/**
- * Copyright © 2016-2024 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.rule.engine.action;
-
-import com.datastax.oss.driver.api.core.uuid.Uuids;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.util.concurrent.Futures;
-import org.apache.commons.lang3.NotImplementedException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.common.util.ListeningExecutor;
-import org.thingsboard.rule.engine.TestDbCallbackExecutor;
-import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
-import org.thingsboard.rule.engine.api.ScriptEngine;
-import org.thingsboard.rule.engine.api.TbContext;
-import org.thingsboard.rule.engine.api.TbNodeConfiguration;
-import org.thingsboard.rule.engine.api.TbNodeException;
-import org.thingsboard.server.common.data.DataConstants;
-import org.thingsboard.server.common.data.alarm.Alarm;
-import org.thingsboard.server.common.data.alarm.AlarmApiCallResult;
-import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
-import org.thingsboard.server.common.data.alarm.AlarmInfo;
-import org.thingsboard.server.common.data.alarm.AlarmSeverity;
-import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
-import org.thingsboard.server.common.data.id.AlarmId;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.RuleChainId;
-import org.thingsboard.server.common.data.id.RuleNodeId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.msg.TbMsgType;
-import org.thingsboard.server.common.data.script.ScriptLanguage;
-import org.thingsboard.server.common.msg.TbMsg;
-import org.thingsboard.server.common.msg.TbMsgDataType;
-import org.thingsboard.server.common.msg.TbMsgMetaData;
-
-import javax.script.ScriptException;
-import java.io.IOException;
-import java.util.function.Consumer;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.anyLong;
-import static org.mockito.Mockito.atMost;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.same;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-@RunWith(MockitoJUnitRunner.class)
-public class TbAlarmNodeTest {
-
-    private TbAbstractAlarmNode node;
-
-    @Mock
-    private TbContext ctx;
-    @Mock
-    private RuleEngineAlarmService alarmService;
-
-    @Mock
-    private ScriptEngine detailsJs;
-
-    @Captor
-    private ArgumentCaptor<Runnable> successCaptor;
-    @Captor
-    private ArgumentCaptor<Consumer<Throwable>> failureCaptor;
-
-    private final RuleChainId ruleChainId = new RuleChainId(Uuids.timeBased());
-    private final RuleNodeId ruleNodeId = new RuleNodeId(Uuids.timeBased());
-
-    private ListeningExecutor dbExecutor;
-
-    private final EntityId originator = new DeviceId(Uuids.timeBased());
-    private final EntityId alarmOriginator = new AlarmId(Uuids.timeBased());
-    private final TenantId tenantId = TenantId.fromUUID(Uuids.timeBased());
-    private final TbMsgMetaData metaData = new TbMsgMetaData();
-    private final String rawJson = "{\"name\": \"Vit\", \"passed\": 5}";
-
-    @Before
-    public void before() {
-        dbExecutor = new TestDbCallbackExecutor();
-    }
-
-    @Test
-    public void newAlarmCanBeCreated() {
-        initWithCreateAlarmScript();
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-        long ts = msg.getTs();
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(null);
-        Alarm expectedAlarm = Alarm.builder()
-                .startTs(ts)
-                .endTs(ts)
-                .tenantId(tenantId)
-                .originator(originator)
-                .severity(AlarmSeverity.CRITICAL)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .build();
-        when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
-                AlarmApiCallResult.builder()
-                        .created(true)
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Created"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(originator, originatorCaptor.getValue());
-        assertEquals("value", metadataCaptor.getValue().getValue("key"));
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_NEW_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void buildDetailsThrowsException() {
-        initWithCreateAlarmScript();
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFailedFuture(new NotImplementedException("message")));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(null);
-
-        node.onMsg(ctx, msg);
-
-        verifyError(msg, "message", NotImplementedException.class);
-
-        verify(ctx).createScriptEngine(ScriptLanguage.JS, "DETAILS");
-        verify(ctx).getAlarmService();
-        verify(ctx, times(2)).getDbCallbackExecutor();
-        verify(ctx).logJsEvalRequest();
-        verify(ctx).getTenantId();
-        verify(alarmService).findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType");
-
-        verifyNoMoreInteractions(ctx, alarmService);
-    }
-
-    @Test
-    public void ifAlarmClearedCreateNew() {
-        initWithCreateAlarmScript();
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-        long ts = msg.getTs();
-        Alarm clearedAlarm = Alarm.builder().cleared(true).acknowledged(true).build();
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(clearedAlarm);
-
-        Alarm expectedAlarm = Alarm.builder()
-                .startTs(ts)
-                .endTs(ts)
-                .tenantId(tenantId)
-                .originator(originator)
-                .severity(AlarmSeverity.CRITICAL)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .build();
-        when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
-                AlarmApiCallResult.builder()
-                        .successful(true)
-                        .created(true)
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Created"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(originator, originatorCaptor.getValue());
-        assertEquals("value", metadataCaptor.getValue().getValue("key"));
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_NEW_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void alarmCanBeUpdated() {
-        initWithCreateAlarmScript();
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-
-        long oldEndDate = System.currentTimeMillis();
-        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).severity(AlarmSeverity.WARNING).endTs(oldEndDate).build();
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(activeAlarm);
-
-        Alarm expectedAlarm = Alarm.builder()
-                .tenantId(tenantId)
-                .originator(originator)
-                .severity(AlarmSeverity.CRITICAL)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .endTs(activeAlarm.getEndTs())
-                .build();
-        when(alarmService.updateAlarm(any(AlarmUpdateRequest.class))).thenReturn(
-                AlarmApiCallResult.builder()
-                        .successful(true)
-                        .modified(true)
-                        .old(new Alarm(activeAlarm))
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Updated"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(originator, originatorCaptor.getValue());
-        assertEquals("value", metadataCaptor.getValue().getValue("key"));
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_EXISTING_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertTrue(activeAlarm.getEndTs() >= oldEndDate);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void alarmCanBeCleared() {
-        initWithClearAlarmScript();
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-
-        long oldEndDate = System.currentTimeMillis();
-        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).severity(AlarmSeverity.WARNING).endTs(oldEndDate).build();
-
-        Alarm expectedAlarm = Alarm.builder()
-                .tenantId(tenantId)
-                .originator(originator)
-                .cleared(true)
-                .severity(AlarmSeverity.WARNING)
-                .propagate(false)
-                .type("SomeType")
-                .details(null)
-                .endTs(oldEndDate)
-                .build();
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(activeAlarm);
-        when(alarmService.clearAlarm(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()), anyLong(), nullable(JsonNode.class)))
-                .thenReturn(AlarmApiCallResult.builder()
-                        .successful(true)
-                        .cleared(true)
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Cleared"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(originator, originatorCaptor.getValue());
-        assertEquals("value", metadataCaptor.getValue().getValue("key"));
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_CLEARED_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void alarmCanBeClearedWithAlarmOriginator() throws ScriptException, IOException {
-        initWithClearAlarmScript();
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, alarmOriginator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-
-        long oldEndDate = System.currentTimeMillis();
-        AlarmId id = new AlarmId(alarmOriginator.getId());
-        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(originator).severity(AlarmSeverity.WARNING).endTs(oldEndDate).build();
-        activeAlarm.setId(id);
-
-        Alarm expectedAlarm = Alarm.builder()
-                .tenantId(tenantId)
-                .originator(originator)
-                .cleared(true)
-                .severity(AlarmSeverity.WARNING)
-                .propagate(false)
-                .type("SomeType")
-                .details(null)
-                .endTs(oldEndDate)
-                .build();
-        expectedAlarm.setId(id);
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findAlarmById(tenantId, id)).thenReturn(activeAlarm);
-        when(alarmService.clearAlarm(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()), anyLong(), nullable(JsonNode.class)))
-                .thenReturn(AlarmApiCallResult.builder()
-                        .successful(true)
-                        .cleared(true)
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Cleared"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(alarmOriginator, originatorCaptor.getValue());
-        assertEquals("value", metadataCaptor.getValue().getValue("key"));
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_CLEARED_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void testCreateAlarmWithDynamicSeverityFromMessageBody() throws Exception {
-        TbCreateAlarmNodeConfiguration config = new TbCreateAlarmNodeConfiguration();
-        config.setPropagate(true);
-        config.setSeverity("$[alarmSeverity]");
-        config.setAlarmType("SomeType");
-        config.setScriptLang(ScriptLanguage.JS);
-        config.setAlarmDetailsBuildJs("DETAILS");
-        config.setDynamicSeverity(true);
-        TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-
-        when(ctx.createScriptEngine(ScriptLanguage.JS, "DETAILS")).thenReturn(detailsJs);
-
-        when(ctx.getTenantId()).thenReturn(tenantId);
-        when(ctx.getAlarmService()).thenReturn(alarmService);
-        when(ctx.getDbCallbackExecutor()).thenReturn(dbExecutor);
-
-        node = new TbCreateAlarmNode();
-        node.init(ctx, nodeConfiguration);
-
-        String rawJson = "{\"alarmSeverity\": \"WARNING\", \"passed\": 5}";
-        metaData.putValue("key", "value");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-        long ts = msg.getTs();
-        Alarm expectedAlarm = Alarm.builder()
-                .startTs(ts)
-                .endTs(ts)
-                .tenantId(tenantId)
-                .originator(originator)
-                .severity(AlarmSeverity.WARNING)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .build();
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(null);
-        when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
-                AlarmApiCallResult.builder()
-                        .successful(true)
-                        .created(true)
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Created"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(originator, originatorCaptor.getValue());
-        assertEquals("value", metadataCaptor.getValue().getValue("key"));
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_NEW_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void testCreateAlarmWithDynamicSeverityFromMetadata() throws Exception {
-        TbCreateAlarmNodeConfiguration config = new TbCreateAlarmNodeConfiguration();
-        config.setPropagate(true);
-        config.setScriptLang(ScriptLanguage.JS);
-        config.setSeverity("${alarmSeverity}");
-        config.setAlarmType("SomeType");
-        config.setAlarmDetailsBuildJs("DETAILS");
-        config.setDynamicSeverity(true);
-        TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-
-        when(ctx.createScriptEngine(ScriptLanguage.JS, "DETAILS")).thenReturn(detailsJs);
-
-        when(ctx.getTenantId()).thenReturn(tenantId);
-        when(ctx.getAlarmService()).thenReturn(alarmService);
-        when(ctx.getDbCallbackExecutor()).thenReturn(dbExecutor);
-
-        node = new TbCreateAlarmNode();
-        node.init(ctx, nodeConfiguration);
-
-        metaData.putValue("alarmSeverity", "WARNING");
-        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-        long ts = msg.getTs();
-        Alarm expectedAlarm = Alarm.builder()
-                .startTs(ts)
-                .endTs(ts)
-                .tenantId(tenantId)
-                .originator(originator)
-                .severity(AlarmSeverity.WARNING)
-                .propagate(true)
-                .type("SomeType")
-                .details(null)
-                .build();
-
-        when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-        when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType")).thenReturn(null);
-        when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
-                AlarmApiCallResult.builder()
-                        .successful(true)
-                        .created(true)
-                        .alarm(new AlarmInfo(expectedAlarm))
-                        .build());
-
-        node.onMsg(ctx, msg);
-
-        verify(ctx).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-        successCaptor.getValue().run();
-        verify(ctx).tellNext(any(), eq("Created"));
-
-        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-        verify(ctx).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-        assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-        assertEquals(originator, originatorCaptor.getValue());
-        assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_NEW_ALARM));
-        assertNotSame(metaData, metadataCaptor.getValue());
-
-        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-        assertEquals(expectedAlarm, actualAlarm);
-    }
-
-    @Test
-    public void testCreateAlarmsWithPropagationToTenantWithDynamicTypes() throws Exception {
-        for (int i = 0; i < 10; i++) {
-            var config = new TbCreateAlarmNodeConfiguration();
-            config.setPropagateToTenant(true);
-            config.setSeverity(AlarmSeverity.CRITICAL.name());
-            config.setAlarmType("SomeType" + i);
-            config.setScriptLang(ScriptLanguage.JS);
-            config.setAlarmDetailsBuildJs("DETAILS");
-            config.setDynamicSeverity(true);
-            TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-
-            when(ctx.createScriptEngine(ScriptLanguage.JS, "DETAILS")).thenReturn(detailsJs);
-
-            when(ctx.getTenantId()).thenReturn(tenantId);
-            when(ctx.getAlarmService()).thenReturn(alarmService);
-            when(ctx.getDbCallbackExecutor()).thenReturn(dbExecutor);
-
-            node = new TbCreateAlarmNode();
-            node.init(ctx, nodeConfiguration);
-
-            metaData.putValue("key", "value");
-            TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, metaData, TbMsgDataType.JSON, rawJson, ruleChainId, ruleNodeId);
-            long ts = msg.getTs();
-            Alarm expectedAlarm = Alarm.builder()
-                    .startTs(ts)
-                    .endTs(ts)
-                    .tenantId(tenantId)
-                    .originator(originator)
-                    .severity(AlarmSeverity.CRITICAL)
-                    .propagateToTenant(true)
-                    .type("SomeType" + i)
-                    .details(null)
-                    .build();
-
-            when(detailsJs.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
-            when(alarmService.findLatestActiveByOriginatorAndType(tenantId, originator, "SomeType" + i)).thenReturn(null);
-            when(alarmService.createAlarm(any(AlarmCreateOrUpdateActiveRequest.class))).thenReturn(
-                    AlarmApiCallResult.builder()
-                            .successful(true)
-                            .created(true)
-                            .alarm(new AlarmInfo(expectedAlarm))
-                            .build());
-            node.onMsg(ctx, msg);
-
-            verify(ctx, atMost(10)).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
-            successCaptor.getValue().run();
-            verify(ctx, atMost(10)).tellNext(any(), eq("Created"));
-
-            ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
-            ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
-            ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
-            ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
-            ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
-            verify(ctx, atMost(10)).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
-
-            assertEquals(TbMsgType.ALARM, typeCaptor.getValue());
-            assertEquals(originator, originatorCaptor.getValue());
-            assertEquals("value", metadataCaptor.getValue().getValue("key"));
-            assertEquals(Boolean.TRUE.toString(), metadataCaptor.getValue().getValue(DataConstants.IS_NEW_ALARM));
-            assertNotSame(metaData, metadataCaptor.getValue());
-
-            Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
-            assertEquals(expectedAlarm, actualAlarm);
-        }
-    }
-
-    private void initWithCreateAlarmScript() {
-        try {
-            TbCreateAlarmNodeConfiguration config = new TbCreateAlarmNodeConfiguration();
-            config.setPropagate(true);
-            config.setSeverity(AlarmSeverity.CRITICAL.name());
-            config.setAlarmType("SomeType");
-            config.setScriptLang(ScriptLanguage.JS);
-            config.setAlarmDetailsBuildJs("DETAILS");
-            TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-
-            when(ctx.createScriptEngine(ScriptLanguage.JS, "DETAILS")).thenReturn(detailsJs);
-
-            when(ctx.getTenantId()).thenReturn(tenantId);
-            when(ctx.getAlarmService()).thenReturn(alarmService);
-            when(ctx.getDbCallbackExecutor()).thenReturn(dbExecutor);
-
-            node = new TbCreateAlarmNode();
-            node.init(ctx, nodeConfiguration);
-        } catch (TbNodeException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    private void initWithClearAlarmScript() {
-        try {
-            TbClearAlarmNodeConfiguration config = new TbClearAlarmNodeConfiguration();
-            config.setAlarmType("SomeType");
-            config.setScriptLang(ScriptLanguage.JS);
-            config.setAlarmDetailsBuildJs("DETAILS");
-            TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-
-            when(ctx.createScriptEngine(ScriptLanguage.JS, "DETAILS")).thenReturn(detailsJs);
-
-            when(ctx.getTenantId()).thenReturn(tenantId);
-            when(ctx.getAlarmService()).thenReturn(alarmService);
-            when(ctx.getDbCallbackExecutor()).thenReturn(dbExecutor);
-
-            node = new TbClearAlarmNode();
-            node.init(ctx, nodeConfiguration);
-        } catch (TbNodeException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    private void verifyError(TbMsg msg, String message, Class expectedClass) {
-        ArgumentCaptor<Throwable> captor = ArgumentCaptor.forClass(Throwable.class);
-        verify(ctx).tellFailure(same(msg), captor.capture());
-
-        Throwable value = captor.getValue();
-        assertEquals(expectedClass, value.getClass());
-        assertEquals(message, value.getMessage());
-    }
-
-}
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeTest.java
new file mode 100644
index 0000000000..afab0a0a99
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeTest.java
@@ -0,0 +1,218 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.rule.engine.action;
+
+import com.datastax.oss.driver.api.core.uuid.Uuids;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.util.concurrent.Futures;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.common.util.ListeningExecutor;
+import org.thingsboard.rule.engine.TestDbCallbackExecutor;
+import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
+import org.thingsboard.rule.engine.api.ScriptEngine;
+import org.thingsboard.rule.engine.api.TbContext;
+import org.thingsboard.rule.engine.api.TbNodeConfiguration;
+import org.thingsboard.rule.engine.api.TbNodeException;
+import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmApiCallResult;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.id.AlarmId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.msg.TbMsgType;
+import org.thingsboard.server.common.data.script.ScriptLanguage;
+import org.thingsboard.server.common.msg.TbMsg;
+import org.thingsboard.server.common.msg.TbMsgMetaData;
+
+import java.util.function.Consumer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class TbClearAlarmNodeTest {
+
+    @Mock
+    TbContext ctxMock;
+    @Mock
+    RuleEngineAlarmService alarmServiceMock;
+    @Mock
+    ScriptEngine alarmDetailsScriptMock;
+
+    @Captor
+    ArgumentCaptor<Runnable> successCaptor;
+    @Captor
+    ArgumentCaptor<Consumer<Throwable>> failureCaptor;
+
+    TbClearAlarmNode node;
+
+    final TenantId tenantId = TenantId.fromUUID(Uuids.timeBased());
+    final EntityId msgOriginator = new DeviceId(Uuids.timeBased());
+    final EntityId alarmOriginator = new AlarmId(Uuids.timeBased());
+    TbMsgMetaData metadata;
+
+    ListeningExecutor dbExecutor;
+
+    @BeforeEach
+    void before() {
+        dbExecutor = new TestDbCallbackExecutor();
+        metadata = new TbMsgMetaData();
+    }
+
+    @Test
+    void alarmCanBeCleared() {
+        initWithClearAlarmScript();
+        metadata.putValue("key", "value");
+        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50}");
+
+        long oldEndDate = System.currentTimeMillis();
+        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(msgOriginator).severity(AlarmSeverity.WARNING).endTs(oldEndDate).build();
+
+        Alarm expectedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(true)
+                .severity(AlarmSeverity.WARNING)
+                .propagate(false)
+                .type("SomeType")
+                .details(null)
+                .endTs(oldEndDate)
+                .build();
+
+        when(alarmDetailsScriptMock.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
+        when(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, "SomeType")).thenReturn(activeAlarm);
+        when(alarmServiceMock.clearAlarm(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()), anyLong(), nullable(JsonNode.class)))
+                .thenReturn(AlarmApiCallResult.builder()
+                        .successful(true)
+                        .cleared(true)
+                        .alarm(new AlarmInfo(expectedAlarm))
+                        .build());
+
+        node.onMsg(ctxMock, msg);
+
+        verify(ctxMock).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
+        successCaptor.getValue().run();
+        verify(ctxMock).tellNext(any(), eq("Cleared"));
+
+        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
+        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
+        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
+        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
+        verify(ctxMock).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
+
+        assertThat(TbMsgType.ALARM).isEqualTo(typeCaptor.getValue());
+        assertThat(msgOriginator).isEqualTo(originatorCaptor.getValue());
+        assertThat("value").isEqualTo(metadataCaptor.getValue().getValue("key"));
+        assertThat(Boolean.TRUE.toString()).isEqualTo(metadataCaptor.getValue().getValue(DataConstants.IS_CLEARED_ALARM));
+        assertThat(metadata).isNotSameAs(metadataCaptor.getValue());
+
+        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
+        assertThat(actualAlarm).isEqualTo(expectedAlarm);
+    }
+
+    @Test
+    void alarmCanBeClearedWithAlarmOriginator() {
+        initWithClearAlarmScript();
+        metadata.putValue("key", "value");
+        TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, alarmOriginator, metadata, "{\"temperature\": 50}");
+
+        long oldEndDate = System.currentTimeMillis();
+        AlarmId id = new AlarmId(alarmOriginator.getId());
+        Alarm activeAlarm = Alarm.builder().type("SomeType").tenantId(tenantId).originator(msgOriginator).severity(AlarmSeverity.WARNING).endTs(oldEndDate).build();
+        activeAlarm.setId(id);
+
+        Alarm expectedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(true)
+                .severity(AlarmSeverity.WARNING)
+                .propagate(false)
+                .type("SomeType")
+                .details(null)
+                .endTs(oldEndDate)
+                .build();
+        expectedAlarm.setId(id);
+
+        when(alarmDetailsScriptMock.executeJsonAsync(msg)).thenReturn(Futures.immediateFuture(null));
+        when(alarmServiceMock.findAlarmById(tenantId, id)).thenReturn(activeAlarm);
+        when(alarmServiceMock.clearAlarm(eq(activeAlarm.getTenantId()), eq(activeAlarm.getId()), anyLong(), nullable(JsonNode.class)))
+                .thenReturn(AlarmApiCallResult.builder()
+                        .successful(true)
+                        .cleared(true)
+                        .alarm(new AlarmInfo(expectedAlarm))
+                        .build());
+
+        node.onMsg(ctxMock, msg);
+
+        verify(ctxMock).enqueue(any(), successCaptor.capture(), failureCaptor.capture());
+        successCaptor.getValue().run();
+        verify(ctxMock).tellNext(any(), eq("Cleared"));
+
+        ArgumentCaptor<TbMsg> msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        ArgumentCaptor<TbMsgType> typeCaptor = ArgumentCaptor.forClass(TbMsgType.class);
+        ArgumentCaptor<EntityId> originatorCaptor = ArgumentCaptor.forClass(EntityId.class);
+        ArgumentCaptor<TbMsgMetaData> metadataCaptor = ArgumentCaptor.forClass(TbMsgMetaData.class);
+        ArgumentCaptor<String> dataCaptor = ArgumentCaptor.forClass(String.class);
+        verify(ctxMock).transformMsg(msgCaptor.capture(), typeCaptor.capture(), originatorCaptor.capture(), metadataCaptor.capture(), dataCaptor.capture());
+
+        assertThat(TbMsgType.ALARM).isEqualTo(typeCaptor.getValue());
+        assertThat(alarmOriginator).isEqualTo(originatorCaptor.getValue());
+        assertThat("value").isEqualTo(metadataCaptor.getValue().getValue("key"));
+        assertThat(Boolean.TRUE.toString()).isEqualTo(metadataCaptor.getValue().getValue(DataConstants.IS_CLEARED_ALARM));
+        assertThat(metadata).isNotSameAs(metadataCaptor.getValue());
+
+        Alarm actualAlarm = JacksonUtil.fromBytes(dataCaptor.getValue().getBytes(), Alarm.class);
+        assertThat(actualAlarm).isEqualTo(expectedAlarm);
+    }
+
+    private void initWithClearAlarmScript() {
+        try {
+            TbClearAlarmNodeConfiguration config = new TbClearAlarmNodeConfiguration();
+            config.setAlarmType("SomeType");
+            config.setScriptLang(ScriptLanguage.JS);
+            config.setAlarmDetailsBuildJs("DETAILS");
+            TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
+
+            when(ctxMock.createScriptEngine(ScriptLanguage.JS, "DETAILS")).thenReturn(alarmDetailsScriptMock);
+
+            when(ctxMock.getTenantId()).thenReturn(tenantId);
+            when(ctxMock.getAlarmService()).thenReturn(alarmServiceMock);
+            when(ctxMock.getDbCallbackExecutor()).thenReturn(dbExecutor);
+
+            node = new TbClearAlarmNode();
+            node.init(ctxMock, nodeConfiguration);
+        } catch (TbNodeException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+
+}
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeTest.java
new file mode 100644
index 0000000000..c0e27231c4
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeTest.java
@@ -0,0 +1,1223 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.rule.engine.action;
+
+import com.datastax.oss.driver.api.core.uuid.Uuids;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.util.concurrent.Futures;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.common.util.ListeningExecutor;
+import org.thingsboard.rule.engine.TestDbCallbackExecutor;
+import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
+import org.thingsboard.rule.engine.api.ScriptEngine;
+import org.thingsboard.rule.engine.api.TbContext;
+import org.thingsboard.rule.engine.api.TbNodeConfiguration;
+import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmApiCallResult;
+import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
+import org.thingsboard.server.common.data.alarm.AlarmPropagationInfo;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest;
+import org.thingsboard.server.common.data.id.AlarmId;
+import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.RuleNodeId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.msg.TbMsgType;
+import org.thingsboard.server.common.data.msg.TbNodeConnectionType;
+import org.thingsboard.server.common.data.script.ScriptLanguage;
+import org.thingsboard.server.common.msg.TbMsg;
+import org.thingsboard.server.common.msg.TbMsgMetaData;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.never;
+
+@ExtendWith(MockitoExtension.class)
+class TbCreateAlarmNodeTest {
+
+    @Mock
+    TbContext ctxMock;
+    @Mock
+    RuleEngineAlarmService alarmServiceMock;
+    @Mock
+    ScriptEngine alarmDetailsScriptMock;
+    @Mock
+    TbMsg alarmActionMsgMock;
+
+    @Captor
+    ArgumentCaptor<Runnable> successCaptor;
+
+    @Spy
+    TbCreateAlarmNode nodeSpy;
+    TbCreateAlarmNodeConfiguration config;
+
+    final TenantId tenantId = TenantId.fromUUID(Uuids.timeBased());
+    final EntityId msgOriginator = new DeviceId(Uuids.timeBased());
+    TbMsgMetaData metadata;
+
+    ListeningExecutor dbExecutor;
+
+    @BeforeEach
+    void before() {
+        dbExecutor = new TestDbCallbackExecutor();
+        metadata = new TbMsgMetaData();
+        config = new TbCreateAlarmNodeConfiguration();
+    }
+
+    @Test
+    @DisplayName("When defaultConfiguration() is called, then correct values are set.")
+    void whenDefaultConfiguration_thenShouldSetCorrectValues() {
+        // GIVEN-WHEN
+        config = config.defaultConfiguration();
+
+        // THEN
+        assertThat(config.getAlarmType()).isEqualTo("General Alarm");
+        assertThat(config.getScriptLang()).isEqualTo(ScriptLanguage.TBEL);
+        assertThat(config.getAlarmDetailsBuildJs()).isEqualTo("""
+                \
+                var details = {};
+                if (metadata.prevAlarmDetails) {
+                    details = JSON.parse(metadata.prevAlarmDetails);
+                    //remove prevAlarmDetails from metadata
+                    delete metadata.prevAlarmDetails;
+                    //now metadata is the same as it comes IN this rule node
+                }
+
+
+                return details;""");
+        assertThat(config.getAlarmDetailsBuildTbel()).isEqualTo("""
+                \
+                var details = {};
+                if (metadata.prevAlarmDetails != null) {
+                    details = JSON.parse(metadata.prevAlarmDetails);
+                    //remove prevAlarmDetails from metadata
+                    metadata.remove('prevAlarmDetails');
+                    //now metadata is the same as it comes IN this rule node
+                }
+
+
+                return details;""");
+        assertThat(config.getSeverity()).isEqualTo(AlarmSeverity.CRITICAL.name());
+        assertThat(config.isPropagate()).isFalse();
+        assertThat(config.isPropagateToOwner()).isFalse();
+        assertThat(config.isPropagateToTenant()).isFalse();
+        assertThat(config.isUseMessageAlarmData()).isFalse();
+        assertThat(config.isOverwriteAlarmDetails()).isFalse();
+        assertThat(config.isDynamicSeverity()).isFalse();
+        assertThat(config.getRelationTypes()).isEmpty();
+    }
+
+    @Test
+    @DisplayName("When node is taking alarm info from default node config and alarm does not exist, then should create new alarm using info from default config.")
+    void whenAlarmDataIsTakenFromDefaultNodeConfigAndAlarmDoesNotExist_thenNewAlarmIsCreated() throws Exception {
+        // GIVEN
+
+        // node configuration
+        config = config.defaultConfiguration();
+
+        // other values
+        String alarmType = config.getAlarmType();
+        AlarmSeverity alarmSeverity = AlarmSeverity.valueOf(config.getSeverity());
+        JsonNode alarmDetails = JacksonUtil.newObjectNode();
+
+        long metadataTs = 1711631716127L;
+        metadata.putValue("ts", Long.toString(metadataTs));
+        metadata.putValue("location", "Company office");
+
+        var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50}");
+
+        Alarm existingAlarm = null;
+
+        // expected values
+        var expectedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(alarmSeverity)
+                .propagate(false)
+                .propagateToOwner(false)
+                .propagateToTenant(false)
+                .propagateRelationTypes(Collections.emptyList())
+                .type(alarmType)
+                .startTs(metadataTs)
+                .endTs(metadataTs)
+                .details(alarmDetails)
+                .build();
+        var expectedCreatedAlarmInfo = new AlarmInfo(expectedAlarm);
+        expectedCreatedAlarmInfo.setId(new AlarmId(Uuids.timeBased()));
+
+        var expectedCreateAlarmRequest = AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(null)
+                .type(alarmType)
+                .originator(msgOriginator)
+                .severity(alarmSeverity)
+                .startTs(metadataTs)
+                .endTs(metadataTs)
+                .details(alarmDetails)
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(false)
+                        .propagateToOwner(false)
+                        .propagateToTenant(false)
+                        .propagateRelationTypes(Collections.emptyList()).build())
+                .userId(null)
+                .edgeAlarmId(null)
+                .build();
+
+        // mocks
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.getSelfId()).willReturn(ruleNodeSelfId);
+        given(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, alarmType)).willReturn(existingAlarm);
+        given(alarmDetailsScriptMock.executeJsonAsync(incomingMsg)).willReturn(Futures.immediateFuture(alarmDetails));
+        var apiCallResult = AlarmApiCallResult.builder()
+                .successful(true)
+                .created(true)
+                .modified(false)
+                .cleared(false)
+                .deleted(false)
+                .alarm(expectedCreatedAlarmInfo)
+                .old(null)
+                .propagatedEntitiesList(Collections.emptyList())
+                .build();
+        given(alarmServiceMock.createAlarm(expectedCreateAlarmRequest)).willReturn(apiCallResult);
+        given(ctxMock.alarmActionMsg(expectedCreatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_CREATED)).willReturn(alarmActionMsgMock);
+        given(ctxMock.transformMsg(any(TbMsg.class), any(TbMsgType.class), any(EntityId.class), any(TbMsgMetaData.class), anyString()))
+                .willAnswer(answer -> TbMsg.transformMsg(
+                        answer.getArgument(0, TbMsg.class),
+                        answer.getArgument(1, TbMsgType.class),
+                        answer.getArgument(2, EntityId.class),
+                        answer.getArgument(3, TbMsgMetaData.class),
+                        answer.getArgument(4, String.class))
+                );
+        given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, TbAbstractAlarmNodeConfiguration.ALARM_DETAILS_BUILD_TBEL_TEMPLATE)).willReturn(alarmDetailsScriptMock);
+
+        // node initialization
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+
+        // verify alarm details script evaluation
+        then(ctxMock).should().logJsEvalRequest();
+        then(alarmDetailsScriptMock).should().executeJsonAsync(incomingMsg);
+        then(ctxMock).should().logJsEvalResponse();
+
+        // verify we called createAlarm() with correct AlarmCreateOrUpdateActiveRequest
+        then(alarmServiceMock).should().createAlarm(expectedCreateAlarmRequest);
+        then(alarmServiceMock).should(never()).updateAlarm(any());
+
+        // verify that we created a correct alarm action message and enqueued it
+        then(ctxMock).should().alarmActionMsg(expectedCreatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_CREATED);
+        then(ctxMock).should().enqueue(eq(alarmActionMsgMock), successCaptor.capture(), any());
+
+        // run success captor to emulate successful sending and to trigger further processing on the success path
+        successCaptor.getValue().run();
+
+        // capture and verify an outgoing message
+        var outgoingMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(ctxMock).should().tellNext(outgoingMsgCaptor.capture(), eq("Created"));
+        var actualOutgoingMsg = outgoingMsgCaptor.getValue();
+        assertThat(actualOutgoingMsg.getType()).isEqualTo(TbMsgType.ALARM.name());
+        assertThat(actualOutgoingMsg.getOriginator()).isEqualTo(msgOriginator);
+        assertThat(actualOutgoingMsg.getData()).isEqualTo(JacksonUtil.valueToTree(expectedCreatedAlarmInfo).toString());
+
+        Map<String, String> actualOutgoingMsgMetadataContent = actualOutgoingMsg.getMetaData().getData();
+        assertThat(actualOutgoingMsgMetadataContent).containsAllEntriesOf(metadata.getData());
+        assertThat(actualOutgoingMsgMetadataContent).containsEntry(DataConstants.IS_NEW_ALARM, Boolean.TRUE.toString());
+        assertThat(actualOutgoingMsgMetadataContent).size().isEqualTo(metadata.getData().size() + 1);
+
+        // verify wrong processing paths were not taken
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Updated"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+        then(ctxMock).should(never()).tellFailure(any(), any());
+    }
+
+    @Test
+    @DisplayName("When node is taking alarm info from node config and cleared alarm exists, then should create new alarm using info from config.")
+    void whenAlarmDataIsTakenFromNodeConfigAndClearedAlarmExists_thenNewAlarmIsCreated() throws Exception {
+        // GIVEN
+
+        // node configuration
+        config.setAlarmType("$[alarmType]");
+        config.setScriptLang(ScriptLanguage.JS);
+        config.setAlarmDetailsBuildJs("""
+                return {
+                    alarmDetails: "Some alarm details"
+                };
+                """);
+        config.setAlarmDetailsBuildTbel("""
+                return {
+                    alarmDetails: "Some alarm details"
+                };
+                """);
+        config.setDynamicSeverity(true);
+        config.setSeverity("${alarmSeverity}");
+        config.setPropagate(true);
+        config.setPropagateToOwner(true);
+        config.setPropagateToTenant(true);
+        config.setRelationTypes(List.of("RELATION_TYPE_1", "RELATION_TYPE_2", "RELATION_TYPE_3"));
+        config.setUseMessageAlarmData(false);
+        config.setOverwriteAlarmDetails(false);
+
+        // other values
+        String alarmType = "High Temperature";
+        AlarmSeverity alarmSeverity = AlarmSeverity.MAJOR;
+        JsonNode alarmDetails = JacksonUtil.newObjectNode().put("alarmDetails", "Some alarm details");
+
+        long metadataTs = 1711631716127L;
+        metadata.putValue("ts", Long.toString(metadataTs));
+        metadata.putValue("alarmSeverity", alarmSeverity.name());
+        metadata.putValue("location", "Company office");
+
+        var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50, \"alarmType\": \"" + alarmType + "\"}");
+
+        var existingClearedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(true)
+                .acknowledged(false)
+                .severity(AlarmSeverity.WARNING)
+                .propagate(false)
+                .propagateToOwner(false)
+                .propagateToTenant(false)
+                .propagateRelationTypes(Collections.emptyList())
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(200L)
+                .details(JacksonUtil.newObjectNode().put("oldAlarmDetailsProperty", "oldAlarmDetailsPropertyValue"))
+                .build();
+        existingClearedAlarm.setId(new AlarmId(Uuids.timeBased()));
+
+        // expected values
+        var expectedCreatedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(alarmSeverity)
+                .propagate(true)
+                .propagateToOwner(true)
+                .propagateToTenant(true)
+                .propagateRelationTypes(config.getRelationTypes())
+                .type(alarmType)
+                .startTs(metadataTs)
+                .endTs(metadataTs)
+                .details(alarmDetails)
+                .build();
+        var expectedCreatedAlarmInfo = new AlarmInfo(expectedCreatedAlarm);
+        expectedCreatedAlarmInfo.setId(new AlarmId(Uuids.timeBased()));
+
+        var expectedCreateAlarmRequest = AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(null)
+                .type(alarmType)
+                .originator(msgOriginator)
+                .severity(alarmSeverity)
+                .startTs(metadataTs)
+                .endTs(metadataTs)
+                .details(alarmDetails)
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(true)
+                        .propagateToOwner(true)
+                        .propagateToTenant(true)
+                        .propagateRelationTypes(config.getRelationTypes()).build())
+                .userId(null)
+                .edgeAlarmId(null)
+                .build();
+
+        // mocks
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.getSelfId()).willReturn(ruleNodeSelfId);
+        given(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, alarmType)).willReturn(existingClearedAlarm);
+        given(alarmDetailsScriptMock.executeJsonAsync(incomingMsg)).willReturn(Futures.immediateFuture(alarmDetails));
+        var apiCallResult = AlarmApiCallResult.builder()
+                .successful(true)
+                .created(true)
+                .modified(false)
+                .cleared(false)
+                .deleted(false)
+                .alarm(expectedCreatedAlarmInfo)
+                .old(null)
+                .propagatedEntitiesList(List.of(TenantId.fromUUID(Uuids.timeBased()), new CustomerId(Uuids.timeBased()), new AssetId(Uuids.timeBased())))
+                .build();
+        given(alarmServiceMock.createAlarm(expectedCreateAlarmRequest)).willReturn(apiCallResult);
+        given(ctxMock.alarmActionMsg(expectedCreatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_CREATED)).willReturn(alarmActionMsgMock);
+        given(ctxMock.transformMsg(any(TbMsg.class), any(TbMsgType.class), any(EntityId.class), any(TbMsgMetaData.class), anyString()))
+                .willAnswer(answer -> TbMsg.transformMsg(
+                        answer.getArgument(0, TbMsg.class),
+                        answer.getArgument(1, TbMsgType.class),
+                        answer.getArgument(2, EntityId.class),
+                        answer.getArgument(3, TbMsgMetaData.class),
+                        answer.getArgument(4, String.class))
+                );
+        given(ctxMock.createScriptEngine(ScriptLanguage.JS, config.getAlarmDetailsBuildJs())).willReturn(alarmDetailsScriptMock);
+
+        // node initialization
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+
+        // verify alarm details script evaluation
+        then(ctxMock).should().logJsEvalRequest();
+        then(alarmDetailsScriptMock).should().executeJsonAsync(incomingMsg);
+        then(ctxMock).should().logJsEvalResponse();
+
+        // verify we called createAlarm() with correct AlarmCreateOrUpdateActiveRequest
+        then(alarmServiceMock).should().createAlarm(expectedCreateAlarmRequest);
+        then(alarmServiceMock).should(never()).updateAlarm(any());
+
+        // verify that we created a correct alarm action message and enqueued it
+        then(ctxMock).should().alarmActionMsg(expectedCreatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_CREATED);
+        then(ctxMock).should().enqueue(eq(alarmActionMsgMock), successCaptor.capture(), any());
+
+        // run success captor to emulate successful sending and to trigger further processing on the success path
+        successCaptor.getValue().run();
+
+        // capture and verify an outgoing message
+        var outgoingMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(ctxMock).should().tellNext(outgoingMsgCaptor.capture(), eq("Created"));
+        var actualOutgoingMsg = outgoingMsgCaptor.getValue();
+        assertThat(actualOutgoingMsg.getType()).isEqualTo(TbMsgType.ALARM.name());
+        assertThat(actualOutgoingMsg.getOriginator()).isEqualTo(msgOriginator);
+        assertThat(actualOutgoingMsg.getData()).isEqualTo(JacksonUtil.valueToTree(expectedCreatedAlarmInfo).toString());
+
+        Map<String, String> actualOutgoingMsgMetadataContent = actualOutgoingMsg.getMetaData().getData();
+        assertThat(actualOutgoingMsgMetadataContent).containsAllEntriesOf(metadata.getData());
+        assertThat(actualOutgoingMsgMetadataContent).containsEntry(DataConstants.IS_NEW_ALARM, Boolean.TRUE.toString());
+        assertThat(actualOutgoingMsgMetadataContent).size().isEqualTo(metadata.getData().size() + 1);
+
+        // verify wrong processing paths were not taken
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Updated"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+        then(ctxMock).should(never()).tellFailure(any(), any());
+    }
+
+    @Test
+    @DisplayName("When node is taking alarm info from node config and active alarm exists, then should update existing alarm using info from config.")
+    void whenAlarmDataIsTakenFromNodeConfigAndActiveAlarmExists_thenExistingAlarmIsUpdated() throws Exception {
+        // GIVEN
+
+        // values that changed between existing alarm and updated alarm
+        AlarmSeverity oldAlarmSeverity = AlarmSeverity.WARNING;
+        AlarmSeverity newAlarmSeverity = AlarmSeverity.MAJOR;
+
+        boolean oldPropagate = true;
+        boolean newPropagate = false;
+
+        boolean oldPropagateToOwner = false;
+        boolean newPropagateToOwner = true;
+
+        boolean oldPropagateToTenant = false;
+        boolean newPropagateToTenant = true;
+
+        List<String> oldPropagateRelationTypes = List.of("RELATION_TYPE_1", "RELATION_TYPE_2", "RELATION_TYPE_3");
+        List<String> newPropagateRelationTypes = Collections.emptyList();
+
+        JsonNode oldAlarmDetails = JacksonUtil.newObjectNode().put("oldAlarmDetailsKey", "oldAlarmDetailsValue");
+        JsonNode newAlarmDetails = JacksonUtil.newObjectNode().put("newAlarmDetails", "Some alarm details TBEL").set("oldAlarmDetails", oldAlarmDetails);
+
+        long oldEndTs = 200L;
+        long newEndTs = 300L;
+
+        // node configuration
+        config.setAlarmType("${alarmType}");
+        config.setScriptLang(ScriptLanguage.TBEL);
+        config.setAlarmDetailsBuildJs("""
+                return {
+                    oldAlarmDetails: metadata.prevAlarmDetails,
+                    newAlarmDetails: "Some alarm details JS"
+                };
+                """);
+        config.setAlarmDetailsBuildTbel("""
+                return {
+                    oldAlarmDetails: metadata.prevAlarmDetails,
+                    newAlarmDetails: "Some alarm details TBEL"
+                };
+                """);
+        config.setDynamicSeverity(true);
+        config.setSeverity("$[alarmSeverity]");
+        config.setPropagate(newPropagate);
+        config.setPropagateToOwner(newPropagateToOwner);
+        config.setPropagateToTenant(newPropagateToTenant);
+        config.setRelationTypes(newPropagateRelationTypes);
+        config.setUseMessageAlarmData(false);
+        config.setOverwriteAlarmDetails(false);
+
+        // other values
+        String alarmType = "High Temperature";
+
+        long metadataTs = 1711631716127L;
+        metadata.putValue("ts", Long.toString(metadataTs));
+        metadata.putValue("alarmType", alarmType);
+        metadata.putValue("location", "Company office");
+
+        var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50, \"alarmSeverity\": \"" + newAlarmSeverity.name() + "\"}");
+
+        var existingAlarmId = new AlarmId(Uuids.timeBased());
+        var existingActiveAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(oldAlarmSeverity)
+                .propagate(oldPropagate)
+                .propagateToOwner(oldPropagateToOwner)
+                .propagateToTenant(oldPropagateToTenant)
+                .propagateRelationTypes(oldPropagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(oldEndTs)
+                .details(oldAlarmDetails)
+                .build();
+        existingActiveAlarm.setId(existingAlarmId);
+
+        // expected values
+        var expectedUpdatedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(newAlarmSeverity)
+                .propagate(newPropagate)
+                .propagateToOwner(newPropagateToOwner)
+                .propagateToTenant(newPropagateToTenant)
+                .propagateRelationTypes(newPropagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(newEndTs)
+                .details(newAlarmDetails)
+                .build();
+        expectedUpdatedAlarm.setId(existingAlarmId);
+        var expectedUpdatedAlarmInfo = new AlarmInfo(expectedUpdatedAlarm);
+
+        var expectedUpdateAlarmRequest = AlarmUpdateRequest.builder()
+                .tenantId(tenantId)
+                .alarmId(existingAlarmId)
+                .severity(newAlarmSeverity)
+                .startTs(100L)
+                .endTs(newEndTs)
+                .details(newAlarmDetails)
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(newPropagate)
+                        .propagateToOwner(newPropagateToOwner)
+                        .propagateToTenant(newPropagateToTenant)
+                        .propagateRelationTypes(newPropagateRelationTypes).build())
+                .userId(null)
+                .build();
+
+        // mocks
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.getSelfId()).willReturn(ruleNodeSelfId);
+        given(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, alarmType)).willReturn(existingActiveAlarm);
+        given(alarmDetailsScriptMock.executeJsonAsync(any())).willReturn(Futures.immediateFuture(newAlarmDetails));
+        doReturn(newEndTs).when(nodeSpy).currentTimeMillis();
+        var apiCallResult = AlarmApiCallResult.builder()
+                .successful(true)
+                .created(false)
+                .modified(true)
+                .cleared(false)
+                .deleted(false)
+                .alarm(expectedUpdatedAlarmInfo)
+                .old(new Alarm(existingActiveAlarm))
+                .propagatedEntitiesList(List.of(tenantId))
+                .build();
+        given(alarmServiceMock.updateAlarm(expectedUpdateAlarmRequest)).willReturn(apiCallResult);
+        given(ctxMock.alarmActionMsg(expectedUpdatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_UPDATED)).willReturn(alarmActionMsgMock);
+        given(ctxMock.transformMsg(any(TbMsg.class), any(TbMsgType.class), any(EntityId.class), any(TbMsgMetaData.class), anyString()))
+                .willAnswer(answer -> TbMsg.transformMsg(
+                        answer.getArgument(0, TbMsg.class),
+                        answer.getArgument(1, TbMsgType.class),
+                        answer.getArgument(2, EntityId.class),
+                        answer.getArgument(3, TbMsgMetaData.class),
+                        answer.getArgument(4, String.class))
+                );
+        given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
+
+        // node initialization
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+
+        // verify alarm details script evaluation
+        then(ctxMock).should().logJsEvalRequest();
+        var dummyMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(alarmDetailsScriptMock).should().executeJsonAsync(dummyMsgCaptor.capture());
+        TbMsg actualDummyMsg = dummyMsgCaptor.getValue();
+        assertThat(actualDummyMsg.getType()).isEqualTo(incomingMsg.getType());
+        assertThat(actualDummyMsg.getData()).isEqualTo(incomingMsg.getData());
+        assertThat(actualDummyMsg.getMetaData().getData()).containsEntry("prevAlarmDetails", JacksonUtil.toString(oldAlarmDetails));
+        then(ctxMock).should().logJsEvalResponse();
+
+        // verify we called updateAlarm() with correct AlarmUpdateRequest
+        then(alarmServiceMock).should().updateAlarm(expectedUpdateAlarmRequest);
+        then(alarmServiceMock).should(never()).createAlarm(any());
+
+        // verify that we created a correct alarm action message and enqueued it
+        then(ctxMock).should().alarmActionMsg(expectedUpdatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_UPDATED);
+        then(ctxMock).should().enqueue(eq(alarmActionMsgMock), successCaptor.capture(), any());
+
+        // run success captor to emulate successful queueing of an alarm action message and to trigger further processing on the success path
+        successCaptor.getValue().run();
+
+        // capture and verify an outgoing message
+        var outgoingMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(ctxMock).should().tellNext(outgoingMsgCaptor.capture(), eq("Updated"));
+        var actualOutgoingMsg = outgoingMsgCaptor.getValue();
+        assertThat(actualOutgoingMsg.getType()).isEqualTo(TbMsgType.ALARM.name());
+        assertThat(actualOutgoingMsg.getOriginator()).isEqualTo(msgOriginator);
+        assertThat(actualOutgoingMsg.getData()).isEqualTo(JacksonUtil.valueToTree(expectedUpdatedAlarmInfo).toString());
+
+        Map<String, String> actualOutgoingMsgMetadataContent = actualOutgoingMsg.getMetaData().getData();
+        assertThat(actualOutgoingMsgMetadataContent).containsAllEntriesOf(metadata.getData());
+        assertThat(actualOutgoingMsgMetadataContent).containsEntry(DataConstants.IS_EXISTING_ALARM, Boolean.TRUE.toString());
+        assertThat(actualOutgoingMsgMetadataContent).size().isEqualTo(metadata.getData().size() + 1);
+
+        // verify wrong processing paths were not taken
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Created"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+        then(ctxMock).should(never()).tellFailure(any(), any());
+    }
+
+    @Test
+    @DisplayName("When node is taking alarm data from incoming message and cleared alarm exists, then should create new alarm using info from incoming message.")
+    void whenAlarmDataIsTakenFromMsgAndClearedAlarmExists_thenNewAlarmIsCreated() throws Exception {
+        // GIVEN
+
+        // node configuration
+        config = config.defaultConfiguration();
+        config.setUseMessageAlarmData(true);
+        config.setOverwriteAlarmDetails(false);
+
+        // other values
+        String alarmType = "High Temperature";
+        AlarmSeverity alarmSeverity = AlarmSeverity.MAJOR;
+        JsonNode alarmDetails = JacksonUtil.newObjectNode().put("alarmDetails", "Some alarm details");
+
+        // alarm that is inside an incoming message
+        var alarmFromIncomingMessage = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(alarmSeverity)
+                .propagate(true)
+                .propagateToOwner(true)
+                .propagateToTenant(true)
+                .propagateRelationTypes(Collections.emptyList())
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(300L)
+                .details(alarmDetails)
+                .build();
+
+        long metadataTs = 1711631716127L;
+        metadata.putValue("ts", Long.toString(metadataTs));
+        metadata.putValue("location", "Company office");
+
+        var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.ALARM, msgOriginator, metadata, JacksonUtil.toString(alarmFromIncomingMessage));
+
+        var existingClearedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(true)
+                .acknowledged(false)
+                .severity(AlarmSeverity.WARNING)
+                .propagate(false)
+                .propagateToOwner(true)
+                .propagateToTenant(true)
+                .propagateRelationTypes(Collections.emptyList())
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(200L)
+                .details(JacksonUtil.newObjectNode())
+                .build();
+        existingClearedAlarm.setId(new AlarmId(Uuids.timeBased()));
+
+        // expected values
+        var expectedCreatedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(alarmSeverity)
+                .propagate(true)
+                .propagateToOwner(true)
+                .propagateToTenant(true)
+                .propagateRelationTypes(Collections.emptyList())
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(300L)
+                .details(alarmDetails)
+                .build();
+        var expectedCreatedAlarmInfo = new AlarmInfo(expectedCreatedAlarm);
+        expectedCreatedAlarmInfo.setId(new AlarmId(Uuids.timeBased()));
+
+        var expectedCreateAlarmRequest = AlarmCreateOrUpdateActiveRequest.builder()
+                .tenantId(tenantId)
+                .customerId(null)
+                .type(alarmType)
+                .originator(msgOriginator)
+                .severity(alarmSeverity)
+                .startTs(100L)
+                .endTs(300L)
+                .details(alarmDetails)
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(true)
+                        .propagateToOwner(true)
+                        .propagateToTenant(true)
+                        .propagateRelationTypes(Collections.emptyList()).build())
+                .userId(null)
+                .edgeAlarmId(null)
+                .build();
+
+        // mocks
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.getSelfId()).willReturn(ruleNodeSelfId);
+        given(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, alarmType)).willReturn(existingClearedAlarm);
+        var apiCallResult = AlarmApiCallResult.builder()
+                .successful(true)
+                .created(true)
+                .modified(false)
+                .cleared(false)
+                .deleted(false)
+                .alarm(expectedCreatedAlarmInfo)
+                .old(null)
+                .propagatedEntitiesList(List.of(TenantId.fromUUID(Uuids.timeBased()), new CustomerId(Uuids.timeBased()), new AssetId(Uuids.timeBased())))
+                .build();
+        given(alarmServiceMock.createAlarm(expectedCreateAlarmRequest)).willReturn(apiCallResult);
+        given(ctxMock.alarmActionMsg(expectedCreatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_CREATED)).willReturn(alarmActionMsgMock);
+        given(ctxMock.transformMsg(any(TbMsg.class), any(TbMsgType.class), any(EntityId.class), any(TbMsgMetaData.class), anyString()))
+                .willAnswer(answer -> TbMsg.transformMsg(
+                        answer.getArgument(0, TbMsg.class),
+                        answer.getArgument(1, TbMsgType.class),
+                        answer.getArgument(2, EntityId.class),
+                        answer.getArgument(3, TbMsgMetaData.class),
+                        answer.getArgument(4, String.class))
+                );
+        given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
+
+        // node initialization
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+
+        // verify alarm details script was not evaluated
+        then(ctxMock).should(never()).logJsEvalRequest();
+        then(alarmDetailsScriptMock).should(never()).executeJsonAsync(any());
+        then(ctxMock).should(never()).logJsEvalResponse();
+
+        // verify we called createAlarm() with correct AlarmCreateOrUpdateActiveRequest
+        then(alarmServiceMock).should().createAlarm(expectedCreateAlarmRequest);
+        then(alarmServiceMock).should(never()).updateAlarm(any());
+
+        // verify that we created a correct alarm action message and enqueued it
+        then(ctxMock).should().alarmActionMsg(expectedCreatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_CREATED);
+        then(ctxMock).should().enqueue(eq(alarmActionMsgMock), successCaptor.capture(), any());
+
+        // run success captor to emulate successful sending and to trigger further processing on the success path
+        successCaptor.getValue().run();
+
+        // capture and verify an outgoing message
+        var outgoingMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(ctxMock).should().tellNext(outgoingMsgCaptor.capture(), eq("Created"));
+        var actualOutgoingMsg = outgoingMsgCaptor.getValue();
+        assertThat(actualOutgoingMsg.getType()).isEqualTo(TbMsgType.ALARM.name());
+        assertThat(actualOutgoingMsg.getOriginator()).isEqualTo(msgOriginator);
+        assertThat(actualOutgoingMsg.getData()).isEqualTo(JacksonUtil.valueToTree(expectedCreatedAlarmInfo).toString());
+
+        Map<String, String> actualOutgoingMsgMetadataContent = actualOutgoingMsg.getMetaData().getData();
+        assertThat(actualOutgoingMsgMetadataContent).containsAllEntriesOf(metadata.getData());
+        assertThat(actualOutgoingMsgMetadataContent).containsEntry(DataConstants.IS_NEW_ALARM, Boolean.TRUE.toString());
+        assertThat(actualOutgoingMsgMetadataContent).size().isEqualTo(metadata.getData().size() + 1);
+
+        // verify wrong processing paths were not taken
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Updated"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+        then(ctxMock).should(never()).tellFailure(any(), any());
+    }
+
+    @Test
+    @DisplayName("When node is taking alarm data from incoming message and active alarm exists, then should update existing alarm using info from incoming message.")
+    void whenAlarmDataIsTakenFromMsgAndActiveAlarmExists_thenExistingAlarmIsUpdated() throws Exception {
+        // GIVEN
+
+        // values that changed between existing alarm and updated alarm
+        AlarmSeverity oldAlarmSeverity = AlarmSeverity.WARNING;
+        AlarmSeverity newAlarmSeverity = AlarmSeverity.MAJOR;
+
+        boolean oldPropagate = true;
+        boolean newPropagate = false;
+
+        boolean oldPropagateToOwner = false;
+        boolean newPropagateToOwner = true;
+
+        boolean oldPropagateToTenant = false;
+        boolean newPropagateToTenant = true;
+
+        List<String> oldPropagateRelationTypes = List.of("RELATION_TYPE_1", "RELATION_TYPE_2", "RELATION_TYPE_3");
+        List<String> newPropagateRelationTypes = Collections.emptyList();
+
+        JsonNode oldAlarmDetails = JacksonUtil.newObjectNode().put("oldAlarmDetailsKey", "oldAlarmDetailsValue");
+        JsonNode newAlarmDetails = JacksonUtil.newObjectNode().put("newAlarmDetails", "Some alarm details TBEL").set("oldAlarmDetails", oldAlarmDetails);
+
+        long oldEndTs = 200L;
+        long newEndTs = 300L;
+
+        // node configuration
+        config = config.defaultConfiguration();
+        config.setUseMessageAlarmData(true);
+        config.setOverwriteAlarmDetails(true);
+
+        // other values
+        String alarmType = "High Temperature";
+
+        long metadataTs = 1711631716127L;
+        metadata.putValue("ts", Long.toString(metadataTs));
+        metadata.putValue("location", "Company office");
+
+        var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
+
+        // alarm that is inside an incoming message
+        var alarmFromIncomingMessage = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(newAlarmSeverity)
+                .propagate(newPropagate)
+                .propagateToOwner(newPropagateToOwner)
+                .propagateToTenant(newPropagateToTenant)
+                .propagateRelationTypes(newPropagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(newEndTs)
+                .details(newAlarmDetails)
+                .build();
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, JacksonUtil.toString(alarmFromIncomingMessage));
+
+        var existingAlarmId = new AlarmId(Uuids.timeBased());
+        var existingActiveAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(oldAlarmSeverity)
+                .propagate(oldPropagate)
+                .propagateToOwner(oldPropagateToOwner)
+                .propagateToTenant(oldPropagateToTenant)
+                .propagateRelationTypes(oldPropagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(oldEndTs)
+                .details(oldAlarmDetails)
+                .build();
+        existingActiveAlarm.setId(existingAlarmId);
+
+        // expected values
+        var expectedUpdatedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(newAlarmSeverity)
+                .propagate(newPropagate)
+                .propagateToOwner(newPropagateToOwner)
+                .propagateToTenant(newPropagateToTenant)
+                .propagateRelationTypes(newPropagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(newEndTs)
+                .details(newAlarmDetails)
+                .build();
+        expectedUpdatedAlarm.setId(existingAlarmId);
+        var expectedUpdatedAlarmInfo = new AlarmInfo(expectedUpdatedAlarm);
+
+        var expectedUpdateAlarmRequest = AlarmUpdateRequest.builder()
+                .tenantId(tenantId)
+                .alarmId(existingAlarmId)
+                .severity(newAlarmSeverity)
+                .startTs(100L)
+                .endTs(newEndTs)
+                .details(newAlarmDetails)
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(newPropagate)
+                        .propagateToOwner(newPropagateToOwner)
+                        .propagateToTenant(newPropagateToTenant)
+                        .propagateRelationTypes(newPropagateRelationTypes).build())
+                .userId(null)
+                .build();
+
+        // mocks
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.getSelfId()).willReturn(ruleNodeSelfId);
+        given(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, alarmType)).willReturn(existingActiveAlarm);
+        given(alarmDetailsScriptMock.executeJsonAsync(any())).willReturn(Futures.immediateFuture(newAlarmDetails));
+        doReturn(newEndTs).when(nodeSpy).currentTimeMillis();
+        var apiCallResult = AlarmApiCallResult.builder()
+                .successful(true)
+                .created(false)
+                .modified(true)
+                .cleared(false)
+                .deleted(false)
+                .alarm(expectedUpdatedAlarmInfo)
+                .old(new Alarm(existingActiveAlarm))
+                .propagatedEntitiesList(List.of(tenantId))
+                .build();
+        given(alarmServiceMock.updateAlarm(expectedUpdateAlarmRequest)).willReturn(apiCallResult);
+        given(ctxMock.alarmActionMsg(expectedUpdatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_UPDATED)).willReturn(alarmActionMsgMock);
+        given(ctxMock.transformMsg(any(TbMsg.class), any(TbMsgType.class), any(EntityId.class), any(TbMsgMetaData.class), anyString()))
+                .willAnswer(answer -> TbMsg.transformMsg(
+                        answer.getArgument(0, TbMsg.class),
+                        answer.getArgument(1, TbMsgType.class),
+                        answer.getArgument(2, EntityId.class),
+                        answer.getArgument(3, TbMsgMetaData.class),
+                        answer.getArgument(4, String.class))
+                );
+        given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
+
+        // node initialization
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+
+        // verify alarm details script evaluation
+        then(ctxMock).should().logJsEvalRequest();
+        var dummyMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(alarmDetailsScriptMock).should().executeJsonAsync(dummyMsgCaptor.capture());
+        TbMsg actualDummyMsg = dummyMsgCaptor.getValue();
+        assertThat(actualDummyMsg.getType()).isEqualTo(incomingMsg.getType());
+        assertThat(actualDummyMsg.getData()).isEqualTo(incomingMsg.getData());
+        assertThat(actualDummyMsg.getMetaData().getData()).containsEntry("prevAlarmDetails", JacksonUtil.toString(oldAlarmDetails));
+        then(ctxMock).should().logJsEvalResponse();
+
+        // verify we called updateAlarm() with correct AlarmUpdateRequest
+        then(alarmServiceMock).should().updateAlarm(expectedUpdateAlarmRequest);
+        then(alarmServiceMock).should(never()).createAlarm(any());
+
+        // verify that we created a correct alarm action message and enqueued it
+        then(ctxMock).should().alarmActionMsg(expectedUpdatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_UPDATED);
+        then(ctxMock).should().enqueue(eq(alarmActionMsgMock), successCaptor.capture(), any());
+
+        // run success captor to emulate successful queueing of an alarm action message and to trigger further processing on the success path
+        successCaptor.getValue().run();
+
+        // capture and verify an outgoing message
+        var outgoingMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(ctxMock).should().tellNext(outgoingMsgCaptor.capture(), eq("Updated"));
+        var actualOutgoingMsg = outgoingMsgCaptor.getValue();
+        assertThat(actualOutgoingMsg.getType()).isEqualTo(TbMsgType.ALARM.name());
+        assertThat(actualOutgoingMsg.getOriginator()).isEqualTo(msgOriginator);
+        assertThat(actualOutgoingMsg.getData()).isEqualTo(JacksonUtil.valueToTree(expectedUpdatedAlarmInfo).toString());
+
+        Map<String, String> actualOutgoingMsgMetadataContent = actualOutgoingMsg.getMetaData().getData();
+        assertThat(actualOutgoingMsgMetadataContent).containsAllEntriesOf(metadata.getData());
+        assertThat(actualOutgoingMsgMetadataContent).containsEntry(DataConstants.IS_EXISTING_ALARM, Boolean.TRUE.toString());
+        assertThat(actualOutgoingMsgMetadataContent).size().isEqualTo(metadata.getData().size() + 1);
+
+        // verify wrong processing paths were not taken
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Created"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+        then(ctxMock).should(never()).tellFailure(any(), any());
+    }
+
+    @Test
+    @DisplayName("When only severity was updated (other fields the same), then should consider this as an alarm update and take update processing path.")
+    void whenOnlySeverityWasUpdated_thenShouldTakeAlarmUpdatedPath() throws Exception {
+        // GIVEN
+
+        // values that changed between existing alarm and updated alarm
+        AlarmSeverity oldAlarmSeverity = AlarmSeverity.WARNING;
+        AlarmSeverity newAlarmSeverity = AlarmSeverity.MAJOR;
+
+        boolean propagate = true;
+        boolean propagateToOwner = false;
+        boolean propagateToTenant = false;
+        List<String> propagateRelationTypes = List.of("RELATION_TYPE_1", "RELATION_TYPE_2", "RELATION_TYPE_3");
+        JsonNode alarmDetails = JacksonUtil.newObjectNode().put("oldAlarmDetailsKey", "oldAlarmDetailsValue");
+        long endTs = 200L;
+
+        // node configuration
+        config = config.defaultConfiguration();
+        config.setUseMessageAlarmData(true);
+        config.setOverwriteAlarmDetails(true);
+
+        // other values
+        String alarmType = "High Temperature";
+
+        long metadataTs = 1711631716127L;
+        metadata.putValue("ts", Long.toString(metadataTs));
+        metadata.putValue("location", "Company office");
+
+        var ruleNodeSelfId = new RuleNodeId(Uuids.timeBased());
+
+        // alarm that is inside an incoming message
+        var alarmFromIncomingMessage = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(newAlarmSeverity)
+                .propagate(propagate)
+                .propagateToOwner(propagateToOwner)
+                .propagateToTenant(propagateToTenant)
+                .propagateRelationTypes(propagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(endTs)
+                .details(alarmDetails)
+                .build();
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, JacksonUtil.toString(alarmFromIncomingMessage));
+
+        var existingAlarmId = new AlarmId(Uuids.timeBased());
+        var existingActiveAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(oldAlarmSeverity)
+                .propagate(propagate)
+                .propagateToOwner(propagateToOwner)
+                .propagateToTenant(propagateToTenant)
+                .propagateRelationTypes(propagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(endTs)
+                .details(alarmDetails)
+                .build();
+        existingActiveAlarm.setId(existingAlarmId);
+
+        // expected values
+        var expectedUpdatedAlarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(msgOriginator)
+                .cleared(false)
+                .acknowledged(false)
+                .severity(newAlarmSeverity)
+                .propagate(propagate)
+                .propagateToOwner(propagateToOwner)
+                .propagateToTenant(propagateToTenant)
+                .propagateRelationTypes(propagateRelationTypes)
+                .type(alarmType)
+                .startTs(100L)
+                .endTs(endTs)
+                .details(alarmDetails)
+                .build();
+        expectedUpdatedAlarm.setId(existingAlarmId);
+        var expectedUpdatedAlarmInfo = new AlarmInfo(expectedUpdatedAlarm);
+
+        var expectedUpdateAlarmRequest = AlarmUpdateRequest.builder()
+                .tenantId(tenantId)
+                .alarmId(existingAlarmId)
+                .severity(newAlarmSeverity)
+                .startTs(100L)
+                .endTs(endTs)
+                .details(alarmDetails)
+                .propagation(AlarmPropagationInfo.builder()
+                        .propagate(propagate)
+                        .propagateToOwner(propagateToOwner)
+                        .propagateToTenant(propagateToTenant)
+                        .propagateRelationTypes(propagateRelationTypes).build())
+                .userId(null)
+                .build();
+
+        // mocks
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.getSelfId()).willReturn(ruleNodeSelfId);
+        given(alarmServiceMock.findLatestActiveByOriginatorAndType(tenantId, msgOriginator, alarmType)).willReturn(existingActiveAlarm);
+        given(alarmDetailsScriptMock.executeJsonAsync(any())).willReturn(Futures.immediateFuture(alarmDetails));
+        doReturn(endTs).when(nodeSpy).currentTimeMillis();
+        var apiCallResult = AlarmApiCallResult.builder()
+                .successful(true)
+                .created(false)
+                .modified(true)
+                .cleared(false)
+                .deleted(false)
+                .alarm(expectedUpdatedAlarmInfo)
+                .old(new Alarm(existingActiveAlarm))
+                .propagatedEntitiesList(List.of(tenantId))
+                .build();
+        given(alarmServiceMock.updateAlarm(expectedUpdateAlarmRequest)).willReturn(apiCallResult);
+        given(ctxMock.alarmActionMsg(expectedUpdatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_UPDATED)).willReturn(alarmActionMsgMock);
+        given(ctxMock.transformMsg(any(TbMsg.class), any(TbMsgType.class), any(EntityId.class), any(TbMsgMetaData.class), anyString()))
+                .willAnswer(answer -> TbMsg.transformMsg(
+                        answer.getArgument(0, TbMsg.class),
+                        answer.getArgument(1, TbMsgType.class),
+                        answer.getArgument(2, EntityId.class),
+                        answer.getArgument(3, TbMsgMetaData.class),
+                        answer.getArgument(4, String.class))
+                );
+        given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
+
+        // node initialization
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+
+        // verify alarm details script evaluation
+        then(ctxMock).should().logJsEvalRequest();
+        var dummyMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(alarmDetailsScriptMock).should().executeJsonAsync(dummyMsgCaptor.capture());
+        TbMsg actualDummyMsg = dummyMsgCaptor.getValue();
+        assertThat(actualDummyMsg.getType()).isEqualTo(incomingMsg.getType());
+        assertThat(actualDummyMsg.getData()).isEqualTo(incomingMsg.getData());
+        assertThat(actualDummyMsg.getMetaData().getData()).containsEntry("prevAlarmDetails", JacksonUtil.toString(alarmDetails));
+        then(ctxMock).should().logJsEvalResponse();
+
+        // verify we called updateAlarm() with correct AlarmUpdateRequest
+        then(alarmServiceMock).should().updateAlarm(expectedUpdateAlarmRequest);
+        then(alarmServiceMock).should(never()).createAlarm(any());
+
+        // verify that we created a correct alarm action message and enqueued it
+        then(ctxMock).should().alarmActionMsg(expectedUpdatedAlarmInfo, ruleNodeSelfId, TbMsgType.ENTITY_UPDATED);
+        then(ctxMock).should().enqueue(eq(alarmActionMsgMock), successCaptor.capture(), any());
+
+        // run success captor to emulate successful queueing of an alarm action message and to trigger further processing on the success path
+        successCaptor.getValue().run();
+
+        // capture and verify an outgoing message
+        var outgoingMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+        then(ctxMock).should().tellNext(outgoingMsgCaptor.capture(), eq("Updated"));
+        var actualOutgoingMsg = outgoingMsgCaptor.getValue();
+        assertThat(actualOutgoingMsg.getType()).isEqualTo(TbMsgType.ALARM.name());
+        assertThat(actualOutgoingMsg.getOriginator()).isEqualTo(msgOriginator);
+        assertThat(actualOutgoingMsg.getData()).isEqualTo(JacksonUtil.valueToTree(expectedUpdatedAlarmInfo).toString());
+
+        Map<String, String> actualOutgoingMsgMetadataContent = actualOutgoingMsg.getMetaData().getData();
+        assertThat(actualOutgoingMsgMetadataContent).containsAllEntriesOf(metadata.getData());
+        assertThat(actualOutgoingMsgMetadataContent).containsEntry(DataConstants.IS_EXISTING_ALARM, Boolean.TRUE.toString());
+        assertThat(actualOutgoingMsgMetadataContent).size().isEqualTo(metadata.getData().size() + 1);
+
+        // verify wrong processing paths were not taken
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Created"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+        then(ctxMock).should(never()).tellFailure(any(), any());
+    }
+
+    @Test
+    @DisplayName("When the alarm details script throws an exception, " +
+            "node should tell failure with that exception, and it should neither create nor update any alarms, nor should it send any other messages.")
+    void whenAlarmDetailsScriptThrowsException_thenShouldTellFailureAndNoOtherActions() throws Exception {
+        // GIVEN
+        config = config.defaultConfiguration();
+
+        var incomingMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, msgOriginator, metadata, "{\"temperature\": 50}");
+
+        given(ctxMock.getTenantId()).willReturn(tenantId);
+        given(ctxMock.getAlarmService()).willReturn(alarmServiceMock);
+        given(ctxMock.getDbCallbackExecutor()).willReturn(dbExecutor);
+        given(ctxMock.createScriptEngine(ScriptLanguage.TBEL, config.getAlarmDetailsBuildTbel())).willReturn(alarmDetailsScriptMock);
+
+        var expectedException = new ExecutionException("Failed to execute script.", new RuntimeException("Something went wrong!"));
+        given(alarmDetailsScriptMock.executeJsonAsync(incomingMsg)).willReturn(Futures.immediateFailedFuture(expectedException));
+
+        nodeSpy.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config)));
+
+        // WHEN
+        nodeSpy.onMsg(ctxMock, incomingMsg);
+
+        // THEN
+        var exceptionCaptor = ArgumentCaptor.forClass(Throwable.class);
+        then(ctxMock).should().tellFailure(eq(incomingMsg), exceptionCaptor.capture());
+        Throwable actualException = exceptionCaptor.getValue();
+        assertThat(actualException).isEqualTo(expectedException);
+
+        then(alarmServiceMock).should(never()).createAlarm(any());
+        then(alarmServiceMock).should(never()).updateAlarm(any());
+
+        then(ctxMock).should(never()).tellNext(any(), eq(TbNodeConnectionType.FALSE));
+        then(ctxMock).should(never()).tellNext(any(), eq("Created"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Updated"));
+        then(ctxMock).should(never()).tellNext(any(), eq("Cleared"));
+        then(ctxMock).should(never()).tellSuccess(any());
+    }
+
+}
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
index c79f962818..5b71db5dfb 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
@@ -38,8 +38,10 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.BDDMockito.willReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -158,6 +160,19 @@ class TbCheckAlarmStatusNodeTest {
         assertThat(value).isInstanceOf(TbNodeException.class).hasMessage("No such alarm found.");
     }
 
+    @Test
+    void givenUnparseableAlarm_whenOnMsg_then_Failure() {
+        String msgData = "{\"Number\":1113718,\"id\":8.1}";
+        TbMsg msg = getTbMsg(msgData);
+        willReturn("Default Rule Chain").given(ctx).getRuleChainName();
+
+        assertThatThrownBy(() -> node.onMsg(ctx, msg))
+                .as("onMsg")
+                .isInstanceOf(TbNodeException.class)
+                .hasCauseInstanceOf(IllegalArgumentException.class)
+                .hasMessage("java.lang.IllegalArgumentException: The given string value cannot be transformed to Json object: {\"Number\":1113718,\"id\":8.1}");
+    }
+
     private TbMsg getTbMsg(String msgData) {
         return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, DEVICE_ID, TbMsgMetaData.EMPTY, msgData);
     }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathNodeTest.java
index e036e6333e..80e669847c 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathNodeTest.java
@@ -20,7 +20,6 @@ import com.google.common.util.concurrent.Futures;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.Triple;
 import org.assertj.core.api.SoftAssertions;
-import org.junit.Assert;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -69,7 +68,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyDouble;
@@ -78,9 +76,7 @@ import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.BDDMockito.willReturn;
-import static org.mockito.BDDMockito.willReturn;
 import static org.mockito.BDDMockito.willThrow;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -543,7 +539,7 @@ public class TbMathNodeTest {
 
         ArgumentCaptor<Throwable> tCaptor = ArgumentCaptor.forClass(Throwable.class);
         Mockito.verify(ctx, Mockito.timeout(5000)).tellFailure(eq(msg), tCaptor.capture());
-        Assert.assertNotNull(tCaptor.getValue().getMessage());
+        assertNotNull(tCaptor.getValue().getMessage());
     }
 
     @Test
@@ -558,7 +554,7 @@ public class TbMathNodeTest {
 
         ArgumentCaptor<Throwable> tCaptor = ArgumentCaptor.forClass(Throwable.class);
         Mockito.verify(ctx, Mockito.timeout(5000)).tellFailure(eq(msg), tCaptor.capture());
-        Assert.assertNotNull(tCaptor.getValue().getMessage());
+        assertNotNull(tCaptor.getValue().getMessage());
     }
 
     @Test
@@ -574,10 +570,10 @@ public class TbMathNodeTest {
 
         List<TbMsg> slowMsgList = IntStream.range(0, 5)
                 .mapToObj(x -> TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originatorSlow, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString()))
-                .collect(Collectors.toList());
+                .toList();
         List<TbMsg> fastMsgList = IntStream.range(0, 2)
                 .mapToObj(x -> TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originatorFast, TbMsgMetaData.EMPTY, JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString()))
-                .collect(Collectors.toList());
+                .toList();
 
         assertThat(slowMsgList.size()).as("slow msgs >= rule-dispatcher pool size").isGreaterThanOrEqualTo(RULE_DISPATCHER_POOL_SIZE);
 
@@ -714,7 +710,7 @@ public class TbMathNodeTest {
                     }).given(node).onMsg(any(), any());
                     return Triple.of(ctx, resultKey, node);
                 })
-                .collect(Collectors.toList());
+                .toList();
         ctxNodes.forEach(ctxNode -> ruleEngineDispatcherExecutor.executeAsync(() -> ctxNode.getRight()
                 .onMsg(ctxNode.getLeft(), TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, originator, TbMsgMetaData.EMPTY, "{\"a\":2,\"b\":2}"))));
         ctxNodes.forEach(ctxNode -> verify(ctxNode.getRight(), timeout(5000)).onMsg(eq(ctxNode.getLeft()), any()));
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java
index 707de1741f..c427dcbd3b 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java
@@ -16,19 +16,26 @@
 package org.thingsboard.rule.engine.metadata;
 
 import com.google.common.util.concurrent.Futures;
-import lombok.RequiredArgsConstructor;
-import org.assertj.core.api.Assertions;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.NullAndEmptySource;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentCaptor;
-import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
+import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.common.util.AbstractListeningExecutor;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ListeningExecutor;
+import org.thingsboard.rule.engine.AbstractRuleNodeUpgradeTest;
 import org.thingsboard.rule.engine.TestDbCallbackExecutor;
 import org.thingsboard.rule.engine.api.TbContext;
+import org.thingsboard.rule.engine.api.TbNode;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -47,45 +54,61 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
-
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BiConsumer;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anySet;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.BDDMockito.willAnswer;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+@Slf4j
 @ExtendWith(MockitoExtension.class)
-public class CalculateDeltaNodeTest {
+public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
+
+    private final DeviceId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.fromString("2ba3ded4-882b-40cf-999a-89da9ccd58f9"));
+    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("3842e740-0d89-43a9-8d52-ae44023847ba"));
+    private final ListeningExecutor DB_EXECUTOR = new TestDbCallbackExecutor();
+
+    private static final int RULE_DISPATCHER_POOL_SIZE = 2;
+    private static final int DB_CALLBACK_POOL_SIZE = 3;
 
-    private static final DeviceId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID());
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
-    private static final ListeningExecutor DB_EXECUTOR = new TestDbCallbackExecutor();
     @Mock
     private TbContext ctxMock;
     @Mock
     private TimeseriesService timeseriesServiceMock;
+    @Spy
     private CalculateDeltaNode node;
     private CalculateDeltaNodeConfiguration config;
     private TbNodeConfiguration nodeConfiguration;
 
     @BeforeEach
     public void setUp() throws TbNodeException {
-        node = new CalculateDeltaNode();
         config = new CalculateDeltaNodeConfiguration().defaultConfiguration();
         nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-        when(ctxMock.getTimeseriesService()).thenReturn(timeseriesServiceMock);
-
         node.init(ctxMock, nodeConfiguration);
     }
 
@@ -99,6 +122,49 @@ public class CalculateDeltaNodeTest {
         assertTrue(config.isTellFailureIfDeltaIsNegative());
     }
 
+
+    @ParameterizedTest
+    @NullAndEmptySource
+    @ValueSource(strings = {" "}) // blank value
+    public void givenInvalidInputKey_whenInitThenThrowException(String key) {
+        config.setInputValueKey(key);
+        nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
+        var exception = assertThrows(TbNodeException.class, () -> node.init(ctxMock, nodeConfiguration));
+        assertThat(exception).hasMessage("Input value key should be specified!");
+        assertThat(exception.isUnrecoverable()).isTrue();
+    }
+
+    @ParameterizedTest
+    @NullAndEmptySource
+    @ValueSource(strings = {" "}) // blank value
+    public void givenInvalidOutputKey_whenInitThenThrowException(String key) {
+        config.setOutputValueKey(key);
+        nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
+        var exception = assertThrows(TbNodeException.class, () -> node.init(ctxMock, nodeConfiguration));
+        assertThat(exception).hasMessage("Output value key should be specified!");
+        assertThat(exception.isUnrecoverable()).isTrue();
+    }
+
+    @ParameterizedTest
+    @NullAndEmptySource
+    @ValueSource(strings = {" "}) // blank value
+    public void givenInvalidPeriodKey_whenInitThenThrowException(String key) {
+        config.setPeriodValueKey(key);
+        config.setAddPeriodBetweenMsgs(true);
+        nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
+        var exception = assertThrows(TbNodeException.class, () -> node.init(ctxMock, nodeConfiguration));
+        assertThat(exception).hasMessage("Period value key should be specified!");
+        assertThat(exception.isUnrecoverable()).isTrue();
+    }
+
+    @Test
+    public void givenInvalidPeriodKeyAndAddPeriodDisabled_whenInitThenNoExceptionThrown() {
+        config.setPeriodValueKey(null);
+        config.setAddPeriodBetweenMsgs(false);
+        nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
+        assertDoesNotThrow(() -> node.init(ctxMock, nodeConfiguration));
+    }
+
     @Test
     public void givenInvalidMsgType_whenOnMsg_thenShouldTellNextOther() {
         // GIVEN
@@ -109,7 +175,7 @@ public class CalculateDeltaNodeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        verify(ctxMock, times(1)).tellNext(eq(msg), eq(TbNodeConnectionType.OTHER));
+        verify(ctxMock).tellNext(eq(msg), eq(TbNodeConnectionType.OTHER));
         verify(ctxMock, never()).tellSuccess(any());
         verify(ctxMock, never()).tellFailure(any(), any());
     }
@@ -123,7 +189,7 @@ public class CalculateDeltaNodeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        verify(ctxMock, times(1)).tellNext(eq(msg), eq(TbNodeConnectionType.OTHER));
+        verify(ctxMock).tellNext(eq(msg), eq(TbNodeConnectionType.OTHER));
         verify(ctxMock, never()).tellSuccess(any());
         verify(ctxMock, never()).tellFailure(any(), any());
     }
@@ -138,7 +204,7 @@ public class CalculateDeltaNodeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        verify(ctxMock, times(1)).tellNext(eq(msg), eq(TbNodeConnectionType.OTHER));
+        verify(ctxMock).tellNext(eq(msg), eq(TbNodeConnectionType.OTHER));
         verify(ctxMock, never()).tellSuccess(any());
         verify(ctxMock, never()).tellFailure(any(), any());
     }
@@ -164,7 +230,7 @@ public class CalculateDeltaNodeTest {
         // THEN
         var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
 
-        verify(ctxMock, times(1)).tellSuccess(actualMsgCaptor.capture());
+        verify(ctxMock).tellSuccess(actualMsgCaptor.capture());
         verify(ctxMock, never()).tellNext(any(), anyString());
         verify(ctxMock, never()).tellNext(any(), anySet());
         verify(ctxMock, never()).tellFailure(any(), any());
@@ -194,7 +260,7 @@ public class CalculateDeltaNodeTest {
         // THEN
         var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
 
-        verify(ctxMock, times(1)).tellSuccess(actualMsgCaptor.capture());
+        verify(ctxMock).tellSuccess(actualMsgCaptor.capture());
         verify(ctxMock, never()).tellNext(any(), anyString());
         verify(ctxMock, never()).tellNext(any(), anySet());
         verify(ctxMock, never()).tellFailure(any(), any());
@@ -224,7 +290,7 @@ public class CalculateDeltaNodeTest {
         // THEN
         var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
 
-        verify(ctxMock, times(1)).tellSuccess(actualMsgCaptor.capture());
+        verify(ctxMock).tellSuccess(actualMsgCaptor.capture());
         verify(ctxMock, never()).tellNext(any(), anyString());
         verify(ctxMock, never()).tellNext(any(), anySet());
         verify(ctxMock, never()).tellFailure(any(), any());
@@ -245,7 +311,7 @@ public class CalculateDeltaNodeTest {
         nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
         node.init(ctxMock, nodeConfiguration);
 
-        mockFindLatest(new BasicTsKvEntry(1L, new DoubleDataEntry("temperature", 40.0)));
+        mockFindLatestAsync(new BasicTsKvEntry(1L, new DoubleDataEntry("temperature", 40.0)));
 
         var msgData = "{\"temperature\": 42,\"airPressure\":123}";
         var firstMsgMetaData = new TbMsgMetaData();
@@ -258,7 +324,7 @@ public class CalculateDeltaNodeTest {
         // THEN
         var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
 
-        verify(ctxMock, times(1)).tellSuccess(actualMsgCaptor.capture());
+        verify(ctxMock).tellSuccess(actualMsgCaptor.capture());
         verify(ctxMock, never()).tellNext(any(), anyString());
         verify(ctxMock, never()).tellNext(any(), anySet());
         verify(ctxMock, never()).tellFailure(any(), any());
@@ -272,6 +338,8 @@ public class CalculateDeltaNodeTest {
         reset(ctxMock);
         reset(timeseriesServiceMock);
 
+        when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR);
+
         var secondMsgMetaData = new TbMsgMetaData();
         secondMsgMetaData.putValue("ts", String.valueOf(6L));
         var secondMsg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, secondMsgMetaData, msgData);
@@ -283,7 +351,7 @@ public class CalculateDeltaNodeTest {
         actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
 
         verify(timeseriesServiceMock, never()).findLatest(any(), any(), anyList());
-        verify(ctxMock, times(1)).tellSuccess(actualMsgCaptor.capture());
+        verify(ctxMock).tellSuccess(actualMsgCaptor.capture());
         verify(ctxMock, never()).tellNext(any(), anyString());
         verify(ctxMock, never()).tellNext(any(), anySet());
         verify(ctxMock, never()).tellFailure(any(), any());
@@ -313,7 +381,7 @@ public class CalculateDeltaNodeTest {
         // THEN
         var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
 
-        verify(ctxMock, times(1)).tellSuccess(actualMsgCaptor.capture());
+        verify(ctxMock).tellSuccess(actualMsgCaptor.capture());
         verify(ctxMock, never()).tellNext(any(), anyString());
         verify(ctxMock, never()).tellNext(any(), anySet());
         verify(ctxMock, never()).tellFailure(any(), any());
@@ -330,7 +398,7 @@ public class CalculateDeltaNodeTest {
         nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
         node.init(ctxMock, nodeConfiguration);
 
-        mockFindLatest(new BasicTsKvEntry(System.currentTimeMillis(), new LongDataEntry("pulseCounter", 200L)));
+        mockFindLatestAsync(new BasicTsKvEntry(System.currentTimeMillis(), new LongDataEntry("pulseCounter", 200L)));
 
         var msgData = "{\"pulseCounter\":\"123\"}";
         var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
@@ -342,7 +410,7 @@ public class CalculateDeltaNodeTest {
         var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         var actualExceptionCaptor = ArgumentCaptor.forClass(Exception.class);
 
-        verify(ctxMock, times(1)).tellFailure(actualMsgCaptor.capture(), actualExceptionCaptor.capture());
+        verify(ctxMock).tellFailure(actualMsgCaptor.capture(), actualExceptionCaptor.capture());
         verify(ctxMock, never()).tellSuccess(any());
         verify(ctxMock, never()).tellNext(any(), anyString());
         verify(ctxMock, never()).tellNext(any(), anySet());
@@ -362,7 +430,7 @@ public class CalculateDeltaNodeTest {
         nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
         node.init(ctxMock, nodeConfiguration);
 
-        mockFindLatest(new BasicTsKvEntry(System.currentTimeMillis(), new LongDataEntry("pulseCounter", 200L)));
+        mockFindLatestAsync(new BasicTsKvEntry(System.currentTimeMillis(), new LongDataEntry("pulseCounter", 200L)));
 
         var msgData = "{\"pulseCounter\":\"123\"}";
         var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
@@ -373,7 +441,7 @@ public class CalculateDeltaNodeTest {
         // THEN
         var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
 
-        verify(ctxMock, times(1)).tellSuccess(actualMsgCaptor.capture());
+        verify(ctxMock).tellSuccess(actualMsgCaptor.capture());
         verify(ctxMock, never()).tellFailure(any(), any());
         verify(ctxMock, never()).tellNext(any(), anyString());
         verify(ctxMock, never()).tellNext(any(), anySet());
@@ -385,13 +453,23 @@ public class CalculateDeltaNodeTest {
     @Test
     public void givenInvalidStringValue_whenOnMsg_thenException() {
         // GIVEN
-        mockFindLatest(new BasicTsKvEntry(System.currentTimeMillis(), new StringDataEntry("pulseCounter", "high")));
+        mockFindLatestAsync(new BasicTsKvEntry(System.currentTimeMillis(), new StringDataEntry("pulseCounter", "high")));
 
         var msgData = "{\"pulseCounter\":\"123\"}";
         var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
 
-        // WHEN-THEN
-        Assertions.assertThatThrownBy(() -> node.onMsg(ctxMock, msg))
+        // WHEN
+        node.onMsg(ctxMock, msg);
+
+        // THEN
+        ArgumentCaptor<Throwable> throwableCaptor = ArgumentCaptor.forClass(Throwable.class);
+
+        verify(ctxMock).tellFailure(eq(msg), throwableCaptor.capture());
+        verify(ctxMock, never()).tellSuccess(any());
+        verify(ctxMock, never()).tellNext(any(), anyString());
+        verify(ctxMock, never()).tellNext(any(), anySet());
+
+        assertThat(throwableCaptor.getValue())
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("Calculation failed. Unable to parse value [high] of telemetry [pulseCounter] to Double");
     }
@@ -399,13 +477,23 @@ public class CalculateDeltaNodeTest {
     @Test
     public void givenBooleanValue_whenOnMsg_thenException() {
         // GIVEN
-        mockFindLatest(new BasicTsKvEntry(System.currentTimeMillis(), new BooleanDataEntry("pulseCounter", false)));
+        mockFindLatestAsync(new BasicTsKvEntry(System.currentTimeMillis(), new BooleanDataEntry("pulseCounter", false)));
 
         var msgData = "{\"pulseCounter\":true}";
         var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
 
-        // WHEN-THEN
-        Assertions.assertThatThrownBy(() -> node.onMsg(ctxMock, msg))
+        // WHEN
+        node.onMsg(ctxMock, msg);
+
+        // THEN
+        ArgumentCaptor<Throwable> throwableCaptor = ArgumentCaptor.forClass(Throwable.class);
+
+        verify(ctxMock).tellFailure(eq(msg), throwableCaptor.capture());
+        verify(ctxMock, never()).tellSuccess(any());
+        verify(ctxMock, never()).tellNext(any(), anyString());
+        verify(ctxMock, never()).tellNext(any(), anySet());
+
+        assertThat(throwableCaptor.getValue())
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("Calculation failed. Boolean values are not supported!");
     }
@@ -413,48 +501,190 @@ public class CalculateDeltaNodeTest {
     @Test
     public void givenJsonValue_whenOnMsg_thenException() {
         // GIVEN
-        mockFindLatest(new BasicTsKvEntry(System.currentTimeMillis(), new JsonDataEntry("pulseCounter", "{\"isActive\":false}")));
+        mockFindLatestAsync(new BasicTsKvEntry(System.currentTimeMillis(), new JsonDataEntry("pulseCounter", "{\"isActive\":false}")));
 
         var msgData = "{\"pulseCounter\":{\"isActive\":true}}";
         var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
 
-        // WHEN-THEN
-        Assertions.assertThatThrownBy(() -> node.onMsg(ctxMock, msg))
+        // WHEN
+        node.onMsg(ctxMock, msg);
+
+        // THEN
+        ArgumentCaptor<Throwable> throwableCaptor = ArgumentCaptor.forClass(Throwable.class);
+
+        verify(ctxMock).tellFailure(eq(msg), throwableCaptor.capture());
+        verify(ctxMock, never()).tellSuccess(any());
+        verify(ctxMock, never()).tellNext(any(), anyString());
+        verify(ctxMock, never()).tellNext(any(), anySet());
+
+        assertThat(throwableCaptor.getValue())
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("Calculation failed. JSON values are not supported!");
     }
 
-    private void mockFindLatest(TsKvEntry tsKvEntry) {
-        when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
-        when(timeseriesServiceMock.findLatestSync(
-                eq(TENANT_ID), eq(DUMMY_DEVICE_ORIGINATOR), argThat(new ListMatcher<>(List.of(tsKvEntry.getKey())))
-        )).thenReturn(List.of(tsKvEntry));
+    @Test
+    public void givenConcurrentAccess_whenOnMsg_thenGetFromDBInvokedOnce() throws TbNodeException, InterruptedException {
+        DBCallbackExecutor dbCallbackExecutor = new DBCallbackExecutor();
+        dbCallbackExecutor.init();
+
+        RuleDispatcherExecutor ruleEngineDispatcherExecutor = new RuleDispatcherExecutor();
+        ruleEngineDispatcherExecutor.init();
+
+        assertThat(RULE_DISPATCHER_POOL_SIZE).as("dispatcher pool size have to be > 1").isGreaterThan(1);
+
+        final TbContext ctx = mock(TbContext.class);
+        final TimeseriesService timeseriesService = mock(TimeseriesService.class);
+
+        when(ctx.getTimeseriesService()).thenReturn(timeseriesService);
+        when(ctx.getDbCallbackExecutor()).thenReturn(dbCallbackExecutor);
+        when(timeseriesService.findLatest(any(), any(), anyString())).thenReturn(Futures.immediateFuture(Optional.empty()));
+
+        final CalculateDeltaNodeConfiguration config = new CalculateDeltaNodeConfiguration().defaultConfiguration();
+        final TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
+        final CalculateDeltaNode node = spy(CalculateDeltaNode.class);
+
+        node.init(ctx, nodeConfiguration);
+
+        List<TbMsg> tbMsgList = IntStream.range(0, RULE_DISPATCHER_POOL_SIZE * 2).mapToObj(x -> {
+            var msgData = "{\"pulseCounter\":" + 2 + "}";
+            return TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
+        }).toList();
+
+        CountDownLatch processingLatch = new CountDownLatch(tbMsgList.size());
+
+        willAnswer(invocation -> {
+            processingLatch.countDown();
+            return invocation.callRealMethod();
+        }).given(node).processMsgAsync(any(), any());
+
+        tbMsgList.forEach(msg -> ruleEngineDispatcherExecutor.executeAsync(() -> node.onMsg(ctx, msg)));
+
+        assertThat(processingLatch.await(5, TimeUnit.SECONDS)).as("await on processingLatch").isTrue();
+
+        verify(timeseriesService).findLatest(any(), any(), anyString());
+        await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> verify(ctx, times(tbMsgList.size())).tellSuccess(any()));
+    }
+
+    private static class RuleDispatcherExecutor extends AbstractListeningExecutor {
+        @Override
+        protected int getThreadPollSize() {
+            return RULE_DISPATCHER_POOL_SIZE;
+        }
+    }
+
+    private static class DBCallbackExecutor extends AbstractListeningExecutor {
+        @Override
+        protected int getThreadPollSize() {
+            return DB_CALLBACK_POOL_SIZE;
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("CalculateDeltaTestConfig")
+    public void givenCalculateDeltaConfig_whenOnMsg_thenVerify(CalculateDeltaTestConfig testConfig) throws TbNodeException {
+        // GIVEN
+        config.setTellFailureIfDeltaIsNegative(testConfig.tellFailureIfDeltaIsNegative());
+        config.setExcludeZeroDeltas(testConfig.excludeZeroDeltas());
+        config.setInputValueKey("temperature");
+        nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
+        node.init(ctxMock, nodeConfiguration);
+
+        mockFindLatestAsync(new BasicTsKvEntry(1L, new DoubleDataEntry("temperature", testConfig.prevValue())));
+
+        var msgData = "{\"temperature\":" + testConfig.currentValue() + ",\"airPressure\":123}";
+        var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
+
+        // WHEN
+        node.onMsg(ctxMock, msg);
+
+        // THEN
+        testConfig.verificationMethod().accept(ctxMock, msg);
+    }
+
+    private static Stream<CalculateDeltaTestConfig> CalculateDeltaTestConfig() {
+        return Stream.of(
+                // delta = 0, tell failure if delta is negative is set to true and exclude zero deltas is set to true so delta should filter out the message.
+                new CalculateDeltaTestConfig(true, true, 40, 40, (ctx, msg) -> {
+                    verify(ctx).tellSuccess(eq(msg));
+                    verify(ctx).getDbCallbackExecutor();
+                    verifyNoMoreInteractions(ctx);
+                }),
+                // delta < 0, tell failure if delta is negative is set to true so it should throw exception.
+                new CalculateDeltaTestConfig(true, true, 41, 40, (ctx, msg) -> {
+                    var errorCaptor = ArgumentCaptor.forClass(Throwable.class);
+                    verify(ctx).tellFailure(eq(msg), errorCaptor.capture());
+                    verify(ctx).getDbCallbackExecutor();
+                    verifyNoMoreInteractions(ctx);
+                    assertThat(errorCaptor.getValue()).isInstanceOf(IllegalArgumentException.class).hasMessage("Delta value is negative!");
+                }),
+                // delta < 0, exclude zero deltas is set to true so it should return message with delta if delta is negative is set to false.
+                new CalculateDeltaTestConfig(false, true, 41, 40, (ctx, msg) -> {
+                    var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+                    verify(ctx).tellSuccess(actualMsgCaptor.capture());
+                    verify(ctx).getDbCallbackExecutor();
+                    verifyNoMoreInteractions(ctx);
+                    String expectedMsgData = "{\"temperature\":40.0,\"airPressure\":123,\"delta\":-1}";
+                    assertEquals(expectedMsgData, actualMsgCaptor.getValue().getData());
+                }),
+                // delta = 0, tell failure if delta is negative is set to false and exclude zero deltas is set to true so delta should filter out the message.
+                new CalculateDeltaTestConfig(false, true, 40, 40, (ctx, msg) -> {
+                    verify(ctx).tellSuccess(eq(msg));
+                    verify(ctx).getDbCallbackExecutor();
+                    verifyNoMoreInteractions(ctx);
+                }),
+                // delta > 0, exclude zero deltas is set to true so it should return message with delta.
+                new CalculateDeltaTestConfig(false, true, 39, 40, (ctx, msg) -> {
+                    var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+                    verify(ctx).tellSuccess(actualMsgCaptor.capture());
+                    verify(ctx).getDbCallbackExecutor();
+                    verifyNoMoreInteractions(ctx);
+                    String expectedMsgData = "{\"temperature\":40.0,\"airPressure\":123,\"delta\":1}";
+                    assertEquals(expectedMsgData, actualMsgCaptor.getValue().getData());
+                }),
+                // delta > 0, exclude zero deltas is set to false so it should return message with delta.
+                new CalculateDeltaTestConfig(false, false, 39, 40, (ctx, msg) -> {
+                    var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
+                    verify(ctx).tellSuccess(actualMsgCaptor.capture());
+                    verify(ctx).getDbCallbackExecutor();
+                    verifyNoMoreInteractions(ctx);
+                    String expectedMsgData = "{\"temperature\":40.0,\"airPressure\":123,\"delta\":1}";
+                    assertEquals(expectedMsgData, actualMsgCaptor.getValue().getData());
+                })
+        );
+    }
+
+    private record CalculateDeltaTestConfig(boolean tellFailureIfDeltaIsNegative, boolean excludeZeroDeltas,
+                                            double prevValue, double currentValue,
+                                            BiConsumer<TbContext, TbMsg> verificationMethod) {
     }
 
     private void mockFindLatestAsync(TsKvEntry tsKvEntry) {
         when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR);
         when(ctxMock.getTenantId()).thenReturn(TENANT_ID);
+        when(ctxMock.getTimeseriesService()).thenReturn(timeseriesServiceMock);
         when(timeseriesServiceMock.findLatest(
-                eq(TENANT_ID), eq(DUMMY_DEVICE_ORIGINATOR), argThat(new ListMatcher<>(List.of(tsKvEntry.getKey())))
-        )).thenReturn(Futures.immediateFuture(List.of(tsKvEntry)));
+                eq(TENANT_ID), eq(DUMMY_DEVICE_ORIGINATOR), eq(tsKvEntry.getKey())
+        )).thenReturn(Futures.immediateFuture(Optional.of(tsKvEntry)));
     }
 
-    @RequiredArgsConstructor
-    private static class ListMatcher<T> implements ArgumentMatcher<List<T>> {
-
-        private final List<T> expectedList;
-
-        @Override
-        public boolean matches(List<T> actualList) {
-            if (actualList == expectedList) {
-                return true;
-            }
-            if (actualList.size() != expectedList.size()) {
-                return false;
-            }
-            return actualList.containsAll(expectedList);
-        }
+    private static Stream<Arguments> givenFromVersionAndConfig_whenUpgrade_thenVerifyHasChangesAndConfig() {
+        return Stream.of(
+                // default config for version 0
+                Arguments.of(0,
+                        "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true}",
+                        true,
+                        "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true, \"excludeZeroDeltas\":false}"),
+                // default config for version 1 with upgrade from version 0
+                Arguments.of(1,
+                        "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true, \"excludeZeroDeltas\":false}",
+                        false,
+                        "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true, \"excludeZeroDeltas\":false}")
+        );
 
     }
 
+    @Override
+    protected TbNode getTestNode() {
+        return node;
+    }
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeTest.java
new file mode 100644
index 0000000000..b46ecdf6fe
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeTest.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.rule.engine.mqtt;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.provider.Arguments;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.rule.engine.AbstractRuleNodeUpgradeTest;
+import org.thingsboard.rule.engine.api.TbNode;
+
+import java.util.stream.Stream;
+
+import static org.mockito.Mockito.mock;
+
+@ExtendWith(MockitoExtension.class)
+class TbMqttNodeTest extends AbstractRuleNodeUpgradeTest {
+    @Spy
+    TbMqttNode node;
+
+    @BeforeEach
+    public void setUp() throws Exception {
+        node = mock(TbMqttNode.class);
+    }
+
+    private static Stream<Arguments> givenFromVersionAndConfig_whenUpgrade_thenVerifyHasChangesAndConfig() {
+        return Stream.of(
+                // default config for version 0
+                Arguments.of(0,
+                        "{\"topicPattern\":\"my-topic\",\"port\":1883,\"connectTimeoutSec\":10,\"cleanSession\":true, \"ssl\":false, \"retainedMessage\":false,\"credentials\":{\"type\":\"anonymous\"}}",
+                        true,
+                        "{\"topicPattern\":\"my-topic\",\"port\":1883,\"connectTimeoutSec\":10,\"cleanSession\":true, \"ssl\":false, \"retainedMessage\":false,\"credentials\":{\"type\":\"anonymous\"},\"parseToPlainText\":false}"),
+                // default config for version 1 with upgrade from version 0
+                Arguments.of(1,
+                        "{\"topicPattern\":\"my-topic\",\"port\":1883,\"connectTimeoutSec\":10,\"cleanSession\":true, \"ssl\":false, \"retainedMessage\":false,\"credentials\":{\"type\":\"anonymous\"},\"parseToPlainText\":false}",
+                        false,
+                        "{\"topicPattern\":\"my-topic\",\"port\":1883,\"connectTimeoutSec\":10,\"cleanSession\":true, \"ssl\":false, \"retainedMessage\":false,\"credentials\":{\"type\":\"anonymous\"},\"parseToPlainText\":false}")
+        );
+
+    }
+
+    @Override
+    protected TbNode getTestNode() {
+        return node;
+    }
+}
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java
index 617c553770..2eb65c1787 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java
@@ -22,13 +22,10 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.mockserver.integration.ClientAndServer;
 import org.springframework.util.LinkedMultiValueMap;
-import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -47,7 +44,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.willCallRealMethod;
 import static org.mockito.Mockito.mock;
@@ -222,16 +218,4 @@ public class TbHttpClientTest {
         Assertions.assertEquals(data.get("Set-Cookie"), "[\"sap-context=sap-client=075; path=/\",\"sap-token=sap-client=075; path=/\"]");
     }
 
-    @ParameterizedTest
-    @ValueSource(strings = { "false", "\"", "\"\"", "\"This is a string with double quotes\"", "Path: /home/developer/test.txt",
-            "First line\nSecond line\n\nFourth line", "Before\rAfter", "Tab\tSeparated\tValues", "Test\bbackspace", "[]",
-            "[1, 2, 3]", "{\"key\": \"value\"}", "{\n\"temperature\": 25.5,\n\"humidity\": 50.2\n\"}", "Expression: (a + b) * c",
-            "世界", "Україна", "\u1F1FA\u1F1E6", "🇺🇦"})
-    public void testParseJsonStringToPlainText(String original) {
-        Mockito.when(client.parseJsonStringToPlainText(anyString())).thenCallRealMethod();
-
-        String serialized = JacksonUtil.toString(original);
-        Assertions.assertNotNull(serialized);
-        Assertions.assertEquals(original, client.parseJsonStringToPlainText(serialized));
-    }
 }
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java
index 5648b02454..e06be15fe6 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java
@@ -56,6 +56,7 @@ import org.thingsboard.server.common.data.notification.rule.NotificationRule;
 import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
 import org.thingsboard.server.common.data.queue.Queue;
+import org.thingsboard.server.common.data.queue.QueueStats;
 import org.thingsboard.server.common.data.rpc.Rpc;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleNode;
@@ -73,6 +74,7 @@ import org.thingsboard.server.dao.notification.NotificationTargetService;
 import org.thingsboard.server.dao.notification.NotificationTemplateService;
 import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.queue.QueueService;
+import org.thingsboard.server.dao.queue.QueueStatsService;
 import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.user.UserService;
@@ -135,6 +137,8 @@ public class TenantIdLoaderTest {
     private NotificationRequestService notificationRequestService;
     @Mock
     private NotificationRuleService notificationRuleService;
+    @Mock
+    private QueueStatsService queueStatsService;
 
     private TenantId tenantId;
     private TenantProfileId tenantProfileId;
@@ -352,6 +356,12 @@ public class TenantIdLoaderTest {
                 when(ctx.getNotificationRuleService()).thenReturn(notificationRuleService);
                 doReturn(notificationRule).when(notificationRuleService).findNotificationRuleById(eq(tenantId), any());
                 break;
+            case QUEUE_STATS:
+                QueueStats queueStats = new QueueStats();
+                queueStats.setTenantId(tenantId);
+                when(ctx.getQueueStatsService()).thenReturn(queueStatsService);
+                doReturn(queueStats).when(queueStatsService).findQueueStatsById(eq(tenantId), any());
+                break;
             default:
                 throw new RuntimeException("Unexpected originator EntityType " + entityType);
         }
diff --git a/rule-engine/rule-engine-components/src/test/resources/logback-test.xml b/rule-engine/rule-engine-components/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..0695fe1e1a
--- /dev/null
+++ b/rule-engine/rule-engine-components/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration>
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{ISO8601} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.thingsboard.rule.engine.filter.TbCheckAlarmStatusNode" level="DEBUG"/>
+
+    <root level="INFO">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>
diff --git a/transport/lwm2m/src/main/java/org/eclipse/leshan/server/observation/ObservationServiceImpl.java b/transport/lwm2m/src/main/java/org/eclipse/leshan/server/observation/ObservationServiceImpl.java
deleted file mode 100644
index 89a2f07179..0000000000
--- a/transport/lwm2m/src/main/java/org/eclipse/leshan/server/observation/ObservationServiceImpl.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/**
- * Copyright © 2016-2024 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright (c) 2016 Sierra Wireless and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * and Eclipse Distribution License v1.0 which accompany this distribution.
- *
- * The Eclipse Public License is available at
- *    http://www.eclipse.org/legal/epl-v20.html
- * and the Eclipse Distribution License is available at
- *    http://www.eclipse.org/org/documents/edl-v10.html.
- *
- * Contributors:
- *     Sierra Wireless - initial API and implementation
- *     Michał Wadowski (Orange) - Add Observe-Composite feature.
- */
-package org.eclipse.leshan.server.observation;
-
-import lombok.extern.slf4j.Slf4j;
-import org.eclipse.leshan.core.node.LwM2mPath;
-import org.eclipse.leshan.core.observation.CompositeObservation;
-import org.eclipse.leshan.core.observation.Observation;
-import org.eclipse.leshan.core.observation.SingleObservation;
-import org.eclipse.leshan.core.peer.LwM2mPeer;
-import org.eclipse.leshan.core.response.ObserveCompositeResponse;
-import org.eclipse.leshan.core.response.ObserveResponse;
-import org.eclipse.leshan.server.endpoint.LwM2mServerEndpoint;
-import org.eclipse.leshan.server.endpoint.LwM2mServerEndpointsProvider;
-import org.eclipse.leshan.server.profile.ClientProfile;
-import org.eclipse.leshan.server.registration.Registration;
-import org.eclipse.leshan.server.registration.RegistrationStore;
-import org.eclipse.leshan.server.registration.RegistrationUpdate;
-import org.eclipse.leshan.server.registration.UpdatedRegistration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * Implementation of the {@link ObservationService} accessing the persisted observation via the provided
- * {@link RegistrationStore}.
- *
- * When a new observation is added or changed or canceled, the registered listeners are notified.
- */
-@Slf4j
-public class ObservationServiceImpl implements ObservationService, LwM2mNotificationReceiver {
-
-    private final Logger LOG = LoggerFactory.getLogger(ObservationServiceImpl.class);
-
-    private final RegistrationStore registrationStore;
-    private final LwM2mServerEndpointsProvider endpointProvider;
-    private final boolean updateRegistrationOnNotification;
-
-    private final List<ObservationListener> listeners = new CopyOnWriteArrayList<>();;
-
-    /**
-     * Creates an instance of {@link ObservationServiceImpl}
-     */
-    public ObservationServiceImpl(RegistrationStore store, LwM2mServerEndpointsProvider endpointProvider) {
-        this(store, endpointProvider, false);
-    }
-
-    /**
-     * Creates an instance of {@link ObservationServiceImpl}
-     *
-     * @param updateRegistrationOnNotification will activate registration update on observe notification.
-     *
-     * @since 1.1
-     */
-    public ObservationServiceImpl(RegistrationStore store, LwM2mServerEndpointsProvider endpointProvider,
-                                  boolean updateRegistrationOnNotification) {
-        this.registrationStore = store;
-        this.updateRegistrationOnNotification = updateRegistrationOnNotification;
-        this.endpointProvider = endpointProvider;
-    }
-
-    @Override
-    public int cancelObservations(Registration registration) {
-        // check registration id
-        String registrationId = registration.getId();
-        if (registrationId == null)
-            return 0;
-
-        Collection<Observation> observations = registrationStore.removeObservations(registrationId);
-        if (observations == null)
-            return 0;
-
-        for (Observation observation : observations) {
-            cancel(observation);
-        }
-
-        return observations.size();
-    }
-
-    @Override
-    public int cancelObservations(Registration registration, String nodePath) {
-        if (registration == null || registration.getId() == null || nodePath == null || nodePath.isEmpty())
-            return 0;
-
-        Set<Observation> observations = getObservationsForCancel(registration.getId(), nodePath);
-        for (Observation observation : observations) {
-            cancelObservation(observation);
-        }
-        return observations.size();
-    }
-
-    @Override
-    public int cancelCompositeObservations(Registration registration, String[] nodePaths) {
-        if (registration == null || registration.getId() == null || nodePaths == null || nodePaths.length == 0)
-            return 0;
-
-        Set<Observation> observations = getCompositeObservationsForCancel(registration.getId(), nodePaths);
-        for (Observation observation : observations) {
-            cancelObservation(observation);
-        }
-        return observations.size();
-    }
-
-    @Override
-    public void cancelObservation(Observation observation) {
-        if (observation == null)
-            return;
-
-        registrationStore.removeObservation(observation.getRegistrationId(), observation.getId());
-        cancel(observation);
-    }
-
-    private void cancel(Observation observation) {
-        List<LwM2mServerEndpoint> endpoints = endpointProvider.getEndpoints();
-        for (LwM2mServerEndpoint lwM2mEndpoint : endpoints) {
-            lwM2mEndpoint.cancelObservation(observation);
-        }
-
-        for (ObservationListener listener : listeners) {
-            listener.cancelled(observation);
-        }
-    }
-
-    @Override
-    public Set<Observation> getObservations(Registration registration) {
-        return getObservations(registration.getId());
-    }
-
-    private Set<Observation> getObservations(String registrationId) {
-        if (registrationId == null)
-            return Collections.emptySet();
-
-        return new HashSet<>(registrationStore.getObservations(registrationId));
-    }
-
-    private Set<Observation> getCompositeObservationsForCancel(String registrationId, String[] nodePaths) {
-        if (registrationId == null || nodePaths == null)
-            return Collections.emptySet();
-
-        // array of String to array of LWM2M path
-        List<LwM2mPath> lwPaths = new ArrayList<>(nodePaths.length);
-        for (int i = 0; i < nodePaths.length; i++) {
-            lwPaths.add(new LwM2mPath(nodePaths[i]));
-        }
-
-        // search composite-observation
-        Set<Observation> result = new HashSet<>();
-        for (Observation obs : getObservations(registrationId)) {
-            if (obs instanceof CompositeObservation) {
-                if (lwPaths.equals(((CompositeObservation) obs).getPaths())) {
-                    result.add(obs);
-                }
-            }
-        }
-        return result;
-    }
-
-    private Set<Observation> getObservationsForCancel(String registrationId, String nodePath) {
-        if (registrationId == null || nodePath == null)
-            return Collections.emptySet();
-
-        Set<Observation> result = new HashSet<>();
-        LwM2mPath lwPath = new LwM2mPath(nodePath);
-        for (Observation obs : getObservations(registrationId)) {
-            if (obs instanceof SingleObservation) {
-                LwM2mPath lwPathObs = ((SingleObservation) obs).getPath();
-                if (lwPath.equals(lwPathObs) || lwPathObs.startWith(lwPath)) {                // nodePath = "3",     lwPathObs = "3/0/9": cancel for tne all lwPathObs
-                    result.add(obs);
-                } else if (!lwPath.equals(lwPathObs) && lwPath.startWith(lwPathObs)) {        // nodePath = "3/0/9", lwPathObs = "3":     error...
-                        String errorMsg = String.format(
-                                "Unexpected error <cancelObservation>: There is registration with id [%s] existing observation [%s] includes input observation [%s]!",
-                                registrationId, lwPathObs, lwPath);
-                        throw new IllegalStateException(errorMsg);
-                }
-            }
-        }
-
-        return result;
-    }
-
-    @Override
-    public void addListener(ObservationListener listener) {
-        listeners.add(listener);
-    }
-
-    @Override
-    public void removeListener(ObservationListener listener) {
-        listeners.remove(listener);
-    }
-
-    private Registration updateRegistrationOnRegistration(Observation observation, LwM2mPeer sender,
-            ClientProfile profile) {
-        if (updateRegistrationOnNotification) {
-            RegistrationUpdate regUpdate = new RegistrationUpdate(observation.getRegistrationId(), sender, null, null,
-                    null, null, null, null, null, null, null, null);
-            UpdatedRegistration updatedRegistration = registrationStore.updateRegistration(regUpdate);
-            if (updatedRegistration == null || updatedRegistration.getUpdatedRegistration() == null) {
-                String errorMsg = String.format(
-                        "Unexpected error: There is no registration with id %s for this observation %s",
-                        observation.getRegistrationId(), observation);
-                LOG.error(errorMsg);
-                throw new IllegalStateException(errorMsg);
-            }
-            return updatedRegistration.getUpdatedRegistration();
-        }
-        return profile.getRegistration();
-    }
-
-    // ********** NotificationListener interface **********//
-    @Override
-    public void onNotification(SingleObservation observation, LwM2mPeer sender, ClientProfile profile,
-            ObserveResponse response) {
-        try {
-            Registration updatedRegistration = updateRegistrationOnRegistration(observation, sender, profile);
-            for (ObservationListener listener : listeners) {
-                listener.onResponse(observation, updatedRegistration, response);
-            }
-        } catch (Exception e) {
-            for (ObservationListener listener : listeners) {
-                listener.onError(observation, profile.getRegistration(), e);
-            }
-        }
-    }
-
-    @Override
-    public void onNotification(CompositeObservation observation, LwM2mPeer sender, ClientProfile profile,
-            ObserveCompositeResponse response) {
-        try {
-            Registration updatedRegistration = updateRegistrationOnRegistration(observation, sender, profile);
-            for (ObservationListener listener : listeners) {
-                listener.onResponse(observation, updatedRegistration, response);
-            }
-        } catch (Exception e) {
-            for (ObservationListener listener : listeners) {
-                listener.onError(observation, profile.getRegistration(), e);
-            }
-        }
-    }
-
-    @Override
-    public void onError(Observation observation, LwM2mPeer sender, ClientProfile profile, Exception error) {
-        for (ObservationListener listener : listeners) {
-            listener.onError(observation, profile.getRegistration(), error);
-        }
-    }
-
-    @Override
-    public void newObservation(Observation observation, Registration registration) {
-        for (ObservationListener listener : listeners) {
-            listener.newObservation(observation, registration);
-        }
-    }
-
-    @Override
-    public void cancelled(Observation observation) {
-        for (ObservationListener listener : listeners) {
-            listener.cancelled(observation);
-        }
-
-    }
-}
diff --git a/ui-ngx/.eslintrc.json b/ui-ngx/.eslintrc.json
index cf9f0e8238..764733e4d7 100644
--- a/ui-ngx/.eslintrc.json
+++ b/ui-ngx/.eslintrc.json
@@ -51,7 +51,8 @@
                 "import/order": "off",
                 "@typescript-eslint/member-ordering": "off",
                 "no-underscore-dangle": "off",
-                "@typescript-eslint/naming-convention": "off"
+                "@typescript-eslint/naming-convention": "off",
+                "jsdoc/newline-after-description": 0
             }
         },
         {
diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index af2092e933..b8a8e4c9a9 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -30,7 +30,7 @@
     "@date-io/date-fns": "1.3.7",
     "@flowjs/flow.js": "^2.14.1",
     "@flowjs/ngx-flow": "~0.6.0",
-    "@geoman-io/leaflet-geoman-free": "^2.13.0",
+    "@geoman-io/leaflet-geoman-free": "2.14.2",
     "@iplab/ngx-color-picker": "^15.0.2",
     "@juggle/resize-observer": "^3.4.0",
     "@mat-datetimepicker/core": "~11.0.3",
@@ -43,7 +43,6 @@
     "@ngrx/store": "^15.4.0",
     "@ngrx/store-devtools": "^15.4.0",
     "@ngx-translate/core": "^14.0.0",
-    "@ngx-translate/http-loader": "^7.0.0",
     "@svgdotjs/svg.filter.js": "^3.0.8",
     "@svgdotjs/svg.js": "^3.2.0",
     "@tinymce/tinymce-angular": "^7.0.0",
@@ -55,7 +54,7 @@
     "core-js": "^3.29.1",
     "date-fns": "2.0.0-alpha.27",
     "dayjs": "1.11.4",
-    "echarts": "^5.5.0",
+    "echarts": "https://github.com/thingsboard/echarts/archive/5.5.0-TB.tar.gz",
     "flot": "https://github.com/thingsboard/flot.git#0.9-work",
     "flot.curvedlines": "https://github.com/MichaelZinsmaier/CurvedLines.git#master",
     "font-awesome": "^4.7.0",
@@ -67,11 +66,11 @@
     "jstree": "^3.3.15",
     "jstree-bootstrap-theme": "^1.0.1",
     "jszip": "^3.10.1",
-    "leaflet": "~1.8.0",
-    "leaflet-polylinedecorator": "^1.6.0",
-    "leaflet-providers": "^1.13.0",
-    "leaflet.gridlayer.googlemutant": "^0.13.5",
-    "leaflet.markercluster": "^1.5.3",
+    "leaflet": "1.8.0",
+    "leaflet-polylinedecorator": "1.6.0",
+    "leaflet-providers": "1.13.0",
+    "leaflet.gridlayer.googlemutant": "0.14.1",
+    "leaflet.markercluster": "1.5.3",
     "libphonenumber-js": "^1.10.4",
     "marked": "^4.0.17",
     "moment": "^2.29.4",
@@ -130,11 +129,11 @@
     "@types/jasminewd2": "^2.0.10",
     "@types/jquery": "^3.5.16",
     "@types/js-beautify": "^1.13.3",
-    "@types/leaflet": "~1.8.0",
-    "@types/leaflet-polylinedecorator": "^1.6.1",
-    "@types/leaflet-providers": "^1.2.1",
-    "@types/leaflet.gridlayer.googlemutant": "^0.4.6",
-    "@types/leaflet.markercluster": "^1.5.1",
+    "@types/leaflet": "1.8.0",
+    "@types/leaflet-polylinedecorator": "1.6.4",
+    "@types/leaflet-providers": "1.2.4",
+    "@types/leaflet.gridlayer.googlemutant": "0.4.9",
+    "@types/leaflet.markercluster": "1.5.4",
     "@types/lodash": "^4.14.192",
     "@types/marked": "^4.0.8",
     "@types/node": "~18.15.11",
diff --git a/ui-ngx/patches/echarts+5.5.0.patch b/ui-ngx/patches/echarts+5.5.0.patch
deleted file mode 100644
index 4f1ebed81a..0000000000
--- a/ui-ngx/patches/echarts+5.5.0.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-diff --git a/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js b/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js
-index d6c05f3..aafb0b8 100644
---- a/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js
-+++ b/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js
-@@ -362,7 +362,10 @@ var DataZoomModel = /** @class */function (_super) {
-         return axisProxy.getDataValueWindow();
-       }
-     } else {
--      return this.getAxisProxy(axisDim, axisIndex).getDataValueWindow();
-+      var axisProxy = this.getAxisProxy(axisDim, axisIndex);
-+      if (axisProxy) {
-+        return axisProxy.getDataValueWindow();
-+      }
-     }
-   };
-   /**
-@@ -381,10 +384,10 @@ var DataZoomModel = /** @class */function (_super) {
-       var axisInfo = this._targetAxisInfoMap.get(axisDim);
-       for (var j = 0; j < axisInfo.indexList.length; j++) {
-         var proxy = this.getAxisProxy(axisDim, axisInfo.indexList[j]);
--        if (proxy.hostedBy(this)) {
-+        if (proxy && proxy.hostedBy(this)) {
-           return proxy;
-         }
--        if (!firstProxy) {
-+        if (proxy && !firstProxy) {
-           firstProxy = proxy;
-         }
-       }
-diff --git a/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js b/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js
-index 06469b2..cf0b2ea 100644
---- a/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js
-+++ b/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js
-@@ -96,11 +96,14 @@ var getRangeHandlers = {
-     range[0] = (range[0] - percentPoint) * scale + percentPoint;
-     range[1] = (range[1] - percentPoint) * scale + percentPoint;
-     // Restrict range.
--    var minMaxSpan = this.dataZoomModel.findRepresentativeAxisProxy().getMinMaxSpan();
--    sliderMove(0, range, [0, 100], 0, minMaxSpan.minSpan, minMaxSpan.maxSpan);
--    this.range = range;
--    if (lastRange[0] !== range[0] || lastRange[1] !== range[1]) {
--      return range;
-+    var proxy = this.dataZoomModel.findRepresentativeAxisProxy();
-+    if (proxy) {
-+      var minMaxSpan = proxy.getMinMaxSpan();
-+      sliderMove(0, range, [0, 100], 0, minMaxSpan.minSpan, minMaxSpan.maxSpan);
-+      this.range = range;
-+      if (lastRange[0] !== range[0] || lastRange[1] !== range[1]) {
-+        return range;
-+      }
-     }
-   },
-   pan: makeMover(function (range, axisModel, coordSysInfo, coordSysMainType, controller, e) {
-diff --git a/node_modules/echarts/lib/component/dataZoom/SliderZoomView.js b/node_modules/echarts/lib/component/dataZoom/SliderZoomView.js
-index 98912e0..0cda6be 100644
---- a/node_modules/echarts/lib/component/dataZoom/SliderZoomView.js
-+++ b/node_modules/echarts/lib/component/dataZoom/SliderZoomView.js
-@@ -64,7 +64,7 @@ var DEFAULT_MOVE_HANDLE_SIZE = 7;
- var HORIZONTAL = 'horizontal';
- var VERTICAL = 'vertical';
- var LABEL_GAP = 5;
--var SHOW_DATA_SHADOW_SERIES_TYPE = ['line', 'bar', 'candlestick', 'scatter'];
-+var SHOW_DATA_SHADOW_SERIES_TYPE = ['line', 'bar', 'candlestick', 'scatter', 'custom'];
- var REALTIME_ANIMATION_CONFIG = {
-   easing: 'cubicOut',
-   duration: 100,
-@@ -359,30 +359,33 @@ var SliderZoomView = /** @class */function (_super) {
-     var result;
-     var ecModel = this.ecModel;
-     dataZoomModel.eachTargetAxis(function (axisDim, axisIndex) {
--      var seriesModels = dataZoomModel.getAxisProxy(axisDim, axisIndex).getTargetSeriesModels();
--      each(seriesModels, function (seriesModel) {
--        if (result) {
--          return;
--        }
--        if (showDataShadow !== true && indexOf(SHOW_DATA_SHADOW_SERIES_TYPE, seriesModel.get('type')) < 0) {
--          return;
--        }
--        var thisAxis = ecModel.getComponent(getAxisMainType(axisDim), axisIndex).axis;
--        var otherDim = getOtherDim(axisDim);
--        var otherAxisInverse;
--        var coordSys = seriesModel.coordinateSystem;
--        if (otherDim != null && coordSys.getOtherAxis) {
--          otherAxisInverse = coordSys.getOtherAxis(thisAxis).inverse;
--        }
--        otherDim = seriesModel.getData().mapDimension(otherDim);
--        result = {
--          thisAxis: thisAxis,
--          series: seriesModel,
--          thisDim: axisDim,
--          otherDim: otherDim,
--          otherAxisInverse: otherAxisInverse
--        };
--      }, this);
-+      var axisProxy = dataZoomModel.getAxisProxy(axisDim, axisIndex);
-+      if (axisProxy) {
-+        var seriesModels = axisProxy.getTargetSeriesModels();
-+        each(seriesModels, function (seriesModel) {
-+          if (result) {
-+            return;
-+          }
-+          if (showDataShadow !== true && indexOf(SHOW_DATA_SHADOW_SERIES_TYPE, seriesModel.get('type')) < 0) {
-+            return;
-+          }
-+          var thisAxis = ecModel.getComponent(getAxisMainType(axisDim), axisIndex).axis;
-+          var otherDim = getOtherDim(axisDim);
-+          var otherAxisInverse;
-+          var coordSys = seriesModel.coordinateSystem;
-+          if (otherDim != null && coordSys.getOtherAxis) {
-+            otherAxisInverse = coordSys.getOtherAxis(thisAxis).inverse;
-+          }
-+          otherDim = seriesModel.getData().mapDimension(otherDim);
-+          result = {
-+            thisAxis: thisAxis,
-+            series: seriesModel,
-+            thisDim: axisDim,
-+            otherDim: otherDim,
-+            otherAxisInverse: otherAxisInverse
-+          };
-+        }, this);
-+      }
-     }, this);
-     return result;
-   };
-@@ -530,12 +533,17 @@ var SliderZoomView = /** @class */function (_super) {
-     var dataZoomModel = this.dataZoomModel;
-     var handleEnds = this._handleEnds;
-     var viewExtend = this._getViewExtent();
--    var minMaxSpan = dataZoomModel.findRepresentativeAxisProxy().getMinMaxSpan();
--    var percentExtent = [0, 100];
--    sliderMove(delta, handleEnds, viewExtend, dataZoomModel.get('zoomLock') ? 'all' : handleIndex, minMaxSpan.minSpan != null ? linearMap(minMaxSpan.minSpan, percentExtent, viewExtend, true) : null, minMaxSpan.maxSpan != null ? linearMap(minMaxSpan.maxSpan, percentExtent, viewExtend, true) : null);
--    var lastRange = this._range;
--    var range = this._range = asc([linearMap(handleEnds[0], viewExtend, percentExtent, true), linearMap(handleEnds[1], viewExtend, percentExtent, true)]);
--    return !lastRange || lastRange[0] !== range[0] || lastRange[1] !== range[1];
-+    var proxy = dataZoomModel.findRepresentativeAxisProxy();
-+    if (proxy) {
-+      var minMaxSpan = proxy.getMinMaxSpan();
-+      var percentExtent = [0, 100];
-+      sliderMove(delta, handleEnds, viewExtend, dataZoomModel.get('zoomLock') ? 'all' : handleIndex, minMaxSpan.minSpan != null ? linearMap(minMaxSpan.minSpan, percentExtent, viewExtend, true) : null, minMaxSpan.maxSpan != null ? linearMap(minMaxSpan.maxSpan, percentExtent, viewExtend, true) : null);
-+      var lastRange = this._range;
-+      var range = this._range = asc([linearMap(handleEnds[0], viewExtend, percentExtent, true), linearMap(handleEnds[1], viewExtend, percentExtent, true)]);
-+      return !lastRange || lastRange[0] !== range[0] || lastRange[1] !== range[1];
-+    } else {
-+      return false;
-+    }
-   };
-   SliderZoomView.prototype._updateView = function (nonRealtime) {
-     var displaybles = this._displayables;
-diff --git a/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js b/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js
-index ce98fed..e154118 100644
---- a/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js
-+++ b/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js
-@@ -90,7 +90,10 @@ var dataZoomProcessor = {
-       // init stage and not after action dispatch handler, because
-       // reset should be called after seriesData.restoreData.
-       dataZoomModel.eachTargetAxis(function (axisDim, axisIndex) {
--        dataZoomModel.getAxisProxy(axisDim, axisIndex).reset(dataZoomModel);
-+        var axisProxy = dataZoomModel.getAxisProxy(axisDim, axisIndex);
-+        if (axisProxy) {
-+          axisProxy.reset(dataZoomModel);
-+        }
-       });
-       // Caution: data zoom filtering is order sensitive when using
-       // percent range and no min/max/scale set on axis.
-@@ -107,7 +110,10 @@ var dataZoomProcessor = {
-       // So we should filter x-axis after reset x-axis immediately,
-       // and then reset y-axis and filter y-axis.
-       dataZoomModel.eachTargetAxis(function (axisDim, axisIndex) {
--        dataZoomModel.getAxisProxy(axisDim, axisIndex).filterData(dataZoomModel, api);
-+        var axisProxy = dataZoomModel.getAxisProxy(axisDim, axisIndex);
-+        if (axisProxy) {
-+          axisProxy.filterData(dataZoomModel, api);
-+        }
-       });
-     });
-     ecModel.eachComponent('dataZoom', function (dataZoomModel) {
-diff --git a/node_modules/echarts/lib/component/toolbox/feature/DataZoom.js b/node_modules/echarts/lib/component/toolbox/feature/DataZoom.js
-index cf8d6bc..f9b9f90 100644
---- a/node_modules/echarts/lib/component/toolbox/feature/DataZoom.js
-+++ b/node_modules/echarts/lib/component/toolbox/feature/DataZoom.js
-@@ -109,9 +109,12 @@ var DataZoomFeature = /** @class */function (_super) {
-       var axisModel = axis.model;
-       var dataZoomModel = findDataZoom(dimName, axisModel, ecModel);
-       // Restrict range.
--      var minMaxSpan = dataZoomModel.findRepresentativeAxisProxy(axisModel).getMinMaxSpan();
--      if (minMaxSpan.minValueSpan != null || minMaxSpan.maxValueSpan != null) {
--        minMax = sliderMove(0, minMax.slice(), axis.scale.getExtent(), 0, minMaxSpan.minValueSpan, minMaxSpan.maxValueSpan);
-+      var proxy = dataZoomModel.findRepresentativeAxisProxy(axisModel);
-+      if (proxy) {
-+        var minMaxSpan = proxy.getMinMaxSpan();
-+        if (minMaxSpan.minValueSpan != null || minMaxSpan.maxValueSpan != null) {
-+          minMax = sliderMove(0, minMax.slice(), axis.scale.getExtent(), 0, minMaxSpan.minValueSpan, minMaxSpan.maxValueSpan);
-+        }
-       }
-       dataZoomModel && (snapshot[dataZoomModel.id] = {
-         dataZoomId: dataZoomModel.id,
-diff --git a/node_modules/echarts/lib/component/tooltip/TooltipView.js b/node_modules/echarts/lib/component/tooltip/TooltipView.js
-index b8a9b95..11e49c0 100644
---- a/node_modules/echarts/lib/component/tooltip/TooltipView.js
-+++ b/node_modules/echarts/lib/component/tooltip/TooltipView.js
-@@ -360,7 +360,7 @@ var TooltipView = /** @class */function (_super) {
-       each(itemCoordSys.dataByAxis, function (axisItem) {
-         var axisModel = ecModel.getComponent(axisItem.axisDim + 'Axis', axisItem.axisIndex);
-         var axisValue = axisItem.value;
--        if (!axisModel || axisValue == null) {
-+        if (!axisModel || !axisModel.axis || axisValue == null) {
-           return;
-         }
-         var axisValueLabel = axisPointerViewHelper.getValueLabel(axisValue, axisModel.axis, ecModel, axisItem.seriesDataIndices, axisItem.valueLabelOpt);
-diff --git a/node_modules/echarts/lib/coord/axisHelper.js b/node_modules/echarts/lib/coord/axisHelper.js
-index a76c66b..e5b7ee5 100644
---- a/node_modules/echarts/lib/coord/axisHelper.js
-+++ b/node_modules/echarts/lib/coord/axisHelper.js
-@@ -187,7 +187,9 @@ export function createScaleByModel(model, axisType) {
-         });
-       default:
-         // case 'value'/'interval', 'log', or others.
--        return new (Scale.getClass(axisType) || IntervalScale)();
-+        return new (Scale.getClass(axisType) || IntervalScale)({
-+          ticksGenerator: model.get('ticksGenerator')
-+        });
-     }
-   }
- }
-diff --git a/node_modules/echarts/lib/coord/cartesian/Grid.js b/node_modules/echarts/lib/coord/cartesian/Grid.js
-index 5b18f02..39a57f8 100644
---- a/node_modules/echarts/lib/coord/cartesian/Grid.js
-+++ b/node_modules/echarts/lib/coord/cartesian/Grid.js
-@@ -91,11 +91,11 @@ var Grid = /** @class */function () {
-         var scale = axis.scale;
-         if (
-         // Only value and log axis without interval support alignTicks.
--        isIntervalOrLogScale(scale) && model.get('alignTicks') && model.get('interval') == null) {
-+        isIntervalOrLogScale(scale) && model.get('alignTicks') && model.get('interval') == null && model.get('ticksGenerator') == null) {
-           axisNeedsAlign.push(axis);
-         } else {
-           niceScaleExtent(scale, model);
--          if (isIntervalOrLogScale(scale)) {
-+          if (isIntervalOrLogScale(scale) && !scale.isBlank()) {
-             // Can only align to interval or log axis.
-             alignTo = axis;
-           }
-@@ -105,10 +105,15 @@ var Grid = /** @class */function () {
-       // All axes has set alignTicks. Pick the first one.
-       // PENDING. Should we find the axis that both set interval, min, max and align to this one?
-       if (axisNeedsAlign.length) {
--        if (!alignTo) {
--          alignTo = axisNeedsAlign.pop();
--          niceScaleExtent(alignTo.scale, alignTo.model);
-+        while (!alignTo && axisNeedsAlign.length) {
-+          var axis = axisNeedsAlign.pop();
-+          niceScaleExtent(axis.scale, axis.model);
-+          if (!axis.scale.isBlank()) {
-+            alignTo = axis;
-+          }
-         }
-+      }
-+      if (axisNeedsAlign.length && alignTo) {
-         each(axisNeedsAlign, function (axis) {
-           alignScaleTicks(axis.scale, axis.model, alignTo.scale);
-         });
-diff --git a/node_modules/echarts/lib/data/SeriesData.js b/node_modules/echarts/lib/data/SeriesData.js
-index 98d5ce8..1c293a6 100644
---- a/node_modules/echarts/lib/data/SeriesData.js
-+++ b/node_modules/echarts/lib/data/SeriesData.js
-@@ -900,13 +900,16 @@ var SeriesData = /** @class */function () {
-         var dimInfo = data._dimInfos[dim];
-         // Currently, only dimensions that has ordinalMeta can create inverted indices.
-         var ordinalMeta = dimInfo.ordinalMeta;
-+        var stack = dimInfo.stack;
-         var store = data._store;
--        if (ordinalMeta) {
--          invertedIndices = invertedIndicesMap[dim] = new CtorInt32Array(ordinalMeta.categories.length);
--          // The default value of TypedArray is 0. To avoid miss
--          // mapping to 0, we should set it as INDEX_NOT_FOUND.
--          for (var i = 0; i < invertedIndices.length; i++) {
--            invertedIndices[i] = INDEX_NOT_FOUND;
-+        if (ordinalMeta || stack) {
-+          invertedIndices = invertedIndicesMap[dim] = stack ? new Array(store.count()) : new CtorInt32Array(ordinalMeta.categories.length);
-+          if (ordinalMeta) {
-+            // The default value of TypedArray is 0. To avoid miss
-+            // mapping to 0, we should set it as INDEX_NOT_FOUND.
-+            for (var i = 0; i < invertedIndices.length; i++) {
-+              invertedIndices[i] = INDEX_NOT_FOUND;
-+            }
-           }
-           for (var i = 0; i < store.count(); i++) {
-             // Only support the case that all values are distinct.
-diff --git a/node_modules/echarts/lib/data/Source.js b/node_modules/echarts/lib/data/Source.js
-index 7dda49b..2dd2b98 100644
---- a/node_modules/echarts/lib/data/Source.js
-+++ b/node_modules/echarts/lib/data/Source.js
-@@ -252,7 +252,8 @@ function normalizeDimensionsOption(dimensionsDefine) {
-     var item = {
-       name: rawItem.name,
-       displayName: rawItem.displayName,
--      type: rawItem.type
-+      type: rawItem.type,
-+      stack: rawItem.stack
-     };
-     // User can set null in dimensions.
-     // We don't auto specify name, otherwise a given name may
-diff --git a/node_modules/echarts/lib/data/helper/createDimensions.js b/node_modules/echarts/lib/data/helper/createDimensions.js
-index 00d7eb7..dd514b1 100644
---- a/node_modules/echarts/lib/data/helper/createDimensions.js
-+++ b/node_modules/echarts/lib/data/helper/createDimensions.js
-@@ -110,6 +110,9 @@ source, opt) {
-       }
-       dimDefItem.type != null && (resultItem.type = dimDefItem.type);
-       dimDefItem.displayName != null && (resultItem.displayName = dimDefItem.displayName);
-+      if (dimDefItem.stack) {
-+        resultItem.stack = true;
-+      }
-       var newIdx = resultList.length;
-       indicesMap[dimIdx] = newIdx;
-       resultItem.storeDimIndex = dimIdx;
-diff --git a/node_modules/echarts/lib/data/helper/dataStackHelper.js b/node_modules/echarts/lib/data/helper/dataStackHelper.js
-index c25de1b..ea8300d 100644
---- a/node_modules/echarts/lib/data/helper/dataStackHelper.js
-+++ b/node_modules/echarts/lib/data/helper/dataStackHelper.js
-@@ -91,7 +91,7 @@ export function enableDataStack(seriesModel, dimensionsInput, opt) {
-     }
-     if (mayStack && !dimensionInfo.isExtraCoord) {
-       // Find the first ordinal dimension as the stackedByDimInfo.
--      if (!byIndex && !stackedByDimInfo && dimensionInfo.ordinalMeta) {
-+      if (!byIndex && !stackedByDimInfo && (dimensionInfo.ordinalMeta || dimensionInfo.stack)) {
-         stackedByDimInfo = dimensionInfo;
-       }
-       // Find the first stackable dimension as the stackedDimInfo.
-diff --git a/node_modules/echarts/lib/scale/Interval.js b/node_modules/echarts/lib/scale/Interval.js
-index 1094662..363c0a5 100644
---- a/node_modules/echarts/lib/scale/Interval.js
-+++ b/node_modules/echarts/lib/scale/Interval.js
-@@ -46,12 +46,17 @@ import * as numberUtil from '../util/number.js';
- import * as formatUtil from '../util/format.js';
- import Scale from './Scale.js';
- import * as helper from './helper.js';
-+import { isFunction } from 'zrender/lib/core/util.js';
- var roundNumber = numberUtil.round;
- var IntervalScale = /** @class */function (_super) {
-   __extends(IntervalScale, _super);
--  function IntervalScale() {
--    var _this = _super !== null && _super.apply(this, arguments) || this;
-+  function IntervalScale(setting) {
-+    var _this = _super.call(this, setting) || this;
-     _this.type = 'interval';
-+    var ticksGenerator = _this.getSetting('ticksGenerator');
-+    if (isFunction(ticksGenerator)) {
-+      _this._ticksGenerator = ticksGenerator;
-+    }
-     // Step is calculated in adjustExtent.
-     _this._interval = 0;
-     _this._intervalPrecision = 2;
-@@ -104,7 +109,17 @@ var IntervalScale = /** @class */function (_super) {
-     var extent = this._extent;
-     var niceTickExtent = this._niceExtent;
-     var intervalPrecision = this._intervalPrecision;
--    var ticks = [];
-+    var ticksGenerator = this._ticksGenerator;
-+    var ticks;
-+    if (ticksGenerator) {
-+      try {
-+        ticks = ticksGenerator(extent, interval, niceTickExtent, intervalPrecision);
-+        if (ticks) {
-+          return ticks;
-+        }
-+      } catch (_e) {}
-+    }
-+    ticks = [];
-     // If interval is 0, return [];
-     if (!interval) {
-       return ticks;
-diff --git a/node_modules/echarts/types/dist/shared.d.ts b/node_modules/echarts/types/dist/shared.d.ts
-index ca74097..ef41ce2 100644
---- a/node_modules/echarts/types/dist/shared.d.ts
-+++ b/node_modules/echarts/types/dist/shared.d.ts
-@@ -2422,6 +2422,9 @@ interface AxisBaseOptionCommon extends ComponentOption, AnimationOptionMixin {
-         max: number;
-     }) => ScaleDataValue);
- }
-+
-+declare type NumericAxisTicksGenerator = (extent?: number[], interval?: number, niceTickExtent?: number[], intervalPrecision?: number) => {value: number}[];
-+
- interface NumericAxisBaseOptionCommon extends AxisBaseOptionCommon {
-     boundaryGap?: [number | string, number | string];
-     /**
-@@ -2447,6 +2450,8 @@ interface NumericAxisBaseOptionCommon extends AxisBaseOptionCommon {
-      * Will be ignored if interval is set.
-      */
-     alignTicks?: boolean;
-+
-+    ticksGenerator?: NumericAxisTicksGenerator;
- }
- interface CategoryAxisBaseOption extends AxisBaseOptionCommon {
-     type?: 'category';
-@@ -6412,6 +6417,7 @@ declare type DimensionDefinition = {
-     type?: DataStoreDimensionType;
-     name?: DimensionName;
-     displayName?: string;
-+    stack?: boolean;
- };
- declare type DimensionDefinitionLoose = DimensionDefinition['name'] | DimensionDefinition;
- declare const SOURCE_FORMAT_ORIGINAL: "original";
-diff --git a/node_modules/echarts/types/src/coord/axisCommonTypes.d.ts b/node_modules/echarts/types/src/coord/axisCommonTypes.d.ts
-index c5c2792..d524b70 100644
---- a/node_modules/echarts/types/src/coord/axisCommonTypes.d.ts
-+++ b/node_modules/echarts/types/src/coord/axisCommonTypes.d.ts
-@@ -56,6 +56,9 @@ export interface AxisBaseOptionCommon extends ComponentOption, AnimationOptionMi
-         max: number;
-     }) => ScaleDataValue);
- }
-+
-+export declare type NumericAxisTicksGenerator = (extent?: number[], interval?: number, niceTickExtent?: number[], intervalPrecision?: number) => {value: number}[];
-+
- export interface NumericAxisBaseOptionCommon extends AxisBaseOptionCommon {
-     boundaryGap?: [number | string, number | string];
-     /**
-@@ -81,6 +84,8 @@ export interface NumericAxisBaseOptionCommon extends AxisBaseOptionCommon {
-      * Will be ignored if interval is set.
-      */
-     alignTicks?: boolean;
-+    
-+    ticksGenerator?: NumericAxisTicksGenerator;
- }
- export interface CategoryAxisBaseOption extends AxisBaseOptionCommon {
-     type?: 'category';
diff --git a/ui-ngx/src/app/app.component.ts b/ui-ngx/src/app/app.component.ts
index 479e0465e5..9ac5bc79a1 100644
--- a/ui-ngx/src/app/app.component.ts
+++ b/ui-ngx/src/app/app.component.ts
@@ -21,16 +21,17 @@ import { Component, OnInit } from '@angular/core';
 import { environment as env } from '@env/environment';
 
 import { TranslateService } from '@ngx-translate/core';
-import { select, Store } from '@ngrx/store';
+import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { LocalStorageService } from '@core/local-storage/local-storage.service';
 import { DomSanitizer } from '@angular/platform-browser';
 import { MatIconRegistry } from '@angular/material/icon';
-import { combineLatest } from 'rxjs';
-import { selectIsAuthenticated, selectIsUserLoaded } from '@core/auth/auth.selectors';
-import { distinctUntilChanged, filter, map, skip } from 'rxjs/operators';
+import { getCurrentAuthState, selectUserReady } from '@core/auth/auth.selectors';
+import { filter, skip, tap } from 'rxjs/operators';
 import { AuthService } from '@core/auth/auth.service';
 import { svgIcons, svgIconsUrl } from '@shared/models/icon.models';
+import { ActionSettingsChangeLanguage } from '@core/settings/settings.actions';
+import { SETTINGS_KEY } from '@core/settings/settings.effects';
 
 @Component({
   selector: 'tb-root',
@@ -87,13 +88,16 @@ export class AppComponent implements OnInit {
   }
 
   setupAuth() {
-    combineLatest([
-      this.store.pipe(select(selectIsAuthenticated)),
-      this.store.pipe(select(selectIsUserLoaded))]
-    ).pipe(
-      map(results => ({isAuthenticated: results[0], isUserLoaded: results[1]})),
-      distinctUntilChanged(),
-      filter((data) => data.isUserLoaded ),
+    this.store.select(selectUserReady).pipe(
+      filter((data) => data.isUserLoaded),
+      tap((data) => {
+        let userLang = getCurrentAuthState(this.store).userDetails?.additionalInfo?.lang ?? null;
+        if (!userLang && !data.isAuthenticated) {
+          const settings = this.storageService.getItem(SETTINGS_KEY);
+          userLang = settings?.userLang ?? null;
+        }
+        this.notifyUserLang(userLang);
+      }),
       skip(1),
     ).subscribe((data) => {
       this.authService.gotoDefaultPlace(data.isAuthenticated);
@@ -111,4 +115,8 @@ export class AppComponent implements OnInit {
     }
   }
 
+  private notifyUserLang(userLang: string) {
+    this.store.dispatch(new ActionSettingsChangeLanguage({userLang}));
+  }
+
 }
diff --git a/ui-ngx/src/app/core/api/data-aggregator.ts b/ui-ngx/src/app/core/api/data-aggregator.ts
index 61cb1f1a85..5bce9115e8 100644
--- a/ui-ngx/src/app/core/api/data-aggregator.ts
+++ b/ui-ngx/src/app/core/api/data-aggregator.ts
@@ -378,6 +378,7 @@ export class DataAggregator {
   private updateStateBounds(keyData: DataSet, lastPrevKvPair: DataEntry) {
     if (lastPrevKvPair) {
       lastPrevKvPair[0] = this.startTs;
+      lastPrevKvPair[2] = [this.startTs, this.startTs];
     }
     let firstKvPair: DataEntry;
     if (!keyData.length) {
@@ -398,6 +399,7 @@ export class DataAggregator {
       if (lastKvPair[0] < this.endTs) {
         lastKvPair = deepClone(lastKvPair);
         lastKvPair[0] = this.endTs;
+        lastKvPair[2] = [this.endTs, this.endTs];
         keyData.push(lastKvPair);
       }
     }
diff --git a/ui-ngx/src/app/core/api/widget-api.models.ts b/ui-ngx/src/app/core/api/widget-api.models.ts
index 54552c714f..1fcd18bd93 100644
--- a/ui-ngx/src/app/core/api/widget-api.models.ts
+++ b/ui-ngx/src/app/core/api/widget-api.models.ts
@@ -30,7 +30,12 @@ import {
 import { TimeService } from '../services/time.service';
 import { DeviceService } from '../http/device.service';
 import { UtilsService } from '@core/services/utils.service';
-import { Timewindow, WidgetTimewindow } from '@shared/models/time/time.models';
+import {
+  ComparisonDuration,
+  SubscriptionTimewindow,
+  Timewindow,
+  WidgetTimewindow
+} from '@shared/models/time/time.models';
 import { EntityType } from '@shared/models/entity-type.models';
 import { HttpErrorResponse } from '@angular/common/http';
 import { RafService } from '@core/services/raf.service';
@@ -265,7 +270,7 @@ export interface WidgetSubscriptionOptions {
   onTimewindowChangeFunction?: (timewindow: Timewindow) => Timewindow;
   legendConfig?: LegendConfig;
   comparisonEnabled?: boolean;
-  timeForComparison?: moment_.unitOfTime.DurationConstructor;
+  timeForComparison?: ComparisonDuration;
   comparisonCustomIntervalValue?: number;
   decimals?: number;
   units?: string;
@@ -303,6 +308,7 @@ export interface IWidgetSubscription {
   hiddenData?: Array<{data: DataSet}>;
   timeWindowConfig?: Timewindow;
   timeWindow?: WidgetTimewindow;
+  subscriptionTimewindow: SubscriptionTimewindow;
   onTimewindowChangeFunction?: (timewindow: Timewindow) => Timewindow;
   widgetTimewindowChanged$: Observable<WidgetTimewindow>;
   comparisonEnabled?: boolean;
diff --git a/ui-ngx/src/app/core/api/widget-subscription.ts b/ui-ngx/src/app/core/api/widget-subscription.ts
index 933d836ffd..dc29f36ee2 100644
--- a/ui-ngx/src/app/core/api/widget-subscription.ts
+++ b/ui-ngx/src/app/core/api/widget-subscription.ts
@@ -23,13 +23,13 @@ import {
   WidgetSubscriptionOptions
 } from '@core/api/widget-api.models';
 import {
-  DataKey,
+  DataKey, DataKeySettingsWithComparison,
   DataSet,
   DataSetHolder,
   Datasource,
   DatasourceData,
   datasourcesHasAggregation,
-  DatasourceType,
+  DatasourceType, isDataKeySettingsWithComparison,
   LegendConfig,
   LegendData,
   LegendKey,
@@ -513,7 +513,7 @@ export class WidgetSubscription implements IWidgetSubscription {
       this.configuredDatasources.forEach((datasource, datasourceIndex) => {
         const additionalDataKeys: DataKey[] = [];
         datasource.dataKeys.forEach((dataKey, dataKeyIndex) => {
-          if (dataKey.settings.comparisonSettings && dataKey.settings.comparisonSettings.showValuesForComparison) {
+          if (isDataKeySettingsWithComparison(dataKey.settings) && dataKey.settings.comparisonSettings.showValuesForComparison) {
             const additionalDataKey = deepClone(dataKey);
             additionalDataKey.isAdditional = true;
             additionalDataKey.origDataKeyIndex = dataKeyIndex;
@@ -1468,11 +1468,12 @@ export class WidgetSubscription implements IWidgetSubscription {
           if (datasource.isAdditional) {
             const origDatasource = this.datasourcePages[datasource.origDatasourceIndex].data[dIndex];
             datasource.dataKeys.forEach((dataKey) => {
-              if (dataKey.settings.comparisonSettings.color) {
+              const settings: DataKeySettingsWithComparison = dataKey.settings;
+              if (settings.comparisonSettings.color) {
                 dataKey.color = dataKey.settings.comparisonSettings.color;
               }
               const origDataKey = origDatasource.dataKeys[dataKey.origDataKeyIndex];
-              origDataKey.settings.comparisonSettings.color = dataKey.color;
+              (origDataKey.settings as DataKeySettingsWithComparison).comparisonSettings.color = dataKey.color;
             });
           }
         });
@@ -1523,7 +1524,8 @@ export class WidgetSubscription implements IWidgetSubscription {
     const formattedData = flatFormattedData(formattedDataArray);
 
     datasource.dataKeys.forEach((dataKey) => {
-      if (this.comparisonEnabled && dataKey.isAdditional && dataKey.settings.comparisonSettings.comparisonValuesLabel) {
+      if (this.comparisonEnabled && dataKey.isAdditional && isDataKeySettingsWithComparison(dataKey.settings) &&
+        dataKey.settings.comparisonSettings.comparisonValuesLabel) {
         dataKey.label = createLabelFromPattern(dataKey.settings.comparisonSettings.comparisonValuesLabel, formattedData);
       } else {
         if (this.comparisonEnabled && dataKey.isAdditional) {
diff --git a/ui-ngx/src/app/core/auth/auth.selectors.ts b/ui-ngx/src/app/core/auth/auth.selectors.ts
index fc8fdc18b0..0cb13c9865 100644
--- a/ui-ngx/src/app/core/auth/auth.selectors.ts
+++ b/ui-ngx/src/app/core/auth/auth.selectors.ts
@@ -42,6 +42,12 @@ export const selectIsUserLoaded = createSelector(
   (state: AuthState) => state.isUserLoaded
 );
 
+export const selectUserReady = createSelector(
+  selectIsAuthenticated,
+  selectIsUserLoaded,
+  (isAuthenticated, isUserLoaded) => ({isAuthenticated, isUserLoaded})
+);
+
 export const selectAuthUser = createSelector(
   selectAuthState,
   (state: AuthState) => state.authUser
diff --git a/ui-ngx/src/app/core/auth/auth.service.ts b/ui-ngx/src/app/core/auth/auth.service.ts
index 0cc0ca4567..48018e9317 100644
--- a/ui-ngx/src/app/core/auth/auth.service.ts
+++ b/ui-ngx/src/app/core/auth/auth.service.ts
@@ -22,7 +22,7 @@ import { Observable, of, ReplaySubject, throwError } from 'rxjs';
 import { catchError, map, mergeMap, tap } from 'rxjs/operators';
 
 import { LoginRequest, LoginResponse, PublicLoginRequest } from '@shared/models/login.models';
-import { ActivatedRoute, Router, UrlTree } from '@angular/router';
+import { Router, UrlTree } from '@angular/router';
 import { defaultHttpOptions, defaultHttpOptionsFromConfig, RequestConfig } from '../http/http-utils';
 import { UserService } from '../http/user.service';
 import { Store } from '@ngrx/store';
@@ -35,7 +35,6 @@ import {
 } from './auth.actions';
 import { getCurrentAuthState, getCurrentAuthUser } from './auth.selectors';
 import { Authority } from '@shared/models/authority.enum';
-import { ActionSettingsChangeLanguage } from '@app/core/settings/settings.actions';
 import { AuthPayload, AuthState, SysParams, SysParamsState } from '@core/auth/auth.models';
 import { TranslateService } from '@ngx-translate/core';
 import { AuthUser } from '@shared/models/user.model';
@@ -59,7 +58,6 @@ export class AuthService {
     private userService: UserService,
     private timeService: TimeService,
     private router: Router,
-    private route: ActivatedRoute,
     private zone: NgZone,
     private utils: UtilsService,
     private translate: TranslateService,
@@ -419,14 +417,7 @@ export class AuthService {
               this.loadSystemParams().subscribe(
                 (sysParams) => {
                   authPayload = {...authPayload, ...sysParams};
-                  let userLang;
-                  if (authPayload.userDetails.additionalInfo && authPayload.userDetails.additionalInfo.lang) {
-                    userLang = authPayload.userDetails.additionalInfo.lang;
-                  } else {
-                    userLang = null;
-                  }
                   loadUserSubject.next(authPayload);
-                  this.notifyUserLang(userLang);
                   loadUserSubject.complete();
                 },
                 (err) => {
@@ -555,14 +546,14 @@ export class AuthService {
         this.notifyUserLoaded(false);
         this.loadUser(false).subscribe(
           (authPayload) => {
-            this.notifyUserLoaded(true);
             this.notifyAuthenticated(authPayload);
+            this.notifyUserLoaded(true);
             authenticatedSubject.next(true);
             authenticatedSubject.complete();
           },
           () => {
-            this.notifyUserLoaded(true);
             this.notifyUnauthenticated();
+            this.notifyUserLoaded(true);
             authenticatedSubject.next(false);
             authenticatedSubject.complete();
           }
@@ -607,10 +598,6 @@ export class AuthService {
     this.store.dispatch(new ActionAuthAuthenticated(authPayload));
   }
 
-  private notifyUserLang(userLang: string) {
-    this.store.dispatch(new ActionSettingsChangeLanguage({userLang}));
-  }
-
   private updateAndValidateToken(token, prefix, notify) {
     let valid = false;
     const tokenData = this.jwtHelper.decodeToken(token);
diff --git a/ui-ngx/src/app/core/core.module.ts b/ui-ngx/src/app/core/core.module.ts
index 2f713e405f..a72eb1ada7 100644
--- a/ui-ngx/src/app/core/core.module.ts
+++ b/ui-ngx/src/app/core/core.module.ts
@@ -31,7 +31,6 @@ import {
   TranslateModule,
   TranslateParser
 } from '@ngx-translate/core';
-import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { TbMissingTranslationHandler } from './translate/missing-translate-handler';
 import { MatButtonModule } from '@angular/material/button';
 import { MAT_DIALOG_DEFAULT_OPTIONS, MatDialogConfig, MatDialogModule } from '@angular/material/dialog';
@@ -41,9 +40,10 @@ import { TranslateDefaultCompiler } from '@core/translate/translate-default-comp
 import { WINDOW_PROVIDERS } from '@core/services/window.service';
 import { HotkeyModule } from 'angular2-hotkeys';
 import { TranslateDefaultParser } from '@core/translate/translate-default-parser';
+import { TranslateDefaultLoader } from '@core/translate/translate-default-loader';
 
 export function HttpLoaderFactory(http: HttpClient) {
-  return new TranslateHttpLoader(http, './assets/locale/locale.constant-', '.json');
+  return new TranslateDefaultLoader(http);
 }
 
 @NgModule({
diff --git a/ui-ngx/src/app/core/http/device-profile.service.ts b/ui-ngx/src/app/core/http/device-profile.service.ts
index 91ca903c7a..7a9dfd13ba 100644
--- a/ui-ngx/src/app/core/http/device-profile.service.ts
+++ b/ui-ngx/src/app/core/http/device-profile.service.ts
@@ -60,7 +60,7 @@ export class DeviceProfileService {
 
   public getLwm2mObjects(sortOrder: SortOrder, objectIds?: string[], searchText?: string, config?: RequestConfig):
     Observable<Array<ObjectLwM2M>> {
-    let url = `/api/resource/lwm2m/?sortProperty=${sortOrder.property}&sortOrder=${sortOrder.direction}`;
+    let url = `/api/resource/lwm2m?sortProperty=${sortOrder.property}&sortOrder=${sortOrder.direction}`;
     if (isDefinedAndNotNull(objectIds) && objectIds.length > 0) {
       url += `&objectIds=${objectIds}`;
     }
diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts
index b29fd6c9a0..ce1c26f17d 100644
--- a/ui-ngx/src/app/core/http/entity.service.ts
+++ b/ui-ngx/src/app/core/http/entity.service.ts
@@ -716,6 +716,7 @@ export class EntityService {
         entityTypes.push(EntityType.CUSTOMER);
         entityTypes.push(EntityType.USER);
         entityTypes.push(EntityType.DASHBOARD);
+        entityTypes.push(EntityType.QUEUE_STATS);
         if (authState.edgesSupportEnabled) {
           entityTypes.push(EntityType.EDGE);
         }
@@ -795,6 +796,10 @@ export class EntityService {
       case EntityType.API_USAGE_STATE:
         entityFieldKeys.push(entityFields.name.keyName);
         break;
+      case EntityType.QUEUE_STATS:
+        entityFieldKeys.push(entityFields.queueName.keyName);
+        entityFieldKeys.push(entityFields.serviceId.keyName);
+        break;
     }
     return query ? entityFieldKeys.filter((entityField) => entityField.toLowerCase().indexOf(query) === 0) : entityFieldKeys;
   }
diff --git a/ui-ngx/src/app/core/services/resources.service.ts b/ui-ngx/src/app/core/services/resources.service.ts
index bd2402b44c..449e950a65 100644
--- a/ui-ngx/src/app/core/services/resources.service.ts
+++ b/ui-ngx/src/app/core/services/resources.service.ts
@@ -34,6 +34,7 @@ import { select, Store } from '@ngrx/store';
 import { selectIsAuthenticated } from '@core/auth/auth.selectors';
 import { AppState } from '@core/core.state';
 import { map, tap } from 'rxjs/operators';
+import { RequestConfig } from '@core/http/http-utils';
 
 declare const System;
 
@@ -106,11 +107,11 @@ export class ResourcesService {
     return this.loadResourceByType(fileType, url);
   }
 
-  public downloadResource(downloadUrl: string): Observable<any> {
-    return this.http.get(downloadUrl, {
+  public downloadResource(downloadUrl: string, config?: RequestConfig): Observable<any> {
+    return this.http.get(downloadUrl, {...config, ...{
       responseType: 'arraybuffer',
       observe: 'response'
-    }).pipe(
+    }}).pipe(
       map((response) => {
         const headers = response.headers;
         const filename = headers.get('x-filename');
diff --git a/ui-ngx/src/app/core/settings/settings.effects.ts b/ui-ngx/src/app/core/settings/settings.effects.ts
index 56615bf62c..1564814a74 100644
--- a/ui-ngx/src/app/core/settings/settings.effects.ts
+++ b/ui-ngx/src/app/core/settings/settings.effects.ts
@@ -28,7 +28,6 @@ import { AppState } from '@app/core/core.state';
 import { LocalStorageService } from '@app/core/local-storage/local-storage.service';
 import { TitleService } from '@app/core/services/title.service';
 import { updateUserLang } from '@app/core/settings/settings.utils';
-import { AuthService } from '@core/auth/auth.service';
 import { UtilsService } from '@core/services/utils.service';
 import { getCurrentAuthUser } from '@core/auth/auth.selectors';
 import { ActionAuthUpdateLastPublicDashboardId } from '../auth/auth.actions';
@@ -40,7 +39,6 @@ export class SettingsEffects {
   constructor(
     private actions$: Actions<SettingsActions>,
     private store: Store<AppState>,
-    private authService: AuthService,
     private utils: UtilsService,
     private router: Router,
     private localStorageService: LocalStorageService,
@@ -49,26 +47,19 @@ export class SettingsEffects {
   ) {
   }
 
-  
-  persistSettings = createEffect(() => this.actions$.pipe(
+  setTranslateServiceLanguage = createEffect(() => this.actions$.pipe(
     ofType(
       SettingsActionTypes.CHANGE_LANGUAGE,
     ),
     withLatestFrom(this.store.pipe(select(selectSettingsState))),
-    tap(([action, settings]) =>
-      this.localStorageService.setItem(SETTINGS_KEY, settings)
-    )
-  ), {dispatch: false});
-
-  
-  setTranslateServiceLanguage = createEffect(() => this.store.pipe(
-    select(selectSettingsState),
-    map(settings => settings.userLang),
-    distinctUntilChanged(),
-    tap(userLang => updateUserLang(this.translate, userLang))
+    map(settings => settings[1]),
+    distinctUntilChanged((a, b) => a?.userLang === b?.userLang),
+    tap(setting => {
+      this.localStorageService.setItem(SETTINGS_KEY, setting);
+      updateUserLang(this.translate, setting.userLang);
+    })
   ), {dispatch: false});
 
-  
   setTitle = createEffect(() => merge(
     this.actions$.pipe(ofType(SettingsActionTypes.CHANGE_LANGUAGE)),
     this.router.events.pipe(filter(event => event instanceof ActivationEnd))
@@ -81,7 +72,6 @@ export class SettingsEffects {
     })
   ), {dispatch: false});
 
-  
   setPublicId = createEffect(() => merge(
     this.router.events.pipe(filter(event => event instanceof ActivationEnd))
   ).pipe(
diff --git a/ui-ngx/src/app/core/settings/settings.utils.ts b/ui-ngx/src/app/core/settings/settings.utils.ts
index dfe8b37519..e816bbffb0 100644
--- a/ui-ngx/src/app/core/settings/settings.utils.ts
+++ b/ui-ngx/src/app/core/settings/settings.utils.ts
@@ -18,7 +18,7 @@ import { environment as env } from '@env/environment';
 import { TranslateService } from '@ngx-translate/core';
 import * as _moment from 'moment';
 
-export function updateUserLang(translate: TranslateService, userLang: string) {
+export function updateUserLang(translate: TranslateService, userLang: string, translations = env.supportedLangs) {
   let targetLang = userLang;
   if (!env.production) {
     console.log(`User lang: ${targetLang}`);
@@ -29,7 +29,7 @@ export function updateUserLang(translate: TranslateService, userLang: string) {
       console.log(`Fallback to browser lang: ${targetLang}`);
     }
   }
-  const detectedSupportedLang = detectSupportedLang(targetLang);
+  const detectedSupportedLang = detectSupportedLang(targetLang, translations);
   if (!env.production) {
     console.log(`Detected supported lang: ${detectedSupportedLang}`);
   }
@@ -37,10 +37,10 @@ export function updateUserLang(translate: TranslateService, userLang: string) {
   _moment.locale([detectedSupportedLang]);
 }
 
-function detectSupportedLang(targetLang: string): string {
+function detectSupportedLang(targetLang: string, translations: string[]): string {
   const langTag = (targetLang || '').split('-').join('_');
   if (langTag.length) {
-    if (env.supportedLangs.indexOf(langTag) > -1) {
+    if (translations.indexOf(langTag) > -1) {
       return langTag;
     } else {
       const parts = langTag.split('_');
@@ -50,7 +50,7 @@ function detectSupportedLang(targetLang: string): string {
       } else {
         lang = langTag;
       }
-      const foundLangs = env.supportedLangs.filter(
+      const foundLangs = translations.filter(
         (supportedLang: string) => {
           const supportedLangParts = supportedLang.split('_');
           return supportedLangParts[0] === lang;
diff --git a/ui-ngx/src/app/core/translate/translate-default-loader.ts b/ui-ngx/src/app/core/translate/translate-default-loader.ts
new file mode 100644
index 0000000000..7f26170c9c
--- /dev/null
+++ b/ui-ngx/src/app/core/translate/translate-default-loader.ts
@@ -0,0 +1,30 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { TranslateLoader } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import { HttpClient } from '@angular/common/http';
+
+export class TranslateDefaultLoader implements TranslateLoader {
+
+  constructor(private http: HttpClient) {
+
+  }
+
+  getTranslation(lang: string): Observable<object> {
+    return this.http.get(`/assets/locale/locale.constant-${lang}.json`);
+  }
+}
diff --git a/ui-ngx/src/app/core/utils.ts b/ui-ngx/src/app/core/utils.ts
index 999d05b3a8..dc9ed5004b 100644
--- a/ui-ngx/src/app/core/utils.ts
+++ b/ui-ngx/src/app/core/utils.ts
@@ -338,6 +338,8 @@ export const isEmpty = (a: any): boolean => _.isEmpty(a);
 
 export const unset = (object: any, path: string | symbol): boolean => _.unset(object, path);
 
+export const setByPath = <T extends object>(object: T, path: string | number | symbol, value: any): T => _.set(object, path, value);
+
 export const isEqualIgnoreUndefined = (a: any, b: any): boolean => {
   if (a === b) {
     return true;
diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/edit-widget.component.scss b/ui-ngx/src/app/modules/home/components/dashboard-page/edit-widget.component.scss
index 36d3e276b3..1285b9568c 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/edit-widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/edit-widget.component.scss
@@ -21,6 +21,7 @@
     right: 0;
     bottom: 0;
     background: #fff;
+    z-index: 1;
   }
   .widget-preview-section {
     position: absolute;
diff --git a/ui-ngx/src/app/modules/home/components/profile/asset-profile.component.html b/ui-ngx/src/app/modules/home/components/profile/asset-profile.component.html
index 5bf94d5c86..67f3bcdf13 100644
--- a/ui-ngx/src/app/modules/home/components/profile/asset-profile.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/asset-profile.component.html
@@ -31,7 +31,7 @@
   <button mat-raised-button color="primary"
           [disabled]="(isLoading$ | async)"
           (click)="onEntityAction($event, 'setDefault')"
-          [fxShow]="!isEdit && !entity?.default && entity?.name !== TB_SERVICE_QUEUE">
+          [fxShow]="!isEdit && !entity?.default">
     {{'asset-profile.set-default' | translate }}
   </button>
   <button mat-raised-button color="primary"
diff --git a/ui-ngx/src/app/modules/home/components/profile/asset-profile.component.ts b/ui-ngx/src/app/modules/home/components/profile/asset-profile.component.ts
index ae0a5b574f..2635e7bcfe 100644
--- a/ui-ngx/src/app/modules/home/components/profile/asset-profile.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/asset-profile.component.ts
@@ -27,7 +27,7 @@ import { RuleChainId } from '@shared/models/id/rule-chain-id';
 import { ServiceType } from '@shared/models/queue.models';
 import { EntityId } from '@shared/models/id/entity-id';
 import { DashboardId } from '@shared/models/id/dashboard-id';
-import { AssetProfile, TB_SERVICE_QUEUE } from '@shared/models/asset.models';
+import { AssetProfile } from '@shared/models/asset.models';
 import { RuleChainType } from '@shared/models/rule-chain.models';
 
 @Component({
@@ -46,8 +46,6 @@ export class AssetProfileComponent extends EntityComponent<AssetProfile> {
 
   edgeRuleChainType = RuleChainType.EDGE;
 
-  TB_SERVICE_QUEUE = TB_SERVICE_QUEUE;
-
   assetProfileId: EntityId;
 
   constructor(protected store: Store<AppState>,
diff --git a/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.html b/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.html
index 0ef7f3bc7c..ccab83b9aa 100644
--- a/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.html
+++ b/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.html
@@ -23,11 +23,16 @@
   <mat-progress-bar color="warn" style="z-index: 10; width: 100%; margin-bottom: -4px;" mode="indeterminate"
                     *ngIf="isLoading$ | async">
   </mat-progress-bar>
-  <form [formGroup]="loadVersionFormGroup" fxLayout="column" style="flex: 1; padding-top: 16px; overflow: auto;">
+  <form [formGroup]="loadVersionFormGroup" fxLayout="column" style="flex: 1; padding: 16px 0; overflow-y: auto; overflow-x: hidden">
     <tb-entity-types-version-load
       formControlName="entityTypes">
     </tb-entity-types-version-load>
   </form>
+  <div tb-hint-tooltip-icon="{{ 'version-control.rollback-on-error-hint' | translate }}" [formGroup]="loadVersionFormGroup">
+    <mat-slide-toggle formControlName="rollbackOnError">
+      {{ 'version-control.rollback-on-error' | translate }}
+    </mat-slide-toggle>
+  </div>
   <div fxLayoutAlign="end center" fxLayoutGap="8px" style="padding-top: 16px;">
     <button mat-button color="primary"
             type="button"
diff --git a/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.ts b/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.ts
index a9c05a5640..0fed8dab88 100644
--- a/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.ts
+++ b/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.ts
@@ -79,6 +79,7 @@ export class ComplexVersionLoadComponent extends PageComponent implements OnInit
   ngOnInit(): void {
     this.loadVersionFormGroup = this.fb.group({
       entityTypes: [createDefaultEntityTypesVersionLoad(), []],
+      rollbackOnError: [true]
     });
   }
 
@@ -116,6 +117,7 @@ export class ComplexVersionLoadComponent extends PageComponent implements OnInit
     const request: EntityTypeVersionLoadRequest = {
       versionId: this.versionId,
       entityTypes: this.loadVersionFormGroup.get('entityTypes').value,
+      rollbackOnError: this.loadVersionFormGroup.get('rollbackOnError').value,
       type: VersionLoadRequestType.ENTITY_TYPE
     };
     this.versionLoadResult$ = this.entitiesVersionControlService.loadEntitiesVersion(request, {ignoreErrors: true}).pipe(
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts
index 2ff5142b9c..9e7c91c114 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts
@@ -110,6 +110,16 @@ import {
 import {
   TimeSeriesChartBasicConfigComponent
 } from '@home/components/widget/config/basic/chart/time-series-chart-basic-config.component';
+import { ComparisonKeyRowComponent } from '@home/components/widget/config/basic/chart/comparison-key-row.component';
+import {
+  ComparisonKeysTableComponent
+} from '@home/components/widget/config/basic/chart/comparison-keys-table.component';
+import {
+  StatusWidgetBasicConfigComponent
+} from '@home/components/widget/config/basic/indicator/status-widget-basic-config.component';
+import {
+  PieChartBasicConfigComponent
+} from '@home/components/widget/config/basic/chart/pie-chart-basic-config.component';
 
 @NgModule({
   declarations: [
@@ -145,7 +155,11 @@ import {
     PowerButtonBasicConfigComponent,
     SliderBasicConfigComponent,
     ToggleButtonBasicConfigComponent,
-    TimeSeriesChartBasicConfigComponent
+    TimeSeriesChartBasicConfigComponent,
+    ComparisonKeyRowComponent,
+    ComparisonKeysTableComponent,
+    StatusWidgetBasicConfigComponent,
+    PieChartBasicConfigComponent
   ],
   imports: [
     CommonModule,
@@ -185,7 +199,9 @@ import {
     PowerButtonBasicConfigComponent,
     SliderBasicConfigComponent,
     ToggleButtonBasicConfigComponent,
-    TimeSeriesChartBasicConfigComponent
+    TimeSeriesChartBasicConfigComponent,
+    StatusWidgetBasicConfigComponent,
+    PieChartBasicConfigComponent
   ]
 })
 export class BasicWidgetConfigModule {
@@ -219,5 +235,7 @@ export const basicWidgetConfigComponentsMap: {[key: string]: Type<IBasicWidgetCo
   'tb-power-button-basic-config': PowerButtonBasicConfigComponent,
   'tb-slider-basic-config': SliderBasicConfigComponent,
   'tb-toggle-button-basic-config': ToggleButtonBasicConfigComponent,
-  'tb-time-series-chart-basic-config': TimeSeriesChartBasicConfigComponent
+  'tb-time-series-chart-basic-config': TimeSeriesChartBasicConfigComponent,
+  'tb-status-widget-basic-config': StatusWidgetBasicConfigComponent,
+  'tb-pie-chart-basic-config': PieChartBasicConfigComponent
 };
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html
index c98c9274cc..458dfffa14 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html
@@ -84,8 +84,31 @@
       </div>
     </div>
   </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.time-series-chart.chart</div>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="dataZoom">
+        {{ 'widgets.time-series-chart.data-zoom' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <tb-time-series-chart-grid-settings
+        formControlName="grid">
+    </tb-time-series-chart-grid-settings>
+  </div>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
+    <div class="tb-form-row space-between">
+      <div translate>widget-config.units-short</div>
+      <tb-unit-input
+          formControlName="units">
+      </tb-unit-input>
+    </div>
+    <div class="tb-form-row space-between">
+      <div translate>widget-config.decimals-short</div>
+      <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+        <input matInput formControlName="decimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
     <div class="tb-form-row space-between">
       <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showBarLabel">
         {{ 'widgets.bar-chart.label-on-bar' | translate }}
@@ -118,19 +141,57 @@
         </tb-color-input>
       </div>
     </div>
-    <div class="tb-form-row space-between">
-      <div translate>widget-config.units-short</div>
-      <tb-unit-input
-        formControlName="units">
-      </tb-unit-input>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="showBarBorder">
+        {{ 'widgets.time-series-chart.series.bar.show-border' | translate }}
+      </mat-slide-toggle>
     </div>
-    <div class="tb-form-row space-between">
-      <div translate>widget-config.decimals-short</div>
-      <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
-        <input matInput formControlName="decimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+    <div class="tb-form-row space-between column-xs">
+      <div translate>widgets.time-series-chart.series.bar.border-width</div>
+      <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+        <input matInput type="number" formControlName="barBorderWidth" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
       </mat-form-field>
     </div>
+    <div class="tb-form-row space-between column-xs">
+      <div translate>widgets.time-series-chart.series.bar.border-radius</div>
+      <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+        <input matInput type="number" formControlName="barBorderRadius" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
+      </mat-form-field>
+    </div>
+    <tb-time-series-chart-fill-settings
+        formControlName="barBackgroundSettings"
+        title="widgets.time-series-chart.series.background"
+        fillNoneTitle="widgets.time-series-chart.series.fill-type-solid">
+    </tb-time-series-chart-fill-settings>
+    <tb-time-series-no-aggregation-bar-width-settings
+        stroked
+        formControlName="noAggregationBarWidthSettings">
+    </tb-time-series-no-aggregation-bar-width-settings>
   </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.time-series-chart.axis.y-axis</div>
+    <tb-time-series-chart-axis-settings
+        formControlName="yAxis"
+        axisType="yAxis"
+        hideUnits
+        hideDecimals>
+    </tb-time-series-chart-axis-settings>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.time-series-chart.axis.x-axis</div>
+    <tb-time-series-chart-axis-settings
+        formControlName="xAxis"
+        axisType="xAxis">
+    </tb-time-series-chart-axis-settings>
+  </div>
+  <tb-time-series-chart-thresholds-panel
+      formControlName="thresholds"
+      [aliasController]="aliasController"
+      [dataKeyCallbacks]="callbacks"
+      [datasource]="datasource"
+      [widgetConfig]="widgetConfig?.config"
+      hideYAxis>
+  </tb-time-series-chart-thresholds-panel>
   <div class="tb-form-panel tb-slide-toggle">
     <mat-expansion-panel class="tb-settings" [expanded]="barChartWidgetConfigForm.get('showLegend').value" [disabled]="!barChartWidgetConfigForm.get('showLegend').value">
       <mat-expansion-panel-header fxLayout="row wrap">
@@ -178,10 +239,24 @@
         </mat-panel-title>
       </mat-expansion-panel-header>
       <ng-template matExpansionPanelContent>
+        <div class="tb-form-row space-between">
+          <div>{{ 'tooltip.label' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <tb-font-settings formControlName="tooltipLabelFont"
+                              [initialPreviewStyle]="{ color: barChartWidgetConfigForm.get('tooltipLabelColor').value }"
+                              previewText="Temperature">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="tooltipLabelColor">
+            </tb-color-input>
+          </div>
+        </div>
         <div class="tb-form-row space-between">
           <div>{{ 'tooltip.value' | translate }}</div>
           <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
             <tb-font-settings formControlName="tooltipValueFont"
+                              [initialPreviewStyle]="{ color: barChartWidgetConfigForm.get('tooltipValueColor').value }"
                               [previewText]="tooltipValuePreviewFn">
             </tb-font-settings>
             <tb-color-input asBoxInput
@@ -198,6 +273,7 @@
             <tb-date-format-select fxFlex excludeLastUpdateAgo includeAuto
                                    formControlName="tooltipDateFormat"></tb-date-format-select>
             <tb-font-settings formControlName="tooltipDateFont"
+                              [initialPreviewStyle]="{ color: barChartWidgetConfigForm.get('tooltipDateColor').value }"
                               [previewText]="tooltipDatePreviewFn">
             </tb-font-settings>
             <tb-color-input asBoxInput
@@ -230,6 +306,9 @@
       </ng-template>
     </mat-expansion-panel>
   </div>
+  <tb-echarts-animation-settings
+      formControlName="animation">
+  </tb-echarts-animation-settings>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
     <div class="tb-form-row space-between">
@@ -249,6 +328,12 @@
         <input matInput formControlName="borderRadius" placeholder="{{ 'widget-config.set' | translate }}">
       </mat-form-field>
     </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widget-config.card-padding' | translate }}</div>
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <input matInput formControlName="padding" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
   </div>
   <tb-widget-actions-panel
     formControlName="actions">
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.ts
index 78b0b6073b..5c616fa028 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.ts
@@ -33,7 +33,7 @@ import {
   getTimewindowConfig,
   setTimewindowConfig
 } from '@home/components/widget/config/timewindow-config-panel.component';
-import { formatValue, isUndefined } from '@core/utils';
+import { formatValue, isUndefined, mergeDeep } from '@core/utils';
 import {
   cssSizeToStrSize,
   DateFormatProcessor,
@@ -44,6 +44,7 @@ import {
   barChartWithLabelsDefaultSettings,
   BarChartWithLabelsWidgetSettings
 } from '@home/components/widget/lib/chart/bar-chart-with-labels-widget.models';
+import { TimeSeriesChartType } from '@home/components/widget/lib/chart/time-series-chart.models';
 
 @Component({
   selector: 'tb-bar-chart-with-labels-basic-config',
@@ -87,7 +88,8 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
   }
 
   protected onConfigSet(configData: WidgetConfigComponentData) {
-    const settings: BarChartWithLabelsWidgetSettings = {...barChartWithLabelsDefaultSettings, ...(configData.config.settings || {})};
+    const settings: BarChartWithLabelsWidgetSettings = mergeDeep<BarChartWithLabelsWidgetSettings>({} as BarChartWithLabelsWidgetSettings,
+      barChartWithLabelsDefaultSettings, configData.config.settings as BarChartWithLabelsWidgetSettings);
     const iconSize = resolveCssSize(configData.config.iconSize);
     this.barChartWidgetConfigForm = this.fb.group({
       timewindowConfig: [getTimewindowConfig(configData.config), []],
@@ -105,22 +107,40 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
       icon: [configData.config.titleIcon, []],
       iconColor: [configData.config.iconColor, []],
 
+      dataZoom: [settings.dataZoom, []],
+
       showBarLabel: [settings.showBarLabel, []],
       barLabelFont: [settings.barLabelFont, []],
       barLabelColor: [settings.barLabelColor, []],
       showBarValue: [settings.showBarValue, []],
       barValueFont: [settings.barValueFont, []],
       barValueColor: [settings.barValueColor, []],
+      showBarBorder: [settings.showBarBorder, []],
+      barBorderWidth: [settings.barBorderWidth, []],
+      barBorderRadius: [settings.barBorderRadius, []],
+      barBackgroundSettings: [settings.barBackgroundSettings, []],
+      noAggregationBarWidthSettings: [settings.noAggregationBarWidthSettings, []],
 
       units: [configData.config.units, []],
       decimals: [configData.config.decimals, []],
 
+      grid: [settings.grid, []],
+
+      yAxis: [settings.yAxis, []],
+      xAxis: [settings.xAxis, []],
+
+      thresholds: [settings.thresholds, []],
+
+      animation: [settings.animation, []],
+
       showLegend: [settings.showLegend, []],
       legendPosition: [settings.legendPosition, []],
       legendLabelFont: [settings.legendLabelFont, []],
       legendLabelColor: [settings.legendLabelColor, []],
 
       showTooltip: [settings.showTooltip, []],
+      tooltipLabelFont: [settings.tooltipLabelFont, []],
+      tooltipLabelColor: [settings.tooltipLabelColor, []],
       tooltipValueFont: [settings.tooltipValueFont, []],
       tooltipValueColor: [settings.tooltipValueColor, []],
       tooltipShowDate: [settings.tooltipShowDate, []],
@@ -136,6 +156,7 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
 
       cardButtons: [this.getCardButtons(configData.config), []],
       borderRadius: [configData.config.borderRadius, []],
+      padding: [settings.padding, []],
 
       actions: [configData.config.actions || {}, []]
     });
@@ -158,6 +179,8 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
 
     this.widgetConfig.config.settings = this.widgetConfig.config.settings || {};
 
+    this.widgetConfig.config.settings.dataZoom = config.dataZoom;
+
     this.widgetConfig.config.settings.showBarLabel = config.showBarLabel;
     this.widgetConfig.config.settings.barLabelFont = config.barLabelFont;
     this.widgetConfig.config.settings.barLabelColor = config.barLabelColor;
@@ -165,15 +188,32 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
     this.widgetConfig.config.settings.barValueFont = config.barValueFont;
     this.widgetConfig.config.settings.barValueColor = config.barValueColor;
 
+    this.widgetConfig.config.settings.showBarBorder = config.showBarBorder;
+    this.widgetConfig.config.settings.barBorderWidth = config.barBorderWidth;
+    this.widgetConfig.config.settings.barBorderRadius = config.barBorderRadius;
+    this.widgetConfig.config.settings.barBackgroundSettings = config.barBackgroundSettings;
+    this.widgetConfig.config.settings.noAggregationBarWidthSettings = config.noAggregationBarWidthSettings;
+
     this.widgetConfig.config.units = config.units;
     this.widgetConfig.config.decimals = config.decimals;
 
+    this.widgetConfig.config.settings.grid = config.grid;
+
+    this.widgetConfig.config.settings.yAxis = config.yAxis;
+    this.widgetConfig.config.settings.xAxis = config.xAxis;
+
+    this.widgetConfig.config.settings.thresholds = config.thresholds;
+
+    this.widgetConfig.config.settings.animation = config.animation;
+
     this.widgetConfig.config.settings.showLegend = config.showLegend;
     this.widgetConfig.config.settings.legendPosition = config.legendPosition;
     this.widgetConfig.config.settings.legendLabelFont = config.legendLabelFont;
     this.widgetConfig.config.settings.legendLabelColor = config.legendLabelColor;
 
     this.widgetConfig.config.settings.showTooltip = config.showTooltip;
+    this.widgetConfig.config.settings.tooltipLabelFont = config.tooltipLabelFont;
+    this.widgetConfig.config.settings.tooltipLabelColor = config.tooltipLabelColor;
     this.widgetConfig.config.settings.tooltipValueFont = config.tooltipValueFont;
     this.widgetConfig.config.settings.tooltipValueColor = config.tooltipValueColor;
     this.widgetConfig.config.settings.tooltipShowDate = config.tooltipShowDate;
@@ -188,13 +228,14 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
 
     this.setCardButtons(config.cardButtons, this.widgetConfig.config);
     this.widgetConfig.config.borderRadius = config.borderRadius;
+    this.widgetConfig.config.settings.padding = config.padding;
 
     this.widgetConfig.config.actions = config.actions;
     return this.widgetConfig;
   }
 
   protected validatorTriggers(): string[] {
-    return ['showTitle', 'showIcon', 'showBarLabel', 'showBarValue', 'showLegend', 'showTooltip', 'tooltipShowDate'];
+    return ['showTitle', 'showIcon', 'showBarLabel', 'showBarValue', 'showBarBorder', 'showLegend', 'showTooltip', 'tooltipShowDate'];
   }
 
   protected updateValidators(emitEvent: boolean, trigger?: string) {
@@ -202,6 +243,7 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
     const showIcon: boolean = this.barChartWidgetConfigForm.get('showIcon').value;
     const showBarLabel: boolean = this.barChartWidgetConfigForm.get('showBarLabel').value;
     const showBarValue: boolean = this.barChartWidgetConfigForm.get('showBarValue').value;
+    const showBarBorder: boolean = this.barChartWidgetConfigForm.get('showBarBorder').value;
     const showLegend: boolean = this.barChartWidgetConfigForm.get('showLegend').value;
     const showTooltip: boolean = this.barChartWidgetConfigForm.get('showTooltip').value;
     const tooltipShowDate: boolean = this.barChartWidgetConfigForm.get('tooltipShowDate').value;
@@ -248,7 +290,11 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
       this.barChartWidgetConfigForm.get('barValueFont').disable();
       this.barChartWidgetConfigForm.get('barValueColor').disable();
     }
-
+    if (showBarBorder) {
+      this.barChartWidgetConfigForm.get('barBorderWidth').enable();
+    } else {
+      this.barChartWidgetConfigForm.get('barBorderWidth').disable();
+    }
     if (showLegend) {
       this.barChartWidgetConfigForm.get('legendPosition').enable();
       this.barChartWidgetConfigForm.get('legendLabelFont').enable();
@@ -260,6 +306,8 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
     }
 
     if (showTooltip) {
+      this.barChartWidgetConfigForm.get('tooltipLabelFont').enable();
+      this.barChartWidgetConfigForm.get('tooltipLabelColor').enable();
       this.barChartWidgetConfigForm.get('tooltipValueFont').enable();
       this.barChartWidgetConfigForm.get('tooltipValueColor').enable();
       this.barChartWidgetConfigForm.get('tooltipShowDate').enable({emitEvent: false});
@@ -277,6 +325,8 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
         this.barChartWidgetConfigForm.get('tooltipDateInterval').disable();
       }
     } else {
+      this.barChartWidgetConfigForm.get('tooltipLabelFont').disable();
+      this.barChartWidgetConfigForm.get('tooltipLabelColor').disable();
       this.barChartWidgetConfigForm.get('tooltipValueFont').disable();
       this.barChartWidgetConfigForm.get('tooltipValueColor').disable();
       this.barChartWidgetConfigForm.get('tooltipShowDate').disable({emitEvent: false});
@@ -326,4 +376,6 @@ export class BarChartWithLabelsBasicConfigComponent extends BasicWidgetConfigCom
     processor.update(Date.now());
     return processor.formatted;
   }
+
+  protected readonly TimeSeriesChartType = TimeSeriesChartType;
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-key-row.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-key-row.component.html
new file mode 100644
index 0000000000..79b9ecad15
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-key-row.component.html
@@ -0,0 +1,37 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div [formGroup]="keyRowFormGroup" class="tb-form-table-row tb-comparison-key-row">
+  <mat-checkbox class="tb-show-field" formControlName="showValuesForComparison"></mat-checkbox>
+  <tb-data-key-input
+      [editable]="false"
+      [removable]="false"
+      [datasourceType]="datasourceType"
+      [formControl]="keyFormControl">
+  </tb-data-key-input>
+  <div class="tb-label-field">
+    <mat-form-field class="tb-inline-field" appearance="outline" subscriptSizing="dynamic">
+      <input matInput formControlName="comparisonValuesLabel" placeholder="{{ 'widgets.time-series-chart.comparison.comparison-values-label-auto' | translate }}">
+    </mat-form-field>
+  </div>
+  <div class="tb-color-field">
+    <tb-color-input asBoxInput
+                    colorClearButton
+                    formControlName="color">
+    </tb-color-input>
+  </div>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-key-row.component.scss b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-key-row.component.scss
new file mode 100644
index 0000000000..a71d07371e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-key-row.component.scss
@@ -0,0 +1,54 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import '../../../../../../../../scss/constants';
+
+.tb-comparison-key-row {
+  .tb-show-field {
+    width: 40px;
+    min-width: 40px;
+  }
+
+  .tb-data-key-input {
+    flex: 1;
+    @media #{$mat-gt-xs} {
+      min-width: 100px;
+      flex: 1 1 40%;
+    }
+  }
+
+  .tb-label-field, .tb-color-field {
+    display: flex;
+    flex-direction: row;
+    place-content: center;
+    align-items: center;
+    .tb-inline-field {
+      flex: 1;
+    }
+  }
+
+  .tb-label-field {
+    flex: 1;
+    @media #{$mat-gt-xs} {
+      min-width: 150px;
+      flex: 1 1 60%;
+    }
+  }
+
+  .tb-color-field {
+    width: 40px;
+    min-width: 40px;
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-key-row.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-key-row.component.ts
new file mode 100644
index 0000000000..8836a31f8b
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-key-row.component.ts
@@ -0,0 +1,131 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { ChangeDetectorRef, Component, forwardRef, Input, OnInit, ViewEncapsulation } from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup
+} from '@angular/forms';
+import {
+  DataKey,
+  DataKeyComparisonSettings,
+  DataKeySettingsWithComparison,
+  DatasourceType
+} from '@shared/models/widget.models';
+import { deepClone } from '@core/utils';
+
+@Component({
+  selector: 'tb-comparison-key-row',
+  templateUrl: './comparison-key-row.component.html',
+  styleUrls: ['./comparison-key-row.component.scss', '../../data-keys.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => ComparisonKeyRowComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class ComparisonKeyRowComponent implements ControlValueAccessor, OnInit {
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  datasourceType: DatasourceType;
+
+  keyFormControl: UntypedFormControl;
+
+  keyRowFormGroup: UntypedFormGroup;
+
+  modelValue: DataKey;
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder,
+              private cd: ChangeDetectorRef) {
+  }
+
+  ngOnInit() {
+    this.keyFormControl = this.fb.control(null, []);
+    this.keyRowFormGroup = this.fb.group({
+      showValuesForComparison: [null, []],
+      comparisonValuesLabel: [null, []],
+      color: [null, []]
+    });
+    this.keyRowFormGroup.valueChanges.subscribe(
+      () => this.updateModel()
+    );
+    this.keyRowFormGroup.get('showValuesForComparison').valueChanges.subscribe(() => this.updateValidators());
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.keyFormControl.disable({emitEvent: false});
+      this.keyRowFormGroup.disable({emitEvent: false});
+    } else {
+      this.keyFormControl.enable({emitEvent: false});
+      this.keyRowFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  writeValue(value: DataKey): void {
+    this.modelValue = value;
+    const comparisonSettings = (value?.settings as DataKeySettingsWithComparison)?.comparisonSettings;
+    this.keyRowFormGroup.patchValue(
+      comparisonSettings, {emitEvent: false}
+    );
+    this.keyFormControl.patchValue(deepClone(this.modelValue), {emitEvent: false});
+    this.updateValidators();
+    this.cd.markForCheck();
+  }
+
+  private updateValidators() {
+    const showValuesForComparison: boolean = this.keyRowFormGroup.get('showValuesForComparison').value;
+    if (showValuesForComparison) {
+      this.keyFormControl.enable({emitEvent: false});
+      this.keyRowFormGroup.get('comparisonValuesLabel').enable({emitEvent: false});
+      this.keyRowFormGroup.get('color').enable({emitEvent: false});
+    } else {
+      this.keyFormControl.disable({emitEvent: false});
+      this.keyRowFormGroup.get('comparisonValuesLabel').disable({emitEvent: false});
+      this.keyRowFormGroup.get('color').disable({emitEvent: false});
+    }
+  }
+
+  private updateModel() {
+    const comparisonSettings: DataKeyComparisonSettings = this.keyRowFormGroup.value;
+    if (!this.modelValue.settings) {
+      this.modelValue.settings = {};
+    }
+    this.modelValue.settings.comparisonSettings = comparisonSettings;
+    this.propagateChange(this.modelValue);
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-keys-table.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-keys-table.component.html
new file mode 100644
index 0000000000..a202a81cf6
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-keys-table.component.html
@@ -0,0 +1,38 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div class="tb-comparison-keys-table tb-form-table">
+  <div class="tb-form-table-header">
+    <div class="tb-form-table-header-cell tb-show-header" translate>widgets.time-series-chart.comparison.show</div>
+    <div class="tb-form-table-header-cell tb-key-header" translate>datakey.key</div>
+    <div class="tb-form-table-header-cell tb-label-header" translate>datakey.label</div>
+    <div class="tb-form-table-header-cell tb-color-header" translate>datakey.color</div>
+  </div>
+  <div *ngIf="keysFormArray().controls.length; else noKeys" class="tb-form-table-body">
+    <div *ngFor="let keyControl of keysFormArray().controls; trackBy: trackByKey; let $index = index;">
+      <tb-comparison-key-row
+          fxFlex
+          [datasourceType]="datasourceType"
+          [formControl]="keyControl">
+      </tb-comparison-key-row>
+    </div>
+  </div>
+</div>
+<ng-template #noKeys>
+  <span fxLayoutAlign="center center"
+        class="tb-prompt">{{ 'widgets.chart.no-series' | translate }}</span>
+</ng-template>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-keys-table.component.scss b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-keys-table.component.scss
new file mode 100644
index 0000000000..1d9689a333
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-keys-table.component.scss
@@ -0,0 +1,53 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import '../../../../../../../../scss/constants';
+
+.tb-comparison-keys-table {
+  .tb-form-table-header-cell {
+
+    &.tb-show-header {
+      width: 40px;
+      min-width: 40px;
+    }
+
+    &.tb-key-header {
+      flex: 1;
+      @media #{$mat-gt-xs} {
+        min-width: 100px;
+        flex: 1 1 40%;
+      }
+    }
+
+    &.tb-label-header {
+      flex: 1;
+      @media #{$mat-gt-xs} {
+        min-width: 150px;
+        flex: 1 1 60%;
+      }
+    }
+
+    &.tb-color-header {
+      width: 40px;
+      min-width: 40px;
+    }
+  }
+
+  .tb-form-table-body {
+    tb-comparison-key-row {
+      overflow: hidden;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-keys-table.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-keys-table.component.ts
new file mode 100644
index 0000000000..b8241531b3
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/comparison-keys-table.component.ts
@@ -0,0 +1,110 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, forwardRef, Input, OnInit, ViewEncapsulation } from '@angular/core';
+import {
+  AbstractControl,
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+  UntypedFormArray,
+  UntypedFormBuilder,
+  UntypedFormGroup
+} from '@angular/forms';
+import { DataKey, DatasourceType } from '@shared/models/widget.models';
+
+@Component({
+  selector: 'tb-comparison-keys-table',
+  templateUrl: './comparison-keys-table.component.html',
+  styleUrls: ['./comparison-keys-table.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => ComparisonKeysTableComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class ComparisonKeysTableComponent implements ControlValueAccessor, OnInit {
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  datasourceType: DatasourceType;
+
+  keysListFormGroup: UntypedFormGroup;
+
+  get noKeys(): boolean {
+    const keys: DataKey[] = this.keysListFormGroup.get('keys').value;
+    return keys.length === 0;
+  }
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit() {
+    this.keysListFormGroup = this.fb.group({
+      keys: [this.fb.array([]), []]
+    });
+    this.keysListFormGroup.valueChanges.subscribe(
+      () => {
+        const keys: DataKey[] = this.keysListFormGroup.get('keys').value;
+        this.propagateChange(keys);
+      }
+    );
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    if (isDisabled) {
+      this.keysListFormGroup.disable({emitEvent: false});
+    } else {
+      this.keysListFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(value: DataKey[] | undefined): void {
+    this.keysListFormGroup.setControl('keys', this.prepareKeysFormArray(value), {emitEvent: false});
+  }
+
+  keysFormArray(): UntypedFormArray {
+    return this.keysListFormGroup.get('keys') as UntypedFormArray;
+  }
+
+  trackByKey(_index: number, keyControl: AbstractControl): any {
+    return keyControl;
+  }
+
+  private prepareKeysFormArray(keys: DataKey[] | undefined): UntypedFormArray {
+    const keysControls: Array<AbstractControl> = [];
+    if (keys) {
+      keys.forEach((key) => {
+        keysControls.push(this.fb.control(key, []));
+      });
+    }
+    return this.fb.array(keysControls);
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.html
index 9d6e9a4bd5..8ba255052d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.html
@@ -59,7 +59,7 @@
     </tb-image-cards-select>
     <div class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="autoScale">
-        {{ 'widgets.doughnut.auto-scale' | translate }}
+        {{ 'widgets.latest-chart.auto-scale' | translate }}
       </mat-slide-toggle>
     </div>
     <div class="tb-form-row column-xs">
@@ -99,12 +99,12 @@
     </div>
     <div class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="clockwise">
-        {{ 'widgets.doughnut.clockwise-layout' | translate }}
+        {{ 'widgets.latest-chart.clockwise-layout' | translate }}
       </mat-slide-toggle>
     </div>
     <div class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="sortSeries">
-        {{ 'widgets.doughnut.sort-series' | translate }}
+        {{ 'widgets.latest-chart.sort-series' | translate }}
       </mat-slide-toggle>
     </div>
     <div [fxShow]="totalEnabled" class="tb-form-row space-between">
@@ -194,8 +194,8 @@
           <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
             <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
               <mat-select formControlName="tooltipValueType">
-                <mat-option *ngFor="let type of doughnutTooltipValueTypes" [value]="type">
-                  {{ doughnutTooltipValueTypeTranslationMap.get(type) | translate }}
+                <mat-option *ngFor="let type of latestChartTooltipValueTypes" [value]="type">
+                  {{ latestChartTooltipValueTypeTranslationMap.get(type) | translate }}
                 </mat-option>
               </mat-select>
             </mat-form-field>
@@ -229,6 +229,9 @@
       </ng-template>
     </mat-expansion-panel>
   </div>
+  <tb-echarts-animation-settings
+      formControlName="animation">
+  </tb-echarts-animation-settings>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
     <div class="tb-form-row space-between">
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.ts
index 99e45d49a7..d2bff75354 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/doughnut-basic-config.component.ts
@@ -31,7 +31,7 @@ import {
 } from '@shared/models/widget.models';
 import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
-import { formatValue, isDefinedAndNotNull, isUndefined } from '@core/utils';
+import { formatValue, isDefinedAndNotNull, isUndefined, mergeDeep } from '@core/utils';
 import {
   getTimewindowConfig,
   setTimewindowConfig
@@ -42,12 +42,14 @@ import {
   doughnutLayoutImages,
   doughnutLayouts,
   doughnutLayoutTranslations,
-  DoughnutTooltipValueType,
-  doughnutTooltipValueTypes,
-  doughnutTooltipValueTypeTranslations,
   DoughnutWidgetSettings,
   horizontalDoughnutLayoutImages
 } from '@home/components/widget/lib/chart/doughnut-widget.models';
+import {
+  LatestChartTooltipValueType,
+  latestChartTooltipValueTypes,
+  latestChartTooltipValueTypeTranslations
+} from '@home/components/widget/lib/chart/latest-chart.models';
 
 @Component({
   selector: 'tb-doughnut-basic-config',
@@ -87,9 +89,9 @@ export class DoughnutBasicConfigComponent extends BasicWidgetConfigComponent {
 
   legendPositionTranslationMap = legendPositionTranslationMap;
 
-  doughnutTooltipValueTypes = doughnutTooltipValueTypes;
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
 
-  doughnutTooltipValueTypeTranslationMap = doughnutTooltipValueTypeTranslations;
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
 
   doughnutWidgetConfigForm: UntypedFormGroup;
 
@@ -125,7 +127,8 @@ export class DoughnutBasicConfigComponent extends BasicWidgetConfigComponent {
   }
 
   protected onConfigSet(configData: WidgetConfigComponentData) {
-    const settings: DoughnutWidgetSettings = {...doughnutDefaultSettings(this.horizontal), ...(configData.config.settings || {})};
+    const settings: DoughnutWidgetSettings = mergeDeep<DoughnutWidgetSettings>({} as DoughnutWidgetSettings,
+      doughnutDefaultSettings(this.horizontal), configData.config.settings as DoughnutWidgetSettings);
     this.doughnutWidgetConfigForm = this.fb.group({
       timewindowConfig: [getTimewindowConfig(configData.config), []],
       datasources: [configData.config.datasources, []],
@@ -151,6 +154,8 @@ export class DoughnutBasicConfigComponent extends BasicWidgetConfigComponent {
       units: [configData.config.units, []],
       decimals: [configData.config.decimals, []],
 
+      animation: [settings.animation, []],
+
       showLegend: [settings.showLegend, []],
       legendPosition: [settings.legendPosition, []],
       legendLabelFont: [settings.legendLabelFont, []],
@@ -202,6 +207,8 @@ export class DoughnutBasicConfigComponent extends BasicWidgetConfigComponent {
     this.widgetConfig.config.units = config.units;
     this.widgetConfig.config.decimals = config.decimals;
 
+    this.widgetConfig.config.settings.animation = config.animation;
+
     this.widgetConfig.config.settings.showLegend = config.showLegend;
     this.widgetConfig.config.settings.legendPosition = config.legendPosition;
     this.widgetConfig.config.settings.legendLabelFont = config.legendLabelFont;
@@ -329,9 +336,9 @@ export class DoughnutBasicConfigComponent extends BasicWidgetConfigComponent {
   }
 
   private _tooltipValuePreviewFn(): string {
-    const tooltipValueType: DoughnutTooltipValueType = this.doughnutWidgetConfigForm.get('tooltipValueType').value;
+    const tooltipValueType: LatestChartTooltipValueType = this.doughnutWidgetConfigForm.get('tooltipValueType').value;
     const decimals: number = this.doughnutWidgetConfigForm.get('tooltipValueDecimals').value;
-    if (tooltipValueType === DoughnutTooltipValueType.percentage) {
+    if (tooltipValueType === LatestChartTooltipValueType.percentage) {
       return formatValue(35, decimals, '%', false);
     } else {
       const units: string = this.doughnutWidgetConfigForm.get('units').value;
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.html
new file mode 100644
index 0000000000..e0b6352a8a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.html
@@ -0,0 +1,276 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<ng-container [formGroup]="pieChartWidgetConfigForm">
+  <tb-timewindow-config-panel *ngIf="displayTimewindowConfig"
+                              [onlyHistoryTimewindow]="onlyHistoryTimewindow()"
+                              formControlName="timewindowConfig">
+  </tb-timewindow-config-panel>
+  <tb-datasources
+      [configMode]="basicMode"
+      hideDatasourceLabel
+      hideDataKeys
+      forceSingleDatasource
+      formControlName="datasources">
+  </tb-datasources>
+  <tb-data-keys-panel
+      panelTitle="{{ 'widgets.chart.series' | translate }}"
+      addKeyTitle="{{ 'widgets.chart.add-series' | translate }}"
+      keySettingsTitle="{{ 'widgets.chart.series-settings' | translate }}"
+      removeKeyTitle="{{ 'widgets.chart.remove-series' | translate }}"
+      noKeysText="{{ 'widgets.chart.no-series' | translate }}"
+      requiredKeysText="{{ 'widgets.chart.no-series-error' | translate }}"
+      hideUnits
+      hideDecimals
+      hideDataKeyUnits
+      hideDataKeyDecimals
+      [datasourceType]="datasource?.type"
+      [deviceId]="datasource?.deviceId"
+      [entityAliasId]="datasource?.entityAliasId"
+      formControlName="series">
+  </tb-data-keys-panel>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
+    <div class="tb-form-row space-between column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showLabel">
+        {{ 'widgets.pie-chart.label' | translate }}
+      </mat-slide-toggle>
+      <div fxFlex fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field fxFlex appearance="outline" subscriptSizing="dynamic">
+          <mat-select formControlName="labelPosition">
+            <mat-option *ngFor="let position of pieChartLabelPositions" [value]="position">
+              {{ pieChartLabelPositionTranslationMap.get(position) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <tb-font-settings formControlName="labelFont"
+                          disabledLineHeight
+                          forceSizeUnit="px"
+                          [previewText]="'Wind<br/>55%'">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="labelColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.pie-chart.border' | translate }}</div>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="borderWidth" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+          <div matSuffix>px</div>
+        </mat-form-field>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="borderColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.pie-chart.radius' | translate }}</div>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="radius" type="number" min="0" max="100" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+          <div matSuffix>%</div>
+        </mat-form-field>
+      </div>
+    </div>
+    <div class="tb-form-row column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width"  formControlName="showTitle">
+        {{ 'widget-config.card-title' | translate }}
+      </mat-slide-toggle>
+      <div fxFlex fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field fxFlex appearance="outline" subscriptSizing="dynamic">
+          <input matInput formControlName="title" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+        <tb-font-settings formControlName="titleFont"
+                          clearButton
+                          [previewText]="pieChartWidgetConfigForm.get('title').value"
+                          [initialPreviewStyle]="widgetConfig.config.titleStyle">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="titleColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <div class="tb-form-row space-between">
+      <mat-slide-toggle class="mat-slide"  formControlName="showTitleIcon">
+        {{ 'widget-config.card-icon' | translate }}
+      </mat-slide-toggle>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <tb-material-icon-select asBoxInput
+                                 iconClearButton
+                                 [color]="pieChartWidgetConfigForm.get('iconColor').value"
+                                 formControlName="titleIcon">
+        </tb-material-icon-select>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="iconColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="clockwise">
+        {{ 'widgets.latest-chart.clockwise-layout' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="sortSeries">
+        {{ 'widgets.latest-chart.sort-series' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div class="tb-form-row space-between">
+      <div translate>widget-config.units-short</div>
+      <tb-unit-input
+          formControlName="units">
+      </tb-unit-input>
+    </div>
+    <div class="tb-form-row space-between">
+      <div translate>widget-config.decimals-short</div>
+      <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+        <input matInput formControlName="decimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+  </div>
+  <div class="tb-form-panel tb-slide-toggle">
+    <mat-expansion-panel class="tb-settings" [expanded]="pieChartWidgetConfigForm.get('showLegend').value" [disabled]="!pieChartWidgetConfigForm.get('showLegend').value">
+      <mat-expansion-panel-header fxLayout="row wrap">
+        <mat-panel-title>
+          <mat-slide-toggle class="mat-slide" formControlName="showLegend" (click)="$event.stopPropagation()"
+                            fxLayoutAlign="center">
+            {{ 'widget-config.legend' | translate }}
+          </mat-slide-toggle>
+        </mat-panel-title>
+      </mat-expansion-panel-header>
+      <ng-template matExpansionPanelContent>
+        <div class="tb-form-row space-between">
+          <div>{{ 'legend.position' | translate }}</div>
+          <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+            <mat-select formControlName="legendPosition">
+              <mat-option *ngFor="let pos of legendPositions" [value]="pos">
+                {{ legendPositionTranslationMap.get(pos) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'legend.label' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <tb-font-settings formControlName="legendLabelFont"
+                              previewText="Wind">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="legendLabelColor">
+            </tb-color-input>
+          </div>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'legend.value' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <tb-font-settings formControlName="legendValueFont"
+                              [previewText]="valuePreviewFn">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="legendValueColor">
+            </tb-color-input>
+          </div>
+        </div>
+      </ng-template>
+    </mat-expansion-panel>
+  </div>
+  <div class="tb-form-panel tb-slide-toggle">
+    <mat-expansion-panel class="tb-settings" [expanded]="pieChartWidgetConfigForm.get('showTooltip').value" [disabled]="!pieChartWidgetConfigForm.get('showTooltip').value">
+      <mat-expansion-panel-header fxLayout="row wrap">
+        <mat-panel-title>
+          <mat-slide-toggle class="mat-slide" formControlName="showTooltip" (click)="$event.stopPropagation()"
+                            fxLayoutAlign="center">
+            {{ 'widget-config.tooltip' | translate }}
+          </mat-slide-toggle>
+        </mat-panel-title>
+      </mat-expansion-panel-header>
+      <ng-template matExpansionPanelContent>
+        <div class="tb-form-row space-between column-xs">
+          <div>{{ 'tooltip.value' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+              <mat-select formControlName="tooltipValueType">
+                <mat-option *ngFor="let type of latestChartTooltipValueTypes" [value]="type">
+                  {{ latestChartTooltipValueTypeTranslationMap.get(type) | translate }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+            <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+              <input matInput formControlName="tooltipValueDecimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+              <div matSuffix fxHide.lt-md translate>widget-config.decimals-suffix</div>
+            </mat-form-field>
+            <tb-font-settings formControlName="tooltipValueFont"
+                              [previewText]="tooltipValuePreviewFn">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="tooltipValueColor">
+            </tb-color-input>
+          </div>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'tooltip.background-color' | translate }}</div>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="tooltipBackgroundColor">
+          </tb-color-input>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'tooltip.background-blur' | translate }}</div>
+          <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+            <input matInput formControlName="tooltipBackgroundBlur" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+            <div matSuffix>px</div>
+          </mat-form-field>
+        </div>
+      </ng-template>
+    </mat-expansion-panel>
+  </div>
+  <tb-echarts-animation-settings
+      formControlName="animation">
+  </tb-echarts-animation-settings>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.background.background' | translate }}</div>
+      <tb-background-settings formControlName="background">
+      </tb-background-settings>
+    </div>
+    <div class="tb-form-row space-between column-lt-md">
+      <div translate>widget-config.show-card-buttons</div>
+      <mat-chip-listbox multiple formControlName="cardButtons">
+        <mat-chip-option value="fullscreen">{{ 'fullscreen.fullscreen' | translate }}</mat-chip-option>
+      </mat-chip-listbox>
+    </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widget-config.card-border-radius' | translate }}</div>
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <input matInput formControlName="borderRadius" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+  </div>
+  <tb-widget-actions-panel
+      formControlName="actions">
+  </tb-widget-actions-panel>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.ts
new file mode 100644
index 0000000000..7e0dc8d993
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/pie-chart-basic-config.component.ts
@@ -0,0 +1,343 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { BasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models';
+import { WidgetConfigComponentData } from '@home/models/widget-component.models';
+import {
+  DataKey,
+  Datasource,
+  datasourcesHasAggregation,
+  datasourcesHasOnlyComparisonAggregation,
+  legendPositions,
+  legendPositionTranslationMap,
+  WidgetConfig
+} from '@shared/models/widget.models';
+import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
+import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
+import { formatValue, isUndefined, mergeDeep } from '@core/utils';
+import {
+  getTimewindowConfig,
+  setTimewindowConfig
+} from '@home/components/widget/config/timewindow-config-panel.component';
+import {
+  LatestChartTooltipValueType,
+  latestChartTooltipValueTypes,
+  latestChartTooltipValueTypeTranslations
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import {
+  pieChartWidgetDefaultSettings,
+  PieChartWidgetSettings
+} from '@home/components/widget/lib/chart/pie-chart-widget.models';
+import {
+  pieChartLabelPositions,
+  pieChartLabelPositionTranslations
+} from '@home/components/widget/lib/chart/pie-chart.models';
+
+@Component({
+  selector: 'tb-pie-chart-basic-config',
+  templateUrl: './pie-chart-basic-config.component.html',
+  styleUrls: ['../basic-config.scss']
+})
+export class PieChartBasicConfigComponent extends BasicWidgetConfigComponent {
+
+  public get datasource(): Datasource {
+    const datasources: Datasource[] = this.pieChartWidgetConfigForm.get('datasources').value;
+    if (datasources && datasources.length) {
+      return datasources[0];
+    } else {
+      return null;
+    }
+  }
+
+  public get displayTimewindowConfig(): boolean {
+    const datasources = this.pieChartWidgetConfigForm.get('datasources').value;
+    return datasourcesHasAggregation(datasources);
+  }
+
+  public onlyHistoryTimewindow(): boolean {
+    const datasources = this.pieChartWidgetConfigForm.get('datasources').value;
+    return datasourcesHasOnlyComparisonAggregation(datasources);
+  }
+
+  pieChartLabelPositions = pieChartLabelPositions;
+
+  pieChartLabelPositionTranslationMap = pieChartLabelPositionTranslations;
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
+
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
+
+  pieChartWidgetConfigForm: UntypedFormGroup;
+
+  valuePreviewFn = this._valuePreviewFn.bind(this);
+
+  tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
+
+  constructor(protected store: Store<AppState>,
+              protected widgetConfigComponent: WidgetConfigComponent,
+              private fb: UntypedFormBuilder) {
+    super(store, widgetConfigComponent);
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.pieChartWidgetConfigForm;
+  }
+
+  protected defaultDataKeys(configData: WidgetConfigComponentData): DataKey[] {
+    return [{ name: 'windPower', label: 'Wind', type: DataKeyType.timeseries, units: '', decimals: 0, color: '#08872B' },
+            { name: 'solarPower', label: 'Solar', type: DataKeyType.timeseries, units: '', decimals: 0, color: '#FF4D5A' },
+            { name: 'hydroelectricPower', label: 'Hydroelectric', type: DataKeyType.timeseries, units: '', decimals: 0, color: '#FFDE30' }];
+  }
+
+  protected onConfigSet(configData: WidgetConfigComponentData) {
+    const settings: PieChartWidgetSettings = mergeDeep<PieChartWidgetSettings>({} as PieChartWidgetSettings,
+      pieChartWidgetDefaultSettings, configData.config.settings as PieChartWidgetSettings);
+    this.pieChartWidgetConfigForm = this.fb.group({
+      timewindowConfig: [getTimewindowConfig(configData.config), []],
+      datasources: [configData.config.datasources, []],
+
+      series: [this.getSeries(configData.config.datasources), []],
+
+      showLabel: [settings.showLabel, []],
+      labelPosition: [settings.labelPosition, []],
+      labelFont: [settings.labelFont, []],
+      labelColor: [settings.labelColor, []],
+
+      borderWidth: [settings.borderWidth, [Validators.min(0)]],
+      borderColor: [settings.borderColor, []],
+
+      radius: [settings.radius, [Validators.min(0), Validators.max(100)]],
+
+      clockwise: [settings.clockwise, []],
+      sortSeries: [settings.sortSeries, []],
+
+      showTitle: [configData.config.showTitle, []],
+      title: [configData.config.title, []],
+      titleFont: [configData.config.titleFont, []],
+      titleColor: [configData.config.titleColor, []],
+      showTitleIcon: [configData.config.showTitleIcon, []],
+      titleIcon: [configData.config.titleIcon, []],
+      iconColor: [configData.config.iconColor, []],
+
+      units: [configData.config.units, []],
+      decimals: [configData.config.decimals, []],
+
+      animation: [settings.animation, []],
+
+      showLegend: [settings.showLegend, []],
+      legendPosition: [settings.legendPosition, []],
+      legendLabelFont: [settings.legendLabelFont, []],
+      legendLabelColor: [settings.legendLabelColor, []],
+      legendValueFont: [settings.legendValueFont, []],
+      legendValueColor: [settings.legendValueColor, []],
+
+      showTooltip: [settings.showTooltip, []],
+      tooltipValueType: [settings.tooltipValueType, []],
+      tooltipValueDecimals: [settings.tooltipValueDecimals, []],
+      tooltipValueFont: [settings.tooltipValueFont, []],
+      tooltipValueColor: [settings.tooltipValueColor, []],
+      tooltipBackgroundColor: [settings.tooltipBackgroundColor, []],
+      tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []],
+
+      background: [settings.background, []],
+
+      cardButtons: [this.getCardButtons(configData.config), []],
+      borderRadius: [configData.config.borderRadius, []],
+
+      actions: [configData.config.actions || {}, []]
+    });
+  }
+
+  protected prepareOutputConfig(config: any): WidgetConfigComponentData {
+    setTimewindowConfig(this.widgetConfig.config, config.timewindowConfig);
+    this.widgetConfig.config.datasources = config.datasources;
+    this.setSeries(config.series, this.widgetConfig.config.datasources);
+
+    this.widgetConfig.config.showTitle = config.showTitle;
+    this.widgetConfig.config.title = config.title;
+    this.widgetConfig.config.titleFont = config.titleFont;
+    this.widgetConfig.config.titleColor = config.titleColor;
+
+    this.widgetConfig.config.showTitleIcon = config.showTitleIcon;
+    this.widgetConfig.config.titleIcon = config.titleIcon;
+    this.widgetConfig.config.iconColor = config.iconColor;
+
+    this.widgetConfig.config.settings = this.widgetConfig.config.settings || {};
+
+    this.widgetConfig.config.settings.showLabel = config.showLabel;
+    this.widgetConfig.config.settings.labelPosition = config.labelPosition;
+    this.widgetConfig.config.settings.labelFont = config.labelFont;
+    this.widgetConfig.config.settings.labelColor = config.labelColor;
+
+    this.widgetConfig.config.settings.borderWidth = config.borderWidth;
+    this.widgetConfig.config.settings.borderColor = config.borderColor;
+
+    this.widgetConfig.config.settings.radius = config.radius;
+
+    this.widgetConfig.config.settings.clockwise = config.clockwise;
+    this.widgetConfig.config.settings.sortSeries = config.sortSeries;
+
+    this.widgetConfig.config.units = config.units;
+    this.widgetConfig.config.decimals = config.decimals;
+
+    this.widgetConfig.config.settings.animation = config.animation;
+
+    this.widgetConfig.config.settings.showLegend = config.showLegend;
+    this.widgetConfig.config.settings.legendPosition = config.legendPosition;
+    this.widgetConfig.config.settings.legendLabelFont = config.legendLabelFont;
+    this.widgetConfig.config.settings.legendLabelColor = config.legendLabelColor;
+    this.widgetConfig.config.settings.legendValueFont = config.legendValueFont;
+    this.widgetConfig.config.settings.legendValueColor = config.legendValueColor;
+
+    this.widgetConfig.config.settings.showTooltip = config.showTooltip;
+    this.widgetConfig.config.settings.tooltipValueType = config.tooltipValueType;
+    this.widgetConfig.config.settings.tooltipValueDecimals = config.tooltipValueDecimals;
+    this.widgetConfig.config.settings.tooltipValueFont = config.tooltipValueFont;
+    this.widgetConfig.config.settings.tooltipValueColor = config.tooltipValueColor;
+    this.widgetConfig.config.settings.tooltipBackgroundColor = config.tooltipBackgroundColor;
+    this.widgetConfig.config.settings.tooltipBackgroundBlur = config.tooltipBackgroundBlur;
+
+    this.widgetConfig.config.settings.background = config.background;
+
+    this.setCardButtons(config.cardButtons, this.widgetConfig.config);
+    this.widgetConfig.config.borderRadius = config.borderRadius;
+
+    this.widgetConfig.config.actions = config.actions;
+
+    return this.widgetConfig;
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['showLabel', 'showTitle', 'showTitleIcon', 'showLegend', 'showTooltip'];
+  }
+
+  protected updateValidators(emitEvent: boolean, trigger?: string) {
+    const showLabel: boolean = this.pieChartWidgetConfigForm.get('showLabel').value;
+    const showTitle: boolean = this.pieChartWidgetConfigForm.get('showTitle').value;
+    const showTitleIcon: boolean = this.pieChartWidgetConfigForm.get('showTitleIcon').value;
+    const showLegend: boolean = this.pieChartWidgetConfigForm.get('showLegend').value;
+    const showTooltip: boolean = this.pieChartWidgetConfigForm.get('showTooltip').value;
+
+    if (showLabel) {
+      this.pieChartWidgetConfigForm.get('labelPosition').enable();
+      this.pieChartWidgetConfigForm.get('labelFont').enable();
+      this.pieChartWidgetConfigForm.get('labelColor').enable();
+    } else {
+      this.pieChartWidgetConfigForm.get('labelPosition').disable();
+      this.pieChartWidgetConfigForm.get('labelFont').disable();
+      this.pieChartWidgetConfigForm.get('labelColor').disable();
+    }
+
+    if (showTitle) {
+      this.pieChartWidgetConfigForm.get('title').enable();
+      this.pieChartWidgetConfigForm.get('titleFont').enable();
+      this.pieChartWidgetConfigForm.get('titleColor').enable();
+      this.pieChartWidgetConfigForm.get('showTitleIcon').enable({emitEvent: false});
+      if (showTitleIcon) {
+        this.pieChartWidgetConfigForm.get('titleIcon').enable();
+        this.pieChartWidgetConfigForm.get('iconColor').enable();
+      } else {
+        this.pieChartWidgetConfigForm.get('titleIcon').disable();
+        this.pieChartWidgetConfigForm.get('iconColor').disable();
+      }
+    } else {
+      this.pieChartWidgetConfigForm.get('title').disable();
+      this.pieChartWidgetConfigForm.get('titleFont').disable();
+      this.pieChartWidgetConfigForm.get('titleColor').disable();
+      this.pieChartWidgetConfigForm.get('showTitleIcon').disable({emitEvent: false});
+      this.pieChartWidgetConfigForm.get('titleIcon').disable();
+      this.pieChartWidgetConfigForm.get('iconColor').disable();
+    }
+    if (showLegend) {
+      this.pieChartWidgetConfigForm.get('legendPosition').enable();
+      this.pieChartWidgetConfigForm.get('legendLabelFont').enable();
+      this.pieChartWidgetConfigForm.get('legendLabelColor').enable();
+      this.pieChartWidgetConfigForm.get('legendValueFont').enable();
+      this.pieChartWidgetConfigForm.get('legendValueColor').enable();
+    } else {
+      this.pieChartWidgetConfigForm.get('legendPosition').disable();
+      this.pieChartWidgetConfigForm.get('legendLabelFont').disable();
+      this.pieChartWidgetConfigForm.get('legendLabelColor').disable();
+      this.pieChartWidgetConfigForm.get('legendValueFont').disable();
+      this.pieChartWidgetConfigForm.get('legendValueColor').disable();
+    }
+    if (showTooltip) {
+      this.pieChartWidgetConfigForm.get('tooltipValueType').enable();
+      this.pieChartWidgetConfigForm.get('tooltipValueDecimals').enable();
+      this.pieChartWidgetConfigForm.get('tooltipValueFont').enable();
+      this.pieChartWidgetConfigForm.get('tooltipValueColor').enable();
+      this.pieChartWidgetConfigForm.get('tooltipBackgroundColor').enable();
+      this.pieChartWidgetConfigForm.get('tooltipBackgroundBlur').enable();
+    } else {
+      this.pieChartWidgetConfigForm.get('tooltipValueType').disable();
+      this.pieChartWidgetConfigForm.get('tooltipValueDecimals').disable();
+      this.pieChartWidgetConfigForm.get('tooltipValueFont').disable();
+      this.pieChartWidgetConfigForm.get('tooltipValueColor').disable();
+      this.pieChartWidgetConfigForm.get('tooltipBackgroundColor').disable();
+      this.pieChartWidgetConfigForm.get('tooltipBackgroundBlur').disable();
+    }
+  }
+
+  private getSeries(datasources?: Datasource[]): DataKey[] {
+    if (datasources && datasources.length) {
+      return datasources[0].dataKeys || [];
+    }
+    return [];
+  }
+
+  private setSeries(series: DataKey[], datasources?: Datasource[]) {
+    if (datasources && datasources.length) {
+      datasources[0].dataKeys = series;
+    }
+  }
+
+  private getCardButtons(config: WidgetConfig): string[] {
+    const buttons: string[] = [];
+    if (isUndefined(config.enableFullscreen) || config.enableFullscreen) {
+      buttons.push('fullscreen');
+    }
+    return buttons;
+  }
+
+  private setCardButtons(buttons: string[], config: WidgetConfig) {
+    config.enableFullscreen = buttons.includes('fullscreen');
+  }
+
+  private _valuePreviewFn(): string {
+    const units: string = this.pieChartWidgetConfigForm.get('units').value;
+    const decimals: number = this.pieChartWidgetConfigForm.get('decimals').value;
+    return formatValue(110, decimals, units, false);
+  }
+
+  private _tooltipValuePreviewFn(): string {
+    const tooltipValueType: LatestChartTooltipValueType = this.pieChartWidgetConfigForm.get('tooltipValueType').value;
+    const decimals: number = this.pieChartWidgetConfigForm.get('tooltipValueDecimals').value;
+    if (tooltipValueType === LatestChartTooltipValueType.percentage) {
+      return formatValue(35, decimals, '%', false);
+    } else {
+      const units: string = this.pieChartWidgetConfigForm.get('units').value;
+      return formatValue(110, decimals, units, false);
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html
index 5be56204fa..913974c313 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html
@@ -75,6 +75,24 @@
         {{ 'widgets.range-chart.data-zoom' | translate }}
       </mat-slide-toggle>
     </div>
+    <tb-time-series-chart-grid-settings
+        formControlName="grid">
+    </tb-time-series-chart-grid-settings>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.range-chart.range-chart-appearance</div>
+    <div class="tb-form-row space-between">
+      <div translate>widget-config.units-short</div>
+      <tb-unit-input
+          formControlName="units">
+      </tb-unit-input>
+    </div>
+    <div class="tb-form-row space-between">
+      <div translate>widget-config.decimals-short</div>
+      <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+        <input matInput formControlName="decimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
     <div class="tb-form-row space-between">
       <div>{{ 'widgets.range-chart.range-colors' | translate }}</div>
       <tb-color-range-settings formControlName="rangeColors">
@@ -87,24 +105,155 @@
                       formControlName="outOfRangeColor">
       </tb-color-input>
     </div>
+    <div class="tb-form-row space-between">
+      <mat-slide-toggle class="mat-slide" formControlName="showRangeThresholds">
+        {{ 'widgets.range-chart.show-range-thresholds' | translate }}
+      </mat-slide-toggle>
+      <tb-time-series-chart-threshold-settings
+          boxButton
+          hideYAxis
+          [widgetConfig]="widgetConfig?.config"
+          title="widgets.range-chart.range-thresholds-settings"
+          formControlName="rangeThreshold">
+      </tb-time-series-chart-threshold-settings>
+    </div>
     <div class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="fillArea">
         {{ 'widgets.range-chart.fill-area' | translate }}
       </mat-slide-toggle>
     </div>
-    <div class="tb-form-row space-between">
-      <div translate>widget-config.units-short</div>
-      <tb-unit-input
-        formControlName="units">
-      </tb-unit-input>
-    </div>
-    <div class="tb-form-row space-between">
-      <div translate>widget-config.decimals-short</div>
-      <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
-        <input matInput formControlName="decimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+    <div class="tb-form-row space-between column-xs">
+      <div translate>widgets.range-chart.fill-area-opacity</div>
+      <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+        <input matInput type="number" formControlName="fillAreaOpacity" min="0" max="1"
+               step="0.1" placeholder="{{ 'widget-config.set' | translate }}"/>
       </mat-form-field>
+    </div>
+    <div class="tb-form-panel stroked">
+      <div class="tb-form-panel-title" translate>widgets.time-series-chart.series.line.line</div>
+      <div class="tb-form-row">
+        <mat-slide-toggle class="mat-slide" formControlName="showLine">
+          {{ 'widgets.time-series-chart.series.line.show-line' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <mat-slide-toggle class="mat-slide" formControlName="step">
+          {{ 'widgets.time-series-chart.series.line.step-line' | translate }}
+        </mat-slide-toggle>
+        <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+          <mat-select formControlName="stepType">
+            <mat-option *ngFor="let stepType of lineSeriesStepTypes" [value]="stepType">
+              {{ lineSeriesStepTypeTranslations.get(stepType) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div class="tb-form-row">
+        <mat-slide-toggle class="mat-slide" formControlName="smooth">
+          {{ 'widgets.time-series-chart.series.line.smooth-line' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.time-series-chart.line-type</div>
+        <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+          <mat-select formControlName="lineType">
+            <mat-option *ngFor="let lineType of timeSeriesLineTypes" [value]="lineType">
+              {{ timeSeriesLineTypeTranslations.get(lineType) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.time-series-chart.line-width</div>
+        <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+          <input matInput type="number" formControlName="lineWidth" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
+        </mat-form-field>
+      </div>
+    </div>
+    <div class="tb-form-panel stroked">
+      <div class="tb-form-panel-title" translate>widgets.time-series-chart.series.point.points</div>
+      <div class="tb-form-row">
+        <mat-slide-toggle class="mat-slide" formControlName="showPoints">
+          {{ 'widgets.time-series-chart.series.point.show-points' | translate }}
+        </mat-slide-toggle>
       </div>
+      <div class="tb-form-row space-between column-lt-md">
+        <mat-slide-toggle class="mat-slide" formControlName="showPointLabel">
+          <div tb-hint-tooltip-icon="{{'widgets.time-series-chart.series.point.point-label-hint' | translate}}">
+            {{ 'widgets.time-series-chart.series.point.point-label' | translate }}
+          </div>
+        </mat-slide-toggle>
+        <div fxLayout="row" fxFlex.lt-md fxLayoutAlign="start center" fxLayoutGap="8px">
+          <mat-form-field class="medium-width" fxFlex.lt-md appearance="outline" subscriptSizing="dynamic">
+            <mat-select formControlName="pointLabelPosition">
+              <mat-option *ngFor="let position of seriesLabelPositions" [value]="position">
+                {{ seriesLabelPositionTranslations.get(position) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <tb-font-settings formControlName="pointLabelFont"
+                            clearButton
+                            disabledLineHeight
+                            forceSizeUnit="px"
+                            [previewText]="pointLabelPreviewFn">
+          </tb-font-settings>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="pointLabelColor">
+          </tb-color-input>
+        </div>
+      </div>
+      <div class="tb-form-row space-between">
+        <mat-slide-toggle class="mat-slide" formControlName="enablePointLabelBackground">
+          {{ 'widgets.time-series-chart.series.point.point-label-background' | translate }}
+        </mat-slide-toggle>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="pointLabelBackground">
+        </tb-color-input>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.time-series-chart.series.point.point-shape</div>
+        <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+          <mat-select formControlName="pointShape">
+            <mat-option *ngFor="let shape of echartsShapes" [value]="shape">
+              {{ echartsShapeTranslations.get(shape) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.time-series-chart.series.point.point-size</div>
+        <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+          <input matInput type="number" formControlName="pointSize" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
+        </mat-form-field>
+      </div>
+    </div>
   </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.time-series-chart.axis.y-axis</div>
+    <tb-time-series-chart-axis-settings
+        formControlName="yAxis"
+        axisType="yAxis"
+        hideUnits
+        hideDecimals>
+    </tb-time-series-chart-axis-settings>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.time-series-chart.axis.x-axis</div>
+    <tb-time-series-chart-axis-settings
+        formControlName="xAxis"
+        axisType="xAxis">
+    </tb-time-series-chart-axis-settings>
+  </div>
+  <tb-time-series-chart-thresholds-panel
+      formControlName="thresholds"
+      [aliasController]="aliasController"
+      [dataKeyCallbacks]="callbacks"
+      [datasource]="datasource"
+      [widgetConfig]="widgetConfig?.config"
+      hideYAxis>
+  </tb-time-series-chart-thresholds-panel>
   <div class="tb-form-panel tb-slide-toggle">
     <mat-expansion-panel class="tb-settings" [expanded]="rangeChartWidgetConfigForm.get('showLegend').value" [disabled]="!rangeChartWidgetConfigForm.get('showLegend').value">
       <mat-expansion-panel-header fxLayout="row wrap">
@@ -152,10 +301,24 @@
         </mat-panel-title>
       </mat-expansion-panel-header>
       <ng-template matExpansionPanelContent>
+        <div class="tb-form-row space-between">
+          <div>{{ 'tooltip.label' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <tb-font-settings formControlName="tooltipLabelFont"
+                              [initialPreviewStyle]="{ color: rangeChartWidgetConfigForm.get('tooltipLabelColor').value }"
+                              previewText="Temperature">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="tooltipLabelColor">
+            </tb-color-input>
+          </div>
+        </div>
         <div class="tb-form-row space-between">
           <div>{{ 'tooltip.value' | translate }}</div>
           <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
             <tb-font-settings formControlName="tooltipValueFont"
+                              [initialPreviewStyle]="{ color: rangeChartWidgetConfigForm.get('tooltipValueColor').value }"
                               [previewText]="tooltipValuePreviewFn">
             </tb-font-settings>
             <tb-color-input asBoxInput
@@ -163,8 +326,7 @@
                             formControlName="tooltipValueColor">
             </tb-color-input>
           </div>
-        </div>
-        <div class="tb-form-row column-xs">
+        </div>        <div class="tb-form-row column-xs">
           <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="tooltipShowDate">
             {{ 'tooltip.date' | translate }}
           </mat-slide-toggle>
@@ -172,6 +334,7 @@
             <tb-date-format-select fxFlex excludeLastUpdateAgo includeAuto
                                    formControlName="tooltipDateFormat"></tb-date-format-select>
             <tb-font-settings formControlName="tooltipDateFont"
+                              [initialPreviewStyle]="{ color: rangeChartWidgetConfigForm.get('tooltipDateColor').value }"
                               [previewText]="tooltipDatePreviewFn">
             </tb-font-settings>
             <tb-color-input asBoxInput
@@ -204,6 +367,9 @@
       </ng-template>
     </mat-expansion-panel>
   </div>
+  <tb-echarts-animation-settings
+      formControlName="animation">
+  </tb-echarts-animation-settings>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
     <div class="tb-form-row space-between">
@@ -223,6 +389,12 @@
         <input matInput formControlName="borderRadius" placeholder="{{ 'widget-config.set' | translate }}">
       </mat-form-field>
     </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widget-config.card-padding' | translate }}</div>
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <input matInput formControlName="padding" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
   </div>
   <tb-widget-actions-panel
     formControlName="actions">
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts
index 0add69096b..1144f0b905 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts
@@ -14,20 +14,26 @@
 /// limitations under the License.
 ///
 
-import { ChangeDetectorRef, Component, Injector } from '@angular/core';
+import { Component, Injector } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { BasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models';
 import { WidgetConfigComponentData } from '@home/models/widget-component.models';
-import { DataKey, legendPositions, legendPositionTranslationMap, WidgetConfig, } from '@shared/models/widget.models';
+import {
+  DataKey,
+  Datasource,
+  legendPositions,
+  legendPositionTranslationMap,
+  WidgetConfig,
+} from '@shared/models/widget.models';
 import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import {
   getTimewindowConfig,
   setTimewindowConfig
 } from '@home/components/widget/config/timewindow-config-panel.component';
-import { formatValue, isUndefined } from '@core/utils';
+import { formatValue, isUndefined, mergeDeep } from '@core/utils';
 import {
   cssSizeToStrSize,
   DateFormatProcessor,
@@ -38,6 +44,15 @@ import {
   rangeChartDefaultSettings,
   RangeChartWidgetSettings
 } from '@home/components/widget/lib/chart/range-chart-widget.models';
+import {
+  lineSeriesStepTypes,
+  lineSeriesStepTypeTranslations,
+  seriesLabelPositions,
+  seriesLabelPositionTranslations,
+  timeSeriesLineTypes,
+  timeSeriesLineTypeTranslations
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { echartsShapes, echartsShapeTranslations } from '@home/components/widget/lib/chart/echarts-widget.models';
 
 @Component({
   selector: 'tb-range-chart-basic-config',
@@ -46,12 +61,39 @@ import {
 })
 export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
 
+  public get datasource(): Datasource {
+    const datasources: Datasource[] = this.rangeChartWidgetConfigForm.get('datasources').value;
+    if (datasources && datasources.length) {
+      return datasources[0];
+    } else {
+      return null;
+    }
+  }
+
+  lineSeriesStepTypes = lineSeriesStepTypes;
+
+  lineSeriesStepTypeTranslations = lineSeriesStepTypeTranslations;
+
+  timeSeriesLineTypes = timeSeriesLineTypes;
+
+  timeSeriesLineTypeTranslations = timeSeriesLineTypeTranslations;
+
+  seriesLabelPositions = seriesLabelPositions;
+
+  seriesLabelPositionTranslations = seriesLabelPositionTranslations;
+
+  echartsShapes = echartsShapes;
+
+  echartsShapeTranslations = echartsShapeTranslations;
+
   legendPositions = legendPositions;
 
   legendPositionTranslationMap = legendPositionTranslationMap;
 
   rangeChartWidgetConfigForm: UntypedFormGroup;
 
+  pointLabelPreviewFn = this._pointLabelPreviewFn.bind(this);
+
   tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
 
   tooltipDatePreviewFn = this._tooltipDatePreviewFn.bind(this);
@@ -72,7 +114,8 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
   }
 
   protected onConfigSet(configData: WidgetConfigComponentData) {
-    const settings: RangeChartWidgetSettings = {...rangeChartDefaultSettings, ...(configData.config.settings || {})};
+    const settings: RangeChartWidgetSettings = mergeDeep<RangeChartWidgetSettings>({} as RangeChartWidgetSettings,
+      rangeChartDefaultSettings, configData.config.settings as RangeChartWidgetSettings);
     const iconSize = resolveCssSize(configData.config.iconSize);
     this.rangeChartWidgetConfigForm = this.fb.group({
       timewindowConfig: [getTimewindowConfig(configData.config), []],
@@ -90,11 +133,41 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
       iconColor: [configData.config.iconColor, []],
 
       dataZoom: [settings.dataZoom, []],
+
+      units: [configData.config.units, []],
+      decimals: [configData.config.decimals, []],
       rangeColors: [settings.rangeColors, []],
       outOfRangeColor: [settings.outOfRangeColor, []],
+      showRangeThresholds: [settings.showRangeThresholds, []],
+      rangeThreshold: [settings.rangeThreshold, []],
       fillArea: [settings.fillArea, []],
-      units: [configData.config.units, []],
-      decimals: [configData.config.decimals, []],
+      fillAreaOpacity: [settings.fillAreaOpacity, [Validators.min(0), Validators.max(1)]],
+
+      showLine: [settings.showLine, []],
+      step: [settings.step, []],
+      stepType: [settings.stepType, []],
+      smooth: [settings.smooth, []],
+      lineType: [settings.lineType, []],
+      lineWidth: [settings.lineWidth, [Validators.min(0)]],
+
+      showPoints: [settings.showPoints, []],
+      showPointLabel: [settings.showPointLabel, []],
+      pointLabelPosition: [settings.pointLabelPosition, []],
+      pointLabelFont: [settings.pointLabelFont, []],
+      pointLabelColor: [settings.pointLabelColor, []],
+      enablePointLabelBackground: [settings.enablePointLabelBackground, []],
+      pointLabelBackground: [settings.pointLabelBackground, []],
+      pointShape: [settings.pointShape, []],
+      pointSize: [settings.pointSize, [Validators.min(0)]],
+
+      grid: [settings.grid, []],
+
+      yAxis: [settings.yAxis, []],
+      xAxis: [settings.xAxis, []],
+
+      thresholds: [settings.thresholds, []],
+
+      animation: [settings.animation, []],
 
       showLegend: [settings.showLegend, []],
       legendPosition: [settings.legendPosition, []],
@@ -102,6 +175,8 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
       legendLabelColor: [settings.legendLabelColor, []],
 
       showTooltip: [settings.showTooltip, []],
+      tooltipLabelFont: [settings.tooltipLabelFont, []],
+      tooltipLabelColor: [settings.tooltipLabelColor, []],
       tooltipValueFont: [settings.tooltipValueFont, []],
       tooltipValueColor: [settings.tooltipValueColor, []],
       tooltipShowDate: [settings.tooltipShowDate, []],
@@ -117,6 +192,7 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
 
       cardButtons: [this.getCardButtons(configData.config), []],
       borderRadius: [configData.config.borderRadius, []],
+      padding: [settings.padding, []],
 
       actions: [configData.config.actions || {}, []]
     });
@@ -138,12 +214,44 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
 
     this.widgetConfig.config.settings = this.widgetConfig.config.settings || {};
 
+
     this.widgetConfig.config.settings.dataZoom = config.dataZoom;
+
+    this.widgetConfig.config.units = config.units;
+    this.widgetConfig.config.decimals = config.decimals;
+
     this.widgetConfig.config.settings.rangeColors = config.rangeColors;
     this.widgetConfig.config.settings.outOfRangeColor = config.outOfRangeColor;
+    this.widgetConfig.config.settings.showRangeThresholds = config.showRangeThresholds;
+    this.widgetConfig.config.settings.rangeThreshold = config.rangeThreshold;
     this.widgetConfig.config.settings.fillArea = config.fillArea;
-    this.widgetConfig.config.units = config.units;
-    this.widgetConfig.config.decimals = config.decimals;
+    this.widgetConfig.config.settings.fillAreaOpacity = config.fillAreaOpacity;
+
+    this.widgetConfig.config.settings.showLine = config.showLine;
+    this.widgetConfig.config.settings.step = config.step;
+    this.widgetConfig.config.settings.stepType = config.stepType;
+    this.widgetConfig.config.settings.smooth = config.smooth;
+    this.widgetConfig.config.settings.lineType = config.lineType;
+    this.widgetConfig.config.settings.lineWidth = config.lineWidth;
+
+    this.widgetConfig.config.settings.showPoints = config.showPoints;
+    this.widgetConfig.config.settings.showPointLabel = config.showPointLabel;
+    this.widgetConfig.config.settings.pointLabelPosition = config.pointLabelPosition;
+    this.widgetConfig.config.settings.pointLabelFont = config.pointLabelFont;
+    this.widgetConfig.config.settings.pointLabelColor = config.pointLabelColor;
+    this.widgetConfig.config.settings.enablePointLabelBackground = config.enablePointLabelBackground;
+    this.widgetConfig.config.settings.pointLabelBackground = config.pointLabelBackground;
+    this.widgetConfig.config.settings.pointShape = config.pointShape;
+    this.widgetConfig.config.settings.pointSize = config.pointSize;
+
+    this.widgetConfig.config.settings.grid = config.grid;
+
+    this.widgetConfig.config.settings.yAxis = config.yAxis;
+    this.widgetConfig.config.settings.xAxis = config.xAxis;
+
+    this.widgetConfig.config.settings.thresholds = config.thresholds;
+
+    this.widgetConfig.config.settings.animation = config.animation;
 
     this.widgetConfig.config.settings.showLegend = config.showLegend;
     this.widgetConfig.config.settings.legendPosition = config.legendPosition;
@@ -151,6 +259,8 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
     this.widgetConfig.config.settings.legendLabelColor = config.legendLabelColor;
 
     this.widgetConfig.config.settings.showTooltip = config.showTooltip;
+    this.widgetConfig.config.settings.tooltipLabelFont = config.tooltipLabelFont;
+    this.widgetConfig.config.settings.tooltipLabelColor = config.tooltipLabelColor;
     this.widgetConfig.config.settings.tooltipValueFont = config.tooltipValueFont;
     this.widgetConfig.config.settings.tooltipValueColor = config.tooltipValueColor;
     this.widgetConfig.config.settings.tooltipShowDate = config.tooltipShowDate;
@@ -165,18 +275,26 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
 
     this.setCardButtons(config.cardButtons, this.widgetConfig.config);
     this.widgetConfig.config.borderRadius = config.borderRadius;
+    this.widgetConfig.config.settings.padding = config.padding;
 
     this.widgetConfig.config.actions = config.actions;
     return this.widgetConfig;
   }
 
   protected validatorTriggers(): string[] {
-    return ['showTitle', 'showIcon', 'showLegend', 'showTooltip', 'tooltipShowDate'];
+    return ['showTitle', 'showIcon', 'showRangeThresholds', 'fillArea', 'showLine',
+      'step', 'showPointLabel', 'enablePointLabelBackground', 'showLegend', 'showTooltip', 'tooltipShowDate'];
   }
 
   protected updateValidators(emitEvent: boolean, trigger?: string) {
     const showTitle: boolean = this.rangeChartWidgetConfigForm.get('showTitle').value;
     const showIcon: boolean = this.rangeChartWidgetConfigForm.get('showIcon').value;
+    const showRangeThresholds: boolean = this.rangeChartWidgetConfigForm.get('showRangeThresholds').value;
+    const fillArea: boolean = this.rangeChartWidgetConfigForm.get('fillArea').value;
+    const showLine: boolean = this.rangeChartWidgetConfigForm.get('showLine').value;
+    const step: boolean = this.rangeChartWidgetConfigForm.get('step').value;
+    const showPointLabel: boolean = this.rangeChartWidgetConfigForm.get('showPointLabel').value;
+    const enablePointLabelBackground: boolean = this.rangeChartWidgetConfigForm.get('enablePointLabelBackground').value;
     const showLegend: boolean = this.rangeChartWidgetConfigForm.get('showLegend').value;
     const showTooltip: boolean = this.rangeChartWidgetConfigForm.get('showTooltip').value;
     const tooltipShowDate: boolean = this.rangeChartWidgetConfigForm.get('tooltipShowDate').value;
@@ -208,6 +326,54 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
       this.rangeChartWidgetConfigForm.get('iconColor').disable();
     }
 
+    if (showRangeThresholds) {
+      this.rangeChartWidgetConfigForm.get('rangeThreshold').enable();
+    } else {
+      this.rangeChartWidgetConfigForm.get('rangeThreshold').disable();
+    }
+
+    if (fillArea) {
+      this.rangeChartWidgetConfigForm.get('fillAreaOpacity').enable();
+    } else {
+      this.rangeChartWidgetConfigForm.get('fillAreaOpacity').disable();
+    }
+
+    if (showLine) {
+      this.rangeChartWidgetConfigForm.get('step').enable({emitEvent: false});
+      if (step) {
+        this.rangeChartWidgetConfigForm.get('stepType').enable();
+        this.rangeChartWidgetConfigForm.get('smooth').disable();
+      } else {
+        this.rangeChartWidgetConfigForm.get('stepType').disable();
+        this.rangeChartWidgetConfigForm.get('smooth').enable();
+      }
+      this.rangeChartWidgetConfigForm.get('lineType').enable();
+      this.rangeChartWidgetConfigForm.get('lineWidth').enable();
+    } else {
+      this.rangeChartWidgetConfigForm.get('step').disable({emitEvent: false});
+      this.rangeChartWidgetConfigForm.get('stepType').disable();
+      this.rangeChartWidgetConfigForm.get('smooth').disable();
+      this.rangeChartWidgetConfigForm.get('lineType').disable();
+      this.rangeChartWidgetConfigForm.get('lineWidth').disable();
+    }
+    if (showPointLabel) {
+      this.rangeChartWidgetConfigForm.get('pointLabelPosition').enable();
+      this.rangeChartWidgetConfigForm.get('pointLabelFont').enable();
+      this.rangeChartWidgetConfigForm.get('pointLabelColor').enable();
+      this.rangeChartWidgetConfigForm.get('enablePointLabelBackground').enable({emitEvent: false});
+      if (enablePointLabelBackground) {
+        this.rangeChartWidgetConfigForm.get('pointLabelBackground').enable();
+      } else {
+        this.rangeChartWidgetConfigForm.get('pointLabelBackground').disable();
+      }
+    } else {
+      this.rangeChartWidgetConfigForm.get('pointLabelPosition').disable();
+      this.rangeChartWidgetConfigForm.get('pointLabelFont').disable();
+      this.rangeChartWidgetConfigForm.get('pointLabelColor').disable();
+      this.rangeChartWidgetConfigForm.get('enablePointLabelBackground').disable({emitEvent: false});
+      this.rangeChartWidgetConfigForm.get('pointLabelBackground').disable();
+    }
+
     if (showLegend) {
       this.rangeChartWidgetConfigForm.get('legendPosition').enable();
       this.rangeChartWidgetConfigForm.get('legendLabelFont').enable();
@@ -219,6 +385,8 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
     }
 
     if (showTooltip) {
+      this.rangeChartWidgetConfigForm.get('tooltipLabelFont').enable();
+      this.rangeChartWidgetConfigForm.get('tooltipLabelColor').enable();
       this.rangeChartWidgetConfigForm.get('tooltipValueFont').enable();
       this.rangeChartWidgetConfigForm.get('tooltipValueColor').enable();
       this.rangeChartWidgetConfigForm.get('tooltipShowDate').enable({emitEvent: false});
@@ -236,6 +404,8 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
         this.rangeChartWidgetConfigForm.get('tooltipDateInterval').disable();
       }
     } else {
+      this.rangeChartWidgetConfigForm.get('tooltipLabelFont').disable();
+      this.rangeChartWidgetConfigForm.get('tooltipLabelColor').disable();
       this.rangeChartWidgetConfigForm.get('tooltipValueFont').disable();
       this.rangeChartWidgetConfigForm.get('tooltipValueColor').disable();
       this.rangeChartWidgetConfigForm.get('tooltipShowDate').disable({emitEvent: false});
@@ -260,6 +430,12 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
     config.enableFullscreen = buttons.includes('fullscreen');
   }
 
+  private _pointLabelPreviewFn(): string {
+    const units: string = this.rangeChartWidgetConfigForm.get('units').value;
+    const decimals: number = this.rangeChartWidgetConfigForm.get('decimals').value;
+    return formatValue(22, decimals, units, false);
+  }
+
   private _tooltipValuePreviewFn(): string {
     const units: string = this.rangeChartWidgetConfigForm.get('units').value;
     const decimals: number = this.rangeChartWidgetConfigForm.get('decimals').value;
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
index 94866da201..f8e72b5676 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
@@ -25,22 +25,81 @@
       forceSingleDatasource
       formControlName="datasources">
   </tb-datasources>
-  <tb-data-keys-panel
-      panelTitle="{{ 'widgets.chart.series' | translate }}"
-      addKeyTitle="{{ 'widgets.chart.add-series' | translate }}"
-      keySettingsTitle="{{ 'widgets.chart.series-settings' | translate }}"
-      removeKeyTitle="{{ 'widgets.chart.remove-series' | translate }}"
-      noKeysText="{{ 'widgets.chart.no-series' | translate }}"
-      requiredKeysText="{{ 'widgets.chart.no-series-error' | translate }}"
-      timeSeriesChart
-      [yAxisIds]="yAxisIds"
-      [showTimeSeriesType]="chartType === TimeSeriesChartType.default"
-      hideSourceSelection
-      [datasourceType]="datasource?.type"
-      [deviceId]="datasource?.deviceId"
-      [entityAliasId]="datasource?.entityAliasId"
-      formControlName="series">
-  </tb-data-keys-panel>
+  <div class="tb-form-panel">
+    <div fxLayout="row" fxLayoutAlign="space-between center">
+      <div class="tb-form-panel-title">{{ 'widgets.chart.series' | translate }}</div>
+      <tb-toggle-select [ngModel]="seriesMode" (ngModelChange)="seriesModeChange($event)"
+                        [ngModelOptions]="{ standalone: true }">
+        <tb-toggle-option value="series">{{ 'widgets.chart.series' | translate }}</tb-toggle-option>
+        <tb-toggle-option value="comparison">{{ 'widgets.time-series-chart.comparison.comparison' | translate }}</tb-toggle-option>
+      </tb-toggle-select>
+    </div>
+    <tb-data-keys-panel
+        *ngIf="seriesMode === 'series'"
+        hidePanel
+        panelTitle="{{ 'widgets.chart.series' | translate }}"
+        addKeyTitle="{{ 'widgets.chart.add-series' | translate }}"
+        keySettingsTitle="{{ 'widgets.chart.series-settings' | translate }}"
+        removeKeyTitle="{{ 'widgets.chart.remove-series' | translate }}"
+        noKeysText="{{ 'widgets.chart.no-series' | translate }}"
+        requiredKeysText="{{ 'widgets.chart.no-series-error' | translate }}"
+        timeSeriesChart
+        [yAxisIds]="yAxisIds"
+        [showTimeSeriesType]="chartType === TimeSeriesChartType.default"
+        hideSourceSelection
+        [datasourceType]="datasource?.type"
+        [deviceId]="datasource?.deviceId"
+        [entityAliasId]="datasource?.entityAliasId"
+        formControlName="series">
+    </tb-data-keys-panel>
+    <div *ngIf="seriesMode === 'comparison'" class="tb-form-row no-border no-padding column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="comparisonEnabled">
+        {{ 'widgets.time-series-chart.comparison.comparison' | translate }}
+      </mat-slide-toggle>
+      <div fxFlex fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
+          <mat-select formControlName="timeForComparison">
+            <mat-option [value]="'previousInterval'">
+              {{ 'widgets.chart.time-for-comparison-previous-interval' | translate }}
+            </mat-option>
+            <mat-option [value]="'days'">
+              {{ 'widgets.chart.time-for-comparison-days' | translate }}
+            </mat-option>
+            <mat-option [value]="'weeks'">
+              {{ 'widgets.chart.time-for-comparison-weeks' | translate }}
+            </mat-option>
+            <mat-option [value]="'months'">
+              {{ 'widgets.chart.time-for-comparison-months' | translate }}
+            </mat-option>
+            <mat-option [value]="'years'">
+              {{ 'widgets.chart.time-for-comparison-years' | translate }}
+            </mat-option>
+            <mat-option [value]="'customInterval'">
+              {{ 'widgets.chart.time-for-comparison-custom-interval' | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-form-field [fxShow]="timeSeriesChartWidgetConfigForm.get('timeForComparison').value === 'customInterval'"
+                        appearance="outline" class="number flex-lt-md" subscriptSizing="dynamic">
+          <input matInput formControlName="comparisonCustomIntervalValue" type="number" min="0" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+        <tb-time-series-chart-axis-settings-button
+            axisType="xAxis"
+            panelTitle="{{ 'widgets.time-series-chart.axis.comparison-x-axis-settings' | translate }}"
+            formControlName="comparisonXAxis">
+        </tb-time-series-chart-axis-settings-button>
+      </div>
+    </div>
+    <tb-comparison-keys-table
+        *ngIf="seriesMode === 'comparison'"
+        [datasourceType]="datasource?.type"
+        formControlName="series">
+    </tb-comparison-keys-table>
+  </div>
+  <tb-time-series-chart-states-panel
+      *ngIf="chartType === TimeSeriesChartType.state"
+      formControlName="states">
+  </tb-time-series-chart-states-panel>
   <tb-time-series-chart-y-axes-panel
     formControlName="yAxes"
     (axisRemoved)="yAxisRemoved($event)">
@@ -102,6 +161,9 @@
         {{ 'widgets.time-series-chart.data-zoom' | translate }}
       </mat-slide-toggle>
     </div>
+    <tb-time-series-chart-grid-settings
+        formControlName="grid">
+    </tb-time-series-chart-grid-settings>
     <div class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="stack">
         <div tb-hint-tooltip-icon="{{'widgets.time-series-chart.stack-mode-hint' | translate}}">
@@ -137,6 +199,7 @@
           <div>{{ 'legend.label' | translate }}</div>
           <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
             <tb-font-settings formControlName="legendLabelFont"
+                              [initialPreviewStyle]="{color: timeSeriesChartWidgetConfigForm.get('legendLabelColor').value}"
                               previewText="Temperature">
             </tb-font-settings>
             <tb-color-input asBoxInput
@@ -145,6 +208,32 @@
             </tb-color-input>
           </div>
         </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'legend.value' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <tb-font-settings formControlName="legendValueFont"
+                              [initialPreviewStyle]="{color: timeSeriesChartWidgetConfigForm.get('legendValueColor').value}"
+                              previewText="22 °C">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="legendValueColor">
+            </tb-color-input>
+          </div>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'legend.column-title' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <tb-font-settings formControlName="legendColumnTitleFont"
+                              [initialPreviewStyle]="{color: timeSeriesChartWidgetConfigForm.get('legendColumnTitleColor').value}"
+                              previewText="{{ 'legend.Avg' | translate }}">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="legendColumnTitleColor">
+            </tb-color-input>
+          </div>
+        </div>
         <tb-legend-config hideDirection
                           formControlName="legendConfig">
         </tb-legend-config>
@@ -172,10 +261,24 @@
                              [value]="EChartsTooltipTrigger.axis">{{ 'tooltip.trigger-axis' | translate }}</mat-chip-option>
           </mat-chip-listbox>
         </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'tooltip.label' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <tb-font-settings formControlName="tooltipLabelFont"
+                              [initialPreviewStyle]="{ color: timeSeriesChartWidgetConfigForm.get('tooltipLabelColor').value }"
+                              previewText="Temperature">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="tooltipLabelColor">
+            </tb-color-input>
+          </div>
+        </div>
         <div class="tb-form-row space-between">
           <div>{{ 'tooltip.value' | translate }}</div>
           <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
             <tb-font-settings formControlName="tooltipValueFont"
+                              [initialPreviewStyle]="{ color: timeSeriesChartWidgetConfigForm.get('tooltipValueColor').value }"
                               [previewText]="tooltipValuePreviewFn">
             </tb-font-settings>
             <tb-color-input asBoxInput
@@ -192,6 +295,7 @@
             <tb-date-format-select fxFlex excludeLastUpdateAgo includeAuto
                                    formControlName="tooltipDateFormat"></tb-date-format-select>
             <tb-font-settings formControlName="tooltipDateFont"
+                              [initialPreviewStyle]="{ color: timeSeriesChartWidgetConfigForm.get('tooltipDateColor').value }"
                               [previewText]="tooltipDatePreviewFn">
             </tb-font-settings>
             <tb-color-input asBoxInput
@@ -224,9 +328,9 @@
       </ng-template>
     </mat-expansion-panel>
   </div>
-  <tb-time-series-chart-animation-settings
+  <tb-echarts-animation-settings
     formControlName="animation">
-  </tb-time-series-chart-animation-settings>
+  </tb-echarts-animation-settings>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
     <div class="tb-form-row space-between">
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.ts
index 31dca75c7e..f32f35d47e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.ts
@@ -23,6 +23,7 @@ import { WidgetConfigComponentData } from '@home/models/widget-component.models'
 import {
   DataKey,
   Datasource,
+  DatasourceType,
   legendPositions,
   legendPositionTranslationMap,
   WidgetConfig,
@@ -46,8 +47,9 @@ import {
 } from '@home/components/widget/lib/chart/time-series-chart-widget.models';
 import { EChartsTooltipTrigger } from '@home/components/widget/lib/chart/echarts-widget.models';
 import {
-  TimeSeriesChartKeySettings, TimeSeriesChartThreshold,
-  TimeSeriesChartType, TimeSeriesChartYAxes,
+  TimeSeriesChartKeySettings,
+  TimeSeriesChartType,
+  TimeSeriesChartYAxes,
   TimeSeriesChartYAxisId
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 
@@ -88,6 +90,8 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
 
   chartType: TimeSeriesChartType = TimeSeriesChartType.default;
 
+  seriesMode = 'series';
+
   constructor(protected store: Store<AppState>,
               protected widgetConfigComponent: WidgetConfigComponent,
               private $injector: Injector,
@@ -104,6 +108,11 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
     }
   }
 
+  seriesModeChange(seriesMode: string) {
+    this.seriesMode = seriesMode;
+    this.updateSeriesState();
+  }
+
   protected configForm(): UntypedFormGroup {
     return this.timeSeriesChartWidgetConfigForm;
   }
@@ -130,6 +139,12 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
 
       yAxes: [settings.yAxes, []],
       series: [this.getSeries(configData.config.datasources), []],
+
+      comparisonEnabled: [settings.comparisonEnabled, []],
+      timeForComparison: [settings.timeForComparison, []],
+      comparisonCustomIntervalValue: [settings.comparisonCustomIntervalValue, [Validators.min(0)]],
+      comparisonXAxis: [settings.comparisonXAxis, []],
+
       thresholds: [settings.thresholds, []],
 
       showTitle: [configData.config.showTitle, []],
@@ -146,17 +161,25 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
       dataZoom: [settings.dataZoom, []],
       stack: [settings.stack, []],
 
+      grid: [settings.grid, []],
+
       xAxis: [settings.xAxis, []],
 
       noAggregationBarWidthSettings: [settings.noAggregationBarWidthSettings, []],
 
       showLegend: [settings.showLegend, []],
+      legendColumnTitleFont: [settings.legendColumnTitleFont, []],
+      legendColumnTitleColor: [settings.legendColumnTitleColor, []],
       legendLabelFont: [settings.legendLabelFont, []],
       legendLabelColor: [settings.legendLabelColor, []],
+      legendValueFont: [settings.legendValueFont, []],
+      legendValueColor: [settings.legendValueColor, []],
       legendConfig: [settings.legendConfig, []],
 
       showTooltip: [settings.showTooltip, []],
       tooltipTrigger: [settings.tooltipTrigger, []],
+      tooltipLabelFont: [settings.tooltipLabelFont, []],
+      tooltipLabelColor: [settings.tooltipLabelColor, []],
       tooltipValueFont: [settings.tooltipValueFont, []],
       tooltipValueColor: [settings.tooltipValueColor, []],
       tooltipShowDate: [settings.tooltipShowDate, []],
@@ -178,6 +201,10 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
 
       actions: [configData.config.actions || {}, []]
     });
+    if (this.chartType === TimeSeriesChartType.state) {
+      this.timeSeriesChartWidgetConfigForm.addControl('states', this.fb.control(settings.states, []));
+    }
+    this.timeSeriesChartWidgetConfigForm.get('comparisonEnabled').valueChanges.subscribe(() => this.updateSeriesState());
   }
 
   protected prepareOutputConfig(config: any): WidgetConfigComponentData {
@@ -197,23 +224,36 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
 
     this.widgetConfig.config.settings = this.widgetConfig.config.settings || {};
 
+    this.widgetConfig.config.settings.comparisonEnabled = config.comparisonEnabled;
+    this.widgetConfig.config.settings.timeForComparison = config.timeForComparison;
+    this.widgetConfig.config.settings.comparisonCustomIntervalValue = config.comparisonCustomIntervalValue;
+    this.widgetConfig.config.settings.comparisonXAxis = config.comparisonXAxis;
+
     this.widgetConfig.config.settings.thresholds = config.thresholds;
 
     this.widgetConfig.config.settings.dataZoom = config.dataZoom;
     this.widgetConfig.config.settings.stack = config.stack;
 
+    this.widgetConfig.config.settings.grid = config.grid;
+
     this.widgetConfig.config.settings.yAxes = config.yAxes;
     this.widgetConfig.config.settings.xAxis = config.xAxis;
 
     this.widgetConfig.config.settings.noAggregationBarWidthSettings = config.noAggregationBarWidthSettings;
 
     this.widgetConfig.config.settings.showLegend = config.showLegend;
+    this.widgetConfig.config.settings.legendColumnTitleFont = config.legendColumnTitleFont;
+    this.widgetConfig.config.settings.legendColumnTitleColor = config.legendColumnTitleColor;
     this.widgetConfig.config.settings.legendLabelFont = config.legendLabelFont;
     this.widgetConfig.config.settings.legendLabelColor = config.legendLabelColor;
+    this.widgetConfig.config.settings.legendValueFont = config.legendValueFont;
+    this.widgetConfig.config.settings.legendValueColor = config.legendValueColor;
     this.widgetConfig.config.settings.legendConfig = config.legendConfig;
 
     this.widgetConfig.config.settings.showTooltip = config.showTooltip;
     this.widgetConfig.config.settings.tooltipTrigger = config.tooltipTrigger;
+    this.widgetConfig.config.settings.tooltipLabelFont = config.tooltipLabelFont;
+    this.widgetConfig.config.settings.tooltipLabelColor = config.tooltipLabelColor;
     this.widgetConfig.config.settings.tooltipValueFont = config.tooltipValueFont;
     this.widgetConfig.config.settings.tooltipValueColor = config.tooltipValueColor;
     this.widgetConfig.config.settings.tooltipShowDate = config.tooltipShowDate;
@@ -233,20 +273,35 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
     this.widgetConfig.config.settings.padding = config.padding;
 
     this.widgetConfig.config.actions = config.actions;
+
+    if (this.chartType === TimeSeriesChartType.state) {
+      this.widgetConfig.config.settings.states = config.states;
+    }
     return this.widgetConfig;
   }
 
   protected validatorTriggers(): string[] {
-    return ['showTitle', 'showIcon', 'showLegend', 'showTooltip', 'tooltipShowDate'];
+    return ['comparisonEnabled', 'showTitle', 'showIcon', 'showLegend', 'showTooltip', 'tooltipShowDate'];
   }
 
   protected updateValidators(emitEvent: boolean, trigger?: string) {
+    const comparisonEnabled: boolean = this.timeSeriesChartWidgetConfigForm.get('comparisonEnabled').value;
     const showTitle: boolean = this.timeSeriesChartWidgetConfigForm.get('showTitle').value;
     const showIcon: boolean = this.timeSeriesChartWidgetConfigForm.get('showIcon').value;
     const showLegend: boolean = this.timeSeriesChartWidgetConfigForm.get('showLegend').value;
     const showTooltip: boolean = this.timeSeriesChartWidgetConfigForm.get('showTooltip').value;
     const tooltipShowDate: boolean = this.timeSeriesChartWidgetConfigForm.get('tooltipShowDate').value;
 
+    if (comparisonEnabled) {
+      this.timeSeriesChartWidgetConfigForm.get('timeForComparison').enable();
+      this.timeSeriesChartWidgetConfigForm.get('comparisonCustomIntervalValue').enable();
+      this.timeSeriesChartWidgetConfigForm.get('comparisonXAxis').enable();
+    } else {
+      this.timeSeriesChartWidgetConfigForm.get('timeForComparison').disable();
+      this.timeSeriesChartWidgetConfigForm.get('comparisonCustomIntervalValue').disable();
+      this.timeSeriesChartWidgetConfigForm.get('comparisonXAxis').disable();
+    }
+
     if (showTitle) {
       this.timeSeriesChartWidgetConfigForm.get('title').enable();
       this.timeSeriesChartWidgetConfigForm.get('titleFont').enable();
@@ -275,17 +330,27 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
     }
 
     if (showLegend) {
+      this.timeSeriesChartWidgetConfigForm.get('legendColumnTitleFont').enable();
+      this.timeSeriesChartWidgetConfigForm.get('legendColumnTitleColor').enable();
       this.timeSeriesChartWidgetConfigForm.get('legendLabelFont').enable();
       this.timeSeriesChartWidgetConfigForm.get('legendLabelColor').enable();
+      this.timeSeriesChartWidgetConfigForm.get('legendValueFont').enable();
+      this.timeSeriesChartWidgetConfigForm.get('legendValueColor').enable();
       this.timeSeriesChartWidgetConfigForm.get('legendConfig').enable();
     } else {
+      this.timeSeriesChartWidgetConfigForm.get('legendColumnTitleFont').disable();
+      this.timeSeriesChartWidgetConfigForm.get('legendColumnTitleColor').disable();
       this.timeSeriesChartWidgetConfigForm.get('legendLabelFont').disable();
       this.timeSeriesChartWidgetConfigForm.get('legendLabelColor').disable();
+      this.timeSeriesChartWidgetConfigForm.get('legendValueFont').disable();
+      this.timeSeriesChartWidgetConfigForm.get('legendValueColor').disable();
       this.timeSeriesChartWidgetConfigForm.get('legendConfig').disable();
     }
 
     if (showTooltip) {
       this.timeSeriesChartWidgetConfigForm.get('tooltipTrigger').enable();
+      this.timeSeriesChartWidgetConfigForm.get('tooltipLabelFont').enable();
+      this.timeSeriesChartWidgetConfigForm.get('tooltipLabelColor').enable();
       this.timeSeriesChartWidgetConfigForm.get('tooltipValueFont').enable();
       this.timeSeriesChartWidgetConfigForm.get('tooltipValueColor').enable();
       this.timeSeriesChartWidgetConfigForm.get('tooltipShowDate').enable({emitEvent: false});
@@ -303,6 +368,9 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
         this.timeSeriesChartWidgetConfigForm.get('tooltipDateInterval').disable();
       }
     } else {
+      this.timeSeriesChartWidgetConfigForm.get('tooltipTrigger').disable();
+      this.timeSeriesChartWidgetConfigForm.get('tooltipLabelFont').disable();
+      this.timeSeriesChartWidgetConfigForm.get('tooltipLabelColor').disable();
       this.timeSeriesChartWidgetConfigForm.get('tooltipValueFont').disable();
       this.timeSeriesChartWidgetConfigForm.get('tooltipValueColor').disable();
       this.timeSeriesChartWidgetConfigForm.get('tooltipShowDate').disable({emitEvent: false});
@@ -328,6 +396,19 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
     }
   }
 
+  private updateSeriesState() {
+    if (this.seriesMode === 'series') {
+      this.timeSeriesChartWidgetConfigForm.get('series').enable({emitEvent: false});
+    } else {
+      const comparisonEnabled = this.timeSeriesChartWidgetConfigForm.get('comparisonEnabled').value;
+      if (comparisonEnabled) {
+        this.timeSeriesChartWidgetConfigForm.get('series').enable({emitEvent: false});
+      } else {
+        this.timeSeriesChartWidgetConfigForm.get('series').disable({emitEvent: false});
+      }
+    }
+  }
+
   private removeYaxisId(series: DataKey[], yAxisId: TimeSeriesChartYAxisId): boolean {
     let changed = false;
     if (series) {
@@ -364,4 +445,6 @@ export class TimeSeriesChartBasicConfigComponent extends BasicWidgetConfigCompon
     processor.update(Date.now());
     return processor.formatted;
   }
+
+  protected readonly DatasourceType = DatasourceType;
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-keys-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-keys-panel.component.html
index f140bd7445..59a3bcb3cb 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-keys-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-keys-panel.component.html
@@ -15,8 +15,10 @@
     limitations under the License.
 
 -->
-<div class="tb-form-panel tb-data-keys-panel">
-  <div class="tb-form-panel-title">{{ panelTitle }}</div>
+<div class="tb-form-panel tb-data-keys-panel"
+     [class.no-border]="hidePanel"
+     [class.no-padding]="hidePanel">
+  <div *ngIf="!hidePanel" class="tb-form-panel-title">{{ panelTitle }}</div>
   <div class="tb-form-table">
     <div class="tb-form-table-header no-padding-right">
       <div *ngIf="hasAdditionalLatestDataKeys" class="tb-form-table-header-cell tb-source-header" translate>datakey.source</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-keys-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-keys-panel.component.ts
index 86367771de..67ed19b2d2 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-keys-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/common/data-keys-panel.component.ts
@@ -96,6 +96,10 @@ export class DataKeysPanelComponent implements ControlValueAccessor, OnInit, OnC
   @Input()
   deviceId: string;
 
+  @Input()
+  @coerceBoolean()
+  hidePanel = false;
+
   @Input()
   @coerceBoolean()
   hideDataKeyColor = false;
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/status-widget-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/status-widget-basic-config.component.html
new file mode 100644
index 0000000000..57eb184009
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/status-widget-basic-config.component.html
@@ -0,0 +1,101 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<ng-container [formGroup]="statusWidgetConfigForm">
+  <tb-target-device formControlName="targetDevice"></tb-target-device>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.status-widget.behavior</div>
+    <div class="tb-form-row">
+      <div class="fixed-title-width" tb-hint-tooltip-icon="{{'widgets.rpc-state.initial-state-hint' | translate}}" translate>widgets.rpc-state.initial-state</div>
+      <tb-get-value-action-settings fxFlex
+                                    panelTitle="widgets.rpc-state.initial-state"
+                                    [valueType]="valueType.BOOLEAN"
+                                    trueLabel="widgets.rpc-state.on"
+                                    falseLabel="widgets.rpc-state.off"
+                                    stateLabel="widgets.rpc-state.on"
+                                    [aliasController]="aliasController"
+                                    [targetDevice]="targetDevice"
+                                    [widgetType]="widgetType"
+                                    formControlName="initialState"></tb-get-value-action-settings>
+    </div>
+    <div class="tb-form-row">
+      <div class="fixed-title-width" tb-hint-tooltip-icon="{{'widgets.rpc-state.disabled-state-hint' | translate}}" translate>widgets.rpc-state.disabled-state</div>
+      <tb-get-value-action-settings fxFlex
+                                    panelTitle="widgets.rpc-state.disabled-state"
+                                    [valueType]="valueType.BOOLEAN"
+                                    stateLabel="widgets.rpc-state.disabled"
+                                    [aliasController]="aliasController"
+                                    [targetDevice]="targetDevice"
+                                    [widgetType]="widgetType"
+                                    formControlName="disabledState"></tb-get-value-action-settings>
+    </div>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widget-config.appearance</div>
+    <tb-image-cards-select rowHeight="1:1"
+                           [cols]="{columns: 3,
+                                    breakpoints: {
+                                      'lt-sm': 1,
+                                      'lt-md': 2
+                                    }}"
+                           label="{{ 'widgets.status-widget.layout' | translate }}" formControlName="layout">
+      <tb-image-cards-select-option *ngFor="let layout of statusWidgetLayouts"
+                                    [value]="layout"
+                                    [image]="statusWidgetLayoutImageMap.get(layout)">
+        {{ statusWidgetLayoutTranslationMap.get(layout) | translate }}
+      </tb-image-cards-select-option>
+    </tb-image-cards-select>
+  </div>
+  <div class="tb-form-panel">
+    <div fxLayout="row" fxLayoutAlign="space-between center">
+      <div class="tb-form-panel-title" translate>widget-config.card-style</div>
+      <tb-toggle-select [(ngModel)]="cardStyleMode"
+                        [ngModelOptions]="{ standalone: true }">
+        <tb-toggle-option value="on">{{ 'widgets.status-widget.on' | translate }}</tb-toggle-option>
+        <tb-toggle-option value="off">{{ 'widgets.status-widget.off' | translate }}</tb-toggle-option>
+      </tb-toggle-select>
+    </div>
+    <tb-status-widget-state-settings
+        *ngIf="cardStyleMode === 'on'"
+        [layout]="statusWidgetConfigForm.get('layout').value"
+        formControlName="onState">
+    </tb-status-widget-state-settings>
+    <tb-status-widget-state-settings
+        *ngIf="cardStyleMode === 'off'"
+        [layout]="statusWidgetConfigForm.get('layout').value"
+        formControlName="offState">
+    </tb-status-widget-state-settings>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
+    <div class="tb-form-row space-between column-lt-md">
+      <div translate>widget-config.show-card-buttons</div>
+      <mat-chip-listbox multiple formControlName="cardButtons">
+        <mat-chip-option value="fullscreen">{{ 'fullscreen.fullscreen' | translate }}</mat-chip-option>
+      </mat-chip-listbox>
+    </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widget-config.card-border-radius' | translate }}</div>
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <input matInput formControlName="borderRadius" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+    </div>
+  </div>
+  <tb-widget-actions-panel
+      formControlName="actions">
+  </tb-widget-actions-panel>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/status-widget-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/status-widget-basic-config.component.ts
new file mode 100644
index 0000000000..d2110026f6
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/status-widget-basic-config.component.ts
@@ -0,0 +1,119 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { BasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models';
+import { WidgetConfigComponentData } from '@home/models/widget-component.models';
+import { TargetDevice, WidgetConfig, } from '@shared/models/widget.models';
+import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
+import { isUndefined } from '@core/utils';
+import { ValueType } from '@shared/models/constants';
+import {
+  statusWidgetDefaultSettings,
+  statusWidgetLayoutImages,
+  statusWidgetLayouts,
+  statusWidgetLayoutTranslations,
+  StatusWidgetSettings
+} from '@home/components/widget/lib/indicator/status-widget.models';
+
+@Component({
+  selector: 'tb-status-widget-basic-config',
+  templateUrl: './status-widget-basic-config.component.html',
+  styleUrls: ['../basic-config.scss']
+})
+export class StatusWidgetBasicConfigComponent extends BasicWidgetConfigComponent {
+
+  get targetDevice(): TargetDevice {
+    return this.statusWidgetConfigForm.get('targetDevice').value;
+  }
+
+  statusWidgetLayouts = statusWidgetLayouts;
+
+  statusWidgetLayoutTranslationMap = statusWidgetLayoutTranslations;
+  statusWidgetLayoutImageMap = statusWidgetLayoutImages;
+
+  valueType = ValueType;
+
+  statusWidgetConfigForm: UntypedFormGroup;
+
+  cardStyleMode = 'on';
+
+  constructor(protected store: Store<AppState>,
+              protected widgetConfigComponent: WidgetConfigComponent,
+              private fb: UntypedFormBuilder) {
+    super(store, widgetConfigComponent);
+  }
+
+  protected configForm(): UntypedFormGroup {
+    return this.statusWidgetConfigForm;
+  }
+
+  protected onConfigSet(configData: WidgetConfigComponentData) {
+    const settings: StatusWidgetSettings = {...statusWidgetDefaultSettings, ...(configData.config.settings || {})};
+    this.statusWidgetConfigForm = this.fb.group({
+      targetDevice: [configData.config.targetDevice, []],
+
+      initialState: [settings.initialState, []],
+      disabledState: [settings.disabledState, []],
+
+      layout: [settings.layout, []],
+
+      onState: [settings.onState, []],
+      offState: [settings.offState, []],
+
+      cardButtons: [this.getCardButtons(configData.config), []],
+      borderRadius: [configData.config.borderRadius, []],
+
+      actions: [configData.config.actions || {}, []]
+    });
+  }
+
+  protected prepareOutputConfig(config: any): WidgetConfigComponentData {
+    this.widgetConfig.config.targetDevice = config.targetDevice;
+
+    this.widgetConfig.config.settings = this.widgetConfig.config.settings || {};
+
+    this.widgetConfig.config.settings.initialState = config.initialState;
+    this.widgetConfig.config.settings.disabledState = config.disabledState;
+
+    this.widgetConfig.config.settings.layout = config.layout;
+
+    this.widgetConfig.config.settings.onState = config.onState;
+    this.widgetConfig.config.settings.offState = config.offState;
+
+    this.setCardButtons(config.cardButtons, this.widgetConfig.config);
+    this.widgetConfig.config.borderRadius = config.borderRadius;
+
+    this.widgetConfig.config.actions = config.actions;
+    return this.widgetConfig;
+  }
+
+  private getCardButtons(config: WidgetConfig): string[] {
+    const buttons: string[] = [];
+    if (isUndefined(config.enableFullscreen) || config.enableFullscreen) {
+      buttons.push('fullscreen');
+    }
+    return buttons;
+  }
+
+  private setCardButtons(buttons: string[], config: WidgetConfig) {
+    config.enableFullscreen = buttons.includes('fullscreen');
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/dynamic-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/dynamic-widget.component.ts
index 6cef868e66..d047abdec5 100644
--- a/ui-ngx/src/app/modules/home/components/widget/dynamic-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/dynamic-widget.component.ts
@@ -49,6 +49,7 @@ import { TbInject } from '@shared/decorators/tb-inject';
 import { MillisecondsToTimeStringPipe } from '@shared/pipe/milliseconds-to-time-string.pipe';
 import { UserSettingsService } from '@core/http/user-settings.service';
 import { ImagePipe } from '@shared/pipe/image.pipe';
+import { UtilsService } from '@core/services/utils.service';
 
 @Directive()
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
@@ -86,6 +87,7 @@ export class DynamicWidgetComponent extends PageComponent implements IDynamicWid
     this.ctx.customDialog = $injector.get(CustomDialogService);
     this.ctx.resourceService = $injector.get(ResourceService);
     this.ctx.userSettingsService = $injector.get(UserSettingsService);
+    this.ctx.utilsService = $injector.get(UtilsService);
     this.ctx.telemetryWsService = $injector.get(TelemetryWebsocketService);
     this.ctx.date = $injector.get(DatePipe);
     this.ctx.imagePipe = $injector.get(ImagePipe);
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.html
index 8d660a7884..f48b8def30 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.html
@@ -15,20 +15,21 @@
     limitations under the License.
 
 -->
-<div class="tb-bar-chart-panel" [style]="backgroundStyle$ | async">
+<div class="tb-bar-chart-panel" [style.padding]="padding"
+     [class.overlay]="overlayEnabled" [style]="backgroundStyle$ | async">
   <div class="tb-bar-chart-overlay" [style]="overlayStyle"></div>
   <ng-container *ngTemplateOutlet="widgetTitlePanel"></ng-container>
   <div class="tb-bar-chart-content" [class]="legendClass">
     <div #chartShape class="tb-bar-chart-shape">
     </div>
     <div *ngIf="showLegend" class="tb-bar-chart-legend">
-      <div class="tb-bar-chart-legend-item" *ngFor="let legendItem of legendItems"
-           (mouseenter)="onLegendItemEnter(legendItem)"
-           (mouseleave)="onLegendItemLeave(legendItem)"
-           (click)="toggleLegendItem(legendItem)">
+      <div class="tb-bar-chart-legend-item" *ngFor="let legendKey of legendKeys"
+           (mouseenter)="onLegendKeyEnter(legendKey)"
+           (mouseleave)="onLegendKeyLeave(legendKey)"
+           (click)="toggleLegendKey(legendKey)">
         <div class="tb-bar-chart-legend-item-label">
-          <div class="tb-bar-chart-legend-item-label-circle" [style]="{background: legendItem.enabled ? legendItem.color : null}"></div>
-          <div [style]="legendItem.enabled ? legendLabelStyle : disabledLegendLabelStyle">{{ legendItem.label }}</div>
+          <div class="tb-bar-chart-legend-item-label-circle" [style]="{background: !legendKey.hidden ? legendKey.color : null}"></div>
+          <div [style]="!legendKey.hidden ? legendLabelStyle : disabledLegendLabelStyle">{{ legendKey.label }}</div>
         </div>
       </div>
     </div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.scss
index feb65353f6..ac7229672e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.scss
@@ -19,8 +19,10 @@
   position: relative;
   display: flex;
   flex-direction: column;
-  gap: 16px;
-  padding: 20px 24px 24px 24px;
+  gap: 8px;
+  &.overlay {
+    padding: 20px 24px 24px 24px;
+  }
   > div:not(.tb-bar-chart-overlay) {
     z-index: 1;
   }
@@ -40,7 +42,7 @@
     min-height: 0;
     display: flex;
     flex-direction: column;
-    gap: 16px;
+    gap: 8px;
     &.legend-top {
       flex-direction: column-reverse;
     }
@@ -88,8 +90,9 @@
       }
     }
     &.legend-right, &.legend-left {
-      gap: 24px;
+      gap: 16px;
       .tb-bar-chart-legend {
+        padding-top: 8px;
         flex-direction: column-reverse;
         justify-content: flex-end;
         align-items: stretch;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.ts
index da7f4d4e40..b840f49e3b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.component.ts
@@ -28,45 +28,18 @@ import {
   ViewEncapsulation
 } from '@angular/core';
 import { WidgetContext } from '@home/models/widget-component.models';
-import {
-  backgroundStyle,
-  ComponentStyle,
-  DateFormatProcessor,
-  overlayStyle,
-  textStyle
-} from '@shared/models/widget-settings.models';
-import { ResizeObserver } from '@juggle/resize-observer';
-import { formatValue } from '@core/utils';
+import { backgroundStyle, ComponentStyle, overlayStyle, textStyle } from '@shared/models/widget-settings.models';
 import { Observable } from 'rxjs';
 import { ImagePipe } from '@shared/pipe/image.pipe';
 import { DomSanitizer } from '@angular/platform-browser';
 import {
   barChartWithLabelsDefaultSettings,
+  barChartWithLabelsTimeSeriesKeySettings,
+  barChartWithLabelsTimeSeriesSettings,
   BarChartWithLabelsWidgetSettings
 } from '@home/components/widget/lib/chart/bar-chart-with-labels-widget.models';
-
-import * as echarts from 'echarts/core';
-import { CustomSeriesOption } from 'echarts/charts';
-import { CallbackDataParams, CustomSeriesRenderItem, LabelLayoutOptionCallback } from 'echarts/types/dist/shared';
-
-import {
-  ECharts,
-  echartsModule,
-  EChartsOption,
-  EChartsSeriesItem,
-  echartsTooltipFormatter,
-  toNamedData
-} from '@home/components/widget/lib/chart/echarts-widget.models';
-import { AggregationType, IntervalMath } from '@shared/models/time/time.models';
-
-type BarChartDataItem = EChartsSeriesItem;
-
-interface BarChartLegendItem {
-  id: string;
-  color: string;
-  label: string;
-  enabled: boolean;
-}
+import { TbTimeSeriesChart } from '@home/components/widget/lib/chart/time-series-chart';
+import { DataKey } from '@shared/models/widget.models';
 
 @Component({
   selector: 'tb-bar-chart-with-labels-widget',
@@ -92,30 +65,14 @@ export class BarChartWithLabelsWidgetComponent implements OnInit, OnDestroy, Aft
 
   backgroundStyle$: Observable<ComponentStyle>;
   overlayStyle: ComponentStyle = {};
+  overlayEnabled: boolean;
+  padding: string;
 
-  legendItems: BarChartLegendItem[];
+  legendKeys: DataKey[];
   legendLabelStyle: ComponentStyle;
   disabledLegendLabelStyle: ComponentStyle;
 
-  private get noAggregation(): boolean {
-    return this.ctx.defaultSubscription.timeWindowConfig?.aggregation?.type === AggregationType.NONE;
-  }
-
-  private shapeResize$: ResizeObserver;
-
-  private decimals = 0;
-  private units = '';
-
-  private dataItems: BarChartDataItem[] = [];
-
-  private drawChartPending = false;
-  private barChart: ECharts;
-  private barChartOptions: EChartsOption;
-
-  private tooltipDateFormat: DateFormatProcessor;
-
-  private barRenderItem: CustomSeriesRenderItem;
-  private barLabelLayoutCallback: LabelLayoutOptionCallback;
+  private timeSeriesChart: TbTimeSeriesChart;
 
   constructor(private imagePipe: ImagePipe,
               private sanitizer: DomSanitizer,
@@ -127,355 +84,64 @@ export class BarChartWithLabelsWidgetComponent implements OnInit, OnDestroy, Aft
     this.ctx.$scope.barChartWidget = this;
     this.settings = {...barChartWithLabelsDefaultSettings, ...this.ctx.settings};
 
-    this.decimals = this.ctx.decimals;
-    this.units = this.ctx.units;
-
     this.backgroundStyle$ = backgroundStyle(this.settings.background, this.imagePipe, this.sanitizer);
     this.overlayStyle = overlayStyle(this.settings.background.overlay);
+    this.overlayEnabled = this.settings.background.overlay.enabled;
+    this.padding = this.overlayEnabled ? undefined : this.settings.padding;
 
     this.showLegend = this.settings.showLegend;
 
     if (this.showLegend) {
-      this.legendItems = [];
+      this.legendKeys = [];
       this.legendClass = `legend-${this.settings.legendPosition}`;
       this.legendLabelStyle = textStyle(this.settings.legendLabelFont);
       this.disabledLegendLabelStyle = textStyle(this.settings.legendLabelFont);
       this.legendLabelStyle.color = this.settings.legendLabelColor;
     }
-    let counter = 0;
-    if (this.ctx.datasources.length) {
-      for (const datasource of this.ctx.datasources) {
-        const dataKeys = datasource.dataKeys;
-        for (const dataKey of dataKeys) {
-          const id = counter++;
-          const datasourceData = this.ctx.data ? this.ctx.data.find(d => d.dataKey === dataKey) : null;
-          const namedData = datasourceData?.data ? toNamedData(datasourceData.data) : [];
-          this.dataItems.push({
-            id: id+'',
-            dataKey,
-            data: namedData,
-            enabled: true
-          });
-          if (this.showLegend) {
-            this.legendItems.push(
-              {
-                id: id+'',
-                label: dataKey.label,
-                color: dataKey.color,
-                enabled: true
-              }
-            );
-          }
+    const barSettings = barChartWithLabelsTimeSeriesKeySettings(this.settings, this.ctx.decimals);
+    for (const datasource of this.ctx.datasources) {
+      const dataKeys = datasource.dataKeys;
+      for (const dataKey of dataKeys) {
+        dataKey.settings = barSettings;
+        if (this.showLegend) {
+          this.legendKeys.push(dataKey);
         }
       }
     }
-
-    if (this.settings.showTooltip && this.settings.tooltipShowDate) {
-      this.tooltipDateFormat = DateFormatProcessor.fromSettings(this.ctx.$injector, this.settings.tooltipDateFormat);
-    }
-
-    const barValueStyle: ComponentStyle = textStyle(this.settings.barValueFont);
-    delete barValueStyle.lineHeight;
-    barValueStyle.fontSize = this.settings.barValueFont.size;
-    barValueStyle.fill = this.settings.barValueColor;
-
-    const barLabelStyle: ComponentStyle = textStyle(this.settings.barLabelFont);
-    delete barLabelStyle.lineHeight;
-    barLabelStyle.fontSize = this.settings.barLabelFont.size;
-    barLabelStyle.fill = this.settings.barLabelColor;
-
-    this.barRenderItem = (params, api) => {
-
-      const time = api.value(0) as number;
-      let start = api.value(2) as number;
-      const end = api.value(3) as number;
-      let interval = end - start;
-      if (!start || !end || !interval) {
-        interval = IntervalMath.numberValue(this.ctx.timeWindow.interval);
-        start = time - interval / 2;
-      }
-      const enabledDataItems = this.dataItems.filter(d => d.enabled);
-      const barInterval = interval / (enabledDataItems.length + 1);
-      const intervalGap = barInterval / 2;
-
-      const index = enabledDataItems.findIndex(d => d.id === params.seriesId);
-      const value = api.value(1);
-      const startTime = start + intervalGap + barInterval * index;
-      const delta = barInterval;
-      const lowerLeft = api.coord([startTime, value >= 0 ? value : 0]);
-      const height = api.size([delta, value])[1];
-      const width = api.size([delta, 10])[0];
-
-      const coordSys: {x: number; y: number; width: number; height: number} = params.coordSys as any;
-
-      const rectShape = echarts.graphic.clipRectByRect({
-        x: lowerLeft[0],
-        y: lowerLeft[1],
-        width,
-        height
-      }, {
-        x: coordSys.x,
-        y: coordSys.y,
-        width: coordSys.width,
-        height: coordSys.height
-      });
-
-      const zeroPos = api.coord([0, 0]);
-      const labelParts: string[] = [];
-      if (this.settings.showBarValue) {
-        const labelValue = formatValue(value, this.decimals, '', false);
-        labelParts.push(`{value|${labelValue}}`);
-      }
-      if (this.settings.showBarLabel) {
-        labelParts.push(`{label|${params.seriesName}}`);
-      }
-      const barLabel = labelParts.join(' ');
-      return rectShape && {
-        type: 'rect',
-        id: time + '',
-        shape: rectShape,
-        style: {
-          fill: api.visual('color'),
-          text: barLabel,
-          textPosition: 'insideBottom',
-          textRotation: Math.PI / 2,
-          textDistance: 15,
-          textStrokeWidth: 0,
-          textAlign: 'left',
-          textVerticalAlign: 'middle',
-          rich: {
-            value: barValueStyle,
-            label: barLabelStyle
-          }
-        },
-        focus: 'series',
-        transition: 'all',
-        enterFrom: {
-          style: { opacity: 0 },
-          shape: { height: 0, y: zeroPos[1] }
-        }
-      };
-    };
-
-    this.barLabelLayoutCallback = (params) => {
-      if (params.rect.width - params.labelRect.width < 2) {
-        return {
-          y: '100000%',
-        };
-      } else {
-        return {
-          hideOverlap: true
-        };
-      }
-    };
   }
 
   ngAfterViewInit() {
-    if (this.drawChartPending) {
-      this.drawChart();
-    }
+    const settings = barChartWithLabelsTimeSeriesSettings(this.settings);
+    this.timeSeriesChart = new TbTimeSeriesChart(this.ctx, settings, this.chartShape.nativeElement, this.renderer);
   }
 
   ngOnDestroy() {
-    if (this.shapeResize$) {
-      this.shapeResize$.disconnect();
-    }
-    if (this.barChart) {
-      this.barChart.dispose();
+    if (this.timeSeriesChart) {
+      this.timeSeriesChart.destroy();
     }
   }
 
   public onInit() {
     const borderRadius = this.ctx.$widgetElement.css('borderRadius');
     this.overlayStyle = {...this.overlayStyle, ...{borderRadius}};
-    if (this.chartShape) {
-      this.drawChart();
-    } else {
-      this.drawChartPending = true;
-    }
     this.cd.detectChanges();
   }
 
   public onDataUpdated() {
-    for (const item of this.dataItems) {
-      const datasourceData = this.ctx.data ? this.ctx.data.find(d => d.dataKey === item.dataKey) : null;
-      item.data = datasourceData?.data ? toNamedData(datasourceData.data) : [];
-    }
-    if (this.barChart) {
-      (this.barChartOptions.xAxis as any).min = this.ctx.defaultSubscription.timeWindow.minTime;
-      (this.barChartOptions.xAxis as any).max = this.ctx.defaultSubscription.timeWindow.maxTime;
-      (this.barChartOptions.xAxis as any).tbTimeWindow = this.ctx.defaultSubscription.timeWindow;
-      this.barChartOptions.series = this.updateSeries();
-      this.barChart.setOption(this.barChartOptions);
+    if (this.timeSeriesChart) {
+      this.timeSeriesChart.update();
     }
   }
 
-  private updateSeries(): Array<CustomSeriesOption> {
-    const series: Array<CustomSeriesOption> = [];
-    for (const item of this.dataItems) {
-      if (item.enabled) {
-        const seriesOption: CustomSeriesOption = {
-          type: 'custom',
-          id: item.id,
-          name: item.dataKey.label,
-          color: item.dataKey.color,
-          data: item.data,
-          renderItem: this.barRenderItem,
-          labelLayout: this.barLabelLayoutCallback,
-          dimensions: [
-            {name: 'intervalStart', type: 'number'},
-            {name: 'intervalEnd', type: 'number'}
-          ],
-          encode: {
-            intervalStart: 2,
-            intervalEnd: 3
-          }
-        };
-        series.push(seriesOption);
-      }
-    }
-    return series;
+  public onLegendKeyEnter(key: DataKey) {
+    this.timeSeriesChart.keyEnter(key);
   }
 
-
-  public onLegendItemEnter(item: BarChartLegendItem) {
-    this.barChart.dispatchAction({
-      type: 'highlight',
-      seriesId: item.id
-    });
-  }
-
-  public onLegendItemLeave(item: BarChartLegendItem) {
-    this.barChart.dispatchAction({
-      type: 'downplay',
-      seriesId: item.id
-    });
-  }
-
-  public toggleLegendItem(item: BarChartLegendItem) {
-    const enable = !item.enabled;
-    const dataItem = this.dataItems.find(d => d.id === item.id);
-    if (dataItem) {
-      dataItem.enabled = enable;
-      if (!enable) {
-        this.barChart.dispatchAction({
-          type: 'downplay',
-          seriesId: item.id
-        });
-      }
-      this.barChartOptions.series = this.updateSeries();
-      this.barChart.setOption(this.barChartOptions, {replaceMerge: ['series']});
-      item.enabled = enable;
-      if (enable) {
-        this.barChart.dispatchAction({
-          type: 'highlight',
-          seriesId: item.id
-        });
-      }
-    }
+  public onLegendKeyLeave(key: DataKey) {
+    this.timeSeriesChart.keyLeave(key);
   }
 
-  private drawChart() {
-    echartsModule.init();
-    this.barChart = echarts.init(this.chartShape.nativeElement, null, {
-      renderer: 'canvas',
-    });
-    this.barChartOptions = {
-      tooltip: {
-        trigger: 'axis',
-        confine: true,
-        appendTo: 'body',
-        axisPointer: {
-          type: 'shadow'
-        },
-        formatter: (params: CallbackDataParams[]) => {
-          if (this.settings.showTooltip) {
-            const focusedSeriesIndex = this.focusedSeriesIndex();
-            return echartsTooltipFormatter(this.renderer, this.tooltipDateFormat,
-              this.settings, params, this.decimals, this.units, focusedSeriesIndex, null,
-              this.noAggregation ? null : this.ctx.timeWindow.interval);
-          } else {
-            return undefined;
-          }
-        },
-        padding: [8, 12],
-        backgroundColor: this.settings.tooltipBackgroundColor,
-        borderWidth: 0,
-        extraCssText: `line-height: 1; backdrop-filter: blur(${this.settings.tooltipBackgroundBlur}px);`
-      },
-      grid: {
-        containLabel: true,
-        top: '30',
-        left: 0,
-        right: 0,
-        bottom: 0
-      },
-      xAxis: {
-        type: 'time',
-        scale: true,
-        axisTick: {
-          show: false
-        },
-        axisLabel: {
-          hideOverlap: true,
-          fontSize: 10
-        },
-        axisLine: {
-          onZero: false
-        },
-        min: this.ctx.defaultSubscription.timeWindow.minTime,
-        max: this.ctx.defaultSubscription.timeWindow.maxTime
-      },
-      yAxis: {
-        type: 'value',
-        axisLabel: {
-          formatter: (value: any) => formatValue(value, this.decimals, this.units, false)
-        }
-      }
-    };
-
-    (this.barChartOptions.xAxis as any).tbTimeWindow = this.ctx.defaultSubscription.timeWindow;
-
-    this.barChartOptions.series = this.updateSeries();
-
-    this.barChart.setOption(this.barChartOptions);
-
-    this.shapeResize$ = new ResizeObserver(() => {
-      this.onResize();
-    });
-    this.shapeResize$.observe(this.chartShape.nativeElement);
-    this.onResize();
-  }
-
-  private focusedSeriesIndex(): number {
-    let index = - 1;
-    const views: any[] = (this.barChart as any)._chartsViews;
-    if (views) {
-      const hasBlurredView = !!views.find(view => {
-        const graphicEls: any[] = view._data._graphicEls;
-        return !!graphicEls.find(el => el?.currentStates.includes('blur'));
-      });
-      if (hasBlurredView) {
-        const focusedView = views.find(view => {
-          const graphicEls: any[] = view._data._graphicEls;
-          return !!graphicEls.find(el => !el?.currentStates.includes('blur'));
-        });
-        if (focusedView) {
-          index = !!focusedView._model ?
-            focusedView._model.seriesIndex : (!!focusedView.__model ? focusedView.__model.seriesIndex : -1);
-        }
-      }
-    }
-    return index;
-  }
-
-  private onResize() {
-    const width = this.barChart.getWidth();
-    const height = this.barChart.getHeight();
-    const shapeWidth = this.chartShape.nativeElement.offsetWidth;
-    const shapeHeight = this.chartShape.nativeElement.offsetHeight;
-    if (width !== shapeWidth || height !== shapeHeight) {
-      this.barChart.resize();
-    }
+  public toggleLegendKey(key: DataKey) {
+    this.timeSeriesChart.toggleKey(key);
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts
index 99ea088c92..5351b219a3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-with-labels-widget.models.ts
@@ -14,25 +14,69 @@
 /// limitations under the License.
 ///
 
-import { BackgroundSettings, BackgroundType, customDateFormat, Font } from '@shared/models/widget-settings.models';
+import {
+  BackgroundSettings,
+  BackgroundType,
+  ComponentStyle,
+  customDateFormat,
+  Font,
+  textStyle
+} from '@shared/models/widget-settings.models';
 import { LegendPosition } from '@shared/models/widget.models';
-import { EChartsTooltipWidgetSettings } from '@home/components/widget/lib/chart/echarts-widget.models';
+import {
+  echartsAnimationDefaultSettings,
+  EChartsAnimationSettings,
+  EChartsTooltipWidgetSettings
+} from '@home/components/widget/lib/chart/echarts-widget.models';
+import { DeepPartial } from '@shared/models/common';
+import {
+  defaultTimeSeriesChartXAxisSettings,
+  defaultTimeSeriesChartYAxisSettings,
+  SeriesFillSettings,
+  SeriesFillType,
+  timeSeriesChartGridDefaultSettings,
+  TimeSeriesChartGridSettings,
+  TimeSeriesChartKeySettings,
+  timeSeriesChartNoAggregationBarWidthDefaultSettings,
+  TimeSeriesChartNoAggregationBarWidthSettings,
+  TimeSeriesChartSeriesType,
+  TimeSeriesChartSettings,
+  TimeSeriesChartThreshold,
+  TimeSeriesChartXAxisSettings,
+  TimeSeriesChartYAxisSettings
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { CallbackDataParams, LabelLayoutOptionCallbackParams } from 'echarts/types/dist/shared';
+import { formatValue, mergeDeep } from '@core/utils';
+import { LabelLayoutOption } from 'echarts/types/src/util/types';
 
 export interface BarChartWithLabelsWidgetSettings extends EChartsTooltipWidgetSettings {
+  dataZoom: boolean;
   showBarLabel: boolean;
   barLabelFont: Font;
   barLabelColor: string;
   showBarValue: boolean;
   barValueFont: Font;
   barValueColor: string;
+  showBarBorder: boolean;
+  barBorderWidth: number;
+  barBorderRadius: number;
+  barBackgroundSettings: SeriesFillSettings;
+  noAggregationBarWidthSettings: TimeSeriesChartNoAggregationBarWidthSettings;
+  grid: TimeSeriesChartGridSettings;
+  yAxis: TimeSeriesChartYAxisSettings;
+  xAxis: TimeSeriesChartXAxisSettings;
+  animation: EChartsAnimationSettings;
+  thresholds: TimeSeriesChartThreshold[];
   showLegend: boolean;
   legendPosition: LegendPosition;
   legendLabelFont: Font;
   legendLabelColor: string;
   background: BackgroundSettings;
+  padding: string;
 }
 
 export const barChartWithLabelsDefaultSettings: BarChartWithLabelsWidgetSettings = {
+  dataZoom: false,
   showBarLabel: true,
   barLabelFont: {
     family: 'Roboto',
@@ -53,6 +97,30 @@ export const barChartWithLabelsDefaultSettings: BarChartWithLabelsWidgetSettings
     lineHeight: '12px'
   },
   barValueColor: 'rgba(0, 0, 0, 0.76)',
+  showBarBorder: false,
+  barBorderWidth: 2,
+  barBorderRadius: 0,
+  barBackgroundSettings: {
+    type: SeriesFillType.none,
+    opacity: 0.4,
+    gradient: {
+      start: 100,
+      end: 0
+    }
+  },
+  noAggregationBarWidthSettings: mergeDeep({} as TimeSeriesChartNoAggregationBarWidthSettings,
+    timeSeriesChartNoAggregationBarWidthDefaultSettings),
+  grid: mergeDeep({} as TimeSeriesChartGridSettings,
+    timeSeriesChartGridDefaultSettings),
+  yAxis: mergeDeep({} as TimeSeriesChartYAxisSettings,
+    defaultTimeSeriesChartYAxisSettings,
+    { id: 'default', order: 0, showLine: false, showTicks: false } as TimeSeriesChartYAxisSettings),
+  xAxis: mergeDeep({} as TimeSeriesChartXAxisSettings,
+    defaultTimeSeriesChartXAxisSettings,
+    {showTicks: false, showSplitLines: false} as TimeSeriesChartXAxisSettings),
+  animation: mergeDeep({} as EChartsAnimationSettings,
+    echartsAnimationDefaultSettings),
+  thresholds: [],
   showLegend: true,
   legendPosition: LegendPosition.top,
   legendLabelFont: {
@@ -65,6 +133,15 @@ export const barChartWithLabelsDefaultSettings: BarChartWithLabelsWidgetSettings
   },
   legendLabelColor: 'rgba(0, 0, 0, 0.76)',
   showTooltip: true,
+  tooltipLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '16px'
+  },
+  tooltipLabelColor: 'rgba(0, 0, 0, 0.76)',
   tooltipValueFont: {
     family: 'Roboto',
     size: 12,
@@ -96,5 +173,92 @@ export const barChartWithLabelsDefaultSettings: BarChartWithLabelsWidgetSettings
       color: 'rgba(255,255,255,0.72)',
       blur: 3
     }
-  }
+  },
+  padding: '12px'
+};
+
+export const barChartWithLabelsTimeSeriesSettings = (settings: BarChartWithLabelsWidgetSettings): DeepPartial<TimeSeriesChartSettings> => ({
+  dataZoom: settings.dataZoom,
+  grid: settings.grid,
+  yAxes: {
+    default: settings.yAxis
+  },
+  xAxis: settings.xAxis,
+  barWidthSettings: {
+    barGap: 0,
+    intervalGap: 0.5
+  },
+  noAggregationBarWidthSettings: settings.noAggregationBarWidthSettings,
+  animation: settings.animation,
+  thresholds: settings.thresholds,
+  showTooltip: settings.showTooltip,
+  tooltipLabelFont: settings.tooltipLabelFont,
+  tooltipLabelColor: settings.tooltipLabelColor,
+  tooltipValueFont: settings.tooltipValueFont,
+  tooltipValueColor: settings.tooltipValueColor,
+  tooltipShowDate: settings.tooltipShowDate,
+  tooltipDateInterval: settings.tooltipDateInterval,
+  tooltipDateFormat: settings.tooltipDateFormat,
+  tooltipDateFont: settings.tooltipDateFont,
+  tooltipDateColor: settings.tooltipDateColor,
+  tooltipBackgroundColor: settings.tooltipBackgroundColor,
+  tooltipBackgroundBlur: settings.tooltipBackgroundBlur,
+  tooltipShowFocusedSeries: true
+});
+
+export const barChartWithLabelsTimeSeriesKeySettings = (settings: BarChartWithLabelsWidgetSettings,
+                                                        decimals: number): DeepPartial<TimeSeriesChartKeySettings> => {
+  const barValueStyle: ComponentStyle = textStyle(settings.barValueFont);
+  delete barValueStyle.lineHeight;
+  barValueStyle.fontSize = settings.barValueFont.size;
+  barValueStyle.fill = settings.barValueColor;
+
+  const barLabelStyle: ComponentStyle = textStyle(settings.barLabelFont);
+  delete barLabelStyle.lineHeight;
+  barLabelStyle.fontSize = settings.barLabelFont.size;
+  barLabelStyle.fill = settings.barLabelColor;
+  return {
+    type: TimeSeriesChartSeriesType.bar,
+    barSettings: {
+      showBorder: settings.showBarBorder,
+      borderWidth: settings.barBorderWidth,
+      borderRadius: settings.barBorderRadius,
+      backgroundSettings: settings.barBackgroundSettings,
+      showLabel: settings.showBarLabel || settings.showBarValue,
+      labelPosition: 'insideBottom',
+      labelFormatter: (params: CallbackDataParams): string => {
+        const labelParts: string[] = [];
+        if (settings.showBarValue) {
+          const labelValue = formatValue(params.value[1], decimals, '', false);
+          labelParts.push(`{value|${labelValue}}`);
+        }
+        if (settings.showBarLabel) {
+          labelParts.push(`{label|${params.seriesName}}`);
+        }
+        return labelParts.join(' ');
+      },
+      labelLayout: (params: LabelLayoutOptionCallbackParams): LabelLayoutOption => {
+        if (params.rect.width - params.labelRect.width < 2) {
+          return {
+            y: '100000%',
+          };
+        } else {
+          return {
+            hideOverlap: true
+          };
+        }
+      },
+      additionalLabelOption: {
+        textRotation: Math.PI / 2,
+        textDistance: 15,
+        textStrokeWidth: 0,
+        textAlign: 'left',
+        textVerticalAlign: 'middle',
+        rich: {
+          value: barValueStyle,
+          label: barLabelStyle
+        }
+      }
+    }
+  };
 };
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.html
deleted file mode 100644
index 3465e80c15..0000000000
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
-    Copyright © 2016-2024 The Thingsboard Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<div class="tb-doughnut-panel" [style]="backgroundStyle$ | async">
-  <div class="tb-doughnut-overlay" [style]="overlayStyle"></div>
-  <ng-container *ngTemplateOutlet="widgetTitlePanel"></ng-container>
-  <div #doughnutContent class="tb-doughnut-content" [class]="legendClass">
-    <div #doughnutShape class="tb-doughnut-shape">
-    </div>
-    <div *ngIf="showLegend" #doughnutLegend class="tb-doughnut-legend">
-      <div class="tb-doughnut-legend-item" *ngFor="let legendItem of legendItems" [class]="{'pointer': !legendItem.total && legendItem.hasValue}"
-           (mouseenter)="onLegendItemEnter(legendItem)"
-           (mouseleave)="onLegendItemLeave(legendItem)"
-           (click)="toggleLegendItem(legendItem)">
-        <div class="tb-doughnut-legend-item-label">
-          <div class="tb-doughnut-legend-item-label-circle" [style]="{background: (legendItem.enabled && legendItem.hasValue) ? legendItem.color : null}"></div>
-          <div [style]="(legendItem.enabled && legendItem.hasValue) ? legendLabelStyle : disabledLegendLabelStyle">{{ legendItem.label }}</div>
-        </div>
-        <div [style]="(legendItem.enabled && legendItem.hasValue) ? legendValueStyle : disabledLegendValueStyle" class="tb-doughnut-legend-item-value">{{ legendItem.value }}</div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.ts
index d215f37a32..4b2eca3728 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.ts
@@ -14,85 +14,32 @@
 /// limitations under the License.
 ///
 
-import {
-  AfterViewInit,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  Input,
-  OnDestroy,
-  OnInit,
-  Renderer2,
-  TemplateRef,
-  ViewChild,
-  ViewEncapsulation
-} from '@angular/core';
+import { Component, Input, OnInit, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core';
 import {
   doughnutDefaultSettings,
-  DoughnutLayout,
-  DoughnutTooltipValueType,
+  doughnutPieChartSettings,
   DoughnutWidgetSettings
 } from '@home/components/widget/lib/chart/doughnut-widget.models';
 import { WidgetContext } from '@home/models/widget-component.models';
-import {
-  backgroundStyle,
-  ColorProcessor,
-  ComponentStyle,
-  overlayStyle,
-  textStyle
-} from '@shared/models/widget-settings.models';
-import { ResizeObserver } from '@juggle/resize-observer';
 import { WidgetComponent } from '@home/components/widget/widget.component';
-import * as echarts from 'echarts/core';
 import { TranslateService } from '@ngx-translate/core';
-import { PieDataItemOption } from 'echarts/types/src/chart/pie/PieSeries';
-import { formatValue, isDefinedAndNotNull, isNumeric } from '@core/utils';
-import { SVG, Svg, Text } from '@svgdotjs/svg.js';
-import { DataKey, LegendPosition } from '@shared/models/widget.models';
-import { Observable } from 'rxjs';
-import { ImagePipe } from '@shared/pipe/image.pipe';
-import { DomSanitizer } from '@angular/platform-browser';
-import { ECharts, echartsModule, EChartsOption } from '@home/components/widget/lib/chart/echarts-widget.models';
-
-const shapeSize = 134;
-const shapeSegmentWidth = 13.4;
-
-interface DoughnutDataItem {
-  id: number;
-  dataKey: DataKey;
-  value: number;
-  hasValue: boolean;
-  enabled: boolean;
-}
-
-interface DoughnutLegendItem {
-  id: number;
-  color: string;
-  label: string;
-  value: string;
-  hasValue: boolean;
-  enabled: boolean;
-  total?: boolean;
-}
+import { isDefinedAndNotNull } from '@core/utils';
+import { TbPieChart } from '@home/components/widget/lib/chart/pie-chart';
+import {
+  LatestChartComponent,
+  LatestChartComponentCallbacks
+} from '@home/components/widget/lib/chart/latest-chart.component';
 
 @Component({
   selector: 'tb-doughnut-widget',
-  templateUrl: './doughnut-widget.component.html',
-  styleUrls: ['./doughnut-widget.component.scss'],
+  templateUrl: './latest-chart-widget.component.html',
+  styleUrls: [],
   encapsulation: ViewEncapsulation.None
 })
-export class DoughnutWidgetComponent implements OnInit, OnDestroy, AfterViewInit {
+export class DoughnutWidgetComponent implements OnInit {
 
-  @ViewChild('doughnutContent', {static: false})
-  doughnutContent: ElementRef<HTMLElement>;
-
-  @ViewChild('doughnutShape', {static: false})
-  doughnutShape: ElementRef<HTMLElement>;
-
-  @ViewChild('doughnutLegend', {static: false})
-  doughnutLegend: ElementRef<HTMLElement>;
-
-  settings: DoughnutWidgetSettings;
+  @ViewChild('latestChart')
+  latestChart: LatestChartComponent;
 
   @Input()
   ctx: WidgetContext;
@@ -100,45 +47,12 @@ export class DoughnutWidgetComponent implements OnInit, OnDestroy, AfterViewInit
   @Input()
   widgetTitlePanel: TemplateRef<any>;
 
-  showLegend: boolean;
-  legendClass: string;
-
-  totalValueColor: ColorProcessor;
-
-  backgroundStyle$: Observable<ComponentStyle>;
-  overlayStyle: ComponentStyle = {};
-
-  legendItems: DoughnutLegendItem[];
-  legendLabelStyle: ComponentStyle;
-  legendValueStyle: ComponentStyle;
-  disabledLegendLabelStyle: ComponentStyle;
-  disabledLegendValueStyle: ComponentStyle;
-
-  private shapeResize$: ResizeObserver;
-  private legendHorizontal: boolean;
-
-  private decimals = 0;
-  private units = '';
-
-  private total = 0;
-  private totalText = 'N/A';
-  private scale = 1;
-
-  private dataItems: DoughnutDataItem[] = [];
+  settings: DoughnutWidgetSettings;
 
-  private drawDoughnutPending = false;
-  private showTotal = false;
-  private doughnutChart: ECharts;
-  private doughnutOptions: EChartsOption;
-  private svgShape: Svg;
-  private totalTextNode: Text;
+  callbacks: LatestChartComponentCallbacks;
 
-  constructor(private imagePipe: ImagePipe,
-              private sanitizer: DomSanitizer,
-              private widgetComponent: WidgetComponent,
-              private renderer: Renderer2,
-              private translate: TranslateService,
-              private cd: ChangeDetectorRef) {
+  constructor(private widgetComponent: WidgetComponent,
+              private translate: TranslateService) {
   }
 
   ngOnInit(): void {
@@ -146,390 +60,19 @@ export class DoughnutWidgetComponent implements OnInit, OnDestroy, AfterViewInit
     const horizontal  = isDefinedAndNotNull(params.horizontal) ? params.horizontal : false;
     this.ctx.$scope.doughnutWidget = this;
     this.settings = {...doughnutDefaultSettings(horizontal), ...this.ctx.settings};
-
-    this.decimals = this.ctx.decimals;
-    this.units = this.ctx.units;
-
-    this.showLegend = this.settings.showLegend;
-    this.showTotal = this.settings.layout === DoughnutLayout.with_total;
-
-    if (this.showTotal) {
-      this.totalValueColor = ColorProcessor.fromSettings(this.settings.totalValueColor);
-    }
-
-    this.backgroundStyle$ = backgroundStyle(this.settings.background, this.imagePipe, this.sanitizer);
-    this.overlayStyle = overlayStyle(this.settings.background.overlay);
-
-    if (this.showLegend) {
-      this.legendItems = [];
-      this.legendClass = `legend-${this.settings.legendPosition}`;
-      this.legendHorizontal = [LegendPosition.left, LegendPosition.right].includes(this.settings.legendPosition);
-      this.legendLabelStyle = textStyle(this.settings.legendLabelFont);
-      this.disabledLegendLabelStyle = textStyle(this.settings.legendLabelFont);
-      this.legendLabelStyle.color = this.settings.legendLabelColor;
-      this.legendValueStyle = textStyle(this.settings.legendValueFont);
-      this.disabledLegendValueStyle = textStyle(this.settings.legendValueFont);
-      this.legendValueStyle.color = this.settings.legendValueColor;
-    }
-    let counter = 0;
-    if (this.ctx.datasources.length) {
-      for (const datasource of this.ctx.datasources) {
-        const dataKeys = datasource.dataKeys;
-        for (const dataKey of dataKeys) {
-          const id = counter++;
-          this.dataItems.push({
-            id,
-            dataKey,
-            value: 0,
-            hasValue: false,
-            enabled: true
-          });
-          if (this.showLegend) {
-            this.legendItems.push(
-              {
-                id,
-                value: '--',
-                label: dataKey.label,
-                color: dataKey.color,
-                enabled: true,
-                hasValue: false
-              }
-            );
-          }
-        }
+    this.callbacks = {
+      createChart: (chartShape, renderer) => {
+        const settings = doughnutPieChartSettings(this.settings);
+        return new TbPieChart(this.ctx, settings, chartShape.nativeElement, renderer, this.translate, true);
       }
-    }
-    if (this.settings.sortSeries) {
-      this.dataItems.sort((a, b) => a.dataKey.label.localeCompare(b.dataKey.label));
-      if (this.showLegend) {
-        this.legendItems.sort((a, b) => a.label.localeCompare(b.label));
-      }
-    }
-    if (this.showLegend && !this.showTotal) {
-      this.legendItems.push(
-        {
-          id: null,
-          value: '--',
-          label: this.translate.instant('widgets.doughnut.total'),
-          color: 'rgba(0, 0, 0, 0.06)',
-          enabled: true,
-          hasValue: false,
-          total: true
-        }
-      );
-    }
-  }
-
-  ngAfterViewInit() {
-    if (this.drawDoughnutPending) {
-      this.drawDoughnut();
-    }
-  }
-
-  ngOnDestroy() {
-    if (this.shapeResize$) {
-      this.shapeResize$.disconnect();
-    }
-    if (this.doughnutChart) {
-      this.doughnutChart.dispose();
-    }
+    };
   }
 
   public onInit() {
-    const borderRadius = this.ctx.$widgetElement.css('borderRadius');
-    this.overlayStyle = {...this.overlayStyle, ...{borderRadius}};
-    if (this.doughnutShape) {
-      this.drawDoughnut();
-    } else {
-      this.drawDoughnutPending = true;
-    }
-    this.cd.detectChanges();
+    this.latestChart?.onInit();
   }
 
   public onDataUpdated() {
-    for (const dsData of this.ctx.data) {
-      let value = 0;
-      const tsValue = dsData.data[0];
-      const dataItem = this.dataItems.find(item => item.dataKey === dsData.dataKey);
-      if (tsValue && isDefinedAndNotNull(tsValue[1]) && isNumeric(tsValue[1])) {
-        value = tsValue[1];
-        dataItem.hasValue = true;
-        dataItem.value = Number(value);
-      } else {
-        dataItem.hasValue = false;
-        dataItem.value = 0;
-      }
-    }
-    this.updateSeriesData();
-    if (this.showLegend) {
-      this.cd.detectChanges();
-      if (this.legendHorizontal) {
-        setTimeout(() => {
-          this.onResize();
-        });
-      }
-    }
-  }
-
-  private updateSeriesData(renderTotal = true) {
-    this.total = 0;
-    this.totalText = 'N/A';
-    let hasValue = false;
-    const seriesData: PieDataItemOption[] = [];
-    const enabledDataItems = this.dataItems.filter(item => item.enabled && item.hasValue);
-    for (const dataItem of this.dataItems) {
-      if (dataItem.enabled && dataItem.hasValue) {
-        hasValue = true;
-        this.total += dataItem.value;
-        seriesData.push(
-          {id: dataItem.id, value: dataItem.value, name: dataItem.dataKey.label, itemStyle: {color: dataItem.dataKey.color}}
-        );
-        if (enabledDataItems.length > 1) {
-          seriesData.push({
-            value: 0, name: '', itemStyle: {color: 'transparent'}, emphasis: {disabled: true}
-          });
-        }
-      }
-      if (this.showLegend) {
-        const legendItem = this.legendItems.find(item => item.id === dataItem.id);
-        if (dataItem.hasValue) {
-          legendItem.hasValue = true;
-          legendItem.value = formatValue(dataItem.value, this.decimals, this.units, false);
-        } else {
-          legendItem.hasValue = false;
-          legendItem.value = '--';
-        }
-      }
-    }
-    for (let i= 1; i < seriesData.length; i+=2) {
-      seriesData[i].value = this.total / 100;
-    }
-    if (this.showTotal || this.showLegend) {
-      if (hasValue) {
-        this.totalText = formatValue(this.total, this.decimals, this.units, false);
-        if (this.showLegend && !this.showTotal) {
-          this.legendItems[this.legendItems.length - 1].hasValue = true;
-          this.legendItems[this.legendItems.length - 1].value = this.totalText;
-        }
-      } else if (this.showLegend && !this.showTotal) {
-        this.legendItems[this.legendItems.length - 1].hasValue = false;
-        this.legendItems[this.legendItems.length - 1].value = '--';
-      }
-    }
-    this.doughnutOptions.series[0].data = seriesData;
-    this.doughnutChart.setOption(this.doughnutOptions);
-    if (this.showTotal) {
-      this.totalValueColor.update(this.total);
-      if (renderTotal) {
-        this.renderTotal();
-      }
-    }
-  }
-
-  public onLegendItemEnter(item: DoughnutLegendItem) {
-    if (!item.total && item.enabled && item.hasValue) {
-      const dataIndex = this.doughnutOptions.series[0].data.findIndex(d => d.id === item.id);
-      if (dataIndex > -1) {
-        this.doughnutChart.dispatchAction({
-          type: 'highlight',
-          dataIndex
-        });
-      }
-    }
-  }
-
-  public onLegendItemLeave(item: DoughnutLegendItem) {
-    if (!item.total && item.enabled && item.hasValue) {
-      const dataIndex = this.doughnutOptions.series[0].data.findIndex(d => d.id === item.id);
-      if (dataIndex > -1) {
-        this.doughnutChart.dispatchAction({
-          type: 'downplay',
-          dataIndex
-        });
-      }
-    }
+    this.latestChart?.onDataUpdated();
   }
-
-  public toggleLegendItem(item: DoughnutLegendItem) {
-    if (!item.total && item.hasValue) {
-      const enable = !item.enabled;
-      const dataItem = this.dataItems.find(d => d.id === item.id);
-      if (dataItem) {
-        dataItem.enabled = enable;
-        this.updateSeriesData();
-        item.enabled = enable;
-        if (enable) {
-          const dataIndex = this.doughnutOptions.series[0].data.findIndex(d => d.id === item.id);
-          if (dataIndex > -1) {
-            this.doughnutChart.dispatchAction({
-              type: 'highlight',
-              dataIndex
-            });
-          }
-        }
-      }
-    }
-  }
-
-  private drawDoughnut() {
-    echartsModule.init();
-    const shapeWidth = this.doughnutShape.nativeElement.getBoundingClientRect().width;
-    const shapeHeight = this.doughnutShape.nativeElement.getBoundingClientRect().height;
-    const size = this.settings.autoScale ? shapeSize : Math.min(shapeWidth, shapeHeight);
-    const innerRadius = size / 2 - shapeSegmentWidth;
-    const outerRadius = size / 2;
-    this.doughnutChart = echarts.init(this.doughnutShape.nativeElement, null, {
-      renderer: 'svg',
-      width: this.settings.autoScale ? shapeSize : undefined,
-      height: this.settings.autoScale ? shapeSize : undefined,
-    });
-    this.doughnutOptions = {
-      tooltip: {
-        trigger: this.settings.showTooltip ? 'item' : 'none',
-        confine: false,
-        appendTo: 'body',
-      },
-      series: [
-        {
-          type: 'pie',
-          clockwise: this.settings.clockwise,
-          radius: [innerRadius, outerRadius],
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderRadius: '50%',
-            borderWidth: 0,
-            borderColor: '#fff'
-          },
-          label: {
-            show: false
-          },
-          emphasis: {
-            scale: false,
-            itemStyle: {
-              borderColor: '#fff',
-              borderWidth: 2,
-              shadowColor: 'rgba(0, 0, 0, 0.24)',
-              shadowBlur: 8
-            },
-            label: {
-              show: false
-            }
-          }
-        }
-      ]
-    };
-    if (this.settings.showTooltip) {
-      this.doughnutOptions.series[0].tooltip = {
-        formatter: (params) => {
-          if (!params.name) {
-            return null;
-          }
-          let value: string;
-          if (this.settings.tooltipValueType === DoughnutTooltipValueType.percentage) {
-            const percents = params.value / this.total * 100;
-            value = formatValue(percents, this.settings.tooltipValueDecimals, '%', false);
-          } else {
-            value = formatValue(params.value, this.settings.tooltipValueDecimals, this.units, false);
-          }
-          const textElement: HTMLElement = this.renderer.createElement('div');
-          this.renderer.setStyle(textElement, 'display', 'inline-flex');
-          this.renderer.setStyle(textElement, 'align-items', 'center');
-          this.renderer.setStyle(textElement, 'gap', '8px');
-          const labelElement: HTMLElement = this.renderer.createElement('div');
-          this.renderer.appendChild(labelElement, this.renderer.createText(params.name));
-          this.renderer.setStyle(labelElement, 'font-family', 'Roboto');
-          this.renderer.setStyle(labelElement, 'font-size', '11px');
-          this.renderer.setStyle(labelElement, 'font-style', 'normal');
-          this.renderer.setStyle(labelElement, 'font-weight', '400');
-          this.renderer.setStyle(labelElement, 'line-height', '16px');
-          this.renderer.setStyle(labelElement, 'letter-spacing', '0.25px');
-          this.renderer.setStyle(labelElement, 'color', 'rgba(0, 0, 0, 0.38)');
-          const valueElement: HTMLElement = this.renderer.createElement('div');
-          this.renderer.appendChild(valueElement, this.renderer.createText(value));
-          this.renderer.setStyle(valueElement, 'font-family', this.settings.tooltipValueFont.family);
-          this.renderer.setStyle(valueElement, 'font-size', this.settings.tooltipValueFont.size + this.settings.tooltipValueFont.sizeUnit);
-          this.renderer.setStyle(valueElement, 'font-style', this.settings.tooltipValueFont.style);
-          this.renderer.setStyle(valueElement, 'font-weight', this.settings.tooltipValueFont.weight);
-          this.renderer.setStyle(valueElement, 'line-height', this.settings.tooltipValueFont.lineHeight);
-          this.renderer.setStyle(valueElement, 'color', this.settings.tooltipValueColor);
-          this.renderer.appendChild(textElement, labelElement);
-          this.renderer.appendChild(textElement, valueElement);
-          return textElement;
-        },
-        padding: [4, 8],
-        backgroundColor: this.settings.tooltipBackgroundColor,
-        extraCssText: `line-height: 1; backdrop-filter: blur(${this.settings.tooltipBackgroundBlur}px);`
-      };
-      this.doughnutOptions.series[0].tooltip.position = (pos) => [pos[0] + 10, pos[1] + 10];
-    }
-    this.updateSeriesData(false);
-
-    this.renderer.setStyle(this.doughnutChart.getDom().firstChild, 'overflow', 'visible');
-    if (this.settings.autoScale) {
-      this.renderer.setStyle(this.doughnutChart.getDom().firstChild, 'position', 'absolute');
-    }
-    this.renderer.setStyle(this.doughnutChart.getDom().firstChild.firstChild, 'overflow', 'visible');
-
-    this.svgShape = SVG(this.doughnutChart.getDom().firstChild.firstChild).toRoot();
-
-    if (this.showTotal) {
-      this.totalTextNode = this.svgShape.text('').font({
-        family: 'Roboto',
-        leading: 1
-      }).attr({'text-anchor': 'middle'});
-      this.renderTotal();
-    }
-
-    this.shapeResize$ = new ResizeObserver(() => {
-      this.onResize();
-    });
-    this.shapeResize$.observe(this.doughnutContent.nativeElement);
-    this.onResize();
-  }
-
-  private renderTotal() {
-    this.totalTextNode.text(add => {
-      add.tspan(this.translate.instant('widgets.doughnut.total')).font({size: '12px', weight: 400}).fill('rgba(0, 0, 0, 0.38)');
-      add.tspan('').newLine().font({size: '4px'});
-      add.tspan(this.totalText).newLine().font(
-        {family: this.settings.totalValueFont.family,
-            size: this.settings.totalValueFont.size + this.settings.totalValueFont.sizeUnit,
-            weight: this.settings.totalValueFont.weight,
-            style: this.settings.totalValueFont.style}
-      ).fill(this.totalValueColor.color);
-    }).center(this.svgShape.bbox().width / 2, this.svgShape.bbox().height / 2);
-  }
-
-  private onResize() {
-    if (this.legendHorizontal) {
-      this.renderer.setStyle(this.doughnutShape.nativeElement, 'max-width', null);
-      this.renderer.setStyle(this.doughnutShape.nativeElement, 'min-width', null);
-      this.renderer.setStyle(this.doughnutLegend.nativeElement, 'flex', null);
-    }
-    const shapeWidth = this.doughnutShape.nativeElement.getBoundingClientRect().width;
-    const shapeHeight = this.doughnutShape.nativeElement.getBoundingClientRect().height;
-    const size = Math.min(shapeWidth, shapeHeight);
-    if (this.legendHorizontal) {
-      this.renderer.setStyle(this.doughnutShape.nativeElement, 'max-width', `${size}px`);
-      this.renderer.setStyle(this.doughnutShape.nativeElement, 'min-width', `${size}px`);
-      this.renderer.setStyle(this.doughnutLegend.nativeElement, 'flex', '1');
-    }
-    if (!this.settings.autoScale) {
-      const innerRadius = size / 2 - shapeSegmentWidth;
-      const outerRadius = size / 2;
-      this.doughnutOptions.series[0].radius = [innerRadius, outerRadius];
-      this.doughnutChart.setOption(this.doughnutOptions);
-    } else {
-      this.scale = size / shapeSize;
-      this.renderer.setStyle(this.doughnutChart.getDom().firstChild, 'transform', `scale(${this.scale})`);
-    }
-    if (!this.settings.autoScale) {
-      this.doughnutChart.resize();
-    }
-    if (this.showTotal) {
-      this.totalTextNode.center((this.settings.autoScale ? shapeSize : shapeWidth) / 2,
-        (this.settings.autoScale ? shapeSize : shapeHeight) / 2);
-    }
-  }
-
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts
index 9110cfcd4d..d059e0186c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts
@@ -14,14 +14,16 @@
 /// limitations under the License.
 ///
 
-import {
-  BackgroundSettings,
-  BackgroundType,
-  ColorSettings,
-  constantColor,
-  Font
-} from '@shared/models/widget-settings.models';
+import { BackgroundType, ColorSettings, constantColor, Font } from '@shared/models/widget-settings.models';
 import { LegendPosition } from '@shared/models/widget.models';
+import { pieChartAnimationDefaultSettings, PieChartSettings } from '@home/components/widget/lib/chart/pie-chart.models';
+import { DeepPartial } from '@shared/models/common';
+import {
+  LatestChartTooltipValueType,
+  LatestChartWidgetSettings
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import { mergeDeep } from '@core/utils';
+import { EChartsAnimationSettings } from '@home/components/widget/lib/chart/echarts-widget.models';
 
 export enum DoughnutLayout {
   default = 'default',
@@ -51,41 +53,11 @@ export const horizontalDoughnutLayoutImages = new Map<DoughnutLayout, string>(
   ]
 );
 
-export enum DoughnutTooltipValueType {
-  absolute = 'absolute',
-  percentage = 'percentage'
-}
-
-export const doughnutTooltipValueTypes = Object.keys(DoughnutTooltipValueType) as DoughnutTooltipValueType[];
-
-export const doughnutTooltipValueTypeTranslations = new Map<DoughnutTooltipValueType, string>(
-  [
-    [DoughnutTooltipValueType.absolute, 'widgets.doughnut.tooltip-value-type-absolute'],
-    [DoughnutTooltipValueType.percentage, 'widgets.doughnut.tooltip-value-type-percentage']
-  ]
-);
-
-export interface DoughnutWidgetSettings {
+export interface DoughnutWidgetSettings extends LatestChartWidgetSettings {
   layout: DoughnutLayout;
-  autoScale: boolean;
   clockwise: boolean;
-  sortSeries: boolean;
   totalValueFont: Font;
   totalValueColor: ColorSettings;
-  showLegend: boolean;
-  legendPosition: LegendPosition;
-  legendLabelFont: Font;
-  legendLabelColor: string;
-  legendValueFont: Font;
-  legendValueColor: string;
-  showTooltip: boolean;
-  tooltipValueType: DoughnutTooltipValueType;
-  tooltipValueDecimals: number;
-  tooltipValueFont: Font;
-  tooltipValueColor: string;
-  tooltipBackgroundColor: string;
-  tooltipBackgroundBlur: number;
-  background: BackgroundSettings;
 }
 
 export const doughnutDefaultSettings = (horizontal: boolean): DoughnutWidgetSettings => ({
@@ -102,6 +74,8 @@ export const doughnutDefaultSettings = (horizontal: boolean): DoughnutWidgetSett
     lineHeight: '1'
   },
   totalValueColor: constantColor('rgba(0, 0, 0, 0.87)'),
+  animation: mergeDeep({} as EChartsAnimationSettings,
+    pieChartAnimationDefaultSettings),
   showLegend: true,
   legendPosition: horizontal ? LegendPosition.right : LegendPosition.bottom,
   legendLabelFont: {
@@ -123,7 +97,7 @@ export const doughnutDefaultSettings = (horizontal: boolean): DoughnutWidgetSett
   },
   legendValueColor: 'rgba(0, 0, 0, 0.87)',
   showTooltip: true,
-  tooltipValueType: DoughnutTooltipValueType.percentage,
+  tooltipValueType: LatestChartTooltipValueType.percentage,
   tooltipValueDecimals: 0,
   tooltipValueFont: {
     family: 'Roboto',
@@ -146,3 +120,31 @@ export const doughnutDefaultSettings = (horizontal: boolean): DoughnutWidgetSett
     }
   }
 });
+
+export const doughnutPieChartSettings = (settings: DoughnutWidgetSettings): DeepPartial<PieChartSettings> => ({
+  autoScale: settings.autoScale,
+  doughnut: true,
+  clockwise: settings.clockwise,
+  sortSeries: settings.sortSeries,
+  showTotal: settings.layout === DoughnutLayout.with_total,
+  animation: settings.animation,
+  showLegend: settings.showLegend,
+  totalValueFont: settings.totalValueFont,
+  totalValueColor: settings.totalValueColor,
+  showLabel: false,
+  borderWidth: 0,
+  borderColor: '#fff',
+  borderRadius: '50%',
+  emphasisScale: false,
+  emphasisBorderWidth: 2,
+  emphasisBorderColor: '#fff',
+  emphasisShadowColor: 'rgba(0, 0, 0, 0.24)',
+  emphasisShadowBlur: 8,
+  showTooltip: settings.showTooltip,
+  tooltipValueType: settings.tooltipValueType,
+  tooltipValueDecimals: settings.tooltipValueDecimals,
+  tooltipValueFont: settings.tooltipValueFont,
+  tooltipValueColor: settings.tooltipValueColor,
+  tooltipBackgroundColor: settings.tooltipBackgroundColor,
+  tooltipBackgroundBlur: settings.tooltipBackgroundBlur
+});
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/echarts-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/echarts-widget.models.ts
index 7fdd1fbfff..a225973b82 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/echarts-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/echarts-widget.models.ts
@@ -15,11 +15,9 @@
 ///
 
 import * as echarts from 'echarts/core';
-import { Axis } from 'echarts';
 import AxisModel from 'echarts/types/src/coord/cartesian/AxisModel';
 import { estimateLabelUnionRect } from 'echarts/lib/coord/axisHelper';
-import { formatValue, isDefinedAndNotNull } from '@core/utils';
-import TimeScale from 'echarts/types/src/scale/Time';
+import { isDefinedAndNotNull, isFunction, isNumber } from '@core/utils';
 import {
   DataZoomComponent,
   DataZoomComponentOption,
@@ -44,72 +42,27 @@ import {
 } from 'echarts/charts';
 import { LabelLayout } from 'echarts/features';
 import { CanvasRenderer, SVGRenderer } from 'echarts/renderers';
-import { DataEntry, DataKey, DataSet } from '@shared/models/widget.models';
+import { DataEntry, DataKey, DataSet, Datasource, FormattedData } from '@shared/models/widget.models';
 import {
   calculateAggIntervalWithWidgetTimeWindow,
   Interval,
   IntervalMath,
   WidgetTimewindow
 } from '@shared/models/time/time.models';
-import { CallbackDataParams } from 'echarts/types/dist/shared';
+import { CallbackDataParams, TimeAxisBandWidthCalculator } from 'echarts/types/dist/shared';
 import { Renderer2 } from '@angular/core';
 import { DateFormatProcessor, DateFormatSettings, Font } from '@shared/models/widget-settings.models';
 import GlobalModel from 'echarts/types/src/model/Global';
 import Axis2D from 'echarts/types/src/coord/cartesian/Axis2D';
 import SeriesModel from 'echarts/types/src/model/Series';
+import { MarkLine2DDataItemOption } from 'echarts/types/src/component/marker/MarkLineModel';
+import { TimeAxisBaseOption } from 'echarts/types/src/coord/axisCommonTypes';
 
 class EChartsModule {
   private initialized = false;
 
   init() {
     if (!this.initialized) {
-      const axisGetBandWidth = Axis.prototype.getBandWidth;
-
-      Axis.prototype.getBandWidth = function(){
-        const model: AxisModel = this.model;
-        const axisOption = model.option;
-        if (this.scale.type === 'time') {
-          let interval: number;
-          const seriesDataIndices = axisOption.axisPointer?.seriesDataIndices;
-          if (seriesDataIndices?.length) {
-            const seriesDataIndex = seriesDataIndices[0];
-            const series = model.ecModel.getSeriesByIndex(seriesDataIndex.seriesIndex);
-            if (series) {
-              const values = series.getData().getValues(seriesDataIndex.dataIndex);
-              const start = values[2];
-              const end = values[3];
-              if (typeof start === 'number' && typeof end === 'number') {
-                interval = Math.max(end - start, 1);
-              }
-            }
-          }
-          if (!interval) {
-            const tbTimeWindow: WidgetTimewindow = (axisOption as any).tbTimeWindow;
-            if (isDefinedAndNotNull(tbTimeWindow)) {
-              if (axisOption.axisPointer?.value && typeof axisOption.axisPointer?.value === 'number') {
-                const intervalArray = calculateAggIntervalWithWidgetTimeWindow(tbTimeWindow, axisOption.axisPointer.value);
-                const start = intervalArray[0];
-                const end = intervalArray[1];
-                interval = Math.max(end - start, 1);
-              } else {
-                interval = IntervalMath.numberValue(tbTimeWindow.interval);
-              }
-            }
-          }
-          if (interval) {
-            const timeScale: TimeScale = this.scale;
-            const axisExtent: [number, number] = this._extent;
-            const dataExtent = timeScale.getExtent();
-            const size = Math.abs(axisExtent[1] - axisExtent[0]);
-            return interval * (size / (dataExtent[1] - dataExtent[0]));
-          } else {
-            return axisGetBandWidth.call(this);
-          }
-        } else {
-          return axisGetBandWidth.call(this);
-        }
-      };
-
       echarts.use([
         TooltipComponent,
         GridComponent,
@@ -124,7 +77,6 @@ class EChartsModule {
         CanvasRenderer,
         SVGRenderer
       ]);
-
       this.initialized = true;
     }
   }
@@ -150,29 +102,165 @@ export type EChartsDataItem = [number, any, number, number];
 
 export type NamedDataSet = {name: string; value: EChartsDataItem}[];
 
+export type EChartsTooltipValueFormatFunction = (value: any, latestData: FormattedData, units?: string, decimals?: number) => string;
+
 export type EChartsSeriesItem = {
   id: string;
+  datasource: Datasource;
   dataKey: DataKey;
   data: NamedDataSet;
   dataSet?: DataSet;
   enabled: boolean;
   units?: string;
   decimals?: number;
+  latestData?: FormattedData;
+  tooltipValueFormatFunction?: EChartsTooltipValueFormatFunction;
+  comparisonItem?: boolean;
 };
 
-export const getXAxis = (chart: ECharts): Axis2D => {
-  const model: GlobalModel = (chart as any).getModel();
-  const models = model.queryComponents({mainType: 'xAxis'});
-  if (models?.length) {
-    const axisModel = models[0] as AxisModel;
-    return axisModel.axis;
+export enum EChartsShape {
+  emptyCircle = 'emptyCircle',
+  circle = 'circle',
+  rect = 'rect',
+  roundRect = 'roundRect',
+  triangle = 'triangle',
+  diamond = 'diamond',
+  pin = 'pin',
+  arrow = 'arrow',
+  none = 'none'
+}
+
+export const echartsShapes = Object.keys(EChartsShape) as EChartsShape[];
+
+export const echartsShapeTranslations = new Map<EChartsShape, string>(
+  [
+    [EChartsShape.emptyCircle, 'widgets.time-series-chart.shape-empty-circle'],
+    [EChartsShape.circle, 'widgets.time-series-chart.shape-circle'],
+    [EChartsShape.rect, 'widgets.time-series-chart.shape-rect'],
+    [EChartsShape.roundRect, 'widgets.time-series-chart.shape-round-rect'],
+    [EChartsShape.triangle, 'widgets.time-series-chart.shape-triangle'],
+    [EChartsShape.diamond, 'widgets.time-series-chart.shape-diamond'],
+    [EChartsShape.pin, 'widgets.time-series-chart.shape-pin'],
+    [EChartsShape.arrow, 'widgets.time-series-chart.shape-arrow'],
+    [EChartsShape.none, 'widgets.time-series-chart.shape-none']
+  ]
+);
+
+type EChartsShapeOffsetFunction = (size: number) => number;
+
+export const timeSeriesChartShapeOffsetFunctions = new Map<EChartsShape, EChartsShapeOffsetFunction>(
+  [
+    [EChartsShape.emptyCircle, size => size / 2 + 1],
+    [EChartsShape.circle, size => size / 2],
+    [EChartsShape.rect, size => size / 2],
+    [EChartsShape.roundRect, size => size / 2],
+    [EChartsShape.triangle, size => size / 2],
+    [EChartsShape.diamond, size => size / 2],
+    [EChartsShape.pin, size => size],
+    [EChartsShape.arrow, () => 0],
+    [EChartsShape.none, () => 0],
+  ]
+);
+
+export enum EChartsAnimationEasing {
+  linear = 'linear',
+  quadraticIn = 'quadraticIn',
+  quadraticOut = 'quadraticOut',
+  quadraticInOut = 'quadraticInOut',
+  cubicIn = 'cubicIn',
+  cubicOut = 'cubicOut',
+  cubicInOut = 'cubicInOut',
+  quarticIn = 'quarticIn',
+  quarticOut = 'quarticOut',
+  quarticInOut = 'quarticInOut',
+  quinticIn = 'quinticIn',
+  quinticOut = 'quinticOut',
+  quinticInOut = 'quinticInOut',
+  sinusoidalIn = 'sinusoidalIn',
+  sinusoidalOut = 'sinusoidalOut',
+  sinusoidalInOut = 'sinusoidalInOut',
+  exponentialIn = 'exponentialIn',
+  exponentialOut = 'exponentialOut',
+  exponentialInOut = 'exponentialInOut',
+  circularIn = 'circularIn',
+  circularOut = 'circularOut',
+  circularInOut = 'circularInOut',
+  elasticIn = 'elasticIn',
+  elasticOut = 'elasticOut',
+  elasticInOut = 'elasticInOut',
+  backIn = 'backIn',
+  backOut = 'backOut',
+  backInOut = 'backInOut',
+  bounceIn = 'bounceIn',
+  bounceOut = 'bounceOut',
+  bounceInOut = 'bounceInOut'
+}
+
+export const echartsAnimationEasings = Object.keys(EChartsAnimationEasing) as EChartsAnimationEasing[];
+
+export interface EChartsAnimationSettings {
+  animation: boolean;
+  animationThreshold: number;
+  animationDuration: number;
+  animationEasing: EChartsAnimationEasing;
+  animationDelay: number;
+  animationDurationUpdate: number;
+  animationEasingUpdate: EChartsAnimationEasing;
+  animationDelayUpdate: number;
+}
+
+export const echartsAnimationDefaultSettings: EChartsAnimationSettings = {
+  animation: true,
+  animationThreshold: 2000,
+  animationDuration: 500,
+  animationEasing: EChartsAnimationEasing.cubicOut,
+  animationDelay: 0,
+  animationDurationUpdate: 300,
+  animationEasingUpdate: EChartsAnimationEasing.cubicOut,
+  animationDelayUpdate: 0
+};
+
+export const timeAxisBandWidthCalculator: TimeAxisBandWidthCalculator = (model) => {
+  let interval: number;
+  const axisOption = model.option;
+  const seriesDataIndices = axisOption.axisPointer?.seriesDataIndices;
+  if (seriesDataIndices?.length) {
+    const seriesDataIndex = seriesDataIndices[0];
+    const series = model.ecModel.getSeriesByIndex(seriesDataIndex.seriesIndex);
+    if (series) {
+      const values = series.getData().getValues(seriesDataIndex.dataIndex);
+      const start = values[2];
+      const end = values[3];
+      if (typeof start === 'number' && typeof end === 'number') {
+        interval = Math.max(end - start, 1);
+      }
+    }
+  }
+  if (!interval) {
+    const tbTimeWindow: WidgetTimewindow = (axisOption as any).tbTimeWindow;
+    if (isDefinedAndNotNull(tbTimeWindow)) {
+      if (axisOption.axisPointer?.value && typeof axisOption.axisPointer?.value === 'number') {
+        const intervalArray = calculateAggIntervalWithWidgetTimeWindow(tbTimeWindow, axisOption.axisPointer.value);
+        const start = intervalArray[0];
+        const end = intervalArray[1];
+        interval = Math.max(end - start, 1);
+      } else {
+        interval = IntervalMath.numberValue(tbTimeWindow.interval);
+      }
+    }
+  }
+  if (interval) {
+    const timeScale = model.axis.scale;
+    const axisExtent = model.axis.getExtent();
+    const dataExtent = timeScale.getExtent();
+    const size = Math.abs(axisExtent[1] - axisExtent[0]);
+    return interval * (size / (dataExtent[1] - dataExtent[0]));
   }
-  return null;
 };
 
-export const getYAxis = (chart: ECharts, axisId: string): Axis2D => {
+export const getAxis = (chart: ECharts, mainType: string, axisId: string): Axis2D => {
   const model: GlobalModel = (chart as any).getModel();
-  const models = model.queryComponents({mainType: 'yAxis', id: axisId});
+  const models = model.queryComponents({mainType, id: axisId});
   if (models?.length) {
     const axisModel = models[0] as AxisModel;
     return axisModel.axis;
@@ -180,17 +268,20 @@ export const getYAxis = (chart: ECharts, axisId: string): Axis2D => {
   return null;
 };
 
-export const calculateYAxisWidth = (chart: ECharts, axisId: string): number => {
-  const axis = getYAxis(chart, axisId);
-  return calculateAxisSize(axis);
+export const calculateAxisSize = (chart: ECharts, mainType: string, axisId: string): number => {
+  const axis = getAxis(chart, mainType, axisId);
+  return _calculateAxisSize(axis);
 };
 
-export const calculateXAxisHeight = (chart: ECharts): number => {
-  const axis = getXAxis(chart);
-  return calculateAxisSize(axis);
+export const measureAxisNameSize = (chart: ECharts, mainType: string, axisId: string, name: string): number => {
+  const axis = getAxis(chart, mainType, axisId);
+  if (axis) {
+    return axis.model.getModel('nameTextStyle').getTextRect(name).height;
+  }
+  return 0;
 };
 
-const calculateAxisSize = (axis: Axis2D): number => {
+const _calculateAxisSize = (axis: Axis2D): number => {
   let size = 0;
   if (axis && axis.model.option.show) {
     const labelUnionRect = estimateLabelUnionRect(axis);
@@ -207,24 +298,24 @@ const calculateAxisSize = (axis: Axis2D): number => {
   return size;
 };
 
-export const measureYAxisNameWidth = (chart: ECharts, axisId: string, name: string): number => {
-  const axis = getYAxis(chart, axisId);
-  if (axis) {
-    return axis.model.getModel('nameTextStyle').getTextRect(name).height;
-  }
-  return 0;
-};
-
-export const measureXAxisNameHeight = (chart: ECharts, name: string): number => {
-  const axis = getXAxis(chart);
-  if (axis) {
-    return axis.model.getModel('nameTextStyle').getTextRect(name).height;
+const measureSymbolOffset = (symbol: string, symbolSize: any): number => {
+  if (isNumber(symbolSize)) {
+    if (symbol) {
+      const offsetFunction = timeSeriesChartShapeOffsetFunctions.get(symbol as EChartsShape);
+      if (offsetFunction) {
+        return offsetFunction(symbolSize);
+      } else {
+        return symbolSize / 2;
+      }
+    }
+  } else {
+    return 0;
   }
-  return 0;
 };
 
-export const measureThresholdLabelOffset = (chart: ECharts, axisId: string, thresholdId: string, value: any): [number, number] => {
-  const axis = getYAxis(chart, axisId);
+export const measureThresholdOffset = (chart: ECharts, axisId: string, thresholdId: string, value: any): [number, number] => {
+  const offset: [number, number] = [0,0];
+  const axis = getAxis(chart, 'yAxis', axisId);
   if (axis && !axis.scale.isBlank()) {
     const extent = axis.scale.getExtent();
     const model: GlobalModel = (chart as any).getModel();
@@ -232,6 +323,16 @@ export const measureThresholdLabelOffset = (chart: ECharts, axisId: string, thre
     if (models?.length) {
       const lineSeriesModel = models[0] as SeriesModel<LineSeriesOption>;
       const markLineModel = lineSeriesModel.getModel('markLine');
+      const dataOption = markLineModel.get('data');
+      for (const dataItemOption of dataOption) {
+        const dataItem = dataItemOption as MarkLine2DDataItemOption;
+        const start = dataItem[0];
+        const startOffset = measureSymbolOffset(start.symbol, start.symbolSize);
+        offset[0] = Math.max(offset[0], startOffset);
+        const end = dataItem[1];
+        const endOffset = measureSymbolOffset(end.symbol, end.symbolSize);
+        offset[1] = Math.max(offset[1], endOffset);
+      }
       const labelPosition = markLineModel.get(['label', 'position']);
       if (labelPosition === 'start' || labelPosition === 'end') {
         const labelModel = markLineModel.getModel('label');
@@ -251,34 +352,91 @@ export const measureThresholdLabelOffset = (chart: ECharts, axisId: string, thre
           }
         }
         if (!textWidth) {
-          return [0,0];
+          return offset;
         }
         const distanceOpt = markLineModel.get(['label', 'distance']);
         let distance = 5;
         if (distanceOpt) {
           distance = typeof distanceOpt === 'number' ? distanceOpt : distanceOpt[0];
         }
-        const offset = distance + textWidth;
+        const paddingOpt = markLineModel.get(['label', 'padding']);
+        let leftPadding = 0;
+        let rightPadding = 0;
+        if (paddingOpt) {
+          if (Array.isArray(paddingOpt)) {
+            if (paddingOpt.length === 4) {
+              leftPadding = paddingOpt[3];
+              rightPadding = paddingOpt[1];
+            } else if (paddingOpt.length === 2) {
+              leftPadding = rightPadding = paddingOpt[1];
+            }
+          } else {
+            leftPadding = rightPadding = paddingOpt;
+          }
+        }
+        const textOffset = distance + textWidth + leftPadding + rightPadding;
         if (labelPosition === 'start') {
-          return [offset, 0];
+          offset[0] = Math.max(offset[0], textOffset);
         } else {
-          return [0, offset];
+          offset[1] = Math.max(offset[1], textOffset);
         }
       }
     }
   }
-  return [0,0];
+  return offset;
 };
 
 export const getAxisExtent = (chart: ECharts, axisId: string): [number, number] => {
-  const axis = getYAxis(chart, axisId);
+  const axis = getAxis(chart, 'yAxis', axisId);
   if (axis) {
     return axis.scale.getExtent();
   }
   return [0,0];
 };
 
-export const toNamedData = (data: DataSet): NamedDataSet => {
+let componentBlurredKey: string;
+
+const isBlurred = (model: SeriesModel): boolean => {
+  if (!componentBlurredKey) {
+    const innerKeys = Object.keys(model).filter(k => k.startsWith('__ec_inner_'));
+    for (const k of innerKeys) {
+      const obj = model[k];
+      if (obj.hasOwnProperty('isBlured')) {
+        componentBlurredKey = k;
+        break;
+      }
+    }
+  }
+  if (componentBlurredKey) {
+    const obj = model[componentBlurredKey];
+    return !!obj?.isBlured;
+  } else {
+    return false;
+  }
+};
+
+export const getFocusedSeriesIndex = (chart: ECharts): number => {
+  const model: GlobalModel = (chart as any).getModel();
+  const models = model.queryComponents({mainType: 'series'});
+  if (models) {
+    let hasBlurred = false;
+    let notBlurredIndex = -1;
+    for (const _model of models) {
+      const seriesModel = _model as SeriesModel;
+      const blurred = isBlurred(seriesModel);
+      if (!blurred) {
+        notBlurredIndex = seriesModel.seriesIndex;
+      }
+      hasBlurred = blurred || hasBlurred;
+    }
+    if (hasBlurred) {
+      return notBlurredIndex;
+    }
+  }
+  return -1;
+};
+
+export const toNamedData = (data: DataSet, valueConverter?: (value: any) => any): NamedDataSet => {
   if (!data?.length) {
     return [];
   } else {
@@ -286,14 +444,43 @@ export const toNamedData = (data: DataSet): NamedDataSet => {
       const ts = isDefinedAndNotNull(d[2]) ? d[2][0] : d[0];
       return {
         name: ts + '',
-        value: toEChartsDataItem(d)
+        value: toEChartsDataItem(d, valueConverter)
       };
     });
   }
 };
 
-const toEChartsDataItem = (entry: DataEntry): EChartsDataItem => {
-  const item: EChartsDataItem = [entry[0], entry[1], entry[0], entry[0]];
+const minDataTs = (dataSet: NamedDataSet): number => dataSet.length ? dataSet.map(data =>
+  Number(data.name)).reduce((a, b) => Math.min(a, b)) : undefined;
+
+const maxDataTs = (dataSet: NamedDataSet): number => dataSet.length ? dataSet.map(data =>
+  Number(data.name)).reduce((a, b) => Math.max(a, b)) : undefined;
+
+export const adjustTimeAxisExtentToData = (timeAxisOption: TimeAxisBaseOption,
+                                           dataItems: EChartsSeriesItem[],
+                                           defaultMin: number,
+                                           defaultMax: number): void => {
+  let min: number;
+  let max: number;
+  for (const item of dataItems) {
+    if (item.enabled) {
+      const minTs = minDataTs(item.data);
+      if (typeof minTs !== 'undefined') {
+        min = (typeof min !== 'undefined') ? Math.min(min, minTs) : minTs;
+      }
+      const maxTs = maxDataTs(item.data);
+      if (typeof maxTs !== 'undefined') {
+        max = (typeof max !== 'undefined') ? Math.max(max, maxTs) : maxTs;
+      }
+    }
+  }
+  timeAxisOption.min = (typeof min !== 'undefined' && Math.abs(min - defaultMin) < 1000) ? min : defaultMin;
+  timeAxisOption.max = (typeof max !== 'undefined' && Math.abs(max - defaultMax) < 1000) ? max : defaultMax;
+};
+
+const toEChartsDataItem = (entry: DataEntry, valueConverter?: (value: any) => any): EChartsDataItem => {
+  const value = valueConverter ? valueConverter(entry[1]) : entry[1];
+  const item: EChartsDataItem = [entry[0], value, entry[0], entry[0]];
   if (isDefinedAndNotNull(entry[2])) {
     item[2] = entry[2][0];
     item[3] = entry[2][1];
@@ -316,8 +503,12 @@ export const tooltipTriggerTranslationMap = new Map<EChartsTooltipTrigger, strin
 export interface EChartsTooltipWidgetSettings {
   showTooltip: boolean;
   tooltipTrigger?: EChartsTooltipTrigger;
+  tooltipShowFocusedSeries?: boolean;
+  tooltipLabelFont: Font;
+  tooltipLabelColor: string;
   tooltipValueFont: Font;
   tooltipValueColor: string;
+  tooltipValueFormatter?: string | EChartsTooltipValueFormatFunction;
   tooltipShowDate: boolean;
   tooltipDateInterval?: boolean;
   tooltipDateFormat: DateFormatSettings;
@@ -327,52 +518,94 @@ export interface EChartsTooltipWidgetSettings {
   tooltipBackgroundBlur: number;
 }
 
+export const createTooltipValueFormatFunction =
+  (tooltipValueFormatter: string | EChartsTooltipValueFormatFunction): EChartsTooltipValueFormatFunction => {
+  let tooltipValueFormatFunction: EChartsTooltipValueFormatFunction;
+  if (isFunction(tooltipValueFormatter)) {
+    tooltipValueFormatFunction = tooltipValueFormatter as EChartsTooltipValueFormatFunction;
+  } else if (typeof tooltipValueFormatter === 'string' && tooltipValueFormatter.length) {
+    try {
+      tooltipValueFormatFunction =
+        new Function('value', 'latestData', tooltipValueFormatter) as EChartsTooltipValueFormatFunction;
+    } catch (e) {}
+  }
+  return tooltipValueFormatFunction;
+};
+
 export const echartsTooltipFormatter = (renderer: Renderer2,
                                         tooltipDateFormat: DateFormatProcessor,
                                         settings: EChartsTooltipWidgetSettings,
                                         params: CallbackDataParams[] | CallbackDataParams,
-                                        decimals: number,
-                                        units: string,
+                                        valueFormatFunction: EChartsTooltipValueFormatFunction,
                                         focusedSeriesIndex: number,
                                         series?: EChartsSeriesItem[],
                                         interval?: Interval): null | HTMLElement => {
-  if (!params || Array.isArray(params) && !params[0]) {
-    return null;
-  }
-  const firstParam = Array.isArray(params) ? params[0] : params;
-  if (!firstParam.value) {
+
+  const tooltipParams = mapTooltipParams(params, series, focusedSeriesIndex);
+  if (!tooltipParams.items.length && !tooltipParams.comparisonItems.length) {
     return null;
   }
+
   const tooltipElement: HTMLElement = renderer.createElement('div');
   renderer.setStyle(tooltipElement, 'display', 'flex');
   renderer.setStyle(tooltipElement, 'flex-direction', 'column');
   renderer.setStyle(tooltipElement, 'align-items', 'flex-start');
-  renderer.setStyle(tooltipElement, 'gap', '4px');
-  if (settings.tooltipShowDate) {
-    const dateElement: HTMLElement = renderer.createElement('div');
-    let dateText: string;
-    const startTs = firstParam.value[2];
-    const endTs = firstParam.value[3];
-    if (settings.tooltipDateInterval && startTs && endTs && (endTs - 1) > startTs) {
-      const startDateText = tooltipDateFormat.update(startTs, interval);
-      const endDateText = tooltipDateFormat.update(endTs - 1, interval);
-      if (startDateText === endDateText) {
-        dateText = startDateText;
-      } else {
-        dateText = startDateText + ' - ' + endDateText;
-      }
-    } else {
-      const ts = firstParam.value[0];
-      dateText = tooltipDateFormat.update(ts, interval);
+  renderer.setStyle(tooltipElement, 'gap', '16px');
+
+  buildItemsTooltip(tooltipElement, tooltipParams.items, renderer, tooltipDateFormat, settings, valueFormatFunction, interval);
+  buildItemsTooltip(tooltipElement, tooltipParams.comparisonItems, renderer, tooltipDateFormat, settings, valueFormatFunction, interval);
+
+  return tooltipElement;
+};
+
+interface TooltipItem {
+  param: CallbackDataParams;
+  dataItem: EChartsSeriesItem;
+}
+
+interface TooltipParams {
+  items: TooltipItem[];
+  comparisonItems: TooltipItem[];
+}
+
+const buildItemsTooltip = (tooltipElement: HTMLElement,
+                           items: TooltipItem[],
+                           renderer: Renderer2,
+                           tooltipDateFormat: DateFormatProcessor,
+                           settings: EChartsTooltipWidgetSettings,
+                           valueFormatFunction: EChartsTooltipValueFormatFunction,
+                           interval?: Interval) => {
+  if (items.length) {
+    const tooltipItemsElement: HTMLElement = renderer.createElement('div');
+    renderer.setStyle(tooltipItemsElement, 'display', 'flex');
+    renderer.setStyle(tooltipItemsElement, 'flex-direction', 'column');
+    renderer.setStyle(tooltipItemsElement, 'align-items', 'flex-start');
+    renderer.setStyle(tooltipItemsElement, 'gap', '4px');
+    renderer.appendChild(tooltipElement, tooltipItemsElement);
+    if (settings.tooltipShowDate) {
+      renderer.appendChild(tooltipItemsElement,
+        constructEchartsTooltipDateElement(renderer, tooltipDateFormat, settings, items[0].param, interval));
     }
-    renderer.appendChild(dateElement, renderer.createText(dateText));
-    renderer.setStyle(dateElement, 'font-family', settings.tooltipDateFont.family);
-    renderer.setStyle(dateElement, 'font-size', settings.tooltipDateFont.size + settings.tooltipDateFont.sizeUnit);
-    renderer.setStyle(dateElement, 'font-style', settings.tooltipDateFont.style);
-    renderer.setStyle(dateElement, 'font-weight', settings.tooltipDateFont.weight);
-    renderer.setStyle(dateElement, 'line-height', settings.tooltipDateFont.lineHeight);
-    renderer.setStyle(dateElement, 'color', settings.tooltipDateColor);
-    renderer.appendChild(tooltipElement, dateElement);
+    for (const item of items) {
+      renderer.appendChild(tooltipItemsElement,
+        constructEchartsTooltipSeriesElement(renderer, settings, item, valueFormatFunction));
+    }
+  }
+};
+
+const mapTooltipParams = (params: CallbackDataParams[] | CallbackDataParams,
+                          series?: EChartsSeriesItem[],
+                          focusedSeriesIndex?: number): TooltipParams => {
+  const result: TooltipParams = {
+    items: [],
+    comparisonItems: []
+  };
+  if (!params || Array.isArray(params) && !params[0]) {
+    return result;
+  }
+  const firstParam = Array.isArray(params) ? params[0] : params;
+  if (!firstParam.value) {
+    return result;
   }
   let seriesParams: CallbackDataParams = null;
   if (Array.isArray(params) && focusedSeriesIndex > -1) {
@@ -381,21 +614,63 @@ export const echartsTooltipFormatter = (renderer: Renderer2,
     seriesParams = params;
   }
   if (seriesParams) {
-    renderer.appendChild(tooltipElement, constructEchartsTooltipSeriesElement(renderer, settings, seriesParams, decimals, units, series));
+    appendTooltipItem(result, seriesParams, series);
   } else if (Array.isArray(params)) {
     for (seriesParams of params) {
-      renderer.appendChild(tooltipElement, constructEchartsTooltipSeriesElement(renderer, settings, seriesParams, decimals, units, series));
+      appendTooltipItem(result, seriesParams, series);
     }
   }
-  return tooltipElement;
+  return result;
+};
+
+const appendTooltipItem = (tooltipParams: TooltipParams, seriesParams: CallbackDataParams, series?: EChartsSeriesItem[]) => {
+  const dataItem = series?.find(s => s.id === seriesParams.seriesId);
+  const tooltipItem: TooltipItem = {
+    param: seriesParams,
+    dataItem
+  };
+  if (dataItem?.comparisonItem) {
+    tooltipParams.comparisonItems.push(tooltipItem);
+  } else {
+    tooltipParams.items.push(tooltipItem);
+  }
+};
+
+const constructEchartsTooltipDateElement = (renderer: Renderer2,
+                                            tooltipDateFormat: DateFormatProcessor,
+                                            settings: EChartsTooltipWidgetSettings,
+                                            param: CallbackDataParams,
+                                            interval?: Interval): HTMLElement => {
+  const dateElement: HTMLElement = renderer.createElement('div');
+  let dateText: string;
+  const startTs = param.value[2];
+  const endTs = param.value[3];
+  if (settings.tooltipDateInterval && startTs && endTs && (endTs - 1) > startTs) {
+    const startDateText = tooltipDateFormat.update(startTs, interval);
+    const endDateText = tooltipDateFormat.update(endTs - 1, interval);
+    if (startDateText === endDateText) {
+      dateText = startDateText;
+    } else {
+      dateText = startDateText + ' - ' + endDateText;
+    }
+  } else {
+    const ts = param.value[0];
+    dateText = tooltipDateFormat.update(ts, interval);
+  }
+  renderer.appendChild(dateElement, renderer.createText(dateText));
+  renderer.setStyle(dateElement, 'font-family', settings.tooltipDateFont.family);
+  renderer.setStyle(dateElement, 'font-size', settings.tooltipDateFont.size + settings.tooltipDateFont.sizeUnit);
+  renderer.setStyle(dateElement, 'font-style', settings.tooltipDateFont.style);
+  renderer.setStyle(dateElement, 'font-weight', settings.tooltipDateFont.weight);
+  renderer.setStyle(dateElement, 'line-height', settings.tooltipDateFont.lineHeight);
+  renderer.setStyle(dateElement, 'color', settings.tooltipDateColor);
+  return dateElement;
 };
 
 const constructEchartsTooltipSeriesElement = (renderer: Renderer2,
                                               settings: EChartsTooltipWidgetSettings,
-                                              seriesParams: CallbackDataParams,
-                                              decimals: number,
-                                              units: string,
-                                              series?: EChartsSeriesItem[]): HTMLElement => {
+                                              item: TooltipItem,
+                                              valueFormatFunction: EChartsTooltipValueFormatFunction): HTMLElement => {
   const labelValueElement: HTMLElement = renderer.createElement('div');
   renderer.setStyle(labelValueElement, 'display', 'flex');
   renderer.setStyle(labelValueElement, 'flex-direction', 'row');
@@ -411,29 +686,34 @@ const constructEchartsTooltipSeriesElement = (renderer: Renderer2,
   renderer.setStyle(circleElement, 'width', '8px');
   renderer.setStyle(circleElement, 'height', '8px');
   renderer.setStyle(circleElement, 'border-radius', '50%');
-  renderer.setStyle(circleElement, 'background', seriesParams.color);
+  renderer.setStyle(circleElement, 'background', item.param.color);
   renderer.appendChild(labelElement, circleElement);
   const labelTextElement: HTMLElement = renderer.createElement('div');
-  renderer.appendChild(labelTextElement, renderer.createText(seriesParams.seriesName));
-  renderer.setStyle(labelTextElement, 'font-family', 'Roboto');
-  renderer.setStyle(labelTextElement, 'font-size', '12px');
-  renderer.setStyle(labelTextElement, 'font-style', 'normal');
-  renderer.setStyle(labelTextElement, 'font-weight', '400');
-  renderer.setStyle(labelTextElement, 'line-height', '16px');
-  renderer.setStyle(labelTextElement, 'letter-spacing', '0.4px');
-  renderer.setStyle(labelTextElement, 'color', 'rgba(0, 0, 0, 0.76)');
+  renderer.appendChild(labelTextElement, renderer.createText(item.param.seriesName));
+  renderer.setStyle(labelTextElement, 'font-family', settings.tooltipLabelFont.family);
+  renderer.setStyle(labelTextElement, 'font-size', settings.tooltipLabelFont.size + settings.tooltipLabelFont.sizeUnit);
+  renderer.setStyle(labelTextElement, 'font-style', settings.tooltipLabelFont.style);
+  renderer.setStyle(labelTextElement, 'font-weight', settings.tooltipLabelFont.weight);
+  renderer.setStyle(labelTextElement, 'line-height', settings.tooltipLabelFont.lineHeight);
+  renderer.setStyle(labelTextElement, 'color', settings.tooltipLabelColor);
   renderer.appendChild(labelElement, labelTextElement);
   const valueElement: HTMLElement = renderer.createElement('div');
-  let formatDecimals = decimals;
-  let formatUnits = units;
-  if (series) {
-    const item = series.find(s => s.id === seriesParams.seriesId);
-    if (item) {
-      formatDecimals = item.decimals;
-      formatUnits = item.units;
+  let formatFunction = valueFormatFunction;
+  let latestData: FormattedData;
+  let units = '';
+  let decimals = 0;
+  if (item.dataItem) {
+    if (item.dataItem.tooltipValueFormatFunction) {
+      formatFunction = item.dataItem.tooltipValueFormatFunction;
     }
+    latestData = item.dataItem.latestData;
+    units = item.dataItem.units;
+    decimals = item.dataItem.decimals;
+  }
+  if (!latestData) {
+    latestData = {} as FormattedData;
   }
-  const value = formatValue(seriesParams.value[1], formatDecimals, formatUnits, false);
+  const value = formatFunction(item.param.value[1], latestData, units, decimals);
   renderer.appendChild(valueElement, renderer.createText(value));
   renderer.setStyle(valueElement, 'flex', '1');
   renderer.setStyle(valueElement, 'text-align', 'end');
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart-widget.component.html
new file mode 100644
index 0000000000..436687b23a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart-widget.component.html
@@ -0,0 +1,24 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<tb-latest-chart
+    #latestChart
+    [ctx]="ctx"
+    [settings]="settings"
+    [widgetTitlePanel]="widgetTitlePanel"
+    [callbacks]="callbacks"
+></tb-latest-chart>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.html
new file mode 100644
index 0000000000..bd85f19d81
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.html
@@ -0,0 +1,37 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div class="tb-latest-chart-panel" [style]="backgroundStyle$ | async">
+  <div class="tb-latest-chart-overlay" [style]="overlayStyle"></div>
+  <ng-container *ngTemplateOutlet="widgetTitlePanel"></ng-container>
+  <div #chartContent class="tb-latest-chart-content" [class]="legendClass">
+    <div #chartShape class="tb-latest-chart-shape">
+    </div>
+    <div *ngIf="showLegend" #chartLegend class="tb-latest-chart-legend">
+      <div class="tb-latest-chart-legend-item" *ngFor="let legendItem of legendItems" [class]="{'pointer': !legendItem.total && legendItem.hasValue}"
+           (mouseenter)="onLegendItemEnter(legendItem)"
+           (mouseleave)="onLegendItemLeave(legendItem)"
+           (click)="toggleLegendItem(legendItem)">
+        <div class="tb-latest-chart-legend-item-label">
+          <div class="tb-latest-chart-legend-item-label-circle" [style]="{background: (!legendItem.dataKey?.hidden && legendItem.hasValue) ? legendItem.color : null}"></div>
+          <div [style]="(!legendItem.dataKey?.hidden && legendItem.hasValue) ? legendLabelStyle : disabledLegendLabelStyle">{{ legendItem.label }}</div>
+        </div>
+        <div [style]="(!legendItem.dataKey?.hidden && legendItem.hasValue) ? legendValueStyle : disabledLegendValueStyle" class="tb-latest-chart-legend-item-value">{{ legendItem.value }}</div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.scss
similarity index 82%
rename from ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.scss
rename to ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.scss
index 3ed90e1c2c..77b4f0fc08 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.scss
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-.tb-doughnut-panel {
+.tb-latest-chart-panel {
   width: 100%;
   height: 100%;
   position: relative;
@@ -21,10 +21,10 @@
   flex-direction: column;
   gap: 16px;
   padding: 20px 24px 24px 24px;
-  > div:not(.tb-doughnut-overlay) {
+  > div:not(.tb-latest-chart-overlay) {
     z-index: 1;
   }
-  .tb-doughnut-overlay {
+  .tb-latest-chart-overlay {
     position: absolute;
     top: 12px;
     left: 12px;
@@ -34,7 +34,7 @@
   div.tb-widget-title {
     padding: 0;
   }
-  .tb-doughnut-content {
+  .tb-latest-chart-content {
     flex: 1;
     min-width: 0;
     min-height: 0;
@@ -50,22 +50,22 @@
     &.legend-left {
       flex-direction: row-reverse;
     }
-    .tb-doughnut-shape {
+    .tb-latest-chart-shape {
       flex: 1;
-      min-width: 0;
-      min-height: 0;
+      min-width: 10px;
+      min-height: 10px;
       display: flex;
       align-items: center;
       justify-content: center;
     }
-    .tb-doughnut-legend {
+    .tb-latest-chart-legend {
       display: flex;
       justify-content: space-around;
       align-items: center;
       align-self: stretch;
       flex-wrap: wrap;
       gap: 8px;
-      .tb-doughnut-legend-item {
+      .tb-latest-chart-legend-item {
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -74,19 +74,19 @@
         &.pointer {
           cursor: pointer;
         }
-        .tb-doughnut-legend-item-label {
+        .tb-latest-chart-legend-item-label {
           display: flex;
           align-items: center;
           gap: 4px;
           color: #ccc;
-          .tb-doughnut-legend-item-label-circle {
+          .tb-latest-chart-legend-item-label-circle {
             width: 8px;
             height: 8px;
             border-radius: 50%;
             background-color: #ccc;
           }
         }
-        .tb-doughnut-legend-item-value {
+        .tb-latest-chart-legend-item-value {
           padding-left: 12px;
           color: #ccc;
         }
@@ -94,11 +94,11 @@
     }
     &.legend-right, &.legend-left {
       gap: 24px;
-      .tb-doughnut-legend {
+      .tb-latest-chart-legend {
         flex-direction: column;
         justify-content: center;
         align-items: stretch;
-        .tb-doughnut-legend-item {
+        .tb-latest-chart-legend-item {
           flex-direction: row;
           justify-content: space-between;
           align-items: center;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.ts
new file mode 100644
index 0000000000..21599dc94b
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.ts
@@ -0,0 +1,200 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import {
+  AfterViewInit,
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  Input,
+  OnDestroy,
+  OnInit,
+  Renderer2,
+  TemplateRef,
+  ViewChild,
+  ViewEncapsulation
+} from '@angular/core';
+import {
+  LatestChartDataItem,
+  LatestChartLegendItem,
+  LatestChartSettings,
+  LatestChartWidgetSettings
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import { WidgetContext } from '@home/models/widget-component.models';
+import { Observable } from 'rxjs';
+import { backgroundStyle, ComponentStyle, overlayStyle, textStyle } from '@shared/models/widget-settings.models';
+import { TbLatestChart } from '@home/components/widget/lib/chart/latest-chart';
+import { ResizeObserver } from '@juggle/resize-observer';
+import { ImagePipe } from '@shared/pipe/image.pipe';
+import { DomSanitizer } from '@angular/platform-browser';
+import { WidgetComponent } from '@home/components/widget/widget.component';
+import { TranslateService } from '@ngx-translate/core';
+import { LegendPosition } from '@shared/models/widget.models';
+
+export interface LatestChartComponentCallbacks {
+  createChart: (chartShape: ElementRef<HTMLElement>, renderer: Renderer2) => TbLatestChart<LatestChartSettings>;
+  onItemClick?: ($event: Event, item: LatestChartDataItem) => void;
+}
+
+@Component({
+  selector: 'tb-latest-chart',
+  templateUrl: './latest-chart.component.html',
+  styleUrls: ['./latest-chart.component.scss'],
+  encapsulation: ViewEncapsulation.None
+})
+export class LatestChartComponent implements OnInit, OnDestroy, AfterViewInit {
+
+  @ViewChild('chartContent', {static: false})
+  chartContent: ElementRef<HTMLElement>;
+
+  @ViewChild('chartShape', {static: false})
+  chartShape: ElementRef<HTMLElement>;
+
+  @ViewChild('chartLegend', {static: false})
+  chartLegend: ElementRef<HTMLElement>;
+
+  @Input()
+  ctx: WidgetContext;
+
+  @Input()
+  widgetTitlePanel: TemplateRef<any>;
+
+  @Input()
+  callbacks: LatestChartComponentCallbacks;
+
+  @Input()
+  settings: LatestChartWidgetSettings;
+
+  showLegend: boolean;
+  legendClass: string;
+
+  backgroundStyle$: Observable<ComponentStyle>;
+  overlayStyle: ComponentStyle = {};
+
+  get legendItems(): LatestChartLegendItem[] {
+    return this.latestChart ? this.latestChart.getLegendItems() : [];
+  }
+
+  legendLabelStyle: ComponentStyle;
+  legendValueStyle: ComponentStyle;
+  disabledLegendLabelStyle: ComponentStyle;
+  disabledLegendValueStyle: ComponentStyle;
+
+  private shapeResize$: ResizeObserver;
+  private legendHorizontal: boolean;
+
+  private latestChart: TbLatestChart<LatestChartSettings>;
+
+  constructor(private imagePipe: ImagePipe,
+              private sanitizer: DomSanitizer,
+              private widgetComponent: WidgetComponent,
+              private renderer: Renderer2,
+              private translate: TranslateService,
+              private cd: ChangeDetectorRef) {
+  }
+
+  ngOnInit(): void {
+    this.showLegend = this.settings.showLegend;
+
+    this.backgroundStyle$ = backgroundStyle(this.settings.background, this.imagePipe, this.sanitizer);
+    this.overlayStyle = overlayStyle(this.settings.background.overlay);
+
+    if (this.showLegend) {
+      this.legendClass = `legend-${this.settings.legendPosition}`;
+      this.legendHorizontal = [LegendPosition.left, LegendPosition.right].includes(this.settings.legendPosition);
+      this.legendLabelStyle = textStyle(this.settings.legendLabelFont);
+      this.disabledLegendLabelStyle = textStyle(this.settings.legendLabelFont);
+      this.legendLabelStyle.color = this.settings.legendLabelColor;
+      this.legendValueStyle = textStyle(this.settings.legendValueFont);
+      this.disabledLegendValueStyle = textStyle(this.settings.legendValueFont);
+      this.legendValueStyle.color = this.settings.legendValueColor;
+    }
+  }
+
+  ngAfterViewInit() {
+    this.latestChart = this.callbacks.createChart(this.chartShape, this.renderer);
+    this.latestChart.onItemClick(this.callbacks.onItemClick);
+    this.shapeResize$ = new ResizeObserver(() => {
+      this.onResize();
+    });
+    this.shapeResize$.observe(this.chartContent.nativeElement);
+    this.onResize();
+  }
+
+  ngOnDestroy() {
+    if (this.shapeResize$) {
+      this.shapeResize$.disconnect();
+    }
+    if (this.latestChart) {
+      this.latestChart.destroy();
+    }
+  }
+
+  public onInit() {
+    const borderRadius = this.ctx.$widgetElement.css('borderRadius');
+    this.overlayStyle = {...this.overlayStyle, ...{borderRadius}};
+    this.cd.detectChanges();
+  }
+
+  public onDataUpdated() {
+    if (this.latestChart) {
+      this.latestChart.update();
+    }
+    if (this.showLegend) {
+      this.cd.detectChanges();
+      if (this.legendHorizontal) {
+        setTimeout(() => {
+          this.onResize();
+        });
+      }
+    }
+  }
+
+  public onLegendItemEnter(item: LatestChartLegendItem) {
+    if (!item.total && item.hasValue) {
+      this.latestChart.keyEnter(item.dataKey);
+    }
+  }
+
+  public onLegendItemLeave(item: LatestChartLegendItem) {
+    if (!item.total && item.hasValue) {
+      this.latestChart.keyLeave(item.dataKey);
+    }
+  }
+
+  public toggleLegendItem(item: LatestChartLegendItem) {
+    if (!item.total && item.hasValue) {
+      this.latestChart.toggleKey(item.dataKey);
+    }
+  }
+
+  private onResize() {
+    if (this.legendHorizontal) {
+      this.renderer.setStyle(this.chartShape.nativeElement, 'max-width', null);
+      this.renderer.setStyle(this.chartShape.nativeElement, 'min-width', null);
+      this.renderer.setStyle(this.chartLegend.nativeElement, 'flex', null);
+    }
+    const shapeWidth = this.chartShape.nativeElement.getBoundingClientRect().width;
+    const shapeHeight = this.chartShape.nativeElement.getBoundingClientRect().height;
+    const size = Math.min(shapeWidth, shapeHeight);
+    if (this.legendHorizontal) {
+      this.renderer.setStyle(this.chartShape.nativeElement, 'max-width', `${size}px`);
+      this.renderer.setStyle(this.chartShape.nativeElement, 'min-width', `${size}px`);
+      this.renderer.setStyle(this.chartLegend.nativeElement, 'flex', '1');
+    }
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.models.ts
new file mode 100644
index 0000000000..c99cd5e773
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.models.ts
@@ -0,0 +1,122 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { DataKey, Datasource, LegendPosition } from '@shared/models/widget.models';
+import { BackgroundSettings, Font } from '@shared/models/widget-settings.models';
+import { Renderer2 } from '@angular/core';
+import { CallbackDataParams } from 'echarts/types/dist/shared';
+import { formatValue, isDefinedAndNotNull } from '@core/utils';
+import { EChartsAnimationSettings } from '@home/components/widget/lib/chart/echarts-widget.models';
+
+export interface LatestChartDataItem {
+  id: number;
+  datasource: Datasource;
+  dataKey: DataKey;
+  value: number;
+  hasValue: boolean;
+  enabled: boolean;
+}
+
+export interface LatestChartLegendItem {
+  dataKey?: DataKey;
+  color: string;
+  label: string;
+  value: string;
+  hasValue: boolean;
+  total?: boolean;
+}
+
+export enum LatestChartTooltipValueType {
+  absolute = 'absolute',
+  percentage = 'percentage'
+}
+
+export const latestChartTooltipValueTypes = Object.keys(LatestChartTooltipValueType) as LatestChartTooltipValueType[];
+
+export const latestChartTooltipValueTypeTranslations = new Map<LatestChartTooltipValueType, string>(
+  [
+    [LatestChartTooltipValueType.absolute, 'widgets.latest-chart.tooltip-value-type-absolute'],
+    [LatestChartTooltipValueType.percentage, 'widgets.latest-chart.tooltip-value-type-percentage']
+  ]
+);
+
+export interface LatestChartTooltipSettings {
+  showTooltip: boolean;
+  tooltipValueType: LatestChartTooltipValueType;
+  tooltipValueDecimals: number;
+  tooltipValueFont: Font;
+  tooltipValueColor: string;
+  tooltipBackgroundColor: string;
+  tooltipBackgroundBlur: number;
+}
+
+export interface LatestChartSettings extends LatestChartTooltipSettings {
+  autoScale?: boolean;
+  sortSeries: boolean;
+  showTotal?: boolean;
+  showLegend: boolean;
+  animation: EChartsAnimationSettings;
+}
+
+export interface LatestChartWidgetSettings extends LatestChartSettings {
+  legendPosition: LegendPosition;
+  legendLabelFont: Font;
+  legendLabelColor: string;
+  legendValueFont: Font;
+  legendValueColor: string;
+  background: BackgroundSettings;
+}
+
+export const latestChartTooltipFormatter = (renderer: Renderer2,
+                                            settings: LatestChartTooltipSettings,
+                                            params: CallbackDataParams,
+                                            units: string,
+                                            total: number): null | HTMLElement => {
+  if (!params.name) {
+    return null;
+  }
+  let value: string;
+  if (settings.tooltipValueType === LatestChartTooltipValueType.percentage) {
+    const percents = isDefinedAndNotNull(params.percent) ? params.percent : (params.value as number) / total * 100;
+    value = formatValue(percents, settings.tooltipValueDecimals, '%', false);
+  } else {
+    value = formatValue(params.value, settings.tooltipValueDecimals, units, false);
+  }
+  const textElement: HTMLElement = renderer.createElement('div');
+  renderer.setStyle(textElement, 'display', 'inline-flex');
+  renderer.setStyle(textElement, 'align-items', 'center');
+  renderer.setStyle(textElement, 'gap', '8px');
+  const labelElement: HTMLElement = renderer.createElement('div');
+  renderer.appendChild(labelElement, renderer.createText(params.name));
+  renderer.setStyle(labelElement, 'font-family', 'Roboto');
+  renderer.setStyle(labelElement, 'font-size', '11px');
+  renderer.setStyle(labelElement, 'font-style', 'normal');
+  renderer.setStyle(labelElement, 'font-weight', '400');
+  renderer.setStyle(labelElement, 'line-height', '16px');
+  renderer.setStyle(labelElement, 'letter-spacing', '0.25px');
+  renderer.setStyle(labelElement, 'color', 'rgba(0, 0, 0, 0.38)');
+  const valueElement: HTMLElement = renderer.createElement('div');
+  renderer.appendChild(valueElement, renderer.createText(value));
+  renderer.setStyle(valueElement, 'font-family', settings.tooltipValueFont.family);
+  renderer.setStyle(valueElement, 'font-size', settings.tooltipValueFont.size + settings.tooltipValueFont.sizeUnit);
+  renderer.setStyle(valueElement, 'font-style', settings.tooltipValueFont.style);
+  renderer.setStyle(valueElement, 'font-weight', settings.tooltipValueFont.weight);
+  renderer.setStyle(valueElement, 'line-height', settings.tooltipValueFont.lineHeight);
+  renderer.setStyle(valueElement, 'color', settings.tooltipValueColor);
+  renderer.appendChild(textElement, labelElement);
+  renderer.appendChild(textElement, valueElement);
+  return textElement;
+};
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.ts
new file mode 100644
index 0000000000..ddb6e47560
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.ts
@@ -0,0 +1,374 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { ResizeObserver } from '@juggle/resize-observer';
+import { ECharts, echartsModule, EChartsOption } from '@home/components/widget/lib/chart/echarts-widget.models';
+import {
+  LatestChartDataItem,
+  LatestChartLegendItem,
+  LatestChartSettings,
+  latestChartTooltipFormatter
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import { WidgetContext } from '@home/models/widget-component.models';
+import { DeepPartial } from '@shared/models/common';
+import { Renderer2 } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { formatValue, isDefinedAndNotNull, isNumeric, mergeDeep } from '@core/utils';
+import { DataKey } from '@shared/models/widget.models';
+import * as echarts from 'echarts/core';
+import { CallbackDataParams } from 'echarts/types/dist/shared';
+import { SVG, Svg } from '@svgdotjs/svg.js';
+
+export abstract class TbLatestChart<S extends LatestChartSettings> {
+
+  private readonly shapeResize$: ResizeObserver;
+
+  protected readonly settings: S;
+
+  protected readonly decimals: number;
+  protected readonly units: string;
+
+  protected total = 0;
+  protected totalText = 'N/A';
+
+  protected latestChart: ECharts;
+  protected latestChartOption: EChartsOption;
+
+  protected svgShape: Svg;
+
+  protected dataItems: LatestChartDataItem[] = [];
+  private legendItems: LatestChartLegendItem[] = [];
+
+  private itemClick: ($event: Event, item: LatestChartDataItem) => void;
+
+  protected constructor(private ctx: WidgetContext,
+                        private readonly inputSettings: DeepPartial<S>,
+                        protected chartElement: HTMLElement,
+                        private renderer: Renderer2,
+                        protected translate: TranslateService,
+                        private autoResize = true) {
+    this.settings = mergeDeep({} as S,
+      this.defaultSettings(),
+      this.inputSettings as S);
+
+    this.decimals = this.ctx.decimals;
+    this.units = this.ctx.units;
+
+    this.initSettings();
+
+    this.setupData();
+
+    this.onResize();
+    if (this.autoResize) {
+      this.shapeResize$ = new ResizeObserver(() => {
+        this.onResize();
+      });
+      this.shapeResize$.observe(this.chartElement);
+    }
+  }
+
+  private setupData(): void {
+    let counter = 0;
+    if (this.ctx.datasources.length) {
+      for (const datasource of this.ctx.datasources) {
+        const dataKeys = datasource.dataKeys;
+        for (const dataKey of dataKeys) {
+          const id = counter++;
+          this.dataItems.push({
+            id,
+            datasource,
+            dataKey,
+            value: 0,
+            hasValue: false,
+            enabled: true
+          });
+          if (this.settings.showLegend) {
+            this.legendItems.push(
+              {
+                dataKey,
+                value: '--',
+                label: dataKey.label,
+                color: dataKey.color,
+                hasValue: false
+              }
+            );
+          }
+        }
+      }
+    }
+    if (this.settings.sortSeries) {
+      this.dataItems.sort((a, b) => a.dataKey.label.localeCompare(b.dataKey.label));
+      if (this.settings.showLegend) {
+        this.legendItems.sort((a, b) => a.label.localeCompare(b.label));
+      }
+    }
+    if (this.settings.showLegend && !this.settings.showTotal) {
+      this.legendItems.push(
+        {
+          value: '--',
+          label: this.translate.instant('widgets.latest-chart.total'),
+          color: 'rgba(0, 0, 0, 0.06)',
+          hasValue: false,
+          total: true
+        }
+      );
+    }
+  }
+
+  public getLegendItems(): LatestChartLegendItem[] {
+    return this.legendItems;
+  }
+
+  public update(): void {
+    for (const dsData of this.ctx.data) {
+      let value = 0;
+      const tsValue = dsData.data[0];
+      const dataItem = this.dataItems.find(item => item.dataKey === dsData.dataKey);
+      if (tsValue && isDefinedAndNotNull(tsValue[1]) && isNumeric(tsValue[1])) {
+        value = tsValue[1];
+        dataItem.hasValue = true;
+        dataItem.value = Number(value);
+      } else {
+        dataItem.hasValue = false;
+        dataItem.value = 0;
+      }
+    }
+    this.updateSeriesData();
+  }
+
+  public keyEnter(dataKey: DataKey): void {
+    const item = this.dataItems.find(d => d.dataKey === dataKey);
+    if (item) {
+      const dataIndex = this.latestChartOption.series[0].data.findIndex(
+        (d: any) => d.id === item.id);
+      if (dataIndex > -1) {
+        this.latestChart.dispatchAction({
+          type: 'highlight',
+          dataIndex
+        });
+      }
+    }
+  }
+
+  public keyLeave(dataKey: DataKey): void {
+    const item = this.dataItems.find(d => d.dataKey === dataKey);
+    if (item) {
+      const dataIndex = this.latestChartOption.series[0].data.findIndex(
+        (d: any) => d.id === item.id);
+      if (dataIndex > -1) {
+        this.latestChart.dispatchAction({
+          type: 'downplay',
+          dataIndex
+        });
+      }
+    }
+  }
+
+  public toggleKey(dataKey: DataKey): void {
+    const enable = dataKey.hidden;
+    const dataItem = this.dataItems.find(d => d.dataKey === dataKey);
+    if (dataItem) {
+      let dataIndex = this.latestChartOption.series[0].data.findIndex(
+        (d: any) => d.id === dataItem.id);
+      dataItem.enabled = enable;
+      if (!enable && dataIndex > -1) {
+        this.latestChart.dispatchAction({
+          type: 'downplay',
+          dataIndex
+        });
+      }
+      this.updateSeriesData();
+      dataKey.hidden = !enable;
+      if (enable) {
+        dataIndex = this.latestChartOption.series[0].data.findIndex(
+          (d: any) => d.id === dataItem.id);
+        if (dataIndex > -1) {
+          this.latestChart.dispatchAction({
+            type: 'highlight',
+            dataIndex
+          });
+        }
+      }
+    }
+  }
+
+  public destroy(): void {
+    if (this.shapeResize$) {
+      this.shapeResize$.disconnect();
+    }
+    if (this.latestChart) {
+      this.latestChart.dispose();
+    }
+  }
+
+  public resize(): void {
+    this.onResize();
+  }
+
+  public onItemClick(itemClick: ($event: Event, item: LatestChartDataItem) => void) {
+    this.itemClick = itemClick;
+  }
+
+  private updateSeriesData(initial = false) {
+    this.total = 0;
+    this.totalText = 'N/A';
+    let hasValue = false;
+    for (const dataItem of this.dataItems) {
+      if (dataItem.enabled && dataItem.hasValue) {
+        hasValue = true;
+        this.total += dataItem.value;
+      }
+      if (this.settings.showLegend) {
+        const legendItem = this.legendItems.find(item => item.dataKey === dataItem.dataKey);
+        if (dataItem.hasValue) {
+          legendItem.hasValue = true;
+          legendItem.value = formatValue(dataItem.value, this.decimals, this.units, false);
+        } else {
+          legendItem.hasValue = false;
+          legendItem.value = '--';
+        }
+      }
+    }
+    if (this.settings.showTotal || this.settings.showLegend) {
+      if (hasValue) {
+        this.totalText = formatValue(this.total, this.decimals, this.units, false);
+        if (this.settings.showLegend && !this.settings.showTotal) {
+          this.legendItems[this.legendItems.length - 1].hasValue = true;
+          this.legendItems[this.legendItems.length - 1].value = this.totalText;
+        }
+      } else if (this.settings.showLegend && !this.settings.showTotal) {
+        this.legendItems[this.legendItems.length - 1].hasValue = false;
+        this.legendItems[this.legendItems.length - 1].value = '--';
+      }
+    }
+    this.doUpdateSeriesData();
+    this.latestChart.setOption(this.latestChartOption);
+    this.afterUpdateSeriesData(initial);
+  }
+
+  private drawChart() {
+    echartsModule.init();
+    this.renderer.setStyle(this.chartElement, 'letterSpacing', 'normal');
+    this.latestChart = echarts.init(this.chartElement, null, {
+      renderer: 'svg',
+      width: this.settings.autoScale ? this.initialShapeWidth() : undefined,
+      height: this.settings.autoScale ? this.initialShapeHeight() : undefined,
+    });
+    this.latestChartOption = {
+      tooltip: {
+        trigger: this.settings.showTooltip ? 'item' : 'none',
+        confine: false,
+        appendTo: 'body',
+        formatter: (params: CallbackDataParams) =>
+          this.settings.showTooltip
+            ? latestChartTooltipFormatter(this.renderer, this.settings, params, this.units, this.total)
+            : undefined,
+        padding: [4, 8],
+        backgroundColor: this.settings.tooltipBackgroundColor,
+        extraCssText: `line-height: 1; backdrop-filter: blur(${this.settings.tooltipBackgroundBlur}px);`,
+        position: (pos) => [pos[0] + 10, pos[1] + 10]
+      },
+      animation: this.settings.animation.animation,
+      animationThreshold: this.settings.animation.animationThreshold,
+      animationDuration: this.settings.animation.animationDuration,
+      animationEasing: this.settings.animation.animationEasing,
+      animationDelay: this.settings.animation.animationDelay,
+      animationDurationUpdate: this.settings.animation.animationDurationUpdate,
+      animationEasingUpdate: this.settings.animation.animationEasingUpdate,
+      animationDelayUpdate: this.settings.animation.animationDelayUpdate
+    };
+    this.prepareLatestChartOption();
+    this.updateSeriesData(true);
+    this.renderer.setStyle(this.latestChart.getDom().firstChild, 'overflow', 'visible');
+    if (this.settings.autoScale) {
+      this.renderer.setStyle(this.latestChart.getDom().firstChild, 'position', 'absolute');
+    }
+    this.renderer.setStyle(this.latestChart.getDom().firstChild.firstChild, 'overflow', 'visible');
+    this.svgShape = SVG(this.latestChart.getDom().firstChild.firstChild).toRoot();
+    this.afterDrawChart();
+    this.latestChart.on('click', (params) => {
+      this.onChartClick(params);
+    });
+  }
+
+  protected onChartClick(params: echarts.ECElementEvent) {
+    if (params.componentType === 'series') {
+      if (params.data) {
+        const data = params.data as any;
+        if (isDefinedAndNotNull(data?.id)) {
+          const item = this.dataItems.find(d => d.id === data.id);
+          if (item && this.itemClick) {
+            this.itemClick(params.event.event, item);
+          }
+        }
+      }
+    }
+  };
+
+  private onResize() {
+    const shapeWidth = this.chartElement.offsetWidth;
+    const shapeHeight = this.chartElement.offsetHeight;
+    if (shapeWidth && shapeHeight) {
+      if (!this.latestChart) {
+        this.drawChart();
+      } else {
+        const width = this.latestChart.getWidth();
+        const height = this.latestChart.getHeight();
+        if (width !== shapeWidth || height !== shapeHeight) {
+          this.beforeResize(shapeWidth, shapeHeight);
+          if (!this.settings.autoScale) {
+            this.latestChart.resize();
+          } else {
+            let scale: number;
+            if (shapeWidth < shapeHeight) {
+              scale = shapeWidth / this.initialShapeWidth();
+            } else {
+              scale = shapeHeight / this.initialShapeHeight();
+            }
+            this.renderer.setStyle(this.latestChart.getDom().firstChild, 'transform', `scale(${scale})`);
+          }
+          this.afterResize(shapeWidth, shapeHeight);
+        }
+      }
+    }
+  }
+
+  protected initSettings() {
+  }
+
+  protected initialShapeWidth(): number {
+    return 100;
+  }
+
+  protected initialShapeHeight(): number {
+    return 100;
+  }
+
+  protected beforeResize(_shapeWidth: number, _shapeHeight: number) {};
+
+  protected afterResize(_shapeWidth: number, _shapeHeight: number) {};
+
+  protected afterDrawChart() {};
+
+  protected afterUpdateSeriesData(_initial: boolean) {};
+
+  protected abstract defaultSettings(): S;
+
+  protected abstract prepareLatestChartOption(): void;
+
+  protected abstract doUpdateSeriesData(): void;
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.component.ts
new file mode 100644
index 0000000000..41f36a43a5
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.component.ts
@@ -0,0 +1,86 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, Input, OnInit, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core';
+import { WidgetContext } from '@home/models/widget-component.models';
+import { WidgetComponent } from '@home/components/widget/widget.component';
+import { TranslateService } from '@ngx-translate/core';
+import { TbPieChart } from '@home/components/widget/lib/chart/pie-chart';
+import {
+  LatestChartComponent,
+  LatestChartComponentCallbacks
+} from '@home/components/widget/lib/chart/latest-chart.component';
+import {
+  pieChartWidgetDefaultSettings,
+  pieChartWidgetPieChartSettings,
+  PieChartWidgetSettings
+} from '@home/components/widget/lib/chart/pie-chart-widget.models';
+
+@Component({
+  selector: 'tb-pie-chart-widget',
+  templateUrl: './latest-chart-widget.component.html',
+  styleUrls: [],
+  encapsulation: ViewEncapsulation.None
+})
+export class PieChartWidgetComponent implements OnInit {
+
+  @ViewChild('latestChart')
+  latestChart: LatestChartComponent;
+
+  @Input()
+  ctx: WidgetContext;
+
+  @Input()
+  widgetTitlePanel: TemplateRef<any>;
+
+  settings: PieChartWidgetSettings;
+
+  callbacks: LatestChartComponentCallbacks;
+
+  constructor(private widgetComponent: WidgetComponent,
+              private translate: TranslateService) {
+  }
+
+  ngOnInit(): void {
+    this.ctx.$scope.pieChartWidget = this;
+    this.settings = {...pieChartWidgetDefaultSettings, ...this.ctx.settings};
+    this.callbacks = {
+      createChart: (chartShape, renderer) => {
+        const settings = pieChartWidgetPieChartSettings(this.settings);
+        return new TbPieChart(this.ctx, settings, chartShape.nativeElement, renderer, this.translate, true);
+      },
+      onItemClick: ($event: Event, item) => {
+        const descriptors = this.ctx.actionsApi.getActionDescriptors('sliceClick');
+        if ($event && descriptors.length) {
+          $event.stopPropagation();
+          const datasource = item.datasource;
+          const entityId = datasource ? datasource.entity?.id : null;
+          const entityName = datasource ? datasource.entityName : null;
+          const entityLabel = datasource ? datasource.entityLabel : null;
+          this.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, item, entityLabel);
+        }
+      }
+    };
+  }
+
+  public onInit() {
+    this.latestChart?.onInit();
+  }
+
+  public onDataUpdated() {
+    this.latestChart?.onDataUpdated();
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.models.ts
new file mode 100644
index 0000000000..05dbef0959
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.models.ts
@@ -0,0 +1,131 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import {
+  LatestChartTooltipValueType,
+  LatestChartWidgetSettings
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import { BackgroundType, Font } from '@shared/models/widget-settings.models';
+import { LegendPosition } from '@shared/models/widget.models';
+import { DeepPartial } from '@shared/models/common';
+import {
+  pieChartAnimationDefaultSettings,
+  PieChartLabelPosition,
+  PieChartSettings
+} from '@home/components/widget/lib/chart/pie-chart.models';
+import { isDefinedAndNotNull, mergeDeep } from '@core/utils';
+import { EChartsAnimationSettings } from '@home/components/widget/lib/chart/echarts-widget.models';
+
+export interface PieChartWidgetSettings extends LatestChartWidgetSettings {
+  showLabel: boolean;
+  labelPosition: PieChartLabelPosition;
+  labelFont: Font;
+  labelColor: string;
+  borderWidth: number;
+  borderColor: string;
+  radius: number;
+  clockwise: boolean;
+}
+
+export const pieChartWidgetDefaultSettings: PieChartWidgetSettings = {
+  showLabel: true,
+  labelPosition: PieChartLabelPosition.outside,
+  labelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: 'normal',
+    lineHeight: '1.2'
+  },
+  labelColor: '#000',
+  borderWidth: 0,
+  borderColor: '#000',
+  radius: 80,
+  clockwise: false,
+  sortSeries: false,
+  animation: mergeDeep({} as EChartsAnimationSettings,
+    pieChartAnimationDefaultSettings),
+  showLegend: true,
+  legendPosition: LegendPosition.bottom,
+  legendLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '16px'
+  },
+  legendLabelColor: 'rgba(0, 0, 0, 0.38)',
+  legendValueFont: {
+    family: 'Roboto',
+    size: 14,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '500',
+    lineHeight: '20px'
+  },
+  legendValueColor: 'rgba(0, 0, 0, 0.87)',
+  showTooltip: true,
+  tooltipValueType: LatestChartTooltipValueType.percentage,
+  tooltipValueDecimals: 0,
+  tooltipValueFont: {
+    family: 'Roboto',
+    size: 13,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '500',
+    lineHeight: '16px'
+  },
+  tooltipValueColor: 'rgba(0, 0, 0, 0.76)',
+  tooltipBackgroundColor: 'rgba(255, 255, 255, 0.76)',
+  tooltipBackgroundBlur: 4,
+  background: {
+    type: BackgroundType.color,
+    color: '#fff',
+    overlay: {
+      enabled: false,
+      color: 'rgba(255,255,255,0.72)',
+      blur: 3
+    }
+  }
+};
+
+export const pieChartWidgetPieChartSettings = (settings: PieChartWidgetSettings): DeepPartial<PieChartSettings> => ({
+  autoScale: false,
+  doughnut: false,
+  clockwise: settings.clockwise,
+  sortSeries: settings.sortSeries,
+  showTotal: false,
+  animation: settings.animation,
+  showLegend: settings.showLegend,
+  showLabel: settings.showLabel,
+  labelPosition: settings.labelPosition,
+  labelFont: settings.labelFont,
+  labelColor: settings.labelColor,
+  borderWidth: settings.borderWidth,
+  borderColor: settings.borderColor,
+  radius: isDefinedAndNotNull(settings.radius) ? settings.radius + '%' : undefined,
+  emphasisBorderWidth: settings.borderWidth,
+  emphasisBorderColor: settings.borderColor,
+  showTooltip: settings.showTooltip,
+  tooltipValueType: settings.tooltipValueType,
+  tooltipValueDecimals: settings.tooltipValueDecimals,
+  tooltipValueFont: settings.tooltipValueFont,
+  tooltipValueColor: settings.tooltipValueColor,
+  tooltipBackgroundColor: settings.tooltipBackgroundColor,
+  tooltipBackgroundBlur: settings.tooltipBackgroundBlur
+});
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart.models.ts
new file mode 100644
index 0000000000..419c4b61bb
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart.models.ts
@@ -0,0 +1,126 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { ColorSettings, constantColor, Font } from '@shared/models/widget-settings.models';
+import {
+  LatestChartSettings,
+  LatestChartTooltipValueType
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import { mergeDeep } from '@core/utils';
+import {
+  EChartsAnimationEasing,
+  EChartsAnimationSettings
+} from '@home/components/widget/lib/chart/echarts-widget.models';
+
+export enum PieChartLabelPosition {
+  outside = 'outside',
+  inside = 'inside'
+}
+
+export const pieChartLabelPositions = Object.keys(PieChartLabelPosition) as PieChartLabelPosition[];
+
+export const pieChartLabelPositionTranslations = new Map<PieChartLabelPosition, string>(
+  [
+    [PieChartLabelPosition.outside, 'widgets.pie-chart.label-position-outside'],
+    [PieChartLabelPosition.inside, 'widgets.pie-chart.label-position-inside']
+  ]
+);
+
+export interface PieChartSettings extends LatestChartSettings {
+  doughnut: boolean;
+  radius: string;
+  clockwise: boolean;
+  totalValueFont: Font;
+  totalValueColor: ColorSettings;
+  showLabel: boolean;
+  labelPosition: PieChartLabelPosition;
+  labelFont: Font;
+  labelColor: string;
+  borderWidth: number;
+  borderColor: string;
+  borderRadius: string;
+  emphasisScale: boolean;
+  emphasisBorderWidth: number;
+  emphasisBorderColor: string;
+  emphasisShadowBlur: number;
+  emphasisShadowColor: string;
+}
+
+export const pieChartAnimationDefaultSettings: EChartsAnimationSettings = {
+  animation: true,
+  animationThreshold: 2000,
+  animationDuration: 1000,
+  animationEasing: EChartsAnimationEasing.cubicOut,
+  animationDelay: 0,
+  animationDurationUpdate: 500,
+  animationEasingUpdate: EChartsAnimationEasing.cubicOut,
+  animationDelayUpdate: 0
+};
+
+export const pieChartDefaultSettings: PieChartSettings = {
+  autoScale: false,
+  doughnut: false,
+  radius: '80%',
+  clockwise: false,
+  sortSeries: false,
+  showTotal: false,
+  animation: mergeDeep({} as EChartsAnimationSettings,
+    pieChartAnimationDefaultSettings),
+  showLegend: true,
+  totalValueFont: {
+    family: 'Roboto',
+    size: 24,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '500',
+    lineHeight: '1'
+  },
+  totalValueColor: constantColor('rgba(0, 0, 0, 0.87)'),
+  showLabel: false,
+  labelPosition: PieChartLabelPosition.outside,
+  labelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: 'normal',
+    lineHeight: '1'
+  },
+  labelColor: '#000',
+  borderWidth: 0,
+  borderColor: '#000',
+  borderRadius: '0%',
+  emphasisScale: true,
+  emphasisBorderWidth: 0,
+  emphasisBorderColor: '#000',
+  emphasisShadowBlur: 10,
+  emphasisShadowColor: 'rgba(0, 0, 0, 0.5)',
+  showTooltip: true,
+  tooltipValueType: LatestChartTooltipValueType.percentage,
+  tooltipValueDecimals: 0,
+  tooltipValueFont: {
+    family: 'Roboto',
+    size: 13,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '500',
+    lineHeight: '16px'
+  },
+  tooltipValueColor: 'rgba(0, 0, 0, 0.76)',
+  tooltipBackgroundColor: 'rgba(255, 255, 255, 0.76)',
+  tooltipBackgroundBlur: 4
+};
+
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart.ts
new file mode 100644
index 0000000000..cfe003732e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart.ts
@@ -0,0 +1,194 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { pieChartDefaultSettings, PieChartSettings } from '@home/components/widget/lib/chart/pie-chart.models';
+import { WidgetContext } from '@home/models/widget-component.models';
+import { DeepPartial } from '@shared/models/common';
+import { Renderer2 } from '@angular/core';
+import { ColorProcessor, textStyle } from '@shared/models/widget-settings.models';
+import { PieDataItemOption } from 'echarts/types/src/chart/pie/PieSeries';
+import { Text } from '@svgdotjs/svg.js';
+import { TranslateService } from '@ngx-translate/core';
+import { TbLatestChart } from '@home/components/widget/lib/chart/latest-chart';
+import { formatValue } from '@core/utils';
+
+const shapeSize = 134;
+const shapeSegmentWidth = 13.4;
+
+export class TbPieChart extends TbLatestChart<PieChartSettings> {
+
+  private totalValueColor: ColorProcessor;
+  private totalTextNode: Text;
+
+  constructor(ctx: WidgetContext,
+              inputSettings: DeepPartial<PieChartSettings>,
+              chartElement: HTMLElement,
+              renderer: Renderer2,
+              translate: TranslateService,
+              autoResize = true) {
+
+    super(ctx, inputSettings, chartElement, renderer, translate, autoResize);
+  }
+
+  protected defaultSettings(): PieChartSettings {
+      return pieChartDefaultSettings;
+  }
+
+  protected initSettings() {
+    if (this.settings.showTotal) {
+      this.totalValueColor = ColorProcessor.fromSettings(this.settings.totalValueColor);
+    }
+  }
+
+  protected prepareLatestChartOption() {
+    const shapeWidth = this.chartElement.offsetWidth;
+    const shapeHeight = this.chartElement.offsetHeight;
+    const size = this.settings.autoScale ? shapeSize : Math.min(shapeWidth, shapeHeight);
+    const innerRadius = size / 2 - shapeSegmentWidth;
+    const outerRadius = size / 2;
+    const labelStyle = textStyle(this.settings.labelFont);
+    labelStyle.fontSize = this.settings.labelFont.size;
+    labelStyle.lineHeight = labelStyle.fontSize * 1.2;
+    labelStyle.color = this.settings.labelColor;
+    this.latestChartOption.series = [
+      {
+        type: 'pie',
+        clockwise: this.settings.clockwise,
+        radius: this.settings.doughnut ? [innerRadius, outerRadius] : this.settings.radius,
+        avoidLabelOverlap: false,
+        itemStyle: {
+          borderRadius: this.settings.borderRadius,
+          borderWidth: this.settings.borderWidth,
+          borderColor: this.settings.borderColor
+        },
+        label: {
+          show: this.settings.showLabel,
+          position: this.settings.labelPosition,
+          formatter: (params) => {
+            const percents = params.percent;
+            const value = formatValue(percents, 0, '%', false);
+            return `{label|${params.name}\n${value}}`;
+          },
+          rich: {
+            label: labelStyle
+          }
+        },
+        emphasis: {
+          scale: this.settings.emphasisScale,
+          itemStyle: {
+            borderColor: this.settings.emphasisBorderColor,
+            borderWidth: this.settings.emphasisBorderWidth,
+            shadowColor: this.settings.emphasisShadowColor,
+            shadowBlur: this.settings.emphasisShadowBlur
+          },
+          label: {
+            show: this.settings.showLabel
+          }
+        },
+        animation: this.settings.animation.animation,
+        animationThreshold: this.settings.animation.animationThreshold,
+        animationDuration: this.settings.animation.animationDuration,
+        animationEasing: this.settings.animation.animationEasing,
+        animationDelay: this.settings.animation.animationDelay,
+        animationDurationUpdate: this.settings.animation.animationDurationUpdate,
+        animationEasingUpdate: this.settings.animation.animationEasingUpdate,
+        animationDelayUpdate: this.settings.animation.animationDelayUpdate
+      }
+    ];
+  }
+
+  protected afterDrawChart() {
+    if (this.settings.showTotal) {
+      this.totalTextNode = this.svgShape.text('').font({
+        family: 'Roboto',
+        leading: 1
+      }).attr({'text-anchor': 'middle'});
+      this.renderTotal();
+    }
+  };
+
+  protected doUpdateSeriesData() {
+    const seriesData: PieDataItemOption[] = [];
+    const enabledDataItems = this.dataItems.filter(item => item.enabled && item.hasValue);
+    for (const dataItem of this.dataItems) {
+      if (dataItem.enabled && dataItem.hasValue) {
+        seriesData.push(
+          {id: dataItem.id, value: dataItem.value, name: dataItem.dataKey.label, itemStyle: {color: dataItem.dataKey.color}}
+        );
+        if (this.settings.doughnut && enabledDataItems.length > 1) {
+          seriesData.push({
+            value: 0, name: '', itemStyle: {color: 'transparent'}, emphasis: {disabled: true}
+          });
+        }
+      }
+    }
+    if (this.settings.doughnut) {
+      for (let i = 1; i < seriesData.length; i += 2) {
+        seriesData[i].value = this.total / 100;
+      }
+    }
+    this.latestChartOption.series[0].data = seriesData;
+  }
+
+  protected afterUpdateSeriesData(initial: boolean) {
+    if (this.settings.showTotal) {
+      this.totalValueColor.update(this.total);
+      if (!initial) {
+        this.renderTotal();
+      }
+    }
+  };
+
+  protected initialShapeWidth(): number {
+    return shapeSize;
+  }
+
+  protected initialShapeHeight(): number {
+    return shapeSize;
+  }
+
+  protected beforeResize(shapeWidth: number, shapeHeight: number) {
+    if (!this.settings.autoScale) {
+      if (this.settings.doughnut) {
+        const size = Math.min(shapeWidth, shapeHeight);
+        const innerRadius = size / 2 - shapeSegmentWidth;
+        const outerRadius = size / 2;
+        this.latestChartOption.series[0].radius = [innerRadius, outerRadius];
+        this.latestChart.setOption(this.latestChartOption);
+      }
+    }
+  };
+
+  protected afterResize(shapeWidth: number, shapeHeight: number) {
+    if (this.settings.showTotal) {
+      this.totalTextNode.center((this.settings.autoScale ? shapeSize : shapeWidth) / 2,
+        (this.settings.autoScale ? shapeSize : shapeHeight) / 2);
+    }
+  };
+
+  private renderTotal() {
+    this.totalTextNode.text(add => {
+      add.tspan(this.translate.instant('widgets.latest-chart.total')).font({size: '12px', weight: 400}).fill('rgba(0, 0, 0, 0.38)');
+      add.tspan('').newLine().font({size: '4px'});
+      add.tspan(this.totalText).newLine().font(
+        {family: this.settings.totalValueFont.family,
+          size: this.settings.totalValueFont.size + this.settings.totalValueFont.sizeUnit,
+          weight: this.settings.totalValueFont.weight,
+          style: this.settings.totalValueFont.style}
+      ).fill(this.totalValueColor.color);
+    }).center(this.svgShape.bbox().width / 2, this.svgShape.bbox().height / 2);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.html
index 6d3b6d43db..63a549bb48 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.html
@@ -15,7 +15,8 @@
     limitations under the License.
 
 -->
-<div class="tb-range-chart-panel" [style]="backgroundStyle$ | async">
+<div class="tb-range-chart-panel" [style.padding]="padding"
+     [class.overlay]="overlayEnabled" [style]="backgroundStyle$ | async">
   <div class="tb-range-chart-overlay" [style]="overlayStyle"></div>
   <ng-container *ngTemplateOutlet="widgetTitlePanel"></ng-container>
   <div class="tb-range-chart-content" [class]="legendClass">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.scss
index de2ca546fc..d956173281 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.scss
@@ -19,8 +19,10 @@
   position: relative;
   display: flex;
   flex-direction: column;
-  gap: 16px;
-  padding: 20px 24px 24px 24px;
+  gap: 8px;
+  &.overlay {
+    padding: 20px 24px 24px 24px;
+  }
   > div:not(.tb-range-chart-overlay) {
     z-index: 1;
   }
@@ -40,7 +42,7 @@
     min-height: 0;
     display: flex;
     flex-direction: column;
-    gap: 16px;
+    gap: 8px;
     &.legend-top {
       flex-direction: column-reverse;
     }
@@ -88,8 +90,9 @@
       }
     }
     &.legend-right, &.legend-left {
-      gap: 24px;
+      gap: 16px;
       .tb-range-chart-legend {
+        padding-top: 8px;
         flex-direction: column-reverse;
         justify-content: flex-end;
         align-items: stretch;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts
index 1705074a1e..9d89154111 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.component.ts
@@ -30,144 +30,24 @@ import {
 import { WidgetContext } from '@home/models/widget-component.models';
 import {
   backgroundStyle,
-  ColorRange,
   ComponentStyle,
-  DateFormatProcessor,
-  filterIncludingColorRanges,
   getDataKey,
   overlayStyle,
-  sortedColorRange,
   textStyle
 } from '@shared/models/widget-settings.models';
-import { ResizeObserver } from '@juggle/resize-observer';
-import * as echarts from 'echarts/core';
-import { formatValue, isDefinedAndNotNull, isNumber } from '@core/utils';
-import { rangeChartDefaultSettings, RangeChartWidgetSettings } from './range-chart-widget.models';
+import { isDefinedAndNotNull } from '@core/utils';
+import {
+  rangeChartDefaultSettings,
+  rangeChartTimeSeriesKeySettings,
+  rangeChartTimeSeriesSettings,
+  RangeChartWidgetSettings,
+  RangeItem,
+  toRangeItems
+} from './range-chart-widget.models';
 import { Observable } from 'rxjs';
 import { ImagePipe } from '@shared/pipe/image.pipe';
 import { DomSanitizer } from '@angular/platform-browser';
-import {
-  ECharts,
-  echartsModule,
-  EChartsOption,
-  echartsTooltipFormatter,
-  toNamedData
-} from '@home/components/widget/lib/chart/echarts-widget.models';
-import { CallbackDataParams } from 'echarts/types/dist/shared';
-import { AggregationType } from '@shared/models/time/time.models';
-
-interface VisualPiece {
-  lt?: number;
-  gt?: number;
-  lte?: number;
-  gte?: number;
-  value?: number;
-  color?: string;
-}
-
-interface RangeItem {
-  index: number;
-  from?: number;
-  to?: number;
-  piece: VisualPiece;
-  color: string;
-  label: string;
-  visible: boolean;
-  enabled: boolean;
-}
-
-const rangeItemLabel = (from?: number, to?: number): string => {
-  if (isNumber(from) && isNumber(to)) {
-    if (from === to) {
-      return `${from}`;
-    } else {
-      return `${from} - ${to}`;
-    }
-  } else if (isNumber(from)) {
-    return `≥ ${from}`;
-  } else if (isNumber(to)) {
-    return `< ${to}`;
-  } else {
-    return null;
-  }
-};
-
-const toVisualPiece = (color: string, from?: number, to?: number): VisualPiece => {
-  const piece: VisualPiece = {
-    color
-  };
-  if (isNumber(from) && isNumber(to)) {
-    if (from === to) {
-      piece.value = from;
-    } else {
-      piece.gte = from;
-      piece.lt = to;
-    }
-  } else if (isNumber(from)) {
-    piece.gte = from;
-  } else if (isNumber(to)) {
-    piece.lt = to;
-  }
-  return piece;
-};
-
-const toRangeItems = (colorRanges: Array<ColorRange>): RangeItem[] => {
-  const rangeItems: RangeItem[] = [];
-  let counter = 0;
-  const ranges = sortedColorRange(filterIncludingColorRanges(colorRanges)).filter(r => isNumber(r.from) || isNumber(r.to));
-  for (let i = 0; i < ranges.length; i++) {
-    const range = ranges[i];
-    let from = range.from;
-    const to = range.to;
-    if (i > 0) {
-      const prevRange = ranges[i - 1];
-      if (isNumber(prevRange.to) && isNumber(from) && from < prevRange.to) {
-        from = prevRange.to;
-      }
-    }
-    rangeItems.push(
-      {
-        index: counter++,
-        color: range.color,
-        enabled: true,
-        visible: true,
-        from,
-        to,
-        label: rangeItemLabel(from, to),
-        piece: toVisualPiece(range.color, from, to)
-      }
-    );
-    if (!isNumber(from) || !isNumber(to)) {
-      const value = !isNumber(from) ? to : from;
-      rangeItems.push(
-        {
-          index: counter++,
-          color: 'transparent',
-          enabled: true,
-          visible: false,
-          label: '',
-          piece: { gt: value - 0.000000001, lt: value + 0.000000001, color: 'transparent'}
-        }
-      );
-    }
-  }
-  return rangeItems;
-};
-
-const getMarkPoints = (ranges: Array<RangeItem>): number[] => {
-  const points = new Set<number>();
-  for (const range of ranges) {
-    if (range.visible) {
-      if (isNumber(range.from)) {
-        points.add(range.from);
-      }
-      if (isNumber(range.to)) {
-        points.add(range.to);
-      }
-    }
-  }
-  return Array.from(points).sort();
-};
+import { TbTimeSeriesChart } from '@home/components/widget/lib/chart/time-series-chart';
 
 @Component({
   selector: 'tb-range-chart-widget',
@@ -193,28 +73,19 @@ export class RangeChartWidgetComponent implements OnInit, OnDestroy, AfterViewIn
 
   backgroundStyle$: Observable<ComponentStyle>;
   overlayStyle: ComponentStyle = {};
+  overlayEnabled: boolean;
+  padding: string;
 
   legendLabelStyle: ComponentStyle;
   disabledLegendLabelStyle: ComponentStyle;
   visibleRangeItems: RangeItem[];
 
-  private get noAggregation(): boolean {
-    return this.ctx.defaultSubscription.timeWindowConfig?.aggregation?.type === AggregationType.NONE;
-  }
-
-  private rangeItems: RangeItem[];
-
-  private shapeResize$: ResizeObserver;
-
   private decimals = 0;
   private units = '';
 
-  private drawChartPending = false;
-  private rangeChart: ECharts;
-  private rangeChartOptions: EChartsOption;
-  private selectedRanges: {[key: number]: boolean} = {};
+  private rangeItems: RangeItem[];
 
-  private tooltipDateFormat: DateFormatProcessor;
+  private timeSeriesChart: TbTimeSeriesChart;
 
   constructor(private imagePipe: ImagePipe,
               private sanitizer: DomSanitizer,
@@ -235,16 +106,17 @@ export class RangeChartWidgetComponent implements OnInit, OnDestroy, AfterViewIn
     if (dataKey?.units) {
       this.units = dataKey.units;
     }
-
+    if (dataKey) {
+      dataKey.settings = rangeChartTimeSeriesKeySettings(this.settings);
+    }
 
     this.backgroundStyle$ = backgroundStyle(this.settings.background, this.imagePipe, this.sanitizer);
     this.overlayStyle = overlayStyle(this.settings.background.overlay);
+    this.overlayEnabled = this.settings.background.overlay.enabled;
+    this.padding = this.overlayEnabled ? undefined : this.settings.padding;
 
     this.rangeItems = toRangeItems(this.settings.rangeColors);
     this.visibleRangeItems = this.rangeItems.filter(item => item.visible);
-    for (const range of this.rangeItems) {
-      this.selectedRanges[range.index] = true;
-    }
 
     this.showLegend = this.settings.showLegend && !!this.rangeItems.length;
 
@@ -254,192 +126,33 @@ export class RangeChartWidgetComponent implements OnInit, OnDestroy, AfterViewIn
       this.disabledLegendLabelStyle = textStyle(this.settings.legendLabelFont);
       this.legendLabelStyle.color = this.settings.legendLabelColor;
     }
-
-    if (this.settings.showTooltip && this.settings.tooltipShowDate) {
-      this.tooltipDateFormat = DateFormatProcessor.fromSettings(this.ctx.$injector, this.settings.tooltipDateFormat);
-    }
   }
 
   ngAfterViewInit() {
-    if (this.drawChartPending) {
-      this.drawChart();
-    }
+    const settings = rangeChartTimeSeriesSettings(this.settings, this.rangeItems, this.decimals, this.units);
+    this.timeSeriesChart = new TbTimeSeriesChart(this.ctx, settings, this.chartShape.nativeElement, this.renderer);
   }
 
   ngOnDestroy() {
-    if (this.shapeResize$) {
-      this.shapeResize$.disconnect();
-    }
-    if (this.rangeChart) {
-      this.rangeChart.dispose();
+    if (this.timeSeriesChart) {
+      this.timeSeriesChart.destroy();
     }
   }
 
   public onInit() {
     const borderRadius = this.ctx.$widgetElement.css('borderRadius');
     this.overlayStyle = {...this.overlayStyle, ...{borderRadius}};
-    if (this.chartShape) {
-      this.drawChart();
-    } else {
-      this.drawChartPending = true;
-    }
     this.cd.detectChanges();
   }
 
   public onDataUpdated() {
-    if (this.rangeChart) {
-      this.rangeChart.setOption({
-        xAxis: {
-          min: this.ctx.defaultSubscription.timeWindow.minTime,
-          max: this.ctx.defaultSubscription.timeWindow.maxTime,
-          tbTimeWindow: this.ctx.defaultSubscription.timeWindow
-        },
-        series: [
-          {data: this.ctx.data?.length ? toNamedData(this.ctx.data[0].data) : []}
-        ],
-        visualMap: {
-          selected: this.selectedRanges
-        }
-      });
+    if (this.timeSeriesChart) {
+      this.timeSeriesChart.update();
     }
   }
 
   public toggleRangeItem(item: RangeItem) {
     item.enabled = !item.enabled;
-    this.selectedRanges[item.index] = item.enabled;
-    this.rangeChart.dispatchAction({
-      type: 'selectDataRange',
-      selected: this.selectedRanges
-    });
-  }
-
-  private drawChart() {
-    echartsModule.init();
-    const dataKey = getDataKey(this.ctx.datasources);
-    this.rangeChart = echarts.init(this.chartShape.nativeElement, null, {
-      renderer: 'canvas',
-    });
-    this.rangeChartOptions = {
-      tooltip: {
-        trigger: 'axis',
-        confine: true,
-        appendTo: 'body',
-        axisPointer: {
-          type: 'shadow'
-        },
-        formatter: (params: CallbackDataParams[]) =>
-          this.settings.showTooltip ? echartsTooltipFormatter(this.renderer, this.tooltipDateFormat,
-            this.settings, params, this.decimals, this.units, 0, null,
-            this.noAggregation ? null : this.ctx.timeWindow.interval) : undefined,
-        padding: [8, 12],
-        backgroundColor: this.settings.tooltipBackgroundColor,
-        borderWidth: 0,
-        extraCssText: `line-height: 1; backdrop-filter: blur(${this.settings.tooltipBackgroundBlur}px);`
-      },
-      grid: {
-        containLabel: true,
-        top: '30',
-        left: 0,
-        right: 0,
-        bottom: this.settings.dataZoom ? 60 : 0
-      },
-      xAxis: {
-        type: 'time',
-        axisTick: {
-          show: true
-        },
-        axisLabel: {
-          hideOverlap: true,
-          fontSize: 10
-        },
-        axisLine: {
-          onZero: false
-        },
-        min: this.ctx.defaultSubscription.timeWindow.minTime,
-        max: this.ctx.defaultSubscription.timeWindow.maxTime
-      },
-      yAxis: {
-        type: 'value',
-        axisLabel: {
-          formatter: (value: any) => formatValue(value, this.decimals, this.units, false)
-        }
-      },
-      series: [{
-        type: 'line',
-        name: dataKey?.label,
-        smooth: false,
-        showSymbol: false,
-        animation: true,
-        areaStyle: this.settings.fillArea ? {} : undefined,
-        data: this.ctx.data?.length ? toNamedData(this.ctx.data[0].data) : [],
-        markLine: this.rangeItems.length ? {
-          animation: true,
-          symbol: ['circle', 'arrow'],
-          symbolSize: [5, 7],
-          lineStyle: {
-            width: 1,
-            type: [3, 3],
-            color: '#37383b'
-          },
-          label: {
-            position: 'insideEndTop',
-            color: '#37383b',
-            backgroundColor: 'rgba(255,255,255,0.56)',
-            padding: [4, 5],
-            borderRadius: 4,
-            formatter: params => formatValue(params.value, this.decimals, this.units, false)
-          },
-          emphasis: {
-            disabled: true
-          },
-          data: getMarkPoints(this.rangeItems).map(point => ({ yAxis: point }))
-        } : undefined
-      }],
-      dataZoom: [
-        {
-          type: 'inside',
-          disabled: !this.settings.dataZoom
-        },
-        {
-          type: 'slider',
-          show: this.settings.dataZoom,
-          showDetail: false,
-          right: 10
-        }
-      ],
-      visualMap: {
-        show: false,
-        type: 'piecewise',
-        selected: this.selectedRanges,
-        dimension: 1,
-        pieces: this.rangeItems.map(item => item.piece),
-        outOfRange: {
-          color: this.settings.outOfRangeColor
-        },
-        inRange: !this.rangeItems.length ? {
-          color: this.settings.outOfRangeColor
-        } : undefined
-      }
-    };
-
-    (this.rangeChartOptions.xAxis as any).tbTimeWindow = this.ctx.defaultSubscription.timeWindow;
-
-    this.rangeChart.setOption(this.rangeChartOptions);
-
-    this.shapeResize$ = new ResizeObserver(() => {
-      this.onResize();
-    });
-    this.shapeResize$.observe(this.chartShape.nativeElement);
-    this.onResize();
-  }
-
-  private onResize() {
-    const width = this.rangeChart.getWidth();
-    const height = this.rangeChart.getHeight();
-    const shapeWidth = this.chartShape.nativeElement.offsetWidth;
-    const shapeHeight = this.chartShape.nativeElement.offsetHeight;
-    if (width !== shapeWidth || height !== shapeHeight) {
-      this.rangeChart.resize();
-    }
+    this.timeSeriesChart.toggleVisualMapRange(item.index);
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
index 31905e70ba..c411737761 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
@@ -18,22 +18,84 @@ import {
   BackgroundSettings,
   BackgroundType,
   ColorRange,
+  filterIncludingColorRanges,
   Font,
-  simpleDateFormat
+  simpleDateFormat,
+  sortedColorRange
 } from '@shared/models/widget-settings.models';
 import { LegendPosition } from '@shared/models/widget.models';
-import { EChartsTooltipWidgetSettings } from '@home/components/widget/lib/chart/echarts-widget.models';
+import {
+  echartsAnimationDefaultSettings,
+  EChartsAnimationSettings,
+  EChartsShape,
+  EChartsTooltipWidgetSettings
+} from '@home/components/widget/lib/chart/echarts-widget.models';
+import {
+  createTimeSeriesChartVisualMapPiece,
+  defaultTimeSeriesChartXAxisSettings,
+  defaultTimeSeriesChartYAxisSettings,
+  LineSeriesStepType,
+  SeriesFillType,
+  SeriesLabelPosition, ThresholdLabelPosition,
+  timeSeriesChartColorScheme, timeSeriesChartGridDefaultSettings, TimeSeriesChartGridSettings,
+  TimeSeriesChartKeySettings,
+  TimeSeriesChartLineType,
+  TimeSeriesChartSeriesType,
+  TimeSeriesChartSettings,
+  TimeSeriesChartThreshold, timeSeriesChartThresholdDefaultSettings,
+  TimeSeriesChartThresholdType,
+  TimeSeriesChartVisualMapPiece,
+  TimeSeriesChartXAxisSettings,
+  TimeSeriesChartYAxisSettings
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { isNumber, mergeDeep } from '@core/utils';
+import { DeepPartial } from '@shared/models/common';
+
+export interface RangeItem {
+  index: number;
+  from?: number;
+  to?: number;
+  color: string;
+  label: string;
+  visible: boolean;
+  enabled: boolean;
+  piece: TimeSeriesChartVisualMapPiece;
+}
 
 export interface RangeChartWidgetSettings extends EChartsTooltipWidgetSettings {
   dataZoom: boolean;
   rangeColors: Array<ColorRange>;
   outOfRangeColor: string;
+  showRangeThresholds: boolean;
+  rangeThreshold: Partial<TimeSeriesChartThreshold>;
   fillArea: boolean;
+  fillAreaOpacity: number;
+  showLine: boolean;
+  step: boolean;
+  stepType: LineSeriesStepType;
+  smooth: boolean;
+  lineType: TimeSeriesChartLineType;
+  lineWidth: number;
+  showPoints: boolean;
+  showPointLabel: boolean;
+  pointLabelPosition: SeriesLabelPosition;
+  pointLabelFont: Font;
+  pointLabelColor: string;
+  enablePointLabelBackground: boolean;
+  pointLabelBackground: string;
+  pointShape: EChartsShape;
+  pointSize: number;
+  grid: TimeSeriesChartGridSettings;
+  yAxis: TimeSeriesChartYAxisSettings;
+  xAxis: TimeSeriesChartXAxisSettings;
+  animation: EChartsAnimationSettings;
+  thresholds: TimeSeriesChartThreshold[];
   showLegend: boolean;
   legendPosition: LegendPosition;
   legendLabelFont: Font;
   legendLabelColor: string;
   background: BackgroundSettings;
+  padding: string;
 }
 
 export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
@@ -48,7 +110,53 @@ export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
     {from: 40, color: '#D81838'}
   ],
   outOfRangeColor: '#ccc',
+  showRangeThresholds: true,
+  rangeThreshold: mergeDeep({} as Partial<TimeSeriesChartThreshold>,
+    timeSeriesChartThresholdDefaultSettings,
+    { lineColor: '#37383b',
+      lineType: TimeSeriesChartLineType.dashed,
+      startSymbol: EChartsShape.circle,
+      startSymbolSize: 5,
+      endSymbol: EChartsShape.arrow,
+      endSymbolSize: 7,
+      labelPosition: ThresholdLabelPosition.insideEndTop,
+      labelColor: '#37383b',
+      enableLabelBackground: true}),
   fillArea: true,
+  fillAreaOpacity: 0.7,
+  showLine: true,
+  step: false,
+  stepType: LineSeriesStepType.start,
+  smooth: false,
+  lineType: TimeSeriesChartLineType.solid,
+  lineWidth: 2,
+  showPoints: false,
+  showPointLabel: false,
+  pointLabelPosition: SeriesLabelPosition.top,
+  pointLabelFont: {
+    family: 'Roboto',
+    size: 11,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  pointLabelColor: timeSeriesChartColorScheme['series.label'].light,
+  enablePointLabelBackground: false,
+  pointLabelBackground: 'rgba(255,255,255,0.56)',
+  pointShape: EChartsShape.emptyCircle,
+  pointSize: 4,
+  grid: mergeDeep({} as TimeSeriesChartGridSettings,
+    timeSeriesChartGridDefaultSettings),
+  yAxis: mergeDeep({} as TimeSeriesChartYAxisSettings,
+    defaultTimeSeriesChartYAxisSettings,
+    { id: 'default', order: 0, showLine: false, showTicks: false } as TimeSeriesChartYAxisSettings),
+  xAxis: mergeDeep({} as TimeSeriesChartXAxisSettings,
+    defaultTimeSeriesChartXAxisSettings,
+    {showSplitLines: false} as TimeSeriesChartXAxisSettings),
+  animation: mergeDeep({} as EChartsAnimationSettings,
+    echartsAnimationDefaultSettings),
+  thresholds: [],
   showLegend: true,
   legendPosition: LegendPosition.top,
   legendLabelFont: {
@@ -61,6 +169,15 @@ export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
   },
   legendLabelColor: 'rgba(0, 0, 0, 0.76)',
   showTooltip: true,
+  tooltipLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '16px'
+  },
+  tooltipLabelColor: 'rgba(0, 0, 0, 0.76)',
   tooltipValueFont: {
     family: 'Roboto',
     size: 12,
@@ -92,5 +209,152 @@ export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
       color: 'rgba(255,255,255,0.72)',
       blur: 3
     }
+  },
+  padding: '12px'
+};
+
+export const rangeChartTimeSeriesSettings = (settings: RangeChartWidgetSettings, rangeItems: RangeItem[],
+                                             decimals: number, units: string): DeepPartial<TimeSeriesChartSettings> => {
+  let thresholds: DeepPartial<TimeSeriesChartThreshold>[] = settings.showRangeThresholds ? getMarkPoints(rangeItems).map(item => ({
+    ...{type: TimeSeriesChartThresholdType.constant,
+    yAxisId: 'default',
+    units,
+    decimals,
+    value: item},
+    ...settings.rangeThreshold
+  } as DeepPartial<TimeSeriesChartThreshold>)) : [];
+  if (settings.thresholds?.length) {
+    thresholds = thresholds.concat(settings.thresholds);
+  }
+  return {
+    dataZoom: settings.dataZoom,
+    thresholds,
+    grid: settings.grid,
+    yAxes: {
+      default: {
+        ...settings.yAxis,
+        ...{
+          decimals,
+          units
+        }
+      }
+    },
+    xAxis: settings.xAxis,
+    animation: settings.animation,
+    visualMapSettings: {
+      outOfRangeColor: settings.outOfRangeColor,
+      pieces: rangeItems.map(item => item.piece)
+    },
+    showTooltip: settings.showTooltip,
+    tooltipLabelFont: settings.tooltipLabelFont,
+    tooltipLabelColor: settings.tooltipLabelColor,
+    tooltipValueFont: settings.tooltipValueFont,
+    tooltipValueColor: settings.tooltipValueColor,
+    tooltipShowDate: settings.tooltipShowDate,
+    tooltipDateInterval: settings.tooltipDateInterval,
+    tooltipDateFormat: settings.tooltipDateFormat,
+    tooltipDateFont: settings.tooltipDateFont,
+    tooltipDateColor: settings.tooltipDateColor,
+    tooltipBackgroundColor: settings.tooltipBackgroundColor,
+    tooltipBackgroundBlur: settings.tooltipBackgroundBlur,
+  };
+};
+
+export const rangeChartTimeSeriesKeySettings = (settings: RangeChartWidgetSettings): DeepPartial<TimeSeriesChartKeySettings> => ({
+    type: TimeSeriesChartSeriesType.line,
+    lineSettings: {
+      showLine: settings.showLine,
+      step: settings.step,
+      stepType: settings.stepType,
+      smooth: settings.smooth,
+      lineType: settings.lineType,
+      lineWidth: settings.lineWidth,
+      showPoints: settings.showPoints,
+      showPointLabel: settings.showPointLabel,
+      pointLabelPosition: settings.pointLabelPosition,
+      pointLabelFont: settings.pointLabelFont,
+      pointLabelColor: settings.pointLabelColor,
+      enablePointLabelBackground: settings.enablePointLabelBackground,
+      pointLabelBackground: settings.pointLabelBackground,
+      pointShape: settings.pointShape,
+      pointSize: settings.pointSize,
+      fillAreaSettings: {
+        type: settings.fillArea ? SeriesFillType.opacity : SeriesFillType.none,
+        opacity: settings.fillAreaOpacity
+      }
+    }
+  });
+
+export const toRangeItems = (colorRanges: Array<ColorRange>): RangeItem[] => {
+  const rangeItems: RangeItem[] = [];
+  let counter = 0;
+  const ranges = sortedColorRange(filterIncludingColorRanges(colorRanges)).filter(r => isNumber(r.from) || isNumber(r.to));
+  for (let i = 0; i < ranges.length; i++) {
+    const range = ranges[i];
+    let from = range.from;
+    const to = range.to;
+    if (i > 0) {
+      const prevRange = ranges[i - 1];
+      if (isNumber(prevRange.to) && isNumber(from) && from < prevRange.to) {
+        from = prevRange.to;
+      }
+    }
+    rangeItems.push(
+      {
+        index: counter++,
+        color: range.color,
+        enabled: true,
+        visible: true,
+        from,
+        to,
+        label: rangeItemLabel(from, to),
+        piece: createTimeSeriesChartVisualMapPiece(range.color, from, to)
+      }
+    );
+    if (!isNumber(from) || !isNumber(to)) {
+      const value = !isNumber(from) ? to : from;
+      rangeItems.push(
+        {
+          index: counter++,
+          color: 'transparent',
+          enabled: true,
+          visible: false,
+          label: '',
+          piece: { gt: value - 0.000000001, lt: value + 0.000000001, color: 'transparent'}
+        }
+      );
+    }
+  }
+  return rangeItems;
+};
+
+const rangeItemLabel = (from?: number, to?: number): string => {
+  if (isNumber(from) && isNumber(to)) {
+    if (from === to) {
+      return `${from}`;
+    } else {
+      return `${from} - ${to}`;
+    }
+  } else if (isNumber(from)) {
+    return `≥ ${from}`;
+  } else if (isNumber(to)) {
+    return `< ${to}`;
+  } else {
+    return null;
+  }
+};
+
+const getMarkPoints = (ranges: Array<RangeItem>): number[] => {
+  const points = new Set<number>();
+  for (const range of ranges) {
+    if (range.visible) {
+      if (isNumber(range.from)) {
+        points.add(range.from);
+      }
+      if (isNumber(range.to)) {
+        points.add(range.to);
+      }
+    }
   }
+  return Array.from(points).sort();
 };
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-bar.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-bar.models.ts
index c00a078b2f..f54a803d12 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-bar.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-bar.models.ts
@@ -22,7 +22,7 @@ import {
   TimeSeriesChartNoAggregationBarWidthStrategy
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { CustomSeriesRenderItemParams } from 'echarts';
-import { CustomSeriesRenderItemAPI, CustomSeriesRenderItemReturn } from 'echarts/types/dist/shared';
+import { CallbackDataParams, CustomSeriesRenderItemAPI, CustomSeriesRenderItemReturn } from 'echarts/types/dist/shared';
 import { isNumeric } from '@core/utils';
 import * as echarts from 'echarts/core';
 
@@ -34,6 +34,8 @@ export interface BarVisualSettings {
 }
 
 export interface BarRenderSharedContext {
+  barGap: number;
+  intervalGap: number;
   timeInterval: Interval;
   noAggregationBarWidthStrategy: TimeSeriesChartNoAggregationBarWidthStrategy;
   noAggregationWidthRelative: boolean;
@@ -47,6 +49,7 @@ export interface BarRenderContext {
   noAggregation?: boolean;
   visualSettings?: BarVisualSettings;
   labelOption?: SeriesLabelOption;
+  additionalLabelOption?: {[key: string]: any};
   barStackIndex?: number;
   currentStackItems?: TimeSeriesChartDataItem[];
 }
@@ -77,10 +80,13 @@ export const renderTimeSeriesBar = (params: CustomSeriesRenderItemParams, api: C
     start = time - interval / 2;
   }
 
-  const gap = 0.3;
-  const barInterval = separateBar ? interval : interval / (renderCtx.barsCount + gap * (renderCtx.barsCount + 3));
-  const intervalGap = barInterval * gap * 2;
-  const barGap = barInterval * gap;
+  const barGapRatio = renderCtx.shared.barGap;
+  const intervalGapRatio = renderCtx.shared.intervalGap;
+  const barInterval = separateBar
+    ? interval
+    : interval / (renderCtx.barsCount + barGapRatio * (renderCtx.barsCount - 1) + intervalGapRatio * 2);
+  const intervalGap = barInterval * intervalGapRatio;
+  const barGap = barInterval * barGapRatio;
   const value = api.value(1);
   const startTime = separateBar ? start : start + intervalGap + (barInterval + barGap) * renderCtx.barIndex;
   const delta = barInterval;
@@ -122,9 +128,10 @@ export const renderTimeSeriesBar = (params: CustomSeriesRenderItemParams, api: C
     height: coordSys.height
   });
 
-  const zeroPos = api.coord([0, offset]);
+  const zeroCoord = api.coord([0, offset]);
+  const zeroPos = Math.min(zeroCoord[1], coordSys.y + coordSys.height);
 
-  const style: any = {
+  let style: any = {
     fill: renderCtx.visualSettings.color,
     stroke: renderCtx.visualSettings.borderColor,
     lineWidth: renderCtx.visualSettings.borderWidth
@@ -139,10 +146,20 @@ export const renderTimeSeriesBar = (params: CustomSeriesRenderItemParams, api: C
         position = 'top';
       }
     }
-    style.text = (renderCtx.labelOption.formatter as LabelFormatterCallback)({value: [null, value]} as any);
+    style.text = (renderCtx.labelOption.formatter as LabelFormatterCallback)(
+      {
+        seriesName: params.seriesName,
+        value: [null, value]
+      } as CallbackDataParams);
     style.textDistance = 5;
     style.textPosition = position;
+    style.textBackgroundColor = renderCtx.labelOption.backgroundColor;
+    style.textPadding = renderCtx.labelOption.padding;
+    style.textBorderRadius = renderCtx.labelOption.borderRadius;
     style.rich = renderCtx.labelOption.rich;
+    if (renderCtx.additionalLabelOption) {
+      style = {...style, ...renderCtx.additionalLabelOption};
+    }
   }
 
   let borderRadius: number[];
@@ -160,7 +177,7 @@ export const renderTimeSeriesBar = (params: CustomSeriesRenderItemParams, api: C
     transition: 'all',
     enterFrom: {
       style: { opacity: 0 },
-      shape: { height: 0, y: zeroPos[1] }
+      shape: { height: 0, y: zeroPos }
     }
   };
 };
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-state.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-state.models.ts
new file mode 100644
index 0000000000..9a72361632
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-state.models.ts
@@ -0,0 +1,109 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import {
+  TimeSeriesChartStateSettings,
+  TimeSeriesChartStateSourceType,
+  TimeSeriesChartTicksFormatter,
+  TimeSeriesChartTicksGenerator
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { UtilsService } from '@core/services/utils.service';
+import { EChartsTooltipValueFormatFunction } from '@home/components/widget/lib/chart/echarts-widget.models';
+import { FormattedData } from '@shared/models/widget.models';
+import { formatValue, isDefinedAndNotNull, isNumber, isNumeric } from '@core/utils';
+import { LabelFormatterCallback } from 'echarts';
+
+export class TimeSeriesChartStateValueConverter {
+
+  private readonly constantsMap = new Map<any, number>();
+  private readonly rangeStates: TimeSeriesChartStateSettings[] = [];
+  private readonly ticks: {value: number}[] = [];
+  private readonly labelsMap = new Map<number, string>();
+
+  public readonly ticksGenerator: TimeSeriesChartTicksGenerator;
+  public readonly ticksFormatter: TimeSeriesChartTicksFormatter;
+  public readonly tooltipFormatter: EChartsTooltipValueFormatFunction;
+  public readonly labelFormatter: LabelFormatterCallback;
+  public readonly valueConverter: (value: any) => any;
+
+  constructor(utils: UtilsService,
+              states: TimeSeriesChartStateSettings[]) {
+    const ticks: number[] = [];
+    for (const state of states) {
+      if (state.sourceType === TimeSeriesChartStateSourceType.constant) {
+        this.constantsMap.set(state.sourceValue, state.value);
+      } else {
+        this.rangeStates.push(state);
+      }
+      if (!ticks.includes(state.value)) {
+        ticks.push(state.value);
+        const label = utils.customTranslation(state.label, state.label);
+        this.labelsMap.set(state.value, label);
+      }
+    }
+    this.ticks = ticks.map(val => ({value: val}));
+    this.ticksGenerator = () => this.ticks;
+    this.ticksFormatter = (value: any) => {
+      const result = this.labelsMap.get(value);
+      return result || '';
+    };
+    this.tooltipFormatter = (value: any, latestData: FormattedData, units?: string, decimals?: number) => {
+      const result = this.labelsMap.get(value);
+      if (typeof result === 'string') {
+        return result;
+      } else {
+        return formatValue(value, decimals, units, false);
+      }
+    };
+    this.labelFormatter = (params) => {
+      const value = params.value[1];
+      const result = this.labelsMap.get(value);
+      if (typeof result === 'string') {
+        return `{value|${result}}`;
+      } else {
+        return undefined;
+      }
+    };
+    this.valueConverter = (value: any) => {
+      let key = value;
+      if (key === 'true') {
+        key = true;
+      } else if (key === 'false') {
+        key = false;
+      }
+      const result = this.constantsMap.get(key);
+      if (typeof result === 'number') {
+        return result;
+      } else if (this.rangeStates.length && isDefinedAndNotNull(value) && isNumeric(value)) {
+        for (const state of this.rangeStates) {
+          const num = Number(value);
+          if (TimeSeriesChartStateValueConverter.constantRange(state) && state.sourceRangeFrom === num) {
+            return state.value;
+          } else if ((!isNumber(state.sourceRangeFrom) || num >= state.sourceRangeFrom) &&
+            (!isNumber(state.sourceRangeTo) || num < state.sourceRangeTo)) {
+            return state.value;
+          }
+        }
+      }
+      return value;
+    };
+  }
+
+  static constantRange(state: TimeSeriesChartStateSettings): boolean {
+    return isNumber(state.sourceRangeFrom) && isNumber(state.sourceRangeTo) && state.sourceRangeFrom === state.sourceRangeTo;
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.html
index 4430579899..147214c355 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.html
@@ -63,11 +63,11 @@
         <thead>
         <tr>
           <th></th>
-          <th class="tb-time-series-chart-legend-type-label right" *ngIf="legendConfig.showMin === true">{{ 'legend.Min' | translate }}</th>
-          <th class="tb-time-series-chart-legend-type-label right" *ngIf="legendConfig.showMax === true">{{ 'legend.Max' | translate }}</th>
-          <th class="tb-time-series-chart-legend-type-label right" *ngIf="legendConfig.showAvg === true">{{ 'legend.Avg' | translate }}</th>
-          <th class="tb-time-series-chart-legend-type-label right" *ngIf="legendConfig.showTotal === true">{{ 'legend.Total' | translate }}</th>
-          <th class="tb-time-series-chart-legend-type-label right" *ngIf="legendConfig.showLatest === true">{{ 'legend.Latest' | translate }}</th>
+          <th class="tb-time-series-chart-legend-type-label right" [style]="legendColumnTitleStyle" *ngIf="legendConfig.showMin === true">{{ 'legend.Min' | translate }}</th>
+          <th class="tb-time-series-chart-legend-type-label right" [style]="legendColumnTitleStyle" *ngIf="legendConfig.showMax === true">{{ 'legend.Max' | translate }}</th>
+          <th class="tb-time-series-chart-legend-type-label right" [style]="legendColumnTitleStyle" *ngIf="legendConfig.showAvg === true">{{ 'legend.Avg' | translate }}</th>
+          <th class="tb-time-series-chart-legend-type-label right" [style]="legendColumnTitleStyle" *ngIf="legendConfig.showTotal === true">{{ 'legend.Total' | translate }}</th>
+          <th class="tb-time-series-chart-legend-type-label right" [style]="legendColumnTitleStyle" *ngIf="legendConfig.showLatest === true">{{ 'legend.Latest' | translate }}</th>
         </tr>
         </thead>
         <tbody>
@@ -75,19 +75,19 @@
             <th>
               <ng-container *ngTemplateOutlet="legendItem; context:{legendKey: legendKey, left: true}"></ng-container>
             </th>
-            <td *ngIf="legendConfig.showMin === true" class="tb-time-series-chart-legend-value">
+            <td *ngIf="legendConfig.showMin === true" class="tb-time-series-chart-legend-value" [style]="legendValueStyle">
               {{ legendData.data[legendKey.dataIndex].min }}
             </td>
-            <td *ngIf="legendConfig.showMax === true" class="tb-time-series-chart-legend-value">
+            <td *ngIf="legendConfig.showMax === true" class="tb-time-series-chart-legend-value" [style]="legendValueStyle">
               {{ legendData.data[legendKey.dataIndex].max }}
             </td>
-            <td *ngIf="legendConfig.showAvg === true" class="tb-time-series-chart-legend-value">
+            <td *ngIf="legendConfig.showAvg === true" class="tb-time-series-chart-legend-value" [style]="legendValueStyle">
               {{ legendData.data[legendKey.dataIndex].avg }}
             </td>
-            <td *ngIf="legendConfig.showTotal === true" class="tb-time-series-chart-legend-value">
+            <td *ngIf="legendConfig.showTotal === true" class="tb-time-series-chart-legend-value" [style]="legendValueStyle">
               {{ legendData.data[legendKey.dataIndex].total }}
             </td>
-            <td *ngIf="legendConfig.showLatest === true" class="tb-time-series-chart-legend-value">
+            <td *ngIf="legendConfig.showLatest === true" class="tb-time-series-chart-legend-value" [style]="legendValueStyle">
               {{ legendData.data[legendKey.dataIndex].latest }}
             </td>
           </tr>
@@ -113,8 +113,8 @@
     </ng-template>
     <ng-template #legendDataRow let-label="label" let-type="type">
       <tr>
-        <th class="tb-time-series-chart-legend-type-label">{{ label | translate }}</th>
-        <td *ngFor="let legendKey of legendKeys" class="tb-time-series-chart-legend-value">
+        <th class="tb-time-series-chart-legend-type-label" [style]="legendColumnTitleStyle">{{ label | translate }}</th>
+        <td *ngFor="let legendKey of legendKeys" class="tb-time-series-chart-legend-value" [style]="legendValueStyle">
           {{ legendData.data[legendKey.dataIndex][type] }}
         </td>
       </tr>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.scss
index ee0400d96f..79a162a7ae 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.scss
@@ -147,11 +147,6 @@ $maxLegendHeight: 35%;
         }
       }
       .tb-time-series-chart-legend-type-label {
-        font-size: 12px;
-        font-style: normal;
-        font-weight: 400;
-        line-height: 16px;
-        color: rgba(0, 0, 0, 0.38);
         white-space: nowrap;
         text-align: left;
         &.right {
@@ -159,11 +154,6 @@ $maxLegendHeight: 35%;
         }
       }
       .tb-time-series-chart-legend-value {
-        font-size: 12px;
-        font-style: normal;
-        font-weight: 500;
-        line-height: 16px;
-        color: rgba(0, 0, 0, 0.87);
         white-space: nowrap;
         text-align: right;
       }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts
index fbb23c6c84..81ea480531 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts
@@ -73,8 +73,10 @@ export class TimeSeriesChartWidgetComponent implements OnInit, OnDestroy, AfterV
   overlayEnabled: boolean;
   padding: string;
 
+  legendColumnTitleStyle: ComponentStyle;
   legendLabelStyle: ComponentStyle;
   disabledLegendLabelStyle: ComponentStyle;
+  legendValueStyle: ComponentStyle;
 
   displayLegendValues = false;
 
@@ -117,9 +119,13 @@ export class TimeSeriesChartWidgetComponent implements OnInit, OnDestroy, AfterV
     if (this.showLegend) {
       this.horizontalLegendPosition = [LegendPosition.left, LegendPosition.right].includes(this.legendConfig.position);
       this.legendClass = `legend-${this.legendConfig.position}`;
+      this.legendColumnTitleStyle = textStyle(this.settings.legendColumnTitleFont);
+      this.legendColumnTitleStyle.color = this.settings.legendColumnTitleColor;
       this.legendLabelStyle = textStyle(this.settings.legendLabelFont);
       this.disabledLegendLabelStyle = textStyle(this.settings.legendLabelFont);
       this.legendLabelStyle.color = this.settings.legendLabelColor;
+      this.legendValueStyle = textStyle(this.settings.legendValueFont);
+      this.legendValueStyle.color = this.settings.legendValueColor;
       this.displayLegendValues = this.legendConfig.showMin || this.legendConfig.showMax ||
         this.legendConfig.showAvg || this.legendConfig.showTotal || this.legendConfig.showLatest;
     }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.models.ts
index 6edf87251c..00abd27c33 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.models.ts
@@ -21,8 +21,12 @@ import { mergeDeep } from '@core/utils';
 
 export interface TimeSeriesChartWidgetSettings extends TimeSeriesChartSettings {
   showLegend: boolean;
+  legendColumnTitleFont: Font;
+  legendColumnTitleColor: string;
   legendLabelFont: Font;
   legendLabelColor: string;
+  legendValueFont: Font;
+  legendValueColor: string;
   legendConfig: LegendConfig;
   background: BackgroundSettings;
   padding: string;
@@ -31,6 +35,15 @@ export interface TimeSeriesChartWidgetSettings extends TimeSeriesChartSettings {
 export const timeSeriesChartWidgetDefaultSettings: TimeSeriesChartWidgetSettings =
   mergeDeep({} as TimeSeriesChartWidgetSettings, timeSeriesChartDefaultSettings as TimeSeriesChartWidgetSettings, {
     showLegend: true,
+    legendColumnTitleFont: {
+      family: 'Roboto',
+      size: 12,
+      sizeUnit: 'px',
+      style: 'normal',
+      weight: '400',
+      lineHeight: '16px'
+    },
+    legendColumnTitleColor: 'rgba(0, 0, 0, 0.38)',
     legendLabelFont: {
       family: 'Roboto',
       size: 12,
@@ -40,6 +53,15 @@ export const timeSeriesChartWidgetDefaultSettings: TimeSeriesChartWidgetSettings
       lineHeight: '16px'
     },
     legendLabelColor: 'rgba(0, 0, 0, 0.76)',
+    legendValueFont: {
+      family: 'Roboto',
+      size: 12,
+      sizeUnit: 'px',
+      style: 'normal',
+      weight: '500',
+      lineHeight: '16px'
+    },
+    legendValueColor: 'rgba(0, 0, 0, 0.87)',
     legendConfig: {...defaultLegendConfig(widgetType.timeseries), position: LegendPosition.top},
     background: {
       type: BackgroundType.color,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts
index 6f985466c4..0fd702a95f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts
@@ -16,11 +16,16 @@
 
 import {
   ECharts,
+  echartsAnimationDefaultSettings,
+  EChartsAnimationSettings,
   EChartsOption,
   EChartsSeriesItem,
+  EChartsShape,
   EChartsTooltipTrigger,
+  EChartsTooltipValueFormatFunction,
   EChartsTooltipWidgetSettings,
-  measureThresholdLabelOffset
+  measureThresholdOffset,
+  timeAxisBandWidthCalculator
 } from '@home/components/widget/lib/chart/echarts-widget.models';
 import {
   autoDateFormat,
@@ -30,12 +35,18 @@ import {
   textStyle,
   tsToFormatTimeUnit
 } from '@shared/models/widget-settings.models';
-import { XAXisOption, YAXisOption } from 'echarts/types/dist/shared';
+import {
+  LabelLayoutOptionCallback,
+  VisualMapComponentOption,
+  XAXisOption,
+  YAXisOption
+} from 'echarts/types/dist/shared';
 import { CustomSeriesOption, LineSeriesOption } from 'echarts/charts';
 import {
   formatValue,
   isDefinedAndNotNull,
   isFunction,
+  isNumber,
   isNumeric,
   isUndefined,
   isUndefinedOrNull,
@@ -45,25 +56,31 @@ import {
 import { LinearGradientObject } from 'zrender/lib/graphic/LinearGradient';
 import tinycolor from 'tinycolor2';
 import { ValueAxisBaseOption } from 'echarts/types/src/coord/axisCommonTypes';
-import { SeriesLabelOption } from 'echarts/types/src/util/types';
+import { LabelLayoutOption, SeriesLabelOption } from 'echarts/types/src/util/types';
+import { LabelFormatterCallback } from 'echarts';
 import {
   BarRenderContext,
   BarRenderSharedContext,
   BarVisualSettings,
   renderTimeSeriesBar
 } from '@home/components/widget/lib/chart/time-series-chart-bar.models';
-import { DataKey } from '@shared/models/widget.models';
+import { DataKey, DataKeySettingsWithComparison, WidgetComparisonSettings } from '@shared/models/widget.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { TbColorScheme } from '@shared/models/color.models';
 import { AbstractControl, ValidationErrors } from '@angular/forms';
 import { MarkLine2DDataItemOption } from 'echarts/types/src/component/marker/MarkLineModel';
 import { DatePipe } from '@angular/common';
+import { BuiltinTextPosition } from 'zrender/src/core/types';
+import { CartesianAxisOption } from 'echarts/types/src/coord/cartesian/AxisModel';
+import { WidgetTimewindow } from '@shared/models/time/time.models';
+import { UtilsService } from '@core/services/utils.service';
 
 export enum TimeSeriesChartType {
   default = 'default',
   line = 'line',
   bar = 'bar',
-  point = 'point'
+  point = 'point',
+  state = 'state'
 }
 
 export const timeSeriesChartTypeTranslations = new Map<TimeSeriesChartType, string>(
@@ -74,7 +91,7 @@ export const timeSeriesChartTypeTranslations = new Map<TimeSeriesChartType, stri
   ]
 );
 
-const timeSeriesChartColorScheme: TbColorScheme = {
+export const timeSeriesChartColorScheme: TbColorScheme = {
   'threshold.line': {
     light: 'rgba(0, 0, 0, 0.76)',
     dark: '#eee'
@@ -127,34 +144,6 @@ export const timeSeriesAxisPositionTranslations = new Map<AxisPosition, string>(
   ]
 );
 
-export enum TimeSeriesChartShape {
-  emptyCircle = 'emptyCircle',
-  circle = 'circle',
-  rect = 'rect',
-  roundRect = 'roundRect',
-  triangle = 'triangle',
-  diamond = 'diamond',
-  pin = 'pin',
-  arrow = 'arrow',
-  none = 'none'
-}
-
-export const timeSeriesChartShapes = Object.keys(TimeSeriesChartShape) as TimeSeriesChartShape[];
-
-export const timeSeriesChartShapeTranslations = new Map<TimeSeriesChartShape, string>(
-  [
-    [TimeSeriesChartShape.emptyCircle, 'widgets.time-series-chart.shape-empty-circle'],
-    [TimeSeriesChartShape.circle, 'widgets.time-series-chart.shape-circle'],
-    [TimeSeriesChartShape.rect, 'widgets.time-series-chart.shape-rect'],
-    [TimeSeriesChartShape.roundRect, 'widgets.time-series-chart.shape-round-rect'],
-    [TimeSeriesChartShape.triangle, 'widgets.time-series-chart.shape-triangle'],
-    [TimeSeriesChartShape.diamond, 'widgets.time-series-chart.shape-diamond'],
-    [TimeSeriesChartShape.pin, 'widgets.time-series-chart.shape-pin'],
-    [TimeSeriesChartShape.arrow, 'widgets.time-series-chart.shape-arrow'],
-    [TimeSeriesChartShape.none, 'widgets.time-series-chart.shape-none']
-  ]
-);
-
 export enum TimeSeriesChartLineType {
   solid = 'solid',
   dashed = 'dashed',
@@ -221,6 +210,21 @@ export const timeSeriesThresholdTypeTranslations = new Map<TimeSeriesChartThresh
   ]
 );
 
+
+export enum TimeSeriesChartStateSourceType {
+  constant = 'constant',
+  range = 'range'
+}
+
+export const timeSeriesStateSourceTypes = Object.keys(TimeSeriesChartStateSourceType) as TimeSeriesChartStateSourceType[];
+
+export const timeSeriesStateSourceTypeTranslations = new Map<TimeSeriesChartStateSourceType, string>(
+  [
+    [TimeSeriesChartStateSourceType.constant, 'widgets.time-series-chart.state.type-constant'],
+    [TimeSeriesChartStateSourceType.range, 'widgets.time-series-chart.state.type-range']
+  ]
+);
+
 export enum SeriesFillType {
   none = 'none',
   opacity = 'opacity',
@@ -401,6 +405,38 @@ export const defaultTimeSeriesChartYAxisSettings: TimeSeriesChartYAxisSettings =
     splitLinesColor: timeSeriesChartColorScheme['axis.splitLine'].light
 };
 
+export const defaultTimeSeriesChartXAxisSettings: TimeSeriesChartXAxisSettings = {
+  show: true,
+  label: '',
+  labelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '600',
+    lineHeight: '1'
+  },
+  labelColor: timeSeriesChartColorScheme['axis.label'].light,
+  position: AxisPosition.bottom,
+  showTickLabels: true,
+  tickLabelFont: {
+    family: 'Roboto',
+    size: 10,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '1'
+  },
+  tickLabelColor: timeSeriesChartColorScheme['axis.tickLabel'].light,
+  ticksFormat: {},
+  showTicks: true,
+  ticksColor: timeSeriesChartColorScheme['axis.ticks'].light,
+  showLine: true,
+  lineColor: timeSeriesChartColorScheme['axis.line'].light,
+  showSplitLines: true,
+  splitLinesColor: timeSeriesChartColorScheme['axis.splitLine'].light
+};
+
 export type TimeSeriesChartYAxes = {[id: TimeSeriesChartYAxisId]: TimeSeriesChartYAxisSettings};
 
 export interface TimeSeriesChartThreshold {
@@ -415,16 +451,19 @@ export interface TimeSeriesChartThreshold {
   units?: string;
   decimals?: number;
   lineColor: string;
-  lineType: TimeSeriesChartLineType;
+  lineType: TimeSeriesChartLineType | number | number[];
   lineWidth: number;
-  startSymbol: TimeSeriesChartShape;
+  startSymbol: EChartsShape;
   startSymbolSize: number;
-  endSymbol: TimeSeriesChartShape;
+  endSymbol: EChartsShape;
   endSymbolSize: number;
   showLabel: boolean;
   labelPosition: ThresholdLabelPosition;
   labelFont: Font;
   labelColor: string;
+  enableLabelBackground: boolean;
+  labelBackground: string;
+  additionalLabelOption?: {[key: string]: any};
 }
 
 export const timeSeriesChartThresholdValid = (threshold: TimeSeriesChartThreshold): boolean => {
@@ -469,9 +508,9 @@ export const timeSeriesChartThresholdDefaultSettings: TimeSeriesChartThreshold =
   lineColor: timeSeriesChartColorScheme['threshold.line'].light,
   lineType: TimeSeriesChartLineType.solid,
   lineWidth: 1,
-  startSymbol: TimeSeriesChartShape.none,
+  startSymbol: EChartsShape.none,
   startSymbolSize: 5,
-  endSymbol: TimeSeriesChartShape.arrow,
+  endSymbol: EChartsShape.arrow,
   endSymbolSize: 5,
   showLabel: true,
   labelPosition: ThresholdLabelPosition.end,
@@ -483,7 +522,9 @@ export const timeSeriesChartThresholdDefaultSettings: TimeSeriesChartThreshold =
     weight: '400',
     lineHeight: '1'
   },
-  labelColor: timeSeriesChartColorScheme['threshold.label'].light
+  labelColor: timeSeriesChartColorScheme['threshold.label'].light,
+  enableLabelBackground: false,
+  labelBackground: 'rgba(255,255,255,0.56)'
 };
 
 export enum TimeSeriesChartNoAggregationBarWidthStrategy {
@@ -513,62 +554,122 @@ export interface TimeSeriesChartNoAggregationBarWidthSettings {
   barWidth?: TimeSeriesChartBarWidth;
 }
 
-export enum TimeSeriesChartAnimationEasing {
-  linear = 'linear',
-  quadraticIn = 'quadraticIn',
-  quadraticOut = 'quadraticOut',
-  quadraticInOut = 'quadraticInOut',
-  cubicIn = 'cubicIn',
-  cubicOut = 'cubicOut',
-  cubicInOut = 'cubicInOut',
-  quarticIn = 'quarticIn',
-  quarticOut = 'quarticOut',
-  quarticInOut = 'quarticInOut',
-  quinticIn = 'quinticIn',
-  quinticOut = 'quinticOut',
-  quinticInOut = 'quinticInOut',
-  sinusoidalIn = 'sinusoidalIn',
-  sinusoidalOut = 'sinusoidalOut',
-  sinusoidalInOut = 'sinusoidalInOut',
-  exponentialIn = 'exponentialIn',
-  exponentialOut = 'exponentialOut',
-  exponentialInOut = 'exponentialInOut',
-  circularIn = 'circularIn',
-  circularOut = 'circularOut',
-  circularInOut = 'circularInOut',
-  elasticIn = 'elasticIn',
-  elasticOut = 'elasticOut',
-  elasticInOut = 'elasticInOut',
-  backIn = 'backIn',
-  backOut = 'backOut',
-  backInOut = 'backInOut',
-  bounceIn = 'bounceIn',
-  bounceOut = 'bounceOut',
-  bounceInOut = 'bounceInOut'
+export const timeSeriesChartNoAggregationBarWidthDefaultSettings: TimeSeriesChartNoAggregationBarWidthSettings = {
+  strategy: TimeSeriesChartNoAggregationBarWidthStrategy.group,
+  groupWidth: {
+    relative: true,
+    relativeWidth: 2,
+    absoluteWidth: 1000
+  },
+  barWidth: {
+    relative: true,
+    relativeWidth: 2,
+    absoluteWidth: 1000
+  }
+};
+
+export interface TimeSeriesChartBarWidthSettings {
+  barGap: number;
+  intervalGap: number;
+}
+
+export interface TimeSeriesChartVisualMapPiece {
+  lt?: number;
+  gt?: number;
+  lte?: number;
+  gte?: number;
+  value?: number;
+  color?: string;
+}
+
+export const createTimeSeriesChartVisualMapPiece = (color: string, from?: number, to?: number): TimeSeriesChartVisualMapPiece => {
+  const piece: TimeSeriesChartVisualMapPiece = {
+    color
+  };
+  if (isNumber(from) && isNumber(to)) {
+    if (from === to) {
+      piece.value = from;
+    } else {
+      piece.gte = from;
+      piece.lt = to;
+    }
+  } else if (isNumber(from)) {
+    piece.gte = from;
+  } else if (isNumber(to)) {
+    piece.lt = to;
+  }
+  return piece;
+};
+
+export interface TimeSeriesChartVisualMapSettings {
+  outOfRangeColor: string;
+  pieces: TimeSeriesChartVisualMapPiece[];
+}
+
+export interface TimeSeriesChartStateSettings {
+  label: string;
+  value: number;
+  sourceType: TimeSeriesChartStateSourceType;
+  sourceValue?: any;
+  sourceRangeFrom?: number;
+  sourceRangeTo?: number;
+}
+
+export const timeSeriesChartStateValid = (state: TimeSeriesChartStateSettings): boolean => {
+  if (isUndefinedOrNull(state.value) || !state.sourceType) {
+    return false;
+  }
+  switch (state.sourceType) {
+    case TimeSeriesChartStateSourceType.constant:
+      if (isUndefinedOrNull(state.sourceValue)) {
+        return false;
+      }
+      break;
+  }
+  return true;
+};
+
+export const timeSeriesChartStateValidator = (control: AbstractControl): ValidationErrors | null => {
+  const state: TimeSeriesChartStateSettings = control.value;
+  if (!timeSeriesChartStateValid(state)) {
+    return {
+      state: true
+    };
+  }
+  return null;
+};
+
+export interface TimeSeriesChartComparisonSettings extends WidgetComparisonSettings {
+  comparisonXAxis?: TimeSeriesChartXAxisSettings;
 }
 
-export const timeSeriesChartAnimationEasings = Object.keys(TimeSeriesChartAnimationEasing) as TimeSeriesChartAnimationEasing[];
-
-export interface TimeSeriesChartAnimationSettings {
-  animation: boolean;
-  animationThreshold: number;
-  animationDuration: number;
-  animationEasing: TimeSeriesChartAnimationEasing;
-  animationDelay: number;
-  animationDurationUpdate: number;
-  animationEasingUpdate: TimeSeriesChartAnimationEasing;
-  animationDelayUpdate: number;
+export interface TimeSeriesChartGridSettings {
+  show: boolean;
+  backgroundColor: string;
+  borderWidth: number;
+  borderColor: string;
 }
 
-export interface TimeSeriesChartSettings extends EChartsTooltipWidgetSettings {
+export const timeSeriesChartGridDefaultSettings: TimeSeriesChartGridSettings = {
+  show: false,
+  backgroundColor: null,
+  borderWidth: 1,
+  borderColor: '#ccc'
+};
+
+export interface TimeSeriesChartSettings extends EChartsTooltipWidgetSettings, TimeSeriesChartComparisonSettings {
   thresholds: TimeSeriesChartThreshold[];
   darkMode: boolean;
   dataZoom: boolean;
   stack: boolean;
+  grid: TimeSeriesChartGridSettings;
   yAxes: TimeSeriesChartYAxes;
   xAxis: TimeSeriesChartXAxisSettings;
-  animation: TimeSeriesChartAnimationSettings;
+  animation: EChartsAnimationSettings;
+  barWidthSettings: TimeSeriesChartBarWidthSettings;
   noAggregationBarWidthSettings: TimeSeriesChartNoAggregationBarWidthSettings;
+  visualMapSettings?: TimeSeriesChartVisualMapSettings;
+  states?: TimeSeriesChartStateSettings[];
 }
 
 export const timeSeriesChartDefaultSettings: TimeSeriesChartSettings = {
@@ -576,67 +677,34 @@ export const timeSeriesChartDefaultSettings: TimeSeriesChartSettings = {
   darkMode: false,
   dataZoom: true,
   stack: false,
+  grid: mergeDeep({} as TimeSeriesChartGridSettings,
+    timeSeriesChartGridDefaultSettings),
   yAxes: {
     default: mergeDeep({} as TimeSeriesChartYAxisSettings,
                        defaultTimeSeriesChartYAxisSettings,
                        { id: 'default', order: 0 } as TimeSeriesChartYAxisSettings)
   },
-  xAxis: {
-    show: true,
-    label: '',
-    labelFont: {
-      family: 'Roboto',
-      size: 12,
-      sizeUnit: 'px',
-      style: 'normal',
-      weight: '600',
-      lineHeight: '1'
-    },
-    labelColor: timeSeriesChartColorScheme['axis.label'].light,
-    position: AxisPosition.bottom,
-    showTickLabels: true,
-    tickLabelFont: {
-      family: 'Roboto',
-      size: 10,
-      sizeUnit: 'px',
-      style: 'normal',
-      weight: '400',
-      lineHeight: '1'
-    },
-    tickLabelColor: timeSeriesChartColorScheme['axis.tickLabel'].light,
-    ticksFormat: {},
-    showTicks: true,
-    ticksColor: timeSeriesChartColorScheme['axis.ticks'].light,
-    showLine: true,
-    lineColor: timeSeriesChartColorScheme['axis.line'].light,
-    showSplitLines: true,
-    splitLinesColor: timeSeriesChartColorScheme['axis.splitLine'].light
-  },
-  animation: {
-    animation: true,
-    animationThreshold: 2000,
-    animationDuration: 500,
-    animationEasing: TimeSeriesChartAnimationEasing.cubicOut,
-    animationDelay: 0,
-    animationDurationUpdate: 300,
-    animationEasingUpdate: TimeSeriesChartAnimationEasing.cubicOut,
-    animationDelayUpdate: 0
-  },
-  noAggregationBarWidthSettings: {
-    strategy: TimeSeriesChartNoAggregationBarWidthStrategy.group,
-    groupWidth: {
-      relative: true,
-      relativeWidth: 2,
-      absoluteWidth: 1000
-    },
-    barWidth: {
-      relative: true,
-      relativeWidth: 2,
-      absoluteWidth: 1000
-    }
+  xAxis: mergeDeep({} as TimeSeriesChartXAxisSettings,
+    defaultTimeSeriesChartXAxisSettings),
+  animation: mergeDeep({} as EChartsAnimationSettings,
+    echartsAnimationDefaultSettings),
+  barWidthSettings: {
+    barGap: 0.3,
+    intervalGap: 0.6
   },
+  noAggregationBarWidthSettings: mergeDeep({} as TimeSeriesChartNoAggregationBarWidthSettings,
+    timeSeriesChartNoAggregationBarWidthDefaultSettings),
   showTooltip: true,
   tooltipTrigger: EChartsTooltipTrigger.axis,
+  tooltipLabelFont: {
+    family: 'Roboto',
+    size: 12,
+    sizeUnit: 'px',
+    style: 'normal',
+    weight: '400',
+    lineHeight: '16px'
+  },
+  tooltipLabelColor: 'rgba(0, 0, 0, 0.76)',
   tooltipValueFont: {
     family: 'Roboto',
     size: 12,
@@ -659,7 +727,13 @@ export const timeSeriesChartDefaultSettings: TimeSeriesChartSettings = {
   tooltipDateColor: 'rgba(0, 0, 0, 0.76)',
   tooltipDateInterval: true,
   tooltipBackgroundColor: 'rgba(255, 255, 255, 0.76)',
-  tooltipBackgroundBlur: 4
+  tooltipBackgroundBlur: 4,
+  comparisonEnabled: false,
+  timeForComparison: 'previousInterval',
+  comparisonCustomIntervalValue: 7200000,
+  comparisonXAxis: mergeDeep({} as TimeSeriesChartXAxisSettings,
+    defaultTimeSeriesChartXAxisSettings,
+    { position: AxisPosition.top } as TimeSeriesChartXAxisSettings)
 };
 
 export interface SeriesFillSettings {
@@ -683,7 +757,10 @@ export interface LineSeriesSettings {
   pointLabelPosition: SeriesLabelPosition;
   pointLabelFont: Font;
   pointLabelColor: string;
-  pointShape: TimeSeriesChartShape;
+  enablePointLabelBackground: boolean;
+  pointLabelBackground: string;
+  pointLabelFormatter?: string | LabelFormatterCallback;
+  pointShape: EChartsShape;
   pointSize: number;
   fillAreaSettings: SeriesFillSettings;
 }
@@ -693,19 +770,25 @@ export interface BarSeriesSettings {
   borderWidth: number;
   borderRadius: number;
   showLabel: boolean;
-  labelPosition: SeriesLabelPosition;
+  labelPosition: SeriesLabelPosition | BuiltinTextPosition;
   labelFont: Font;
   labelColor: string;
+  enableLabelBackground: boolean;
+  labelBackground: string;
+  labelFormatter?: string | LabelFormatterCallback;
+  labelLayout?: LabelLayoutOption | LabelLayoutOptionCallback;
+  additionalLabelOption?: {[key: string]: any};
   backgroundSettings: SeriesFillSettings;
 }
 
-export interface TimeSeriesChartKeySettings {
+export interface TimeSeriesChartKeySettings extends DataKeySettingsWithComparison {
   yAxisId: TimeSeriesChartYAxisId;
   showInLegend: boolean;
   dataHiddenByDefault: boolean;
   type: TimeSeriesChartSeriesType;
   lineSettings: LineSeriesSettings;
   barSettings: BarSeriesSettings;
+  tooltipValueFormatter?: string | EChartsTooltipValueFormatFunction;
 }
 
 export const timeSeriesChartKeyDefaultSettings: TimeSeriesChartKeySettings = {
@@ -732,7 +815,9 @@ export const timeSeriesChartKeyDefaultSettings: TimeSeriesChartKeySettings = {
       lineHeight: '1'
     },
     pointLabelColor: timeSeriesChartColorScheme['series.label'].light,
-    pointShape: TimeSeriesChartShape.emptyCircle,
+    enablePointLabelBackground: false,
+    pointLabelBackground: 'rgba(255,255,255,0.56)',
+    pointShape: EChartsShape.emptyCircle,
     pointSize: 4,
     fillAreaSettings: {
       type: SeriesFillType.none,
@@ -758,6 +843,8 @@ export const timeSeriesChartKeyDefaultSettings: TimeSeriesChartKeySettings = {
       lineHeight: '1'
     },
     labelColor: timeSeriesChartColorScheme['series.label'].light,
+    enableLabelBackground: false,
+    labelBackground: 'rgba(255,255,255,0.56)',
     backgroundSettings: {
       type: SeriesFillType.none,
       opacity: 0.4,
@@ -766,10 +853,16 @@ export const timeSeriesChartKeyDefaultSettings: TimeSeriesChartKeySettings = {
         end: 0
       }
     }
+  },
+  comparisonSettings: {
+    showValuesForComparison: false,
+    comparisonValuesLabel: '',
+    color: ''
   }
 };
 
 export interface TimeSeriesChartDataItem extends EChartsSeriesItem {
+  xAxisIndex: number;
   yAxisId: TimeSeriesChartYAxisId;
   yAxisIndex: number;
   option?: LineSeriesOption | CustomSeriesOption;
@@ -790,16 +883,27 @@ export interface TimeSeriesChartThresholdItem {
   option?: LineSeriesOption;
 }
 
-export interface TimeSeriesChartYAxis {
+export interface TimeSeriesChartAxis {
   id: string;
+  settings: TimeSeriesChartAxisSettings;
+  option: CartesianAxisOption;
+}
+
+export interface TimeSeriesChartYAxis extends TimeSeriesChartAxis {
   decimals: number;
   settings: TimeSeriesChartYAxisSettings;
   option: YAXisOption & ValueAxisBaseOption;
 }
 
+export interface TimeSeriesChartXAxis extends TimeSeriesChartAxis {
+  settings: TimeSeriesChartXAxisSettings;
+  option: XAXisOption;
+}
+
 export const createTimeSeriesYAxis = (units: string,
                                       decimals: number,
                                       settings: TimeSeriesChartYAxisSettings,
+                                      utils: UtilsService,
                                       darkMode: boolean): TimeSeriesChartYAxis => {
   const yAxisTickLabelStyle = createChartTextStyle(settings.tickLabelFont,
     settings.tickLabelColor, darkMode, 'axis.tickLabel');
@@ -814,18 +918,19 @@ export const createTimeSeriesYAxis = (units: string,
       ticksFormatter = parseFunction(settings.ticksFormatter, ['value']);
     }
   }
+  let configuredTicksGenerator: TimeSeriesChartTicksGenerator;
   let ticksGenerator: TimeSeriesChartTicksGenerator;
   let minInterval: number;
   let interval: number;
   let splitNumber: number;
   if (settings.ticksGenerator) {
     if (isFunction(settings.ticksGenerator)) {
-      ticksGenerator = settings.ticksGenerator as TimeSeriesChartTicksGenerator;
+      configuredTicksGenerator = settings.ticksGenerator as TimeSeriesChartTicksGenerator;
     } else if (settings.ticksGenerator.length) {
-      ticksGenerator = parseFunction(settings.ticksGenerator, ['extent', 'interval', 'niceTickExtent', 'intervalPrecision']);
+      configuredTicksGenerator = parseFunction(settings.ticksGenerator, ['extent', 'interval', 'niceTickExtent', 'intervalPrecision']);
     }
   }
-  if (!ticksGenerator) {
+  if (!configuredTicksGenerator) {
     interval = settings.interval;
     if (isUndefinedOrNull(interval)) {
       if (isDefinedAndNotNull(settings.splitNumber)) {
@@ -834,12 +939,18 @@ export const createTimeSeriesYAxis = (units: string,
         minInterval = (1 / Math.pow(10, decimals));
       }
     }
+  } else {
+    ticksGenerator = (extent, ticksInterval, niceTickExtent, intervalPrecision) => {
+      const ticks = configuredTicksGenerator(extent, ticksInterval, niceTickExtent, intervalPrecision);
+      return ticks?.filter(tick => tick.value >= extent[0] && tick.value <= extent[1]);
+    };
   }
   return {
     id: settings.id,
     decimals,
     settings,
     option: {
+      mainType: 'yAxis',
       show: settings.show,
       type: 'value',
       position: settings.position,
@@ -853,7 +964,7 @@ export const createTimeSeriesYAxis = (units: string,
       splitNumber,
       interval,
       ticksGenerator,
-      name: settings.label,
+      name: utils.customTranslation(settings.label, settings.label),
       nameLocation: 'middle',
       nameRotate: settings.position === AxisPosition.left ? 90 : -90,
       nameTextStyle: {
@@ -907,72 +1018,113 @@ export const createTimeSeriesYAxis = (units: string,
   };
 };
 
-export const createTimeSeriesXAxisOption = (settings: TimeSeriesChartXAxisSettings,
-                                            min: number, max: number,
-                                            datePipe: DatePipe,
-                                            darkMode: boolean): XAXisOption => {
+export const createTimeSeriesXAxis = (id: string,
+                                      settings: TimeSeriesChartXAxisSettings,
+                                      min: number, max: number,
+                                      datePipe: DatePipe,
+                                      utils: UtilsService,
+                                      darkMode: boolean): TimeSeriesChartXAxis => {
   const xAxisTickLabelStyle = createChartTextStyle(settings.tickLabelFont,
     settings.tickLabelColor, darkMode, 'axis.tickLabel');
   const xAxisNameStyle = createChartTextStyle(settings.labelFont,
     settings.labelColor, darkMode, 'axis.label');
   const ticksFormat = mergeDeep({}, defaultXAxisTicksFormat, settings.ticksFormat);
   return {
-    show: settings.show,
-    type: 'time',
-    scale: true,
-    position: settings.position,
-    name: settings.label,
-    nameLocation: 'middle',
-    nameTextStyle: {
-      color: xAxisNameStyle.color,
-      fontStyle: xAxisNameStyle.fontStyle,
-      fontWeight: xAxisNameStyle.fontWeight,
-      fontFamily: xAxisNameStyle.fontFamily,
-      fontSize: xAxisNameStyle.fontSize
-    },
-    axisTick: {
-      show: settings.showTicks,
-      lineStyle: {
-        color: prepareChartThemeColor(settings.ticksColor, darkMode, 'axis.ticks')
-      }
-    },
-    axisLabel: {
-      show: settings.showTickLabels,
-      color: xAxisTickLabelStyle.color,
-      fontStyle: xAxisTickLabelStyle.fontStyle,
-      fontWeight: xAxisTickLabelStyle.fontWeight,
-      fontFamily: xAxisTickLabelStyle.fontFamily,
-      fontSize: xAxisTickLabelStyle.fontSize,
-      hideOverlap: true,
-      formatter: (value: number, index: number, extra: {level: number}) => {
-        const unit = tsToFormatTimeUnit(value);
-        const format = ticksFormat[unit];
-        const formatted = datePipe.transform(value, format);
-        if (extra.level > 0) {
-          return `{primary|${formatted}}`;
-        } else {
-          return formatted;
+    id,
+    settings,
+    option: {
+      mainType: 'xAxis',
+      show: settings.show,
+      type: 'time',
+      scale: true,
+      position: settings.position,
+      id,
+      name: utils.customTranslation(settings.label, settings.label),
+      nameLocation: 'middle',
+      nameTextStyle: {
+        color: xAxisNameStyle.color,
+        fontStyle: xAxisNameStyle.fontStyle,
+        fontWeight: xAxisNameStyle.fontWeight,
+        fontFamily: xAxisNameStyle.fontFamily,
+        fontSize: xAxisNameStyle.fontSize
+      },
+      axisPointer: {
+        shadowStyle: {
+          color: id === 'main' ? 'rgba(210,219,238,0.2)' : 'rgba(150,150,150,0.1)'
         }
-      }
-    },
-    axisLine: {
-      show: settings.showLine,
-      onZero: false,
-      lineStyle: {
-        color: prepareChartThemeColor(settings.lineColor, darkMode, 'axis.line')
-      }
-    },
-    splitLine: {
-      show: settings.showSplitLines,
-      lineStyle: {
-        color: prepareChartThemeColor(settings.splitLinesColor, darkMode, 'axis.splitLine')
-      }
-    },
-    min,
-    max
+      },
+      axisTick: {
+        show: settings.showTicks,
+        lineStyle: {
+          color: prepareChartThemeColor(settings.ticksColor, darkMode, 'axis.ticks')
+        }
+      },
+      axisLabel: {
+        show: settings.showTickLabels,
+        color: xAxisTickLabelStyle.color,
+        fontStyle: xAxisTickLabelStyle.fontStyle,
+        fontWeight: xAxisTickLabelStyle.fontWeight,
+        fontFamily: xAxisTickLabelStyle.fontFamily,
+        fontSize: xAxisTickLabelStyle.fontSize,
+        hideOverlap: true,
+        /** Min/Max time label always visible **/
+        /* alignMinLabel: 'left',
+        alignMaxLabel: 'right',
+        showMinLabel: true,
+        showMaxLabel: true, */
+        formatter: (value: number, _index: number, extra: {level: number}) => {
+          const unit = tsToFormatTimeUnit(value);
+          const format = ticksFormat[unit];
+          const formatted = datePipe.transform(value, format);
+          if (extra.level > 0) {
+            return `{primary|${formatted}}`;
+          } else {
+            return formatted;
+          }
+        }
+      },
+      axisLine: {
+        show: settings.showLine,
+        onZero: false,
+        lineStyle: {
+          color: prepareChartThemeColor(settings.lineColor, darkMode, 'axis.line')
+        }
+      },
+      splitLine: {
+        show: settings.showSplitLines,
+        lineStyle: {
+          color: prepareChartThemeColor(settings.splitLinesColor, darkMode, 'axis.splitLine')
+        }
+      },
+      min,
+      max,
+      bandWidthCalculator: timeAxisBandWidthCalculator
+    }
   };
 };
 
+export const createTimeSeriesVisualMapOption = (settings: TimeSeriesChartVisualMapSettings,
+                                                selectedRanges: {[key: number]: boolean}): VisualMapComponentOption => ({
+  show: false,
+  type: 'piecewise',
+  selected: selectedRanges,
+  dimension: 1,
+  pieces: settings.pieces,
+  outOfRange: {
+  color: settings.outOfRangeColor
+},
+  inRange: !settings.pieces.length ? {
+    color: settings.outOfRangeColor
+  } : undefined
+});
+
+export const updateXAxisTimeWindow = (option: XAXisOption,
+                                      timeWindow: WidgetTimewindow) => {
+  option.min = timeWindow.minTime;
+  option.max = timeWindow.maxTime;
+  (option as any).tbTimeWindow = timeWindow;
+};
+
 export const generateChartData = (dataItems: TimeSeriesChartDataItem[],
                                   thresholdItems: TimeSeriesChartThresholdItem[],
                                   stack: boolean,
@@ -982,7 +1134,7 @@ export const generateChartData = (dataItems: TimeSeriesChartDataItem[],
   let series = generateChartSeries(dataItems,
     stack, noAggregation, barRenderSharedContext, darkMode);
   if (thresholdItems.length) {
-    const thresholds = generateChartThresholds(thresholdItems, darkMode);
+    const thresholds = generateChartThresholds(thresholdItems);
     series = series.concat(thresholds);
   }
   return series;
@@ -994,7 +1146,7 @@ export const calculateThresholdsOffset = (chart: ECharts,
   const result: [number, number] = [0, 0];
   for (const item of thresholdItems) {
     const yAxis = yAxisList[item.yAxisIndex];
-    const offset = measureThresholdLabelOffset(chart, yAxis.id, item.id, item.value);
+    const offset = measureThresholdOffset(chart, yAxis.id, item.id, item.value);
     result[0] = Math.max(result[0], offset[0]);
     result[1] = Math.max(result[1], offset[1]);
   }
@@ -1016,7 +1168,7 @@ export const parseThresholdData = (value: any): TimeSeriesChartThresholdValue =>
   return thresholdValue;
 };
 
-const generateChartThresholds = (thresholdItems: TimeSeriesChartThresholdItem[], darkMode: boolean): Array<LineSeriesOption> => {
+const generateChartThresholds = (thresholdItems: TimeSeriesChartThresholdItem[]): Array<LineSeriesOption> => {
   const series: Array<LineSeriesOption> = [];
   for (const item of thresholdItems) {
     if (isDefinedAndNotNull(item.value)) {
@@ -1055,6 +1207,14 @@ const generateChartThresholds = (thresholdItems: TimeSeriesChartThresholdItem[],
             }
           }
         };
+        if (item.settings.enableLabelBackground) {
+          seriesOption.markLine.label.backgroundColor = item.settings.labelBackground;
+          seriesOption.markLine.label.padding = [4, 5];
+          seriesOption.markLine.label.borderRadius = 4;
+        }
+        if (item.settings.additionalLabelOption) {
+          seriesOption.markLine.label = {...seriesOption.markLine.label, ...item.settings.additionalLabelOption};
+        }
         item.option = seriesOption;
       }
       seriesOption.markLine.data = [];
@@ -1129,8 +1289,9 @@ const generateChartSeries = (dataItems: TimeSeriesChartDataItem[],
 };
 
 export const updateDarkMode = (options: EChartsOption, settings: TimeSeriesChartSettings,
+                               xAxisList: TimeSeriesChartXAxis[],
                                yAxisList: TimeSeriesChartYAxis[],
-                               dataItems: TimeSeriesChartDataItem[], thresholdDataItems: TimeSeriesChartThresholdItem[],
+                               dataItems: TimeSeriesChartDataItem[],
                                darkMode: boolean): EChartsOption => {
   options.darkMode = darkMode;
   if (Array.isArray(options.yAxis)) {
@@ -1145,12 +1306,14 @@ export const updateDarkMode = (options: EChartsOption, settings: TimeSeriesChart
     }
   }
   if (Array.isArray(options.xAxis)) {
-    for (const xAxis of options.xAxis) {
-      xAxis.nameTextStyle.color = prepareChartThemeColor(settings.xAxis.labelColor, darkMode, 'axis.label');
-      xAxis.axisLabel.color = prepareChartThemeColor(settings.xAxis.tickLabelColor, darkMode, 'axis.tickLabel');
-      xAxis.axisLine.lineStyle.color = prepareChartThemeColor(settings.xAxis.lineColor, darkMode, 'axis.line');
-      xAxis.axisTick.lineStyle.color = prepareChartThemeColor(settings.xAxis.ticksColor, darkMode, 'axis.ticks');
-      xAxis.splitLine.lineStyle.color = prepareChartThemeColor(settings.xAxis.splitLinesColor, darkMode, 'axis.splitLine');
+    for (let i = 0; i < options.xAxis.length; i++) {
+      const xAxis = options.xAxis[i];
+      const xAxisSettings = xAxisList[i].settings;
+      xAxis.nameTextStyle.color = prepareChartThemeColor(xAxisSettings.labelColor, darkMode, 'axis.label');
+      xAxis.axisLabel.color = prepareChartThemeColor(xAxisSettings.tickLabelColor, darkMode, 'axis.tickLabel');
+      xAxis.axisLine.lineStyle.color = prepareChartThemeColor(xAxisSettings.lineColor, darkMode, 'axis.line');
+      xAxis.axisTick.lineStyle.color = prepareChartThemeColor(xAxisSettings.ticksColor, darkMode, 'axis.ticks');
+      xAxis.splitLine.lineStyle.color = prepareChartThemeColor(xAxisSettings.splitLinesColor, darkMode, 'axis.splitLine');
     }
   }
   for (const item of dataItems) {
@@ -1170,7 +1333,7 @@ export const updateDarkMode = (options: EChartsOption, settings: TimeSeriesChart
     } else {
       if (item.barRenderContext?.labelOption?.show) {
         const barSettings = item.dataKey.settings as BarSeriesSettings;
-        item.barRenderContext.labelOption.rich.value.color = prepareChartThemeColor(barSettings.labelColor,
+        (item.barRenderContext.labelOption.rich.value as any).fill = prepareChartThemeColor(barSettings.labelColor,
           darkMode, 'series.label');
       }
     }
@@ -1189,6 +1352,7 @@ const createTimeSeriesChartSeries = (item: TimeSeriesChartDataItem,
     seriesOption = {
       id: item.id,
       dataGroupId: item.id,
+      xAxisIndex: item.xAxisIndex,
       yAxisIndex: item.yAxisIndex,
       name: item.dataKey.label,
       color: seriesColor,
@@ -1214,11 +1378,14 @@ const createTimeSeriesChartSeries = (item: TimeSeriesChartDataItem,
       const lineSeriesOption = seriesOption as LineSeriesOption;
       lineSeriesOption.type = 'line';
       lineSeriesOption.label = createSeriesLabelOption(item, lineSettings.showPointLabel,
-        lineSettings.pointLabelFont, lineSettings.pointLabelColor, lineSettings.pointLabelPosition, darkMode);
+        lineSettings.pointLabelFont, lineSettings.pointLabelColor,
+        lineSettings.enablePointLabelBackground, lineSettings.pointLabelBackground,
+        lineSettings.pointLabelPosition,
+        lineSettings.pointLabelFormatter, false, darkMode);
       lineSeriesOption.step = lineSettings.step ? lineSettings.stepType : false;
-      lineSeriesOption.smooth = lineSettings.smooth;
+      lineSeriesOption.smooth = lineSettings.smooth ? 0.25 : false;
       if (lineSettings.smooth) {
-        lineSeriesOption.smoothMonotone = 'x';
+        lineSeriesOption.smoothMonotone = 'none';
       }
       lineSeriesOption.lineStyle = {
         width: lineSettings.showLine ? lineSettings.lineWidth : 0,
@@ -1228,7 +1395,7 @@ const createTimeSeriesChartSeries = (item: TimeSeriesChartDataItem,
         lineSeriesOption.areaStyle = {};
         if (lineSettings.fillAreaSettings.type === SeriesFillType.opacity) {
           lineSeriesOption.areaStyle.opacity = lineSettings.fillAreaSettings.opacity;
-        } else {
+        } else if (lineSettings.fillAreaSettings.type === SeriesFillType.gradient) {
           lineSeriesOption.areaStyle.opacity = 1;
           lineSeriesOption.areaStyle.color = createLinearOpacityGradient(seriesColor, lineSettings.fillAreaSettings.gradient);
         }
@@ -1255,9 +1422,12 @@ const createTimeSeriesChartSeries = (item: TimeSeriesChartDataItem,
       }
       item.barRenderContext.visualSettings = barVisualSettings;
       item.barRenderContext.labelOption = createSeriesLabelOption(item, barSettings.showLabel,
-        barSettings.labelFont, barSettings.labelColor, barSettings.labelPosition, darkMode);
+        barSettings.labelFont, barSettings.labelColor, barSettings.enableLabelBackground, barSettings.labelBackground,
+        barSettings.labelPosition, barSettings.labelFormatter, true, darkMode);
+      item.barRenderContext.additionalLabelOption = barSettings.additionalLabelOption;
       barSeriesOption.renderItem = (params, api) =>
         renderTimeSeriesBar(params, api, item.barRenderContext);
+      barSeriesOption.labelLayout = barSettings.labelLayout;
     }
   }
   seriesOption.data = item.data;
@@ -1265,30 +1435,63 @@ const createTimeSeriesChartSeries = (item: TimeSeriesChartDataItem,
 };
 
 const createSeriesLabelOption = (item: TimeSeriesChartDataItem, show: boolean,
-                                 labelFont: Font, labelColor: string, position: SeriesLabelPosition,
+                                 labelFont: Font, labelColor: string,
+                                 enableBackground: boolean, labelBackground: string,
+                                 position: SeriesLabelPosition | BuiltinTextPosition,
+                                 labelFormatter: string | LabelFormatterCallback,
+                                 labelColorFill: boolean,
                                  darkMode: boolean): SeriesLabelOption => {
   let labelStyle: ComponentStyle = {};
   if (show) {
-    labelStyle = createChartTextStyle(labelFont, labelColor, darkMode, 'series.label');
+    labelStyle = createChartTextStyle(labelFont, labelColor, darkMode, 'series.label', labelColorFill);
   }
-  return {
+  let formatFunction: (...args: any[]) => any;
+  if (typeof labelFormatter === 'string' && labelFormatter.length) {
+    formatFunction = parseFunction(labelFormatter, ['value']);
+  }
+  const formatter: LabelFormatterCallback = (params): string => {
+    let result: string;
+    if (typeof labelFormatter === 'string') {
+      if (formatFunction) {
+        try {
+          result = formatFunction(params.value[1]);
+        } catch (_e) {
+        }
+      }
+    } else if (isFunction(labelFormatter)) {
+      result = labelFormatter(params);
+    }
+    if (isUndefined(result)) {
+      result = formatValue(params.value[1], item.decimals, item.units, false);
+      result = `{value|${result}}`;
+    }
+    return result;
+  };
+  const labelOption: SeriesLabelOption = {
     show,
     position,
-    formatter: (params): string => {
-      const value = formatValue(params.value[1], item.decimals, item.units, false);
-      return `{value|${value}}`;
-    },
+    formatter,
     rich: {
       value: labelStyle
     }
   };
+  if (enableBackground) {
+    labelOption.backgroundColor = labelBackground;
+    labelOption.padding = [4, 5];
+    labelOption.borderRadius = 4;
+  }
+  return labelOption;
 };
 
-const createChartTextStyle = (font: Font, color: string, darkMode: boolean, colorKey?: string): ComponentStyle => {
+const createChartTextStyle = (font: Font, color: string, darkMode: boolean, colorKey?: string, fill = false): ComponentStyle => {
   const style = textStyle(font);
   delete style.lineHeight;
   style.fontSize = font.size;
-  style.color = prepareChartThemeColor(color, darkMode, colorKey);
+  if (fill) {
+    style.fill = prepareChartThemeColor(color, darkMode, colorKey);
+  } else {
+    style.color = prepareChartThemeColor(color, darkMode, colorKey);
+  }
   return style;
 };
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
index 462825087e..ad5aafd4eb 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
@@ -16,14 +16,16 @@
 
 import { WidgetContext } from '@home/models/widget-component.models';
 import {
-  AxisPosition,
   calculateThresholdsOffset,
-  createTimeSeriesXAxisOption,
+  createTimeSeriesVisualMapOption,
+  createTimeSeriesXAxis,
   createTimeSeriesYAxis,
   defaultTimeSeriesChartYAxisSettings,
   generateChartData,
+  LineSeriesStepType,
   parseThresholdData,
   SeriesLabelPosition,
+  TimeSeriesChartAxis,
   TimeSeriesChartDataItem,
   timeSeriesChartDefaultSettings,
   timeSeriesChartKeyDefaultSettings,
@@ -31,38 +33,41 @@ import {
   TimeSeriesChartNoAggregationBarWidthStrategy,
   TimeSeriesChartSeriesType,
   TimeSeriesChartSettings,
-  TimeSeriesChartShape,
   TimeSeriesChartThreshold,
   timeSeriesChartThresholdDefaultSettings,
   TimeSeriesChartThresholdItem,
   TimeSeriesChartThresholdType,
   TimeSeriesChartType,
+  TimeSeriesChartXAxis,
   TimeSeriesChartYAxis,
   TimeSeriesChartYAxisId,
   TimeSeriesChartYAxisSettings,
-  updateDarkMode
+  updateDarkMode,
+  updateXAxisTimeWindow
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { ResizeObserver } from '@juggle/resize-observer';
 import {
-  calculateXAxisHeight,
-  calculateYAxisWidth,
+  adjustTimeAxisExtentToData,
+  calculateAxisSize,
+  createTooltipValueFormatFunction,
   ECharts,
   echartsModule,
   EChartsOption,
+  EChartsShape,
   echartsTooltipFormatter,
   EChartsTooltipTrigger,
+  EChartsTooltipValueFormatFunction,
   getAxisExtent,
-  measureXAxisNameHeight,
-  measureYAxisNameWidth,
+  getFocusedSeriesIndex,
+  measureAxisNameSize,
   toNamedData
 } from '@home/components/widget/lib/chart/echarts-widget.models';
 import { DateFormatProcessor } from '@shared/models/widget-settings.models';
-import { isDefinedAndNotNull, isEqual, mergeDeep } from '@core/utils';
-import { DataKey, Datasource, DatasourceType, widgetType } from '@shared/models/widget.models';
+import { formattedDataFormDatasourceData, formatValue, isDefinedAndNotNull, isEqual, mergeDeep } from '@core/utils';
+import { DataKey, Datasource, DatasourceType, FormattedData, widgetType } from '@shared/models/widget.models';
 import * as echarts from 'echarts/core';
-import { CallbackDataParams } from 'echarts/types/dist/shared';
+import { CallbackDataParams, PiecewiseVisualMapOption } from 'echarts/types/dist/shared';
 import { Renderer2 } from '@angular/core';
-import { CustomSeriesOption, LineSeriesOption } from 'echarts/charts';
 import { BehaviorSubject } from 'rxjs';
 import { AggregationType } from '@shared/models/time/time.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
@@ -70,6 +75,7 @@ import { WidgetSubscriptionOptions } from '@core/api/widget-api.models';
 import { DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
 import { DeepPartial } from '@shared/models/common';
 import { BarRenderSharedContext } from '@home/components/widget/lib/chart/time-series-chart-bar.models';
+import { TimeSeriesChartStateValueConverter } from '@home/components/widget/lib/chart/time-series-chart-state.models';
 
 export class TbTimeSeriesChart {
 
@@ -86,8 +92,15 @@ export class TbTimeSeriesChart {
           settings.type = TimeSeriesChartSeriesType.line;
           settings.lineSettings.showLine = false;
           settings.lineSettings.showPoints = true;
-          settings.lineSettings.pointShape = TimeSeriesChartShape.circle;
+          settings.lineSettings.pointShape = EChartsShape.circle;
           settings.lineSettings.pointSize = 8;
+        } else if (type === TimeSeriesChartType.state) {
+          settings.type = TimeSeriesChartSeriesType.line;
+          settings.lineSettings.showLine = true;
+          settings.lineSettings.step = true;
+          settings.lineSettings.stepType = LineSeriesStepType.end;
+          settings.lineSettings.pointShape = EChartsShape.circle;
+          settings.lineSettings.pointSize = 12;
         }
         return settings;
       }
@@ -96,21 +109,34 @@ export class TbTimeSeriesChart {
   }
 
   private get noAggregation(): boolean {
-    return this.ctx.defaultSubscription.timeWindowConfig?.aggregation?.type === AggregationType.NONE;
+    return this.ctx.defaultSubscription.subscriptionTimewindow?.aggregation?.type === AggregationType.NONE;
+  }
+
+  private get stateData(): boolean {
+    return this.ctx.defaultSubscription.subscriptionTimewindow?.aggregation?.stateData === true;
   }
 
   private readonly shapeResize$: ResizeObserver;
 
   private readonly settings: TimeSeriesChartSettings;
 
+  private readonly comparisonEnabled: boolean;
+  private readonly stackMode: boolean;
+
+  private xAxisList: TimeSeriesChartXAxis[] = [];
   private yAxisList: TimeSeriesChartYAxis[] = [];
   private dataItems: TimeSeriesChartDataItem[] = [];
   private thresholdItems: TimeSeriesChartThresholdItem[] = [];
 
+  private hasVisualMap = false;
+  private visualMapSelectedRanges: {[key: number]: boolean};
+
   private timeSeriesChart: ECharts;
   private timeSeriesChartOptions: EChartsOption;
 
   private readonly tooltipDateFormat: DateFormatProcessor;
+  private readonly tooltipValueFormatFunction: EChartsTooltipValueFormatFunction;
+  private readonly stateValueConverter: TimeSeriesChartStateValueConverter;
 
   private yMinSubject = new BehaviorSubject(-1);
   private yMaxSubject = new BehaviorSubject(1);
@@ -127,6 +153,8 @@ export class TbTimeSeriesChart {
 
   private barRenderSharedContext: BarRenderSharedContext;
 
+  private latestData: FormattedData[] = [];
+
   yMin$ = this.yMinSubject.asObservable();
   yMax$ = this.yMaxSubject.asObservable();
 
@@ -139,13 +167,31 @@ export class TbTimeSeriesChart {
     this.settings = mergeDeep({} as TimeSeriesChartSettings,
       timeSeriesChartDefaultSettings,
       this.inputSettings as TimeSeriesChartSettings);
-    const dashboardPageElement = this.ctx.$containerParent.parents('.tb-dashboard-page');
-    this.darkMode = this.settings.darkMode || dashboardPageElement.hasClass('dark');
+    this.comparisonEnabled = !!this.ctx.defaultSubscription.comparisonEnabled;
+    this.stackMode = !this.comparisonEnabled && this.settings.stack;
+    if (this.settings.states && this.settings.states.length) {
+      this.stateValueConverter = new TimeSeriesChartStateValueConverter(this.ctx.utilsService, this.settings.states);
+      this.tooltipValueFormatFunction = this.stateValueConverter.tooltipFormatter;
+    }
+    const $dashboardPageElement = this.ctx.$containerParent.parents('.tb-dashboard-page');
+    const dashboardPageElement = $dashboardPageElement.length ? $($dashboardPageElement[$dashboardPageElement.length-1]) : null;
+    this.darkMode = this.settings.darkMode || dashboardPageElement?.hasClass('dark');
+    this.setupXAxes();
     this.setupYAxes();
     this.setupData();
     this.setupThresholds();
-    if (this.settings.showTooltip && this.settings.tooltipShowDate) {
-      this.tooltipDateFormat = DateFormatProcessor.fromSettings(this.ctx.$injector, this.settings.tooltipDateFormat);
+    this.setupVisualMap();
+    if (this.settings.showTooltip) {
+      if (this.settings.tooltipShowDate) {
+        this.tooltipDateFormat = DateFormatProcessor.fromSettings(this.ctx.$injector, this.settings.tooltipDateFormat);
+      }
+      if (!this.tooltipValueFormatFunction) {
+        this.tooltipValueFormatFunction =
+          createTooltipValueFormatFunction(this.settings.tooltipValueFormatter);
+        if (!this.tooltipValueFormatFunction) {
+          this.tooltipValueFormatFunction = (value, latestData, units, decimals) => formatValue(value, decimals, units, false);
+        }
+      }
     }
     this.onResize();
     if (this.autoResize) {
@@ -154,15 +200,17 @@ export class TbTimeSeriesChart {
       });
       this.shapeResize$.observe(this.chartElement);
     }
-    this.darkModeObserver = new MutationObserver(mutations => {
-      for(let mutation of mutations) {
-        if (mutation.type === 'attributes' && mutation.attributeName === 'class') {
-          const darkMode = dashboardPageElement.hasClass('dark');
-          this.setDarkMode(darkMode);
+    if (dashboardPageElement) {
+      this.darkModeObserver = new MutationObserver(mutations => {
+        for (const mutation of mutations) {
+          if (mutation.type === 'attributes' && mutation.attributeName === 'class') {
+            const darkMode = dashboardPageElement.hasClass('dark');
+            this.setDarkMode(darkMode);
+          }
         }
-      }
-    });
-    this.darkModeObserver.observe(dashboardPageElement[0], { attributes: true });
+      });
+      this.darkModeObserver.observe(dashboardPageElement[0], {attributes: true});
+    }
   }
 
   public update(): void {
@@ -170,19 +218,24 @@ export class TbTimeSeriesChart {
       const datasourceData = this.ctx.data ? this.ctx.data.find(d => d.dataKey === item.dataKey) : null;
       if (!isEqual(item.dataSet, datasourceData?.data)) {
         item.dataSet = datasourceData?.data;
-        item.data = datasourceData?.data ? toNamedData(datasourceData.data) : [];
+        item.data = datasourceData?.data ? toNamedData(datasourceData.data, this.stateValueConverter?.valueConverter) : [];
       }
     }
     this.onResize();
     if (this.timeSeriesChart) {
-      this.timeSeriesChartOptions.xAxis[0].min = this.ctx.defaultSubscription.timeWindow.minTime;
-      this.timeSeriesChartOptions.xAxis[0].max = this.ctx.defaultSubscription.timeWindow.maxTime;
-      this.timeSeriesChartOptions.xAxis[0].tbTimeWindow = this.ctx.defaultSubscription.timeWindow;
+      updateXAxisTimeWindow(this.xAxisList[0].option, this.ctx.defaultSubscription.timeWindow);
       if (this.noAggregation) {
         this.timeSeriesChartOptions.tooltip[0].axisPointer.type = 'line';
       } else {
         this.timeSeriesChartOptions.tooltip[0].axisPointer.type = 'shadow';
       }
+      if (this.comparisonEnabled) {
+        updateXAxisTimeWindow(this.xAxisList[1].option, this.ctx.defaultSubscription.comparisonTimeWindow);
+      }
+      this.timeSeriesChartOptions.xAxis = this.xAxisList.map(axis => axis.option);
+      if (this.hasVisualMap) {
+        (this.timeSeriesChartOptions.visualMap as PiecewiseVisualMapOption).selected = this.visualMapSelectedRanges;
+      }
       this.barRenderSharedContext.timeInterval = this.ctx.timeWindow.interval;
       this.updateSeriesData(true);
       if (this.highlightedDataKey) {
@@ -194,6 +247,14 @@ export class TbTimeSeriesChart {
   public latestUpdated() {
     let update = false;
     if (this.ctx.latestData) {
+      this.latestData = formattedDataFormDatasourceData(this.ctx.latestData);
+      for (const item of this.dataItems) {
+        let latestData = this.latestData.find(data => data.$datasource === item.datasource);
+        if (!latestData) {
+          latestData = {} as FormattedData;
+        }
+        item.latestData = latestData;
+      }
       for (const item of this.thresholdItems) {
         if (item.settings.type === TimeSeriesChartThresholdType.latestKey && item.latestDataKey) {
           const data = this.ctx.latestData.find(d => d.dataKey === item.latestDataKey);
@@ -242,13 +303,13 @@ export class TbTimeSeriesChart {
           seriesId: dataItem.id
         });
       }
-      this.timeSeriesChartOptions.series = this.updateSeries();
+      this.updateSeries();
       const mergeList = ['series'];
       if (this.updateYAxisScale(this.yAxisList)) {
         this.timeSeriesChartOptions.yAxis = this.yAxisList.map(axis => axis.option);
         mergeList.push('yAxis');
       }
-      this.timeSeriesChart.setOption(this.timeSeriesChartOptions, this.settings.stack ? {notMerge: true} : {replaceMerge: mergeList});
+      this.timeSeriesChart.setOption(this.timeSeriesChartOptions, this.stackMode ? {notMerge: true} : {replaceMerge: mergeList});
       this.updateAxes();
       dataKey.hidden = !enable;
       if (enable) {
@@ -260,6 +321,16 @@ export class TbTimeSeriesChart {
     }
   }
 
+  public toggleVisualMapRange(index: number): void {
+    if (this.hasVisualMap) {
+      this.visualMapSelectedRanges[index] = !this.visualMapSelectedRanges[index];
+      this.timeSeriesChart.dispatchAction({
+        type: 'selectDataRange',
+        selected: this.visualMapSelectedRanges
+      });
+    }
+  }
+
   public destroy(): void {
     if (this.shapeResize$) {
       this.shapeResize$.disconnect();
@@ -269,7 +340,7 @@ export class TbTimeSeriesChart {
     }
     this.yMinSubject.complete();
     this.yMaxSubject.complete();
-    this.darkModeObserver.disconnect();
+    this.darkModeObserver?.disconnect();
   }
 
   public resize(): void {
@@ -281,8 +352,7 @@ export class TbTimeSeriesChart {
       this.darkMode = darkMode;
       if (this.timeSeriesChart) {
         this.timeSeriesChartOptions = updateDarkMode(this.timeSeriesChartOptions,
-          this.settings, this.yAxisList, this.dataItems,
-          this.thresholdItems, darkMode);
+          this.settings, this.xAxisList, this.yAxisList, this.dataItems, darkMode);
         this.timeSeriesChart.setOption(this.timeSeriesChartOptions);
       }
     }
@@ -297,6 +367,8 @@ export class TbTimeSeriesChart {
     const targetBarWidth = noAggregationBarWidthSettings.strategy === TimeSeriesChartNoAggregationBarWidthStrategy.group ?
       noAggregationBarWidthSettings.groupWidth : noAggregationBarWidthSettings.barWidth;
     this.barRenderSharedContext = {
+      barGap: this.settings.barWidthSettings.barGap,
+      intervalGap: this.settings.barWidthSettings.intervalGap,
       timeInterval: this.ctx.timeWindow?.interval,
       noAggregationBarWidthStrategy: noAggregationBarWidthSettings.strategy,
       noAggregationWidthRelative: targetBarWidth.relative,
@@ -310,12 +382,18 @@ export class TbTimeSeriesChart {
             timeSeriesChartKeyDefaultSettings, dataKey.settings);
           if ((keySettings.type === TimeSeriesChartSeriesType.line && keySettings.lineSettings.showPointLabel &&
               keySettings.lineSettings.pointLabelPosition === SeriesLabelPosition.top) ||
-            (keySettings.type === TimeSeriesChartSeriesType.bar && keySettings.barSettings.showLabel)) {
+            (keySettings.type === TimeSeriesChartSeriesType.bar &&
+              keySettings.barSettings.showLabel &&
+              [SeriesLabelPosition.top, SeriesLabelPosition.bottom]
+              .includes(keySettings.barSettings.labelPosition as SeriesLabelPosition))) {
             this.topPointLabels = true;
           }
+          if (this.stateValueConverter && keySettings.type === TimeSeriesChartSeriesType.line) {
+            keySettings.lineSettings.pointLabelFormatter = this.stateValueConverter.labelFormatter;
+          }
           dataKey.settings = keySettings;
           const datasourceData = this.ctx.data ? this.ctx.data.find(d => d.dataKey === dataKey) : null;
-          const namedData = datasourceData?.data ? toNamedData(datasourceData.data) : [];
+          const namedData = datasourceData?.data ? toNamedData(datasourceData.data, this.stateValueConverter?.valueConverter) : [];
           const units = dataKey.units && dataKey.units.length ? dataKey.units : this.ctx.units;
           const decimals = isDefinedAndNotNull(dataKey.decimals) ? dataKey.decimals :
             (isDefinedAndNotNull(this.ctx.decimals) ? this.ctx.decimals : 2);
@@ -323,15 +401,21 @@ export class TbTimeSeriesChart {
           if (!Object.keys(this.settings.yAxes).includes(yAxisId)) {
             yAxisId = 'default';
           }
+          const comparisonItem = this.comparisonEnabled && dataKey.isAdditional;
+          const xAxisIndex = comparisonItem ? 1 : 0;
           this.dataItems.push({
             id: this.nextComponentId(),
             units,
             decimals,
+            xAxisIndex,
             yAxisId,
             yAxisIndex: this.getYAxisIndex(yAxisId),
+            comparisonItem,
+            datasource,
             dataKey,
             data: namedData,
-            enabled: !keySettings.dataHiddenByDefault
+            enabled: !keySettings.dataHiddenByDefault,
+            tooltipValueFormatFunction: createTooltipValueFormatFunction(keySettings.tooltipValueFormatter)
           });
         }
       }
@@ -343,6 +427,11 @@ export class TbTimeSeriesChart {
     for (const thresholdSettings of this.settings.thresholds) {
       const threshold = mergeDeep<TimeSeriesChartThreshold>({} as TimeSeriesChartThreshold,
         timeSeriesChartThresholdDefaultSettings, thresholdSettings);
+      if (!this.topPointLabels) {
+        if (threshold.showLabel && !threshold.labelPosition.endsWith('Bottom')) {
+          this.topPointLabels = true;
+        }
+      }
       let latestDataKey: DataKey = null;
       let entityDataKey: DataKey = null;
       let value = null;
@@ -412,6 +501,18 @@ export class TbTimeSeriesChart {
     this.subscribeForEntityThresholds(thresholdDatasources);
   }
 
+  private setupXAxes(): void {
+    const mainXAxis = createTimeSeriesXAxis('main', this.settings.xAxis, this.ctx.defaultSubscription.timeWindow.minTime,
+      this.ctx.defaultSubscription.timeWindow.maxTime, this.ctx.date, this.ctx.utilsService, this.darkMode);
+    this.xAxisList.push(mainXAxis);
+    if (this.comparisonEnabled) {
+      const comparisonXAxis = createTimeSeriesXAxis('comparison', this.settings.comparisonXAxis,
+        this.ctx.defaultSubscription.comparisonTimeWindow.minTime, this.ctx.defaultSubscription.comparisonTimeWindow.maxTime,
+        this.ctx.date, this.ctx.utilsService, this.darkMode);
+      this.xAxisList.push(comparisonXAxis);
+    }
+  }
+
   private setupYAxes(): void {
     const yAxisSettingsList = Object.values(this.settings.yAxes);
     yAxisSettingsList.sort((a1, a2) => a1.order - a2.order);
@@ -421,11 +522,24 @@ export class TbTimeSeriesChart {
       const units = axisSettings.units && axisSettings.units.length ? axisSettings.units : this.ctx.units;
       const decimals = isDefinedAndNotNull(axisSettings.decimals) ? axisSettings.decimals :
         (isDefinedAndNotNull(this.ctx.decimals) ? this.ctx.decimals : 2);
-      const yAxis = createTimeSeriesYAxis(units, decimals, axisSettings, this.darkMode);
+      if (this.stateValueConverter) {
+        axisSettings.ticksGenerator = this.stateValueConverter.ticksGenerator;
+        axisSettings.ticksFormatter = this.stateValueConverter.ticksFormatter;
+      }
+      const yAxis = createTimeSeriesYAxis(units, decimals, axisSettings, this.ctx.utilsService, this.darkMode);
       this.yAxisList.push(yAxis);
     }
   }
 
+  private setupVisualMap(): void {
+    if (this.settings.visualMapSettings?.pieces && this.settings.visualMapSettings?.pieces.length) {
+      this.hasVisualMap = true;
+      this.visualMapSelectedRanges = {};
+      this.settings.visualMapSettings.pieces.forEach((_val, index) => {
+        this.visualMapSelectedRanges[index] = true;
+      });
+    }
+  }
 
   private nextComponentId(): string {
     return (this.componentIndexCounter++) + '';
@@ -474,6 +588,7 @@ export class TbTimeSeriesChart {
 
   private drawChart() {
     echartsModule.init();
+    this.renderer.setStyle(this.chartElement, 'letterSpacing', 'normal');
     this.timeSeriesChart = echarts.init(this.chartElement,  null, {
       renderer: 'canvas'
     });
@@ -489,35 +604,39 @@ export class TbTimeSeriesChart {
         },
         formatter: (params: CallbackDataParams[]) =>
           this.settings.showTooltip ? echartsTooltipFormatter(this.renderer, this.tooltipDateFormat,
-            this.settings, params, 0, '', -1, this.dataItems,
-            this.noAggregation ? null : this.ctx.timeWindow.interval) : undefined,
+            this.settings, params, this.tooltipValueFormatFunction,
+            this.settings.tooltipShowFocusedSeries ? getFocusedSeriesIndex(this.timeSeriesChart) : -1,
+            this.dataItems,  this.noAggregation ? null : this.ctx.timeWindow.interval) : undefined,
         padding: [8, 12],
         backgroundColor: this.settings.tooltipBackgroundColor,
         borderWidth: 0,
         extraCssText: `line-height: 1; backdrop-filter: blur(${this.settings.tooltipBackgroundBlur}px);`
       }],
       grid: [{
+        show: this.settings.grid.show,
+        backgroundColor: this.settings.grid.backgroundColor,
+        borderWidth: this.settings.grid.borderWidth,
+        borderColor: this.settings.grid.borderColor,
         top: this.minTopOffset(),
         left: this.settings.dataZoom ? 5 : 0,
         right: this.settings.dataZoom ? 5 : 0,
         bottom: this.minBottomOffset()
       }],
-      xAxis: [
-        createTimeSeriesXAxisOption(this.settings.xAxis, this.ctx.defaultSubscription.timeWindow.minTime,
-          this.ctx.defaultSubscription.timeWindow.maxTime, this.ctx.date, this.darkMode)
-      ],
+      xAxis: this.xAxisList.map(axis => axis.option),
       yAxis: this.yAxisList.map(axis => axis.option),
       dataZoom: [
         {
           type: 'inside',
           disabled: !this.settings.dataZoom,
-          realtime: true
+          realtime: true,
+          filterMode: this.stateData ? 'none' : 'weakFilter'
         },
         {
           type: 'slider',
           show: this.settings.dataZoom,
           showDetail: false,
           realtime: true,
+          filterMode: this.stateData ? 'none' : 'weakFilter',
           bottom: 10
         }
       ],
@@ -530,16 +649,20 @@ export class TbTimeSeriesChart {
       animationEasingUpdate: this.settings.animation.animationEasingUpdate,
       animationDelayUpdate: this.settings.animation.animationDelayUpdate
     };
+    if (this.hasVisualMap) {
+      this.timeSeriesChartOptions.visualMap =
+        createTimeSeriesVisualMapOption(this.settings.visualMapSettings, this.visualMapSelectedRanges);
+    }
 
     this.timeSeriesChartOptions.xAxis[0].tbTimeWindow = this.ctx.defaultSubscription.timeWindow;
 
-    this.timeSeriesChartOptions.series = this.updateSeries();
+    this.updateSeries();
     if (this.updateYAxisScale(this.yAxisList)) {
       this.timeSeriesChartOptions.yAxis = this.yAxisList.map(axis => axis.option);
     }
 
     this.timeSeriesChart.setOption(this.timeSeriesChartOptions);
-    this.updateAxes();
+    this.updateAxes(false);
 
     if (this.settings.dataZoom) {
       this.timeSeriesChart.on('datazoom', () => {
@@ -549,7 +672,7 @@ export class TbTimeSeriesChart {
   }
 
   private updateSeriesData(updateScale = false): void {
-    this.timeSeriesChartOptions.series = this.updateSeries();
+    this.updateSeries();
     if (updateScale && this.updateYAxisScale(this.yAxisList)) {
       this.timeSeriesChartOptions.yAxis = this.yAxisList.map(axis => axis.option);
     }
@@ -557,46 +680,40 @@ export class TbTimeSeriesChart {
     this.updateAxes();
   }
 
-  private updateSeries(): Array<LineSeriesOption | CustomSeriesOption> {
-    return generateChartData(this.dataItems, this.thresholdItems,
-      this.settings.stack,
+  private updateSeries(): void {
+    this.timeSeriesChartOptions.series = generateChartData(this.dataItems, this.thresholdItems,
+      this.stackMode,
       this.noAggregation,
       this.barRenderSharedContext, this.darkMode);
+    if (this.stateData && !this.comparisonEnabled) {
+      adjustTimeAxisExtentToData(this.timeSeriesChartOptions.xAxis[0], this.dataItems,
+        this.ctx.defaultSubscription.timeWindow.minTime,
+        this.ctx.defaultSubscription.timeWindow.maxTime);
+    }
   }
 
-  private updateAxes() {
+  private updateAxes(lazy = true) {
     const leftAxisList = this.yAxisList.filter(axis => axis.option.position === 'left');
-    let res = this.updateYAxisOffset(leftAxisList);
+    let res = this.updateAxisOffset(leftAxisList);
     let leftOffset = res.offset + (!res.offset && this.settings.dataZoom ? 5 : 0);
     let changed = res.changed;
     const rightAxisList = this.yAxisList.filter(axis => axis.option.position === 'right');
-    res = this.updateYAxisOffset(rightAxisList);
+    res = this.updateAxisOffset(rightAxisList);
     let rightOffset = res.offset + (!res.offset && this.settings.dataZoom ? 5 : 0);
     changed = changed || res.changed;
+
     let bottomOffset = this.minBottomOffset();
     const minTopOffset = this.minTopOffset();
-    let topOffset = minTopOffset;
-    if (this.timeSeriesChartOptions.xAxis[0].show) {
-      const xAxisHeight = calculateXAxisHeight(this.timeSeriesChart);
-      if (this.timeSeriesChartOptions.xAxis[0].position === AxisPosition.bottom) {
-        bottomOffset += xAxisHeight;
-      } else {
-        topOffset = Math.max(minTopOffset, xAxisHeight);
-      }
-      if (this.settings.xAxis.label) {
-        const nameHeight = measureXAxisNameHeight(this.timeSeriesChart, this.timeSeriesChartOptions.xAxis[0].name);
-        if (this.timeSeriesChartOptions.xAxis[0].position === AxisPosition.bottom) {
-          bottomOffset += nameHeight;
-        } else {
-          topOffset = Math.max(minTopOffset, xAxisHeight + nameHeight);
-        }
-        const nameGap = xAxisHeight;
-        if (this.timeSeriesChartOptions.xAxis[0].nameGap !== nameGap) {
-          this.timeSeriesChartOptions.xAxis[0].nameGap = nameGap;
-          changed = true;
-        }
-      }
-    }
+
+    const topAxisList = this.xAxisList.filter(axis => axis.option.position === 'top');
+    res = this.updateAxisOffset(topAxisList);
+    const topOffset = Math.max(res.offset, minTopOffset);
+    changed = changed || res.changed;
+
+    const bottomAxisList = this.xAxisList.filter(axis => axis.option.position === 'bottom');
+    res = this.updateAxisOffset(bottomAxisList);
+    bottomOffset += res.offset;
+    changed = changed || res.changed;
 
     const thresholdsOffset = calculateThresholdsOffset(this.timeSeriesChart, this.thresholdItems, this.yAxisList);
     leftOffset = Math.max(leftOffset, thresholdsOffset[0]);
@@ -614,7 +731,8 @@ export class TbTimeSeriesChart {
     }
     if (changed) {
       this.timeSeriesChartOptions.yAxis = this.yAxisList.map(axis => axis.option);
-      this.timeSeriesChart.setOption(this.timeSeriesChartOptions, {replaceMerge: ['yAxis', 'xAxis', 'grid'], lazyUpdate: true});
+      this.timeSeriesChartOptions.xAxis = this.xAxisList.map(axis => axis.option);
+      this.timeSeriesChart.setOption(this.timeSeriesChartOptions, {replaceMerge: ['yAxis', 'xAxis', 'grid'], lazyUpdate: lazy});
     }
     if (this.yAxisList.length) {
       const extent = getAxisExtent(this.timeSeriesChart, this.yAxisList[0].id);
@@ -629,45 +747,45 @@ export class TbTimeSeriesChart {
     }
   }
 
-  private updateYAxisOffset(axisList: TimeSeriesChartYAxis[]): {offset: number; changed: boolean} {
+  private updateAxisOffset(axisList: TimeSeriesChartAxis[]): {offset: number; changed: boolean} {
     const result = {offset: 0, changed: false};
-    let width = 0;
-    for (const yAxis of axisList) {
-      const newWidth = calculateYAxisWidth(this.timeSeriesChart, yAxis.id);
-      if (width && newWidth) {
+    let size = 0;
+    for (const axis of axisList) {
+      const newSize = calculateAxisSize(this.timeSeriesChart, axis.option.mainType, axis.id);
+      if (size && newSize) {
         result.offset += 5;
       }
-      width = newWidth;
-      const showLine = !!width && yAxis.settings.showLine;
-      if (yAxis.option.axisLine.show !== showLine) {
-        yAxis.option.axisLine.show = showLine;
+      size = newSize;
+      const showLine = !!size && axis.settings.showLine;
+      if (axis.option.axisLine.show !== showLine) {
+        axis.option.axisLine.show = showLine;
         result.changed = true;
       }
-      if (yAxis.option.offset !== result.offset) {
-        yAxis.option.offset = result.offset;
+      if (axis.option.offset !== result.offset) {
+        axis.option.offset = result.offset;
         result.changed = true;
       }
-      if (yAxis.settings.label) {
-        if (!width) {
-          if (yAxis.option.name) {
-            yAxis.option.name = null;
+      if (axis.settings.label) {
+        if (!size) {
+          if (axis.option.name) {
+            axis.option.name = null;
             result.changed = true;
           }
         } else {
-          if (!yAxis.option.name) {
-            yAxis.option.name = yAxis.settings.label;
+          if (!axis.option.name) {
+            axis.option.name = axis.settings.label;
             result.changed = true;
           }
-          const nameGap = width;
-          if (yAxis.option.nameGap !== nameGap) {
-            yAxis.option.nameGap = nameGap;
+          const nameGap = size;
+          if (axis.option.nameGap !== nameGap) {
+            axis.option.nameGap = nameGap;
             result.changed = true;
           }
-          const nameWidth = measureYAxisNameWidth(this.timeSeriesChart, yAxis.id, yAxis.settings.label);
-          result.offset += nameWidth;
+          const nameSize = measureAxisNameSize(this.timeSeriesChart, axis.option.mainType, axis.id, axis.settings.label);
+          result.offset += nameSize;
         }
       }
-      result.offset += width;
+      result.offset += size;
     }
     return result;
   }
@@ -685,15 +803,19 @@ export class TbTimeSeriesChart {
   }
 
   private scaleYAxis(yAxis: TimeSeriesChartYAxis): boolean {
-    const axisBarDataItems = this.dataItems.filter(d => d.yAxisId === yAxis.id && d.enabled &&
-      d.data.length && d.dataKey.settings.type === TimeSeriesChartSeriesType.bar);
-    return !axisBarDataItems.length;
+    if (!this.stateData) {
+      const axisBarDataItems = this.dataItems.filter(d => d.yAxisId === yAxis.id && d.enabled &&
+        d.data.length && d.dataKey.settings.type === TimeSeriesChartSeriesType.bar);
+      return !axisBarDataItems.length;
+    } else {
+      return false;
+    }
   }
 
   private minTopOffset(): number {
     const showTickLabels =
       !!this.yAxisList.find(yAxis => yAxis.settings.show && yAxis.settings.showTickLabels);
-    return (this.topPointLabels) ? 20 :
+    return (this.topPointLabels) ? 25 :
       (showTickLabels ? 10 : 5);
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.models.ts
index 14596b56a8..cc51bde975 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.models.ts
@@ -18,11 +18,10 @@
 /// <reference path="../../../../../../../src/typings/jquery.flot.typings.d.ts" />
 
 import {
-  DataKey,
+  DataKey, DataKeySettingsWithComparison,
   Datasource,
   DatasourceData,
   FormattedData,
-  JsonSettingsSchema,
   LegendConfig
 } from '@shared/models/widget.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
@@ -219,13 +218,7 @@ export interface TbFlotKeyThreshold {
   color: string;
 }
 
-export interface TbFlotKeyComparisonSettings {
-  showValuesForComparison: boolean;
-  comparisonValuesLabel: string;
-  color: string;
-}
-
-export interface TbFlotKeySettings {
+export interface TbFlotKeySettings extends DataKeySettingsWithComparison {
   excludeFromStacking: boolean;
   hideDataByDefault: boolean;
   disableDataHiding: boolean;
@@ -249,7 +242,6 @@ export interface TbFlotKeySettings {
   axisPosition: TbFlotYAxisPosition;
   axisTicksFormatter: string;
   thresholds: TbFlotKeyThreshold[];
-  comparisonSettings: TbFlotKeyComparisonSettings;
 }
 
 export interface TbFlotLatestKeySettings {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/device-gateway-command.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/device-gateway-command.component.scss
index 3425065ca2..3f66b67943 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/device-gateway-command.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/device-gateway-command.component.scss
@@ -63,7 +63,9 @@
             height: 18px;
             background: #305680;
             mask-image: url(/assets/copy-code-icon.svg);
+            -webkit-mask-image: url(/assets/copy-code-icon.svg);
             mask-repeat: no-repeat;
+            -webkit-mask-repeat: no-repeat;
           }
         }
       }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/indicator/battery-level-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/battery-level-widget.component.scss
index 444417fb09..4bef541ad2 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/indicator/battery-level-widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/battery-level-widget.component.scss
@@ -65,6 +65,8 @@
     .tb-battery-level-box {
       display: flex;
       align-items: center;
+      min-height: 0;
+      max-height: 100%;
       .tb-battery-level-rectangle {
         width: 100%;
         height: 100%;
@@ -73,8 +75,11 @@
           position: absolute;
           inset: 0;
           mask-repeat: no-repeat;
+          -webkit-mask-repeat: no-repeat;
           mask-size: cover;
+          -webkit-mask-size: cover;
           mask-position: center;
+          -webkit-mask-position: center;
         }
         .tb-battery-level-container {
           position: absolute;
@@ -95,6 +100,7 @@
         &.vertical {
           .tb-battery-level-shape {
             mask-image: url(/assets/widget/battery-level/battery-shape-vertical.svg);
+            -webkit-mask-image: url(/assets/widget/battery-level/battery-shape-vertical.svg);
           }
           .tb-battery-level-container {
             flex-direction: column-reverse;
@@ -122,6 +128,7 @@
         &.horizontal {
           .tb-battery-level-shape {
             mask-image: url(/assets/widget/battery-level/battery-shape-horizontal.svg);
+            -webkit-mask-image: url(/assets/widget/battery-level/battery-shape-horizontal.svg);
           }
           .tb-battery-level-container {
             inset: 6.25% 8.85% 6.25% 3.54%;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/indicator/battery-level-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/battery-level-widget.component.ts
index 5251a0c602..0cc6d266b0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/indicator/battery-level-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/battery-level-widget.component.ts
@@ -307,7 +307,7 @@ export class BatteryLevelWidgetComponent implements OnInit, OnDestroy, AfterView
         const newWidth = height * horizontalBatteryDimensions.shapeAspectRatio;
         this.renderer.setStyle(this.batteryLevelRectangle.nativeElement, 'width', newWidth + 'px');
       } else {
-        this.renderer.setStyle(this.batteryLevelRectangle.nativeElement, 'width', null);
+        this.renderer.setStyle(this.batteryLevelRectangle.nativeElement, 'width', width + 'px');
       }
       if (this.batteryLevelValue) {
         const ratios = horizontalBatteryDimensions.heightRatio;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/indicator/status-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/status-widget.component.html
new file mode 100644
index 0000000000..391ade6228
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/status-widget.component.html
@@ -0,0 +1,33 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div #statusWidgetPanel class="tb-status-widget-panel" [style]="backgroundStyle$ | async">
+  <div class="tb-status-widget-overlay" [style]="overlayStyle" [style.inset]="overlayInset"></div>
+  <div class="tb-status-widget-title-panel">
+    <ng-container *ngTemplateOutlet="widgetTitlePanel"></ng-container>
+  </div>
+  <div #statusWidgetContent class="tb-status-widget-content" [class]="this.layout">
+    <div class="tb-status-widget-icon-container">
+      <tb-icon [style]="iconStyle">{{ icon }}</tb-icon>
+    </div>
+    <div class="tb-status-widget-labels-container">
+      <div *ngIf="showLabel" class="tb-status-widget-label" [style]="labelStyle">{{ label$ | async }}</div>
+      <div *ngIf="showStatus" class="tb-status-widget-status" [style]="statusStyle">{{ status$ | async }}</div>
+    </div>
+  </div>
+  <mat-progress-bar class="tb-action-widget-progress" style="height: 4px;" color="accent" mode="indeterminate" *ngIf="loading$ | async"></mat-progress-bar>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/indicator/status-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/status-widget.component.scss
new file mode 100644
index 0000000000..8dcefddd2a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/status-widget.component.scss
@@ -0,0 +1,99 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+.tb-status-widget-panel {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0;
+  > div:not(.tb-status-widget-overlay), > tb-icon {
+    z-index: 1;
+  }
+  .tb-status-widget-overlay {
+    position: absolute;
+    inset: 12px;
+  }
+  > div.tb-status-widget-title-panel {
+    position: absolute;
+    top: 12px;
+    left: 12px;
+    right: 12px;
+    z-index: 2;
+  }
+  .tb-status-widget-content {
+    width: 100%;
+    height: 100%;
+    padding: 16px;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    .tb-status-widget-icon-container {
+      display: flex;
+      width: 100%;
+      flex-direction: column;
+    }
+    .tb-status-widget-labels-container {
+      display: flex;
+      width: 100%;
+      flex-direction: column;
+      .tb-status-widget-label {
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+      .tb-status-widget-status {
+        text-transform: uppercase;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    }
+    &.default {
+      place-content: flex-start space-between;
+      align-items: flex-start;
+    }
+    &.center {
+      place-content: center flex-start;
+      align-items: center;
+      .tb-status-widget-icon-container {
+        flex: 1;
+        place-content: center;
+        align-items: center;
+      }
+      .tb-status-widget-labels-container {
+        flex-direction: column-reverse;
+        place-content: center flex-start;
+        align-items: center;
+      }
+    }
+    &.icon {
+      place-content: center;
+      align-items: center;
+      .tb-status-widget-icon-container {
+        flex: 1;
+        place-content: center;
+        align-items: center;
+      }
+      .tb-status-widget-labels-container {
+        display: none;
+      }
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/indicator/status-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/status-widget.component.ts
new file mode 100644
index 0000000000..5b59b0210f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/status-widget.component.ts
@@ -0,0 +1,242 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import {
+  AfterViewInit,
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  OnDestroy,
+  OnInit,
+  Renderer2, ViewChild,
+  ViewEncapsulation
+} from '@angular/core';
+import { BasicActionWidgetComponent } from '@home/components/widget/lib/action/action-widget.models';
+import {
+  statusWidgetDefaultSettings,
+  StatusWidgetLayout,
+  StatusWidgetSettings, StatusWidgetStateSettings
+} from '@home/components/widget/lib/indicator/status-widget.models';
+import { Observable } from 'rxjs';
+import {
+  backgroundStyle,
+  ComponentStyle,
+  iconStyle,
+  overlayStyle,
+  textStyle
+} from '@shared/models/widget-settings.models';
+import { ResizeObserver } from '@juggle/resize-observer';
+import { ImagePipe } from '@shared/pipe/image.pipe';
+import { DomSanitizer } from '@angular/platform-browser';
+import { UtilsService } from '@core/services/utils.service';
+import { ValueType } from '@shared/models/constants';
+
+const initialStatusWidgetSize = 147;
+
+@Component({
+  selector: 'tb-status-widget',
+  templateUrl: './status-widget.component.html',
+  styleUrls: ['../action/action-widget.scss', './status-widget.component.scss'],
+  encapsulation: ViewEncapsulation.None
+})
+export class StatusWidgetComponent extends
+  BasicActionWidgetComponent implements OnInit, AfterViewInit, OnDestroy {
+
+  @ViewChild('statusWidgetPanel', {static: false})
+  statusWidgetPanel: ElementRef<HTMLElement>;
+
+  @ViewChild('statusWidgetContent', {static: false})
+  statusWidgetContent: ElementRef<HTMLElement>;
+
+  settings: StatusWidgetSettings;
+
+  backgroundStyle$: Observable<ComponentStyle>;
+  overlayStyle: ComponentStyle = {};
+
+  overlayInset = '12px';
+  borderRadius = '';
+
+  layout: StatusWidgetLayout;
+
+  showLabel = true;
+  label$: Observable<string>;
+  labelStyle: ComponentStyle = {};
+
+  showStatus = true;
+  status$: Observable<string>;
+  statusStyle: ComponentStyle = {};
+
+  icon = '';
+  iconStyle: ComponentStyle = {};
+
+  private panelResize$: ResizeObserver;
+
+  private onLabel$: Observable<string>;
+  private onStatus$: Observable<string>;
+  private onBackground$: Observable<ComponentStyle>;
+  private onBackgroundDisabled$: Observable<ComponentStyle>;
+
+  private offLabel$: Observable<string>;
+  private offStatus$: Observable<string>;
+  private offBackground$: Observable<ComponentStyle>;
+  private offBackgroundDisabled$: Observable<ComponentStyle>;
+
+  private state = false;
+  private disabled = false;
+  private disabledState = false;
+
+  constructor(protected imagePipe: ImagePipe,
+              protected sanitizer: DomSanitizer,
+              private renderer: Renderer2,
+              private utils: UtilsService,
+              protected cd: ChangeDetectorRef,
+              private elementRef: ElementRef) {
+    super(cd);
+  }
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.settings = {...statusWidgetDefaultSettings, ...this.ctx.settings};
+    this.layout = this.settings.layout;
+
+    this.onLabel$ = this.ctx.registerLabelPattern(this.settings.onState.label, this.onLabel$);
+    this.onStatus$ = this.ctx.registerLabelPattern(this.settings.onState.status, this.onStatus$);
+    this.onBackground$ = backgroundStyle(this.settings.onState.background, this.imagePipe, this.sanitizer);
+    this.onBackgroundDisabled$ = backgroundStyle(this.settings.onState.backgroundDisabled, this.imagePipe, this.sanitizer);
+
+    this.offLabel$ = this.ctx.registerLabelPattern(this.settings.offState.label, this.offLabel$);
+    this.offStatus$ = this.ctx.registerLabelPattern(this.settings.offState.status, this.offStatus$);
+    this.offBackground$ = backgroundStyle(this.settings.offState.background, this.imagePipe, this.sanitizer);
+    this.offBackgroundDisabled$ = backgroundStyle(this.settings.offState.backgroundDisabled, this.imagePipe, this.sanitizer);
+
+    const getInitialStateSettings =
+      {...this.settings.initialState, actionLabel: this.ctx.translate.instant('widgets.rpc-state.initial-state')};
+    this.createValueGetter(getInitialStateSettings, ValueType.BOOLEAN, {
+      next: (value) => this.onState(value)
+    });
+
+    const disabledStateSettings =
+      {...this.settings.disabledState, actionLabel: this.ctx.translate.instant('widgets.rpc-state.disabled-state')};
+    this.createValueGetter(disabledStateSettings, ValueType.BOOLEAN, {
+      next: (value) => this.onDisabled(value)
+    });
+
+    this.loading$.subscribe((loading) => {
+      this.updateDisabledState(loading || this.disabled);
+    });
+
+    this.updateStyle(this.state, this.disabled);
+  }
+
+  ngAfterViewInit(): void {
+    this.renderer.setStyle(this.statusWidgetContent.nativeElement, 'overflow', 'visible');
+    this.renderer.setStyle(this.statusWidgetContent.nativeElement, 'position', 'absolute');
+    this.panelResize$ = new ResizeObserver(() => {
+      this.onResize();
+    });
+    this.panelResize$.observe(this.statusWidgetPanel.nativeElement);
+    if (this.showLabel) {
+      this.panelResize$.observe(this.statusWidgetPanel.nativeElement);
+    }
+    this.onResize();
+    super.ngAfterViewInit();
+  }
+
+  ngOnDestroy() {
+    if (this.panelResize$) {
+      this.panelResize$.disconnect();
+    }
+    super.ngOnDestroy();
+  }
+
+  public onInit() {
+    super.onInit();
+    this.borderRadius = this.ctx.$widgetElement.css('borderRadius');
+    this.overlayStyle = {...this.overlayStyle, ...{borderRadius: this.borderRadius}};
+    this.cd.detectChanges();
+  }
+
+  private onState(value: boolean): void {
+    const newState = !!value;
+    if (this.state !== newState) {
+      this.state = newState;
+      this.updateStyle(this.state, this.disabled || this.disabledState);
+    }
+  }
+
+  private onDisabled(value: boolean): void {
+    const newDisabled = !!value;
+    if (this.disabled !== newDisabled) {
+      this.disabled = newDisabled;
+      this.updateDisabledState(this.disabled);
+    }
+  }
+
+  private updateDisabledState(disabled: boolean) {
+    this.disabledState = disabled;
+    this.updateStyle(this.state, this.disabledState);
+  }
+
+  private onResize() {
+    const panelWidth = this.statusWidgetPanel.nativeElement.getBoundingClientRect().width;
+    const panelHeight = this.statusWidgetPanel.nativeElement.getBoundingClientRect().height;
+    const targetSize = Math.min(panelWidth, panelHeight);
+    const scale = targetSize / initialStatusWidgetSize;
+    const width = initialStatusWidgetSize;
+    const height = initialStatusWidgetSize;
+    this.renderer.setStyle(this.statusWidgetContent.nativeElement, 'width', width + 'px');
+    this.renderer.setStyle(this.statusWidgetContent.nativeElement, 'height', height + 'px');
+    this.renderer.setStyle(this.statusWidgetContent.nativeElement, 'transform', `scale(${scale})`);
+    this.overlayInset = (Math.floor(12 * scale * 100) / 100) + 'px';
+    this.cd.markForCheck();
+  }
+
+  private updateStyle(state: boolean, disabled: boolean) {
+    let stateSettings: StatusWidgetStateSettings;
+    if (state) {
+      this.label$ = this.onLabel$;
+      this.status$ = this.onStatus$;
+      this.backgroundStyle$ = disabled ? this.onBackgroundDisabled$ : this.onBackground$;
+      stateSettings = this.settings.onState;
+    } else {
+      this.label$ = this.offLabel$;
+      this.status$ = this.offStatus$;
+      this.backgroundStyle$ = disabled ? this.offBackgroundDisabled$ : this.offBackground$;
+      stateSettings = this.settings.offState;
+    }
+    this.showLabel = stateSettings.showLabel && this.layout !== StatusWidgetLayout.icon;
+    this.showStatus = stateSettings.showStatus && this.layout !== StatusWidgetLayout.icon;
+    this.icon = stateSettings.icon;
+
+    const primaryColor = disabled ? stateSettings.primaryColorDisabled : stateSettings.primaryColor;
+    const secondaryColor = disabled ? stateSettings.secondaryColorDisabled : stateSettings.secondaryColor;
+
+    this.labelStyle = textStyle(stateSettings.labelFont);
+    this.labelStyle.color = primaryColor;
+
+    this.statusStyle = textStyle(stateSettings.statusFont);
+    this.statusStyle.color = secondaryColor;
+
+    this.iconStyle = iconStyle(stateSettings.iconSize, stateSettings.iconSizeUnit);
+    this.iconStyle.color = primaryColor;
+
+    this.overlayStyle = overlayStyle(disabled ? stateSettings.backgroundDisabled.overlay : stateSettings.background.overlay);
+    if (this.borderRadius) {
+      this.overlayStyle = {...this.overlayStyle, ...{borderRadius: this.borderRadius}};
+    }
+    this.cd.detectChanges();
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/indicator/status-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/status-widget.models.ts
new file mode 100644
index 0000000000..2ef999c6f2
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/indicator/status-widget.models.ts
@@ -0,0 +1,204 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { DataToValueType, GetValueAction, GetValueSettings } from '@shared/models/action-widget-settings.models';
+import { BackgroundSettings, BackgroundType, cssUnit, Font } from '@shared/models/widget-settings.models';
+
+export enum StatusWidgetLayout {
+  default = 'default',
+  center = 'center',
+  icon = 'icon'
+}
+
+export const statusWidgetLayouts = Object.keys(StatusWidgetLayout) as StatusWidgetLayout[];
+
+export const statusWidgetLayoutTranslations = new Map<StatusWidgetLayout, string>(
+  [
+    [StatusWidgetLayout.default, 'widgets.status-widget.layout-default'],
+    [StatusWidgetLayout.center, 'widgets.status-widget.layout-center'],
+    [StatusWidgetLayout.icon, 'widgets.status-widget.layout-icon']
+  ]
+);
+
+export const statusWidgetLayoutImages = new Map<StatusWidgetLayout, string>(
+  [
+    [StatusWidgetLayout.default, 'assets/widget/status-widget/default-layout.svg'],
+    [StatusWidgetLayout.center, 'assets/widget/status-widget/center-layout.svg'],
+    [StatusWidgetLayout.icon, 'assets/widget/status-widget/icon-layout.svg']
+  ]
+);
+
+export interface StatusWidgetStateSettings {
+  showLabel: boolean;
+  label: string;
+  labelFont: Font;
+  showStatus: boolean;
+  status: string;
+  statusFont: Font;
+  icon: string;
+  iconSize: number;
+  iconSizeUnit: cssUnit;
+  primaryColor: string;
+  secondaryColor: string;
+  background: BackgroundSettings;
+  primaryColorDisabled: string;
+  secondaryColorDisabled: string;
+  backgroundDisabled: BackgroundSettings;
+}
+
+export interface StatusWidgetSettings {
+  initialState: GetValueSettings<boolean>;
+  disabledState: GetValueSettings<boolean>;
+  layout: StatusWidgetLayout;
+  onState: StatusWidgetStateSettings;
+  offState: StatusWidgetStateSettings;
+}
+
+export const statusWidgetDefaultSettings: StatusWidgetSettings = {
+  initialState: {
+    action: GetValueAction.EXECUTE_RPC,
+    defaultValue: false,
+    executeRpc: {
+      method: 'getState',
+      requestTimeout: 5000,
+      requestPersistent: false,
+      persistentPollingInterval: 1000
+    },
+    getAttribute: {
+      key: 'state',
+      scope: null
+    },
+    getTimeSeries: {
+      key: 'state'
+    },
+    dataToValue: {
+      type: DataToValueType.NONE,
+      compareToValue: true,
+      dataToValueFunction: '/* Should return boolean value */\nreturn data;'
+    }
+  },
+  disabledState: {
+    action: GetValueAction.DO_NOTHING,
+    defaultValue: false,
+    getAttribute: {
+      key: 'state',
+      scope: null
+    },
+    getTimeSeries: {
+      key: 'state'
+    },
+    dataToValue: {
+      type: DataToValueType.NONE,
+      compareToValue: true,
+      dataToValueFunction: '/* Should return boolean value */\nreturn data;'
+    }
+  },
+  layout: StatusWidgetLayout.default,
+  onState: {
+    showLabel: true,
+    label: 'Window left corner',
+    labelFont: {
+      family: 'Roboto',
+      size: 12,
+      sizeUnit: 'px',
+      style: 'normal',
+      weight: '500',
+      lineHeight: '16px'
+    },
+    showStatus: true,
+    status: 'Opened',
+    statusFont: {
+      family: 'Roboto',
+      size: 10,
+      sizeUnit: 'px',
+      style: 'normal',
+      weight: '500',
+      lineHeight: '20px'
+    },
+    icon: 'mdi:curtains',
+    iconSize: 32,
+    iconSizeUnit: 'px',
+    primaryColor: '#fff',
+    secondaryColor: 'rgba(255, 255, 255, 0.80)',
+    background: {
+      type: BackgroundType.color,
+      color: '#3F52DD',
+      overlay: {
+        enabled: false,
+        color: 'rgba(255,255,255,0.72)',
+        blur: 3
+      }
+    },
+    primaryColorDisabled: 'rgba(0, 0, 0, 0.38)',
+    secondaryColorDisabled: 'rgba(0, 0, 0, 0.38)',
+    backgroundDisabled: {
+      type: BackgroundType.color,
+      color: '#CACACA',
+      overlay: {
+        enabled: false,
+        color: 'rgba(255,255,255,0.72)',
+        blur: 3
+      }
+    }
+  },
+  offState: {
+    showLabel: true,
+    label: 'Window left corner',
+    labelFont: {
+      family: 'Roboto',
+      size: 12,
+      sizeUnit: 'px',
+      style: 'normal',
+      weight: '500',
+      lineHeight: '16px'
+    },
+    showStatus: true,
+    status: 'Closed',
+    statusFont: {
+      family: 'Roboto',
+      size: 10,
+      sizeUnit: 'px',
+      style: 'normal',
+      weight: '500',
+      lineHeight: '20px'
+    },
+    icon: 'mdi:curtains-closed',
+    iconSize: 32,
+    iconSizeUnit: 'px',
+    primaryColor: 'rgba(0, 0, 0, 0.87)',
+    secondaryColor: 'rgba(0, 0, 0, 0.54)',
+    background: {
+      type: BackgroundType.color,
+      color: '#FFF',
+      overlay: {
+        enabled: false,
+        color: 'rgba(255,255,255,0.72)',
+        blur: 3
+      }
+    },
+    primaryColorDisabled: 'rgba(0, 0, 0, 0.38)',
+    secondaryColorDisabled: 'rgba(0, 0, 0, 0.38)',
+    backgroundDisabled: {
+      type: BackgroundType.color,
+      color: '#CACACA',
+      overlay: {
+        enabled: false,
+        color: 'rgba(255,255,255,0.72)',
+        blur: 3
+      }
+    }
+  }
+};
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.models.ts
index 51a427d23b..656ba75fa1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.models.ts
@@ -444,7 +444,7 @@ class InnerShadowCircle {
       add.x('-50%').y('-50%').width('200%').height('200%');
       let effect: Effect = add.componentTransfer(components => {
         components.funcA({ type: 'table', tableValues: '1 0' });
-      }).in(add.$fill);
+      });
       effect = effect.gaussianBlur(this.blur, this.blur).attr({stdDeviation: this.blur});
       this.blurEffect = effect;
       effect = effect.offset(this.dx, this.dy);
@@ -454,7 +454,7 @@ class InnerShadowCircle {
       effect = effect.composite(this.offsetEffect, 'in');
       effect.composite(add.$sourceAlpha, 'in');
       add.merge(m => {
-        m.mergeNode(add.$fill);
+        m.mergeNode();
         m.mergeNode();
       });
     });
@@ -538,14 +538,14 @@ class DefaultPowerButtonShape extends PowerButtonShape {
     this.pressedTimeline.finish();
     const pressedScale = 0.75;
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
-    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale});
+    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale, origin: {x: cx, y: cy}});
     this.pressedShadow.animate(6, 0.6);
   }
 
   protected onPressEnd() {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
-    powerButtonAnimation(this.onLabelShape).transform({scale: 1});
+    powerButtonAnimation(this.onLabelShape).transform({scale: 1, origin: {x: cx, y: cy}});
     this.pressedShadow.animateRestore();
   }
 
@@ -602,14 +602,14 @@ class SimplifiedPowerButtonShape extends PowerButtonShape {
     this.pressedTimeline.finish();
     const pressedScale = 0.75;
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
-    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale});
+    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale, origin: {x: cx, y: cy}});
     this.pressedShadow.animate(6, 0.6);
   }
 
   protected onPressEnd() {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
-    powerButtonAnimation(this.onLabelShape).transform({scale: 1});
+    powerButtonAnimation(this.onLabelShape).transform({scale: 1, origin: {x: cx, y: cy}});
     this.pressedShadow.animateRestore();
   }
 }
@@ -674,7 +674,7 @@ class OutlinedPowerButtonShape extends PowerButtonShape {
     const pressedScale = 0.75;
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
     powerButtonAnimation(this.onCenterGroup).transform({scale: 0.98});
-    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale / 0.98});
+    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale / 0.98, origin: {x: cx, y: cy}});
     this.pressedShadow.animate(6, 0.6);
   }
 
@@ -682,7 +682,7 @@ class OutlinedPowerButtonShape extends PowerButtonShape {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
     powerButtonAnimation(this.onCenterGroup).transform({scale: 1});
-    powerButtonAnimation(this.onLabelShape).transform({scale: 1});
+    powerButtonAnimation(this.onLabelShape).transform({scale: 1, origin: {x: cx, y: cy}});
     this.pressedShadow.animateRestore();
   }
 }
@@ -774,14 +774,14 @@ class DefaultVolumePowerButtonShape extends PowerButtonShape {
     this.innerShadow.show();
     const pressedScale = 0.75;
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
-    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale});
+    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale, origin: {x: cx, y: cy}});
     this.innerShadow.animate(6, 0.6);
   }
 
   protected onPressEnd() {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
-    powerButtonAnimation(this.onLabelShape).transform({scale: 1});
+    powerButtonAnimation(this.onLabelShape).transform({scale: 1, origin: {x: cx, y: cy}});
     this.innerShadow.animateRestore().after(() => {
       if (this.disabled) {
         this.innerShadow.hide();
@@ -849,14 +849,14 @@ class SimplifiedVolumePowerButtonShape extends PowerButtonShape {
       this.backgroundShape.removeClass('tb-shadow');
     }
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
-    powerButtonAnimation(this.onCenterGroup).transform({scale: pressedScale});
+    powerButtonAnimation(this.onCenterGroup).transform({scale: pressedScale, origin: {x: cx, y: cy}});
     this.pressedShadow.animate(8, 0.4);
   }
 
   protected onPressEnd() {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
-    powerButtonAnimation(this.onCenterGroup).transform({scale: 1});
+    powerButtonAnimation(this.onCenterGroup).transform({scale: 1, origin: {x: cx, y: cy}});
     this.pressedShadow.animateRestore().after(() => {
       if (!this.value) {
         this.backgroundShape.addClass('tb-shadow');
@@ -938,7 +938,7 @@ class OutlinedVolumePowerButtonShape extends PowerButtonShape {
     const pressedScale = 0.75;
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
     powerButtonAnimation(this.onCenterGroup).transform({scale: 0.98});
-    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale / 0.98});
+    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale / 0.98, origin: {x: cx, y: cy}});
     this.pressedShadow.animate(6, 0.6);
   }
 
@@ -946,7 +946,7 @@ class OutlinedVolumePowerButtonShape extends PowerButtonShape {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
     powerButtonAnimation(this.onCenterGroup).transform({scale: 1});
-    powerButtonAnimation(this.onLabelShape).transform({scale: 1});
+    powerButtonAnimation(this.onLabelShape).transform({scale: 1, origin: {x: cx, y: cy}});
     this.pressedShadow.animateRestore();
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html
index b20b941bd1..920374ec00 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.html
@@ -17,39 +17,102 @@
 -->
 <ng-container [formGroup]="barChartWidgetSettingsForm">
   <div class="tb-form-panel">
-    <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-chart-card-style</div>
-    <div class="tb-form-row space-between">
-      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showBarLabel">
-        {{ 'widgets.bar-chart.label-on-bar' | translate }}
+    <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-chart-style</div>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="dataZoom">
+        {{ 'widgets.time-series-chart.data-zoom' | translate }}
       </mat-slide-toggle>
-      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
-        <tb-font-settings formControlName="barLabelFont"
-                          disabledLineHeight
-                          forceSizeUnit="px"
-                          previewText="Humidity">
-        </tb-font-settings>
-        <tb-color-input asBoxInput
-                        colorClearButton
-                        formControlName="barLabelColor">
-        </tb-color-input>
-      </div>
     </div>
-    <div class="tb-form-row space-between">
-      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showBarValue">
-        {{ 'widgets.bar-chart.value-on-bar' | translate }}
-      </mat-slide-toggle>
-      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
-        <tb-font-settings formControlName="barValueFont"
-                          disabledLineHeight
-                          forceSizeUnit="px"
-                          previewText="45">
-        </tb-font-settings>
-        <tb-color-input asBoxInput
-                        colorClearButton
-                        formControlName="barValueColor">
-        </tb-color-input>
+    <tb-time-series-chart-grid-settings
+        formControlName="grid">
+    </tb-time-series-chart-grid-settings>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
+      <div class="tb-form-row space-between">
+        <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showBarLabel">
+          {{ 'widgets.bar-chart.label-on-bar' | translate }}
+        </mat-slide-toggle>
+        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+          <tb-font-settings formControlName="barLabelFont"
+                            disabledLineHeight
+                            forceSizeUnit="px"
+                            previewText="Humidity">
+          </tb-font-settings>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="barLabelColor">
+          </tb-color-input>
+        </div>
+      </div>
+      <div class="tb-form-row space-between">
+        <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showBarValue">
+          {{ 'widgets.bar-chart.value-on-bar' | translate }}
+        </mat-slide-toggle>
+        <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+          <tb-font-settings formControlName="barValueFont"
+                            disabledLineHeight
+                            forceSizeUnit="px"
+                            previewText="45">
+          </tb-font-settings>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="barValueColor">
+          </tb-color-input>
+        </div>
+      </div>
+      <div class="tb-form-row">
+        <mat-slide-toggle class="mat-slide" formControlName="showBarBorder">
+          {{ 'widgets.time-series-chart.series.bar.show-border' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.time-series-chart.series.bar.border-width</div>
+        <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+          <input matInput type="number" formControlName="barBorderWidth" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
+        </mat-form-field>
       </div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.time-series-chart.series.bar.border-radius</div>
+        <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+          <input matInput type="number" formControlName="barBorderRadius" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
+        </mat-form-field>
+      </div>
+      <tb-time-series-chart-fill-settings
+          formControlName="barBackgroundSettings"
+          title="widgets.time-series-chart.series.background"
+          fillNoneTitle="widgets.time-series-chart.series.fill-type-solid">
+      </tb-time-series-chart-fill-settings>
+      <tb-time-series-no-aggregation-bar-width-settings
+          stroked
+          formControlName="noAggregationBarWidthSettings">
+      </tb-time-series-no-aggregation-bar-width-settings>
+    </div>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.time-series-chart.axis.y-axis</div>
+      <tb-time-series-chart-axis-settings
+          formControlName="yAxis"
+          axisType="yAxis"
+          advanced
+          hideUnits
+          hideDecimals>
+      </tb-time-series-chart-axis-settings>
     </div>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.time-series-chart.axis.x-axis</div>
+      <tb-time-series-chart-axis-settings
+          formControlName="xAxis"
+          axisType="xAxis"
+          advanced>
+      </tb-time-series-chart-axis-settings>
+    </div>
+    <tb-time-series-chart-thresholds-panel
+        formControlName="thresholds"
+        [aliasController]="aliasController"
+        [dataKeyCallbacks]="dataKeyCallbacks"
+        [datasource]="datasource"
+        [widgetConfig]="widgetConfig?.config"
+        hideYAxis>
+    </tb-time-series-chart-thresholds-panel>
     <div class="tb-form-panel tb-slide-toggle">
       <mat-expansion-panel class="tb-settings" [expanded]="barChartWidgetSettingsForm.get('showLegend').value" [disabled]="!barChartWidgetSettingsForm.get('showLegend').value">
         <mat-expansion-panel-header fxLayout="row wrap">
@@ -97,10 +160,24 @@
           </mat-panel-title>
         </mat-expansion-panel-header>
         <ng-template matExpansionPanelContent>
+          <div class="tb-form-row space-between">
+            <div>{{ 'tooltip.label' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-font-settings formControlName="tooltipLabelFont"
+                                [initialPreviewStyle]="{ color: barChartWidgetSettingsForm.get('tooltipLabelColor').value }"
+                                previewText="Temperature">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="tooltipLabelColor">
+              </tb-color-input>
+            </div>
+          </div>
           <div class="tb-form-row space-between">
             <div>{{ 'tooltip.value' | translate }}</div>
             <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
               <tb-font-settings formControlName="tooltipValueFont"
+                                [initialPreviewStyle]="{ color: barChartWidgetSettingsForm.get('tooltipValueColor').value }"
                                 [previewText]="tooltipValuePreviewFn">
               </tb-font-settings>
               <tb-color-input asBoxInput
@@ -117,6 +194,7 @@
               <tb-date-format-select fxFlex excludeLastUpdateAgo includeAuto
                                      formControlName="tooltipDateFormat"></tb-date-format-select>
               <tb-font-settings formControlName="tooltipDateFont"
+                                [initialPreviewStyle]="{ color: barChartWidgetSettingsForm.get('tooltipDateColor').value }"
                                 [previewText]="tooltipDatePreviewFn">
               </tb-font-settings>
               <tb-color-input asBoxInput
@@ -149,10 +227,22 @@
         </ng-template>
       </mat-expansion-panel>
     </div>
-    <div class="tb-form-row space-between">
-      <div>{{ 'widgets.background.background' | translate }}</div>
-      <tb-background-settings formControlName="background">
-      </tb-background-settings>
+    <tb-echarts-animation-settings
+        formControlName="animation">
+    </tb-echarts-animation-settings>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
+      <div class="tb-form-row space-between">
+        <div>{{ 'widgets.background.background' | translate }}</div>
+        <tb-background-settings formControlName="background">
+        </tb-background-settings>
+      </div>
+      <div class="tb-form-row space-between">
+        <div>{{ 'widget-config.card-padding' | translate }}</div>
+        <mat-form-field appearance="outline" subscriptSizing="dynamic">
+          <input matInput formControlName="padding" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+      </div>
     </div>
   </div>
 </ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.ts
index b69b023d34..8172c0dde7 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/bar-chart-with-labels-widget-settings.component.ts
@@ -16,6 +16,7 @@
 
 import { Component, Injector } from '@angular/core';
 import {
+  Datasource,
   legendPositions,
   legendPositionTranslationMap,
   WidgetSettings,
@@ -24,10 +25,10 @@ import {
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
-import { formatValue } from '@core/utils';
+import { formatValue, mergeDeep } from '@core/utils';
 import { DateFormatProcessor, DateFormatSettings } from '@shared/models/widget-settings.models';
 import {
-  barChartWithLabelsDefaultSettings
+  barChartWithLabelsDefaultSettings, BarChartWithLabelsWidgetSettings
 } from '@home/components/widget/lib/chart/bar-chart-with-labels-widget.models';
 
 @Component({
@@ -37,6 +38,15 @@ import {
 })
 export class BarChartWithLabelsWidgetSettingsComponent extends WidgetSettingsComponent {
 
+  public get datasource(): Datasource {
+    const datasources: Datasource[] = this.widgetConfig.config.datasources;
+    if (datasources && datasources.length) {
+      return datasources[0];
+    } else {
+      return null;
+    }
+  }
+
   legendPositions = legendPositions;
 
   legendPositionTranslationMap = legendPositionTranslationMap;
@@ -58,18 +68,34 @@ export class BarChartWithLabelsWidgetSettingsComponent extends WidgetSettingsCom
   }
 
   protected defaultSettings(): WidgetSettings {
-    return {...barChartWithLabelsDefaultSettings};
+    return mergeDeep<BarChartWithLabelsWidgetSettings>({} as BarChartWithLabelsWidgetSettings, barChartWithLabelsDefaultSettings);
   }
 
   protected onSettingsSet(settings: WidgetSettings) {
     this.barChartWidgetSettingsForm = this.fb.group({
 
+      dataZoom: [settings.dataZoom, []],
+
       showBarLabel: [settings.showBarLabel, []],
       barLabelFont: [settings.barLabelFont, []],
       barLabelColor: [settings.barLabelColor, []],
       showBarValue: [settings.showBarValue, []],
       barValueFont: [settings.barValueFont, []],
       barValueColor: [settings.barValueColor, []],
+      showBarBorder: [settings.showBarBorder, []],
+      barBorderWidth: [settings.barBorderWidth, []],
+      barBorderRadius: [settings.barBorderRadius, []],
+      barBackgroundSettings: [settings.barBackgroundSettings, []],
+      noAggregationBarWidthSettings: [settings.noAggregationBarWidthSettings, []],
+
+      grid: [settings.grid, []],
+
+      yAxis: [settings.yAxis, []],
+      xAxis: [settings.xAxis, []],
+
+      thresholds: [settings.thresholds, []],
+
+      animation: [settings.animation, []],
 
       showLegend: [settings.showLegend, []],
       legendPosition: [settings.legendPosition, []],
@@ -77,6 +103,8 @@ export class BarChartWithLabelsWidgetSettingsComponent extends WidgetSettingsCom
       legendLabelColor: [settings.legendLabelColor, []],
 
       showTooltip: [settings.showTooltip, []],
+      tooltipLabelFont: [settings.tooltipLabelFont, []],
+      tooltipLabelColor: [settings.tooltipLabelColor, []],
       tooltipValueFont: [settings.tooltipValueFont, []],
       tooltipValueColor: [settings.tooltipValueColor, []],
       tooltipShowDate: [settings.tooltipShowDate, []],
@@ -88,17 +116,19 @@ export class BarChartWithLabelsWidgetSettingsComponent extends WidgetSettingsCom
       tooltipBackgroundColor: [settings.tooltipBackgroundColor, []],
       tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []],
 
-      background: [settings.background, []]
+      background: [settings.background, []],
+      padding: [settings.padding, []]
     });
   }
 
   protected validatorTriggers(): string[] {
-    return ['showBarLabel', 'showBarValue', 'showLegend', 'showTooltip', 'tooltipShowDate'];
+    return ['showBarLabel', 'showBarValue', 'showBarBorder', 'showLegend', 'showTooltip', 'tooltipShowDate'];
   }
 
   protected updateValidators(emitEvent: boolean) {
     const showBarLabel: boolean = this.barChartWidgetSettingsForm.get('showBarLabel').value;
     const showBarValue: boolean = this.barChartWidgetSettingsForm.get('showBarValue').value;
+    const showBarBorder: boolean = this.barChartWidgetSettingsForm.get('showBarBorder').value;
     const showLegend: boolean = this.barChartWidgetSettingsForm.get('showLegend').value;
     const showTooltip: boolean = this.barChartWidgetSettingsForm.get('showTooltip').value;
     const tooltipShowDate: boolean = this.barChartWidgetSettingsForm.get('tooltipShowDate').value;
@@ -119,6 +149,12 @@ export class BarChartWithLabelsWidgetSettingsComponent extends WidgetSettingsCom
       this.barChartWidgetSettingsForm.get('barValueColor').disable();
     }
 
+    if (showBarBorder) {
+      this.barChartWidgetSettingsForm.get('barBorderWidth').enable();
+    } else {
+      this.barChartWidgetSettingsForm.get('barBorderWidth').disable();
+    }
+
     if (showLegend) {
       this.barChartWidgetSettingsForm.get('legendPosition').enable();
       this.barChartWidgetSettingsForm.get('legendLabelFont').enable();
@@ -130,6 +166,8 @@ export class BarChartWithLabelsWidgetSettingsComponent extends WidgetSettingsCom
     }
 
     if (showTooltip) {
+      this.barChartWidgetSettingsForm.get('tooltipLabelFont').enable();
+      this.barChartWidgetSettingsForm.get('tooltipLabelColor').enable();
       this.barChartWidgetSettingsForm.get('tooltipValueFont').enable();
       this.barChartWidgetSettingsForm.get('tooltipValueColor').enable();
       this.barChartWidgetSettingsForm.get('tooltipShowDate').enable({emitEvent: false});
@@ -147,6 +185,8 @@ export class BarChartWithLabelsWidgetSettingsComponent extends WidgetSettingsCom
         this.barChartWidgetSettingsForm.get('tooltipDateInterval').disable();
       }
     } else {
+      this.barChartWidgetSettingsForm.get('tooltipLabelFont').disable();
+      this.barChartWidgetSettingsForm.get('tooltipLabelColor').disable();
       this.barChartWidgetSettingsForm.get('tooltipValueFont').disable();
       this.barChartWidgetSettingsForm.get('tooltipValueColor').disable();
       this.barChartWidgetSettingsForm.get('tooltipShowDate').disable({emitEvent: false});
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.html
index ac99c1c42e..863663db08 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.html
@@ -32,17 +32,17 @@
     </tb-image-cards-select>
     <div class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="autoScale">
-        {{ 'widgets.doughnut.auto-scale' | translate }}
+        {{ 'widgets.latest-chart.auto-scale' | translate }}
       </mat-slide-toggle>
     </div>
     <div class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="clockwise">
-        {{ 'widgets.doughnut.clockwise-layout' | translate }}
+        {{ 'widgets.latest-chart.clockwise-layout' | translate }}
       </mat-slide-toggle>
     </div>
     <div class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="sortSeries">
-        {{ 'widgets.doughnut.sort-series' | translate }}
+        {{ 'widgets.latest-chart.sort-series' | translate }}
       </mat-slide-toggle>
     </div>
     <div [fxShow]="totalEnabled" class="tb-form-row space-between">
@@ -119,8 +119,8 @@
             <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
               <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
                 <mat-select formControlName="tooltipValueType">
-                  <mat-option *ngFor="let type of doughnutTooltipValueTypes" [value]="type">
-                    {{ doughnutTooltipValueTypeTranslationMap.get(type) | translate }}
+                  <mat-option *ngFor="let type of latestChartTooltipValueTypes" [value]="type">
+                    {{ latestChartTooltipValueTypeTranslationMap.get(type) | translate }}
                   </mat-option>
                 </mat-select>
               </mat-form-field>
@@ -154,6 +154,9 @@
         </ng-template>
       </mat-expansion-panel>
     </div>
+    <tb-echarts-animation-settings
+        formControlName="animation">
+    </tb-echarts-animation-settings>
     <div class="tb-form-row space-between">
       <div>{{ 'widgets.background.background' | translate }}</div>
       <tb-background-settings formControlName="background">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.ts
index 20910e36af..c71f4b8a8f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/doughnut-widget-settings.component.ts
@@ -24,19 +24,22 @@ import {
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
-import { formatValue, isDefinedAndNotNull } from '@core/utils';
+import { formatValue, isDefinedAndNotNull, mergeDeep } from '@core/utils';
 import {
   doughnutDefaultSettings,
   DoughnutLayout,
   doughnutLayoutImages,
   doughnutLayouts,
   doughnutLayoutTranslations,
-  DoughnutTooltipValueType,
-  doughnutTooltipValueTypes,
-  doughnutTooltipValueTypeTranslations,
+  DoughnutWidgetSettings,
   horizontalDoughnutLayoutImages
 } from '@home/components/widget/lib/chart/doughnut-widget.models';
 import { WidgetConfigComponentData } from '@home/models/widget-component.models';
+import {
+  LatestChartTooltipValueType,
+  latestChartTooltipValueTypes,
+  latestChartTooltipValueTypeTranslations
+} from '@home/components/widget/lib/chart/latest-chart.models';
 
 @Component({
   selector: 'tb-doughnut-widget-settings',
@@ -62,9 +65,9 @@ export class DoughnutWidgetSettingsComponent extends WidgetSettingsComponent {
 
   legendPositionTranslationMap = legendPositionTranslationMap;
 
-  doughnutTooltipValueTypes = doughnutTooltipValueTypes;
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
 
-  doughnutTooltipValueTypeTranslationMap = doughnutTooltipValueTypeTranslations;
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
 
   doughnutWidgetSettingsForm: UntypedFormGroup;
 
@@ -88,7 +91,7 @@ export class DoughnutWidgetSettingsComponent extends WidgetSettingsComponent {
   }
 
   protected defaultSettings(): WidgetSettings {
-    return doughnutDefaultSettings(this.horizontal);
+    return mergeDeep<DoughnutWidgetSettings>({} as DoughnutWidgetSettings, doughnutDefaultSettings(this.horizontal));
   }
 
   protected onSettingsSet(settings: WidgetSettings) {
@@ -101,6 +104,8 @@ export class DoughnutWidgetSettingsComponent extends WidgetSettingsComponent {
       totalValueFont: [settings.totalValueFont, []],
       totalValueColor: [settings.totalValueColor, []],
 
+      animation: [settings.animation, []],
+
       showLegend: [settings.showLegend, []],
       legendPosition: [settings.legendPosition, []],
       legendLabelFont: [settings.legendLabelFont, []],
@@ -175,9 +180,9 @@ export class DoughnutWidgetSettingsComponent extends WidgetSettingsComponent {
   }
 
   private _tooltipValuePreviewFn(): string {
-    const tooltipValueType: DoughnutTooltipValueType = this.doughnutWidgetSettingsForm.get('tooltipValueType').value;
+    const tooltipValueType: LatestChartTooltipValueType = this.doughnutWidgetSettingsForm.get('tooltipValueType').value;
     const decimals: number = this.doughnutWidgetSettingsForm.get('tooltipValueDecimals').value;
-    if (tooltipValueType === DoughnutTooltipValueType.percentage) {
+    if (tooltipValueType === LatestChartTooltipValueType.percentage) {
       return formatValue(35, decimals, '%', false);
     } else {
       const units: string = this.widgetConfig.config.units;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.html
new file mode 100644
index 0000000000..ea96d8a4b5
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.html
@@ -0,0 +1,184 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<ng-container [formGroup]="pieChartWidgetSettingsForm">
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.pie-chart.pie-chart-card-style</div>
+    <div class="tb-form-row space-between column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showLabel">
+        {{ 'widgets.pie-chart.label' | translate }}
+      </mat-slide-toggle>
+      <div fxFlex fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field fxFlex appearance="outline" subscriptSizing="dynamic">
+          <mat-select formControlName="labelPosition">
+            <mat-option *ngFor="let position of pieChartLabelPositions" [value]="position">
+              {{ pieChartLabelPositionTranslationMap.get(position) | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <tb-font-settings formControlName="labelFont"
+                          disabledLineHeight
+                          forceSizeUnit="px"
+                          [previewText]="'Wind<br/>55%'">
+        </tb-font-settings>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="labelColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.pie-chart.border' | translate }}</div>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="borderWidth" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+          <div matSuffix>px</div>
+        </mat-form-field>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="borderColor">
+        </tb-color-input>
+      </div>
+    </div>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.pie-chart.radius' | translate }}</div>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+          <input matInput formControlName="radius" type="number" min="0" max="100" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+          <div matSuffix>%</div>
+        </mat-form-field>
+      </div>
+    </div>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="clockwise">
+        {{ 'widgets.latest-chart.clockwise-layout' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div class="tb-form-row">
+      <mat-slide-toggle class="mat-slide" formControlName="sortSeries">
+        {{ 'widgets.latest-chart.sort-series' | translate }}
+      </mat-slide-toggle>
+    </div>
+    <div class="tb-form-panel tb-slide-toggle">
+      <mat-expansion-panel class="tb-settings" [expanded]="pieChartWidgetSettingsForm.get('showLegend').value" [disabled]="!pieChartWidgetSettingsForm.get('showLegend').value">
+        <mat-expansion-panel-header fxLayout="row wrap">
+          <mat-panel-title>
+            <mat-slide-toggle class="mat-slide" formControlName="showLegend" (click)="$event.stopPropagation()"
+                              fxLayoutAlign="center">
+              {{ 'widget-config.legend' | translate }}
+            </mat-slide-toggle>
+          </mat-panel-title>
+        </mat-expansion-panel-header>
+        <ng-template matExpansionPanelContent>
+          <div class="tb-form-row space-between">
+            <div>{{ 'legend.position' | translate }}</div>
+            <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+              <mat-select formControlName="legendPosition">
+                <mat-option *ngFor="let pos of legendPositions" [value]="pos">
+                  {{ legendPositionTranslationMap.get(pos) | translate }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'legend.label' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-font-settings formControlName="legendLabelFont"
+                                previewText="Wind power">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="legendLabelColor">
+              </tb-color-input>
+            </div>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'legend.value' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-font-settings formControlName="legendValueFont"
+                                [previewText]="valuePreviewFn">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="legendValueColor">
+              </tb-color-input>
+            </div>
+          </div>
+        </ng-template>
+      </mat-expansion-panel>
+    </div>
+    <div class="tb-form-panel tb-slide-toggle">
+      <mat-expansion-panel class="tb-settings" [expanded]="pieChartWidgetSettingsForm.get('showTooltip').value" [disabled]="!pieChartWidgetSettingsForm.get('showTooltip').value">
+        <mat-expansion-panel-header fxLayout="row wrap">
+          <mat-panel-title>
+            <mat-slide-toggle class="mat-slide" formControlName="showTooltip" (click)="$event.stopPropagation()"
+                              fxLayoutAlign="center">
+              {{ 'widget-config.tooltip' | translate }}
+            </mat-slide-toggle>
+          </mat-panel-title>
+        </mat-expansion-panel-header>
+        <ng-template matExpansionPanelContent>
+          <div class="tb-form-row space-between column-xs">
+            <div>{{ 'tooltip.value' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+                <mat-select formControlName="tooltipValueType">
+                  <mat-option *ngFor="let type of latestChartTooltipValueTypes" [value]="type">
+                    {{ latestChartTooltipValueTypeTranslationMap.get(type) | translate }}
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
+              <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+                <input matInput formControlName="tooltipValueDecimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+                <div matSuffix fxHide.lt-md translate>widget-config.decimals-suffix</div>
+              </mat-form-field>
+              <tb-font-settings formControlName="tooltipValueFont"
+                                [previewText]="tooltipValuePreviewFn">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="tooltipValueColor">
+              </tb-color-input>
+            </div>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'tooltip.background-color' | translate }}</div>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="tooltipBackgroundColor">
+            </tb-color-input>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'tooltip.background-blur' | translate }}</div>
+            <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+              <input matInput formControlName="tooltipBackgroundBlur" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
+              <div matSuffix>px</div>
+            </mat-form-field>
+          </div>
+        </ng-template>
+      </mat-expansion-panel>
+    </div>
+    <tb-echarts-animation-settings
+        formControlName="animation">
+    </tb-echarts-animation-settings>
+    <div class="tb-form-row space-between">
+      <div>{{ 'widgets.background.background' | translate }}</div>
+      <tb-background-settings formControlName="background">
+      </tb-background-settings>
+    </div>
+  </div>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.ts
new file mode 100644
index 0000000000..ae96753264
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/pie-chart-widget-settings.component.ts
@@ -0,0 +1,182 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component } from '@angular/core';
+import {
+  legendPositions,
+  legendPositionTranslationMap,
+  WidgetSettings,
+  WidgetSettingsComponent
+} from '@shared/models/widget.models';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import { formatValue, mergeDeep } from '@core/utils';
+import {
+  LatestChartTooltipValueType,
+  latestChartTooltipValueTypes,
+  latestChartTooltipValueTypeTranslations
+} from '@home/components/widget/lib/chart/latest-chart.models';
+import {
+  pieChartLabelPositions,
+  pieChartLabelPositionTranslations
+} from '@home/components/widget/lib/chart/pie-chart.models';
+import {
+  pieChartWidgetDefaultSettings,
+  PieChartWidgetSettings
+} from '@home/components/widget/lib/chart/pie-chart-widget.models';
+
+@Component({
+  selector: 'tb-pie-chart-widget-settings',
+  templateUrl: './pie-chart-widget-settings.component.html',
+  styleUrls: []
+})
+export class PieChartWidgetSettingsComponent extends WidgetSettingsComponent {
+
+  pieChartLabelPositions = pieChartLabelPositions;
+
+  pieChartLabelPositionTranslationMap = pieChartLabelPositionTranslations;
+
+  legendPositions = legendPositions;
+
+  legendPositionTranslationMap = legendPositionTranslationMap;
+
+  latestChartTooltipValueTypes = latestChartTooltipValueTypes;
+
+  latestChartTooltipValueTypeTranslationMap = latestChartTooltipValueTypeTranslations;
+
+  pieChartWidgetSettingsForm: UntypedFormGroup;
+
+  valuePreviewFn = this._valuePreviewFn.bind(this);
+
+  tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
+
+  constructor(protected store: Store<AppState>,
+              private fb: UntypedFormBuilder) {
+    super(store);
+  }
+
+  protected settingsForm(): UntypedFormGroup {
+    return this.pieChartWidgetSettingsForm;
+  }
+
+  protected defaultSettings(): WidgetSettings {
+    return mergeDeep<PieChartWidgetSettings>({} as PieChartWidgetSettings, pieChartWidgetDefaultSettings);
+  }
+
+  protected onSettingsSet(settings: WidgetSettings) {
+    this.pieChartWidgetSettingsForm = this.fb.group({
+      showLabel: [settings.showLabel, []],
+      labelPosition: [settings.labelPosition, []],
+      labelFont: [settings.labelFont, []],
+      labelColor: [settings.labelColor, []],
+
+      borderWidth: [settings.borderWidth, [Validators.min(0)]],
+      borderColor: [settings.borderColor, []],
+
+      radius: [settings.radius, [Validators.min(0), Validators.max(100)]],
+
+      clockwise: [settings.clockwise, []],
+      sortSeries: [settings.sortSeries, []],
+
+      animation: [settings.animation, []],
+
+      showLegend: [settings.showLegend, []],
+      legendPosition: [settings.legendPosition, []],
+      legendLabelFont: [settings.legendLabelFont, []],
+      legendLabelColor: [settings.legendLabelColor, []],
+      legendValueFont: [settings.legendValueFont, []],
+      legendValueColor: [settings.legendValueColor, []],
+
+      showTooltip: [settings.showTooltip, []],
+      tooltipValueType: [settings.tooltipValueType, []],
+      tooltipValueDecimals: [settings.tooltipValueDecimals, []],
+      tooltipValueFont: [settings.tooltipValueFont, []],
+      tooltipValueColor: [settings.tooltipValueColor, []],
+      tooltipBackgroundColor: [settings.tooltipBackgroundColor, []],
+      tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []],
+
+      background: [settings.background, []]
+    });
+  }
+
+  protected validatorTriggers(): string[] {
+    return ['showLabel', 'showLegend', 'showTooltip'];
+  }
+
+  protected updateValidators(emitEvent: boolean) {
+    const showLabel: boolean = this.pieChartWidgetSettingsForm.get('showLabel').value;
+    const showLegend: boolean = this.pieChartWidgetSettingsForm.get('showLegend').value;
+    const showTooltip: boolean = this.pieChartWidgetSettingsForm.get('showTooltip').value;
+
+    if (showLabel) {
+      this.pieChartWidgetSettingsForm.get('labelPosition').enable();
+      this.pieChartWidgetSettingsForm.get('labelFont').enable();
+      this.pieChartWidgetSettingsForm.get('labelColor').enable();
+    } else {
+      this.pieChartWidgetSettingsForm.get('labelPosition').disable();
+      this.pieChartWidgetSettingsForm.get('labelFont').disable();
+      this.pieChartWidgetSettingsForm.get('labelColor').disable();
+    }
+
+    if (showLegend) {
+      this.pieChartWidgetSettingsForm.get('legendPosition').enable();
+      this.pieChartWidgetSettingsForm.get('legendLabelFont').enable();
+      this.pieChartWidgetSettingsForm.get('legendLabelColor').enable();
+      this.pieChartWidgetSettingsForm.get('legendValueFont').enable();
+      this.pieChartWidgetSettingsForm.get('legendValueColor').enable();
+    } else {
+      this.pieChartWidgetSettingsForm.get('legendPosition').disable();
+      this.pieChartWidgetSettingsForm.get('legendLabelFont').disable();
+      this.pieChartWidgetSettingsForm.get('legendLabelColor').disable();
+      this.pieChartWidgetSettingsForm.get('legendValueFont').disable();
+      this.pieChartWidgetSettingsForm.get('legendValueColor').disable();
+    }
+    if (showTooltip) {
+      this.pieChartWidgetSettingsForm.get('tooltipValueType').enable();
+      this.pieChartWidgetSettingsForm.get('tooltipValueDecimals').enable();
+      this.pieChartWidgetSettingsForm.get('tooltipValueFont').enable();
+      this.pieChartWidgetSettingsForm.get('tooltipValueColor').enable();
+      this.pieChartWidgetSettingsForm.get('tooltipBackgroundColor').enable();
+      this.pieChartWidgetSettingsForm.get('tooltipBackgroundBlur').enable();
+    } else {
+      this.pieChartWidgetSettingsForm.get('tooltipValueType').disable();
+      this.pieChartWidgetSettingsForm.get('tooltipValueDecimals').disable();
+      this.pieChartWidgetSettingsForm.get('tooltipValueFont').disable();
+      this.pieChartWidgetSettingsForm.get('tooltipValueColor').disable();
+      this.pieChartWidgetSettingsForm.get('tooltipBackgroundColor').disable();
+      this.pieChartWidgetSettingsForm.get('tooltipBackgroundBlur').disable();
+    }
+  }
+
+  private _valuePreviewFn(): string {
+    const units: string = this.widgetConfig.config.units;
+    const decimals: number = this.widgetConfig.config.decimals;
+    return formatValue(110, decimals, units, false);
+  }
+
+  private _tooltipValuePreviewFn(): string {
+    const tooltipValueType: LatestChartTooltipValueType = this.pieChartWidgetSettingsForm.get('tooltipValueType').value;
+    const decimals: number = this.pieChartWidgetSettingsForm.get('tooltipValueDecimals').value;
+    if (tooltipValueType === LatestChartTooltipValueType.percentage) {
+      return formatValue(35, decimals, '%', false);
+    } else {
+      const units: string = this.widgetConfig.config.units;
+      return formatValue(110, decimals, units, false);
+    }
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html
index cf5bbcfdd5..30c5eea4c1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.html
@@ -17,29 +17,178 @@
 -->
 <ng-container [formGroup]="rangeChartWidgetSettingsForm">
   <div class="tb-form-panel">
-    <div class="tb-form-panel-title" translate>widgets.range-chart.range-chart-card-style</div>
+    <div class="tb-form-panel-title" translate>widgets.range-chart.range-chart-style</div>
     <div class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="dataZoom">
         {{ 'widgets.range-chart.data-zoom' | translate }}
       </mat-slide-toggle>
     </div>
-    <div class="tb-form-row space-between">
-      <div>{{ 'widgets.range-chart.range-colors' | translate }}</div>
-      <tb-color-range-settings formControlName="rangeColors">
-      </tb-color-range-settings>
+    <tb-time-series-chart-grid-settings
+        formControlName="grid">
+    </tb-time-series-chart-grid-settings>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.range-chart.range-chart-appearance</div>
+      <div class="tb-form-row space-between">
+        <div>{{ 'widgets.range-chart.range-colors' | translate }}</div>
+        <tb-color-range-settings formControlName="rangeColors">
+        </tb-color-range-settings>
+      </div>
+      <div class="tb-form-row space-between">
+        <div>{{ 'widgets.range-chart.out-of-range-color' | translate }}</div>
+        <tb-color-input asBoxInput
+                        colorClearButton
+                        formControlName="outOfRangeColor">
+        </tb-color-input>
+      </div>
+      <div class="tb-form-row space-between">
+        <mat-slide-toggle class="mat-slide" formControlName="showRangeThresholds">
+          {{ 'widgets.range-chart.show-range-thresholds' | translate }}
+        </mat-slide-toggle>
+        <tb-time-series-chart-threshold-settings
+            boxButton
+            hideYAxis
+            [widgetConfig]="widgetConfig?.config"
+            title="widgets.range-chart.range-thresholds-settings"
+            formControlName="rangeThreshold">
+        </tb-time-series-chart-threshold-settings>
+      </div>
+      <div class="tb-form-row">
+        <mat-slide-toggle class="mat-slide" formControlName="fillArea">
+          {{ 'widgets.range-chart.fill-area' | translate }}
+        </mat-slide-toggle>
+      </div>
+      <div class="tb-form-row space-between column-xs">
+        <div translate>widgets.range-chart.fill-area-opacity</div>
+        <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+          <input matInput type="number" formControlName="fillAreaOpacity" min="0" max="1"
+                 step="0.1" placeholder="{{ 'widget-config.set' | translate }}"/>
+        </mat-form-field>
+      </div>
+      <div class="tb-form-panel stroked">
+        <div class="tb-form-panel-title" translate>widgets.time-series-chart.series.line.line</div>
+        <div class="tb-form-row">
+          <mat-slide-toggle class="mat-slide" formControlName="showLine">
+            {{ 'widgets.time-series-chart.series.line.show-line' | translate }}
+          </mat-slide-toggle>
+        </div>
+        <div class="tb-form-row space-between column-xs">
+          <mat-slide-toggle class="mat-slide" formControlName="step">
+            {{ 'widgets.time-series-chart.series.line.step-line' | translate }}
+          </mat-slide-toggle>
+          <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+            <mat-select formControlName="stepType">
+              <mat-option *ngFor="let stepType of lineSeriesStepTypes" [value]="stepType">
+                {{ lineSeriesStepTypeTranslations.get(stepType) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <div class="tb-form-row">
+          <mat-slide-toggle class="mat-slide" formControlName="smooth">
+            {{ 'widgets.time-series-chart.series.line.smooth-line' | translate }}
+          </mat-slide-toggle>
+        </div>
+        <div class="tb-form-row space-between column-xs">
+          <div translate>widgets.time-series-chart.line-type</div>
+          <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+            <mat-select formControlName="lineType">
+              <mat-option *ngFor="let lineType of timeSeriesLineTypes" [value]="lineType">
+                {{ timeSeriesLineTypeTranslations.get(lineType) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <div class="tb-form-row space-between column-xs">
+          <div translate>widgets.time-series-chart.line-width</div>
+          <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+            <input matInput type="number" formControlName="lineWidth" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
+          </mat-form-field>
+        </div>
+      </div>
+      <div class="tb-form-panel stroked">
+        <div class="tb-form-panel-title" translate>widgets.time-series-chart.series.point.points</div>
+        <div class="tb-form-row">
+          <mat-slide-toggle class="mat-slide" formControlName="showPoints">
+            {{ 'widgets.time-series-chart.series.point.show-points' | translate }}
+          </mat-slide-toggle>
+        </div>
+        <div class="tb-form-row space-between column-lt-md">
+          <mat-slide-toggle class="mat-slide" formControlName="showPointLabel">
+            <div tb-hint-tooltip-icon="{{'widgets.time-series-chart.series.point.point-label-hint' | translate}}">
+              {{ 'widgets.time-series-chart.series.point.point-label' | translate }}
+            </div>
+          </mat-slide-toggle>
+          <div fxLayout="row" fxFlex.lt-md fxLayoutAlign="start center" fxLayoutGap="8px">
+            <mat-form-field class="medium-width" fxFlex.lt-md appearance="outline" subscriptSizing="dynamic">
+              <mat-select formControlName="pointLabelPosition">
+                <mat-option *ngFor="let position of seriesLabelPositions" [value]="position">
+                  {{ seriesLabelPositionTranslations.get(position) | translate }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+            <tb-font-settings formControlName="pointLabelFont"
+                              clearButton
+                              disabledLineHeight
+                              forceSizeUnit="px"
+                              [previewText]="pointLabelPreviewFn">
+            </tb-font-settings>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="pointLabelColor">
+            </tb-color-input>
+          </div>
+        </div>
+        <div class="tb-form-row space-between">
+          <mat-slide-toggle class="mat-slide" formControlName="enablePointLabelBackground">
+            {{ 'widgets.time-series-chart.series.point.point-label-background' | translate }}
+          </mat-slide-toggle>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="pointLabelBackground">
+          </tb-color-input>
+        </div>
+        <div class="tb-form-row space-between column-xs">
+          <div translate>widgets.time-series-chart.series.point.point-shape</div>
+          <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
+            <mat-select formControlName="pointShape">
+              <mat-option *ngFor="let shape of echartsShapes" [value]="shape">
+                {{ echartsShapeTranslations.get(shape) | translate }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <div class="tb-form-row space-between column-xs">
+          <div translate>widgets.time-series-chart.series.point.point-size</div>
+          <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
+            <input matInput type="number" formControlName="pointSize" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
+          </mat-form-field>
+        </div>
+      </div>
     </div>
-    <div class="tb-form-row space-between">
-      <div>{{ 'widgets.range-chart.out-of-range-color' | translate }}</div>
-      <tb-color-input asBoxInput
-                      colorClearButton
-                      formControlName="outOfRangeColor">
-      </tb-color-input>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.time-series-chart.axis.y-axis</div>
+      <tb-time-series-chart-axis-settings
+          formControlName="yAxis"
+          axisType="yAxis"
+          hideUnits
+          hideDecimals>
+      </tb-time-series-chart-axis-settings>
     </div>
-    <div class="tb-form-row">
-      <mat-slide-toggle class="mat-slide" formControlName="fillArea">
-        {{ 'widgets.range-chart.fill-area' | translate }}
-      </mat-slide-toggle>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widgets.time-series-chart.axis.x-axis</div>
+      <tb-time-series-chart-axis-settings
+          formControlName="xAxis"
+          axisType="xAxis">
+      </tb-time-series-chart-axis-settings>
     </div>
+    <tb-time-series-chart-thresholds-panel
+        formControlName="thresholds"
+        [aliasController]="aliasController"
+        [dataKeyCallbacks]="dataKeyCallbacks"
+        [datasource]="datasource"
+        [widgetConfig]="widgetConfig?.config"
+        hideYAxis>
+    </tb-time-series-chart-thresholds-panel>
     <div class="tb-form-panel tb-slide-toggle">
       <mat-expansion-panel class="tb-settings" [expanded]="rangeChartWidgetSettingsForm.get('showLegend').value" [disabled]="!rangeChartWidgetSettingsForm.get('showLegend').value">
         <mat-expansion-panel-header fxLayout="row wrap">
@@ -87,10 +236,24 @@
           </mat-panel-title>
         </mat-expansion-panel-header>
         <ng-template matExpansionPanelContent>
+          <div class="tb-form-row space-between">
+            <div>{{ 'tooltip.label' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-font-settings formControlName="tooltipLabelFont"
+                                [initialPreviewStyle]="{ color: rangeChartWidgetSettingsForm.get('tooltipLabelColor').value }"
+                                previewText="Temperature">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="tooltipLabelColor">
+              </tb-color-input>
+            </div>
+          </div>
           <div class="tb-form-row space-between">
             <div>{{ 'tooltip.value' | translate }}</div>
             <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
               <tb-font-settings formControlName="tooltipValueFont"
+                                [initialPreviewStyle]="{ color: rangeChartWidgetSettingsForm.get('tooltipValueColor').value }"
                                 [previewText]="tooltipValuePreviewFn">
               </tb-font-settings>
               <tb-color-input asBoxInput
@@ -107,6 +270,7 @@
               <tb-date-format-select fxFlex excludeLastUpdateAgo includeAuto
                                      formControlName="tooltipDateFormat"></tb-date-format-select>
               <tb-font-settings formControlName="tooltipDateFont"
+                                [initialPreviewStyle]="{ color: rangeChartWidgetSettingsForm.get('tooltipDateColor').value }"
                                 [previewText]="tooltipDatePreviewFn">
               </tb-font-settings>
               <tb-color-input asBoxInput
@@ -139,10 +303,22 @@
         </ng-template>
       </mat-expansion-panel>
     </div>
-    <div class="tb-form-row space-between">
-      <div>{{ 'widgets.background.background' | translate }}</div>
-      <tb-background-settings formControlName="background">
-      </tb-background-settings>
+    <tb-echarts-animation-settings
+        formControlName="animation">
+    </tb-echarts-animation-settings>
+    <div class="tb-form-panel">
+      <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
+      <div class="tb-form-row space-between">
+        <div>{{ 'widgets.background.background' | translate }}</div>
+        <tb-background-settings formControlName="background">
+        </tb-background-settings>
+      </div>
+      <div class="tb-form-row space-between">
+        <div>{{ 'widget-config.card-padding' | translate }}</div>
+        <mat-form-field appearance="outline" subscriptSizing="dynamic">
+          <input matInput formControlName="padding" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+      </div>
     </div>
   </div>
 </ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts
index f0870dbd80..872a77d2a7 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts
@@ -16,17 +16,30 @@
 
 import { Component, Injector } from '@angular/core';
 import {
+  Datasource,
   legendPositions,
   legendPositionTranslationMap,
   WidgetSettings,
   WidgetSettingsComponent
 } from '@shared/models/widget.models';
-import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
-import { formatValue } from '@core/utils';
-import { rangeChartDefaultSettings } from '@home/components/widget/lib/chart/range-chart-widget.models';
+import { formatValue, mergeDeep } from '@core/utils';
+import {
+  rangeChartDefaultSettings,
+  RangeChartWidgetSettings
+} from '@home/components/widget/lib/chart/range-chart-widget.models';
 import { DateFormatProcessor, DateFormatSettings } from '@shared/models/widget-settings.models';
+import {
+  lineSeriesStepTypes,
+  lineSeriesStepTypeTranslations,
+  seriesLabelPositions,
+  seriesLabelPositionTranslations,
+  timeSeriesLineTypes,
+  timeSeriesLineTypeTranslations
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import { echartsShapes, echartsShapeTranslations } from '@home/components/widget/lib/chart/echarts-widget.models';
 
 @Component({
   selector: 'tb-range-chart-widget-settings',
@@ -35,12 +48,39 @@ import { DateFormatProcessor, DateFormatSettings } from '@shared/models/widget-s
 })
 export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
 
+  public get datasource(): Datasource {
+    const datasources: Datasource[] = this.widgetConfig.config.datasources;
+    if (datasources && datasources.length) {
+      return datasources[0];
+    } else {
+      return null;
+    }
+  }
+
+  lineSeriesStepTypes = lineSeriesStepTypes;
+
+  lineSeriesStepTypeTranslations = lineSeriesStepTypeTranslations;
+
+  timeSeriesLineTypes = timeSeriesLineTypes;
+
+  timeSeriesLineTypeTranslations = timeSeriesLineTypeTranslations;
+
+  seriesLabelPositions = seriesLabelPositions;
+
+  seriesLabelPositionTranslations = seriesLabelPositionTranslations;
+
+  echartsShapes = echartsShapes;
+
+  echartsShapeTranslations = echartsShapeTranslations;
+
   legendPositions = legendPositions;
 
   legendPositionTranslationMap = legendPositionTranslationMap;
 
   rangeChartWidgetSettingsForm: UntypedFormGroup;
 
+  pointLabelPreviewFn = this._pointLabelPreviewFn.bind(this);
+
   tooltipValuePreviewFn = this._tooltipValuePreviewFn.bind(this);
 
   tooltipDatePreviewFn = this._tooltipDatePreviewFn.bind(this);
@@ -56,7 +96,7 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
   }
 
   protected defaultSettings(): WidgetSettings {
-    return {...rangeChartDefaultSettings};
+    return mergeDeep<RangeChartWidgetSettings>({} as RangeChartWidgetSettings, rangeChartDefaultSettings);
   }
 
   protected onSettingsSet(settings: WidgetSettings) {
@@ -64,7 +104,36 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
       dataZoom: [settings.dataZoom, []],
       rangeColors: [settings.rangeColors, []],
       outOfRangeColor: [settings.outOfRangeColor, []],
+      showRangeThresholds: [settings.showRangeThresholds, []],
+      rangeThreshold: [settings.rangeThreshold, []],
       fillArea: [settings.fillArea, []],
+      fillAreaOpacity: [settings.fillAreaOpacity, [Validators.min(0), Validators.max(1)]],
+
+      showLine: [settings.showLine, []],
+      step: [settings.step, []],
+      stepType: [settings.stepType, []],
+      smooth: [settings.smooth, []],
+      lineType: [settings.lineType, []],
+      lineWidth: [settings.lineWidth, [Validators.min(0)]],
+
+      showPoints: [settings.showPoints, []],
+      showPointLabel: [settings.showPointLabel, []],
+      pointLabelPosition: [settings.pointLabelPosition, []],
+      pointLabelFont: [settings.pointLabelFont, []],
+      pointLabelColor: [settings.pointLabelColor, []],
+      enablePointLabelBackground: [settings.enablePointLabelBackground, []],
+      pointLabelBackground: [settings.pointLabelBackground, []],
+      pointShape: [settings.pointShape, []],
+      pointSize: [settings.pointSize, [Validators.min(0)]],
+
+      grid: [settings.grid, []],
+
+      yAxis: [settings.yAxis, []],
+      xAxis: [settings.xAxis, []],
+
+      thresholds: [settings.thresholds, []],
+
+      animation: [settings.animation, []],
 
       showLegend: [settings.showLegend, []],
       legendPosition: [settings.legendPosition, []],
@@ -72,6 +141,8 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
       legendLabelColor: [settings.legendLabelColor, []],
 
       showTooltip: [settings.showTooltip, []],
+      tooltipLabelFont: [settings.tooltipLabelFont, []],
+      tooltipLabelColor: [settings.tooltipLabelColor, []],
       tooltipValueFont: [settings.tooltipValueFont, []],
       tooltipValueColor: [settings.tooltipValueColor, []],
       tooltipShowDate: [settings.tooltipShowDate, []],
@@ -83,19 +154,75 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
       tooltipBackgroundColor: [settings.tooltipBackgroundColor, []],
       tooltipBackgroundBlur: [settings.tooltipBackgroundBlur, []],
 
-      background: [settings.background, []]
+      background: [settings.background, []],
+      padding: [settings.padding, []]
     });
   }
 
   protected validatorTriggers(): string[] {
-    return ['showLegend', 'showTooltip', 'tooltipShowDate'];
+    return ['showRangeThresholds', 'fillArea', 'showLine', 'step', 'showPointLabel', 'enablePointLabelBackground',
+      'showLegend', 'showTooltip', 'tooltipShowDate'];
   }
 
   protected updateValidators(emitEvent: boolean) {
+    const showRangeThresholds: boolean = this.rangeChartWidgetSettingsForm.get('showRangeThresholds').value;
+    const fillArea: boolean = this.rangeChartWidgetSettingsForm.get('fillArea').value;
+    const showLine: boolean = this.rangeChartWidgetSettingsForm.get('showLine').value;
+    const step: boolean = this.rangeChartWidgetSettingsForm.get('step').value;
+    const showPointLabel: boolean = this.rangeChartWidgetSettingsForm.get('showPointLabel').value;
+    const enablePointLabelBackground: boolean = this.rangeChartWidgetSettingsForm.get('enablePointLabelBackground').value;
     const showLegend: boolean = this.rangeChartWidgetSettingsForm.get('showLegend').value;
     const showTooltip: boolean = this.rangeChartWidgetSettingsForm.get('showTooltip').value;
     const tooltipShowDate: boolean = this.rangeChartWidgetSettingsForm.get('tooltipShowDate').value;
 
+    if (showRangeThresholds) {
+      this.rangeChartWidgetSettingsForm.get('rangeThreshold').enable();
+    } else {
+      this.rangeChartWidgetSettingsForm.get('rangeThreshold').disable();
+    }
+
+    if (fillArea) {
+      this.rangeChartWidgetSettingsForm.get('fillAreaOpacity').enable();
+    } else {
+      this.rangeChartWidgetSettingsForm.get('fillAreaOpacity').disable();
+    }
+
+    if (showLine) {
+      this.rangeChartWidgetSettingsForm.get('step').enable({emitEvent: false});
+      if (step) {
+        this.rangeChartWidgetSettingsForm.get('stepType').enable();
+        this.rangeChartWidgetSettingsForm.get('smooth').disable();
+      } else {
+        this.rangeChartWidgetSettingsForm.get('stepType').disable();
+        this.rangeChartWidgetSettingsForm.get('smooth').enable();
+      }
+      this.rangeChartWidgetSettingsForm.get('lineType').enable();
+      this.rangeChartWidgetSettingsForm.get('lineWidth').enable();
+    } else {
+      this.rangeChartWidgetSettingsForm.get('step').disable({emitEvent: false});
+      this.rangeChartWidgetSettingsForm.get('stepType').disable();
+      this.rangeChartWidgetSettingsForm.get('smooth').disable();
+      this.rangeChartWidgetSettingsForm.get('lineType').disable();
+      this.rangeChartWidgetSettingsForm.get('lineWidth').disable();
+    }
+    if (showPointLabel) {
+      this.rangeChartWidgetSettingsForm.get('pointLabelPosition').enable();
+      this.rangeChartWidgetSettingsForm.get('pointLabelFont').enable();
+      this.rangeChartWidgetSettingsForm.get('pointLabelColor').enable();
+      this.rangeChartWidgetSettingsForm.get('enablePointLabelBackground').enable({emitEvent: false});
+      if (enablePointLabelBackground) {
+        this.rangeChartWidgetSettingsForm.get('pointLabelBackground').enable();
+      } else {
+        this.rangeChartWidgetSettingsForm.get('pointLabelBackground').disable();
+      }
+    } else {
+      this.rangeChartWidgetSettingsForm.get('pointLabelPosition').disable();
+      this.rangeChartWidgetSettingsForm.get('pointLabelFont').disable();
+      this.rangeChartWidgetSettingsForm.get('pointLabelColor').disable();
+      this.rangeChartWidgetSettingsForm.get('enablePointLabelBackground').disable({emitEvent: false});
+      this.rangeChartWidgetSettingsForm.get('pointLabelBackground').disable();
+    }
+
     if (showLegend) {
       this.rangeChartWidgetSettingsForm.get('legendPosition').enable();
       this.rangeChartWidgetSettingsForm.get('legendLabelFont').enable();
@@ -107,6 +234,8 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
     }
 
     if (showTooltip) {
+      this.rangeChartWidgetSettingsForm.get('tooltipLabelFont').enable();
+      this.rangeChartWidgetSettingsForm.get('tooltipLabelColor').enable();
       this.rangeChartWidgetSettingsForm.get('tooltipValueFont').enable();
       this.rangeChartWidgetSettingsForm.get('tooltipValueColor').enable();
       this.rangeChartWidgetSettingsForm.get('tooltipShowDate').enable({emitEvent: false});
@@ -124,6 +253,8 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
         this.rangeChartWidgetSettingsForm.get('tooltipDateInterval').disable();
       }
     } else {
+      this.rangeChartWidgetSettingsForm.get('tooltipLabelFont').disable();
+      this.rangeChartWidgetSettingsForm.get('tooltipLabelColor').disable();
       this.rangeChartWidgetSettingsForm.get('tooltipValueFont').disable();
       this.rangeChartWidgetSettingsForm.get('tooltipValueColor').disable();
       this.rangeChartWidgetSettingsForm.get('tooltipShowDate').disable({emitEvent: false});
@@ -136,6 +267,12 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
     }
   }
 
+  private _pointLabelPreviewFn(): string {
+    const units: string = this.widgetConfig.config.units;
+    const decimals: number = this.widgetConfig.config.decimals;
+    return formatValue(22, decimals, units, false);
+  }
+
   private _tooltipValuePreviewFn(): string {
     const units: string = this.widgetConfig.config.units;
     const decimals: number = this.widgetConfig.config.decimals;
@@ -148,5 +285,4 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
     processor.update(Date.now());
     return processor.formatted;
   }
-
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.html
index 447784091e..ddbeaf2480 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.html
@@ -59,6 +59,15 @@
       </tb-color-input>
     </div>
   </div>
+  <div class="tb-form-row space-between">
+    <mat-slide-toggle class="mat-slide" formControlName="enableLabelBackground">
+      {{ 'widgets.time-series-chart.series.bar.label-background' | translate }}
+    </mat-slide-toggle>
+    <tb-color-input asBoxInput
+                    colorClearButton
+                    formControlName="labelBackground">
+    </tb-color-input>
+  </div>
   <tb-time-series-chart-fill-settings
     formControlName="backgroundSettings"
     title="widgets.time-series-chart.series.background"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.ts
index b42cec925a..a2f8fd01c3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component.ts
@@ -76,13 +76,16 @@ export class TimeSeriesChartBarSettingsComponent implements OnInit, ControlValue
       labelPosition: [null, []],
       labelFont: [null, []],
       labelColor: [null, []],
+      enableLabelBackground: [null, []],
+      labelBackground: [null, []],
       backgroundSettings: [null, []]
     });
     this.barSettingsFormGroup.valueChanges.subscribe(() => {
       this.updateModel();
     });
     merge(this.barSettingsFormGroup.get('showBorder').valueChanges,
-      this.barSettingsFormGroup.get('showLabel').valueChanges)
+      this.barSettingsFormGroup.get('showLabel').valueChanges,
+      this.barSettingsFormGroup.get('enableLabelBackground').valueChanges)
     .subscribe(() => {
       this.updateValidators();
     });
@@ -116,6 +119,7 @@ export class TimeSeriesChartBarSettingsComponent implements OnInit, ControlValue
   private updateValidators() {
     const showBorder: boolean = this.barSettingsFormGroup.get('showBorder').value;
     const showLabel: boolean = this.barSettingsFormGroup.get('showLabel').value;
+    const enableLabelBackground: boolean = this.barSettingsFormGroup.get('enableLabelBackground').value;
     if (showBorder) {
       this.barSettingsFormGroup.get('borderWidth').enable({emitEvent: false});
     } else {
@@ -125,10 +129,18 @@ export class TimeSeriesChartBarSettingsComponent implements OnInit, ControlValue
       this.barSettingsFormGroup.get('labelPosition').enable({emitEvent: false});
       this.barSettingsFormGroup.get('labelFont').enable({emitEvent: false});
       this.barSettingsFormGroup.get('labelColor').enable({emitEvent: false});
+      this.barSettingsFormGroup.get('enableLabelBackground').enable({emitEvent: false});
+      if (enableLabelBackground) {
+        this.barSettingsFormGroup.get('labelBackground').enable({emitEvent: false});
+      } else {
+        this.barSettingsFormGroup.get('labelBackground').disable({emitEvent: false});
+      }
     } else {
       this.barSettingsFormGroup.get('labelPosition').disable({emitEvent: false});
       this.barSettingsFormGroup.get('labelFont').disable({emitEvent: false});
       this.barSettingsFormGroup.get('labelColor').disable({emitEvent: false});
+      this.barSettingsFormGroup.get('enableLabelBackground').disable({emitEvent: false});
+      this.barSettingsFormGroup.get('labelBackground').disable({emitEvent: false});
     }
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.html
index 5f0fbb9e37..a265a1b431 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.html
@@ -56,6 +56,45 @@
                                         formControlName="barSettings">
     </tb-time-series-chart-bar-settings>
   </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.chart.tooltip-settings</div>
+    <tb-js-func
+        formControlName="tooltipValueFormatter"
+        [globalVariables]="functionScopeVariables"
+        [functionArgs]="['value', 'latestData']"
+        functionTitle="{{ 'widgets.chart.tooltip-value-format-function' | translate }}"
+        helpId="widget/lib/flot/tooltip_value_format_fn">
+    </tb-js-func>
+  </div>
+  <div *ngIf="comparisonEnabled" class="tb-form-panel tb-slide-toggle" formGroupName="comparisonSettings">
+    <div class="tb-form-panel-title" translate>widgets.time-series-chart.comparison.settings</div>
+    <mat-expansion-panel class="tb-settings" [expanded]="timeSeriesChartKeySettingsForm.get('comparisonSettings.showValuesForComparison').value"
+                         [disabled]="!timeSeriesChartKeySettingsForm.get('comparisonSettings.showValuesForComparison').value">
+      <mat-expansion-panel-header fxLayout="row wrap">
+        <mat-panel-title>
+          <mat-slide-toggle class="mat-slide" formControlName="showValuesForComparison" (click)="$event.stopPropagation()"
+                            fxLayoutAlign="center">
+            {{ 'widgets.time-series-chart.comparison.show-values-for-comparison' | translate }}
+          </mat-slide-toggle>
+        </mat-panel-title>
+      </mat-expansion-panel-header>
+      <ng-template matExpansionPanelContent>
+        <div class="tb-form-row">
+          <div class="fixed-title-width" translate>widgets.time-series-chart.comparison.comparison-values-label</div>
+          <mat-form-field fxFlex appearance="outline" subscriptSizing="dynamic">
+            <input matInput formControlName="comparisonValuesLabel" placeholder="{{ 'widgets.time-series-chart.comparison.comparison-values-label-auto' | translate }}">
+          </mat-form-field>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'widgets.time-series-chart.comparison.comparison-data-color' | translate }}</div>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="color">
+          </tb-color-input>
+        </div>
+      </ng-template>
+    </mat-expansion-panel>
+  </div>
 </ng-container>
 <ng-template #chartTypeTitle>
   <div class="tb-form-panel-title">{{ timeSeriesChartTypeTranslations.get(chartType) | translate }}</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.ts
index d1ac428396..229607d7f3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-key-settings.component.ts
@@ -29,6 +29,7 @@ import {
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { WidgetConfigComponentData } from '@home/models/widget-component.models';
 import { TimeSeriesChartWidgetSettings } from '@home/components/widget/lib/chart/time-series-chart-widget.models';
+import { WidgetService } from '@core/http/widget.service';
 
 @Component({
   selector: 'tb-time-series-chart-key-settings',
@@ -53,7 +54,12 @@ export class TimeSeriesChartKeySettingsComponent extends WidgetSettingsComponent
 
   yAxisIds: TimeSeriesChartYAxisId[];
 
+  comparisonEnabled: boolean;
+
+  functionScopeVariables = this.widgetService.getWidgetScopeVariables();
+
   constructor(protected store: Store<AppState>,
+              private widgetService: WidgetService,
               private fb: UntypedFormBuilder) {
     super(store);
   }
@@ -69,6 +75,7 @@ export class TimeSeriesChartKeySettingsComponent extends WidgetSettingsComponent
     }
     const widgetSettings = (widgetConfig.config?.settings || {}) as TimeSeriesChartWidgetSettings;
     this.yAxisIds = widgetSettings.yAxes ? Object.keys(widgetSettings.yAxes) : ['default'];
+    this.comparisonEnabled = !!widgetSettings.comparisonEnabled;
   }
 
   protected defaultSettings(): WidgetSettings {
@@ -88,17 +95,25 @@ export class TimeSeriesChartKeySettingsComponent extends WidgetSettingsComponent
       dataHiddenByDefault: [seriesSettings.dataHiddenByDefault, []],
       type: [seriesSettings.type, []],
       lineSettings: [seriesSettings.lineSettings, []],
-      barSettings: [seriesSettings.barSettings, []]
+      barSettings: [seriesSettings.barSettings, []],
+      tooltipValueFormatter: [seriesSettings.tooltipValueFormatter, []],
+      comparisonSettings: this.fb.group({
+        showValuesForComparison: [seriesSettings.comparisonSettings?.showValuesForComparison, []],
+        comparisonValuesLabel: [seriesSettings.comparisonSettings?.comparisonValuesLabel, []],
+        color: [seriesSettings.comparisonSettings?.color, []]
+      })
     });
   }
 
   protected validatorTriggers(): string[] {
-    return ['showInLegend', 'type'];
+    return ['showInLegend', 'type', 'comparisonSettings.showValuesForComparison'];
   }
 
   protected updateValidators(_emitEvent: boolean) {
     const showInLegend: boolean = this.timeSeriesChartKeySettingsForm.get('showInLegend').value;
     const type: TimeSeriesChartSeriesType = this.timeSeriesChartKeySettingsForm.get('type').value;
+    const showValuesForComparison: boolean =
+      this.timeSeriesChartKeySettingsForm.get('comparisonSettings').get('showValuesForComparison').value;
     if (showInLegend) {
       this.timeSeriesChartKeySettingsForm.get('dataHiddenByDefault').enable();
     } else {
@@ -112,5 +127,17 @@ export class TimeSeriesChartKeySettingsComponent extends WidgetSettingsComponent
       this.timeSeriesChartKeySettingsForm.get('lineSettings').disable();
       this.timeSeriesChartKeySettingsForm.get('barSettings').enable();
     }
+    if (this.comparisonEnabled) {
+      this.timeSeriesChartKeySettingsForm.get('comparisonSettings').enable({emitEvent: false});
+      if (showValuesForComparison) {
+        this.timeSeriesChartKeySettingsForm.get('comparisonSettings').get('comparisonValuesLabel').enable();
+        this.timeSeriesChartKeySettingsForm.get('comparisonSettings').get('color').enable();
+      } else {
+        this.timeSeriesChartKeySettingsForm.get('comparisonSettings').get('comparisonValuesLabel').disable();
+        this.timeSeriesChartKeySettingsForm.get('comparisonSettings').get('color').disable();
+      }
+    } else {
+      this.timeSeriesChartKeySettingsForm.get('comparisonSettings').disable({emitEvent: false});
+    }
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.html
index 78f1129727..f20f1323b3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.html
@@ -18,7 +18,7 @@
 <ng-container [formGroup]="lineSettingsFormGroup">
   <div *ngIf="chartType !== TimeSeriesChartType.point" class="tb-form-panel stroked">
     <div class="tb-form-panel-title" translate>widgets.time-series-chart.series.line.line</div>
-    <div class="tb-form-row">
+    <div *ngIf="chartType !== TimeSeriesChartType.state" class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="showLine">
         {{ 'widgets.time-series-chart.series.line.show-line' | translate }}
       </mat-slide-toggle>
@@ -35,7 +35,7 @@
         </mat-select>
       </mat-form-field>
     </div>
-    <div class="tb-form-row">
+    <div *ngIf="chartType !== TimeSeriesChartType.state" class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="smooth">
         {{ 'widgets.time-series-chart.series.line.smooth-line' | translate }}
       </mat-slide-toggle>
@@ -97,12 +97,21 @@
       </tb-color-input>
     </div>
   </div>
+  <div class="tb-form-row space-between">
+    <mat-slide-toggle class="mat-slide" formControlName="enablePointLabelBackground">
+      {{ 'widgets.time-series-chart.series.point.point-label-background' | translate }}
+    </mat-slide-toggle>
+    <tb-color-input asBoxInput
+                    colorClearButton
+                    formControlName="pointLabelBackground">
+    </tb-color-input>
+  </div>
   <div class="tb-form-row space-between column-xs">
     <div translate>widgets.time-series-chart.series.point.point-shape</div>
     <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
       <mat-select formControlName="pointShape">
-        <mat-option *ngFor="let shape of timeSeriesChartShapes" [value]="shape">
-          {{ timeSeriesChartShapeTranslations.get(shape) | translate }}
+        <mat-option *ngFor="let shape of echartsShapes" [value]="shape">
+          {{ echartsShapeTranslations.get(shape) | translate }}
         </mat-option>
       </mat-select>
     </mat-form-field>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.ts
index 84533b26e4..1d57220b4e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-line-settings.component.ts
@@ -28,11 +28,11 @@ import {
   lineSeriesStepTypeTranslations,
   seriesLabelPositions,
   seriesLabelPositionTranslations,
-  timeSeriesChartShapes,
-  timeSeriesChartShapeTranslations, TimeSeriesChartType,
+  TimeSeriesChartType,
   timeSeriesLineTypes,
   timeSeriesLineTypeTranslations
 } from '@home/components/widget/lib/chart/time-series-chart.models';
+import { echartsShapes, echartsShapeTranslations } from '@home/components/widget/lib/chart/echarts-widget.models';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { merge } from 'rxjs';
@@ -67,9 +67,9 @@ export class TimeSeriesChartLineSettingsComponent implements OnInit, ControlValu
 
   seriesLabelPositionTranslations = seriesLabelPositionTranslations;
 
-  timeSeriesChartShapes = timeSeriesChartShapes;
+  echartsShapes = echartsShapes;
 
-  timeSeriesChartShapeTranslations = timeSeriesChartShapeTranslations;
+  echartsShapeTranslations = echartsShapeTranslations;
 
   pointLabelPreviewFn = this._pointLabelPreviewFn.bind(this);
 
@@ -103,6 +103,8 @@ export class TimeSeriesChartLineSettingsComponent implements OnInit, ControlValu
       pointLabelPosition: [null, []],
       pointLabelFont: [null, []],
       pointLabelColor: [null, []],
+      enablePointLabelBackground: [null, []],
+      pointLabelBackground: [null, []],
       pointShape: [null, []],
       pointSize: [null, [Validators.min(0)]],
       fillAreaSettings: [null, []]
@@ -112,7 +114,8 @@ export class TimeSeriesChartLineSettingsComponent implements OnInit, ControlValu
     });
     merge(this.lineSettingsFormGroup.get('showLine').valueChanges,
       this.lineSettingsFormGroup.get('step').valueChanges,
-      this.lineSettingsFormGroup.get('showPointLabel').valueChanges)
+      this.lineSettingsFormGroup.get('showPointLabel').valueChanges,
+      this.lineSettingsFormGroup.get('enablePointLabelBackground').valueChanges)
     .subscribe(() => {
       this.updateValidators();
     });
@@ -144,11 +147,22 @@ export class TimeSeriesChartLineSettingsComponent implements OnInit, ControlValu
   }
 
   private updateValidators() {
+    const state = this.chartType === TimeSeriesChartType.state;
     const showLine: boolean = this.lineSettingsFormGroup.get('showLine').value;
     const step: boolean = this.lineSettingsFormGroup.get('step').value;
     const showPointLabel: boolean = this.lineSettingsFormGroup.get('showPointLabel').value;
+    const enablePointLabelBackground: boolean = this.lineSettingsFormGroup.get('enablePointLabelBackground').value;
+    if (state) {
+      this.lineSettingsFormGroup.get('showLine').disable({emitEvent: false});
+    } else {
+      this.lineSettingsFormGroup.get('showLine').enable({emitEvent: false});
+    }
     if (showLine) {
-      this.lineSettingsFormGroup.get('step').enable({emitEvent: false});
+      if (state) {
+        this.lineSettingsFormGroup.get('step').disable({emitEvent: false});
+      } else {
+        this.lineSettingsFormGroup.get('step').enable({emitEvent: false});
+      }
       if (step) {
         this.lineSettingsFormGroup.get('stepType').enable({emitEvent: false});
         this.lineSettingsFormGroup.get('smooth').disable({emitEvent: false});
@@ -169,10 +183,18 @@ export class TimeSeriesChartLineSettingsComponent implements OnInit, ControlValu
       this.lineSettingsFormGroup.get('pointLabelPosition').enable({emitEvent: false});
       this.lineSettingsFormGroup.get('pointLabelFont').enable({emitEvent: false});
       this.lineSettingsFormGroup.get('pointLabelColor').enable({emitEvent: false});
+      this.lineSettingsFormGroup.get('enablePointLabelBackground').enable({emitEvent: false});
+      if (enablePointLabelBackground) {
+        this.lineSettingsFormGroup.get('pointLabelBackground').enable({emitEvent: false});
+      } else {
+        this.lineSettingsFormGroup.get('pointLabelBackground').disable({emitEvent: false});
+      }
     } else {
       this.lineSettingsFormGroup.get('pointLabelPosition').disable({emitEvent: false});
       this.lineSettingsFormGroup.get('pointLabelFont').disable({emitEvent: false});
       this.lineSettingsFormGroup.get('pointLabelColor').disable({emitEvent: false});
+      this.lineSettingsFormGroup.get('enablePointLabelBackground').disable({emitEvent: false});
+      this.lineSettingsFormGroup.get('pointLabelBackground').disable({emitEvent: false});
     }
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html
index fbd960be18..6bf8abdb70 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html
@@ -16,6 +16,50 @@
 
 -->
 <ng-container [formGroup]="timeSeriesChartWidgetSettingsForm">
+  <div class="tb-form-panel">
+    <div class="tb-form-row no-border no-padding column-xs">
+      <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="comparisonEnabled">
+        {{ 'widgets.time-series-chart.comparison.comparison' | translate }}
+      </mat-slide-toggle>
+      <div fxFlex fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
+          <mat-select formControlName="timeForComparison">
+            <mat-option [value]="'previousInterval'">
+              {{ 'widgets.chart.time-for-comparison-previous-interval' | translate }}
+            </mat-option>
+            <mat-option [value]="'days'">
+              {{ 'widgets.chart.time-for-comparison-days' | translate }}
+            </mat-option>
+            <mat-option [value]="'weeks'">
+              {{ 'widgets.chart.time-for-comparison-weeks' | translate }}
+            </mat-option>
+            <mat-option [value]="'months'">
+              {{ 'widgets.chart.time-for-comparison-months' | translate }}
+            </mat-option>
+            <mat-option [value]="'years'">
+              {{ 'widgets.chart.time-for-comparison-years' | translate }}
+            </mat-option>
+            <mat-option [value]="'customInterval'">
+              {{ 'widgets.chart.time-for-comparison-custom-interval' | translate }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
+        <mat-form-field [fxShow]="timeSeriesChartWidgetSettingsForm.get('timeForComparison').value === 'customInterval'"
+                        appearance="outline" class="number flex-lt-md" subscriptSizing="dynamic">
+          <input matInput formControlName="comparisonCustomIntervalValue" type="number" min="0" placeholder="{{ 'widget-config.set' | translate }}">
+        </mat-form-field>
+        <tb-time-series-chart-axis-settings-button
+          axisType="xAxis"
+          panelTitle="{{ 'widgets.time-series-chart.axis.comparison-x-axis-settings' | translate }}"
+          formControlName="comparisonXAxis">
+        </tb-time-series-chart-axis-settings-button>
+      </div>
+    </div>
+  </div>
+  <tb-time-series-chart-states-panel
+      *ngIf="chartType === TimeSeriesChartType.state"
+      formControlName="states">
+  </tb-time-series-chart-states-panel>
   <tb-time-series-chart-y-axes-panel
     formControlName="yAxes"
     (axisRemoved)="yAxisRemoved($event)"
@@ -36,6 +80,9 @@
         {{ 'widgets.time-series-chart.data-zoom' | translate }}
       </mat-slide-toggle>
     </div>
+    <tb-time-series-chart-grid-settings
+        formControlName="grid">
+    </tb-time-series-chart-grid-settings>
     <div class="tb-form-row">
       <mat-slide-toggle class="mat-slide" formControlName="stack">
         <div tb-hint-tooltip-icon="{{'widgets.time-series-chart.stack-mode-hint' | translate}}">
@@ -71,6 +118,7 @@
             <div>{{ 'legend.label' | translate }}</div>
             <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
               <tb-font-settings formControlName="legendLabelFont"
+                                [initialPreviewStyle]="{color: timeSeriesChartWidgetSettingsForm.get('legendLabelColor').value}"
                                 previewText="Temperature">
               </tb-font-settings>
               <tb-color-input asBoxInput
@@ -79,6 +127,32 @@
               </tb-color-input>
             </div>
           </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'legend.value' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-font-settings formControlName="legendValueFont"
+                                [initialPreviewStyle]="{color: timeSeriesChartWidgetSettingsForm.get('legendValueColor').value}"
+                                previewText="22 °C">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="legendValueColor">
+              </tb-color-input>
+            </div>
+          </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'legend.column-title' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-font-settings formControlName="legendColumnTitleFont"
+                                [initialPreviewStyle]="{color: timeSeriesChartWidgetSettingsForm.get('legendColumnTitleColor').value}"
+                                previewText="{{ 'legend.Avg' | translate }}">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="legendColumnTitleColor">
+              </tb-color-input>
+            </div>
+          </div>
           <tb-legend-config hideDirection
                             formControlName="legendConfig">
           </tb-legend-config>
@@ -106,10 +180,24 @@
                                [value]="EChartsTooltipTrigger.axis">{{ 'tooltip.trigger-axis' | translate }}</mat-chip-option>
             </mat-chip-listbox>
           </div>
+          <div class="tb-form-row space-between">
+            <div>{{ 'tooltip.label' | translate }}</div>
+            <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+              <tb-font-settings formControlName="tooltipLabelFont"
+                                [initialPreviewStyle]="{ color: timeSeriesChartWidgetSettingsForm.get('tooltipLabelColor').value }"
+                                previewText="Temperature">
+              </tb-font-settings>
+              <tb-color-input asBoxInput
+                              colorClearButton
+                              formControlName="tooltipLabelColor">
+              </tb-color-input>
+            </div>
+          </div>
           <div class="tb-form-row space-between">
             <div>{{ 'tooltip.value' | translate }}</div>
             <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
               <tb-font-settings formControlName="tooltipValueFont"
+                                [initialPreviewStyle]="{ color: timeSeriesChartWidgetSettingsForm.get('tooltipValueColor').value }"
                                 [previewText]="tooltipValuePreviewFn">
               </tb-font-settings>
               <tb-color-input asBoxInput
@@ -118,6 +206,13 @@
               </tb-color-input>
             </div>
           </div>
+          <tb-js-func
+              formControlName="tooltipValueFormatter"
+              [globalVariables]="functionScopeVariables"
+              [functionArgs]="['value', 'latestData']"
+              functionTitle="{{ 'widgets.chart.tooltip-value-format-function' | translate }}"
+              helpId="widget/lib/flot/tooltip_value_format_fn">
+          </tb-js-func>
           <div class="tb-form-row column-xs">
             <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="tooltipShowDate">
               {{ 'tooltip.date' | translate }}
@@ -126,6 +221,7 @@
               <tb-date-format-select fxFlex excludeLastUpdateAgo includeAuto
                                      formControlName="tooltipDateFormat"></tb-date-format-select>
               <tb-font-settings formControlName="tooltipDateFont"
+                                [initialPreviewStyle]="{ color: timeSeriesChartWidgetSettingsForm.get('tooltipDateColor').value }"
                                 [previewText]="tooltipDatePreviewFn">
               </tb-font-settings>
               <tb-color-input asBoxInput
@@ -158,9 +254,9 @@
         </ng-template>
       </mat-expansion-panel>
     </div>
-    <tb-time-series-chart-animation-settings
+    <tb-echarts-animation-settings
       formControlName="animation">
-    </tb-time-series-chart-animation-settings>
+    </tb-echarts-animation-settings>
     <div class="tb-form-panel">
       <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
       <div class="tb-form-row space-between">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.ts
index 6edab7ecf2..8ea641d299 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.ts
@@ -23,7 +23,7 @@ import {
   WidgetSettings,
   WidgetSettingsComponent
 } from '@shared/models/widget.models';
-import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { formatValue, isDefinedAndNotNull, mergeDeep } from '@core/utils';
@@ -35,10 +35,12 @@ import {
 } from '@home/components/widget/lib/chart/time-series-chart-widget.models';
 import {
   TimeSeriesChartKeySettings,
-  TimeSeriesChartType, TimeSeriesChartYAxes,
+  TimeSeriesChartType,
+  TimeSeriesChartYAxes,
   TimeSeriesChartYAxisId
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { WidgetConfigComponentData } from '@home/models/widget-component.models';
+import { WidgetService } from '@core/http/widget.service';
 
 @Component({
   selector: 'tb-time-series-chart-widget-settings',
@@ -77,8 +79,11 @@ export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsCompon
 
   chartType: TimeSeriesChartType = TimeSeriesChartType.default;
 
+  functionScopeVariables = this.widgetService.getWidgetScopeVariables();
+
   constructor(protected store: Store<AppState>,
               private $injector: Injector,
+              private widgetService: WidgetService,
               private fb: UntypedFormBuilder) {
     super(store);
   }
@@ -104,31 +109,45 @@ export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsCompon
   }
 
   protected defaultSettings(): WidgetSettings {
-    return mergeDeep({} as TimeSeriesChartWidgetSettings, timeSeriesChartWidgetDefaultSettings);
+    return mergeDeep<TimeSeriesChartWidgetSettings>({} as TimeSeriesChartWidgetSettings, timeSeriesChartWidgetDefaultSettings);
   }
 
   protected onSettingsSet(settings: WidgetSettings) {
     this.timeSeriesChartWidgetSettingsForm = this.fb.group({
 
+      comparisonEnabled: [settings.comparisonEnabled, []],
+      timeForComparison: [settings.timeForComparison, []],
+      comparisonCustomIntervalValue: [settings.comparisonCustomIntervalValue, [Validators.min(0)]],
+      comparisonXAxis: [settings.comparisonXAxis, []],
+
       yAxes: [settings.yAxes, []],
       thresholds: [settings.thresholds, []],
 
       dataZoom: [settings.dataZoom, []],
       stack: [settings.stack, []],
 
+      grid: [settings.grid, []],
+
       xAxis: [settings.xAxis, []],
 
       noAggregationBarWidthSettings: [settings.noAggregationBarWidthSettings, []],
 
       showLegend: [settings.showLegend, []],
+      legendColumnTitleFont: [settings.legendColumnTitleFont, []],
+      legendColumnTitleColor: [settings.legendColumnTitleColor, []],
       legendLabelFont: [settings.legendLabelFont, []],
       legendLabelColor: [settings.legendLabelColor, []],
+      legendValueFont: [settings.legendValueFont, []],
+      legendValueColor: [settings.legendValueColor, []],
       legendConfig: [settings.legendConfig, []],
 
       showTooltip: [settings.showTooltip, []],
       tooltipTrigger: [settings.tooltipTrigger, []],
+      tooltipLabelFont: [settings.tooltipLabelFont, []],
+      tooltipLabelColor: [settings.tooltipLabelColor, []],
       tooltipValueFont: [settings.tooltipValueFont, []],
       tooltipValueColor: [settings.tooltipValueColor, []],
+      tooltipValueFormatter: [settings.tooltipValueFormatter, []],
       tooltipShowDate: [settings.tooltipShowDate, []],
       tooltipDateFormat: [settings.tooltipDateFormat, []],
       tooltipDateFont: [settings.tooltipDateFont, []],
@@ -143,31 +162,56 @@ export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsCompon
       background: [settings.background, []],
       padding: [settings.padding, []]
     });
+    if (this.chartType === TimeSeriesChartType.state) {
+      this.timeSeriesChartWidgetSettingsForm.addControl('states', this.fb.control(settings.states, []));
+    }
   }
 
   protected validatorTriggers(): string[] {
-    return ['showLegend', 'showTooltip', 'tooltipShowDate'];
+    return ['comparisonEnabled', 'showLegend', 'showTooltip', 'tooltipShowDate'];
   }
 
   protected updateValidators(emitEvent: boolean) {
+    const comparisonEnabled: boolean = this.timeSeriesChartWidgetSettingsForm.get('comparisonEnabled').value;
     const showLegend: boolean = this.timeSeriesChartWidgetSettingsForm.get('showLegend').value;
     const showTooltip: boolean = this.timeSeriesChartWidgetSettingsForm.get('showTooltip').value;
     const tooltipShowDate: boolean = this.timeSeriesChartWidgetSettingsForm.get('tooltipShowDate').value;
 
+    if (comparisonEnabled) {
+      this.timeSeriesChartWidgetSettingsForm.get('timeForComparison').enable();
+      this.timeSeriesChartWidgetSettingsForm.get('comparisonCustomIntervalValue').enable();
+      this.timeSeriesChartWidgetSettingsForm.get('comparisonXAxis').enable();
+    } else {
+      this.timeSeriesChartWidgetSettingsForm.get('timeForComparison').disable();
+      this.timeSeriesChartWidgetSettingsForm.get('comparisonCustomIntervalValue').disable();
+      this.timeSeriesChartWidgetSettingsForm.get('comparisonXAxis').disable();
+    }
+
     if (showLegend) {
+      this.timeSeriesChartWidgetSettingsForm.get('legendColumnTitleFont').enable();
+      this.timeSeriesChartWidgetSettingsForm.get('legendColumnTitleColor').enable();
       this.timeSeriesChartWidgetSettingsForm.get('legendLabelFont').enable();
       this.timeSeriesChartWidgetSettingsForm.get('legendLabelColor').enable();
+      this.timeSeriesChartWidgetSettingsForm.get('legendValueFont').enable();
+      this.timeSeriesChartWidgetSettingsForm.get('legendValueColor').enable();
       this.timeSeriesChartWidgetSettingsForm.get('legendConfig').enable();
     } else {
+      this.timeSeriesChartWidgetSettingsForm.get('legendColumnTitleFont').disable();
+      this.timeSeriesChartWidgetSettingsForm.get('legendColumnTitleColor').disable();
       this.timeSeriesChartWidgetSettingsForm.get('legendLabelFont').disable();
       this.timeSeriesChartWidgetSettingsForm.get('legendLabelColor').disable();
+      this.timeSeriesChartWidgetSettingsForm.get('legendValueFont').disable();
+      this.timeSeriesChartWidgetSettingsForm.get('legendValueColor').disable();
       this.timeSeriesChartWidgetSettingsForm.get('legendConfig').disable();
     }
 
     if (showTooltip) {
       this.timeSeriesChartWidgetSettingsForm.get('tooltipTrigger').enable();
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipLabelFont').enable();
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipLabelColor').enable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipValueFont').enable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipValueColor').enable();
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipValueFormatter').enable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipShowDate').enable({emitEvent: false});
       this.timeSeriesChartWidgetSettingsForm.get('tooltipBackgroundColor').enable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipBackgroundBlur').enable();
@@ -183,8 +227,12 @@ export class TimeSeriesChartWidgetSettingsComponent extends WidgetSettingsCompon
         this.timeSeriesChartWidgetSettingsForm.get('tooltipDateInterval').disable();
       }
     } else {
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipTrigger').disable();
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipLabelFont').disable();
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipLabelColor').disable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipValueFont').disable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipValueColor').disable();
+      this.timeSeriesChartWidgetSettingsForm.get('tooltipValueFormatter').disable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipShowDate').disable({emitEvent: false});
       this.timeSeriesChartWidgetSettingsForm.get('tooltipDateFormat').disable();
       this.timeSeriesChartWidgetSettingsForm.get('tooltipDateFont').disable();
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-animation-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/echarts-animation-settings.component.html
similarity index 80%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-animation-settings.component.html
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/echarts-animation-settings.component.html
index 5e0ad8e2ec..53246d2cfc 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-animation-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/echarts-animation-settings.component.html
@@ -23,61 +23,61 @@
         <mat-panel-title>
           <mat-slide-toggle class="mat-slide" formControlName="animation" (click)="$event.stopPropagation()"
                             fxLayoutAlign="center">
-            {{ 'widgets.time-series-chart.animation.animation' | translate }}
+            {{ 'widgets.echarts.animation.animation' | translate }}
           </mat-slide-toggle>
         </mat-panel-title>
       </mat-expansion-panel-header>
       <ng-template matExpansionPanelContent>
         <div class="tb-form-row space-between column-xs">
-          <div>{{ 'widgets.time-series-chart.animation.animation-threshold' | translate }}</div>
+          <div>{{ 'widgets.echarts.animation.animation-threshold' | translate }}</div>
           <mat-form-field appearance="outline" class="medium-width number" subscriptSizing="dynamic">
             <input matInput formControlName="animationThreshold" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
             <div matSuffix>ms</div>
           </mat-form-field>
         </div>
         <div class="tb-form-row space-between column-xs">
-          <div>{{ 'widgets.time-series-chart.animation.animation-duration' | translate }}</div>
+          <div>{{ 'widgets.echarts.animation.animation-duration' | translate }}</div>
           <mat-form-field appearance="outline" class="medium-width number" subscriptSizing="dynamic">
             <input matInput formControlName="animationDuration" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
             <div matSuffix>ms</div>
           </mat-form-field>
         </div>
         <div class="tb-form-row space-between column-xs">
-          <div translate>widgets.time-series-chart.animation.animation-easing</div>
+          <div translate>widgets.echarts.animation.animation-easing</div>
           <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
             <mat-select formControlName="animationEasing">
-              <mat-option *ngFor="let easing of timeSeriesChartAnimationEasings" [value]="easing">
+              <mat-option *ngFor="let easing of echartsAnimationEasings" [value]="easing">
                 {{ easing }}
               </mat-option>
             </mat-select>
           </mat-form-field>
         </div>
         <div class="tb-form-row space-between column-xs">
-          <div>{{ 'widgets.time-series-chart.animation.animation-delay' | translate }}</div>
+          <div>{{ 'widgets.echarts.animation.animation-delay' | translate }}</div>
           <mat-form-field appearance="outline" class="medium-width number" subscriptSizing="dynamic">
             <input matInput formControlName="animationDelay" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
             <div matSuffix>ms</div>
           </mat-form-field>
         </div>
         <div class="tb-form-row space-between column-xs">
-          <div>{{ 'widgets.time-series-chart.animation.update-animation-duration' | translate }}</div>
+          <div>{{ 'widgets.echarts.animation.update-animation-duration' | translate }}</div>
           <mat-form-field appearance="outline" class="medium-width number" subscriptSizing="dynamic">
             <input matInput formControlName="animationDurationUpdate" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
             <div matSuffix>ms</div>
           </mat-form-field>
         </div>
         <div class="tb-form-row space-between column-xs">
-          <div translate>widgets.time-series-chart.animation.update-animation-easing</div>
+          <div translate>widgets.echarts.animation.update-animation-easing</div>
           <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
             <mat-select formControlName="animationEasingUpdate">
-              <mat-option *ngFor="let easing of timeSeriesChartAnimationEasings" [value]="easing">
+              <mat-option *ngFor="let easing of echartsAnimationEasings" [value]="easing">
                 {{ easing }}
               </mat-option>
             </mat-select>
           </mat-form-field>
         </div>
         <div class="tb-form-row space-between column-xs">
-          <div>{{ 'widgets.time-series-chart.animation.update-animation-delay' | translate }}</div>
+          <div>{{ 'widgets.echarts.animation.update-animation-delay' | translate }}</div>
           <mat-form-field appearance="outline" class="medium-width number" subscriptSizing="dynamic">
             <input matInput formControlName="animationDelayUpdate" type="number" min="0" step="1" placeholder="{{ 'widget-config.set' | translate }}">
             <div matSuffix>ms</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-animation-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/echarts-animation-settings.component.ts
similarity index 83%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-animation-settings.component.ts
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/echarts-animation-settings.component.ts
index 5da5aa2fe9..b3a10c6298 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-animation-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/echarts-animation-settings.component.ts
@@ -22,34 +22,34 @@ import {
   UntypedFormGroup,
   Validators
 } from '@angular/forms';
-import {
-  timeSeriesChartAnimationEasings,
-  TimeSeriesChartAnimationSettings
-} from '@home/components/widget/lib/chart/time-series-chart.models';
 import { WidgetService } from '@core/http/widget.service';
+import {
+  echartsAnimationEasings,
+  EChartsAnimationSettings
+} from '@home/components/widget/lib/chart/echarts-widget.models';
 
 @Component({
-  selector: 'tb-time-series-chart-animation-settings',
-  templateUrl: './time-series-chart-animation-settings.component.html',
+  selector: 'tb-echarts-animation-settings',
+  templateUrl: './echarts-animation-settings.component.html',
   styleUrls: ['./../../widget-settings.scss'],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
-      useExisting: forwardRef(() => TimeSeriesChartAnimationSettingsComponent),
+      useExisting: forwardRef(() => EchartsAnimationSettingsComponent),
       multi: true
     }
   ]
 })
-export class TimeSeriesChartAnimationSettingsComponent implements OnInit, ControlValueAccessor {
+export class EchartsAnimationSettingsComponent implements OnInit, ControlValueAccessor {
 
   settingsExpanded = false;
 
-  timeSeriesChartAnimationEasings = timeSeriesChartAnimationEasings;
+  echartsAnimationEasings = echartsAnimationEasings;
 
   @Input()
   disabled: boolean;
 
-  private modelValue: TimeSeriesChartAnimationSettings;
+  private modelValue: EChartsAnimationSettings;
 
   private propagateChange = null;
 
@@ -96,7 +96,7 @@ export class TimeSeriesChartAnimationSettingsComponent implements OnInit, Contro
     }
   }
 
-  writeValue(value: TimeSeriesChartAnimationSettings): void {
+  writeValue(value: EChartsAnimationSettings): void {
     this.modelValue = value;
     this.animationSettingsFormGroup.patchValue(
       value, {emitEvent: false}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-button.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-button.component.html
new file mode 100644
index 0000000000..cd7a26441a
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-button.component.html
@@ -0,0 +1,28 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<button type="button"
+        mat-stroked-button
+        color="primary"
+        [disabled]="disabled"
+        #matButton
+        (click)="openAxisSettingsPopup($event, matButton)"
+        matTooltip="{{ panelTitle }}"
+        matTooltipPosition="above">
+  {{ (axisType === 'xAxis' ? 'widgets.time-series-chart.axis.x-axis' : 'widgets.time-series-chart.axis.y-axis') | translate }}
+  <tb-icon matButtonIcon>settings</tb-icon>
+</button>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-button.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-button.component.ts
new file mode 100644
index 0000000000..7072d7051f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-button.component.ts
@@ -0,0 +1,108 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, forwardRef, Input, OnInit, Renderer2, ViewContainerRef } from '@angular/core';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { MatButton } from '@angular/material/button';
+import { TbPopoverService } from '@shared/components/popover.service';
+import { coerceBoolean } from '@shared/decorators/coercion';
+import { TimeSeriesChartAxisSettings } from '@home/components/widget/lib/chart/time-series-chart.models';
+import {
+  TimeSeriesChartAxisSettingsPanelComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component';
+
+@Component({
+  selector: 'tb-time-series-chart-axis-settings-button',
+  templateUrl: './time-series-chart-axis-settings-button.component.html',
+  styleUrls: [],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartAxisSettingsButtonComponent),
+      multi: true
+    }
+  ]
+})
+export class TimeSeriesChartAxisSettingsButtonComponent implements OnInit, ControlValueAccessor {
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  axisType: 'xAxis' | 'yAxis' = 'xAxis';
+
+  @Input()
+  panelTitle: string;
+
+  @Input()
+  @coerceBoolean()
+  advanced = false;
+
+  private modelValue: TimeSeriesChartAxisSettings;
+
+  private propagateChange = null;
+
+  constructor(private popoverService: TbPopoverService,
+              private renderer: Renderer2,
+              private viewContainerRef: ViewContainerRef) {}
+
+  ngOnInit(): void {
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+  }
+
+  writeValue(value: TimeSeriesChartAxisSettings): void {
+    this.modelValue = value;
+  }
+
+  openAxisSettingsPopup($event: Event, matButton: MatButton) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    const trigger = matButton._elementRef.nativeElement;
+    if (this.popoverService.hasPopover(trigger)) {
+      this.popoverService.hidePopover(trigger);
+    } else {
+      const ctx: any = {
+        axisSettings: this.modelValue,
+        axisType: this.axisType,
+        panelTitle: this.panelTitle,
+        advanced: this.advanced
+      };
+      const axisSettingsPanelPopover = this.popoverService.displayPopover(trigger, this.renderer,
+        this.viewContainerRef, TimeSeriesChartAxisSettingsPanelComponent, ['leftOnly', 'leftTopOnly', 'leftBottomOnly'], true, null,
+        ctx,
+        {},
+        {}, {}, true);
+      axisSettingsPanelPopover.tbComponentRef.instance.popover = axisSettingsPanelPopover;
+      axisSettingsPanelPopover.tbComponentRef.instance.axisSettingsApplied.subscribe((axisSettings) => {
+        axisSettingsPanelPopover.hide();
+        this.modelValue = axisSettings;
+        this.propagateChange(this.modelValue);
+      });
+    }
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component.html
similarity index 69%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-settings-panel.component.html
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component.html
index 759074b4be..dbc74d9ed1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-settings-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component.html
@@ -15,17 +15,17 @@
     limitations under the License.
 
 -->
-<div class="tb-y-axis-settings-panel" [formGroup]="yAxisSettingsFormGroup">
-  <div class="tb-y-axis-settings-title">{{ 'widgets.time-series-chart.axis.y-axis-settings' | translate }}</div>
-  <div class="tb-y-axis-settings-panel-content">
+<div class="tb-axis-settings-panel" [formGroup]="axisSettingsFormGroup">
+  <div class="tb-axis-settings-title">{{ panelTitle }}</div>
+  <div class="tb-axis-settings-panel-content">
     <tb-time-series-chart-axis-settings
-      formControlName="yAxis"
+      formControlName="axis"
       alwaysExpanded
       [advanced]="advanced"
-      axisType="yAxis">
+      [axisType]="axisType">
     </tb-time-series-chart-axis-settings>
   </div>
-  <div class="tb-y-axis-settings-panel-buttons">
+  <div class="tb-axis-settings-panel-buttons">
     <button mat-button
             color="primary"
             type="button"
@@ -35,8 +35,8 @@
     <button mat-raised-button
             color="primary"
             type="button"
-            (click)="applyYAxisSettings()"
-            [disabled]="yAxisSettingsFormGroup.invalid || !yAxisSettingsFormGroup.dirty">
+            (click)="applyAxisSettings()"
+            [disabled]="axisSettingsFormGroup.invalid || !axisSettingsFormGroup.dirty">
       {{ 'action.apply' | translate }}
     </button>
   </div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-settings-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component.scss
similarity index 89%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-settings-panel.component.scss
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component.scss
index 095c38b7f7..853057c24e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-settings-panel.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component.scss
@@ -15,7 +15,7 @@
  */
 @import '../../../../../../../../../scss/constants';
 
-.tb-y-axis-settings-panel {
+.tb-axis-settings-panel {
   width: 530px;
   display: flex;
   flex-direction: column;
@@ -23,7 +23,7 @@
   @media #{$mat-lt-md} {
     width: 90vw;
   }
-  .tb-y-axis-settings-panel-content {
+  .tb-axis-settings-panel-content {
     display: flex;
     flex-direction: column;
     gap: 16px;
@@ -31,14 +31,14 @@
     margin: -10px;
     padding: 10px;
   }
-  .tb-y-axis-settings-title {
+  .tb-axis-settings-title {
     font-size: 16px;
     font-weight: 500;
     line-height: 24px;
     letter-spacing: 0.25px;
     color: rgba(0, 0, 0, 0.87);
   }
-  .tb-y-axis-settings-panel-buttons {
+  .tb-axis-settings-panel-buttons {
     height: 40px;
     display: flex;
     flex-direction: row;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-settings-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component.ts
similarity index 56%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-settings-panel.component.ts
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component.ts
index 8046aafd29..ebfbcf84a1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-settings-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component.ts
@@ -17,40 +17,49 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
 import { TbPopoverComponent } from '@shared/components/popover.component';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
-import { TimeSeriesChartYAxisSettings } from '@home/components/widget/lib/chart/time-series-chart.models';
+import {
+  TimeSeriesChartAxisSettings,
+  TimeSeriesChartYAxisSettings
+} from '@home/components/widget/lib/chart/time-series-chart.models';
 import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
-  selector: 'tb-time-series-chart-y-axis-settings-panel',
-  templateUrl: './time-series-chart-y-axis-settings-panel.component.html',
+  selector: 'tb-time-series-chart-axis-settings-panel',
+  templateUrl: './time-series-chart-axis-settings-panel.component.html',
   providers: [],
-  styleUrls: ['./time-series-chart-y-axis-settings-panel.component.scss'],
+  styleUrls: ['./time-series-chart-axis-settings-panel.component.scss'],
   encapsulation: ViewEncapsulation.None
 })
-export class TimeSeriesChartYAxisSettingsPanelComponent implements OnInit {
+export class TimeSeriesChartAxisSettingsPanelComponent implements OnInit {
 
   @Input()
-  yAxisSettings: TimeSeriesChartYAxisSettings;
+  axisType: 'xAxis' | 'yAxis' = 'xAxis';
+
+  @Input()
+  panelTitle: string;
+
+  @Input()
+  axisSettings: TimeSeriesChartAxisSettings;
 
   @Input()
   @coerceBoolean()
   advanced = false;
 
   @Input()
-  popover: TbPopoverComponent<TimeSeriesChartYAxisSettingsPanelComponent>;
+  popover: TbPopoverComponent<TimeSeriesChartAxisSettingsPanelComponent>;
 
   @Output()
-  yAxisSettingsApplied = new EventEmitter<TimeSeriesChartYAxisSettings>();
+  axisSettingsApplied = new EventEmitter<TimeSeriesChartAxisSettings>();
 
-  yAxisSettingsFormGroup: UntypedFormGroup;
+  axisSettingsFormGroup: UntypedFormGroup;
 
   constructor(private fb: UntypedFormBuilder) {
   }
 
   ngOnInit(): void {
-    this.yAxisSettingsFormGroup = this.fb.group(
+    this.axisSettingsFormGroup = this.fb.group(
       {
-        yAxis: [this.yAxisSettings, []]
+        axis: [this.axisSettings, []]
       }
     );
   }
@@ -59,8 +68,8 @@ export class TimeSeriesChartYAxisSettingsPanelComponent implements OnInit {
     this.popover?.hide();
   }
 
-  applyYAxisSettings() {
-    const yAxisSettings = this.yAxisSettingsFormGroup.get('yAxis').getRawValue();
-    this.yAxisSettingsApplied.emit(yAxisSettings);
+  applyAxisSettings() {
+    const axisSettings = this.axisSettingsFormGroup.get('axis').getRawValue();
+    this.axisSettingsApplied.emit(axisSettings);
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.html
index 1d4bb95f5c..cd240ba8e4 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.html
@@ -56,18 +56,27 @@
             </mat-select>
           </mat-form-field>
         </div>
-        <div *ngIf="axisType === 'yAxis'" class="tb-form-row space-between">
+        <div *ngIf="axisType === 'yAxis' && !hideUnits" class="tb-form-row space-between">
           <div translate>widget-config.units-short</div>
           <tb-unit-input
             formControlName="units">
           </tb-unit-input>
         </div>
-        <div *ngIf="axisType === 'yAxis'" class="tb-form-row space-between">
+        <div *ngIf="axisType === 'yAxis' && !hideDecimals" class="tb-form-row space-between">
           <div translate>widget-config.decimals-short</div>
           <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
             <input matInput formControlName="decimals" type="number" min="0" max="15" step="1" placeholder="{{ 'widget-config.set' | translate }}">
           </mat-form-field>
         </div>
+        <div *ngIf="axisType === 'yAxis' && advanced" class="tb-form-row">
+          <tb-js-func fxFlex
+                      formControlName="ticksGenerator"
+                      [globalVariables]="functionScopeVariables"
+                      [functionArgs]="['extent']"
+                      functionTitle="{{ 'widgets.time-series-chart.axis.ticks-generator-function' | translate }}"
+                      helpId="widget/lib/chart/ticks_generator_fn">
+          </tb-js-func>
+        </div>
         <div class="tb-form-panel no-padding stroked">
           <div class="tb-form-row no-border space-between column-xs">
             <mat-slide-toggle class="mat-slide" formControlName="showTickLabels">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.ts
index 8dafc7050f..91fe61caa3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings.component.ts
@@ -70,6 +70,14 @@ export class TimeSeriesChartAxisSettingsComponent implements OnInit, ControlValu
   @coerceBoolean()
   advanced = false;
 
+  @Input()
+  @coerceBoolean()
+  hideUnits = false;
+
+  @Input()
+  @coerceBoolean()
+  hideDecimals = false;
+
   private modelValue: TimeSeriesChartXAxisSettings | TimeSeriesChartYAxisSettings;
 
   private propagateChange = null;
@@ -77,7 +85,7 @@ export class TimeSeriesChartAxisSettingsComponent implements OnInit, ControlValu
   public axisSettingsFormGroup: UntypedFormGroup;
 
   constructor(private fb: UntypedFormBuilder,
-              private widgetService: WidgetService,) {
+              private widgetService: WidgetService) {
   }
 
   ngOnInit(): void {
@@ -105,6 +113,7 @@ export class TimeSeriesChartAxisSettingsComponent implements OnInit, ControlValu
       this.axisSettingsFormGroup.addControl('units', this.fb.control(null, []));
       this.axisSettingsFormGroup.addControl('decimals', this.fb.control(null, [Validators.min(0)]));
       this.axisSettingsFormGroup.addControl('ticksFormatter', this.fb.control(null, []));
+      this.axisSettingsFormGroup.addControl('ticksGenerator', this.fb.control(null, []));
       this.axisSettingsFormGroup.addControl('interval', this.fb.control(null, [Validators.min(0)]));
       this.axisSettingsFormGroup.addControl('splitNumber', this.fb.control(null, [Validators.min(1)]));
       this.axisSettingsFormGroup.addControl('min', this.fb.control(null, []));
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-fill-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component.html
similarity index 96%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-fill-settings.component.html
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component.html
index 934f985483..99e3c1be8f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-fill-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component.html
@@ -27,8 +27,8 @@
       <div class="tb-form-row space-between column-xs">
         <div translate>widgets.time-series-chart.series.opacity</div>
         <mat-form-field class="medium-width number" appearance="outline" subscriptSizing="dynamic">
-          <input matInput type="number" formControlName="opacity" min="0" max="100"
-                 step="1" placeholder="{{ 'widget-config.set' | translate }}"/>
+          <input matInput type="number" formControlName="opacity" min="0" max="1"
+                 step="0.1" placeholder="{{ 'widget-config.set' | translate }}"/>
         </mat-form-field>
       </div>
     </ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-fill-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component.ts
similarity index 97%
rename from ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-fill-settings.component.ts
rename to ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component.ts
index 44cc870f5b..dd7f4dd7f6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-fill-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component.ts
@@ -34,7 +34,7 @@ import { AppState } from '@core/core.state';
 @Component({
   selector: 'tb-time-series-chart-fill-settings',
   templateUrl: './time-series-chart-fill-settings.component.html',
-  styleUrls: ['./../widget-settings.scss'],
+  styleUrls: ['./../../widget-settings.scss'],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
@@ -73,7 +73,7 @@ export class TimeSeriesChartFillSettingsComponent implements OnInit, ControlValu
   ngOnInit(): void {
     this.fillSettingsFormGroup = this.fb.group({
       type: [null, []],
-      opacity: [null, [Validators.min(0), Validators.max(100)]],
+      opacity: [null, [Validators.min(0), Validators.max(1)]],
       gradient: this.fb.group({
         start: [null, [Validators.min(0), Validators.max(100)]],
         end: [null, [Validators.min(0), Validators.max(100)]]
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-grid-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-grid-settings.component.html
new file mode 100644
index 0000000000..1b439e5bea
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-grid-settings.component.html
@@ -0,0 +1,54 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<ng-container [formGroup]="gridSettingsFormGroup">
+  <div class="tb-form-panel stroked tb-slide-toggle">
+    <mat-expansion-panel class="tb-settings" [(expanded)]="settingsExpanded"
+                         [disabled]="!gridSettingsFormGroup.get('show').value">
+      <mat-expansion-panel-header fxLayout="row wrap">
+        <mat-panel-title>
+          <mat-slide-toggle class="mat-slide" formControlName="show" (click)="$event.stopPropagation()"
+                            fxLayoutAlign="center">
+            {{ 'widgets.time-series-chart.grid.grid' | translate }}
+          </mat-slide-toggle>
+        </mat-panel-title>
+      </mat-expansion-panel-header>
+      <ng-template matExpansionPanelContent>
+        <div class="tb-form-row space-between">
+          <div>{{ 'widgets.time-series-chart.grid.background-color' | translate }}</div>
+          <tb-color-input asBoxInput
+                          colorClearButton
+                          formControlName="backgroundColor">
+          </tb-color-input>
+        </div>
+        <div class="tb-form-row space-between">
+          <div>{{ 'widgets.time-series-chart.grid.border' | translate }}</div>
+          <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+            <mat-form-field appearance="outline" class="number" subscriptSizing="dynamic">
+              <input matInput formControlName="borderWidth" type="number" min="0" placeholder="{{ 'widget-config.set' | translate }}">
+              <span matSuffix>px</span>
+            </mat-form-field>
+            <tb-color-input asBoxInput
+                            colorClearButton
+                            formControlName="borderColor">
+            </tb-color-input>
+          </div>
+        </div>
+      </ng-template>
+    </mat-expansion-panel>
+  </div>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-grid-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-grid-settings.component.ts
new file mode 100644
index 0000000000..fd88ce2a8f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-grid-settings.component.ts
@@ -0,0 +1,115 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, forwardRef, Input, OnInit } from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators
+} from '@angular/forms';
+import { TimeSeriesChartGridSettings } from '@home/components/widget/lib/chart/time-series-chart.models';
+import { WidgetService } from '@core/http/widget.service';
+
+@Component({
+  selector: 'tb-time-series-chart-grid-settings',
+  templateUrl: './time-series-chart-grid-settings.component.html',
+  styleUrls: ['./../../widget-settings.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartGridSettingsComponent),
+      multi: true
+    }
+  ]
+})
+export class TimeSeriesChartGridSettingsComponent implements OnInit, ControlValueAccessor {
+
+  settingsExpanded = false;
+
+  @Input()
+  disabled: boolean;
+
+  private modelValue: TimeSeriesChartGridSettings;
+
+  private propagateChange = null;
+
+  public gridSettingsFormGroup: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder,
+              private widgetService: WidgetService,) {
+  }
+
+  ngOnInit(): void {
+    this.gridSettingsFormGroup = this.fb.group({
+      show: [null, []],
+      backgroundColor: [null, []],
+      borderWidth: [null, [Validators.min(0)]],
+      borderColor: [null, []],
+    });
+    this.gridSettingsFormGroup.valueChanges.subscribe(() => {
+      this.updateModel();
+    });
+    this.gridSettingsFormGroup.get('show').valueChanges
+    .subscribe(() => {
+      this.updateValidators();
+    });
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.gridSettingsFormGroup.disable({emitEvent: false});
+    } else {
+      this.gridSettingsFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  writeValue(value: TimeSeriesChartGridSettings): void {
+    this.modelValue = value;
+    this.gridSettingsFormGroup.patchValue(
+      value, {emitEvent: false}
+    );
+    this.updateValidators();
+    this.gridSettingsFormGroup.get('show').valueChanges.subscribe((show) => {
+      this.settingsExpanded = show;
+    });
+  }
+
+  private updateValidators() {
+    const show: boolean = this.gridSettingsFormGroup.get('show').value;
+    if (show) {
+      this.gridSettingsFormGroup.enable({emitEvent: false});
+    } else {
+      this.gridSettingsFormGroup.disable({emitEvent: false});
+      this.gridSettingsFormGroup.get('show').enable({emitEvent: false});
+    }
+  }
+
+  private updateModel() {
+    this.modelValue = this.gridSettingsFormGroup.getRawValue();
+    this.propagateChange(this.modelValue);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.html
new file mode 100644
index 0000000000..a2e11c3a8e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.html
@@ -0,0 +1,62 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div [formGroup]="stateFormGroup" class="tb-form-table-row tb-time-series-state-row">
+  <mat-form-field appearance="outline" class="tb-inline-field tb-state-label-field" subscriptSizing="dynamic">
+    <input matInput formControlName="label" placeholder="{{ 'widget-config.set' | translate }}">
+  </mat-form-field>
+  <mat-form-field appearance="outline" class="tb-inline-field number tb-state-value-field" subscriptSizing="dynamic">
+    <input matInput formControlName="value" type="number" placeholder="{{ 'widget-config.set' | translate }}">
+  </mat-form-field>
+  <mat-form-field class="tb-inline-field tb-state-source-field" appearance="outline" subscriptSizing="dynamic">
+    <mat-select formControlName="sourceType">
+      <mat-option *ngFor="let type of timeSeriesStateSourceTypes" [value]="type">
+        {{ timeSeriesStateSourceTypeTranslations.get(type) | translate }}
+      </mat-option>
+    </mat-select>
+  </mat-form-field>
+  <div class="tb-state-source-value-field">
+    <tb-value-input
+        *ngIf="stateFormGroup.get('sourceType').value === TimeSeriesChartStateSourceType.constant"
+        formControlName="sourceValue"
+        fxFlex
+        [layout]="{
+                    layout: 'column',
+                    breakpoints: {'gt-sm': 'row'}
+                 }">
+    </tb-value-input>
+    <mat-form-field
+        *ngIf="stateFormGroup.get('sourceType').value === TimeSeriesChartStateSourceType.range"
+        appearance="outline" class="tb-inline-field number" subscriptSizing="dynamic">
+      <input matInput formControlName="sourceRangeFrom" type="number" placeholder="{{ 'widgets.time-series-chart.state.from' | translate }}">
+    </mat-form-field>
+    <mat-form-field
+        *ngIf="stateFormGroup.get('sourceType').value === TimeSeriesChartStateSourceType.range"
+        appearance="outline" class="tb-inline-field number" subscriptSizing="dynamic">
+      <input matInput formControlName="sourceRangeTo" type="number" placeholder="{{ 'widgets.time-series-chart.state.to' | translate }}">
+    </mat-form-field>
+  </div>
+  <div class="tb-form-table-row-cell-buttons">
+    <button type="button"
+            mat-icon-button
+            (click)="stateRemoved.emit()"
+            matTooltip="{{ 'widgets.time-series-chart.state.remove-state' | translate }}"
+            matTooltipPosition="above">
+      <mat-icon>delete</mat-icon>
+    </button>
+  </div>
+</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.scss
new file mode 100644
index 0000000000..247eb5d28f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.scss
@@ -0,0 +1,51 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import '../../../../../../../../../scss/constants';
+
+.tb-form-table-row.tb-time-series-state-row {
+  @media #{$mat-lt-md} {
+    align-items: flex-start;
+  }
+  .tb-state-label-field {
+    flex: 1;
+    min-width: 70px;
+  }
+  .tb-state-value-field {
+    width: 80px;
+    min-width: 80px;
+  }
+  .tb-state-source-field {
+    width: 100px;
+    min-width: 100px;
+  }
+  .tb-state-source-value-field {
+    flex: 1;
+    min-width: 200px;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    @media #{$mat-gt-sm} {
+      min-width: 358px;
+      flex-direction: row;
+      align-items: center;
+      gap: 12px;
+    }
+    .tb-inline-field {
+      flex: 1;
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.ts
new file mode 100644
index 0000000000..97c87432c2
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component.ts
@@ -0,0 +1,138 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  forwardRef,
+  Input,
+  OnInit,
+  Output,
+  ViewEncapsulation
+} from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators
+} from '@angular/forms';
+import {
+  TimeSeriesChartStateSettings,
+  TimeSeriesChartStateSourceType,
+  timeSeriesStateSourceTypes,
+  timeSeriesStateSourceTypeTranslations
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+
+@Component({
+  selector: 'tb-time-series-chart-state-row',
+  templateUrl: './time-series-chart-state-row.component.html',
+  styleUrls: ['./time-series-chart-state-row.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartStateRowComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class TimeSeriesChartStateRowComponent implements ControlValueAccessor, OnInit {
+
+  TimeSeriesChartStateSourceType = TimeSeriesChartStateSourceType;
+
+  timeSeriesStateSourceTypes = timeSeriesStateSourceTypes;
+
+  timeSeriesStateSourceTypeTranslations = timeSeriesStateSourceTypeTranslations;
+
+  @Input()
+  disabled: boolean;
+
+  @Output()
+  stateRemoved = new EventEmitter();
+
+  stateFormGroup: UntypedFormGroup;
+
+  modelValue: TimeSeriesChartStateSettings;
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder,
+              private cd: ChangeDetectorRef) {
+  }
+
+  ngOnInit() {
+    this.stateFormGroup = this.fb.group({
+      label: [null, []],
+      value: [null, [Validators.required]],
+      sourceType: [null, [Validators.required]],
+      sourceValue: [null, [Validators.required]],
+      sourceRangeFrom: [null, []],
+      sourceRangeTo: [null, []]
+    });
+    this.stateFormGroup.valueChanges.subscribe(
+      () => this.updateModel()
+    );
+    this.stateFormGroup.get('sourceType').valueChanges.subscribe(() => {
+      this.updateValidators();
+    });
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.stateFormGroup.disable({emitEvent: false});
+    } else {
+      this.stateFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  writeValue(value: TimeSeriesChartStateSettings): void {
+    this.modelValue = value;
+    this.stateFormGroup.patchValue(
+      value, {emitEvent: false}
+    );
+    this.updateValidators();
+    this.cd.markForCheck();
+  }
+
+  private updateValidators() {
+    const sourceType: TimeSeriesChartStateSourceType = this.stateFormGroup.get('sourceType').value;
+    if (sourceType === TimeSeriesChartStateSourceType.constant) {
+      this.stateFormGroup.get('sourceValue').enable({emitEvent: false});
+      this.stateFormGroup.get('sourceRangeFrom').disable({emitEvent: false});
+      this.stateFormGroup.get('sourceRangeTo').disable({emitEvent: false});
+    } else if (sourceType === TimeSeriesChartStateSourceType.range) {
+      this.stateFormGroup.get('sourceValue').disable({emitEvent: false});
+      this.stateFormGroup.get('sourceRangeFrom').enable({emitEvent: false});
+      this.stateFormGroup.get('sourceRangeTo').enable({emitEvent: false});
+    }
+  }
+
+  private updateModel() {
+    this.modelValue = this.stateFormGroup.value;
+    this.propagateChange(this.modelValue);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.html
new file mode 100644
index 0000000000..5db76d1493
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.html
@@ -0,0 +1,47 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div class="tb-form-panel tb-time-series-states-panel">
+  <div class="tb-form-panel-title">{{ 'widgets.time-series-chart.state.states' | translate }}</div>
+  <div class="tb-form-table">
+    <div class="tb-form-table-header">
+      <div class="tb-form-table-header-cell tb-state-label-header" translate>widgets.time-series-chart.state.label</div>
+      <div class="tb-form-table-header-cell tb-state-value-header" translate>widgets.time-series-chart.state.ticks-value</div>
+      <div class="tb-form-table-header-cell tb-state-source-header" translate>widgets.time-series-chart.state.source</div>
+      <div class="tb-form-table-header-cell tb-state-source-value-header" translate>widgets.time-series-chart.state.value-range</div>
+      <div class="tb-form-table-header-cell tb-actions-header"></div>
+    </div>
+    <div *ngIf="statesFormArray().controls.length; else noStates" class="tb-form-table-body">
+      <div *ngFor="let stateControl of statesFormArray().controls; trackBy: trackByState; let $index = index; let $last = last">
+        <tb-time-series-chart-state-row fxFlex
+                                        [formControl]="stateControl"
+                                        (stateRemoved)="removeState($index)">
+        </tb-time-series-chart-state-row>
+        <mat-divider *ngIf="!$last"></mat-divider>
+      </div>
+    </div>
+  </div>
+  <div>
+    <button type="button" mat-stroked-button color="primary" (click)="addState()">
+      {{ 'widgets.time-series-chart.state.add-state' | translate }}
+    </button>
+  </div>
+</div>
+<ng-template #noStates>
+  <span fxLayoutAlign="center center"
+        class="tb-prompt">{{ 'widgets.time-series-chart.state.no-states' | translate }}</span>
+</ng-template>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.scss
new file mode 100644
index 0000000000..3177b8cdc1
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.scss
@@ -0,0 +1,60 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import '../../../../../../../../../scss/constants';
+
+.tb-time-series-states-panel {
+  .tb-form-table {
+    overflow-x: auto;
+  }
+  .tb-form-table-header-cell {
+    &.tb-state-label-header {
+      flex: 1;
+      min-width: 80px;
+    }
+    &.tb-state-value-header {
+      width: 80px;
+      min-width: 80px;
+    }
+    &.tb-state-source-header {
+      width: 100px;
+      min-width: 100px;
+    }
+    &.tb-state-source-value-header {
+      flex: 1;
+      min-width: 200px;
+      @media #{$mat-gt-sm} {
+        min-width: 358px;
+      }
+    }
+    &.tb-actions-header {
+      width: 40px;
+      min-width: 40px;
+    }
+  }
+  .tb-form-table-header {
+    min-width: fit-content;
+  }
+  .tb-form-table-body {
+    min-width: fit-content;
+    .mat-divider {
+      margin-top: 8px;
+      @media #{$mat-gt-sm} {
+        display: none;
+      }
+    }
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.ts
new file mode 100644
index 0000000000..8c30582425
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component.ts
@@ -0,0 +1,144 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, forwardRef, Input, OnInit, ViewEncapsulation } from '@angular/core';
+import {
+  AbstractControl,
+  ControlValueAccessor,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  UntypedFormArray,
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validator
+} from '@angular/forms';
+import {
+  TimeSeriesChartStateSettings,
+  TimeSeriesChartStateSourceType,
+  timeSeriesChartStateValid,
+  timeSeriesChartStateValidator
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+
+@Component({
+  selector: 'tb-time-series-chart-states-panel',
+  templateUrl: './time-series-chart-states-panel.component.html',
+  styleUrls: ['./time-series-chart-states-panel.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartStatesPanelComponent),
+      multi: true
+    },
+    {
+      provide: NG_VALIDATORS,
+      useExisting: forwardRef(() => TimeSeriesChartStatesPanelComponent),
+      multi: true
+    }
+  ],
+  encapsulation: ViewEncapsulation.None
+})
+export class TimeSeriesChartStatesPanelComponent implements ControlValueAccessor, OnInit, Validator {
+
+  @Input()
+  disabled: boolean;
+
+  statesFormGroup: UntypedFormGroup;
+
+  private propagateChange = (_val: any) => {};
+
+  constructor(private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit() {
+    this.statesFormGroup = this.fb.group({
+      states: [this.fb.array([]), []]
+    });
+    this.statesFormGroup.valueChanges.subscribe(
+      () => {
+        let states: TimeSeriesChartStateSettings[] = this.statesFormGroup.get('states').value;
+        if (states) {
+          states = states.filter(s => timeSeriesChartStateValid(s));
+        }
+        this.propagateChange(states);
+      }
+    );
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.statesFormGroup.disable({emitEvent: false});
+    } else {
+      this.statesFormGroup.enable({emitEvent: false});
+    }
+  }
+
+  writeValue(value: TimeSeriesChartStateSettings[] | undefined): void {
+    const states = value || [];
+    this.statesFormGroup.setControl('states', this.prepareStatesFormArray(states), {emitEvent: false});
+  }
+
+  public validate(c: UntypedFormControl) {
+    const valid = this.statesFormGroup.valid;
+    return valid ? null : {
+      states: {
+        valid: false,
+      },
+    };
+  }
+
+  statesFormArray(): UntypedFormArray {
+    return this.statesFormGroup.get('states') as UntypedFormArray;
+  }
+
+  trackByState(index: number, stateControl: AbstractControl): any {
+    return stateControl;
+  }
+
+  removeState(index: number) {
+    (this.statesFormGroup.get('states') as UntypedFormArray).removeAt(index);
+  }
+
+  addState() {
+    const state: TimeSeriesChartStateSettings = {
+      label: '',
+      value: 0,
+      sourceType: TimeSeriesChartStateSourceType.constant
+    };
+    const statesArray = this.statesFormGroup.get('states') as UntypedFormArray;
+    const stateControl = this.fb.control(state, [timeSeriesChartStateValidator]);
+    statesArray.push(stateControl);
+  }
+
+  private prepareStatesFormArray(states: TimeSeriesChartStateSettings[] | undefined): UntypedFormArray {
+    const statesControls: Array<AbstractControl> = [];
+    if (states) {
+      states.forEach((state) => {
+        statesControls.push(this.fb.control(state, [timeSeriesChartStateValidator]));
+      });
+    }
+    return this.fb.array(statesControls);
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component.html
index 7e2c9f74c2..d0ea8f0ef3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component.html
@@ -73,7 +73,7 @@
       [formControl]="entityKeyFormControl">
     </tb-data-key-input>
   </div>
-  <div class="tb-y-axis-field">
+  <div *ngIf="!hideYAxis" class="tb-y-axis-field">
     <mat-form-field class="tb-inline-field fixed-height" appearance="outline" subscriptSizing="dynamic">
       <mat-select formControlName="yAxisId">
         <mat-option *ngFor="let yAxis of yAxisIds" [value]="yAxis">
@@ -98,14 +98,13 @@
     </mat-form-field>
   </div>
   <div class="tb-form-table-row-cell-buttons">
-    <button type="button"
-            mat-icon-button
-            #matButton
-            (click)="editThreshold($event, matButton)"
-            matTooltip="{{ 'widgets.time-series-chart.threshold.threshold-settings' | translate }}"
-            matTooltipPosition="above">
-      <mat-icon>settings</mat-icon>
-    </button>
+    <tb-time-series-chart-threshold-settings
+        [widgetConfig]="widgetConfig"
+        [yAxisIds]="yAxisIds"
+        [hideYAxis]="hideYAxis"
+        icon="settings"
+        [formControl]="thresholdSettingsFormControl">
+    </tb-time-series-chart-threshold-settings>
     <button type="button"
             mat-icon-button
             (click)="thresholdRemoved.emit()"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component.ts
index baebf8c697..168284ec13 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-row.component.ts
@@ -19,11 +19,11 @@ import {
   Component,
   EventEmitter,
   forwardRef,
-  Input, OnChanges,
+  Input,
+  OnChanges,
   OnInit,
   Output,
-  Renderer2, SimpleChanges,
-  ViewContainerRef,
+  SimpleChanges,
   ViewEncapsulation
 } from '@angular/core';
 import {
@@ -36,7 +36,8 @@ import {
 } from '@angular/forms';
 import {
   TimeSeriesChartThreshold,
-  TimeSeriesChartThresholdType, TimeSeriesChartYAxisId,
+  TimeSeriesChartThresholdType,
+  TimeSeriesChartYAxisId,
   timeSeriesThresholdTypes,
   timeSeriesThresholdTypeTranslations
 } from '@home/components/widget/lib/chart/time-series-chart.models';
@@ -47,12 +48,8 @@ import { IAliasController } from '@core/api/widget-api.models';
 import { DataKey, Datasource, DatasourceType, WidgetConfig } from '@shared/models/widget.models';
 import { DataKeysCallbacks } from '@home/components/widget/config/data-keys.component.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
-import { MatButton } from '@angular/material/button';
-import { TbPopoverService } from '@shared/components/popover.service';
 import { deepClone } from '@core/utils';
-import {
-  TimeSeriesChartThresholdSettingsPanelComponent
-} from '@home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
   selector: 'tb-time-series-chart-threshold-row',
@@ -101,6 +98,10 @@ export class TimeSeriesChartThresholdRowComponent implements ControlValueAccesso
   @Input()
   yAxisIds: TimeSeriesChartYAxisId[];
 
+  @Input()
+  @coerceBoolean()
+  hideYAxis = false;
+
   @Output()
   thresholdRemoved = new EventEmitter();
 
@@ -112,12 +113,11 @@ export class TimeSeriesChartThresholdRowComponent implements ControlValueAccesso
 
   entityKeyFormControl: UntypedFormControl;
 
+  thresholdSettingsFormControl: UntypedFormControl;
+
   private propagateChange = (_val: any) => {};
 
   constructor(private fb: UntypedFormBuilder,
-              private popoverService: TbPopoverService,
-              private renderer: Renderer2,
-              private viewContainerRef: ViewContainerRef,
               private thresholdsPanel: TimeSeriesChartThresholdsPanelComponent,
               private cd: ChangeDetectorRef) {
   }
@@ -134,6 +134,7 @@ export class TimeSeriesChartThresholdRowComponent implements ControlValueAccesso
     });
     this.latestKeyFormControl = this.fb.control(null, [Validators.required]);
     this.entityKeyFormControl = this.fb.control(null, [Validators.required]);
+    this.thresholdSettingsFormControl = this.fb.control(null);
     this.thresholdFormGroup.valueChanges.subscribe(
       () => this.updateModel()
     );
@@ -143,6 +144,18 @@ export class TimeSeriesChartThresholdRowComponent implements ControlValueAccesso
     this.entityKeyFormControl.valueChanges.subscribe(
       () => this.updateModel()
     );
+    this.thresholdSettingsFormControl.valueChanges.subscribe((thresholdSettings: Partial<TimeSeriesChartThreshold>) => {
+      this.modelValue = {...this.modelValue, ...thresholdSettings};
+      this.thresholdFormGroup.patchValue(
+        {
+          yAxisId: this.modelValue.yAxisId,
+          units: this.modelValue.units,
+          decimals: this.modelValue.decimals,
+          lineColor: this.modelValue.lineColor
+        },
+        {emitEvent: false});
+      this.propagateChange(this.modelValue);
+    });
     this.thresholdFormGroup.get('type').valueChanges.subscribe(() => {
       this.updateValidators();
     });
@@ -175,8 +188,10 @@ export class TimeSeriesChartThresholdRowComponent implements ControlValueAccesso
       this.thresholdFormGroup.disable({emitEvent: false});
       this.latestKeyFormControl.disable({emitEvent: false});
       this.entityKeyFormControl.disable({emitEvent: false});
+      this.thresholdSettingsFormControl.disable({emitEvent: false});
     } else {
       this.thresholdFormGroup.enable({emitEvent: false});
+      this.thresholdSettingsFormControl.enable({emitEvent: false});
       this.updateValidators();
     }
   }
@@ -205,45 +220,12 @@ export class TimeSeriesChartThresholdRowComponent implements ControlValueAccesso
         name: value.entityKey
       }, {emitEvent: false});
     }
+    this.thresholdSettingsFormControl.patchValue(deepClone(this.modelValue),
+      {emitEvent: false});
     this.updateValidators();
     this.cd.markForCheck();
   }
 
-  editThreshold($event: Event, matButton: MatButton) {
-    if ($event) {
-      $event.stopPropagation();
-    }
-    const trigger = matButton._elementRef.nativeElement;
-    if (this.popoverService.hasPopover(trigger)) {
-      this.popoverService.hidePopover(trigger);
-    } else {
-      const ctx: any = {
-        thresholdSettings: deepClone(this.modelValue),
-        widgetConfig: this.widgetConfig,
-        yAxisIds: this.yAxisIds
-      };
-      const thresholdSettingsPanelPopover = this.popoverService.displayPopover(trigger, this.renderer,
-        this.viewContainerRef, TimeSeriesChartThresholdSettingsPanelComponent, ['leftOnly', 'leftTopOnly', 'leftBottomOnly'], true, null,
-        ctx,
-        {},
-        {}, {}, true);
-      thresholdSettingsPanelPopover.tbComponentRef.instance.popover = thresholdSettingsPanelPopover;
-      thresholdSettingsPanelPopover.tbComponentRef.instance.thresholdSettingsApplied.subscribe((thresholdSettings) => {
-        thresholdSettingsPanelPopover.hide();
-        this.modelValue = {...this.modelValue, ...thresholdSettings};
-        this.thresholdFormGroup.patchValue(
-          {
-            yAxisId: this.modelValue.yAxisId,
-            units: this.modelValue.units,
-            decimals: this.modelValue.decimals,
-            lineColor: this.modelValue.lineColor
-          },
-          {emitEvent: false});
-        this.propagateChange(this.modelValue);
-      });
-    }
-  }
-
   private updateValidators() {
     const type: TimeSeriesChartThresholdType = this.thresholdFormGroup.get('type').value;
     if (type === TimeSeriesChartThresholdType.constant) {
@@ -282,6 +264,8 @@ export class TimeSeriesChartThresholdRowComponent implements ControlValueAccesso
       this.modelValue.entityKey = entityKey?.name;
       this.modelValue.entityKeyType = (entityKey?.type as any);
     }
+    this.thresholdSettingsFormControl.patchValue(deepClone(this.modelValue),
+      {emitEvent: false});
     this.propagateChange(this.modelValue);
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.html
index 3437a578d6..4017a0ca2b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.html
@@ -16,9 +16,9 @@
 
 -->
 <div class="tb-threshold-settings-panel" [formGroup]="thresholdSettingsFormGroup">
-  <div class="tb-threshold-settings-title">{{ 'widgets.time-series-chart.threshold.threshold-settings' | translate }}</div>
+  <div class="tb-threshold-settings-title">{{ panelTitle | translate }}</div>
   <div class="tb-threshold-settings-panel-content">
-    <div class="tb-form-row space-between column-xs">
+    <div *ngIf="!hideYAxis" class="tb-form-row space-between column-xs">
       <div translate>widgets.time-series-chart.axis.y-axis</div>
       <mat-form-field class="medium-width" appearance="outline" subscriptSizing="dynamic">
         <mat-select formControlName="yAxisId">
@@ -64,6 +64,15 @@
         </tb-color-input>
       </div>
     </div>
+    <div class="tb-form-row space-between">
+      <mat-slide-toggle class="mat-slide" formControlName="enableLabelBackground">
+        {{ 'widgets.time-series-chart.threshold.label-background' | translate }}
+      </mat-slide-toggle>
+      <tb-color-input asBoxInput
+                      colorClearButton
+                      formControlName="labelBackground">
+      </tb-color-input>
+    </div>
     <div class="tb-form-panel">
       <div class="tb-form-panel-title" translate>widgets.time-series-chart.threshold.line-appearance</div>
       <div class="tb-form-row space-between">
@@ -94,8 +103,8 @@
         <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
           <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
             <mat-select formControlName="startSymbol">
-              <mat-option *ngFor="let shape of timeSeriesChartShapes" [value]="shape">
-                {{ timeSeriesChartShapeTranslations.get(shape) | translate }}
+              <mat-option *ngFor="let shape of echartsShapes" [value]="shape">
+                {{ echartsShapeTranslations.get(shape) | translate }}
               </mat-option>
             </mat-select>
           </mat-form-field>
@@ -111,8 +120,8 @@
         <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
           <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
             <mat-select formControlName="endSymbol">
-              <mat-option *ngFor="let shape of timeSeriesChartShapes" [value]="shape">
-                {{ timeSeriesChartShapeTranslations.get(shape) | translate }}
+              <mat-option *ngFor="let shape of echartsShapes" [value]="shape">
+                {{ echartsShapeTranslations.get(shape) | translate }}
               </mat-option>
             </mat-select>
           </mat-form-field>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts
index b9f16103bd..766b8b7ccf 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component.ts
@@ -18,18 +18,22 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } fro
 import { TbPopoverComponent } from '@shared/components/popover.component';
 import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import {
-  TimeSeriesChartShape,
-  timeSeriesChartShapes,
-  timeSeriesChartShapeTranslations,
-  TimeSeriesChartThreshold, TimeSeriesChartYAxisId,
+  TimeSeriesChartThreshold,
+  TimeSeriesChartYAxisId,
   timeSeriesLineTypes,
   timeSeriesLineTypeTranslations,
   timeSeriesThresholdLabelPositions,
   timeSeriesThresholdLabelPositionTranslations
 } from '@home/components/widget/lib/chart/time-series-chart.models';
+import {
+  EChartsShape,
+  echartsShapes,
+  echartsShapeTranslations
+} from '@home/components/widget/lib/chart/echarts-widget.models';
 import { merge } from 'rxjs';
 import { WidgetConfig } from '@shared/models/widget.models';
 import { formatValue, isDefinedAndNotNull } from '@core/utils';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
   selector: 'tb-time-series-chart-threshold-settings-panel',
@@ -44,9 +48,9 @@ export class TimeSeriesChartThresholdSettingsPanelComponent implements OnInit {
 
   timeSeriesLineTypeTranslations = timeSeriesLineTypeTranslations;
 
-  timeSeriesChartShapes = timeSeriesChartShapes;
+  echartsShapes = echartsShapes;
 
-  timeSeriesChartShapeTranslations = timeSeriesChartShapeTranslations;
+  echartsShapeTranslations = echartsShapeTranslations;
 
   timeSeriesThresholdLabelPositions = timeSeriesThresholdLabelPositions;
 
@@ -66,6 +70,13 @@ export class TimeSeriesChartThresholdSettingsPanelComponent implements OnInit {
   @Input()
   popover: TbPopoverComponent<TimeSeriesChartThresholdSettingsPanelComponent>;
 
+  @Input()
+  @coerceBoolean()
+  hideYAxis = false;
+
+  @Input()
+  panelTitle = 'widgets.time-series-chart.threshold.threshold-settings';
+
   @Output()
   thresholdSettingsApplied = new EventEmitter<Partial<TimeSeriesChartThreshold>>();
 
@@ -90,10 +101,13 @@ export class TimeSeriesChartThresholdSettingsPanelComponent implements OnInit {
         showLabel: [this.thresholdSettings.showLabel, []],
         labelPosition: [this.thresholdSettings.labelPosition, []],
         labelFont: [this.thresholdSettings.labelFont, []],
-        labelColor: [this.thresholdSettings.labelColor, []]
+        labelColor: [this.thresholdSettings.labelColor, []],
+        enableLabelBackground: [this.thresholdSettings.enableLabelBackground, []],
+        labelBackground: [this.thresholdSettings.labelBackground, []]
       }
     );
     merge(this.thresholdSettingsFormGroup.get('showLabel').valueChanges,
+          this.thresholdSettingsFormGroup.get('enableLabelBackground').valueChanges,
           this.thresholdSettingsFormGroup.get('startSymbol').valueChanges,
           this.thresholdSettingsFormGroup.get('endSymbol').valueChanges).subscribe(() => {
       this.updateValidators();
@@ -112,23 +126,32 @@ export class TimeSeriesChartThresholdSettingsPanelComponent implements OnInit {
 
   private updateValidators() {
     const showLabel: boolean = this.thresholdSettingsFormGroup.get('showLabel').value;
-    const startSymbol: TimeSeriesChartShape = this.thresholdSettingsFormGroup.get('startSymbol').value;
-    const endSymbol: TimeSeriesChartShape = this.thresholdSettingsFormGroup.get('endSymbol').value;
+    const enableLabelBackground: boolean = this.thresholdSettingsFormGroup.get('enableLabelBackground').value;
+    const startSymbol: EChartsShape = this.thresholdSettingsFormGroup.get('startSymbol').value;
+    const endSymbol: EChartsShape = this.thresholdSettingsFormGroup.get('endSymbol').value;
     if (showLabel) {
       this.thresholdSettingsFormGroup.get('labelPosition').enable({emitEvent: false});
       this.thresholdSettingsFormGroup.get('labelFont').enable({emitEvent: false});
       this.thresholdSettingsFormGroup.get('labelColor').enable({emitEvent: false});
+      this.thresholdSettingsFormGroup.get('enableLabelBackground').enable({emitEvent: false});
+      if (enableLabelBackground) {
+        this.thresholdSettingsFormGroup.get('labelBackground').enable({emitEvent: false});
+      } else {
+        this.thresholdSettingsFormGroup.get('labelBackground').disable({emitEvent: false});
+      }
     } else {
       this.thresholdSettingsFormGroup.get('labelPosition').disable({emitEvent: false});
       this.thresholdSettingsFormGroup.get('labelFont').disable({emitEvent: false});
       this.thresholdSettingsFormGroup.get('labelColor').disable({emitEvent: false});
+      this.thresholdSettingsFormGroup.get('enableLabelBackground').disable({emitEvent: false});
+      this.thresholdSettingsFormGroup.get('labelBackground').disable({emitEvent: false});
     }
-    if (startSymbol === TimeSeriesChartShape.none) {
+    if (startSymbol === EChartsShape.none) {
       this.thresholdSettingsFormGroup.get('startSymbolSize').disable({emitEvent: false});
     } else {
       this.thresholdSettingsFormGroup.get('startSymbolSize').enable({emitEvent: false});
     }
-    if (endSymbol === TimeSeriesChartShape.none) {
+    if (endSymbol === EChartsShape.none) {
       this.thresholdSettingsFormGroup.get('endSymbolSize').disable({emitEvent: false});
     } else {
       this.thresholdSettingsFormGroup.get('endSymbolSize').enable({emitEvent: false});
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings.component.html
new file mode 100644
index 0000000000..787b4db443
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings.component.html
@@ -0,0 +1,39 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<button *ngIf="boxButton; else iconButton"
+        type="button"
+        mat-stroked-button
+        class="tb-box-button"
+        [disabled]="disabled"
+        #matButton
+        (click)="openThresholdSettingsPopup($event, matButton)"
+        matTooltip="{{ title | translate }}"
+        matTooltipPosition="above">
+  <tb-icon matButtonIcon>{{icon}}</tb-icon>
+</button>
+<ng-template #iconButton>
+  <button type="button"
+          mat-icon-button
+          [disabled]="disabled"
+          #matButton
+          (click)="openThresholdSettingsPopup($event, matButton)"
+          matTooltip="{{ title | translate }}"
+          matTooltipPosition="above">
+    <tb-icon>{{icon}}</tb-icon>
+  </button>
+</ng-template>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings.component.ts
new file mode 100644
index 0000000000..6908b086af
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings.component.ts
@@ -0,0 +1,124 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, forwardRef, Input, OnInit, Renderer2, ViewContainerRef } from '@angular/core';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { MatButton } from '@angular/material/button';
+import { TbPopoverService } from '@shared/components/popover.service';
+import { deepClone } from '@core/utils';
+import { coerceBoolean } from '@shared/decorators/coercion';
+import { WidgetConfig } from '@shared/models/widget.models';
+import {
+  TimeSeriesChartThreshold,
+  TimeSeriesChartYAxisId
+} from '@home/components/widget/lib/chart/time-series-chart.models';
+import {
+  TimeSeriesChartThresholdSettingsPanelComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings-panel.component';
+
+@Component({
+  selector: 'tb-time-series-chart-threshold-settings',
+  templateUrl: './time-series-chart-threshold-settings.component.html',
+  styleUrls: [],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TimeSeriesChartThresholdSettingsComponent),
+      multi: true
+    }
+  ]
+})
+export class TimeSeriesChartThresholdSettingsComponent implements OnInit, ControlValueAccessor {
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  widgetConfig: WidgetConfig;
+
+  @Input()
+  yAxisIds: TimeSeriesChartYAxisId[];
+
+  @Input()
+  @coerceBoolean()
+  hideYAxis = false;
+
+  @Input()
+  @coerceBoolean()
+  boxButton = false;
+
+  @Input()
+  icon = 'settings';
+
+  @Input()
+  title = 'widgets.time-series-chart.threshold.threshold-settings';
+
+  private modelValue: Partial<TimeSeriesChartThreshold>;
+
+  private propagateChange = null;
+
+  constructor(private popoverService: TbPopoverService,
+              private renderer: Renderer2,
+              private viewContainerRef: ViewContainerRef) {}
+
+  ngOnInit(): void {
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+  }
+
+  writeValue(value: Partial<TimeSeriesChartThreshold>): void {
+    this.modelValue = value;
+  }
+
+  openThresholdSettingsPopup($event: Event, matButton: MatButton) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    const trigger = matButton._elementRef.nativeElement;
+    if (this.popoverService.hasPopover(trigger)) {
+      this.popoverService.hidePopover(trigger);
+    } else {
+      const ctx: any = {
+        thresholdSettings: deepClone(this.modelValue),
+        panelTitle: this.title,
+        widgetConfig: this.widgetConfig,
+        hideYAxis: this.hideYAxis,
+        yAxisIds: this.yAxisIds
+      };
+      const thresholdSettingsPanelPopover = this.popoverService.displayPopover(trigger, this.renderer,
+        this.viewContainerRef, TimeSeriesChartThresholdSettingsPanelComponent, ['leftOnly', 'leftTopOnly', 'leftBottomOnly'], true, null,
+        ctx,
+        {},
+        {}, {}, true);
+      thresholdSettingsPanelPopover.tbComponentRef.instance.popover = thresholdSettingsPanelPopover;
+      thresholdSettingsPanelPopover.tbComponentRef.instance.thresholdSettingsApplied.subscribe((thresholdSettings) => {
+        thresholdSettingsPanelPopover.hide();
+        this.modelValue = thresholdSettings;
+        this.propagateChange(this.modelValue);
+      });
+    }
+  }
+
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.html
index e975eb4653..ba0325da93 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.html
@@ -21,7 +21,7 @@
     <div class="tb-form-table-header">
       <div class="tb-form-table-header-cell tb-threshold-source-header" translate>widgets.time-series-chart.threshold.source</div>
       <div class="tb-form-table-header-cell tb-threshold-key-value-header" translate>widgets.time-series-chart.threshold.key-value</div>
-      <div class="tb-form-table-header-cell tb-y-axis-header" translate>widgets.time-series-chart.axis.y-axis</div>
+      <div *ngIf="!hideYAxis" class="tb-form-table-header-cell tb-y-axis-header" translate>widgets.time-series-chart.axis.y-axis</div>
       <div class="tb-form-table-header-cell tb-color-header" translate>widgets.color.color</div>
       <div class="tb-form-table-header-cell tb-units-header" translate>widget-config.units-short</div>
       <div class="tb-form-table-header-cell tb-decimals-header" translate>widget-config.decimals-short</div>
@@ -31,6 +31,7 @@
       <div *ngFor="let thresholdControl of thresholdsFormArray().controls; trackBy: trackByThreshold; let $index = index; let $last = last">
         <tb-time-series-chart-threshold-row fxFlex
                                     [formControl]="thresholdControl"
+                                    [hideYAxis]="hideYAxis"
                                     [yAxisIds]="yAxisIds"
                                     (thresholdRemoved)="removeThreshold($index)">
         </tb-time-series-chart-threshold-row>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.ts
index 9cb5e5ced2..95e3b242c3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-thresholds-panel.component.ts
@@ -38,6 +38,7 @@ import { IAliasController } from '@core/api/widget-api.models';
 import { DataKeysCallbacks } from '@home/components/widget/config/data-keys.component.models';
 import { DataKey, Datasource, WidgetConfig } from '@shared/models/widget.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
   selector: 'tb-time-series-chart-thresholds-panel',
@@ -77,6 +78,10 @@ export class TimeSeriesChartThresholdsPanelComponent implements ControlValueAcce
   @Input()
   yAxisIds: TimeSeriesChartYAxisId[];
 
+  @Input()
+  @coerceBoolean()
+  hideYAxis = false;
+
   thresholdsFormGroup: UntypedFormGroup;
 
   private propagateChange = (_val: any) => {};
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.ts
index a4824fd51e..3fcde90cef 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.ts
@@ -36,9 +36,10 @@ import { MatButton } from '@angular/material/button';
 import { TbPopoverService } from '@shared/components/popover.service';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import {
-  TimeSeriesChartYAxisSettingsPanelComponent
-} from '@home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-settings-panel.component';
+  TimeSeriesChartAxisSettingsPanelComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component';
 import { deepClone } from '@core/utils';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'tb-time-series-chart-y-axis-row',
@@ -76,6 +77,7 @@ export class TimeSeriesChartYAxisRowComponent implements ControlValueAccessor, O
   private propagateChange = (_val: any) => {};
 
   constructor(private fb: UntypedFormBuilder,
+              private translate: TranslateService,
               private popoverService: TbPopoverService,
               private renderer: Renderer2,
               private viewContainerRef: ViewContainerRef,
@@ -143,16 +145,18 @@ export class TimeSeriesChartYAxisRowComponent implements ControlValueAccessor, O
       this.popoverService.hidePopover(trigger);
     } else {
       const ctx: any = {
-        yAxisSettings: deepClone(this.modelValue),
+        axisType: 'yAxis',
+        panelTitle: this.translate.instant('widgets.time-series-chart.axis.y-axis-settings'),
+        axisSettings: deepClone(this.modelValue),
         advanced: this.advanced
       };
       const yAxisSettingsPanelPopover = this.popoverService.displayPopover(trigger, this.renderer,
-        this.viewContainerRef, TimeSeriesChartYAxisSettingsPanelComponent, ['leftOnly', 'leftTopOnly', 'leftBottomOnly'], true, null,
+        this.viewContainerRef, TimeSeriesChartAxisSettingsPanelComponent, ['leftOnly', 'leftTopOnly', 'leftBottomOnly'], true, null,
         ctx,
         {},
         {}, {}, true);
       yAxisSettingsPanelPopover.tbComponentRef.instance.popover = yAxisSettingsPanelPopover;
-      yAxisSettingsPanelPopover.tbComponentRef.instance.yAxisSettingsApplied.subscribe((yAxisSettings) => {
+      yAxisSettingsPanelPopover.tbComponentRef.instance.axisSettingsApplied.subscribe((yAxisSettings) => {
         yAxisSettingsPanelPopover.hide();
         this.modelValue = {...this.modelValue, ...yAxisSettings};
         this.axisFormGroup.patchValue(
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-no-aggregation-bar-width-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-no-aggregation-bar-width-settings.component.html
index 239c6ea18c..28c79a1310 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-no-aggregation-bar-width-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-no-aggregation-bar-width-settings.component.html
@@ -15,7 +15,7 @@
     limitations under the License.
 
 -->
-<div class="tb-form-panel" [formGroup]="barWidthSettingsFormGroup">
+<div class="tb-form-panel" [class.stroked]="stroked" [formGroup]="barWidthSettingsFormGroup">
   <div fxLayout="row" fxLayoutAlign="space-between center">
     <div fxFlex translate>widgets.time-series-chart.no-aggregation-bar-width-strategy</div>
     <tb-toggle-select formControlName="strategy" selectMediaBreakpoint="xs">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-no-aggregation-bar-width-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-no-aggregation-bar-width-settings.component.ts
index 36d8cb917a..8601c48159 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-no-aggregation-bar-width-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-no-aggregation-bar-width-settings.component.ts
@@ -29,6 +29,7 @@ import {
   timeSeriesChartNoAggregationBarWidthStrategyTranslations
 } from '@home/components/widget/lib/chart/time-series-chart.models';
 import { merge } from 'rxjs';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
   selector: 'tb-time-series-no-aggregation-bar-width-settings',
@@ -53,6 +54,10 @@ export class TimeSeriesNoAggregationBarWidthSettingsComponent implements OnInit,
   @Input()
   disabled: boolean;
 
+  @Input()
+  @coerceBoolean()
+  stroked = false;
+
   private modelValue: TimeSeriesChartNoAggregationBarWidthSettings;
 
   private propagateChange = null;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.html
index 94831b530f..d5cc9a183e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.html
@@ -19,6 +19,7 @@
                 [class.tb-suffix-absolute]="!keysFormControl.value?.length">
   <mat-chip-grid #chipList [formControl]="keysFormControl">
     <mat-chip-row class="tb-datakey-chip" *ngIf="modelValue?.type"
+                  [removable]="removable"
                   (removed)="removeKey()">
       <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="4px" class="tb-attribute-chip">
         <div class="tb-chip-labels">
@@ -49,7 +50,8 @@
                 (click)="editKey()" mat-icon-button class="tb-mat-24">
           <mat-icon class="tb-mat-18">edit</mat-icon>
         </button>
-        <button matChipRemove
+        <button *ngIf="removable"
+                matChipRemove
                 type="button"
                 mat-icon-button class="tb-mat-24">
           <mat-icon class="tb-mat-18">close</mat-icon>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.scss
index 6d443d0057..f8564a46ac 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.scss
@@ -16,6 +16,13 @@
 .tb-data-key-input {
   .mat-mdc-form-field.tb-inline-field.tb-key-field {
     width: 100%;
+    &.mat-form-field-appearance-fill {
+      .mdc-text-field--filled.mdc-text-field--disabled {
+        &:before {
+          opacity: 0;
+        }
+      }
+    }
     .mat-mdc-text-field-wrapper:not(.mdc-text-field--outlined) {
       padding-left: 8px;
       padding-right: 0;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.ts
index d26f259185..47d093be54 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/data-key-input.component.ts
@@ -98,6 +98,10 @@ export class DataKeyInputComponent implements ControlValueAccessor, OnInit, OnCh
   @coerceBoolean()
   editable = true;
 
+  @Input()
+  @coerceBoolean()
+  removable = true;
+
   @Input()
   datasourceType: DatasourceType;
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/font-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/font-settings-panel.component.html
index d171833001..e897a9de8b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/font-settings-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/font-settings-panel.component.html
@@ -83,7 +83,7 @@
   <mat-divider></mat-divider>
   <div class="tb-form-row no-border no-padding font-preview">
     <div class="fixed-title-width" translate>widgets.widget-font.preview</div>
-    <div class="preview-text" fxFlex [style]="previewStyle">{{ previewText }}</div>
+    <div class="preview-text" fxFlex [style]="previewStyle" [innerHTML]="previewText | safe:'html'"></div>
   </div>
   <div class="tb-font-settings-panel-buttons">
     <button *ngIf="clearButton"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component.html
new file mode 100644
index 0000000000..40f26c6e9c
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component.html
@@ -0,0 +1,111 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<ng-container [formGroup]="stateSettingsFormGroup">
+  <div *ngIf="layout !== StatusWidgetLayout.icon" class="tb-form-row column-xs">
+    <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showLabel">
+      {{ 'widgets.status-widget.label' | translate }}
+    </mat-slide-toggle>
+    <div fxFlex fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+      <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
+        <input matInput formControlName="label" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+      <tb-font-settings formControlName="labelFont"
+                        [previewText]="stateSettingsFormGroup.get('label').value">
+      </tb-font-settings>
+    </div>
+  </div>
+  <div *ngIf="layout !== StatusWidgetLayout.icon" class="tb-form-row column-xs">
+    <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="showStatus">
+      {{ 'widgets.status-widget.status' | translate }}
+    </mat-slide-toggle>
+    <div fxFlex fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+      <mat-form-field class="flex" appearance="outline" subscriptSizing="dynamic">
+        <input matInput formControlName="status" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+      <tb-font-settings formControlName="statusFont"
+                        [previewText]="stateSettingsFormGroup.get('status').value">
+      </tb-font-settings>
+    </div>
+  </div>
+  <div class="tb-form-row">
+    <div class="fixed-title-width">
+      {{ 'widgets.status-widget.icon' | translate }}
+    </div>
+    <div fxFlex fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+      <mat-form-field appearance="outline" class="flex number" subscriptSizing="dynamic">
+        <input matInput type="number" min="0" formControlName="iconSize" placeholder="{{ 'widget-config.set' | translate }}">
+      </mat-form-field>
+      <tb-css-unit-select fxFlex formControlName="iconSizeUnit"></tb-css-unit-select>
+      <tb-material-icon-select asBoxInput
+                               formControlName="icon">
+      </tb-material-icon-select>
+    </div>
+  </div>
+  <div class="tb-form-row space-between" [class]="{'column-xs': layout === StatusWidgetLayout.icon, 'column-lt-md': layout !== StatusWidgetLayout.icon}">
+    <div>{{ 'widgets.status-widget.color-palette' | translate }}</div>
+    <div fxLayout="row wrap" fxLayoutAlign="start center" fxLayoutAlign.lt-sm="space-between center"
+         [fxLayoutAlign.lt-md]="layout !== StatusWidgetLayout.icon ? 'space-between center': 'start center'"
+         style="gap: 12px;">
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <div tb-hint-tooltip-icon="{{'widgets.status-widget.primary-color-hint' | translate}}" translate>widgets.status-widget.primary</div>
+        <tb-color-input asBoxInput
+                        formControlName="primaryColor">
+        </tb-color-input>
+      </div>
+      <mat-divider *ngIf="layout !== StatusWidgetLayout.icon" vertical fxHide.lt-md></mat-divider>
+      <div *ngIf="layout !== StatusWidgetLayout.icon" fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <div tb-hint-tooltip-icon="{{'widgets.status-widget.secondary-color-hint' | translate}}" translate>widgets.status-widget.secondary</div>
+        <tb-color-input asBoxInput
+                        formControlName="secondaryColor">
+        </tb-color-input>
+      </div>
+      <mat-divider vertical fxHide.lt-sm [fxHide.lt-md]="layout !== StatusWidgetLayout.icon"></mat-divider>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <div translate>widgets.status-widget.background</div>
+        <tb-background-settings formControlName="background">
+        </tb-background-settings>
+      </div>
+    </div>
+  </div>
+  <div class="tb-form-row space-between" [class]="{'column-xs': layout === StatusWidgetLayout.icon, 'column-lt-md': layout !== StatusWidgetLayout.icon}">
+    <div>{{ 'widgets.status-widget.disabled-color-palette' | translate }}</div>
+    <div fxLayout="row wrap" fxLayoutAlign="start center" fxLayoutAlign.lt-sm="space-between center"
+         [fxLayoutAlign.lt-md]="layout !== StatusWidgetLayout.icon ? 'space-between center': 'start center'"
+         style="gap: 12px;">
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <div tb-hint-tooltip-icon="{{'widgets.status-widget.primary-color-hint' | translate}}" translate>widgets.status-widget.primary</div>
+        <tb-color-input asBoxInput
+                        formControlName="primaryColorDisabled">
+        </tb-color-input>
+      </div>
+      <mat-divider *ngIf="layout !== StatusWidgetLayout.icon" vertical fxHide.lt-md></mat-divider>
+      <div *ngIf="layout !== StatusWidgetLayout.icon" fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <div tb-hint-tooltip-icon="{{'widgets.status-widget.secondary-color-hint' | translate}}" translate>widgets.status-widget.secondary</div>
+        <tb-color-input asBoxInput
+                        formControlName="secondaryColorDisabled">
+        </tb-color-input>
+      </div>
+      <mat-divider vertical fxHide.lt-sm [fxHide.lt-md]="layout !== StatusWidgetLayout.icon"></mat-divider>
+      <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
+        <div translate>widgets.status-widget.background</div>
+        <tb-background-settings formControlName="backgroundDisabled">
+        </tb-background-settings>
+      </div>
+    </div>
+  </div>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component.ts
new file mode 100644
index 0000000000..8425264d89
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component.ts
@@ -0,0 +1,158 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, forwardRef, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { merge } from 'rxjs';
+import {
+  StatusWidgetLayout,
+  StatusWidgetStateSettings
+} from '@home/components/widget/lib/indicator/status-widget.models';
+
+@Component({
+  selector: 'tb-status-widget-state-settings',
+  templateUrl: './status-widget-state-settings.component.html',
+  styleUrls: ['./../../widget-settings.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => StatusWidgetStateSettingsComponent),
+      multi: true
+    }
+  ]
+})
+export class StatusWidgetStateSettingsComponent implements OnInit, OnChanges, ControlValueAccessor {
+
+  StatusWidgetLayout = StatusWidgetLayout;
+
+  @Input()
+  disabled: boolean;
+
+  @Input()
+  layout: StatusWidgetLayout;
+
+  private modelValue: StatusWidgetStateSettings;
+
+  private propagateChange = null;
+
+  public stateSettingsFormGroup: UntypedFormGroup;
+
+  constructor(private fb: UntypedFormBuilder) {
+  }
+
+  ngOnInit(): void {
+    this.stateSettingsFormGroup = this.fb.group({
+      showLabel: [null, []],
+      label: [null, []],
+      labelFont: [null, []],
+      showStatus: [null, []],
+      status: [null, []],
+      statusFont: [null, []],
+      icon: [null, []],
+      iconSize: [null, []],
+      iconSizeUnit: [null, []],
+      primaryColor: [null, []],
+      secondaryColor: [null, []],
+      background: [null, []],
+      primaryColorDisabled: [null, []],
+      secondaryColorDisabled: [null, []],
+      backgroundDisabled: [null, []]
+    });
+    this.stateSettingsFormGroup.valueChanges.subscribe(() => {
+      this.updateModel();
+    });
+    merge(this.stateSettingsFormGroup.get('showLabel').valueChanges,
+      this.stateSettingsFormGroup.get('showStatus').valueChanges)
+    .subscribe(() => {
+      this.updateValidators();
+    });
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    for (const propName of Object.keys(changes)) {
+      const change = changes[propName];
+      if (!change.firstChange && change.currentValue !== change.previousValue) {
+        if (['layout'].includes(propName)) {
+          this.updateValidators();
+        }
+      }
+    }
+  }
+
+  registerOnChange(fn: any): void {
+    this.propagateChange = fn;
+  }
+
+  registerOnTouched(_fn: any): void {
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.stateSettingsFormGroup.disable({emitEvent: false});
+    } else {
+      this.stateSettingsFormGroup.enable({emitEvent: false});
+      this.updateValidators();
+    }
+  }
+
+  writeValue(value: StatusWidgetStateSettings): void {
+    this.modelValue = value;
+    this.stateSettingsFormGroup.patchValue(
+      value, {emitEvent: false}
+    );
+    this.updateValidators();
+  }
+
+  private updateValidators() {
+    if (this.layout === StatusWidgetLayout.icon) {
+      this.stateSettingsFormGroup.get('showLabel').disable({emitEvent: false});
+      this.stateSettingsFormGroup.get('label').disable({emitEvent: false});
+      this.stateSettingsFormGroup.get('labelFont').disable({emitEvent: false});
+      this.stateSettingsFormGroup.get('showStatus').disable({emitEvent: false});
+      this.stateSettingsFormGroup.get('status').disable({emitEvent: false});
+      this.stateSettingsFormGroup.get('statusFont').disable({emitEvent: false});
+      this.stateSettingsFormGroup.get('secondaryColor').disable({emitEvent: false});
+      this.stateSettingsFormGroup.get('secondaryColorDisabled').disable({emitEvent: false});
+    } else {
+      this.stateSettingsFormGroup.get('showLabel').enable({emitEvent: false});
+      this.stateSettingsFormGroup.get('showStatus').enable({emitEvent: false});
+      this.stateSettingsFormGroup.get('secondaryColor').enable({emitEvent: false});
+      this.stateSettingsFormGroup.get('secondaryColorDisabled').enable({emitEvent: false});
+      const showLabel: boolean = this.stateSettingsFormGroup.get('showLabel').value;
+      const showStatus: boolean = this.stateSettingsFormGroup.get('showStatus').value;
+      if (showLabel) {
+        this.stateSettingsFormGroup.get('label').enable({emitEvent: false});
+        this.stateSettingsFormGroup.get('labelFont').enable({emitEvent: false});
+      } else {
+        this.stateSettingsFormGroup.get('label').disable({emitEvent: false});
+        this.stateSettingsFormGroup.get('labelFont').disable({emitEvent: false});
+      }
+      if (showStatus) {
+        this.stateSettingsFormGroup.get('status').enable({emitEvent: false});
+        this.stateSettingsFormGroup.get('statusFont').enable({emitEvent: false});
+      } else {
+        this.stateSettingsFormGroup.get('status').disable({emitEvent: false});
+        this.stateSettingsFormGroup.get('statusFont').disable({emitEvent: false});
+      }
+    }
+  }
+
+  private updateModel() {
+    this.modelValue = this.stateSettingsFormGroup.getRawValue();
+    this.propagateChange(this.modelValue);
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts
index 5ed50a226f..31c8f60c12 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/widget-settings-common.module.ts
@@ -116,17 +116,38 @@ import {
   TimeSeriesChartYAxisRowComponent
 } from '@home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component';
 import {
-  TimeSeriesChartYAxisSettingsPanelComponent
-} from '@home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-settings-panel.component';
+  TimeSeriesChartAxisSettingsPanelComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-panel.component';
 import {
-  TimeSeriesChartAnimationSettingsComponent
-} from '@home/components/widget/lib/settings/common/chart/time-series-chart-animation-settings.component';
+  EchartsAnimationSettingsComponent
+} from '@home/components/widget/lib/settings/common/chart/echarts-animation-settings.component';
 import {
   AutoDateFormatSettingsPanelComponent
 } from '@home/components/widget/lib/settings/common/auto-date-format-settings-panel.component';
 import {
   AutoDateFormatSettingsComponent
 } from '@home/components/widget/lib/settings/common/auto-date-format-settings.component';
+import {
+  TimeSeriesChartFillSettingsComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-fill-settings.component';
+import {
+  TimeSeriesChartThresholdSettingsComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-threshold-settings.component';
+import {
+  TimeSeriesChartStateRowComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-state-row.component';
+import {
+  TimeSeriesChartStatesPanelComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-states-panel.component';
+import {
+  TimeSeriesChartAxisSettingsButtonComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-axis-settings-button.component';
+import {
+  TimeSeriesChartGridSettingsComponent
+} from '@home/components/widget/lib/settings/common/chart/time-series-chart-grid-settings.component';
+import {
+  StatusWidgetStateSettingsComponent
+} from '@home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component';
 
 @NgModule({
   declarations: [
@@ -172,8 +193,15 @@ import {
     TimeSeriesNoAggregationBarWidthSettingsComponent,
     TimeSeriesChartYAxesPanelComponent,
     TimeSeriesChartYAxisRowComponent,
-    TimeSeriesChartYAxisSettingsPanelComponent,
-    TimeSeriesChartAnimationSettingsComponent,
+    TimeSeriesChartAxisSettingsPanelComponent,
+    TimeSeriesChartAxisSettingsButtonComponent,
+    EchartsAnimationSettingsComponent,
+    TimeSeriesChartFillSettingsComponent,
+    TimeSeriesChartThresholdSettingsComponent,
+    TimeSeriesChartStatesPanelComponent,
+    TimeSeriesChartStateRowComponent,
+    TimeSeriesChartGridSettingsComponent,
+    StatusWidgetStateSettingsComponent,
     DataKeyInputComponent,
     EntityAliasInputComponent
   ],
@@ -225,8 +253,15 @@ import {
     TimeSeriesNoAggregationBarWidthSettingsComponent,
     TimeSeriesChartYAxesPanelComponent,
     TimeSeriesChartYAxisRowComponent,
-    TimeSeriesChartYAxisSettingsPanelComponent,
-    TimeSeriesChartAnimationSettingsComponent,
+    TimeSeriesChartAxisSettingsPanelComponent,
+    TimeSeriesChartAxisSettingsButtonComponent,
+    EchartsAnimationSettingsComponent,
+    TimeSeriesChartFillSettingsComponent,
+    TimeSeriesChartThresholdSettingsComponent,
+    TimeSeriesChartStatesPanelComponent,
+    TimeSeriesChartStateRowComponent,
+    TimeSeriesChartGridSettingsComponent,
+    StatusWidgetStateSettingsComponent,
     DataKeyInputComponent,
     EntityAliasInputComponent
   ],
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/status-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/status-widget-settings.component.html
new file mode 100644
index 0000000000..180340881d
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/status-widget-settings.component.html
@@ -0,0 +1,82 @@
+<!--
+
+    Copyright © 2016-2024 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<ng-container [formGroup]="statusWidgetSettingsForm">
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widgets.status-widget.behavior</div>
+    <div class="tb-form-row">
+      <div class="fixed-title-width" tb-hint-tooltip-icon="{{'widgets.rpc-state.initial-state-hint' | translate}}" translate>widgets.rpc-state.initial-state</div>
+      <tb-get-value-action-settings fxFlex
+                                    panelTitle="widgets.rpc-state.initial-state"
+                                    [valueType]="valueType.BOOLEAN"
+                                    trueLabel="widgets.rpc-state.on"
+                                    falseLabel="widgets.rpc-state.off"
+                                    stateLabel="widgets.rpc-state.on"
+                                    [aliasController]="aliasController"
+                                    [targetDevice]="targetDevice"
+                                    [widgetType]="widgetType"
+                                    formControlName="initialState"></tb-get-value-action-settings>
+    </div>
+    <div class="tb-form-row">
+      <div class="fixed-title-width" tb-hint-tooltip-icon="{{'widgets.rpc-state.disabled-state-hint' | translate}}" translate>widgets.rpc-state.disabled-state</div>
+      <tb-get-value-action-settings fxFlex
+                                    panelTitle="widgets.rpc-state.disabled-state"
+                                    [valueType]="valueType.BOOLEAN"
+                                    stateLabel="widgets.rpc-state.disabled"
+                                    [aliasController]="aliasController"
+                                    [targetDevice]="targetDevice"
+                                    [widgetType]="widgetType"
+                                    formControlName="disabledState"></tb-get-value-action-settings>
+    </div>
+  </div>
+  <div class="tb-form-panel">
+    <div class="tb-form-panel-title" translate>widget-config.appearance</div>
+    <tb-image-cards-select rowHeight="1:1"
+                           [cols]="{columns: 3,
+                                    breakpoints: {
+                                      'lt-sm': 1,
+                                      'lt-md': 2
+                                    }}"
+                           label="{{ 'widgets.status-widget.layout' | translate }}" formControlName="layout">
+      <tb-image-cards-select-option *ngFor="let layout of statusWidgetLayouts"
+                                    [value]="layout"
+                                    [image]="statusWidgetLayoutImageMap.get(layout)">
+        {{ statusWidgetLayoutTranslationMap.get(layout) | translate }}
+      </tb-image-cards-select-option>
+    </tb-image-cards-select>
+  </div>
+  <div class="tb-form-panel">
+    <div fxLayout="row" fxLayoutAlign="space-between center">
+      <div class="tb-form-panel-title" translate>widget-config.card-style</div>
+      <tb-toggle-select [(ngModel)]="cardStyleMode"
+                        [ngModelOptions]="{ standalone: true }">
+        <tb-toggle-option value="on">{{ 'widgets.status-widget.on' | translate }}</tb-toggle-option>
+        <tb-toggle-option value="off">{{ 'widgets.status-widget.off' | translate }}</tb-toggle-option>
+      </tb-toggle-select>
+    </div>
+    <tb-status-widget-state-settings
+        *ngIf="cardStyleMode === 'on'"
+        [layout]="statusWidgetSettingsForm.get('layout').value"
+        formControlName="onState">
+    </tb-status-widget-state-settings>
+    <tb-status-widget-state-settings
+        *ngIf="cardStyleMode === 'off'"
+        [layout]="statusWidgetSettingsForm.get('layout').value"
+        formControlName="offState">
+    </tb-status-widget-state-settings>
+  </div>
+</ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/status-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/status-widget-settings.component.ts
new file mode 100644
index 0000000000..03da985a0e
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/indicator/status-widget-settings.component.ts
@@ -0,0 +1,79 @@
+///
+/// Copyright © 2016-2024 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Component, Injector } from '@angular/core';
+import { TargetDevice, WidgetSettings, WidgetSettingsComponent, widgetType } from '@shared/models/widget.models';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { AppState } from '@core/core.state';
+import {
+  statusWidgetDefaultSettings,
+  statusWidgetLayoutImages,
+  statusWidgetLayouts,
+  statusWidgetLayoutTranslations
+} from '@home/components/widget/lib/indicator/status-widget.models';
+import { ValueType } from '@shared/models/constants';
+
+@Component({
+  selector: 'tb-status-widget-settings',
+  templateUrl: './status-widget-settings.component.html',
+  styleUrls: ['./../widget-settings.scss'],
+})
+export class StatusWidgetSettingsComponent extends WidgetSettingsComponent {
+
+  get targetDevice(): TargetDevice {
+    return this.widgetConfig?.config?.targetDevice;
+  }
+
+  get widgetType(): widgetType {
+    return this.widgetConfig?.widgetType;
+  }
+
+  statusWidgetLayouts = statusWidgetLayouts;
+
+  statusWidgetLayoutTranslationMap = statusWidgetLayoutTranslations;
+  statusWidgetLayoutImageMap = statusWidgetLayoutImages;
+
+  valueType = ValueType;
+
+  statusWidgetSettingsForm: UntypedFormGroup;
+
+  cardStyleMode = 'on';
+
+  constructor(protected store: Store<AppState>,
+              private $injector: Injector,
+              private fb: UntypedFormBuilder) {
+    super(store);
+  }
+
+  protected settingsForm(): UntypedFormGroup {
+    return this.statusWidgetSettingsForm;
+  }
+
+  protected defaultSettings(): WidgetSettings {
+    return {...statusWidgetDefaultSettings};
+  }
+
+  protected onSettingsSet(settings: WidgetSettings) {
+    this.statusWidgetSettingsForm = this.fb.group({
+      initialState: [settings.initialState, []],
+      disabledState: [settings.disabledState, []],
+      layout: [settings.layout, []],
+      onState: [settings.onState, []],
+      offState: [settings.offState, []]
+    });
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts
index 8522734eda..fa34b2c358 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts
@@ -336,15 +336,18 @@ import {
 import {
   TimeSeriesChartLineSettingsComponent
 } from '@home/components/widget/lib/settings/chart/time-series-chart-line-settings.component';
-import {
-  TimeSeriesChartFillSettingsComponent
-} from '@home/components/widget/lib/settings/chart/time-series-chart-fill-settings.component';
 import {
   TimeSeriesChartBarSettingsComponent
 } from '@home/components/widget/lib/settings/chart/time-series-chart-bar-settings.component';
 import {
   TimeSeriesChartWidgetSettingsComponent
 } from '@home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component';
+import {
+  StatusWidgetSettingsComponent
+} from '@home/components/widget/lib/settings/indicator/status-widget-settings.component';
+import {
+  PieChartWidgetSettingsComponent
+} from '@home/components/widget/lib/settings/chart/pie-chart-widget-settings.component';
 
 @NgModule({
   declarations: [
@@ -467,8 +470,9 @@ import {
     TimeSeriesChartKeySettingsComponent,
     TimeSeriesChartLineSettingsComponent,
     TimeSeriesChartBarSettingsComponent,
-    TimeSeriesChartFillSettingsComponent,
-    TimeSeriesChartWidgetSettingsComponent
+    TimeSeriesChartWidgetSettingsComponent,
+    StatusWidgetSettingsComponent,
+    PieChartWidgetSettingsComponent
   ],
   imports: [
     CommonModule,
@@ -596,8 +600,9 @@ import {
     TimeSeriesChartKeySettingsComponent,
     TimeSeriesChartLineSettingsComponent,
     TimeSeriesChartBarSettingsComponent,
-    TimeSeriesChartFillSettingsComponent,
-    TimeSeriesChartWidgetSettingsComponent
+    TimeSeriesChartWidgetSettingsComponent,
+    StatusWidgetSettingsComponent,
+    PieChartWidgetSettingsComponent
   ]
 })
 export class WidgetSettingsModule {
@@ -690,5 +695,7 @@ export const widgetSettingsComponentsMap: {[key: string]: Type<IWidgetSettingsCo
   'tb-slider-widget-settings': SliderWidgetSettingsComponent,
   'tb-toggle-button-widget-settings': ToggleButtonWidgetSettingsComponent,
   'tb-time-series-chart-key-settings': TimeSeriesChartKeySettingsComponent,
-  'tb-time-series-chart-widget-settings': TimeSeriesChartWidgetSettingsComponent
+  'tb-time-series-chart-widget-settings': TimeSeriesChartWidgetSettingsComponent,
+  'tb-status-widget-settings': StatusWidgetSettingsComponent,
+  'tb-pie-chart-widget-settings': PieChartWidgetSettingsComponent
 };
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts b/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
index 7537ef0bc4..0011b76898 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
@@ -86,6 +86,9 @@ import { PowerButtonWidgetComponent } from '@home/components/widget/lib/rpc/powe
 import { SliderWidgetComponent } from '@home/components/widget/lib/rpc/slider-widget.component';
 import { ToggleButtonWidgetComponent } from '@home/components/widget/lib/button/toggle-button-widget.component';
 import { TimeSeriesChartWidgetComponent } from '@home/components/widget/lib/chart/time-series-chart-widget.component';
+import { StatusWidgetComponent } from '@home/components/widget/lib/indicator/status-widget.component';
+import { LatestChartComponent } from '@home/components/widget/lib/chart/latest-chart.component';
+import { PieChartWidgetComponent } from '@home/components/widget/lib/chart/pie-chart-widget.component';
 
 @NgModule({
   declarations:
@@ -138,7 +141,10 @@ import { TimeSeriesChartWidgetComponent } from '@home/components/widget/lib/char
       PowerButtonWidgetComponent,
       SliderWidgetComponent,
       ToggleButtonWidgetComponent,
-      TimeSeriesChartWidgetComponent
+      TimeSeriesChartWidgetComponent,
+      StatusWidgetComponent,
+      LatestChartComponent,
+      PieChartWidgetComponent
     ],
   imports: [
     CommonModule,
@@ -195,7 +201,9 @@ import { TimeSeriesChartWidgetComponent } from '@home/components/widget/lib/char
         PowerButtonWidgetComponent,
         SliderWidgetComponent,
         ToggleButtonWidgetComponent,
-        TimeSeriesChartWidgetComponent
+        TimeSeriesChartWidgetComponent,
+        StatusWidgetComponent,
+        PieChartWidgetComponent
     ],
   providers: [
     {provide: WIDGET_COMPONENTS_MODULE_TOKEN, useValue: WidgetComponentsModule }
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-preview.component.scss b/ui-ngx/src/app/modules/home/components/widget/widget-preview.component.scss
index b56ce199ae..e90e9baa8d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-preview.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-preview.component.scss
@@ -17,10 +17,10 @@
   z-index: 10;
   background: #F3F6FA;
   display: flex;
-  align-items: center;
-  justify-content: center;
+  overflow: auto;
   .tb-preview-dashboard {
     position: relative;
+    margin: auto;
   }
   .tb-preview-panel {
     position: absolute;
diff --git a/ui-ngx/src/app/modules/home/models/widget-component.models.ts b/ui-ngx/src/app/modules/home/models/widget-component.models.ts
index 26e5fd4057..581fded240 100644
--- a/ui-ngx/src/app/modules/home/models/widget-component.models.ts
+++ b/ui-ngx/src/app/modules/home/models/widget-component.models.ts
@@ -103,6 +103,7 @@ import { UserId } from '@shared/models/id/user-id';
 import { UserSettingsService } from '@core/http/user-settings.service';
 import { DynamicComponentModule } from '@core/services/dynamic-component-factory.service';
 import { DataKeySettingsFunction } from '@home/components/widget/config/data-keys.component.models';
+import { UtilsService } from '@core/services/utils.service';
 
 export interface IWidgetAction {
   name: string;
@@ -194,6 +195,7 @@ export class WidgetContext {
   customDialog: CustomDialogService;
   resourceService: ResourceService;
   userSettingsService: UserSettingsService;
+  utilsService: UtilsService;
   telemetryWsService: TelemetryWebsocketService;
   telemetrySubscribers?: TelemetrySubscriber[];
   date: DatePipe;
diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.html
index b01f37a717..2e85f8b54b 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.html
+++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.html
@@ -29,13 +29,18 @@
     <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
     <mat-card-content style="padding-top: 16px;">
       <form [formGroup]="oauth2SettingsForm" (ngSubmit)="save()">
-        <fieldset [disabled]="isLoading$ | async">
-          <mat-checkbox formControlName="enabled">
-            {{ 'admin.oauth2.enable' | translate }}
-          </mat-checkbox>
-          <section *ngIf="oauth2SettingsForm.get('enabled').value" style="margin-top: 1em;">
+        <fieldset class="tb-form-panel stroked gap-xs-12" style="margin-bottom: 16px" [disabled]="isLoading$ | async">
+          <div class="tb-form-row no-border no-padding column-xs">
+            <mat-chip-listbox formControlName="enabled">
+              <mat-chip-option [value]="true">{{ 'admin.oauth2.enable' | translate }}</mat-chip-option>
+            </mat-chip-listbox>
+            <mat-chip-listbox formControlName="edgeEnabled">
+              <mat-chip-option [value]="true">{{ 'admin.oauth2.edge-enable' | translate }}</mat-chip-option>
+            </mat-chip-listbox>
+          </div>
+          <section *ngIf="oauth2SettingsForm.get('enabled').value && oauth2ParamsInfos.controls.length">
             <ng-container formArrayName="oauth2ParamsInfos">
-              <div class="container">
+              <div>
                 <mat-accordion multi>
                   <ng-container *ngFor="let oauth2ParamsInfo of oauth2ParamsInfos.controls; let i = index; trackBy: trackByItem">
                     <mat-expansion-panel [formGroupName]="i">
diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.scss b/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.scss
index a476f438e3..639fb877f2 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.scss
@@ -13,7 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@import '../../../../../scss/constants';
+
 :host{
+  .gap-xs-12 {
+    @media #{$mat-xs} {
+      gap: 12px;
+    }
+  }
+
+  .mdc-evolution-chip-set .mdc-evolution-chip {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+
   .checkbox-row {
     margin-top: 1em;
   }
@@ -31,7 +44,7 @@
   }
 
   .container{
-    margin-bottom: 1em;
+    margin-bottom: 16px;
 
     .tb-highlight{
       margin: 0;
diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts
index 1d346c70f1..f6f8340550 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts
@@ -204,13 +204,23 @@ export class OAuth2SettingsComponent extends PageComponent implements OnInit, Ha
   private buildOAuth2SettingsForm(): void {
     this.oauth2SettingsForm = this.fb.group({
       oauth2ParamsInfos: this.fb.array([]),
-      enabled: [false]
+      enabled: [false],
+      edgeEnabled: [{value: false, disabled: true}]
     });
+
+    this.subscriptions.push(this.oauth2SettingsForm.get('enabled').valueChanges.subscribe(enabled => {
+      if (enabled) {
+        this.oauth2SettingsForm.get('edgeEnabled').enable();
+      } else {
+        this.oauth2SettingsForm.get('edgeEnabled').patchValue(false);
+        this.oauth2SettingsForm.get('edgeEnabled').disable();
+      }
+    }))
   }
 
   private initOAuth2Settings(oauth2Info: OAuth2Info): void {
     if (oauth2Info) {
-      this.oauth2SettingsForm.patchValue({enabled: oauth2Info.enabled}, {emitEvent: false});
+      this.oauth2SettingsForm.patchValue({enabled: oauth2Info.enabled, edgeEnabled: oauth2Info.edgeEnabled});
       oauth2Info.oauth2ParamsInfos.forEach((oauth2ParamsInfo) => {
         this.oauth2ParamsInfos.push(this.buildOAuth2ParamsInfoForm(oauth2ParamsInfo));
       });
diff --git a/ui-ngx/src/app/modules/home/pages/asset-profile/asset-profiles-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/asset-profile/asset-profiles-table-config.resolver.ts
index 301949927b..d9eb000e0f 100644
--- a/ui-ngx/src/app/modules/home/pages/asset-profile/asset-profiles-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/asset-profile/asset-profiles-table-config.resolver.ts
@@ -31,7 +31,7 @@ import { DialogService } from '@core/services/dialog.service';
 import { MatDialog } from '@angular/material/dialog';
 import { ImportExportService } from '@shared/import-export/import-export.service';
 import { HomeDialogsService } from '@home/dialogs/home-dialogs.service';
-import { AssetProfile, TB_SERVICE_QUEUE } from '@shared/models/asset.models';
+import { AssetProfile } from '@shared/models/asset.models';
 import { AssetProfileService } from '@core/http/asset-profile.service';
 import { AssetProfileComponent } from '@home/components/profile/asset-profile.component';
 import { AssetProfileTabsComponent } from './asset-profile-tabs.component';
@@ -78,7 +78,7 @@ export class AssetProfilesTableConfigResolver implements Resolve<EntityTableConf
       {
         name: this.translate.instant('asset-profile.set-default'),
         icon: 'flag',
-        isEnabled: (assetProfile) => !assetProfile.default && TB_SERVICE_QUEUE !== assetProfile.name,
+        isEnabled: (assetProfile) => !assetProfile.default,
         onAction: ($event, entity) => this.setDefaultAssetProfile($event, entity)
       }
     );
@@ -94,9 +94,8 @@ export class AssetProfilesTableConfigResolver implements Resolve<EntityTableConf
     this.config.saveEntity = assetProfile => this.assetProfileService.saveAssetProfile(assetProfile);
     this.config.deleteEntity = id => this.assetProfileService.deleteAssetProfile(id.id);
     this.config.onEntityAction = action => this.onAssetProfileAction(action);
-    this.config.deleteEnabled = (assetProfile) => assetProfile && !assetProfile.default && TB_SERVICE_QUEUE !== assetProfile.name;
-    this.config.entitySelectionEnabled = (assetProfile) => assetProfile && !assetProfile.default && TB_SERVICE_QUEUE !== assetProfile.name;
-    this.config.detailsReadonly = (assetProfile) => assetProfile && TB_SERVICE_QUEUE === assetProfile.name;
+    this.config.deleteEnabled = (assetProfile) => assetProfile && !assetProfile.default;
+    this.config.entitySelectionEnabled = (assetProfile) => assetProfile && !assetProfile.default;
     this.config.addActionDescriptors = this.configureAddActions();
   }
 
diff --git a/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.scss
index f7ed839541..ef5a1c0ff4 100644
--- a/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.scss
@@ -155,7 +155,9 @@
             height: 18px;
             background: #305680;
             mask-image: url(/assets/copy-code-icon.svg);
+            -webkit-mask-image: url(/assets/copy-code-icon.svg);
             mask-repeat: no-repeat;
+            -webkit-mask-repeat: no-repeat;
           }
         }
       }
diff --git a/ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.scss
index 4ff80e2c21..b28b28863e 100644
--- a/ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.scss
@@ -92,7 +92,9 @@
             height: 18px;
             background: $tb-primary-color;
             mask-image: url(/assets/copy-code-icon.svg);
+            -webkit-mask-image: url(/assets/copy-code-icon.svg);
             mask-repeat: no-repeat;
+            -webkit-mask-repeat: no-repeat;
           }
         }
         &.multiline {
diff --git a/ui-ngx/src/app/modules/login/pages/login/login.component.html b/ui-ngx/src/app/modules/login/pages/login/login.component.html
index c623d61b9a..8a9b9959c3 100644
--- a/ui-ngx/src/app/modules/login/pages/login/login.component.html
+++ b/ui-ngx/src/app/modules/login/pages/login/login.component.html
@@ -46,7 +46,7 @@
               <input id="username-input" matInput type="email" autofocus formControlName="username" email required/>
               <mat-icon matPrefix>email</mat-icon>
               <mat-error *ngIf="loginFormGroup.get('username').invalid">
-                {{ 'user.invalid-email-format' | translate }}
+                {{ 'login.invalid-email-format' | translate }}
               </mat-error>
             </mat-form-field>
             <mat-form-field class="tb-appearance-transparent">
diff --git a/ui-ngx/src/app/shared/components/image/multiple-gallery-image-input.component.html b/ui-ngx/src/app/shared/components/image/multiple-gallery-image-input.component.html
index 4a60b29ba9..ea6a4cc603 100644
--- a/ui-ngx/src/app/shared/components/image/multiple-gallery-image-input.component.html
+++ b/ui-ngx/src/app/shared/components/image/multiple-gallery-image-input.component.html
@@ -85,12 +85,11 @@
       </div>
     </div>
     <div *ngIf="linkType === ImageLinkType.none" class="tb-image-select-buttons-container">
-      <button #browseGalleryButton
-              mat-stroked-button
+      <button mat-stroked-button
               type="button"
               color="primary"
               class="tb-image-select-button"
-              (click)="toggleGallery($event, browseGalleryButton)">
+              (click)="toggleGallery($event)">
         <tb-icon matButtonIcon>filter</tb-icon>
         <span translate>image.browse-from-gallery</span>
       </button>
diff --git a/ui-ngx/src/app/shared/components/image/multiple-gallery-image-input.component.ts b/ui-ngx/src/app/shared/components/image/multiple-gallery-image-input.component.ts
index 260a7667f8..a1183acf88 100644
--- a/ui-ngx/src/app/shared/components/image/multiple-gallery-image-input.component.ts
+++ b/ui-ngx/src/app/shared/components/image/multiple-gallery-image-input.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { ChangeDetectorRef, Component, forwardRef, Input, OnDestroy, Renderer2, ViewContainerRef } from '@angular/core';
+import { ChangeDetectorRef, Component, forwardRef, Input, OnDestroy } from '@angular/core';
 import { PageComponent } from '@shared/components/page.component';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
@@ -24,10 +24,13 @@ import { DndDropEvent } from 'ngx-drag-drop';
 import { isUndefined } from '@core/utils';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import { ImageLinkType } from '@shared/components/image/gallery-image-input.component';
-import { TbPopoverService } from '@shared/components/popover.service';
-import { MatButton } from '@angular/material/button';
-import { ImageGalleryComponent } from '@shared/components/image/image-gallery.component';
-import { prependTbImagePrefixToUrls, removeTbImagePrefixFromUrls } from '@shared/models/resource.models';
+import {
+  ImageResourceInfo,
+  prependTbImagePrefixToUrls,
+  removeTbImagePrefixFromUrls
+} from '@shared/models/resource.models';
+import { MatDialog } from '@angular/material/dialog';
+import { ImageGalleryDialogComponent } from '@shared/components/image/image-gallery-dialog.component';
 
 @Component({
   selector: 'tb-multiple-gallery-image-input',
@@ -66,10 +69,8 @@ export class MultipleGalleryImageInputComponent extends PageComponent implements
   private propagateChange = null;
 
   constructor(protected store: Store<AppState>,
-              private cd: ChangeDetectorRef,
-              private renderer: Renderer2,
-              private viewContainerRef: ViewContainerRef,
-              private popoverService: TbPopoverService) {
+              private dialog: MatDialog,
+              private cd: ChangeDetectorRef) {
     super(store);
   }
 
@@ -130,31 +131,21 @@ export class MultipleGalleryImageInputComponent extends PageComponent implements
     this.updateModel();
   }
 
-  toggleGallery($event: Event, browseGalleryButton: MatButton) {
+  toggleGallery($event: Event) {
     if ($event) {
       $event.stopPropagation();
     }
-    const trigger = browseGalleryButton._elementRef.nativeElement;
-    if (this.popoverService.hasPopover(trigger)) {
-      this.popoverService.hidePopover(trigger);
-    } else {
-      const ctx: any = {
-        pageMode: false,
-        popoverMode: true,
-        mode: 'grid',
-        selectionMode: true
-      };
-      const imageGalleryPopover = this.popoverService.displayPopover(trigger, this.renderer,
-        this.viewContainerRef, ImageGalleryComponent, 'top', true, null,
-        ctx,
-        {},
-        {}, {}, true);
-      imageGalleryPopover.tbComponentRef.instance.imageSelected.subscribe((image) => {
-        imageGalleryPopover.hide();
+    this.dialog.open<ImageGalleryDialogComponent, any,
+      ImageResourceInfo>(ImageGalleryDialogComponent, {
+      autoFocus: false,
+      disableClose: false,
+      panelClass: ['tb-dialog', 'tb-fullscreen-dialog']
+    }).afterClosed().subscribe((image) => {
+      if (image) {
         this.imageUrls.push(image.link);
         this.updateModel();
-      });
-    }
+      }
+    });
   }
 
   imageDragStart(index: number) {
diff --git a/ui-ngx/src/app/shared/components/json-content.component.html b/ui-ngx/src/app/shared/components/json-content.component.html
index 33b1936213..1a09d539c8 100644
--- a/ui-ngx/src/app/shared/components/json-content.component.html
+++ b/ui-ngx/src/app/shared/components/json-content.component.html
@@ -18,7 +18,7 @@
 <div class="tb-json-content" style="background: #fff;" [ngClass]="{'fill-height': fillHeight}"
      tb-fullscreen
      [fullscreen]="fullscreen" (fullscreenChanged)="onFullscreen()" fxLayout="column">
-  <div fxLayout="row" fxLayoutAlign="start center" style="height: 40px;" class="tb-json-content-toolbar">
+  <div fxLayout="row" fxLayoutAlign="start center" style="height: 40px;" class="tb-json-content-toolbar" *ngIf="hideToolbar">
     <label class="tb-title no-padding" [ngClass]="{'tb-error': !disabled && (!contentValid || required && !contentBody), 'tb-required': !disabled && required}">{{ label }}</label>
     <span fxFlex></span>
     <button type="button"
diff --git a/ui-ngx/src/app/shared/components/json-content.component.ts b/ui-ngx/src/app/shared/components/json-content.component.ts
index f3d57f80af..d79feacfbc 100644
--- a/ui-ngx/src/app/shared/components/json-content.component.ts
+++ b/ui-ngx/src/app/shared/components/json-content.component.ts
@@ -24,11 +24,11 @@ import {
   OnDestroy,
   OnInit,
   SimpleChanges,
-  ViewChild, ViewEncapsulation
+  ViewChild,
+  ViewEncapsulation
 } from '@angular/core';
-import { ControlValueAccessor, UntypedFormControl, NG_VALIDATORS, NG_VALUE_ACCESSOR, Validator } from '@angular/forms';
+import { ControlValueAccessor, NG_VALIDATORS, NG_VALUE_ACCESSOR, UntypedFormControl, Validator } from '@angular/forms';
 import { Ace } from 'ace-builds';
-import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { ActionNotificationHide, ActionNotificationShow } from '@core/notification/notification.actions';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
@@ -38,6 +38,7 @@ import { guid } from '@core/utils';
 import { ResizeObserver } from '@juggle/resize-observer';
 import { getAce } from '@shared/models/ace/ace.models';
 import { beautifyJs } from '@shared/models/beautify.models';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
   selector: 'tb-json-content',
@@ -79,41 +80,27 @@ export class JsonContentComponent implements OnInit, ControlValueAccessor, Valid
 
   @Input() editorStyle: {[klass: string]: any};
 
-  private readonlyValue: boolean;
-  get readonly(): boolean {
-    return this.readonlyValue;
-  }
+  @Input() tbPlaceholder: string;
+
   @Input()
-  set readonly(value: boolean) {
-    this.readonlyValue = coerceBooleanProperty(value);
-  }
+  @coerceBoolean()
+  hideToolbar = false;
 
-  private validateContentValue: boolean;
-  get validateContent(): boolean {
-    return this.validateContentValue;
-  }
   @Input()
-  set validateContent(value: boolean) {
-    this.validateContentValue = coerceBooleanProperty(value);
-  }
+  @coerceBoolean()
+  readonly: boolean;
 
-  private validateOnChangeValue: boolean;
-  get validateOnChange(): boolean {
-    return this.validateOnChangeValue;
-  }
   @Input()
-  set validateOnChange(value: boolean) {
-    this.validateOnChangeValue = coerceBooleanProperty(value);
-  }
+  @coerceBoolean()
+  validateContent: boolean;
 
-  private requiredValue: boolean;
-  get required(): boolean {
-    return this.requiredValue;
-  }
   @Input()
-  set required(value: boolean) {
-    this.requiredValue = coerceBooleanProperty(value);
-  }
+  @coerceBoolean()
+  validateOnChange: boolean;
+
+  @Input()
+  @coerceBoolean()
+  required: boolean;
 
   fullscreen = false;
 
@@ -169,6 +156,10 @@ export class JsonContentComponent implements OnInit, ControlValueAccessor, Valid
             this.cd.markForCheck();
           });
         }
+
+        if (this.tbPlaceholder && this.tbPlaceholder.length) {
+          this.createPlaceholder();
+        }
         this.editorResize$ = new ResizeObserver(() => {
           this.onAceEditorResize();
         });
@@ -177,6 +168,39 @@ export class JsonContentComponent implements OnInit, ControlValueAccessor, Valid
     );
   }
 
+  private createPlaceholder() {
+    this.jsonEditor.on('input', this.updateEditorPlaceholder.bind(this));
+    setTimeout(this.updateEditorPlaceholder.bind(this), 100);
+  }
+
+  private updateEditorPlaceholder() {
+    const shouldShow = !this.jsonEditor.session.getValue().length;
+    let node: HTMLElement = (this.jsonEditor.renderer as any).emptyMessageNode;
+    if (!shouldShow && node) {
+      this.jsonEditor.renderer.getMouseEventTarget().removeChild(node);
+      (this.jsonEditor.renderer as any).emptyMessageNode = null;
+    } else if (shouldShow && !node) {
+      const placeholderElement = $('<textarea></textarea>');
+      placeholderElement.text(this.tbPlaceholder);
+      placeholderElement.addClass('ace_invisible ace_emptyMessage');
+      placeholderElement.css({
+        padding: '0 9px',
+        width: '100%',
+        border: 'none',
+        textWrap: 'nowrap',
+        whiteSpace: 'pre',
+        overflow: 'hidden',
+        resize: 'none',
+        fontSize: '15px'
+      });
+      const rows = this.tbPlaceholder.split('\n').length;
+      placeholderElement.attr('rows', rows);
+      node = placeholderElement[0];
+      (this.jsonEditor.renderer as any).emptyMessageNode = node;
+      this.jsonEditor.renderer.getMouseEventTarget().appendChild(node);
+    }
+  }
+
   ngOnDestroy(): void {
     if (this.editorResize$) {
       this.editorResize$.disconnect();
diff --git a/ui-ngx/src/app/shared/components/time/timeinterval.component.ts b/ui-ngx/src/app/shared/components/time/timeinterval.component.ts
index 8775b0a6ed..8ed6fb2034 100644
--- a/ui-ngx/src/app/shared/components/time/timeinterval.component.ts
+++ b/ui-ngx/src/app/shared/components/time/timeinterval.component.ts
@@ -21,6 +21,7 @@ import { coerceNumberProperty } from '@angular/cdk/coercion';
 import { SubscriptSizing } from '@angular/material/form-field';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import { Interval, IntervalMath, TimeInterval } from '@shared/models/time/time.models';
+import { isDefined } from '@core/utils';
 
 @Component({
   selector: 'tb-timeinterval',
@@ -90,14 +91,17 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
   secs = 0;
 
   interval: Interval = 0;
-  modelValue: Interval;
+  intervals: Array<TimeInterval>;
 
   advanced = false;
-  rendered = false;
 
-  intervals: Array<TimeInterval>;
+  private modelValue: Interval;
+  private rendered = false;
+  private propagateChangeValue: any;
 
-  private propagateChange = (_: any) => {};
+  private propagateChange = (value: any) => {
+    this.propagateChangeValue = value;
+  };
 
   constructor(private timeService: TimeService) {
   }
@@ -108,6 +112,9 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
 
   registerOnChange(fn: any): void {
     this.propagateChange = fn;
+    if (isDefined(this.propagateChangeValue)) {
+      this.propagateChange(this.propagateChangeValue);
+    }
   }
 
   registerOnTouched(fn: any): void {
@@ -132,7 +139,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     }
   }
 
-  setInterval(interval: Interval) {
+  private setInterval(interval: Interval) {
     if (!this.advanced) {
       this.interval = interval;
     }
@@ -143,7 +150,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     this.secs = intervalSeconds % 60;
   }
 
-  boundInterval(updateToPreferred = false) {
+  private boundInterval(updateToPreferred = false) {
     const min = this.timeService.boundMinInterval(this.minValue);
     const max = this.timeService.boundMaxInterval(this.maxValue);
     this.intervals = this.timeService.getIntervals(this.minValue, this.maxValue, this.useCalendarIntervals);
@@ -165,7 +172,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     }
   }
 
-  updateView(updateToPreferred = false) {
+  private updateView(updateToPreferred = false) {
     if (!this.rendered) {
       return;
     }
@@ -187,7 +194,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     this.boundInterval(updateToPreferred);
   }
 
-  calculateIntervalMs(): number {
+  private calculateIntervalMs(): number {
     return (this.days * 86400 +
       this.hours * 3600 +
       this.mins * 60 +
@@ -232,7 +239,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     }
   }
 
-  onSecsChange() {
+  private onSecsChange() {
     if (typeof this.secs === 'undefined') {
       return;
     }
@@ -252,7 +259,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     this.updateView();
   }
 
-  onMinsChange() {
+  private onMinsChange() {
     if (typeof this.mins === 'undefined') {
       return;
     }
@@ -272,7 +279,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     this.updateView();
   }
 
-  onHoursChange() {
+  private onHoursChange() {
     if (typeof this.hours === 'undefined') {
       return;
     }
@@ -292,7 +299,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     this.updateView();
   }
 
-  onDaysChange() {
+  private onDaysChange() {
     if (typeof this.days === 'undefined') {
       return;
     }
diff --git a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts
index 0c0dd4294c..857d2c7cb7 100644
--- a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts
+++ b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts
@@ -20,7 +20,6 @@ import {
   AggregationType,
   DAY,
   HistoryWindowType,
-  QuickTimeInterval,
   quickTimeIntervalPeriod,
   RealtimeWindowType,
   Timewindow,
diff --git a/ui-ngx/src/app/shared/models/asset.models.ts b/ui-ngx/src/app/shared/models/asset.models.ts
index bcdde08009..6ba8bc8abb 100644
--- a/ui-ngx/src/app/shared/models/asset.models.ts
+++ b/ui-ngx/src/app/shared/models/asset.models.ts
@@ -24,8 +24,6 @@ import { RuleChainId } from '@shared/models/id/rule-chain-id';
 import { DashboardId } from '@shared/models/id/dashboard-id';
 import { EntityInfoData, HasTenantId } from '@shared/models/entity.models';
 
-export const TB_SERVICE_QUEUE = 'TbServiceQueue';
-
 export interface AssetProfile extends BaseData<AssetProfileId>, HasTenantId, ExportableEntity<AssetProfileId> {
   tenantId?: TenantId;
   name: string;
diff --git a/ui-ngx/src/app/shared/models/entity-type.models.ts b/ui-ngx/src/app/shared/models/entity-type.models.ts
index 194327f671..885ea90929 100644
--- a/ui-ngx/src/app/shared/models/entity-type.models.ts
+++ b/ui-ngx/src/app/shared/models/entity-type.models.ts
@@ -39,6 +39,7 @@ export enum EntityType {
   OTA_PACKAGE = 'OTA_PACKAGE',
   RPC = 'RPC',
   QUEUE = 'QUEUE',
+  QUEUE_STATS = 'QUEUE_STATS',
   NOTIFICATION = 'NOTIFICATION',
   NOTIFICATION_REQUEST = 'NOTIFICATION_REQUEST',
   NOTIFICATION_RULE = 'NOTIFICATION_RULE',
@@ -362,6 +363,13 @@ export const entityTypeTranslations = new Map<EntityType | AliasEntityType, Enti
         selectedEntities: 'queue.selected-queues'
       }
     ],
+    [
+      EntityType.QUEUE_STATS,
+      {
+        type: 'entity.type-queue-stats',
+        typePlural: 'entity.type-queues-stats'
+      }
+    ],
     [
       EntityType.NOTIFICATION,
       {
diff --git a/ui-ngx/src/app/shared/models/entity.models.ts b/ui-ngx/src/app/shared/models/entity.models.ts
index 84d138f0a8..9fc5e4fe3c 100644
--- a/ui-ngx/src/app/shared/models/entity.models.ts
+++ b/ui-ngx/src/app/shared/models/entity.models.ts
@@ -161,6 +161,16 @@ export const entityFields: {[fieldName: string]: EntityField} = {
     keyName: 'label',
     name: 'entity-field.label',
     value: 'label'
+  },
+  queueName: {
+    keyName: 'queueName',
+    name: 'entity-field.queue-name',
+    value: 'queueName'
+  },
+  serviceId: {
+    keyName: 'serviceId',
+    name: 'entity-field.service-id',
+    value: 'serviceId'
   }
 };
 
diff --git a/ui-ngx/src/app/shared/models/oauth2.models.ts b/ui-ngx/src/app/shared/models/oauth2.models.ts
index b77a5f5888..9e3d3fa1c5 100644
--- a/ui-ngx/src/app/shared/models/oauth2.models.ts
+++ b/ui-ngx/src/app/shared/models/oauth2.models.ts
@@ -18,6 +18,7 @@ import { HasUUID } from '@shared/models/id/has-uuid';
 
 export interface OAuth2Info {
   enabled: boolean;
+  edgeEnabled: boolean;
   oauth2ParamsInfos: OAuth2ParamsInfo[];
 }
 
diff --git a/ui-ngx/src/app/shared/models/query/query.models.ts b/ui-ngx/src/app/shared/models/query/query.models.ts
index 4ba6608023..761982cf3c 100644
--- a/ui-ngx/src/app/shared/models/query/query.models.ts
+++ b/ui-ngx/src/app/shared/models/query/query.models.ts
@@ -885,6 +885,9 @@ export function entityDataToEntityInfo(entityData: EntityData): EntityInfo {
         } catch (e) {}
       }
     }
+    if (fields.queueName && fields.serviceId) {
+      entityInfo.name = fields.queueName.value + '_' + fields.serviceId.value;
+    }
   }
   return entityInfo;
 }
diff --git a/ui-ngx/src/app/shared/models/vc.models.ts b/ui-ngx/src/app/shared/models/vc.models.ts
index 8cf7366a0a..ba54a297a7 100644
--- a/ui-ngx/src/app/shared/models/vc.models.ts
+++ b/ui-ngx/src/app/shared/models/vc.models.ts
@@ -144,6 +144,7 @@ export interface EntityTypeVersionLoadConfig extends VersionLoadConfig {
 export interface EntityTypeVersionLoadRequest extends VersionLoadRequest {
   entityTypes: {[entityType: string]: EntityTypeVersionLoadConfig};
   type: VersionLoadRequestType.ENTITY_TYPE;
+  rollbackOnError: boolean;
 }
 
 export function createDefaultEntityTypesVersionLoad(): {[entityType: string]: EntityTypeVersionLoadConfig} {
diff --git a/ui-ngx/src/app/shared/models/widget.models.ts b/ui-ngx/src/app/shared/models/widget.models.ts
index c736ed7404..47605f108b 100644
--- a/ui-ngx/src/app/shared/models/widget.models.ts
+++ b/ui-ngx/src/app/shared/models/widget.models.ts
@@ -21,7 +21,6 @@ import { AggregationType, ComparisonDuration, Timewindow } from '@shared/models/
 import { EntityType } from '@shared/models/entity-type.models';
 import { DataKeyType } from './telemetry/telemetry.models';
 import { EntityId } from '@shared/models/id/entity-id';
-import * as moment_ from 'moment';
 import {
   AlarmFilter,
   AlarmFilterConfig,
@@ -710,10 +709,23 @@ export const defaultWidgetAction = (setEntityId = true): WidgetAction => ({
 
 export interface WidgetComparisonSettings {
   comparisonEnabled?: boolean;
-  timeForComparison?: moment_.unitOfTime.DurationConstructor;
+  timeForComparison?: ComparisonDuration;
   comparisonCustomIntervalValue?: number;
 }
 
+export interface DataKeyComparisonSettings {
+  showValuesForComparison: boolean;
+  comparisonValuesLabel: string;
+  color: string;
+}
+
+export interface DataKeySettingsWithComparison {
+  comparisonSettings?: DataKeyComparisonSettings;
+}
+
+export const isDataKeySettingsWithComparison = (settings: any): settings is DataKeySettingsWithComparison =>
+  'comparisonSettings' in settings;
+
 export interface WidgetSettings {
   [key: string]: any;
 }
diff --git a/ui-ngx/src/assets/dashboard/api_usage.json b/ui-ngx/src/assets/dashboard/api_usage.json
index c0f3645156..5564223512 100644
--- a/ui-ngx/src/assets/dashboard/api_usage.json
+++ b/ui-ngx/src/assets/dashboard/api_usage.json
@@ -14,6 +14,7 @@
                     "datasources": [
                         {
                             "type": "entity",
+                            "entityAliasId": "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f",
                             "dataKeys": [
                                 {
                                     "name": "ruleEngineException",
@@ -52,7 +53,29 @@
                                     "_hash": 0.7255162989552142
                                 }
                             ],
-                            "entityAliasId": "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f"
+                            "alarmFilterConfig": {
+                                "statusList": [
+                                    "ACTIVE"
+                                ]
+                            },
+                            "latestDataKeys": [
+                                {
+                                    "name": "queueName",
+                                    "type": "entityField",
+                                    "label": "Queue name",
+                                    "color": "#ffc107",
+                                    "settings": {},
+                                    "_hash": 0.6889245277142959
+                                },
+                                {
+                                    "name": "serviceId",
+                                    "type": "entityField",
+                                    "label": "Service Id",
+                                    "color": "#607d8b",
+                                    "settings": {},
+                                    "_hash": 0.7972226575450785
+                                }
+                            ]
                         }
                     ],
                     "timewindow": {
@@ -7690,7 +7713,25 @@
                                 "statusList": [
                                     "ACTIVE"
                                 ]
-                            }
+                            },
+                            "latestDataKeys": [
+                                {
+                                    "name": "queueName",
+                                    "type": "entityField",
+                                    "label": "Queue name",
+                                    "color": "#ffc107",
+                                    "settings": {},
+                                    "_hash": 0.7021721434431745
+                                },
+                                {
+                                    "name": "serviceId",
+                                    "type": "entityField",
+                                    "label": "Service Id",
+                                    "color": "#607d8b",
+                                    "settings": {},
+                                    "_hash": 0.5924381120750077
+                                }
+                            ]
                         }
                     ],
                     "timewindow": {
@@ -8080,7 +8121,25 @@
                                 "statusList": [
                                     "ACTIVE"
                                 ]
-                            }
+                            },
+                            "latestDataKeys": [
+                                {
+                                    "name": "queueName",
+                                    "type": "entityField",
+                                    "label": "Queue name",
+                                    "color": "#f44336",
+                                    "settings": {},
+                                    "_hash": 0.7066844328378095
+                                },
+                                {
+                                    "name": "serviceId",
+                                    "type": "entityField",
+                                    "label": "Service Id",
+                                    "color": "#ffc107",
+                                    "settings": {},
+                                    "_hash": 0.1371570237026627
+                                }
+                            ]
                         }
                     ],
                     "timewindow": {
@@ -8674,12 +8733,9 @@
                 "id": "2e4c97b0-257a-a1b9-690c-141d9bf2ec6f",
                 "alias": "TbServiceQueues",
                 "filter": {
-                    "type": "assetType",
+                    "type": "entityType",
                     "resolveMultiple": true,
-                    "assetNameFilter": "",
-                    "assetTypes": [
-                        "TbServiceQueue"
-                    ]
+                    "entityType": "QUEUE_STATS"
                 }
             }
         },
diff --git a/ui-ngx/src/assets/help/en_US/widget/action/custom_additional_params.md b/ui-ngx/src/assets/help/en_US/widget/action/custom_additional_params.md
index 35ede5703a..7d5aa04336 100644
--- a/ui-ngx/src/assets/help/en_US/widget/action/custom_additional_params.md
+++ b/ui-ngx/src/assets/help/en_US/widget/action/custom_additional_params.md
@@ -39,8 +39,16 @@ An optional key/value object holding additional entity parameters depending on w
             containing <code>entity</code> field holding basic entity properties <br> (ex. <code>id</code>, <code>name</code>, <code>label</code>) and <code>data</code> field holding other entity attributes/timeseries declared in widget datasource configuration.
       </li>
     </ul>
-  </li>    
-  <li>Pie - Flot widget (<i>On slice click</i>) - <b>additionalParams:</b> <code><a href="https://github.com/thingsboard/thingsboard/blob/e264f7b8ddff05bda85c4833bf497f47f447496e/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.models.ts#L62" target="_blank">TbFlotPlotItem</a></code>:
+  </li>
+  <li>Pie (<i>On slice click</i>) - <b>additionalParams:</b> <code>LatestChartDataItem</code>:
+    <ul>
+      <li><b>additionalParams:</b> <code>LatestChartDataItem</code> - A 
+            data object of clicked pie slice 
+            containing <code>dataKey</code>, <code>datasource</code> and <code>value</code> fields.
+      </li>
+    </ul>
+  </li>
+  <li>Pie - Flot widget (deprecated) (<i>On slice click</i>) - <b>additionalParams:</b> <code><a href="https://github.com/thingsboard/thingsboard/blob/e264f7b8ddff05bda85c4833bf497f47f447496e/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.models.ts#L62" target="_blank">TbFlotPlotItem</a></code>:
     <ul>
       <li><b>additionalParams:</b> <code><a href="https://github.com/thingsboard/thingsboard/blob/e264f7b8ddff05bda85c4833bf497f47f447496e/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.models.ts#L62" target="_blank">TbFlotPlotItem</a></code> - A 
             <a href="https://github.com/thingsboard/thingsboard/blob/e264f7b8ddff05bda85c4833bf497f47f447496e/ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.models.ts#L62" target="_blank">TbFlotPlotItem</a> object
diff --git a/ui-ngx/src/assets/help/en_US/widget/lib/chart/ticks_generator_fn.md b/ui-ngx/src/assets/help/en_US/widget/lib/chart/ticks_generator_fn.md
new file mode 100644
index 0000000000..e3b5bf817a
--- /dev/null
+++ b/ui-ngx/src/assets/help/en_US/widget/lib/chart/ticks_generator_fn.md
@@ -0,0 +1,61 @@
+#### Ticks generator function
+
+<div class="divider"></div>
+<br/>
+
+*function (extent): {value: number}[]*
+
+A JavaScript function used to generate Y axis ticks.
+
+**Parameters:**
+
+<ul>
+  <li><b>extent:</b> <code>number[]</code> - An array of two numbers holding axis min and max values <b>[axisMin, axisMax]</b>.
+  </li>
+</ul>
+
+**Returns:**
+
+An array of tick values with the following structure:
+
+```typescript
+{
+    value: number
+}
+```
+
+<div class="divider"></div>
+
+##### Examples
+
+* Always display only one tick in the middle:
+
+```javascript
+return extent ? [{ value: (extent[0] + extent[1]) / 2}] : [];
+{:copy-code}
+```
+
+* Display only min and max ticks:
+
+```javascript
+if (extent) {
+  return [ {value: extent[0]}, {value: extent[1]} ];
+} else {
+  return [];
+}
+{:copy-code}
+```
+
+* Disable ticks:
+
+```javascript
+return [];
+{:copy-code}
+```
+
+* Constant ticks (1,2,3):
+
+```javascript
+return [ {value: 1}, {value: 2}, {value: 3} ];
+{:copy-code}
+```
diff --git a/ui-ngx/src/assets/locale/locale.constant-ar_AR.json b/ui-ngx/src/assets/locale/locale.constant-ar_AR.json
new file mode 100644
index 0000000000..104eb18abd
--- /dev/null
+++ b/ui-ngx/src/assets/locale/locale.constant-ar_AR.json
@@ -0,0 +1,8263 @@
+{
+    "access": {
+        "unauthorized": "غير مصرح لك",
+        "unauthorized-access": "وصول غير مصرح",
+        "unauthorized-access-text": "يجب عليك تسجيل الدخول للوصول إلى هذا المورد!",
+        "access-forbidden": "الوصول ممنوع",
+        "access-forbidden-text": "ليس لديك حق الوصول إلى هذا المكان!<br/>جرب تسجيل الدخول بمستخدم مختلف إذا كنت لا تزال ترغب في الوصول إلى هذا المكان.",
+        "refresh-token-expired": "انتهت صلاحية الجلسة",
+        "refresh-token-failed": "غير قادر على تحديث الجلسة",
+        "permission-denied": "رفض الإذن",
+        "permission-denied-text": "ليس لديك إذن لأداء هذه العملية!"
+    },
+    "account": {
+        "account": "الحساب",
+        "notification-settings": "إعدادات الإشعارات"
+    },
+    "action": {
+        "activate": "تفعيل",
+        "suspend": "تعليق",
+        "save": "حفظ",
+        "saveAs": "حفظ باسم",
+        "move": "نقل",
+        "cancel": "إلغاء",
+        "ok": "موافق",
+        "delete": "حذف",
+        "add": "إضافة",
+        "yes": "نعم",
+        "no": "لا",
+        "update": "تحديث",
+        "remove": "إزالة",
+        "search": "بحث",
+        "clear-search": "مسح البحث",
+        "assign": "تعيين",
+        "unassign": "إلغاء التعيين",
+        "share": "مشاركة",
+        "make-private": "جعل خاص",
+        "make-public": "جعل عام",
+        "apply": "تطبيق",
+        "apply-changes": "تطبيق التغييرات",
+        "edit-mode": "وضع التحرير",
+        "enter-edit-mode": "الدخول إلى وضع التحرير",
+        "decline-changes": "رفض التغييرات",
+        "open": "فتح",
+        "decline": "رفض",
+        "close": "إغلاق",
+        "back": "رجوع",
+        "run": "تشغيل",
+        "sign-in": "تسجيل الدخول",
+        "edit": "تعديل",
+        "view": "عرض",
+        "create": "إنشاء",
+        "drag": "سحب",
+        "refresh": "تحديث",
+        "undo": "تراجع",
+        "copy": "نسخ",
+        "paste": "لصق",
+        "copy-reference": "نسخ المرجع",
+        "paste-reference": "لصق المرجع",
+        "import": "استيراد",
+        "export": "تصدير",
+        "share-via": "مشاركة عبر {{provider}}",
+        "select": "اختيار",
+        "continue": "استمرار",
+        "discard-changes": "تجاهل التغييرات",
+        "download": "تنزيل",
+        "next": "التالي",
+        "next-with-label": "التالي: {{label}}",
+        "read-more": "اقرأ المزيد",
+        "hide": "إخفاء",
+        "done": "تم",
+        "print": "طباعة",
+        "restore": "استعادة",
+        "confirm": "تأكيد",
+        "more": "المزيد",
+        "less": "أقل",
+        "skip": "تخطي",
+        "send": "إرسال",
+        "reset": "إعادة تعيين",
+        "show-more": "عرض المزيد",
+        "dont-show-again": "لا تظهر مرة أخرى",
+        "see-documentation": "مشاهدة الوثائق",
+        "clear": "مسح",
+        "upload": "تحميل",
+        "delete-anyway": "الحذف على أي حال",
+        "delete-selected": "حذف المحدد"
+    },
+    "aggregation": {
+        "aggregation": "تجميع",
+        "function": "وظيفة تجميع البيانات",
+        "limit": "الحد الأقصى للقيم",
+        "group-interval": "فترة التجميع",
+        "min": "الحد الأدنى",
+        "max": "الحد الأقصى",
+        "avg": "متوسط",
+        "sum": "مجموع",
+        "count": "عدد",
+        "none": "لا شيء"
+    },
+    "admin": {
+        "settings": "الإعدادات",
+        "general": "عام",
+        "general-settings": "الإعدادات العامة",
+        "home-settings": "إعدادات الصفحة الرئيسية",
+        "home": "الصفحة الرئيسية",
+        "outgoing-mail": "خادم البريد الصادر",
+        "outgoing-mail-settings": "إعدادات خادم البريد الصادر",
+        "system-settings": "إعدادات النظام",
+        "test-mail-sent": "تم إرسال بريد الاختبار بنجاح!",
+        "base-url": "عنوان URL الأساسي",
+        "base-url-required": "عنوان URL الأساسي مطلوب.",
+        "prohibit-different-url": "منع استخدام اسم المضيف من رؤوس طلب العميل",
+        "prohibit-different-url-hint": "يجب تفعيل هذا الإعداد لبيئات الإنتاج. قد يسبب مشاكل أمنية عند تعطيله",
+        "device-connectivity": {
+            "device-connectivity": "اتصال الجهاز",
+            "http-s": "HTTP(s)",
+            "mqtt-s": "MQTT(s)",
+            "coap-s": "COAP(s)",
+            "http": "HTTP",
+            "https": "HTTPs",
+            "mqtt": "MQTT",
+            "mqtts": "MQTTs",
+            "coap": "COAP",
+            "coaps": "COAPs",
+            "hint": "إذا كانت حقول العنوان أو المنفذ فارغة، سيتم استخدام قيمة البروتوكول الافتراضية.",
+            "host": "المضيف",
+            "port": "المنفذ",
+            "port-pattern": "يجب أن يكون المنفذ عددًا صحيحًا موجبًا.",
+            "port-range": "يجب أن يكون المنفذ في نطاق من 1 إلى 65535."
+        },
+        "mail-from": "البريد من",
+        "mail-from-required": "البريد من مطلوب.",
+        "smtp-protocol": "بروتوكول SMTP",
+        "smtp-host": "مضيف SMTP",
+        "smtp-host-required": "مضيف SMTP مطلوب.",
+        "smtp-port": "منفذ SMTP",
+        "smtp-port-required": "يجب توفير منفذ smtp.",
+        "smtp-port-invalid": "هذا لا يبدو منفذ smtp صالحًا.",
+        "timeout-msec": "المهلة (ميلي ثانية)",
+        "timeout-required": "المهلة مطلوبة.",
+        "timeout-invalid": "هذا لا يبدو مهلة صالحة.",
+        "enable-tls": "تفعيل TLS",
+        "tls-version": "إصدار TLS",
+        "enable-proxy": "تفعيل الوكيل",
+        "proxy-host": "مضيف الوكيل",
+        "proxy-host-required": "مضيف الوكيل مطلوب.",
+        "proxy-port": "منفذ الوكيل",
+        "proxy-port-required": "منفذ الوكيل مطلوب.",
+        "proxy-port-range": "يجب أن يكون منفذ الوكيل في نطاق من 1 إلى 65535.",
+        "proxy-user": "مستخدم الوكيل",
+        "proxy-password": "كلمة مرور الوكيل",
+        "change-password": "تغيير كلمة المرور",
+        "send-test-mail": "إرسال بريد اختبار",
+        "use-system-mail-settings": "استخدام إعدادات خادم البريد النظام",
+        "mail-templates": "قوالب البريد",
+        "mail-template-settings": "إعدادات قوالب البريد",
+        "use-system-mail-template-settings": "استخدام قوالب البريد النظام",
+        "mail-template": {
+            "mail-template": "قالب البريد",
+            "test": "رسالة بريد اختبارية",
+            "activation": "رسالة تفعيل الحساب",
+            "account-activated": "رسالة تم تفعيل الحساب",
+            "account-lockout": "رسالة قفل الحساب",
+            "reset-password": "رسالة إعادة تعيين كلمة المرور",
+            "password-was-reset": "تم إعادة تعيين كلمة المرور",
+            "user-activated": "رسالة تم تفعيل المستخدم",
+            "user-registered": "رسالة تسجيل المستخدم",
+            "api-usage-state-enabled": "تم تفعيل حالة استخدام API",
+            "api-usage-state-warning": "تحذير حالة استخدام API",
+            "api-usage-state-disabled": "تم تعطيل حالة استخدام API",
+            "two-fa-verification": "رسالة التحقق 2FA"
+        },
+        "mail-subject": "موضوع البريد",
+        "mail-body": "نص البريد",
+        "sms-provider": "مزود الرسائل القصيرة",
+        "sms-provider-settings": "إعدادات مزود الرسائل القصيرة",
+        "use-system-sms-settings": "استخدام إعدادات مزود الرسائل القصيرة النظام",
+        "sms-provider-type": "نوع مزود الرسائل القصيرة",
+        "sms-provider-type-required": "نوع مزود الرسائل القصيرة مطلوب.",
+        "sms-provider-type-aws-sns": "Amazon SNS",
+        "sms-provider-type-twilio": "Twilio",
+        "sms-provider-type-smpp": "SMPP",
+        "aws-access-key-id": "معرف مفتاح الوصول AWS",
+        "aws-access-key-id-required": "معرف مفتاح الوصول AWS مطلوب",
+        "aws-secret-access-key": "مفتاح الوصول السري AWS",
+        "aws-secret-access-key-required": "مفتاح الوصول السري AWS مطلوب",
+        "aws-region": "منطقة AWS",
+        "aws-region-required": "منطقة AWS مطلوبة",
+        "number-from": "رقم الهاتف من",
+        "number-from-required": "رقم الهاتف من مطلوب.",
+        "number-to": "رقم الهاتف إلى",
+        "number-to-required": "رقم الهاتف إلى مطلوب.",
+        "phone-number-hint": "رقم الهاتف بتنسيق E.164، مثل +19995550123",
+        "phone-number-hint-twilio": "رقم الهاتف بتنسيق E.164/معرّف رقم الهاتف/معرّف خدمة الرسائل، مثل +19995550123/PNXXX/MGXXX",
+        "phone-number-pattern": "رقم الهاتف غير صالح. يجب أن يكون بتنسيق E.164، مثل +19995550123.",
+        "phone-number-pattern-twilio": "رقم الهاتف غير صالح. يجب أن يكون بتنسيق E.164/معرّف رقم الهاتف/معرّف خدمة الرسائل، مثل +19995550123/PNXXX/MGXXX.",
+        "sms-message": "رسالة الرسائل القصيرة",
+        "sms-message-required": "رسالة الرسائل القصيرة مطلوبة.",
+        "sms-message-max-length": "لا يمكن أن تكون رسالة الرسائل القصيرة أطول من 1600 حرف",
+        "twilio-account-sid": "معرّف حساب Twilio",
+        "twilio-account-sid-required": "معرّف حساب Twilio مطلوب",
+        "twilio-account-token": "رمز حساب Twilio",
+        "twilio-account-token-required": "رمز حساب Twilio مطلوب",
+        "send-test-sms": "إرسال رسالة قصيرة اختبارية",
+        "test-sms-sent": "تم إرسال الرسالة القصيرة الاختبارية بنجاح!",
+        "security-settings": "إعدادات الأمان",
+        "password-policy": "سياسة كلمة المرور",
+        "minimum-password-length": "الحد الأدنى لطول كلمة المرور",
+        "minimum-password-length-required": "الحد الأدنى لطول كلمة المرور مطلوب",
+        "minimum-password-length-range": "يجب أن يكون طول كلمة المرور الأدنى في نطاق من 6 إلى 50",
+        "maximum-password-length": "الحد الأقصى لطول كلمة المرور",
+        "maximum-password-length-min": "يجب أن يكون الحد الأقصى لطول كلمة المرور 6 على الأقل",
+        "maximum-password-length-less-min": "يجب أن يكون الحد الأقصى لطول كلمة المرور أكبر من الحد الأدنى للطول",
+        "minimum-uppercase-letters": "الحد الأدنى لعدد الأحرف الكبيرة",
+        "minimum-uppercase-letters-range": "لا يمكن أن يكون الحد الأدنى لعدد الأحرف الكبيرة سالبًا",
+        "minimum-lowercase-letters": "الحد الأدنى لعدد الأحرف الصغيرة",
+        "minimum-lowercase-letters-range": "لا يمكن أن يكون الحد الأدنى لعدد الأحرف الصغيرة سالبًا",
+        "minimum-digits": "الحد الأدنى لعدد الأرقام",
+        "minimum-digits-range": "لا يمكن أن يكون الحد الأدنى لعدد الأرقام سالبًا",
+        "minimum-special-characters": "الحد الأدنى لعدد الأحرف الخاصة",
+        "minimum-special-characters-range": "لا يمكن أن يكون الحد الأدنى لعدد الأحرف الخاصة سالبًا",
+        "password-expiration-period-days": "فترة انتهاء صلاحية كلمة المرور بالأيام",
+        "password-expiration-period-days-range": "لا يمكن أن تكون فترة انتهاء صلاحية كلمة المرور بالأيام سالبة",
+        "password-reuse-frequency-days": "تكرار استخدام كلمة المرور بالأيام",
+        "password-reuse-frequency-days-range": "لا يمكن أن يكون تكرار استخدام كلمة المرور بالأيام سالبًا",
+        "allow-whitespace": "السماح بالمسافات",
+        "force-reset-password-if-no-valid": "إجبار على إعادة تعيين كلمة المرور إذا لم تكن صالحة",
+        "force-reset-password-if-no-valid-hint": "يرجى الحذر عند تفعيل هذه الميزة: سيتطلب من المستخدمين الذين لا تكون كلمات مرورهم صالحة إعادة تعيين كلمات المرور الخاصة بهم عبر البريد الإلكتروني.",
+        "general-policy": "السياسة العامة",
+        "max-failed-login-attempts": "الحد الأقصى لعدد محاولات تسجيل الدخول الفاشلة، قبل قفل الحساب",
+        "minimum-max-failed-login-attempts-range": "لا يمكن أن يكون الحد الأقصى لعدد محاولات تسجيل الدخول الفاشلة سالبًا",
+        "user-lockout-notification-email": "في حالة قفل حساب المستخدم، إرسال إشعار إلى البريد الإلكتروني",
+        "domain-name": "اسم النطاق",
+        "domain-name-unique": "يجب أن يكون اسم النطاق والبروتوكول فريدين.",
+        "domain-name-max-length": "يجب أن يكون اسم النطاق أقل من 256",
+        "error-verification-url": "لا ينبغي أن يحتوي اسم النطاق على الرموز '/' و ':'. مثال: thingsboard.io",
+        "connection-settings": "إعدادات الاتصال",
+        "oauth2": {
+            "access-token-uri": "عنوان URI لرمز الوصول",
+            "access-token-uri-required": "عنوان URI لرمز الوصول مطلوب.",
+            "activate-user": "تفعيل المستخدم",
+            "add-domain": "إضافة نطاق",
+            "delete-domain": "حذف نطاق",
+            "add-provider": "إضافة مزود",
+            "delete-provider": "حذف مزود",
+            "allow-user-creation": "السماح بإنشاء المستخدم",
+            "always-fullscreen": "دائمًا بملء الشاشة",
+            "authorization-uri": "عنوان URI للتفويض",
+            "authorization-uri-required": "عنوان URI للتفويض مطلوب.",
+            "client-authentication-method": "طريقة توثيق العميل",
+            "client-id": "معرف العميل",
+            "client-id-required": "معرف العميل مطلوب.",
+            "client-id-max-length": "يجب أن يكون معرف العميل أقل من 256",
+            "client-secret": "سر العميل",
+            "client-secret-required": "سر العميل مطلوب.",
+            "client-secret-max-length": "يجب أن يكون سر العميل أقل من 2049",
+            "custom-setting": "إعدادات مخصصة",
+            "customer-name-pattern": "نمط اسم العميل",
+            "customer-name-pattern-max-length": "يجب أن يكون نمط اسم العميل أقل من 256",
+            "parent-customer-name-pattern": "نمط اسم العميل الأصل",
+            "user-groups-name-pattern": "نمط اسم مجموعات المستخدمين",
+            "default-dashboard-name": "اسم لوحة التحكم الافتراضي",
+            "default-dashboard-name-max-length": "يجب أن يكون اسم لوحة التحكم الافتراضي أقل من 256",
+            "delete-domain-text": "كن حذرًا، بعد التأكيد سيصبح النطاق وجميع بيانات المزود غير متوفرة.",
+            "delete-domain-title": "هل أنت متأكد أنك تريد حذف إعدادات النطاق '{{domainName}}'؟",
+            "delete-registration-text": "كن حذرًا، بعد التأكيد ستصبح بيانات المزود غير متوفرة.",
+            "delete-registration-title": "هل أنت متأكد أنك تريد حذف المزود '{{name}}'؟",
+            "email-attribute-key": "مفتاح سمة البريد الإلكتروني",
+            "email-attribute-key-required": "مفتاح سمة البريد الإلكتروني مطلوب.",
+            "email-attribute-key-max-length": "يجب أن يكون مفتاح سمة البريد الإلكتروني أقل من 32",
+            "first-name-attribute-key": "مفتاح سمة الاسم الأول",
+            "first-name-attribute-key-max-length": "يجب أن يكون مفتاح سمة الاسم الأول أقل من 32",
+            "general": "عام",
+            "jwk-set-uri": "عنوان URI لمجموعة مفاتيح الويب JSON",
+            "last-name-attribute-key": "مفتاح سمة الاسم الأخير",
+            "last-name-attribute-key-max-length": "يجب أن يكون مفتاح سمة الاسم الأخير أقل من 32",
+            "login-button-icon": "أيقونة زر تسجيل الدخول",
+            "login-button-label": "علامة مزود تسجيل الدخول",
+            "login-button-label-placeholder": "تسجيل الدخول مع $(علامة مزود تسجيل الدخول)",
+            "login-button-label-required": "العلامة مطلوبة.",
+            "login-provider": "مزود تسجيل الدخول",
+            "mapper": "المعين",
+            "new-domain": "نطاق جديد",
+            "oauth2": "OAuth2",
+            "password-max-length": "يجب أن تكون كلمة المرور أقل من 256",
+            "redirect-uri-template": "قالب عنوان URI لإعادة التوجيه",
+            "copy-redirect-uri": "نسخ عنوان URI لإعادة التوجيه",
+            "registration-id": "معرّف التسجيل",
+            "registration-id-required": "معرّف التسجيل مطلوب.",
+            "registration-id-unique": "يجب أن يكون معرّف التسجيل فريدًا للنظام.",
+            "scope": "نطاق",
+            "scope-required": "النطاق مطلوب.",
+            "tenant-name-pattern": "نمط اسم المستأجر",
+            "tenant-name-pattern-required": "نمط اسم المستأجر مطلوب.",
+            "tenant-name-pattern-max-length": "يجب أن يكون نمط اسم المستأجر أقل من 256",
+            "tenant-name-strategy": "استراتيجية اسم المستأجر",
+            "type": "نوع المعين",
+            "uri-pattern-error": "تنسيق URI غير صالح.",
+            "url": "URL",
+            "url-pattern": "تنسيق URL غير صالح.",
+            "url-required": "URL مطلوب.",
+            "url-max-length": "يجب أن يكون URL أقل من 256",
+            "user-info-uri": "عنوان URI لمعلومات المستخدم",
+            "user-info-uri-required": "عنوان URI لمعلومات المستخدم مطلوب.",
+            "username-max-length": "يجب أن يكون اسم المستخدم أقل من 256",
+            "user-name-attribute-name": "مفتاح سمة اسم المستخدم",
+            "user-name-attribute-name-required": "مفتاح سمة اسم المستخدم مطلوب",
+            "protocol": "البروتوكول",
+            "domain-schema-http": "HTTP",
+            "domain-schema-https": "HTTPS",
+            "domain-schema-mixed": "HTTP+HTTPS",
+            "enable": "تفعيل إعدادات OAuth2",
+            "domains": "النطاقات",
+            "mobile-apps": "تطبيقات الجوال",
+            "no-mobile-apps": "لا توجد تطبيقات مُعدة",
+            "mobile-package": "حزمة التطبيق",
+            "mobile-package-placeholder": "مثال: my.example.app",
+            "mobile-package-hint": "لنظام Android: معرّف التطبيق الفريد الخاص بك. لنظام iOS: معرّف حزمة المنتج.",
+            "mobile-package-unique": "يجب أن تكون حزمة التطبيق فريدة.",
+            "mobile-app-secret": "سر التطبيق",
+            "invalid-mobile-app-secret": "يجب أن يحتوي سر التطبيق على أحرف أبجدية رقمية فقط ويجب أن يكون بين 16 و2048 حرفًا.",
+            "copy-mobile-app-secret": "نسخ سر التطبيق",
+            "add-mobile-app": "إضافة تطبيق",
+            "delete-mobile-app": "حذف معلومات التطبيق",
+            "providers": "المزودون",
+            "platform-web": "ويب",
+            "platform-android": "Android",
+            "platform-ios": "iOS",
+            "all-platforms": "جميع المنصات",
+            "smtp-provider": "مزود SMTP",
+            "allowed-platforms": "المنصات المسموح بها",
+            "authentication": "المصادقة",
+            "basic": "أساسي",
+            "provider": "المزود",
+            "redirect-url": "عنوان URL لإعادة التوجيه",
+            "domain-name": "اسم النطاق",
+            "redirect-url-template": "قالب عنوان URL لإعادة التوجيه",
+            "microsoft-tenant-id": "معرّف الدليل (المستأجر)",
+            "microsoft-tenant-id-required": "معرّف الدليل (المستأجر) مطلوب",
+            "token-uri": "عنوان URI للرمز",
+            "token-uri-required": "عنوان URI للرمز مطلوب",
+            "redirect-uri": "عنوان URI لإعادة التوجيه",
+            "google-provider": "Google",
+            "microsoft-provider": "Office 365",
+            "sendgrid-provider": "Sendgrid",
+            "custom-provider": "مخصص",
+            "generate-access-token": "توليد رمز الوصول",
+            "update-access-token": "تحديث رمز الوصول",
+            "access-token-status": "حالة رمز الوصول:",
+            "token-status-generated": "تم التوليد",
+            "token-status-not-generated": "لم يتم التوليد"
+        },
+        "smpp-provider": {
+            "smpp-version": "إصدار SMPP",
+            "smpp-host": "مضيف SMPP",
+            "smpp-host-required": "مضيف SMPP مطلوب",
+            "smpp-port": "منفذ SMPP",
+            "smpp-port-required": "منفذ SMPP مطلوب",
+            "system-id": "معرّف النظام",
+            "system-id-required": "معرّف النظام مطلوب",
+            "password": "كلمة المرور",
+            "password-required": "كلمة المرور مطلوبة",
+            "type-settings": "إعدادات النوع",
+            "source-settings": "إعدادات المصدر",
+            "destination-settings": "إعدادات الوجهة",
+            "additional-settings": "إعدادات إضافية",
+            "system-type": "نوع النظام",
+            "bind-type": "نوع الربط",
+            "service-type": "نوع الخدمة",
+            "source-address": "عنوان المصدر",
+            "source-ton": "TON المصدر",
+            "source-npi": "NPI المصدر",
+            "destination-ton": "TON الوجهة (نوع الرقم)",
+            "destination-npi": "NPI الوجهة (تعريف خطة الأرقام)",
+            "address-range": "نطاق العنوان",
+            "coding-scheme": "مخطط الترميز",
+            "bind-type-tx": "مرسل",
+            "bind-type-rx": "مستقبل",
+            "bind-type-trx": "جهاز إرسال واستقبال",
+            "ton-unknown": "غير معروف",
+            "ton-international": "دولي",
+            "ton-national": "وطني",
+            "ton-network-specific": "خاص بالشبكة",
+            "ton-subscriber-number": "رقم المشترك",
+            "ton-alphanumeric": "أبجدية رقمية",
+            "ton-abbreviated": "مختصر",
+            "npi-unknown": "0 - غير معروف",
+            "npi-isdn": "1 - ISDN/خطة ترقيم الهاتف (E163/E164)",
+            "npi-data-numbering-plan": "3 - خطة ترقيم البيانات (X.121)",
+            "npi-telex-numbering-plan": "4 - خطة ترقيم البرق (F.69)",
+            "npi-land-mobile": "6 - الأرض المتنقلة (E.212)",
+            "npi-national-numbering-plan": "8 - خطة الترقيم الوطنية",
+            "npi-private-numbering-plan": "9 - خطة الترقيم الخاصة",
+            "npi-ermes-numbering-plan": "10 - خطة ترقيم ERMES (ETSI DE/PS 3 01-3)",
+            "npi-internet": "13 - الإنترنت (IP)",
+            "npi-wap-client-id": "18 - معرّف عميل WAP (لتحديد بواسطة منتدى WAP)",
+            "scheme-smsc": "0 - أبجدية SMSC الافتراضية (ASCII للرمز القصير والطويل وإلى GSM للمجاني)",
+            "scheme-ia5": "1 - IA5 (ASCII للرمز القصير والطويل، اللاتينية 9 للمجاني (ISO-8859-9))",
+            "scheme-octet-unspecified-2": "2 - أوكتيت غير محدد (ثنائي 8 بت)",
+            "scheme-latin-1": "3 - اللاتينية 1 (ISO-8859-1)",
+            "scheme-octet-unspecified-4": "4 - أوكتيت غير محدد (ثنائي 8 بت)",
+            "scheme-jis": "5 - JIS (X 0208-1990)",
+            "scheme-cyrillic": "6 - السيريلية (ISO-8859-5)",
+            "scheme-latin-hebrew": "7 - اللاتينية/العبرية (ISO-8859-8)",
+            "scheme-ucs-utf": "8 - UCS2/UTF-16 (ISO/IEC-10646)",
+            "scheme-pictogram-encoding": "9 - ترميز الرموز التعبيرية",
+            "scheme-music-codes": "10 - رموز الموسيقى (ISO-2022-JP)",
+            "scheme-extended-kanji-jis": "13 - الكانجي الموسع JIS (X 0212-1990)",
+            "scheme-korean-graphic-character-set": "14 - مجموعة أحرف الرسومات الكورية (KS C 5601/KS X 1001)"
+        },
+        "queue-select-name": "اختيار اسم الطابور",
+        "queue-name": "الاسم",
+        "queue-name-required": "اسم الطابور مطلوب!",
+        "queues": "الطوابير",
+        "queue-partitions": "الأقسام",
+        "queue-submit-strategy": "استراتيجية الإرسال",
+        "queue-processing-strategy": "استراتيجية المعالجة",
+        "queue-configuration": "تكوين الطابور",
+        "repository-settings": "إعدادات المستودع",
+        "repository": "المستودع",
+        "repository-url": "عنوان URL للمستودع",
+        "repository-url-required": "عنوان URL للمستودع مطلوب.",
+        "default-branch": "اسم الفرع الافتراضي",
+        "repository-read-only": "للقراءة فقط",
+        "show-merge-commits": "إظهار التزامات الدمج",
+        "authentication-settings": "إعدادات المصادقة",
+        "auth-method": "طريقة المصادقة",
+        "auth-method-username-password": "كلمة المرور / رمز الوصول",
+        "auth-method-username-password-hint": "يجب على مستخدمي GitHub <b>استخدام</b> الرموز <a href='https://github.com/settings/tokens' target='_blank'>الرموز</a> مع أذونات الكتابة إلى المستودع.",
+        "auth-method-private-key": "المفتاح الخاص",
+        "password-access-token": "كلمة المرور / رمز الوصول",
+        "change-password-access-token": "تغيير كلمة المرور / رمز الوصول",
+        "private-key": "المفتاح الخاص",
+        "drop-private-key-file-or": "اسحب وأفلت ملف المفتاح الخاص أو",
+        "passphrase": "العبارة السرية",
+        "enter-passphrase": "أدخل العبارة السرية",
+        "change-passphrase": "تغيير العبارة السرية",
+        "check-access": "فحص الوصول",
+        "check-repository-access-success": "تم التحقق من وصول المستودع بنجاح!",
+        "delete-repository-settings-title": "هل أنت متأكد أنك تريد حذف إعدادات المستودع؟",
+        "delete-repository-settings-text": "كن حذرًا، بعد التأكيد سيتم إزالة إعدادات المستودع ولن تكون ميزة التحكم في الإصدار متوفرة.",
+        "auto-commit-settings": "إعدادات الالتزام التلقائي",
+        "auto-commit": "الالتزام التلقائي",
+        "auto-commit-entities": "الكيانات الملتزمة تلقائيًا",
+        "no-auto-commit-entities-prompt": "لا توجد كيانات مُعدة للالتزام التلقائي",
+        "delete-auto-commit-settings-title": "هل أنت متأكد أنك تريد حذف إعدادات الالتزام التلقائي؟",
+        "delete-auto-commit-settings-text": "كن حذرًا، بعد التأكيد سيتم إزالة إعدادات الالتزام التلقائي وسيتم تعطيل الالتزام التلقائي لجميع الكيانات.",
+        "2fa": {
+            "2fa": "المصادقة الثنائية",
+            "available-providers": "المزودون المتاحون",
+            "issuer-name": "اسم الجهة المصدرة",
+            "issuer-name-required": "اسم الجهة المصدرة مطلوب.",
+            "max-verification-failures-before-user-lockout": "الحد الأقصى لفشل التحقق قبل قفل المستخدم",
+            "max-verification-failures-before-user-lockout-pattern": "يجب أن يكون الحد الأقصى لفشل التحقق عددًا صحيحًا موجبًا.",
+            "number-of-checking-attempts": "عدد محاولات التحقق",
+            "number-of-checking-attempts-pattern": "يجب أن يكون عدد محاولات التحقق عددًا صحيحًا موجبًا.",
+            "number-of-checking-attempts-required": "عدد محاولات التحقق مطلوب.",
+            "number-of-codes": "عدد الرموز",
+            "number-of-codes-pattern": "يجب أن يكون عدد الرموز عددًا صحيحًا موجبًا.",
+            "number-of-codes-required": "عدد الرموز مطلوب.",
+            "provider": "المزود",
+            "retry-verification-code-period": "فترة إعادة المحاولة لرمز التحقق (ثانية)",
+            "retry-verification-code-period-pattern": "الحد الأدنى للوقت هو 5 ثوانٍ",
+            "retry-verification-code-period-required": "فترة إعادة المحاولة لرمز التحقق مطلوبة.",
+            "total-allowed-time-for-verification": "الوقت الإجمالي المسموح به للتحقق (ثانية)",
+            "total-allowed-time-for-verification-pattern": "الحد الأدنى للوقت الإجمالي المسموح به هو 60 ثانية",
+            "total-allowed-time-for-verification-required": "الوقت الإجمالي المسموح به مطلوب.",
+            "use-system-two-factor-auth-settings": "استخدام إعدادات المصادقة الثنائية للنظام",
+            "verification-code-check-rate-limit": "حد معدل التحقق من رمز التحقق",
+            "verification-code-lifetime": "مدة صلاحية رمز التحقق (ثانية)",
+            "verification-code-lifetime-pattern": "يجب أن تكون مدة صلاحية رمز التحقق عددًا صحيحًا موجبًا.",
+            "verification-code-lifetime-required": "مدة صلاحية رمز التحقق مطلوبة.",
+            "verification-message-template": "قالب رسالة التحقق",
+            "verification-limitations": "قيود التحقق",
+            "verification-message-template-pattern": "يجب أن تحتوي رسالة التحقق على النمط: ${code}",
+            "verification-message-template-required": "قالب رسالة التحقق مطلوب.",
+            "within-time": "خلال الوقت (ثانية)",
+            "within-time-pattern": "يجب أن يكون الوقت عددًا صحيحًا موجبًا.",
+            "within-time-required": "الوقت مطلوب."
+        },
+        "jwt": {
+            "security-settings": "إعدادات أمان JWT",
+            "issuer-name": "اسم الجهة المصدرة",
+            "issuer-name-required": "اسم الجهة المصدرة مطلوب.",
+            "signings-key": "مفتاح التوقيع",
+            "signings-key-hint": "سلسلة مشفرة بتنسيق Base64 تمثل ما لا يقل عن 256 بت من البيانات.",
+            "signings-key-required": "مفتاح التوقيع مطلوب.",
+            "signings-key-min-length": "يجب أن يكون مفتاح التوقيع ما لا يقل عن 256 بت من البيانات.",
+            "signings-key-base64": "يجب أن يكون مفتاح التوقيع بتنسيق base64.",
+            "expiration-time": "وقت انتهاء صلاحية الرمز (ثانية)",
+            "expiration-time-required": "وقت انتهاء صلاحية الرمز مطلوب.",
+            "expiration-time-pattern": "يجب أن يكون وقت انتهاء صلاحية الرمز عددًا صحيحًا موجبًا.",
+            "expiration-time-min": "الحد الأدنى للوقت هو 60 ثانية (1 دقيقة).",
+            "refresh-expiration-time": "وقت انتهاء صلاحية رمز التحديث (ثانية)",
+            "refresh-expiration-time-required": "وقت انتهاء صلاحية رمز التحديث مطلوب.",
+            "refresh-expiration-time-pattern": "يجب أن يكون وقت انتهاء صلاحية رمز التحديث عددًا صحيحًا موجبًا.",
+            "refresh-expiration-time-min": "الحد الأدنى للوقت هو 900 ثانية (15 دقيقة).",
+            "refresh-expiration-time-less-token": "يجب أن يكون وقت رمز التحديث أكبر من وقت الرمز.",
+            "generate-key": "توليد المفتاح",
+            "info-header": "سيتعين على جميع المستخدمين إعادة تسجيل الدخول",
+            "info-message": "تغيير مفتاح التوقيع JWT سيؤدي إلى إبطال جميع الرموز الصادرة. سيحتاج جميع المستخدمين إلى إعادة تسجيل الدخول. سيؤثر هذا أيضًا على البرامج النصية التي تستخدم واجهة برمجة التطبيقات REST/Websockets."
+        },
+        "resources": "الموارد",
+        "notifications": "الإشعارات",
+        "notifications-settings": "إعدادات الإشعارات",
+        "slack-api-token": "رمز API لـ Slack",
+        "slack": "Slack",
+        "slack-settings": "إعدادات Slack"
+    },
+    "alarm": {
+        "alarm": "إنذار",
+        "alarms": "الإنذارات",
+        "all-alarms": "جميع الإنذارات",
+        "select-alarm": "اختر إنذار",
+        "no-alarms-matching": "لم يتم العثور على إنذارات مطابقة لـ '{{entity}}'.",
+        "alarm-required": "الإنذار مطلوب",
+        "alarm-filter": "فلتر الإنذار",
+        "filter": "فلتر",
+        "alarm-status": "حالة الإنذار",
+        "alarm-status-list": "قائمة حالات الإنذار",
+        "any-status": "أي حالة",
+        "search-status": {
+            "ANY": "أي",
+            "ACTIVE": "نشط",
+            "CLEARED": "مُزال",
+            "ACK": "مُقر",
+            "UNACK": "غير مُقر"
+        },
+        "display-status": {
+            "ACTIVE_UNACK": "نشط غير مُقر",
+            "ACTIVE_ACK": "نشط مُقر",
+            "CLEARED_UNACK": "مُزال غير مُقر",
+            "CLEARED_ACK": "مُزال مُقر"
+        },
+        "no-alarms-prompt": "لم يتم العثور على إنذارات",
+        "created-time": "وقت الإنشاء",
+        "type": "النوع",
+        "severity": "الخطورة",
+        "originator": "المُبتدئ",
+        "originator-type": "نوع المُبتدئ",
+        "details": "التفاصيل",
+        "originator-label": "تسمية المُبتدئ",
+        "assign": "تعيين",
+        "assignments": "التعيينات",
+        "assignee": "المُعين",
+        "assignee-id": "معرّف المُعين",
+        "assignee-first-name": "اسم المُعين الأول",
+        "assignee-last-name": "اسم عائلة المُعين",
+        "assignee-email": "بريد المُعين الإلكتروني",
+        "unassigned": "غير مُعين",
+        "assignee-not-set": "الكل",
+        "status": "الحالة",
+        "alarm-details": "تفاصيل الإنذار",
+        "start-time": "وقت البدء",
+        "assign-time": "وقت التعيين",
+        "end-time": "وقت الانتهاء",
+        "ack-time": "وقت الاعتراف",
+        "clear-time": "وقت الإزالة",
+        "duration": "المدة",
+        "alarm-severity-list": "قائمة خطورة الإنذار",
+        "any-severity": "أي خطورة",
+        "severity-critical": "حرج",
+        "severity-major": "رئيسي",
+        "severity-minor": "ثانوي",
+        "severity-warning": "تحذير",
+        "severity-indeterminate": "غير محدد",
+        "acknowledge": "اعتراف",
+        "clear": "إزالة",
+        "delete": "حذف",
+        "search": "بحث عن إنذارات",
+        "selected-alarms": "{ count, plural, =1 {1 إنذار} other {# إنذارات} } محددة",
+        "no-data": "لا توجد بيانات لعرضها",
+        "polling-interval": "فترة استطلاع الإنذارات (ثانية)",
+        "polling-interval-required": "فترة استطلاع الإنذارات مطلوبة.",
+        "min-polling-interval-message": "الحد الأدنى المسموح به هو 1 ثانية لفترة الاستطلاع.",
+        "aknowledge-alarms-title": "الاعتراف بـ { count, plural, =1 {1 إنذار} other {# إنذارات} }",
+        "aknowledge-alarms-text": "هل أنت متأكد أنك تريد الاعتراف بـ { count, plural, =1 {1 إنذار} other {# إنذارات} }؟",
+        "aknowledge-alarm-title": "اعتراف بالإنذار",
+        "aknowledge-alarm-text": "هل أنت متأكد أنك تريد الاعتراف بالإنذار؟",
+        "selected-alarms-are-acknowledged": "تم الاعتراف بالإنذارات المحددة بالفعل",
+        "clear-alarms-title": "إزالة { count, plural, =1 {1 إنذار} other {# إنذارات} }",
+        "clear-alarms-text": "هل أنت متأكد أنك تريد إزالة { count, plural, =1 {1 إنذار} other {# إنذارات} }؟",
+        "clear-alarm-title": "إزالة الإنذار",
+        "clear-alarm-text": "هل أنت متأكد أنك تريد إزالة الإنذار؟",
+        "delete-alarms-title": "حذف { count, plural, =1 {1 إنذار} other {# إنذارات} }",
+        "delete-alarms-text": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 إنذار} other {# إنذارات} }؟",
+        "selected-alarms-are-cleared": "تم إزالة الإنذارات المحددة بالفعل",
+        "alarm-status-filter": "فلتر حالة الإنذار",
+        "alarm-filter-title": "فلتر الإنذار",
+        "assigned": "مُعين",
+        "filter-title": "فلتر",
+        "max-count-load": "الحد الأقصى لعدد الإنذارات للتحميل (0 - غير محدود)",
+        "max-count-load-required": "الحد الأقصى لعدد الإنذارات للتحميل مطلوب.",
+        "max-count-load-error-min": "القيمة الدنيا هي 0.",
+        "fetch-size": "حجم الجلب",
+        "fetch-size-required": "حجم الجلب مطلوب.",
+        "fetch-size-error-min": "القيمة الدنيا هي 10.",
+        "alarm-type-list": "قائمة نوع الإنذار",
+        "any-type": "أي نوع",
+        "assigned-to-current-user": "مُعين للمستخدم الحالي",
+        "assigned-to-me": "مُعين لي",
+        "search-propagated-alarms": "البحث عن الإنذارات المنتشرة",
+        "comments": "تعليقات الإنذار",
+        "show-more": "إظهار المزيد",
+        "additional-info": "معلومات إضافية",
+        "alarm-type": "نوع الإنذار",
+        "enter-alarm-type": "أدخل نوع الإنذار",
+        "no-alarm-types-matching": "لم يتم العثور على أنواع إنذار مطابقة لـ '{{entitySubtype}}'.",
+        "alarm-type-list-empty": "لم يتم تحديد أنواع الإنذار."
+    },
+    "alarm-activity": {
+        "add": "إضافة تعليق...",
+        "alarm-comment": "تعليق الإنذار",
+        "comments": "التعليقات",
+        "delete-alarm-comment": "هل تريد حذف هذا التعليق؟",
+        "refresh": "تحديث",
+        "oldest-first": "الأقدم أولاً",
+        "newest-first": "الأحدث أولاً",
+        "activity": "النشاط",
+        "export": "تصدير إلى CSV",
+        "author": "المؤلف",
+        "created-date": "تاريخ الإنشاء",
+        "edited-date": "تاريخ التحرير",
+        "text": "النص",
+        "system": "النظام"
+    },
+    "alias": {
+        "add": "إضافة الاسم المستعار",
+        "edit": "تحرير الاسم المستعار",
+        "name": "اسم الاسم المستعار",
+        "name-required": "اسم الاسم المستعار مطلوب",
+        "duplicate-alias": "الاسم المستعار بنفس الاسم موجود بالفعل.",
+        "filter-type-single-entity": "كيان واحد",
+        "filter-type-entity-group": "مجموعة كيانات",
+        "filter-type-entity-list": "قائمة الكيانات",
+        "filter-type-entity-name": "اسم الكيان",
+        "filter-type-entity-type": "نوع الكيان",
+        "filter-type-entity-group-list": "قائمة مجموعة الكيانات",
+        "filter-type-entity-group-name": "اسم مجموعة الكيانات",
+        "filter-type-entities-by-group-name": "الكيانات حسب اسم المجموعة",
+        "filter-type-state-entity": "كيان من حالة لوحة التحكم",
+        "filter-type-state-entity-description": "الكيان المأخوذ من معلمات حالة لوحة التحكم",
+        "filter-type-state-entity-owner": "مالك الكيان من حالة لوحة التحكم",
+        "filter-type-state-entity-owner-description": "مالك الكيان المأخوذ من معلمات حالة لوحة التحكم",
+        "filter-type-asset-type": "نوع الأصل",
+        "filter-type-asset-type-description": "الأصول من النوع '{{assetTypes}}'",
+        "filter-type-asset-type-and-name-description": "الأصول من النوع '{{assetTypes}}' وباسم يبدأ بـ '{{prefix}}'",
+        "filter-type-device-type": "نوع الجهاز",
+        "filter-type-device-type-description": "الأجهزة من النوع '{{deviceTypes}}'",
+        "filter-type-device-type-and-name-description": "الأجهزة من الأنواع '{{deviceTypes}}' وباسم يبدأ بـ '{{prefix}}'",
+        "filter-type-entity-view-type": "نوع عرض الكيان",
+        "filter-type-entity-view-type-description": "عروض الكيان من النوع '{{entityViewTypes}}'",
+        "filter-type-entity-view-type-and-name-description": "عروض الكيان من النوع '{{entityViewTypes}}' وباسم يبدأ بـ '{{prefix}}'",
+        "filter-type-edge-type": "نوع الحافة",
+        "filter-type-edge-type-description": "الحواف من النوع '{{edgeTypes}}'",
+        "filter-type-edge-type-and-name-description": "الحواف من النوع '{{edgeTypes}}' وباسم يبدأ بـ '{{prefix}}'",
+        "filter-type-relations-query": "استعلام العلاقات",
+        "filter-type-relations-query-description": "{{entities}} التي لها علاقة {{relationType}} {{direction}} {{rootEntity}}",
+        "filter-type-edge-search-query": "استعلام بحث الحافة",
+        "filter-type-edge-search-query-description": "الحواف بأنواع {{edgeTypes}} التي لها علاقة {{relationType}} {{direction}} {{rootEntity}}",
+        "filter-type-scheduler-event": "أحداث المُجدول",
+        "filter-type-scheduler-event-type-description": "أحداث المُجدول بالنوع '{{eventType}}'",
+        "filter-type-scheduler-event-originator-description": "أحداث المُجدول للمُبتدئ محدد",
+        "filter-type-scheduler-event-type-originator-description": "أحداث المُجدول للمُبتدئ محدد بـ '{{eventType}}'",
+        "filter-type-asset-search-query": "استعلام بحث الأصل",
+        "filter-type-asset-search-query-description": "الأصول بأنواع {{assetTypes}} التي لها علاقة {{relationType}} {{direction}} {{rootEntity}}",
+        "filter-type-device-search-query": "استعلام بحث الجهاز",
+        "filter-type-device-search-query-description": "الأجهزة بأنواع {{deviceTypes}} التي لها علاقة {{relationType}} {{direction}} {{rootEntity}}",
+        "filter-type-entity-view-search-query": "استعلام بحث عرض الكيان",
+        "filter-type-entity-view-search-query-description": "عروض الكيان بأنواع {{entityViewTypes}} التي لها علاقة {{relationType}} {{direction}} {{rootEntity}}",
+        "filter-type-apiUsageState": "حالة استخدام API",
+        "entity-filter": "فلتر الكيان",
+        "resolve-multiple": "حل ككيانات متعددة",
+        "filter-type": "نوع الفلتر",
+        "filter-type-required": "نوع الفلتر مطلوب.",
+        "entity-filter-no-entity-matched": "لم يتم العثور على كيانات تطابق الفلتر المحدد.",
+        "no-entity-filter-specified": "لم يتم تحديد فلتر الكيان",
+        "root-state-entity": "استخدام كيان حالة لوحة التحكم كجذر",
+        "group-state-entity": "استخدام كيان حالة لوحة التحكم كمجموعة كيانات",
+        "group-state-entity-owner": "استخدام كيان حالة لوحة التحكم كمالك مجموعة كيانات",
+        "last-level-relation": "جلب العلاقة المستوى الأخير فقط",
+        "root-entity": "الكيان الجذر",
+        "state-entity-parameter-name": "اسم معلمة كيان الحالة",
+        "default-state-entity": "كيان الحالة الافتراضي",
+        "default-state-entity-group": "مجموعة كيان الحالة الافتراضية",
+        "default-entity-parameter-name": "افتراضيًا",
+        "max-relation-level": "الحد الأقصى لمستوى العلاقة",
+        "unlimited-level": "مستوى غير محدود",
+        "state-entity": "كيان حالة لوحة التحكم",
+        "entities-of-group-state-entity": "الكيانات من مجموعة كيان حالة لوحة التحكم",
+        "all-entities": "جميع الكيانات",
+        "any-relation": "أي",
+        "originator": "المُبتدئ",
+        "originator-state-entity": "استخدام كيان حالة لوحة التحكم كمُبتدئ",
+        "scheduler-event-type": "نوع حدث المُجدول"
+    },
+    "asset": {
+        "all": "الكل",
+        "all-assets": "جميع الأصول",
+        "groups": "المجموعات",
+        "shared": "مشترك",
+        "asset": "الأصل",
+        "assets": "الأصول",
+        "management": "إدارة الأصول",
+        "view-assets": "عرض الأصول",
+        "add": "إضافة أصل",
+        "asset-type-max-length": "يجب أن يكون نوع الأصل أقل من 256",
+        "assign-to-customer": "تعيين للعميل",
+        "assign-asset-to-customer": "تعيين الأصل/الأصول للعميل",
+        "assign-asset-to-customer-text": "الرجاء تحديد الأصول لتعيينها للعميل",
+        "no-assets-text": "لم يتم العثور على أصول",
+        "assign-to-customer-text": "الرجاء تحديد العميل لتعيين الأصل/الأصول له",
+        "public": "عام",
+        "assignedToCustomer": "مُعين للعميل",
+        "make-public": "جعل الأصل عام",
+        "make-private": "جعل الأصل خاص",
+        "unassign-from-customer": "إلغاء التعيين من العميل",
+        "delete": "حذف الأصل",
+        "asset-public": "الأصل عام",
+        "asset-type": "نوع الأصل",
+        "asset-type-required": "نوع الأصل مطلوب.",
+        "select-asset-type": "اختر نوع الأصل",
+        "enter-asset-type": "أدخل ملف الأصل",
+        "any-asset": "أي أصل",
+        "no-asset-types-matching": "لم يتم العثور على أنواع أصول مطابقة لـ '{{entitySubtype}}'.",
+        "asset-type-list-empty": "لم يتم تحديد أنواع الأصول.",
+        "asset-types": "أنواع الأصول",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256",
+        "label-max-length": "يجب أن تكون التسمية أقل من 256",
+        "description": "الوصف",
+        "type": "النوع",
+        "type-required": "النوع مطلوب.",
+        "details": "التفاصيل",
+        "events": "الأحداث",
+        "add-asset-text": "إضافة أصل جديد",
+        "asset-details": "تفاصيل الأصل",
+        "assign-assets": "تعيين الأصول",
+        "assign-assets-text": "تعيين { count, plural, =1 {1 أصل} other {# أصول} } للعميل",
+        "assign-asset-to-edge-title": "تعيين الأصل/الأصول للحافة",
+        "assign-asset-to-edge-text": "الرجاء تحديد الأصول لتعيينها للحافة",
+        "delete-assets": "حذف الأصول",
+        "unassign-assets": "إلغاء تعيين الأصول",
+        "unassign-assets-action-title": "إلغاء تعيين { count, plural, =1 {1 أصل} other {# أصول} } من العميل",
+        "assign-new-asset": "تعيين أصل جديد",
+        "delete-asset-title": "هل أنت متأكد أنك تريد حذف الأصل '{{assetName}}'؟",
+        "delete-asset-text": "كن حذرًا، بعد التأكيد سيتم حذف الأصل وجميع البيانات ذات الصلة ولن تكون قابلة للاسترداد.",
+        "delete-assets-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 أصل} other {# أصول} }؟",
+        "delete-assets-action-title": "حذف { count, plural, =1 {1 أصل} other {# أصول} }",
+        "delete-assets-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع الأصول المحددة وجميع البيانات ذات الصلة ولن تكون قابلة للاسترداد.",
+        "make-public-asset-title": "هل أنت متأكد أنك تريد جعل الأصل '{{assetName}}' عامًا؟",
+        "make-public-asset-text": "بعد التأكيد، سيصبح الأصل وجميع بياناته عامة ويمكن الوصول إليها من قبل الآخرين.",
+        "make-private-asset-title": "هل أنت متأكد أنك تريد جعل الأصل '{{assetName}}' خاصًا؟",
+        "make-private-asset-text": "بعد التأكيد، سيصبح الأصل وجميع بياناته خاصة ولن يمكن الوصول إليها من قبل الآخرين.",
+        "unassign-asset-title": "هل أنت متأكد أنك تريد إلغاء تعيين الأصل '{{assetName}}'؟",
+        "unassign-asset-text": "بعد التأكيد، سيتم إلغاء تعيين الأصل ولن يكون متاحًا للعميل.",
+        "unassign-asset": "إلغاء تعيين الأصل",
+        "unassign-assets-title": "هل أنت متأكد أنك تريد إلغاء تعيين { count, plural, =1 {1 أصل} other {# أصول} }؟",
+        "unassign-assets-text": "بعد التأكيد، سيتم إلغاء تعيين جميع الأصول المحددة ولن تكون متاحة للعميل.",
+        "copyId": "نسخ معرّف الأصل",
+        "idCopiedMessage": "تم نسخ معرّف الأصل إلى الحافظة",
+        "select-asset": "اختر أصل",
+        "no-assets-matching": "لم يتم العثور على أصول مطابقة لـ '{{entity}}'.",
+        "asset-required": "الأصل مطلوب",
+        "name-starts-with": "تعبير اسم الأصل",
+        "help-text": "استخدم '%' حسب الحاجة: '%asset_name_contains%', '%asset_name_ends', 'asset_starts_with'.",
+        "search": "بحث عن أصول",
+        "select-group-to-add": "اختر المجموعة الهدف لإضافة الأصول المحددة",
+        "select-group-to-move": "اختر المجموعة الهدف لنقل الأصول المحددة",
+        "remove-assets-from-group": "هل أنت متأكد أنك تريد إزالة { count, plural, =1 {1 أصل} other {# أصول} } من المجموعة '{{entityGroup}}'؟",
+        "group": "مجموعة الأصول",
+        "list-of-groups": "{ count, plural, =1 {مجموعة أصل واحدة} other {قائمة من # مجموعات الأصول} }",
+        "group-name-starts-with": "مجموعات الأصول التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "import": "استيراد الأصول",
+        "asset-file": "ملف الأصل",
+        "label": "التسمية",
+        "assign-asset-to-edge": "تعيين الأصل/الأصول للحافة",
+        "unassign-asset-from-edge": "إلغاء تعيين الأصل",
+        "unassign-asset-from-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين الأصل '{{assetName}}'؟",
+        "unassign-asset-from-edge-text": "بعد التأكيد، سيتم إلغاء تعيين الأصل ولن يكون متاحًا للحافة.",
+        "unassign-assets-from-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين { count, plural, =1 {1 أصل} other {# أصول} }؟",
+        "unassign-assets-from-edge-text": "بعد التأكيد، سيتم إلغاء تعيين جميع الأصول المحددة ولن تكون متاحة للحافة.",
+        "selected-assets": "{ count, plural, =1 {1 أصل} other {# أصول} } محددة"
+    },
+    "attribute": {
+        "attributes": "السمات",
+        "latest-telemetry": "أحدث قياسات",
+        "no-latest-telemetry": "لا توجد أحدث قياسات",
+        "attributes-scope": "نطاق سمات الكيان",
+        "scope-telemetry": "قياسات",
+        "scope-latest-telemetry": "أحدث قياسات",
+        "scope-client": "سمات العميل",
+        "scope-server": "سمات الخادم",
+        "scope-shared": "السمات المشتركة",
+        "add": "إضافة سمة",
+        "add-attribute-prompt": "الرجاء إضافة سمة",
+        "key": "المفتاح",
+        "key-max-length": "يجب أن يكون المفتاح أقل من 256",
+        "last-update-time": "آخر وقت تحديث",
+        "key-required": "مفتاح السمة مطلوب.",
+        "value": "القيمة",
+        "value-required": "قيمة السمة مطلوبة.",
+        "telemetry-key-required": "مفتاح القياسات مطلوب",
+        "telemetry-value-required": "قيمة القياسات مطلوبة",
+        "delete-attributes-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 سمة} other {# سمات} }؟",
+        "delete-attributes-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع السمات المحددة.",
+        "delete-attributes": "حذف السمات",
+        "enter-attribute-value": "أدخل قيمة السمة",
+        "show-on-widget": "إظهار على القطعة",
+        "widget-mode": "وضع القطعة",
+        "next-widget": "القطعة التالية",
+        "prev-widget": "القطعة السابقة",
+        "add-to-dashboard": "إضافة إلى لوحة التحكم",
+        "add-widget-to-dashboard": "إضافة قطعة إلى لوحة التحكم",
+        "selected-attributes": "{ count, plural, =1 {1 سمة} other {# سمات} } محددة",
+        "selected-telemetry": "{ count, plural, =1 {1 وحدة قياسات} other {# وحدات قياسات} } محددة",
+        "no-attributes-text": "لم يتم العثور على سمات",
+        "no-telemetry-text": "لم يتم العثور على قياسات",
+        "copy-key": "نسخ المفتاح",
+        "add-telemetry": "إضافة قياسات",
+        "copy-value": "نسخ القيمة",
+        "delete-timeseries": {
+            "start-time": "وقت البداية",
+            "ends-on": "ينتهي في",
+            "strategy": "الاستراتيجية",
+            "delete-strategy": "استراتيجية الحذف",
+            "all-data": "حذف جميع البيانات",
+            "all-data-except-latest-value": "حذف جميع البيانات باستثناء آخر قيمة",
+            "latest-value": "حذف آخر قيمة",
+            "all-data-for-time-period": "حذف جميع البيانات لفترة زمنية",
+            "rewrite-latest-value": "إعادة كتابة آخر قيمة"
+        }
+    },
+    "api-usage": {
+        "api-features": "ميزات API",
+        "api-usage": "استخدام API",
+        "alarm": "إنذار",
+        "alarms-created": "الإنذارات المُنشأة",
+        "alarms-created-daily-activity": "نشاط يومي لإنشاء الإنذارات",
+        "alarms-created-hourly-activity": "نشاط ساعي لإنشاء الإنذارات",
+        "alarms-created-monthly-activity": "نشاط شهري لإنشاء الإنذارات",
+        "data-points": "نقاط البيانات",
+        "data-points-storage-days": "أيام تخزين نقاط البيانات",
+        "device-api": "API الجهاز",
+        "email": "البريد الإلكتروني",
+        "email-messages": "رسائل البريد الإلكتروني",
+        "email-messages-daily-activity": "نشاط يومي لرسائل البريد الإلكتروني",
+        "email-messages-monthly-activity": "نشاط شهري لرسائل البريد الإلكتروني",
+        "exceptions": "استثناءات",
+        "executions": "تنفيذات",
+        "scripts": "السكربتات",
+        "scripts-hourly-activity": "نشاط ساعي للسكربتات",
+        "scripts-daily-activity": "نشاط يومي للسكربتات",
+        "scripts-monthly-activity": "نشاط شهري للسكربتات",
+        "javascript": "جافاسكريبت",
+        "javascript-executions": "تنفيذات جافاسكريبت",
+        "tbel": "TBEL",
+        "tbel-executions": "تنفيذات TBEL",
+        "latest-error": "آخر خطأ",
+        "messages": "الرسائل",
+        "notifications": "الإشعارات",
+        "notifications-email-sms": "الإشعارات (البريد الإلكتروني/SMS)",
+        "notifications-hourly-activity": "نشاط ساعي للإشعارات",
+        "permanent-failures": "${entityName} فشل دائم",
+        "permanent-timeouts": "${entityName} مهلة دائمة",
+        "processing-failures": "${entityName} فشل المعالجة",
+        "processing-failures-and-timeouts": "فشل المعالجة والمهل",
+        "processing-timeouts": "${entityName} مهل المعالجة",
+        "queue-stats": "إحصائيات الطابور",
+        "rule-chain": "سلسلة القواعد",
+        "rule-engine": "محرك القواعد",
+        "rule-engine-daily-activity": "نشاط يومي لمحرك القواعد",
+        "rule-engine-executions": "تنفيذات محرك القواعد",
+        "rule-engine-hourly-activity": "نشاط ساعي لمحرك القواعد",
+        "rule-engine-monthly-activity": "نشاط شهري لمحرك القواعد",
+        "rule-engine-statistics": "إحصائيات محرك القواعد",
+        "rule-node": "عقدة القاعدة",
+        "sms": "رسائل قصيرة",
+        "sms-messages": "الرسائل القصيرة",
+        "sms-messages-daily-activity": "نشاط يومي للرسائل القصيرة",
+        "sms-messages-monthly-activity": "نشاط شهري للرسائل القصيرة",
+        "successful": "${entityName} ناجح",
+        "telemetry": "القياسات",
+        "telemetry-persistence": "استمرارية القياسات",
+        "telemetry-persistence-daily-activity": "نشاط يومي لاستمرارية القياسات",
+        "telemetry-persistence-hourly-activity": "نشاط ساعي لاستمرارية القياسات",
+        "telemetry-persistence-monthly-activity": "نشاط شهري لاستمرارية القياسات",
+        "transport": "النقل",
+        "transport-daily-activity": "نشاط يومي للنقل",
+        "transport-data-points": "نقاط بيانات النقل",
+        "transport-hourly-activity": "نشاط ساعي للنقل",
+        "transport-messages": "رسائل النقل",
+        "transport-monthly-activity": "نشاط شهري للنقل",
+        "view-details": "عرض التفاصيل",
+        "view-statistics": "عرض الإحصائيات"
+    },
+    "api-limit": {
+        "cassandra-queries": "استعلامات Cassandra",
+        "entity-version-creation": "إنشاء إصدار الكيان",
+        "entity-version-load": "تحميل إصدار الكيان",
+        "integration-messages": "رسائل التكامل",
+        "integration-messages-per-device": "رسائل التكامل لكل جهاز",
+        "notification-requests": "طلبات الإشعار",
+        "notification-requests-per-rule": "طلبات الإشعار لكل قاعدة",
+        "reports-generation": "توليد التقارير",
+        "rest-api-requests": "طلبات REST API",
+        "rest-api-requests-per-customer": "طلبات REST API لكل عميل",
+        "transport-messages": "رسائل النقل",
+        "transport-messages-per-device": "رسائل النقل لكل جهاز",
+        "ws-updates-per-session": "تحديثات WS لكل جلسة"
+    },
+    "audit-log": {
+        "audit": "تدقيق",
+        "audit-logs": "سجلات التدقيق",
+        "timestamp": "الطابع الزمني",
+        "entity-type": "نوع الكيان",
+        "entity-name": "اسم الكيان",
+        "user": "المستخدم",
+        "type": "النوع",
+        "status": "الحالة",
+        "details": "التفاصيل",
+        "type-added": "مُضاف",
+        "type-deleted": "مُحذف",
+        "type-updated": "مُحدث",
+        "type-attributes-updated": "تم تحديث السمات",
+        "type-attributes-deleted": "تم حذف السمات",
+        "type-rpc-call": "استدعاء RPC",
+        "type-credentials-updated": "تم تحديث الاعتمادات",
+        "type-assigned-to-customer": "مُعين للعميل",
+        "type-unassigned-from-customer": "غير مُعين من العميل",
+        "type-assigned-to-edge": "مُعين للحافة",
+        "type-unassigned-from-edge": "غير مُعين من الحافة",
+        "type-activated": "مُفعل",
+        "type-suspended": "مُعلق",
+        "type-credentials-read": "تم قراءة الاعتمادات",
+        "type-attributes-read": "تم قراءة السمات",
+        "type-added-to-entity-group": "مُضاف إلى المجموعة",
+        "type-removed-from-entity-group": "مُزال من المجموعة",
+        "type-relation-add-or-update": "تم تحديث العلاقة",
+        "type-relation-delete": "تم حذف العلاقة",
+        "type-relations-delete": "تم حذف جميع العلاقات",
+        "type-alarm-ack": "مُقر",
+        "type-alarm-clear": "مُزال",
+        "type-alarm-assign": "مُعين",
+        "type-alarm-unassign": "غير مُعين",
+        "type-added-comment": "تم إضافة تعليق",
+        "type-updated-comment": "تم تحديث التعليق",
+        "type-deleted-comment": "تم حذف التعليق",
+        "type-rest-api-rule-engine-call": "استدعاء API REST لمحرك القواعد",
+        "type-made-public": "أصبح عامًا",
+        "type-made-private": "أصبح خاصًا",
+        "type-login": "تسجيل الدخول",
+        "type-logout": "تسجيل الخروج",
+        "type-lockout": "قفل",
+        "status-success": "نجاح",
+        "status-failure": "فشل",
+        "audit-log-details": "تفاصيل سجل التدقيق",
+        "no-audit-logs-prompt": "لم يتم العثور على سجلات",
+        "action-data": "بيانات العمل",
+        "failure-details": "تفاصيل الفشل",
+        "search": "بحث في سجلات التدقيق",
+        "clear-search": "مسح البحث",
+        "type-assigned-from-tenant": "مُعين من المستأجر",
+        "type-assigned-to-tenant": "مُعين للمستأجر",
+        "type-provision-success": "تم توفير الجهاز",
+        "type-provision-failure": "فشل في توفير الجهاز",
+        "type-timeseries-updated": "تم تحديث القياسات",
+        "type-timeseries-deleted": "تم حذف القياسات",
+        "type-owner-changed": "تغير المالك",
+        "type-sms-sent": "تم إرسال رسالة قصيرة"
+    },
+    "confirm-on-exit": {
+        "message": "لديك تغييرات غير محفوظة. هل أنت متأكد أنك تريد مغادرة هذه الصفحة؟",
+        "html-message": "لديك تغييرات غير محفوظة.<br/>هل أنت متأكد أنك تريد مغادرة هذه الصفحة؟",
+        "title": "تغييرات غير محفوظة"
+    },
+    "contact": {
+        "country": "البلد",
+        "city": "المدينة",
+        "state": "الولاية / المقاطعة",
+        "postal-code": "الرمز البريدي / الرمز البريدي",
+        "postal-code-invalid": "تنسيق الرمز البريدي / الرمز البريدي غير صالح.",
+        "address": "العنوان",
+        "address2": "العنوان 2",
+        "phone": "الهاتف",
+        "email": "البريد الإلكتروني",
+        "no-address": "لا يوجد عنوان",
+        "state-max-length": "يجب أن تكون الولاية أقل من 256",
+        "phone-max-length": "يجب أن يكون رقم الهاتف أقل من 256",
+        "city-max-length": "يجب أن تكون المدينة المحددة أقل من 256"
+    },
+    "common": {
+        "username": "اسم المستخدم",
+        "password": "كلمة المرور",
+        "enter-username": "أدخل اسم المستخدم",
+        "enter-password": "أدخل كلمة المرور",
+        "enter-search": "أدخل للبحث",
+        "created-time": "وقت الإنشاء",
+        "loading": "جار التحميل...",
+        "proceed": "تقدم",
+        "open-details-page": "افتح صفحة التفاصيل",
+        "not-found": "غير موجود",
+        "documentation": "التوثيق"
+    },
+    "converter": {
+        "converter": "محول البيانات",
+        "converters": "محولات البيانات",
+        "select-converter": "اختر محول البيانات",
+        "no-converters-matching": "لم يتم العثور على محولات بيانات تطابق '{{entity}}'.",
+        "no-converters-found": "لم يتم العثور على محولات بيانات.",
+        "converter-required": "محول البيانات مطلوب",
+        "delete": "حذف المحول",
+        "management": "إدارة محولات البيانات",
+        "add-converter-text": "أضف محول بيانات جديد",
+        "no-converters-text": "لم يتم العثور على محولات بيانات",
+        "selected-converters": "{ count, plural, =1 {1 محول بيانات} other {# محولات بيانات} } مختار",
+        "delete-converter-title": "هل أنت متأكد من أنك تريد حذف محول البيانات '{{converterName}}'؟",
+        "delete-converter-text": "كن حذرًا، بعد التأكيد سيصبح محول البيانات وجميع البيانات ذات الصلة غير قابلين للاسترداد.",
+        "delete-converters-title": "هل أنت متأكد من أنك تريد حذف { count, plural, =1 {1 محول بيانات} other {# محولات بيانات} }؟",
+        "delete-converters-action-title": "حذف { count, plural, =1 {1 محول بيانات} other {# محولات بيانات} }",
+        "delete-converters-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع محولات البيانات المختارة وستصبح جميع البيانات ذات الصلة غير قابلة للاسترداد.",
+        "events": "الأحداث",
+        "add": "أضف محول بيانات",
+        "search": "ابحث في محولات البيانات",
+        "converter-details": "تفاصيل محول البيانات",
+        "details": "التفاصيل",
+        "copyId": "نسخ معرف المحول",
+        "idCopiedMessage": "تم نسخ معرف المحول إلى الحافظة",
+        "debug-mode": "وضع التصحيح",
+        "created-time": "وقت الإنشاء",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256",
+        "description": "الوصف",
+        "decoder": "فك التشفير",
+        "encoder": "التشفير",
+        "test-decoder-fuction": "اختبر وظيفة فك التشفير",
+        "test-encoder-fuction": "اختبر وظيفة التشفير",
+        "test-with-this-message": "{{test}} مع هذه الرسالة",
+        "decoder-input-params": "معاملات إدخال فك التشفير",
+        "encoder-input-params": "معاملات إدخال التشفير",
+        "payload": "الحمولة",
+        "payload-content-type": "نوع محتوى الحمولة",
+        "payload-content": "محتوى الحمولة",
+        "message": "الرسالة",
+        "message-type": "نوع الرسالة",
+        "message-type-required": "نوع الرسالة مطلوب",
+        "test": "اختبار",
+        "metadata": "البيانات الوصفية",
+        "metadata-required": "لا يمكن أن تكون إدخالات البيانات الوصفية فارغة.",
+        "integration-metadata": "بيانات وصفية للتكامل",
+        "integration-metadata-required": "لا يمكن أن تكون إدخالات البيانات الوصفية للتكامل فارغة.",
+        "output": "المخرجات",
+        "import": "استيراد المحول",
+        "export": "تصدير المحول",
+        "export-failed-error": "غير قادر على تصدير المحول: {{error}}",
+        "create-new-converter": "إنشاء محول جديد",
+        "converter-file": "ملف المحول",
+        "invalid-converter-file-error": "غير قادر على استيراد المحول: بنية بيانات المحول غير صالحة.",
+        "type": "النوع",
+        "type-required": "النوع مطلوب.",
+        "type-uplink": "ربط تصاعدي",
+        "type-downlink": "ربط تنازلي",
+        "update-only-keys-list": "تحديث قائمة المفاتيح فقط",
+        "update-only-keys-list-hint": "سيتم حفظ القيم المرتبطة بالمفاتيح المقدمة في قاعدة البيانات فقط إذا كانت مختلفة عن القيم المقابلة في الرسالة المحولة السابقة. هذه الوظيفة تنطبق على كل من السمات والقياسات في مخرجات المحول.",
+        "add-key": "أضف مفتاح"
+    },
+    "content-type": {
+        "json": "Json",
+        "text": "نص",
+        "binary": "ثنائي (Base64)"
+    },
+    "color": {
+        "color": "اللون",
+        "color-picker": "اختيار اللون",
+        "primary-colors": "الألوان الأساسية",
+        "accent-colors": "الألوان الفرعية",
+        "no-color-selected": "لم يتم اختيار لون"
+    },
+    "customer": {
+        "all": "الكل",
+        "all-customers": "جميع العملاء",
+        "groups": "المجموعات",
+        "shared": "مشترك",
+        "hierarchy": "التسلسل الهرمي",
+        "customer": "العميل",
+        "customers": "العملاء",
+        "management": "إدارة العملاء",
+        "dashboard": "لوحة تحكم العميل",
+        "dashboards": "لوحات تحكم العميل",
+        "devices": "أجهزة العميل",
+        "entity-views": "عرض كيانات العميل",
+        "assets": "أصول العميل",
+        "public-dashboards": "لوحات التحكم العامة",
+        "public-devices": "الأجهزة العامة",
+        "public-assets": "الأصول العامة",
+        "public-entity-views": "عرض الكيانات العامة",
+        "add": "إضافة عميل",
+        "delete": "حذف العميل",
+        "manage-customer-user-groups": "إدارة مجموعات مستخدمي العملاء",
+        "manage-customer-groups": "إدارة مجموعات العملاء",
+        "manage-customer-device-groups": "إدارة مجموعات أجهزة العملاء",
+        "manage-customer-asset-groups": "إدارة مجموعات أصول العملاء",
+        "manage-customer-entity-view-groups": "إدارة مجموعات عرض كيانات العملاء",
+        "manage-customer-edge-groups": "إدارة مجموعات حواف العملاء",
+        "manage-customer-dashboard-groups": "إدارة مجموعات لوحات تحكم العملاء",
+        "manage-customer-users": "إدارة مستخدمي العملاء",
+        "manage-customers": "إدارة العملاء",
+        "manage-customer-devices": "إدارة أجهزة العملاء",
+        "manage-customer-entity-views": "إدارة عرض كيانات العملاء",
+        "manage-customer-dashboards": "إدارة لوحات تحكم العملاء",
+        "manage-public-devices": "إدارة الأجهزة العامة",
+        "manage-public-dashboards": "إدارة لوحات التحكم العامة",
+        "manage-customer-assets": "إدارة أصول العملاء",
+        "manage-customer-edges": "إدارة حواف العملاء",
+        "manage-public-assets": "إدارة الأصول العامة",
+        "add-customer-text": "أضف عميل جديد",
+        "no-customers-text": "لم يتم العثور على عملاء",
+        "customer-details": "تفاصيل العميل",
+        "delete-customer-title": "هل أنت متأكد من أنك تريد حذف العميل '{{customerTitle}}'؟",
+        "delete-customer-text": "كن حذرًا، بعد التأكيد سيصبح العميل وجميع البيانات ذات الصلة غير قابلين للاسترداد.",
+        "delete-customers-title": "هل أنت متأكد من أنك تريد حذف { count, plural, =1 {1 عميل} other {# عملاء} }؟",
+        "delete-customers-action-title": "حذف { count, plural, =1 {1 عميل} other {# عملاء} }",
+        "delete-customers-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع العملاء المختارين وستصبح جميع البيانات ذات الصلة غير قابلة للاسترداد.",
+        "manage-user-groups": "إدارة مجموعات المستخدمين",
+        "manage-asset-groups": "إدارة مجموعات الأصول",
+        "manage-device-groups": "إدارة مجموعات الأجهزة",
+        "manage-dashboard-groups": "إدارة مجموعات لوحات التحكم",
+        "manage-entity-view-groups": "إدارة مجموعات عرض الكيانات",
+        "manage-edge-groups": "إدارة مجموعات الحواف",
+        "manage-users": "إدارة المستخدمين",
+        "manage-assets": "إدارة الأصول",
+        "manage-devices": "إدارة الأجهزة",
+        "manage-dashboards": "إدارة لوحات التحكم",
+        "manage-entity-views": "إدارة عرض الكيانات",
+        "title": "العنوان",
+        "title-required": "العنوان مطلوب.",
+        "title-max-length": "يجب أن يكون العنوان أقل من 256",
+        "description": "الوصف",
+        "details": "التفاصيل",
+        "events": "الأحداث",
+        "copyId": "نسخ معرف العميل",
+        "idCopiedMessage": "تم نسخ معرف العميل إلى الحافظة",
+        "select-customer": "اختر عميل",
+        "no-customers-matching": "لم يتم العثور على عملاء يطابقون '{{entity}}'.",
+        "customer-required": "العميل مطلوب",
+        "select-group-to-add": "اختر المجموعة المستهدفة لإضافة العملاء المختارين",
+        "select-group-to-move": "اختر المجموعة المستهدفة لنقل العملاء المختارين",
+        "remove-customers-from-group": "هل أنت متأكد من أنك تريد إزالة { count, plural, =1 {1 عميل} other {# عملاء} } من المجموعة '{{entityGroup}}'؟",
+        "group": "مجموعة العملاء",
+        "list-of-groups": "{ count, plural, =1 {مجموعة عملاء واحدة} other {قائمة بـ # مجموعات العملاء} }",
+        "group-name-starts-with": "مجموعات العملاء التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "select-default-customer": "اختر العميل الافتراضي",
+        "default-customer": "العميل الافتراضي",
+        "default-customer-required": "العميل الافتراضي مطلوب لتصحيح لوحة التحكم على مستوى المستأجر",
+        "allow-white-labeling": "السماح بالتسمية البيضاء",
+        "search": "بحث في العملاء",
+        "selected-customers": "{ count, plural, =1 {1 عميل} other {# عملاء} } مختار",
+        "edges": "حواف العميل",
+        "manage-edges": "إدارة الحواف"
+    },
+    "customers-hierarchy": {
+        "customers-hierarchy": "تسلسل العملاء الهرمي",
+        "open-nav-tree": "فتح شجرة التنقل",
+        "return-to-top-level": "العودة إلى المستوى الأعلى"
+    },
+    "custom-menu": {
+        "custom-menu": "قائمة مخصصة",
+        "custom-menu-hint": "حدد قائمة مخصصة JSON أدناه. هذا JSON يحتوي على قائمة بعناصر القائمة المخصصة."
+    },
+    "custom-translation": {
+        "custom-translation": "ترجمة مخصصة",
+        "translation-map": "خريطة الترجمة",
+        "key": "مفتاح الترجمة",
+        "import": "استيراد الترجمة",
+        "export": "تصدير الترجمة",
+        "export-data": "تصدير بيانات الترجمة",
+        "import-data": "استيراد بيانات الترجمة",
+        "translation-file": "ملف الترجمة",
+        "invalid-translation-file-error": "غير قادر على استيراد ملف الترجمة: بنية بيانات الترجمة غير صالحة.",
+        "custom-translation-hint": "حدد ترجمة مخصصة JSON أدناه. سيتم استبدال هذا JSON بالترجمة الافتراضية. انقر على 'تنزيل ملف اللغة' للحصول على الترجمة الحالية. يمكنك أيضًا استخدام الملف المحمل كمرجع لمفتاح قيم الترجمة المتاحة.",
+        "download-locale-file": "تنزيل ملف اللغة"
+    },
+    "date": {
+        "last-update-n-ago": "آخر تحديث منذ N",
+        "last-update-n-ago-text": "آخر تحديث {{ agoText }}",
+        "custom-date": "تاريخ مخصص",
+        "format": "التنسيق",
+        "preview": "معاينة"
+    },
+    "datetime": {
+        "date-from": "التاريخ من",
+        "time-from": "الوقت من",
+        "date-to": "التاريخ إلى",
+        "time-to": "الوقت إلى"
+    },
+    "dashboard": {
+        "all": "الكل",
+        "all-dashboards": "جميع لوحات المعلومات",
+        "groups": "المجموعات",
+        "shared": "مشترك",
+        "dashboard": "لوحة المعلومات",
+        "dashboards": "لوحات المعلومات",
+        "management": "إدارة لوحات المعلومات",
+        "view-dashboards": "عرض لوحات المعلومات",
+        "add": "إضافة لوحة معلومات",
+        "assign-dashboard-to-customer": "تعيين لوحة(لوحات) المعلومات للعميل",
+        "assign-dashboard-to-customer-text": "يرجى اختيار لوحات المعلومات لتعيينها للعميل",
+        "assign-to-customer-text": "يرجى اختيار العميل لتعيين لوحة(لوحات) المعلومات له",
+        "assign-to-customer": "تعيين للعميل",
+        "unassign-from-customer": "إلغاء التعيين من العميل",
+        "make-public": "جعل لوحة المعلومات عامة",
+        "make-private": "جعل لوحة المعلومات خاصة",
+        "manage-assigned-customers": "إدارة العملاء المعينين",
+        "assigned-customers": "العملاء المعينون",
+        "assign-to-customers": "تعيين لوحة(لوحات) المعلومات للعملاء",
+        "assign-to-customers-text": "يرجى اختيار العملاء لتعيين لوحة(لوحات) المعلومات لهم",
+        "unassign-from-customers": "إلغاء تعيين لوحة(لوحات) المعلومات من العملاء",
+        "unassign-from-customers-text": "يرجى اختيار العملاء لإلغاء تعيين لوحة(لوحات) المعلومات منهم",
+        "no-dashboards-text": "لم يتم العثور على لوحات معلومات",
+        "no-widgets": "لا توجد أدوات مُعدة",
+        "add-widget": "إضافة أداة جديدة",
+        "add-widget-button-text": "إضافة أداة",
+        "title": "العنوان",
+        "image": "صورة لوحة المعلومات",
+        "mobile-app-settings": "إعدادات التطبيق المحمول",
+        "mobile-order": "ترتيب لوحة المعلومات في التطبيق المحمول",
+        "mobile-hide": "إخفاء لوحة المعلومات في التطبيق المحمول",
+        "update-image": "تحديث صورة لوحة المعلومات",
+        "take-screenshot": "التقاط لقطة شاشة",
+        "select-widget-title": "اختر عنوان الأداة",
+        "select-widget-value": "{{title}}: اختر أداة",
+        "select-widget-subtitle": "قائمة بأنواع الأدوات المتاحة",
+        "delete": "حذف لوحة المعلومات",
+        "title-required": "العنوان مطلوب.",
+        "title-max-length": "يجب أن يكون العنوان أقل من 256",
+        "description": "الوصف",
+        "details": "التفاصيل",
+        "dashboard-details": "تفاصيل لوحة المعلومات",
+        "add-dashboard-text": "إضافة لوحة معلومات جديدة",
+        "assign-dashboards": "تعيين لوحات المعلومات",
+        "assign-new-dashboard": "تعيين لوحة معلومات جديدة",
+        "assign-dashboards-text": "تعيين { count, plural, =1 {لوحة معلومات واحدة} other {# لوحات المعلومات} } للعملاء",
+        "unassign-dashboards-action-text": "إلغاء تعيين { count, plural, =1 {لوحة معلومات واحدة} other {# لوحات المعلومات} } من العملاء",
+        "delete-dashboards": "حذف لوحات المعلومات",
+        "unassign-dashboards": "إلغاء تعيين لوحات المعلومات",
+        "unassign-dashboards-action-title": "إلغاء تعيين { count, plural, =1 {لوحة معلومات واحدة} other {# لوحات المعلومات} } من العميل",
+        "delete-dashboard-title": "هل أنت متأكد أنك تريد حذف لوحة المعلومات '{{dashboardTitle}}'؟",
+        "delete-dashboard-text": "كن حذرًا، بعد التأكيد ستصبح لوحة المعلومات وجميع البيانات ذات الصلة غير قابلة للاسترداد.",
+        "delete-dashboards-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {لوحة معلومات واحدة} other {# لوحات المعلومات} }؟",
+        "delete-dashboards-action-title": "حذف { count, plural, =1 {لوحة معلومات واحدة} other {# لوحات المعلومات} }",
+        "delete-dashboards-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع لوحات المعلومات المختارة وستصبح جميع البيانات ذات الصلة غير قابلة للاسترداد.",
+        "unassign-dashboard-title": "هل أنت متأكد أنك تريد إلغاء تعيين لوحة المعلومات '{{dashboardTitle}}'؟",
+        "unassign-dashboard-text": "بعد التأكيد سيتم إلغاء تعيين لوحة المعلومات ولن تكون متاحة للعميل.",
+        "unassign-dashboard": "إلغاء تعيين لوحة المعلومات",
+        "unassign-dashboards-title": "هل أنت متأكد أنك تريد إلغاء تعيين { count, plural, =1 {لوحة معلومات واحدة} other {# لوحات المعلومات} }؟",
+        "unassign-dashboards-text": "بعد التأكيد سيتم إلغاء تعيين جميع لوحات المعلومات المختارة ولن تكون متاحة للعميل.",
+        "public-dashboard-title": "لوحة المعلومات الآن عامة",
+        "public-dashboard-text": "لوحة المعلومات <b>{{dashboardTitle}}</b> الخاصة بك أصبحت الآن عامة ويمكن الوصول إليها عبر الرابط العام التالي <a href='{{publicLink}}' target='_blank'>الرابط</a>:",
+        "public-dashboard-notice": "<b>ملاحظة:</b> لا تنسى جعل الأجهزة ذات الصلة عامة للوصول إلى بياناتها.",
+        "public-dashboard-link": "رابط لوحة المعلومات العامة",
+        "public-dashboard-link-text": "يمكن الوصول إلى لوحة المعلومات العامة <b>{{dashboardTitle}}</b> عبر الرابط العام التالي <a href='{{publicLink}}' target='_blank'>الرابط</a>:",
+        "public-dashboard-link-notice": "<b>ملاحظة:</b> لا تنسى جعل الأجهزة والأصول وعروض الكيانات العامة ذات الصلة عامة للوصول إلى بياناتها.",
+        "make-private-dashboard-title": "هل أنت متأكد أنك تريد جعل لوحة المعلومات '{{dashboardTitle}}' خاصة؟",
+        "make-private-dashboard-text": "بعد التأكيد ستصبح لوحة المعلومات خاصة ولن تكون متاحة للآخرين.",
+        "make-private-dashboard": "جعل لوحة المعلومات خاصة",
+        "socialshare-text": "'{{dashboardTitle}}' بدعم من ThingsBoard",
+        "socialshare-title": "'{{dashboardTitle}}' بدعم من ThingsBoard",
+        "select-dashboard": "اختر لوحة المعلومات",
+        "no-dashboards-matching": "لم يتم العثور على لوحات معلومات تطابق '{{entity}}'.",
+        "dashboard-required": "لوحة المعلومات مطلوبة.",
+        "select-existing": "اختر لوحة المعلومات الحالية",
+        "create-new": "إنشاء لوحة معلومات جديدة",
+        "new-dashboard-title": "عنوان لوحة المعلومات الجديدة",
+        "open-dashboard": "فتح لوحة المعلومات",
+        "set-background": "تعيين الخلفية",
+        "background-color": "لون الخلفية",
+        "background-image": "صورة الخلفية",
+        "background-size-mode": "وضع حجم الخلفية",
+        "no-image": "لم يتم اختيار صورة",
+        "empty-image": "لا توجد صورة",
+        "drop-image": "أسقط صورة أو انقر لاختيار ملف للتحميل.",
+        "maximum-upload-file-size": "الحد الأقصى لحجم الملف المرفوع: {{ size }}",
+        "cannot-upload-file": "لا يمكن تحميل الملف",
+        "settings": "الإعدادات",
+        "layout-settings": "إعدادات التخطيط",
+        "columns-count": "عدد الأعمدة",
+        "columns-count-required": "عدد الأعمدة مطلوب.",
+        "min-columns-count-message": "الحد الأدنى المسموح به هو 10 أعمدة.",
+        "max-columns-count-message": "الحد الأقصى المسموح به هو 1000 عمود.",
+        "widgets-margins": "هامش بين الأدوات",
+        "margin-required": "قيمة الهامش مطلوبة.",
+        "min-margin-message": "0 هو الحد الأدنى المسموح به كقيمة هامش.",
+        "max-margin-message": "50 هو الحد الأقصى المسموح به كقيمة هامش.",
+        "horizontal-margin": "الهامش الأفقي",
+        "horizontal-margin-required": "قيمة الهامش الأفقي مطلوبة.",
+        "min-horizontal-margin-message": "0 هو الحد الأدنى المسموح به كقيمة للهامش الأفقي.",
+        "max-horizontal-margin-message": "50 هو الحد الأقصى المسموح به كقيمة للهامش الأفقي.",
+        "vertical-margin": "الهامش العمودي",
+        "vertical-margin-required": "قيمة الهامش العمودي مطلوبة.",
+        "min-vertical-margin-message": "0 هو الحد الأدنى المسموح به كقيمة للهامش العمودي.",
+        "max-vertical-margin-message": "50 هو الحد الأقصى المسموح به كقيمة للهامش العمودي.",
+        "apply-outer-margin": "تطبيق الهامش على جوانب التخطيط",
+        "autofill-height": "تعبئة ارتفاع التخطيط تلقائيًا",
+        "mobile-layout": "إعدادات التخطيط للجوال",
+        "mobile-row-height": "ارتفاع الصف في التخطيط للجوال، بكسل",
+        "mobile-row-height-required": "قيمة ارتفاع الصف للجوال مطلوبة.",
+        "min-mobile-row-height-message": "5 بكسل هو الحد الأدنى المسموح به كقيمة لارتفاع الصف للجوال.",
+        "max-mobile-row-height-message": "200 بكسل هو الحد الأقصى المسموح به كقيمة لارتفاع الصف للجوال.",
+        "title-settings": "إعدادات العنوان",
+        "display-title": "عرض عنوان لوحة المعلومات",
+        "title-color": "لون العنوان",
+        "toolbar-settings": "إعدادات شريط الأدوات",
+        "hide-toolbar": "إخفاء شريط الأدوات",
+        "toolbar-always-open": "الإبقاء على شريط الأدوات مفتوحًا",
+        "display-dashboards-selection": "عرض اختيار لوحات المعلومات",
+        "display-entities-selection": "عرض اختيار الكيانات",
+        "display-filters": "عرض الفلاتر",
+        "display-dashboard-timewindow": "عرض نافذة الوقت للوحة المعلومات",
+        "display-dashboard-export": "عرض تصدير لوحة المعلومات",
+        "display-update-dashboard-image": "عرض تحديث صورة لوحة المعلومات",
+        "dashboard-logo-settings": "إعدادات شعار لوحة المعلومات",
+        "display-dashboard-logo": "عرض الشعار في وضع ملء الشاشة للوحة المعلومات",
+        "dashboard-logo-image": "صورة شعار لوحة المعلومات",
+        "advanced-settings": "الإعدادات المتقدمة",
+        "dashboard-css": "CSS للوحة المعلومات",
+        "import": "استيراد لوحة المعلومات",
+        "export": "تصدير لوحة المعلومات",
+        "export-failed-error": "غير قادر على تصدير لوحة المعلومات: {{error}}",
+        "export-pdf": "تصدير كـ PDF",
+        "export-png": "تصدير كـ PNG",
+        "export-jpg": "تصدير كـ JPEG",
+        "export-json-config": "تصدير تكوين JSON",
+        "download-dashboard-progress": "جار توليد {{reportType}} للوحة المعلومات...",
+        "create-new-dashboard": "إنشاء لوحة معلومات جديدة",
+        "dashboard-file": "ملف لوحة المعلومات",
+        "invalid-dashboard-file-error": "غير قادر على استيراد لوحة المعلومات: بنية بيانات لوحة المعلومات غير صالحة.",
+        "dashboard-import-missing-aliases-title": "تكوين الأسماء المستعارة المستخدمة بواسطة لوحة المعلومات المستوردة",
+        "create-new-widget": "إنشاء أداة جديدة",
+        "import-widget": "استيراد أداة",
+        "widget-file": "ملف الأداة",
+        "invalid-widget-file-error": "غير قادر على استيراد الأداة: بنية بيانات الأداة غير صالحة.",
+        "widget-import-missing-aliases-title": "تكوين الأسماء المستعارة المستخدمة بواسطة الأداة المستوردة",
+        "open-toolbar": "فتح شريط أدوات لوحة المعلومات",
+        "close-toolbar": "إغلاق شريط أدوات لوحة المعلومات",
+        "configuration-error": "خطأ في التكوين",
+        "alias-resolution-error-title": "خطأ في تكوين الأسماء المستعارة للوحة المعلومات",
+        "invalid-aliases-config": "غير قادر على العثور على أي أجهزة تطابق فلتر الأسماء المستعارة.<br/>يرجى الاتصال بمدير النظام لحل هذه المشكلة.",
+        "select-devices": "اختر الأجهزة",
+        "assignedToCustomer": "معين للعميل",
+        "assignedToCustomers": "معين للعملاء",
+        "public": "عام",
+        "copyId": "نسخ معرف لوحة المعلومات",
+        "idCopiedMessage": "تم نسخ معرف لوحة المعلومات إلى الحافظة",
+        "public-link": "الرابط العام",
+        "copy-public-link": "نسخ الرابط العام",
+        "public-link-copied-message": "تم نسخ الرابط العام للوحة المعلومات إلى الحافظة",
+        "manage-states": "إدارة حالات لوحة المعلومات",
+        "states": "حالات لوحة المعلومات",
+        "states-short": "الحالات",
+        "search-states": "بحث في حالات لوحة المعلومات",
+        "selected-states": "{ count, plural, =1 {حالة لوحة معلومات واحدة} other {# حالات لوحات المعلومات} } مختارة",
+        "edit-state": "تعديل حالة لوحة المعلومات",
+        "delete-state": "حذف حالة لوحة المعلومات",
+        "add-state": "إضافة حالة لوحة المعلومات",
+        "no-states-text": "لم يتم العثور على حالات",
+        "state": "حالة لوحة المعلومات",
+        "state-name": "الاسم",
+        "state-name-required": "اسم حالة لوحة المعلومات مطلوب.",
+        "state-id": "معرف الحالة",
+        "state-id-required": "معرف حالة لوحة المعلومات مطلوب.",
+        "state-id-exists": "حالة لوحة المعلومات بنفس المعرف موجودة بالفعل.",
+        "is-root-state": "حالة الجذر",
+        "delete-state-title": "حذف حالة لوحة المعلومات",
+        "delete-state-text": "هل أنت متأكد أنك تريد حذف حالة لوحة المعلومات بالاسم '{{stateName}}'؟",
+        "show-details": "عرض التفاصيل",
+        "hide-details": "إخفاء التفاصيل",
+        "select-state": "اختر الحالة المستهدفة",
+        "state-controller": "تحكم حالة لوحة المعلومات",
+        "state-controller-default": "ثابت (مُهمل)",
+        "search": "بحث في لوحات المعلومات",
+        "selected-dashboards": "{ count, plural, =1 {لوحة معلومات واحدة} other {# لوحات المعلومات} } مختارة",
+        "home-dashboard": "لوحة المعلومات الرئيسية",
+        "home-dashboard-hide-toolbar": "إخفاء شريط أدوات لوحة المعلومات الرئيسية",
+        "select-group-to-add": "اختر المجموعة المستهدفة لإضافة لوحات المعلومات المختارة",
+        "select-group-to-move": "اختر المجموعة المستهدفة لنقل لوحات المعلومات المختارة",
+        "remove-dashboards-from-group": "هل أنت متأكد أنك تريد إزالة { count, plural, =1 {لوحة معلومات واحدة} other {# لوحات المعلومات} } من المجموعة '{{entityGroup}}'؟",
+        "group": "مجموعة لوحات المعلومات",
+        "list-of-groups": "{ count, plural, =1 {مجموعة لوحة معلومات واحدة} other {قائمة بـ # مجموعات لوحات المعلومات} }",
+        "group-name-starts-with": "مجموعات لوحات المعلومات التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "unassign-dashboard-from-edge-text": "بعد التأكيد سيتم إلغاء تعيين لوحة المعلومات ولن تكون متاحة بواسطة الحافة.",
+        "unassign-dashboards-from-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين { count, plural, =1 {لوحة معلومات واحدة} other {# لوحات المعلومات} }؟",
+        "unassign-dashboards-from-edge-text": "بعد التأكيد سيتم إلغاء تعيين جميع لوحات المعلومات المختارة ولن تكون متاحة بواسطة الحافة.",
+        "assign-dashboard-to-edge": "تعيين لوحة(لوحات) المعلومات للحافة",
+        "assign-dashboard-to-edge-text": "يرجى اختيار لوحات المعلومات لتعيينها للحافة",
+        "non-existent-dashboard-state-error": "حالة لوحة المعلومات بمعرف \"{{ stateId }}\" غير موجودة",
+        "edit-mode": "وضع التحرير",
+        "duplicate-state-action": "تكرار الحالة"
+    },
+    "datakey": {
+        "settings": "الإعدادات",
+        "general": "عام",
+        "advanced": "متقدم",
+        "key": "المفتاح",
+        "label": "التسمية",
+        "color": "اللون",
+        "units": "رمز خاص للعرض بجانب القيمة",
+        "decimals": "عدد الأرقام بعد النقطة العائمة",
+        "data-generation-func": "وظيفة توليد البيانات",
+        "use-data-post-processing-func": "استخدم وظيفة معالجة البيانات بعد الإدخال",
+        "configuration": "تكوين مفتاح البيانات",
+        "timeseries": "السلاسل الزمنية",
+        "attributes": "السمات",
+        "entity-field": "حقل الكيان",
+        "alarm": "حقول التنبيه",
+        "timeseries-required": "سلاسل البيانات الزمنية للكيان مطلوبة.",
+        "timeseries-or-attributes-required": "سلاسل البيانات الزمنية للكيان/السمات مطلوبة.",
+        "alarm-fields-timeseries-or-attributes-required": "حقول التنبيه أو سلاسل البيانات الزمنية للكيان/السمات مطلوبة.",
+        "maximum-timeseries-or-attributes": "الحد الأقصى { count, plural, =1 {سلسلة بيانات زمنية/سمة واحدة مسموح بها.} other {# من سلاسل البيانات الزمنية/السمات مسموح بها} }",
+        "alarm-fields-required": "حقول التنبيه مطلوبة.",
+        "function-types": "أنواع الوظائف",
+        "function-type": "نوع الوظيفة",
+        "function-types-required": "أنواع الوظائف مطلوبة.",
+        "data-keys": "مفاتيح البيانات",
+        "data-key": "مفتاح البيانات",
+        "data-keys-required": "مفاتيح البيانات مطلوبة.",
+        "data-key-required": "مفتاح البيانات مطلوب.",
+        "alarm-keys": "مفاتيح بيانات التنبيه",
+        "alarm-key": "مفتاح بيانات التنبيه",
+        "alarm-key-functions": "وظائف مفتاح التنبيه",
+        "alarm-key-function": "وظيفة مفتاح التنبيه",
+        "latest-keys": "آخر مفاتيح البيانات",
+        "latest-key": "آخر مفتاح بيانات",
+        "latest-key-functions": "وظائف آخر مفتاح",
+        "latest-key-function": "وظيفة آخر مفتاح",
+        "timeseries-keys": "مفاتيح بيانات السلاسل الزمنية",
+        "timeseries-key": "مفتاح بيانات السلسلة الزمنية",
+        "timeseries-key-functions": "وظائف مفتاح السلسلة الزمنية",
+        "timeseries-key-function": "وظيفة مفتاح السلسلة الزمنية",
+        "maximum-function-types": "الحد الأقصى { count, plural, =1 {نوع وظيفة واحد مسموح به.} other {# من أنواع الوظائف مسموح بها} }",
+        "time-description": "طابع زمني للقيمة الحالية؛",
+        "value-description": "القيمة الحالية؛",
+        "prev-value-description": "نتيجة آخر استدعاء للوظيفة؛",
+        "time-prev-description": "طابع زمني للقيمة السابقة؛",
+        "prev-orig-value-description": "القيمة الأصلية السابقة؛",
+        "aggregation": "تجميع",
+        "aggregation-type-hint-common": "لأسباب تتعلق بالأداء، يتوفر حساب القيم المجمعة فقط لفترات زمنية ثابتة مثل \"اليوم الحالي\"، \"الشهر الحالي\"، إلخ، وغير متاحة لفترات النافذة الزمنية المتحركة مثل 'آخر 30 دقيقة' أو 'آخر 24 ساعة'.",
+        "aggregation-type-none-hint": "أخذ آخر قيمة.",
+        "aggregation-type-min-hint": "العثور على القيمة الدنيا بين نقاط البيانات ضمن نافذة زمنية محددة.",
+        "aggregation-type-max-hint": "العثور على القيمة العظمى بين نقاط البيانات ضمن نافذة زمنية محددة.",
+        "aggregation-type-avg-hint": "حساب قيمة متوسطة بين نقاط البيانات ضمن نافذة زمنية محددة.",
+        "aggregation-type-sum-hint": "جمع جميع قيم نقاط البيانات ضمن نافذة زمنية محددة.",
+        "aggregation-type-count-hint": "إجمالي عدد نقاط البيانات ضمن نافذة زمنية محددة.",
+        "delta-calculation": "حساب الفارق",
+        "enable-delta-calculation": "تمكين حساب الفارق",
+        "enable-delta-calculation-hint": "عند التمكين، يتم حساب قيمة مفتاح البيانات بناءً على القيم المجمعة لنافذة زمنية محددة وفترة مقارنة محددة. لأسباب تتعلق بالأداء، يتوفر حساب الفارق فقط لنوافذ الزمن التاريخية وليس للقيم الزمنية الفعلية. على سبيل المثال، يمكنك حساب الفارق بين استهلاك الطاقة للأمس مقارنةً باليوم الذي سبقه.",
+        "delta-calculation-result": "نتيجة حساب الفارق",
+        "delta-calculation-result-previous-value": "القيمة السابقة",
+        "delta-calculation-result-delta-absolute": "الفارق (مطلق)",
+        "delta-calculation-result-delta-percent": "الفارق (نسبة مئوية)",
+        "source": "المصدر",
+        "latest": "آخر",
+        "latest-value": "آخر قيمة",
+        "delta": "الفارق",
+        "percent": "نسبة مئوية",
+        "absolute": "مطلق"
+    },
+    "datasource": {
+        "type": "نوع مصدر البيانات",
+        "name": "الاسم",
+        "label": "التسمية",
+        "add-datasource-prompt": "يرجى إضافة مصدر بيانات"
+    },
+    "details": {
+        "details": "تفاصيل",
+        "edit-mode": "وضع التحرير",
+        "edit-json": "تحرير JSON",
+        "toggle-edit-mode": "تبديل وضع التحرير"
+    },
+    "device": {
+        "all": "الكل",
+        "all-devices": "جميع الأجهزة",
+        "groups": "المجموعات",
+        "shared": "مشترك",
+        "device": "الجهاز",
+        "device-required": "الجهاز مطلوب.",
+        "devices": "الأجهزة",
+        "management": "إدارة الأجهزة",
+        "view-devices": "عرض الأجهزة",
+        "device-alias": "اسم مستعار للجهاز",
+        "device-type-max-length": "يجب أن يكون نوع الجهاز أقل من 256",
+        "aliases": "أسماء مستعارة للجهاز",
+        "no-alias-matching": "لم يتم العثور على '{{alias}}'.",
+        "no-aliases-found": "لم يتم العثور على أسماء مستعارة.",
+        "no-key-matching": "لم يتم العثور على '{{key}}'.",
+        "no-keys-found": "لم يتم العثور على مفاتيح.",
+        "create-new-alias": "إنشاء جديد!",
+        "create-new-key": "إنشاء جديد!",
+        "duplicate-alias-error": "تم العثور على اسم مستعار مكرر '{{alias}}'.<br>يجب أن تكون أسماء الأجهزة المستعارة فريدة ضمن لوحة المعلومات.",
+        "configure-alias": "تكوين الاسم المستعار '{{alias}}'",
+        "no-devices-matching": "لم يتم العثور على أجهزة تطابق '{{entity}}'.",
+        "alias": "الاسم المستعار",
+        "alias-required": "الاسم المستعار للجهاز مطلوب.",
+        "remove-alias": "إزالة اسم مستعار للجهاز",
+        "add-alias": "إضافة اسم مستعار للجهاز",
+        "name-starts-with": "تعبير اسم الجهاز",
+        "help-text": "استخدم '%' وفقًا للحاجة: '%device_name_contains%', '%device_name_ends', 'device_starts_with'.",
+        "device-list": "قائمة الأجهزة",
+        "use-device-name-filter": "استخدم الفلتر",
+        "device-list-empty": "لم يتم اختيار أجهزة.",
+        "device-name-filter-required": "فلتر اسم الجهاز مطلوب.",
+        "device-name-filter-no-device-matched": "لم يتم العثور على أجهزة تبدأ بـ '{{device}}'.",
+        "add": "إضافة جهاز",
+        "assign-to-customer": "تعيين للعميل",
+        "assign-device-to-customer": "تعيين جهاز(أجهزة) للعميل",
+        "assign-device-to-customer-text": "يرجى اختيار الأجهزة لتعيينها للعميل",
+        "make-public": "جعل الجهاز عام",
+        "make-private": "جعل الجهاز خاص",
+        "no-devices-text": "لم يتم العثور على أجهزة",
+        "assign-to-customer-text": "يرجى اختيار العميل لتعيين الجهاز(الأجهزة) له",
+        "device-details": "تفاصيل الجهاز",
+        "add-device-text": "إضافة جهاز جديد",
+        "credentials": "بيانات الاعتماد",
+        "manage-credentials": "إدارة بيانات الاعتماد",
+        "delete": "حذف الجهاز",
+        "assign-devices": "تعيين الأجهزة",
+        "assign-devices-text": "تعيين { count, plural, =1 {جهاز واحد} other {# أجهزة} } للعميل",
+        "delete-devices": "حذف الأجهزة",
+        "unassign-from-customer": "إلغاء التعيين من العميل",
+        "unassign-devices": "إلغاء تعيين الأجهزة",
+        "unassign-devices-action-title": "إلغاء تعيين { count, plural, =1 {جهاز واحد} other {# أجهزة} } من العميل",
+        "unassign-device-from-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين الجهاز '{{deviceName}}'؟",
+        "unassign-device-from-edge-text": "بعد التأكيد سيتم إلغاء تعيين الجهاز ولن يكون متاحًا بواسطة الحافة.",
+        "unassign-devices-from-edge": "إلغاء تعيين الأجهزة من الحافة",
+        "assign-new-device": "تعيين جهاز جديد",
+        "make-public-device-title": "هل أنت متأكد أنك تريد جعل الجهاز '{{deviceName}}' عام؟",
+        "make-public-device-text": "بعد التأكيد سيصبح الجهاز وجميع بياناته عامة ومتاحة للآخرين.",
+        "make-private-device-title": "هل أنت متأكد أنك تريد جعل الجهاز '{{deviceName}}' خاص؟",
+        "make-private-device-text": "بعد التأكيد سيصبح الجهاز وجميع بياناته خاصة ولن تكون متاحة للآخرين.",
+        "view-credentials": "عرض بيانات الاعتماد",
+        "delete-device-title": "هل أنت متأكد أنك تريد حذف الجهاز '{{deviceName}}'؟",
+        "delete-device-text": "كن حذرًا، بعد التأكيد سيتم حذف الجهاز وجميع البيانات ذات الصلة ولن يمكن استردادها.",
+        "delete-devices-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {جهاز واحد} other {# أجهزة} }؟",
+        "delete-devices-action-title": "حذف { count, plural, =1 {جهاز واحد} other {# أجهزة} }",
+        "delete-devices-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع الأجهزة المختارة وجميع البيانات ذات الصلة ولن يمكن استردادها.",
+        "unassign-device-title": "هل أنت متأكد أنك تريد إلغاء تعيين الجهاز '{{deviceName}}'؟",
+        "unassign-device-text": "بعد التأكيد سيتم إلغاء تعيين الجهاز ولن يكون متاحًا للعميل.",
+        "unassign-device": "إلغاء تعيين الجهاز",
+        "unassign-devices-title": "هل أنت متأكد أنك تريد إلغاء تعيين { count, plural, =1 {جهاز واحد} other {# أجهزة} }؟",
+        "unassign-devices-text": "بعد التأكيد سيتم إلغاء تعيين جميع الأجهزة المختارة ولن تكون متاحة للعميل.",
+        "device-credentials": "بيانات اعتماد الجهاز",
+        "loading-device-credentials": "جار تحميل بيانات اعتماد الجهاز...",
+        "credentials-type": "نوع بيانات الاعتماد",
+        "access-token": "رمز الوصول",
+        "access-token-required": "رمز الوصول مطلوب.",
+        "access-token-invalid": "يجب أن يكون طول رمز الوصول من 1 إلى 32 حرفًا.",
+        "certificate-pem-format": "شهادة بتنسيق PEM",
+        "certificate-pem-format-required": "الشهادة مطلوبة.",
+        "copy-access-token": "نسخ رمز الوصول",
+        "copy-certificate": "نسخ الشهادة",
+        "copy-client-id": "نسخ معرف العميل",
+        "copy-user-name": "نسخ اسم المستخدم",
+        "copy-password": "نسخ كلمة المرور",
+        "generate-client-id": "توليد معرف العميل",
+        "generate-user-name": "توليد اسم المستخدم",
+        "generate-password": "توليد كلمة المرور",
+        "generate-access-token": "توليد رمز الوصول",
+        "lwm2m-security-config": {
+            "identity": "هوية العميل",
+            "identity-required": "هوية العميل مطلوبة.",
+            "identity-tooltip": "معرف PSK هو معرف PSK تعسفي يصل إلى 128 بايت، كما هو موصوف في المعيار [RFC7925].\nيجب تحويل معرف PSK أولاً إلى سلسلة أحرف ثم ترميزها إلى أوكتيتات باستخدام UTF-8.",
+            "client-key": "مفتاح العميل",
+            "client-key-required": "مفتاح العميل مطلوب.",
+            "client-key-tooltip-prk": "يجب أن يكون المفتاح العام لـ RPK أو المعرف وفقًا للمعيار [RFC7250] ومرمزًا إلى تنسيق Base64!",
+            "client-key-tooltip-psk": "يجب أن يكون مفتاح PSK وفقًا للمعيار [RFC4279] وبتنسيق HexDec: 32، 64، 128 حرفًا!",
+            "endpoint": "اسم نهاية العميل",
+            "endpoint-required": "اسم نهاية العميل مطلوب.",
+            "client-public-key": "المفتاح العام للعميل",
+            "client-public-key-hint": "إذا كان المفتاح العام للعميل فارغًا، سيتم استخدام الشهادة الموثوق بها",
+            "client-public-key-tooltip": "يجب أن يكون المفتاح العام لـ X509 بتنسيق X509v3 المشفر بـ DER ويدعم خوارزمية EC حصريًا ثم يتم ترميزه إلى تنسيق Base64!",
+            "mode": "وضع تكوين الأمان",
+            "client-tab": "تكوين أمان العميل",
+            "client-certificate": "شهادة العميل",
+            "bootstrap-tab": "عميل الإقلاع",
+            "bootstrap-server": "خادم الإقلاع",
+            "lwm2m-server": "خادم LwM2M",
+            "client-publicKey-or-id": "المفتاح العام للعميل أو المعرف",
+            "client-publicKey-or-id-required": "المفتاح العام للعميل أو المعرف مطلوب.",
+            "client-publicKey-or-id-tooltip-psk": "معرف PSK هو معرف PSK تعسفي يصل إلى 128 بايت، كما هو موصوف في المعيار [RFC7925].\nيجب تحويل معرف PSK أولاً إلى سلسلة أحرف ثم ترميزها إلى أوكتيتات باستخدام UTF-8.",
+            "client-publicKey-or-id-tooltip-rpk": "يجب أن يكون المفتاح العام لـ RPK أو المعرف وفقًا للمعيار [RFC7250] ومرمزًا إلى تنسيق Base64!",
+            "client-publicKey-or-id-tooltip-x509": "يجب أن يكون المفتاح العام لـ X509 بتنسيق X509v3 المشفر بـ DER ويدعم خوارزمية EC حصريًا ثم يتم ترميزه إلى تنسيق Base64",
+            "client-secret-key": "المفتاح السري للعميل",
+            "client-secret-key-required": "المفتاح السري للعميل مطلوب.",
+            "client-secret-key-tooltip-psk": "يجب أن يكون مفتاح PSK وفقًا للمعيار [RFC4279] وبتنسيق HexDec: 32، 64، 128 حرفًا!",
+            "client-secret-key-tooltip-prk": "يجب أن يكون المفتاح السري لـ RPK بتنسيق PKCS_8 (ترميز DER، المعيار [RFC5958]) ثم يتم ترميزه إلى تنسيق Base64!",
+            "client-secret-key-tooltip-x509": "يجب أن يكون المفتاح السري لـ X509 بتنسيق PKCS_8 (ترميز DER، المعيار [RFC5958]) ثم يتم ترميزه إلى تنسيق Base64!"
+        },
+        "client-id": "معرّف العميل",
+        "client-id-pattern": "يحتوي على حرف غير صالح.",
+        "user-name": "اسم المستخدم",
+        "user-name-required": "اسم المستخدم مطلوب.",
+        "client-id-or-user-name-necessary": "معرّف العميل و/أو اسم المستخدم ضروريان",
+        "password": "كلمة المرور",
+        "secret": "السر",
+        "secret-required": "السر مطلوب.",
+        "device-type": "ملف تعريف الجهاز",
+        "device-type-required": "نوع الجهاز مطلوب.",
+        "select-device-type": "اختر نوع الجهاز",
+        "enter-device-type": "أدخل ملف تعريف الجهاز",
+        "any-device": "أي جهاز",
+        "no-device-types-matching": "لم يتم العثور على ملفات تعريف جهاز تطابق '{{entitySubtype}}'.",
+        "device-type-list-empty": "لم يتم اختيار ملفات تعريف جهاز!",
+        "device-profile-type-list-empty": "يجب اختيار ملف تعريف جهاز واحد على الأقل.",
+        "device-types": "أنواع الأجهزة",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256",
+        "label-max-length": "يجب أن تكون التسمية أقل من 256",
+        "description": "الوصف",
+        "label": "التسمية",
+        "events": "الأحداث",
+        "details": "التفاصيل",
+        "copyId": "نسخ معرّف الجهاز",
+        "copyAccessToken": "نسخ رمز الوصول",
+        "copy-mqtt-authentication": "نسخ بيانات اعتماد MQTT",
+        "idCopiedMessage": "تم نسخ معرّف الجهاز إلى الحافظة",
+        "accessTokenCopiedMessage": "تم نسخ رمز وصول الجهاز إلى الحافظة",
+        "mqtt-authentication-copied-message": "تم نسخ بيانات اعتماد MQTT الخاصة بالجهاز إلى الحافظة",
+        "assignedToCustomer": "معيّن للعميل",
+        "unable-delete-device-alias-title": "غير قادر على حذف الاسم المستعار للجهاز",
+        "unable-delete-device-alias-text": "لا يمكن حذف الاسم المستعار '{{deviceAlias}}' لأنه يستخدم من قبل الأدوات التالية:<br/>{{widgetsList}}",
+        "is-gateway": "هو بوابة",
+        "overwrite-activity-time": "استبدال وقت النشاط للجهاز المتصل",
+        "device-filter": "فلتر الجهاز",
+        "device-filter-title": "فلتر الجهاز",
+        "filter-title": "الفلتر",
+        "device-state": "حالة الجهاز",
+        "state": "الحالة",
+        "any": "أي",
+        "active": "نشط",
+        "inactive": "غير نشط",
+        "public": "عام",
+        "device-public": "الجهاز عام",
+        "select-device": "اختر جهاز",
+        "select-group-to-add": "اختر المجموعة المستهدفة لإضافة الأجهزة المختارة",
+        "select-group-to-move": "اختر المجموعة المستهدفة لنقل الأجهزة المختارة",
+        "remove-devices-from-group": "هل أنت متأكد أنك تريد إزالة { count, plural, =1 {جهاز واحد} other {# أجهزة} } من المجموعة '{{entityGroup}}'؟",
+        "group": "مجموعة الأجهزة",
+        "list-of-groups": "{ count, plural, =1 {مجموعة جهاز واحدة} other {قائمة # مجموعات الأجهزة} }",
+        "group-name-starts-with": "مجموعات الأجهزة التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "import": "استيراد جهاز",
+        "device-file": "ملف الجهاز",
+        "search": "بحث في الأجهزة",
+        "selected-devices": "{ count, plural, =1 {جهاز واحد} other {# أجهزة} } مختارة",
+        "device-configuration": "تكوين الجهاز",
+        "transport-configuration": "تكوين النقل",
+        "wizard": {
+            "device-details": "تفاصيل الجهاز"
+        },
+        "unassign-devices-from-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين { count, plural, =1 {جهاز واحد} other {# أجهزة} }؟",
+        "unassign-devices-from-edge-text": "بعد التأكيد سيتم إلغاء تعيين جميع الأجهزة المختارة ولن تكون متاحة بواسطة الحافة.",
+        "time": "الوقت",
+        "connectivity": {
+            "check-connectivity": "تحقق من الاتصال",
+            "device-created-check-connectivity": "تم إنشاء الجهاز. دعنا نتحقق من الاتصال!",
+            "loading-check-connectivity-command": "جار تحميل أوامر التحقق من الاتصال...",
+            "use-following-instructions": "استخدم التعليمات التالية لإرسال بيانات القياس نيابة عن الجهاز باستخدام الشل",
+            "execute-following-command": "نفذ الأمر التالي",
+            "install-curl-windows": "ابتداءً من Windows 10 b17063، يتوفر cURL بشكل افتراضي",
+            "install-curl-macos": "ابتداءً من Mac OS X 10.2 6C115 (Jaguar)، يتوفر cURL بشكل افتراضي",
+            "install-mqtt-windows": "استخدم التعليمات لتنزيل، تثبيت، إعداد وتشغيل mosquitto_pub",
+            "install-coap-client": "استخدم التعليمات لتنزيل، تثبيت، إعداد وتشغيل coap-client",
+            "install-necessary-client-tools": "قم بتثبيت أدوات العميل الضرورية",
+            "mqtts-x509-command": "استخدم التوثيق التالي لربط الجهاز عبر MQTT بتفويض X509",
+            "coaps-x509-command": "استخدم التوثيق التالي لربط الجهاز عبر CoAP فوق DTLS بتفويض X509",
+            "snmp-command": "استخدم التوثيق التالي لربط الجهاز من خلال SNMP.",
+            "sparkplug-command": "استخدم التوثيق التالي لربط الجهاز من خلال MQTT Sparkplug.",
+            "lwm2m-command": "استخدم التوثيق التالي لربط الجهاز من خلال LWM2M."
+        }
+    },
+    "asset-profile": {
+        "asset-profile": "ملف تعريف الأصل",
+        "asset-profiles": "ملفات تعريف الأصول",
+        "all-asset-profiles": "الكل",
+        "add": "إضافة ملف تعريف أصل",
+        "edit": "تعديل ملف تعريف الأصل",
+        "asset-profile-details": "تفاصيل ملف تعريف الأصل",
+        "no-asset-profiles-text": "لم يتم العثور على ملفات تعريف أصول",
+        "search": "بحث في ملفات تعريف الأصول",
+        "selected-asset-profiles": "{ count, plural, =1 {ملف تعريف أصل واحد} other {# من ملفات تعريف الأصول} } محدد",
+        "no-asset-profiles-matching": "لم يتم العثور على ملف تعريف أصل يطابق '{{entity}}'.",
+        "asset-profile-required": "ملف تعريف الأصل مطلوب",
+        "idCopiedMessage": "تم نسخ معرف ملف تعريف الأصل إلى الحافظة",
+        "set-default": "جعل ملف تعريف الأصل افتراضي",
+        "delete": "حذف ملف تعريف الأصل",
+        "copyId": "نسخ معرف ملف تعريف الأصل",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256",
+        "new-device-profile-name": "اسم ملف تعريف الأصل",
+        "new-device-profile-name-required": "اسم ملف تعريف الأصل مطلوب.",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "image": "صورة ملف تعريف الأصل",
+        "description": "الوصف",
+        "default": "افتراضي",
+        "default-rule-chain": "سلسلة القواعد الافتراضية",
+        "default-edge-rule-chain": "سلسلة القواعد الافتراضية للحافة",
+        "default-edge-rule-chain-hint": "تستخدم على الحافة كسلسلة قواعد لمعالجة البيانات الواردة للأصول من هذا الملف تعريف الأصل",
+        "mobile-dashboard": "لوحة التحكم المحمولة",
+        "mobile-dashboard-hint": "تستخدم من قبل التطبيق المحمول كلوحة تفاصيل الأصل",
+        "select-queue-hint": "اختر من قائمة منسدلة.",
+        "delete-asset-profile-title": "هل أنت متأكد أنك تريد حذف ملف تعريف الأصل '{{assetProfileName}}'؟",
+        "delete-asset-profile-text": "كن حذرًا، بعد التأكيد سيتم حذف ملف تعريف الأصل وجميع البيانات ذات الصلة ولن يمكن استردادها.",
+        "delete-asset-profiles-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {ملف تعريف أصل واحد} other {# من ملفات تعريف الأصول} }؟",
+        "delete-asset-profiles-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع ملفات تعريف الأصول المحددة وجميع البيانات ذات الصلة ولن يمكن استردادها.",
+        "set-default-asset-profile-title": "هل أنت متأكد أنك تريد جعل ملف تعريف الأصل '{{assetProfileName}}' افتراضي؟",
+        "set-default-asset-profile-text": "بعد التأكيد سيتم تمييز ملف تعريف الأصل كافتراضي وسيتم استخدامه للأصول الجديدة بدون تحديد ملف تعريف.",
+        "no-asset-profiles-found": "لم يتم العثور على ملفات تعريف أصول.",
+        "create-new-asset-profile": "إنشاء جديد!",
+        "create-asset-profile": "إنشاء ملف تعريف أصل جديد",
+        "import": "استيراد ملف تعريف الأصل",
+        "export": "تصدير ملف تعريف الأصل",
+        "export-failed-error": "غير قادر على تصدير ملف تعريف الأصل: {{error}}",
+        "asset-profile-file": "ملف ملف تعريف الأصل",
+        "invalid-asset-profile-file-error": "غير قادر على استيراد ملف تعريف الأصل: بنية بيانات ملف تعريف الأصل غير صالحة."
+    },
+    "device-profile": {
+        "device-profile": "ملف تعريف الجهاز",
+        "device-profiles": "ملفات تعريف الأجهزة",
+        "all-device-profiles": "الكل",
+        "add": "إضافة ملف تعريف جهاز",
+        "edit": "تعديل ملف تعريف الجهاز",
+        "device-profile-details": "تفاصيل ملف تعريف الجهاز",
+        "no-device-profiles-text": "لم يتم العثور على ملفات تعريف للأجهزة",
+        "search": "بحث في ملفات تعريف الأجهزة",
+        "selected-device-profiles": "{ count, plural, =1 {ملف تعريف جهاز واحد} other {# من ملفات تعريف الأجهزة} } محددة",
+        "no-device-profiles-matching": "لم يتم العثور على ملف تعريف جهاز يطابق '{{entity}}'.",
+        "device-profile-required": "ملف تعريف الجهاز مطلوب",
+        "idCopiedMessage": "تم نسخ معرف ملف تعريف الجهاز إلى الحافظة",
+        "set-default": "جعل ملف تعريف الجهاز افتراضي",
+        "delete": "حذف ملف تعريف الجهاز",
+        "copyId": "نسخ معرف ملف تعريف الجهاز",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "type": "نوع الملف التعريفي",
+        "type-required": "نوع الملف التعريفي مطلوب.",
+        "type-default": "افتراضي",
+        "image": "صورة ملف تعريف الجهاز",
+        "transport-type": "نوع النقل",
+        "transport-type-required": "نوع النقل مطلوب.",
+        "transport-type-default": "افتراضي",
+        "transport-type-default-hint": "يدعم نقل MQTT و HTTP و CoAP الأساسي",
+        "transport-type-mqtt": "MQTT",
+        "transport-type-mqtt-hint": "يمكن تفعيل إعدادات نقل MQTT المتقدمة",
+        "transport-type-coap": "CoAP",
+        "transport-type-coap-hint": "يمكن تفعيل إعدادات نقل CoAP المتقدمة",
+        "transport-type-lwm2m": "LWM2M",
+        "transport-type-lwm2m-hint": "نوع نقل LWM2M",
+        "transport-type-snmp": "SNMP",
+        "transport-type-snmp-hint": "تحديد تكوين نقل SNMP",
+        "transport-type-http": "HTTP",
+        "description": "الوصف",
+        "default": "افتراضي",
+        "profile-configuration": "تكوين الملف التعريفي",
+        "transport-configuration": "تكوين النقل",
+        "default-rule-chain": "سلسلة القواعد الافتراضية",
+        "default-edge-rule-chain": "سلسلة قواعد الحافة الافتراضية",
+        "default-edge-rule-chain-hint": "تستخدم على الحافة كسلسلة قواعد لمعالجة البيانات الواردة للأجهزة من هذا الملف التعريفي",
+        "mobile-dashboard": "لوحة التحكم المحمولة",
+        "mobile-dashboard-hint": "تستخدم من قبل التطبيق المحمول كلوحة تفاصيل الجهاز",
+        "select-queue-hint": "اختر من قائمة منسدلة.",
+        "delete-device-profile-title": "هل أنت متأكد أنك تريد حذف ملف تعريف الجهاز '{{deviceProfileName}}'؟",
+        "delete-device-profile-text": "كن حذرًا، بعد التأكيد سيتم حذف ملف تعريف الجهاز وجميع البيانات ذات الصلة بما في ذلك التحديثات OTA المرتبطة ولن يمكن استردادها.",
+        "delete-device-profiles-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {ملف تعريف جهاز واحد} other {# من ملفات تعريف الأجهزة} }؟",
+        "delete-device-profiles-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع ملفات تعريف الأجهزة المحددة وجميع البيانات ذات الصلة بما في ذلك التحديثات OTA المرتبطة ولن يمكن استردادها.",
+        "set-default-device-profile-title": "هل أنت متأكد أنك تريد جعل ملف تعريف الجهاز '{{deviceProfileName}}' افتراضي؟",
+        "set-default-device-profile-text": "بعد التأكيد سيتم تمييز ملف تعريف الجهاز كافتراضي وسيتم استخدامه للأجهزة الجديدة بدون تحديد ملف تعريف.",
+        "no-device-profiles-found": "لم يتم العثور على ملفات تعريف للأجهزة.",
+        "create-new-device-profile": "إنشاء جديد!",
+        "mqtt-device-topic-filters": "فلاتر موضوع جهاز MQTT",
+        "mqtt-device-topic-filters-unique": "يجب أن تكون فلاتر موضوع جهاز MQTT فريدة.",
+        "mqtt-device-topic-filters-spark-plug": "عقدة MQTT Sparkplug B Edge of Network (EoN).",
+        "mqtt-device-topic-filters-spark-plug-hint": "السماح بالاتصالات من عقد EoN مع بيانات Sparkplug B وتنسيق الموضوع.",
+        "mqtt-device-topic-filters-spark-plug-attribute-metric-names": "مقاييس SparkPlug لتخزينها كسمات.",
+        "mqtt-device-topic-filters-spark-plug-attribute-metric-names-hint": "أسماء مقاييس SparkPlug التي سيتم تخزينها كسمات الجهاز. سيتم تخزين جميع المقاييس الأخرى كبيانات تليمترية للجهاز.",
+        "mqtt-device-payload-type": "حمولة جهاز MQTT",
+        "mqtt-device-payload-type-json": "JSON",
+        "mqtt-device-payload-type-proto": "Protobuf",
+        "mqtt-enable-compatibility-with-json-payload-format": "تمكين التوافق مع تنسيقات الحمولة الأخرى.",
+        "mqtt-enable-compatibility-with-json-payload-format-hint": "عند التمكين، ستستخدم المنصة تنسيق حمولة Protobuf بشكل افتراضي. إذا فشل التحليل، ستحاول المنصة استخدام تنسيق حمولة JSON. مفيد للتوافق العكسي أثناء تحديثات البرنامج الثابت. على سبيل المثال، يستخدم الإصدار الأولي من البرنامج الثابت Json، بينما يستخدم الإصدار الجديد Protobuf. خلال عملية تحديث البرنامج الثابت لأسطول الأجهزة، يلزم دعم كل من Protobuf و JSON في نفس الوقت. يقدم وضع التوافق تدهورًا طفيفًا في الأداء، لذا يُنصح بتعطيل هذا الوضع بمجرد تحديث جميع الأجهزة.",
+        "mqtt-use-json-format-for-default-downlink-topics": "استخدم تنسيق Json لمواضيع الارتباط الهابط الافتراضية",
+        "mqtt-use-json-format-for-default-downlink-topics-hint": "عند التمكين، ستستخدم المنصة تنسيق حمولة Json لدفع السمات و RPC عبر المواضيع التالية: <b>v1/devices/me/attributes/response/$request_id</b>, <b>v1/devices/me/attributes</b>, <b>v1/devices/me/rpc/request/$request_id</b>, <b>v1/devices/me/rpc/response/$request_id</b>. لا يؤثر هذا الإعداد على اشتراكات السمات و rpc التي تم إرسالها باستخدام مواضيع جديدة (v2): <b>v2/a/res/$request_id</b>, <b>v2/a</b>, <b>v2/r/req/$request_id</b>, <b>v2/r/res/$request_id</b>. حيث <b>$request_id</b> هو معرف الطلب الصحيح.",
+        "mqtt-send-ack-on-validation-exception": "إرسال PUBACK عند فشل التحقق من صحة رسالة PUBLISH",
+        "mqtt-send-ack-on-validation-exception-hint": "بشكل افتراضي، ستغلق المنصة جلسة MQTT عند فشل التحقق من الرسالة. عند التمكين، سترسل المنصة إقرارًا بالنشر بدلاً من إغلاق الجلسة.",
+        "snmp-add-mapping": "إضافة تعيين SNMP",
+        "snmp-mapping-not-configured": "لم يتم تكوين تعيين ل OID إلى timeseries/telemetry",
+        "snmp-timseries-or-attribute-name": "اسم timeseries/attribute للتعيين",
+        "snmp-timseries-or-attribute-type": "نوع timeseries/attribute للتعيين",
+        "snmp-method-pdu-type-get-request": "GetRequest",
+        "snmp-method-pdu-type-get-next-request": "GetNextRequest",
+        "snmp-oid": "OID",
+        "transport-device-payload-type-json": "JSON",
+        "transport-device-payload-type-proto": "Protobuf",
+        "mqtt-payload-type-required": "نوع الحمولة مطلوب.",
+        "coap-device-type": "نوع جهاز CoAP",
+        "coap-device-payload-type": "حمولة جهاز CoAP",
+        "coap-device-type-required": "نوع جهاز CoAP مطلوب.",
+        "coap-device-type-default": "افتراضي",
+        "coap-device-type-efento": "Efento NB-IoT",
+        "support-level-wildcards": "يدعم البدلات المستوى الواحد <code>[+]</code> والمستويات المتعددة <code>[#]</code>.",
+        "telemetry-topic-filter": "فلتر موضوع التليمتري",
+        "telemetry-topic-filter-required": "فلتر موضوع التليمتري مطلوب.",
+        "attributes-topic-filter": "فلتر موضوع نشر السمات",
+        "attributes-subscribe-topic-filter": "فلتر موضوع اشتراك السمات",
+        "attributes-topic-filter-required": "فلتر موضوع نشر السمات مطلوب.",
+        "attributes-subscribe-topic-filter-required": "موضوع اشتراك السمات مطلوب",
+        "telemetry-proto-schema": "مخطط بروتو التليمتري",
+        "telemetry-proto-schema-required": "مخطط بروتو التليمتري مطلوب.",
+        "attributes-proto-schema": "مخطط بروتو السمات",
+        "attributes-proto-schema-required": "مخطط بروتو السمات مطلوب.",
+        "rpc-response-proto-schema": "مخطط بروتو استجابة RPC",
+        "rpc-response-proto-schema-required": "مخطط بروتو استجابة RPC مطلوب.",
+        "rpc-response-topic-filter": "فلتر موضوع استجابة RPC",
+        "rpc-response-topic-filter-required": "فلتر موضوع استجابة RPC مطلوب.",
+        "rpc-request-proto-schema": "مخطط بروتو طلب RPC",
+        "rpc-request-proto-schema-required": "مخطط بروتو طلب RPC مطلوب.",
+        "rpc-request-proto-schema-hint": "يجب أن يحتوي رسالة طلب RPC دائمًا على الحقول: string method = 1; int32 requestId = 2; و params = 3 من أي نوع بيانات.",
+        "not-valid-pattern-topic-filter": "فلتر موضوع النمط غير صالح",
+        "not-valid-single-character": "استخدام غير صالح لحرف البدل لمستوى واحد",
+        "not-valid-multi-character": "استخدام غير صالح لحرف البدل لمستويات متعددة",
+        "single-level-wildcards-hint": "<code>[+]</code> مناسب لأي مستوى فلتر موضوع. مثال: <b>v1/devices/+/telemetry</b> أو <b>+/devices/+/attributes</b>.",
+        "multi-level-wildcards-hint": "<code>[#]</code> يمكن أن يحل محل فلتر الموضوع نفسه ويجب أن يكون آخر رمز في الموضوع. مثال: <b>#</b> أو <b>v1/devices/me/#</b>.",
+        "alarm-rules": "قواعد الإنذار",
+        "alarm-rules-with-count": "قواعد الإنذار ({{count}})",
+        "no-alarm-rules": "لم يتم تكوين قواعد إنذار",
+        "add-alarm-rule": "إضافة قاعدة إنذار",
+        "edit-alarm-rule": "تعديل قاعدة إنذار",
+        "alarm-type": "نوع الإنذار",
+        "alarm-type-required": "نوع الإنذار مطلوب.",
+        "alarm-type-unique": "يجب أن يكون نوع الإنذار فريدًا ضمن قواعد إنذار ملف تعريف الجهاز.",
+        "alarm-type-max-length": "يجب أن يكون نوع الإنذار أقل من 256",
+        "create-alarm-pattern": "إنشاء إنذار <b>{{alarmType}}</b>",
+        "create-alarm-rules": "إنشاء قواعد إنذار",
+        "no-create-alarm-rules": "لم يتم تكوين شروط إنشاء",
+        "add-create-alarm-rule-prompt": "يرجى إضافة قاعدة إنشاء إنذار",
+        "clear-alarm-rule": "مسح قاعدة الإنذار",
+        "no-clear-alarm-rule": "لم يتم تكوين شرط مسح",
+        "add-create-alarm-rule": "إضافة شرط إنشاء",
+        "add-clear-alarm-rule": "إضافة شرط مسح",
+        "select-alarm-severity": "اختر شدة الإنذار",
+        "alarm-severity-required": "شدة الإنذار مطلوبة.",
+        "condition-duration": "مدة الشرط",
+        "condition-duration-value": "قيمة المدة",
+        "condition-duration-time-unit": "وحدة الزمن",
+        "condition-duration-value-range": "يجب أن تكون قيمة المدة في نطاق من 1 إلى 2147483647.",
+        "condition-duration-value-pattern": "يجب أن تكون قيمة المدة أعدادًا صحيحة.",
+        "condition-duration-value-required": "قيمة المدة مطلوبة.",
+        "condition-duration-time-unit-required": "وحدة الزمن مطلوبة.",
+        "advanced-settings": "الإعدادات المتقدمة",
+        "alarm-rule-additional-info": "معلومات إضافية",
+        "edit-alarm-rule-additional-info": "تعديل المعلومات الإضافية",
+        "alarm-rule-additional-info-placeholder": "يرجى تقديم تعليقاتك وتعديلاتك هنا لعرضها ضمن تفاصيل الإنذار تحت المعلومات الإضافية",
+        "alarm-rule-additional-info-hint": "تلميح: استخدم <code><span style=\"color: #000;\">$&#123;</span>اسم المفتاح<span style=\"color: #000;\">&#125;</span></code> لاستبدال قيم السمات أو مفاتيح البيانات التي يتم استخدامها في شرط قاعدة الإنذار.",
+        "alarm-rule-mobile-dashboard": "لوحة التحكم المحمولة",
+        "alarm-rule-mobile-dashboard-hint": "تستخدم من قبل التطبيق المحمول كلوحة تفاصيل الإنذار",
+        "alarm-rule-no-mobile-dashboard": "لم يتم تحديد لوحة تحكم",
+        "propagate-alarm": "نشر الإنذار إلى الكيانات ذات الصلة",
+        "alarm-rule-relation-types-list": "أنواع العلاقات لنشر الإنذار",
+        "alarm-rule-relation-types-list-hint": "إذا لم يتم تحديد أنواع علاقات النشر، سيتم نشر الإنذارات دون تصفية حسب نوع العلاقة.",
+        "propagate-alarm-to-owner": "نشر الإنذار إلى مالك الكيان (العميل أو المستأجر)",
+        "propagate-alarm-to-owner-hierarchy": "نشر الإنذار إلى تسلسل مالكي الكيان",
+        "propagate-alarm-to-tenant": "نشر الإنذار إلى المستأجر",
+        "alarm-rule-condition": "شرط قاعدة الإنذار",
+        "enter-alarm-rule-condition-prompt": "يرجى إضافة شرط قاعدة الإنذار",
+        "edit-alarm-rule-condition": "تعديل شرط قاعدة الإنذار",
+        "device-provisioning": "توفير الجهاز",
+        "provision-strategy": "استراتيجية التوفير",
+        "provision-strategy-required": "استراتيجية التوفير مطلوبة.",
+        "provision-strategy-disabled": "معطل",
+        "provision-strategy-created-new": "السماح بإنشاء أجهزة جديدة",
+        "provision-strategy-check-pre-provisioned": "التحقق من الأجهزة المعدة مسبقًا",
+        "provision-device-key": "مفتاح توفير الجهاز",
+        "provision-device-key-required": "مفتاح توفير الجهاز مطلوب.",
+        "copy-provision-key": "نسخ مفتاح التوفير",
+        "provision-key-copied-message": "تم نسخ مفتاح التوفير إلى الحافظة",
+        "provision-device-secret": "سر توفير الجهاز",
+        "provision-device-secret-required": "سر توفير الجهاز مطلوب.",
+        "copy-provision-secret": "نسخ سر التوفير",
+        "provision-secret-copied-message": "تم نسخ سر التوفير إلى الحافظة",
+        "provision-strategy-x509": {
+            "certificate-chain": "سلسلة شهادات X509",
+            "certificate-chain-hint": "تُستخدم استراتيجية شهادات X.509 لتوفير الأجهزة عن طريق شهادات العميل في اتصال TLS ثنائي الاتجاه.",
+            "allow-create-new-devices": "إنشاء أجهزة جديدة",
+            "allow-create-new-devices-hint": "إذا تم تحديدها، سيتم إنشاء أجهزة جديدة وسيتم استخدام شهادة العميل كبيانات اعتماد الجهاز.",
+            "certificate-value": "الشهادة بتنسيق PEM",
+            "certificate-value-required": "الشهادة بتنسيق PEM مطلوبة",
+            "cn-regex-variable": "متغير التعبير العادي لـ CN",
+            "cn-regex-variable-required": "متغير التعبير العادي لـ CN مطلوب",
+            "cn-regex-variable-hint": "مطلوب لجلب اسم الجهاز من الاسم المشترك لشهادة X509 للجهاز."
+        },
+        "condition": "الشرط",
+        "condition-type": "نوع الشرط",
+        "condition-type-simple": "بسيط",
+        "condition-type-duration": "المدة",
+        "condition-during": "خلال {{during}}",
+        "condition-during-dynamic": "خلال \"{{ attribute }}\" ({{during}})",
+        "condition-type-repeating": "متكرر",
+        "condition-type-required": "نوع الشرط مطلوب.",
+        "condition-repeating-value": "عدد الأحداث",
+        "condition-repeating-value-range": "يجب أن يكون عدد الأحداث ضمن نطاق من 1 إلى 2147483647.",
+        "condition-repeating-value-pattern": "يجب أن يكون عدد الأحداث أعدادًا صحيحة.",
+        "condition-repeating-value-required": "عدد الأحداث مطلوب.",
+        "condition-repeat-times": "يتكرر { count, plural, =1 {مرة واحدة} other {# مرات} }",
+        "condition-repeat-times-dynamic": "يتكرر \"{ attribute }\" ({ count, plural, =1 {مرة واحدة} other {# مرات} })",
+        "schedule-type": "نوع المجدول",
+        "schedule-type-required": "نوع المجدول مطلوب.",
+        "schedule": "الجدول الزمني",
+        "edit-schedule": "تعديل جدول الإنذار",
+        "schedule-any-time": "نشط طوال الوقت",
+        "schedule-specific-time": "نشط في وقت محدد",
+        "schedule-custom": "مخصص",
+        "schedule-day": {
+            "monday": "الاثنين",
+            "tuesday": "الثلاثاء",
+            "wednesday": "الأربعاء",
+            "thursday": "الخميس",
+            "friday": "الجمعة",
+            "saturday": "السبت",
+            "sunday": "الأحد"
+        },
+        "schedule-days": "الأيام",
+        "schedule-time": "الوقت",
+        "schedule-time-from": "من",
+        "schedule-time-to": "إلى",
+        "schedule-days-of-week-required": "يجب اختيار يوم واحد على الأقل من أيام الأسبوع.",
+        "create-device-profile": "إنشاء ملف تعريف جهاز جديد",
+        "import": "استيراد ملف تعريف الجهاز",
+        "export": "تصدير ملف تعريف الجهاز",
+        "export-failed-error": "غير قادر على تصدير ملف تعريف الجهاز: {{error}}",
+        "device-profile-file": "ملف ملف تعريف الجهاز",
+        "invalid-device-profile-file-error": "غير قادر على استيراد ملف تعريف الجهاز: بنية بيانات ملف تعريف الجهاز غير صالحة.",
+        "power-saving-mode": "وضع توفير الطاقة",
+        "power-saving-mode-type": {
+            "default": "استخدم وضع توفير الطاقة لملف تعريف الجهاز",
+            "psm": "وضع توفير الطاقة (PSM)",
+            "drx": "استقبال متقطع (DRX)",
+            "edrx": "استقبال متقطع موسع (eDRX)"
+        },
+        "edrx-cycle": "دورة eDRX",
+        "edrx-cycle-required": "دورة eDRX مطلوبة.",
+        "edrx-cycle-pattern": "يجب أن تكون دورة eDRX عددًا صحيحًا موجبًا.",
+        "edrx-cycle-min": "العدد الأدنى لدورة eDRX هو {{ min }} ثانية.",
+        "paging-transmission-window": "نافذة نقل البيجنج",
+        "paging-transmission-window-required": "نافذة نقل البيجنج مطلوبة.",
+        "paging-transmission-window-pattern": "يجب أن تكون نافذة نقل البيجنج عددًا صحيحًا موجبًا.",
+        "paging-transmission-window-min": "العدد الأدنى لنافذة نقل البيجنج هو {{ min }} ثانية.",
+        "psm-activity-timer": "مؤقت نشاط PSM",
+        "psm-activity-timer-required": "مؤقت نشاط PSM مطلوب.",
+        "psm-activity-timer-pattern": "يجب أن يكون مؤقت نشاط PSM عددًا صحيحًا موجبًا.",
+        "psm-activity-timer-min": "العدد الأدنى لمؤقت نشاط PSM هو {{ min }} ثانية.",
+        "lwm2m": {
+            "object-list": "قائمة الكائنات",
+            "object-list-empty": "لم يتم تحديد كائنات.",
+            "no-objects-found": "لم يتم العثور على كائنات.",
+            "no-objects-matching": "لم يتم العثور على كائنات تطابق '{{object}}'.",
+            "model-tab": "نموذج LWM2M",
+            "add-new-instances": "إضافة نماذج جديدة",
+            "instances-list": "قائمة النماذج",
+            "instances-list-required": "قائمة النماذج مطلوبة.",
+            "instance-id-pattern": "يجب أن يكون معرف النموذج عددًا صحيحًا موجبًا.",
+            "instance-id-max": "القيمة القصوى لمعرف النموذج هي {{max}}.",
+            "instance": "النموذج",
+            "resource-label": "اسم المورد #ID",
+            "observe-label": "مراقبة",
+            "attribute-label": "سمة",
+            "telemetry-label": "تليمتري",
+            "edit-observe-select": "لتعديل المراقبة اختر تليمتري أو سمة",
+            "edit-attributes-select": "لتعديل السمات اختر تليمتري أو سمة",
+            "no-attributes-set": "لم يتم تعيين سمات",
+            "key-name": "اسم المفتاح",
+            "key-name-required": "اسم المفتاح مطلوب",
+            "attribute-name": "اسم السمة",
+            "attribute-name-required": "اسم السمة مطلوب.",
+            "attribute-value": "قيمة السمة",
+            "attribute-value-required": "قيمة السمة مطلوبة.",
+            "attribute-value-pattern": "يجب أن تكون قيمة السمة عددًا صحيحًا موجبًا.",
+            "edit-attributes": "تعديل السمات: {{ name }}",
+            "view-attributes": "عرض السمات: {{ name }}",
+            "add-attribute": "إضافة سمة",
+            "edit-attribute": "تعديل السمة",
+            "view-attribute": "عرض السمة",
+            "remove-attribute": "إزالة السمة",
+            "delete-server-text": "كن حذرًا، بعد التأكيد ستصبح تكوينات الخادم غير قابلة للاسترداد.",
+            "delete-server-title": "هل أنت متأكد أنك تريد حذف الخادم؟",
+            "mode": "وضع تكوين الأمان",
+            "bootstrap-tab": "التمهيد",
+            "bootstrap-server-legend": "خادم التمهيد (ShortId...)",
+            "lwm2m-server-legend": "خادم LwM2M (ShortId...)",
+            "server": "الخادم",
+            "short-id": "معرف الخادم القصير",
+            "short-id-tooltip": "معرف الخادم القصير. يُستخدم كرابط لربط نموذج كائن الخادم.\nهذا المعرف يُميز بشكل فريد كل خادم LwM2M المُعد للعميل LwM2M.\nيجب ضبط المورد عندما يكون مورد الخادم التمهيدي بقيمة 'false'.\nلا يجب استخدام قيم المعرف ID:0 و ID:65535 لتحديد خادم LwM2M.",
+            "short-id-required": "معرف الخادم القصير مطلوب.",
+            "short-id-range": "يجب أن يكون معرف الخادم القصير ضمن نطاق من 1 إلى 65534.",
+            "short-id-pattern": "يجب أن يكون معرف الخادم القصير عددًا صحيحًا موجبًا.",
+            "lifetime": "مدة تسجيل العميل",
+            "lifetime-required": "مدة تسجيل العميل مطلوبة.",
+            "lifetime-pattern": "يجب أن تكون مدة تسجيل العميل عددًا صحيحًا موجبًا.",
+            "default-min-period": "الفترة الدنيا بين إشعارين (ثواني)",
+            "default-min-period-tooltip": "القيمة الافتراضية التي يجب أن يستخدمها العميل LwM2M للفترة الدنيا لمراقبة في غياب هذا العامل في مراقبة.",
+            "default-min-period-required": "الفترة الدنيا مطلوبة.",
+            "default-min-period-pattern": "يجب أن تكون الفترة الدنيا عددًا صحيحًا موجبًا.",
+            "notification-storing": "تخزين الإشعارات عند التعطيل أو عدم الاتصال",
+            "binding": "الربط",
+            "binding-type": {
+                "u": "U: العميل متاح عبر الربط UDP في أي وقت.",
+                "m": "M: العميل متاح عبر الربط MQTT في أي وقت.",
+                "h": "H: العميل متاح عبر الربط HTTP في أي وقت.",
+                "t": "T: العميل متاح عبر الربط TCP في أي وقت.",
+                "s": "S: العميل متاح عبر الربط SMS في أي وقت.",
+                "n": "N: يجب على العميل إرسال الرد على مثل هذا الطلب عبر الربط غير الـ IP (يدعم منذ LWM2M 1.1).",
+                "uq": "UQ: اتصال UDP في وضع الطابور (لا يدعم منذ LWM2M 1.1)",
+                "uqs": "UQS: كلا من اتصالات UDP وSMS نشطة؛ UDP في وضع الطابور، SMS في الوضع القياسي (لا يدعم منذ LWM2M 1.1)",
+                "tq": "TQ: اتصال TCP في وضع الطابور (لا يدعم منذ LWM2M 1.1)",
+                "tqs": "TQS: كلا من اتصالات TCP وSMS نشطة؛ TCP في وضع الطابور، SMS في الوضع القياسي (لا يدعم منذ LWM2M 1.1)",
+                "sq": "SQ: اتصال SMS في وضع الطابور (لا يدعم منذ LWM2M 1.1)"
+            },
+            "binding-tooltip": "هذه هي القائمة في مورد \"الربط\" لكائن خادم LwM2M - /1/x/7.\nتشير إلى أوضاع الربط المدعومة في عميل LwM2M.\nيجب أن تكون هذه القيمة هي نفس القيمة في مورد \"أوضاع الربط والدعم\" في كائن الجهاز (/3/0/16).\nبينما يتم دعم العديد من وسائط النقل، يمكن استخدام ربط وسيط نقل واحد فقط خلال جلسة النقل بأكملها.\nعلى سبيل المثال، عندما يتم دعم كل من UDP و SMS، يمكن لعميل LwM2M وخادم LwM2M اختيار التواصل إما عبر UDP أو SMS خلال جلسة النقل بأكملها.",
+            "bootstrap-server": "خادم التمهيد",
+            "lwm2m-server": "خادم LwM2M",
+            "include-bootstrap-server": "تضمين تحديثات خادم التمهيد",
+            "bootstrap-update-title": "لديك بالفعل خادم تمهيد مُعد. هل أنت متأكد أنك تريد استبعاد التحديثات؟",
+            "bootstrap-update-text": "كن حذرًا، بعد التأكيد ستصبح بيانات تكوين خادم التمهيد غير قابلة للاسترداد.",
+            "server-host": "المضيف",
+            "server-host-required": "المضيف مطلوب.",
+            "server-port": "المنفذ",
+            "server-port-required": "المنفذ مطلوب.",
+            "server-port-pattern": "يجب أن يكون المنفذ عددًا صحيحًا موجبًا.",
+            "server-port-range": "يجب أن يكون المنفذ ضمن نطاق من 1 إلى 65535.",
+            "server-public-key": "مفتاح الخادم العام",
+            "server-public-key-required": "مفتاح الخادم العام مطلوب.",
+            "client-hold-off-time": "وقت الانتظار للعميل",
+            "client-hold-off-time-required": "وقت الانتظار للعميل مطلوب.",
+            "client-hold-off-time-pattern": "يجب أن يكون وقت الانتظار للعميل عددًا صحيحًا موجبًا.",
+            "client-hold-off-time-tooltip": "وقت الانتظار للعميل للاستخدام مع خادم التمهيد فقط",
+            "account-after-timeout": "الحساب بعد انتهاء الوقت",
+            "account-after-timeout-required": "الحساب بعد انتهاء الوقت مطلوب.",
+            "account-after-timeout-pattern": "يجب أن يكون الحساب بعد انتهاء الوقت عددًا صحيحًا موجبًا.",
+            "account-after-timeout-tooltip": "حساب خادم التمهيد بعد قيمة الوقت المحددة بواسطة هذا المورد.",
+            "server-type": "نوع الخادم",
+            "add-new-server-title": "إضافة تكوين خادم جديد",
+            "add-server-config": "إضافة تكوين خادم",
+            "add-lwm2m-server-config": "إضافة خادم LwM2M",
+            "no-config-servers": "لا توجد خوادم مكونة",
+            "others-tab": "إعدادات أخرى",
+            "client-strategy": "استراتيجية العميل عند الاتصال",
+            "client-strategy-label": "الاستراتيجية",
+            "client-strategy-only-observe": "طلب المراقبة فقط للعميل بعد الاتصال الأولي",
+            "client-strategy-read-all": "قراءة جميع الموارد وطلب المراقبة للعميل بعد التسجيل",
+            "fw-update": "تحديث البرنامج الثابت",
+            "fw-update-strategy": "استراتيجية تحديث البرنامج الثابت",
+            "fw-update-strategy-data": "دفع تحديث البرنامج الثابت كملف ثنائي باستخدام الكائن 19 والمورد 0 (البيانات)",
+            "fw-update-strategy-package": "دفع تحديث البرنامج الثابت كملف ثنائي باستخدام الكائن 5 والمورد 0 (الحزمة)",
+            "fw-update-strategy-package-uri": "إنشاء عنوان URL فريد لـ CoAP تلقائيًا لتنزيل الحزمة ودفع تحديث البرنامج الثابت ككائن 5 والمورد 1 (عنوان URL للحزمة)",
+            "sw-update": "تحديث البرمجيات",
+            "sw-update-strategy": "استراتيجية تحديث البرمجيات",
+            "sw-update-strategy-package": "دفع ملف ثنائي باستخدام الكائن 9 والمورد 2 (الحزمة)",
+            "sw-update-strategy-package-uri": "إنشاء عنوان URL فريد لـ CoAP تلقائيًا لتنزيل الحزمة ودفع تحديث البرمجيات باستخدام الكائن 9 والمورد 3 (عنوان URL للحزمة)",
+            "fw-update-resource": "مورد تحديث البرنامج الثابت CoAP",
+            "fw-update-resource-required": "مورد تحديث البرنامج الثابت CoAP مطلوب.",
+            "sw-update-resource": "مورد تحديث البرمجيات CoAP",
+            "sw-update-resource-required": "مورد تحديث البرمجيات CoAP مطلوب.",
+            "config-json-tab": "ملف تكوين Json للجهاز",
+            "attributes-name": {
+                "min-period": "الفترة الدنيا",
+                "max-period": "الفترة القصوى",
+                "greater-than": "أكبر من",
+                "less-than": "أقل من",
+                "step": "خطوة",
+                "min-evaluation-period": "الفترة الدنيا للتقييم",
+                "max-evaluation-period": "الفترة القصوى للتقييم"
+            },
+            "composite-operations-support": "يدعم عمليات القراءة/الكتابة/المراقبة المركبة"
+        },
+        "snmp": {
+            "add-communication-config": "إضافة تكوين الاتصال",
+            "add-mapping": "إضافة تعيين",
+            "authentication-passphrase": "عبارة مرور المصادقة",
+            "authentication-passphrase-required": "عبارة مرور المصادقة مطلوبة.",
+            "authentication-protocol": "بروتوكول المصادقة",
+            "authentication-protocol-required": "بروتوكول المصادقة مطلوب.",
+            "communication-configs": "تكوينات الاتصال",
+            "community": "سلسلة المجتمع",
+            "community-required": "سلسلة المجتمع مطلوبة.",
+            "context-name": "اسم السياق",
+            "data-key": "مفتاح البيانات",
+            "data-key-required": "مفتاح البيانات مطلوب.",
+            "data-type": "نوع البيانات",
+            "data-type-required": "نوع البيانات مطلوب.",
+            "engine-id": "معرف المحرك",
+            "host": "المضيف",
+            "host-required": "المضيف مطلوب.",
+            "oid": "OID",
+            "oid-pattern": "تنسيق OID غير صالح.",
+            "oid-required": "OID مطلوب.",
+            "please-add-communication-config": "يرجى إضافة تكوين الاتصال",
+            "please-add-mapping-config": "يرجى إضافة تكوين التعيين",
+            "port": "المنفذ",
+            "port-format": "تنسيق المنفذ غير صالح.",
+            "port-required": "المنفذ مطلوب.",
+            "privacy-passphrase": "عبارة مرور الخصوصية",
+            "privacy-passphrase-required": "عبارة مرور الخصوصية مطلوبة.",
+            "privacy-protocol": "بروتوكول الخصوصية",
+            "privacy-protocol-required": "بروتوكول الخصوصية مطلوب.",
+            "protocol-version": "إصدار البروتوكول",
+            "protocol-version-required": "إصدار البروتوكول مطلوب.",
+            "querying-frequency": "تردد الاستعلام، ملي ثانية",
+            "querying-frequency-invalid-format": "يجب أن يكون تردد الاستعلام عددًا صحيحًا موجبًا.",
+            "querying-frequency-required": "تردد الاستعلام مطلوب.",
+            "retries": "محاولات",
+            "retries-invalid-format": "يجب أن تكون المحاولات عددًا صحيحًا موجبًا.",
+            "retries-required": "المحاولات مطلوبة.",
+            "scope": "النطاق",
+            "scope-required": "النطاق مطلوب.",
+            "security-name": "اسم الأمان",
+            "security-name-required": "اسم الأمان مطلوب.",
+            "timeout-ms": "المهلة، ملي ثانية",
+            "timeout-ms-invalid-format": "يجب أن تكون المهلة عددًا صحيحًا موجبًا.",
+            "timeout-ms-required": "المهلة مطلوبة.",
+            "user-name": "اسم المستخدم",
+            "user-name-required": "اسم المستخدم مطلوب."
+        }
+    },
+    "dialog": {
+        "close": "إغلاق الحوار",
+        "error-message-title": "عنوان رسالة الخطأ:",
+        "error-details-title": "تفاصيل الخطأ"
+    },
+    "direction": {
+        "column": "عمود",
+        "row": "صف"
+    },
+    "edge": {
+        "all": "الكل",
+        "all-edges": "جميع الحواف",
+        "groups": "المجموعات",
+        "shared": "مشترك",
+        "edge": "حافة",
+        "edge-instances": "نماذج الحافة",
+        "instances": "نماذج",
+        "edge-file": "ملف الحافة",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256",
+        "label-max-length": "يجب أن يكون التصنيف أقل من 256",
+        "type-max-length": "يجب أن يكون النوع أقل من 256",
+        "management": "إدارة الحافة",
+        "no-edges-matching": "لم يتم العثور على حواف تطابق '{{entity}}'.",
+        "add": "إضافة حافة",
+        "no-edges-text": "لم يتم العثور على حواف",
+        "edge-details": "تفاصيل الحافة",
+        "add-edge-text": "إضافة حافة جديدة",
+        "delete": "حذف الحافة",
+        "delete-edge-title": "هل أنت متأكد أنك تريد حذف الحافة '{{edgeName}}'؟",
+        "delete-edge-text": "كن حذرًا، بعد التأكيد ستصبح الحافة وجميع البيانات المرتبطة بها غير قابلة للاسترداد.",
+        "delete-edges-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {حافة واحدة} other {# حواف} }؟",
+        "delete-edges-text": "كن حذرًا، بعد التأكيد ستتم إزالة جميع الحواف المحددة وجميع البيانات المرتبطة بها.",
+        "name": "الاسم",
+        "name-starts-with": "اسم الحافة يبدأ ب",
+        "name-required": "الاسم مطلوب.",
+        "edge-license-key": "مفتاح ترخيص الحافة",
+        "edge-license-key-required": "مفتاح ترخيص الحافة مطلوب.",
+        "edge-license-key-max-length": "يجب أن يكون مفتاح ترخيص الحافة أقل من 31",
+        "edge-license-key-hint": "<b>ملاحظة مهمة:</b> يتم توفير مفتاح ترخيص الحافة الافتراضي لأغراض التقييم فقط.<br>هذا المفتاح نشط فقط لمدة <b>30</b> يومًا بعد التنشيط. ميزة <b>التخصيص</b> معطلة. <br>للحصول على مفتاح الترخيص الخاص بك، يرجى التوجه إلى <a href='https://thingsboard.io/pricing/?active=thingsboard-edge' target='_blank'>صفحة التسعير</a> واختيار أفضل خيار ترخيص لحالتك.",
+        "cloud-endpoint": "نقطة نهاية السحاب",
+        "cloud-endpoint-required": "نقطة نهاية السحاب مطلوبة.",
+        "cloud-endpoint-max-length": "يجب أن تكون نقطة نهاية السحاب أقل من 256",
+        "cloud-endpoint-hint": "تتطلب الحافة الوصول إلى HTTP(s) إلى السحاب (ThingsBoard PE) للتحقق من مفتاح الترخيص. يرجى تحديد عنوان URL للسحاب الذي يمكن للحافة الاتصال به.",
+        "description": "الوصف",
+        "details": "التفاصيل",
+        "events": "الأحداث",
+        "copy-id": "نسخ معرف الحافة",
+        "id-copied-message": "تم نسخ معرف الحافة إلى الحافظة",
+        "sync": "مزامنة الحافة",
+        "edge-required": "الحافة مطلوبة",
+        "edge-type": "نوع الحافة",
+        "edge-type-required": "نوع الحافة مطلوب.",
+        "event-action": "إجراء الحدث",
+        "entity-id": "معرف الكيان",
+        "select-edge-type": "اختر نوع الحافة",
+        "assign-to-customer": "تعيين للعميل",
+        "assign-to-customer-text": "يرجى اختيار العميل لتعيين الحواف",
+        "assign-edge-to-customer": "تعيين الحواف للعميل",
+        "assign-edge-to-customer-text": "يرجى اختيار الحواف لتعيينها للعميل",
+        "assignedToCustomer": "معين للعميل",
+        "edge-public": "الحافة عامة",
+        "assigned-to-customer": "معين إلى: {{customerTitle}}",
+        "unassign-from-customer": "إلغاء التعيين من العميل",
+        "unassign-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين الحافة '{{edgeName}}'؟",
+        "unassign-edge-text": "بعد التأكيد ستصبح الحافة غير معينة ولن تكون متاحة للعميل.",
+        "unassign-edges-title": "هل أنت متأكد أنك تريد إلغاء تعيين { count, plural, =1 {حافة واحدة} other {# حواف} }؟",
+        "unassign-edges-text": "بعد التأكيد سيتم إلغاء تعيين جميع الحواف المحددة ولن تكون متاحة للعميل.",
+        "make-public": "جعل الحافة عامة",
+        "make-public-edge-title": "هل أنت متأكد أنك تريد جعل الحافة '{{edgeName}}' عامة؟",
+        "make-public-edge-text": "بعد التأكيد ستصبح الحافة وجميع بياناتها عامة ومتاحة للآخرين.",
+        "make-private": "جعل الحافة خاصة",
+        "public": "عام",
+        "make-private-edge-title": "هل أنت متأكد أنك تريد جعل الحافة '{{edgeName}}' خاصة؟",
+        "make-private-edge-text": "بعد التأكيد ستصبح الحافة وجميع بياناتها خاصة ولن تكون متاحة للآخرين.",
+        "import": "استيراد الحافة",
+        "install-connect-instructions": "تعليمات التثبيت والاتصال",
+        "install-connect-instructions-edge-created": "تم إنشاء الحافة! تحقق من تعليمات التثبيت والاتصال",
+        "loading-edge-instructions": "جاري تحميل تعليمات الحافة...",
+        "label": "التصنيف",
+        "load-entity-error": "فشل في تحميل البيانات. تم حذف الكيان.",
+        "assign-new-edge": "تعيين حافة جديدة",
+        "unassign-from-edge": "إلغاء التعيين من الحافة",
+        "edge-key": "مفتاح الحافة",
+        "copy-edge-key": "نسخ مفتاح الحافة",
+        "edge-key-copied-message": "تم نسخ مفتاح الحافة إلى الحافظة",
+        "edge-secret": "سر الحافة",
+        "copy-edge-secret": "نسخ سر الحافة",
+        "edge-secret-copied-message": "تم نسخ سر الحافة إلى الحافظة",
+        "manage-assets": "إدارة الأصول",
+        "manage-devices": "إدارة الأجهزة",
+        "manage-entity-views": "إدارة عرض الكيانات",
+        "manage-dashboards": "إدارة لوحات المعلومات",
+        "manage-rulechains": "إدارة سلاسل القواعد",
+        "assets": "أصول الحافة",
+        "devices": "أجهزة الحافة",
+        "entity-views": "عرض كيانات الحافة",
+        "dashboard": "لوحة معلومات الحافة",
+        "dashboards": "لوحات معلومات الحافة",
+        "rulechain-templates": "قوالب سلسلة القواعد",
+        "edge-rulechain-templates": "قوالب سلسلة القواعد للحافة",
+        "converter-templates": "قوالب المحول",
+        "edge-converter-templates": "قوالب المحول للحافة",
+        "integration-templates": "قوالب التكامل",
+        "edge-integration-templates": "قوالب التكامل للحافة",
+        "rulechains": "سلاسل القواعد للحافة",
+        "integrations": "التكاملات",
+        "search": "بحث في الحواف",
+        "selected-edges": "{ count, plural, =1 {حافة واحدة} other {# حواف} } محددة",
+        "any-edge": "أي حافة",
+        "no-edge-types-matching": "لم يتم العثور على أنواع الحواف التي تطابق '{{entitySubtype}}'.",
+        "edge-type-list-empty": "لم يتم تحديد أنواع الحواف.",
+        "edge-types": "أنواع الحواف",
+        "enter-edge-type": "أدخل نوع الحافة",
+        "deployed": "تم النشر",
+        "pending": "قيد الانتظار",
+        "downlinks": "روابط تنزيل",
+        "no-downlinks-prompt": "لم يتم العثور على روابط تنزيل",
+        "sync-process-started-successfully": "تم بدء عملية المزامنة بنجاح!",
+        "missing-related-rule-chains-title": "الحافة تفتقد سلاسل قواعد ذات صلة",
+        "missing-related-rule-chains-text": "سلاسل القواعد المعينة للحافة تستخدم عقد قواعد ترسل الرسائل إلى سلاسل قواعد ليست معينة لهذه الحافة. <br><br> قائمة سلاسل القواعد المفقودة: <br> {{missingRuleChains}}",
+        "widget-datasource-error": "هذه الأداة تدعم فقط مصدر بيانات كيان EDGE",
+        "assign-to-edge": "تعيين للحافة",
+        "assign-to-edge-title": "تعيين مجموعات الكيانات للحافة",
+        "manage-edge-user-groups": "إدارة مجموعات المستخدمين للحافة",
+        "manage-edge-asset-groups": "إدارة مجموعات الأصول للحافة",
+        "manage-edge-device-groups": "إدارة مجموعات الأجهزة للحافة",
+        "manage-edge-entity-view-groups": "إدارة مجموعات عرض الكيانات للحافة",
+        "manage-edge-dashboard-groups": "إدارة مجموعات لوحات المعلومات للحافة",
+        "manage-edge-rule-chains": "إدارة سلاسل القواعد للحافة",
+        "manage-edge-integrations": "إدارة التكاملات للحافة",
+        "manage-edge-scheduler-events": "إدارة أحداث المجدول للحافة",
+        "select-group-to-add": "حدد المجموعة المستهدفة لإضافة الحواف المحددة",
+        "select-group-to-move": "حدد المجموعة المستهدفة لنقل الحواف المحددة",
+        "remove-edges-from-group": "هل أنت متأكد أنك تريد إزالة { count, plural, =1 {حافة واحدة} other {# حواف} } من المجموعة '{{entityGroup}}'؟",
+        "group": "مجموعة الحواف",
+        "list-of-groups": "{ count, plural, =1 {مجموعة حافة واحدة} other {قائمة # مجموعات الحواف} }",
+        "group-name-starts-with": "مجموعات الحواف التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "unassign-entity-group-from-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين مجموعة الكيان '{{ entityGroupName }}'؟",
+        "unassign-entity-group-from-edge-text": "بعد التأكيد ستصبح مجموعة الكيان غير معينة ولن تكون متاحة للحافة.",
+        "unassign-entity-group-from-edge": "إلغاء تعيين مجموعة الكيان من الحافة",
+        "unassign-entity-groups-from-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين {{count}} مجموعات كيان؟",
+        "unassign-entity-groups-from-edge-text": "بعد التأكيد سيتم إلغاء تعيين مجموعات الكيان ولن تكون متاحة للحافة.",
+        "unassign-entity-groups-from-edge": "إلغاء تعيين مجموعات الكيان من الحافة",
+        "unassign-scheduler-events-from-edge": "إلغاء تعيين أحداث المجدول من الحافة",
+        "unassign-scheduler-event-from-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين حدث المجدول '{{schedulerEventName}}'؟",
+        "unassign-scheduler-event-from-edge-text": "بعد التأكيد سيتم إلغاء تعيين حدث المجدول ولن يكون متاحًا للحافة.",
+        "unassign-scheduler-events-from-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين { count, plural, =1 {حدث مجدول واحد} other {# أحداث مجدولة} }؟",
+        "unassign-scheduler-events-from-edge-text": "بعد التأكيد سيتم إلغاء تعيين جميع الأحداث المجدولة المحددة ولن تكون متاحة للحافة.",
+        "manage-user-groups": "إدارة مجموعات المستخدمين",
+        "manage-asset-groups": "إدارة مجموعات الأصول",
+        "manage-device-groups": "إدارة مجموعات الأجهزة",
+        "manage-dashboard-groups": "إدارة مجموعات لوحات المعلومات",
+        "manage-entity-view-groups": "إدارة مجموعات عرض الكيانات",
+        "manage-scheduler-events": "إدارة أحداث المجدول",
+        "manage-integrations": "إدارة التكاملات",
+        "assign-scheduler-event-to-edge-title": "تعيين أحداث المجدول للحافة",
+        "assign-scheduler-event-to-edge-text": "يرجى اختيار أحداث المجدول لتعيينها للحافة",
+        "assign-entity-groups-to-edge-text": "يرجى اختيار مجموعات الكيان لتعيينها للحافة",
+        "assign-integration-to-edge-title": "تعيين التكاملات للحافة",
+        "assign-integration-to-edge-text": "يرجى اختيار التكاملات لتعيينها للحافة",
+        "missing-attributes-title": "الحافة تفتقد لبعض السمات",
+        "missing-attributes-text": "التكاملات المعينة للحافة لديها عناصر نائبة للسمات غير متوفرة على هذه الحافة. <br><br> قائمة السمات المفقودة على الحافة: <br> {{missingEdgeAttributes}}",
+        "missing-all-related-attributes-title": "الحواف لديها سمات مفقودة",
+        "missing-all-related-attributes-text": "الحواف المرتبطة بالتكامل لا تملك السمات الموجودة داخل تكوين التكامل كعناصر نائبة للسمات. <br><br> قائمة السمات المفقودة على الحافة: <br> {{missingEdgeAttributes}}",
+        "quick-overview-widget-header": "نظرة سريعة على {{edgeName}}",
+        "upgrade-instructions": "تعليمات الترقية"
+    },
+    "edge-event": {
+        "type-dashboard": "لوحة المعلومات",
+        "type-asset": "الأصل",
+        "type-device": "الجهاز",
+        "type-device-profile": "ملف تعريف الجهاز",
+        "type-asset-profile": "ملف تعريف الأصل",
+        "type-entity-view": "عرض الكيان",
+        "type-alarm": "إنذار",
+        "type-entity-group": "مجموعة الكيان",
+        "type-rule-chain": "سلسلة القواعد",
+        "type-rule-chain-metadata": "بيانات تعريف سلسلة القواعد",
+        "type-edge": "الحافة",
+        "type-user": "المستخدم",
+        "type-tenant": "المستأجر",
+        "type-tenant-profile": "ملف تعريف المستأجر",
+        "type-customer": "العميل",
+        "type-relation": "العلاقة",
+        "type-widgets-bundle": "حزمة الأدوات",
+        "type-widgets-type": "نوع الأدوات",
+        "type-admin-settings": "إعدادات المسؤول",
+        "type-ota-package": "حزمة OTA",
+        "type-queue": "الطابور",
+        "type-scheduler-event": "حدث المجدول",
+        "type-white-labeling": "التسمية البيضاء",
+        "type-login-white-labeling": "تسجيل دخول التسمية البيضاء",
+        "type-custom-translation": "الترجمة المخصصة",
+        "type-role": "الدور",
+        "type-group-permission": "إذن المجموعة",
+        "type-integration": "التكامل",
+        "type-converter": "المحول",
+        "action-type-added": "تمت الإضافة",
+        "action-type-deleted": "تم الحذف",
+        "action-type-updated": "تم التحديث",
+        "action-type-post-attributes": "إرسال السمات",
+        "action-type-attributes-updated": "تم تحديث السمات",
+        "action-type-attributes-deleted": "تم حذف السمات",
+        "action-type-timeseries-updated": "تم تحديث السلاسل الزمنية",
+        "action-type-credentials-updated": "تم تحديث البيانات الاعتمادية",
+        "action-type-assigned-to-customer": "تم التعيين للعميل",
+        "action-type-unassigned-from-customer": "تم إلغاء التعيين من العميل",
+        "action-type-relation-add-or-update": "إضافة أو تحديث العلاقة",
+        "action-type-relation-deleted": "تم حذف العلاقة",
+        "action-type-rpc-call": "RPC استدعاء",
+        "action-type-alarm-ack": "تأكيد الإنذار",
+        "action-type-alarm-clear": "مسح الإنذار",
+        "action-type-alarm-assigned": "تم تعيين الإنذار",
+        "action-type-alarm-unassigned": "تم إلغاء تعيين الإنذار",
+        "action-type-assigned-to-edge": "تم التعيين إلى الحافة",
+        "action-type-unassigned-from-edge": "تم إلغاء التعيين من الحافة",
+        "action-type-credentials-request": "طلب بيانات اعتماد",
+        "action-type-entity-merge-request": "طلب دمج الكيان",
+        "action-type-added-to-entity-group": "تمت الإضافة إلى مجموعة الكيان",
+        "action-type-removed-from-entity-group": "تم الإزالة من مجموعة الكيان",
+        "action-type-change-owner": "تغيير المالك"
+    },
+    "error": {
+        "unable-to-connect": "غير قادر على الاتصال بالخادم! يرجى التحقق من اتصالك بالإنترنت.",
+        "unhandled-error-code": "رمز خطأ غير معالج: {{errorCode}}",
+        "unknown-error": "خطأ غير معروف"
+    },
+    "entity": {
+        "entity": "كيان",
+        "entities": "الكيانات",
+        "entities-count": "عدد الكيانات",
+        "alarms-count": "عدد التنبيهات",
+        "aliases": "أسماء مستعارة للكيان",
+        "aliases-short": "الأسماء المستعارة",
+        "entity-alias": "اسم مستعار للكيان",
+        "unable-delete-entity-alias-title": "غير قادر على حذف الاسم المستعار للكيان",
+        "unable-delete-entity-alias-text": "لا يمكن حذف الاسم المستعار '{{entityAlias}}' لأنه مستخدم بواسطة الأدوات التالية:<br/>{{widgetsList}}",
+        "duplicate-alias-error": "تم العثور على اسم مستعار مكرر '{{alias}}'.<br>يجب أن تكون الأسماء المستعارة للكيانات فريدة ضمن لوحة المعلومات.",
+        "missing-entity-filter-error": "الفلتر مفقود للكنية '{{alias}}'.",
+        "configure-alias": "تكوين الاسم المستعار '{{alias}}'",
+        "alias": "الاسم المستعار",
+        "alias-required": "الاسم المستعار للكيان مطلوب.",
+        "remove-alias": "إزالة الاسم المستعار للكيان",
+        "add-alias": "إضافة اسم مستعار للكيان",
+        "entity-list": "قائمة الكيانات",
+        "entity-type": "نوع الكيان",
+        "entity-types": "أنواع الكيانات",
+        "entity-type-list": "قائمة أنواع الكيان",
+        "any-entity": "أي كيان",
+        "add-entity-type": "إضافة نوع كيان",
+        "enter-entity-type": "إدخال نوع الكيان",
+        "no-entities-matching": "لا توجد كيانات تطابق '{{entity}}'",
+        "no-entity-types-matching": "لا توجد أنواع كيانات تطابق '{{entityType}}'",
+        "name-starts-with": "تعبير عن الاسم",
+        "help-text": "استخدم '%' حسب الحاجة: '%entity_name_contains%', '%entity_name_ends', 'entity_starts_with'.",
+        "use-entity-name-filter": "استخدم الفلتر",
+        "entity-list-empty": "لم يتم اختيار كيانات.",
+        "entity-type-list-required": "يجب اختيار نوع كيان واحد على الأقل.",
+        "entity-name-filter-required": "فلتر اسم الكيان مطلوب.",
+        "entity-name-filter-no-entity-matched": "لم يتم العثور على كيانات تبدأ بـ '{{entity}}'.",
+        "all-subtypes": "الكل",
+        "select-entities": "اختر الكيانات",
+        "no-aliases-found": "لم يتم العثور على أسماء مستعارة.",
+        "no-alias-matching": "لم يتم العثور على '{{alias}}'.",
+        "create-new-alias": "إنشاء جديد!",
+        "create-new": "إنشاء جديد",
+        "key": "المفتاح",
+        "key-name": "اسم المفتاح",
+        "no-keys-found": "لم يتم العثور على مفاتيح.",
+        "no-key-matching": "لم يتم العثور على '{{key}}'.",
+        "create-new-key": "إنشاء جديد!",
+        "type": "النوع",
+        "type-required": "نوع الكيان مطلوب.",
+        "type-device": "جهاز",
+        "type-devices": "الأجهزة",
+        "list-of-devices": "{ count, plural, =1 {جهاز واحد} other {قائمة من # أجهزة} }",
+        "device-name-starts-with": "أجهزة تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-device-profile": "ملف تعريف الجهاز",
+        "type-device-profiles": "ملفات تعريف الجهاز",
+        "clear-selected-profiles": "مسح الملفات المختارة",
+        "list-of-device-profiles": "{ count, plural, =1 {ملف تعريف جهاز واحد} other {قائمة من # ملفات تعريف الجهاز} }",
+        "device-profile-name-starts-with": "ملفات تعريف الجهاز التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-asset-profile": "ملف تعريف الأصل",
+        "type-asset-profiles": "ملفات تعريف الأصل",
+        "list-of-asset-profiles": "{ count, plural, =1 {ملف تعريف أصل واحد} other {قائمة من # ملفات تعريف الأصل} }",
+        "asset-profile-name-starts-with": "ملفات تعريف الأصل التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-asset": "الأصل",
+        "type-assets": "الأصول",
+        "list-of-assets": "{ count, plural, =1 {أصل واحد} other {قائمة من # الأصول} }",
+        "asset-name-starts-with": "الأصول التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-entity-view": "عرض الكيان",
+        "type-entity-views": "عروض الكيانات",
+        "list-of-entity-views": "{ count, plural, =1 {عرض كيان واحد} other {قائمة من # عروض الكيانات} }",
+        "entity-view-name-starts-with": "عروض الكيانات التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-rule": "القاعدة",
+        "type-rules": "القواعد",
+        "list-of-rules": "{ count, plural, =1 {قاعدة واحدة} other {قائمة من # القواعد} }",
+        "rule-name-starts-with": "القواعد التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-plugin": "المكون الإضافي",
+        "type-plugins": "المكونات الإضافية",
+        "list-of-plugins": "{ count, plural, =1 {مكون إضافي واحد} other {قائمة من # المكونات الإضافية} }",
+        "plugin-name-starts-with": "المكونات الإضافية التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-tenant": "المستأجر",
+        "type-tenants": "المستأجرون",
+        "list-of-tenants": "{ count, plural, =1 {مستأجر واحد} other {قائمة من # المستأجرون} }",
+        "tenant-name-starts-with": "المستأجرون الذين تبدأ أسماؤهم بـ '{{prefix}}'",
+        "type-tenant-profile": "ملف تعريف المستأجر",
+        "type-tenant-profiles": "ملفات تعريف المستأجر",
+        "list-of-tenant-profiles": "{ count, plural, =1 {ملف تعريف مستأجر واحد} other {قائمة من # ملفات تعريف المستأجر} }",
+        "tenant-profile-name-starts-with": "ملفات تعريف المستأجر التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-customer": "العميل",
+        "type-customers": "العملاء",
+        "list-of-customers": "{ count, plural, =1 {عميل واحد} other {قائمة من # العملاء} }",
+        "customer-name-starts-with": "العملاء الذين تبدأ أسماؤهم بـ '{{prefix}}'",
+        "type-user": "المستخدم",
+        "type-users": "المستخدمون",
+        "list-of-users": "{ count, plural, =1 {مستخدم واحد} other {قائمة من # المستخدمين} }",
+        "user-name-starts-with": "المستخدمون الذين تبدأ أسماؤهم بـ '{{prefix}}'",
+        "type-dashboard": "لوحة المعلومات",
+        "type-dashboards": "لوحات المعلومات",
+        "list-of-dashboards": "{ count, plural, =1 {لوحة معلومات واحدة} other {قائمة من # لوحات المعلومات} }",
+        "dashboard-name-starts-with": "لوحات المعلومات التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-alarm": "التنبيه",
+        "type-alarms": "التنبيهات",
+        "list-of-alarms": "{ count, plural, =1 {تنبيه واحد} other {قائمة من # التنبيهات} }",
+        "alarm-name-starts-with": "التنبيهات التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-rulechain": "سلسلة القواعد",
+        "type-rulechains": "سلاسل القواعد",
+        "list-of-rulechains": "{ count, plural, =1 {سلسلة قواعد واحدة} other {قائمة من # سلاسل القواعد} }",
+        "rulechain-name-starts-with": "سلاسل القواعد التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-scheduler-event": "حدث المجدول",
+        "type-scheduler-events": "أحداث المجدول",
+        "list-of-scheduler-events": "{ count, plural, =1 {حدث مجدول واحد} other {قائمة من # أحداث المجدول} }",
+        "scheduler-event-name-starts-with": "أحداث المجدول التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-blob-entity": "كيان البلوب",
+        "type-blob-entities": "كيانات البلوب",
+        "list-of-blob-entities": "{ count, plural, =1 {كيان بلوب واحد} other {قائمة من # كيانات البلوب} }",
+        "blob-entity-name-starts-with": "كيانات البلوب التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-rulenode": "عقدة القاعدة",
+        "type-rulenodes": "عقد القواعد",
+        "list-of-rulenodes": "{ count, plural, =1 {عقدة قاعدة واحدة} other {قائمة من # عقد القواعد} }",
+        "rulenode-name-starts-with": "عقد القواعد التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-current-customer": "العميل الحالي",
+        "type-current-tenant": "المستأجر الحالي",
+        "type-current-user": "المستخدم الحالي",
+        "type-current-user-owner": "مالك المستخدم الحالي",
+        "type-widgets-bundle": "حزمة الأدوات",
+        "type-widgets-bundles": "حزم الأدوات",
+        "list-of-widgets-bundles": "{ count, plural, =1 {حزمة أدوات واحدة} other {قائمة من # حزم الأدوات} }",
+        "type-widget": "الأداة",
+        "type-widgets": "الأدوات",
+        "list-of-widgets": "{ count, plural, =1 {أداة واحدة} other {قائمة من # الأدوات} }",
+        "search": "بحث في الكيانات",
+        "selected-entities": "{ count, plural, =1 {1 كيان} other {# كيانات} } مختارة",
+        "entity-name": "اسم الكيان",
+        "entity-label": "تسمية الكيان",
+        "details": "تفاصيل الكيان",
+        "no-entities-prompt": "لم يتم العثور على كيانات",
+        "no-data": "لا توجد بيانات لعرضها",
+        "columns-to-display": "الأعمدة للعرض",
+        "type-api-usage-state": "حالة استخدام API",
+        "type-entity-group": "مجموعة الكيان",
+        "type-converter": "محول البيانات",
+        "type-converters": "محولات البيانات",
+        "list-of-converters": "{ count, plural, =1 {محول بيانات واحد} other {قائمة من # محولات البيانات} }",
+        "converter-name-starts-with": "محولات البيانات التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-integration": "التكامل",
+        "type-integrations": "التكاملات",
+        "list-of-integrations": "{ count, plural, =1 {تكامل واحد} other {قائمة من # التكاملات} }",
+        "integration-name-starts-with": "التكاملات التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-role": "الدور",
+        "type-roles": "الأدوار",
+        "list-of-roles": "{ count, plural, =1 {دور واحد} other {قائمة من # الأدوار} }",
+        "role-name-starts-with": "الأدوار التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-group-permission": "إذن المجموعة",
+        "type-edge": "الحافة",
+        "type-edges": "الحواف",
+        "list-of-edges": "{ count, plural, =1 {حافة واحدة} other {قائمة من # الحواف} }",
+        "edge-name-starts-with": "الحواف التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "type-tb-resource": "المورد",
+        "type-tb-resources": "الموارد",
+        "list-of-tb-resources": "{ count, plural, =1 {مورد واحد} other {قائمة من # الموارد} }",
+        "type-ota-package": "حزمة OTA",
+        "type-rpc": "RPC",
+        "type-queue": "الطابور",
+        "type-notification": "الإشعار",
+        "type-notification-rule": "قاعدة الإشعار",
+        "type-notification-rules": "قواعد الإشعار",
+        "list-of-notification-rules": "{ count, plural, =1 {قاعدة إشعار واحدة} other {قائمة من # قواعد الإشعار} }",
+        "type-notification-target": "مستلم الإشعار",
+        "type-notification-targets": "مستلمو الإشعارات",
+        "list-of-notification-targets": "{ count, plural, =1 {مستلم إشعار واحد} other {قائمة من # مستلمي الإشعارات} }",
+        "type-notification-request": "طلب الإشعار",
+        "type-notification-template": "قالب الإشعار",
+        "type-notification-templates": "قوالب الإشعار",
+        "list-of-notification-templates": "{ count, plural, =1 {قالب إشعار واحد} other {قائمة من # قوالب الإشعار} }",
+        "customer-name": "اسم العميل",
+        "sub-customer-name": "اسم العميل الفرعي",
+        "parent-customer-name": "اسم العميل الأصلي",
+        "parent-sub-customer-name": "اسم العميل الفرعي الأصلي",
+        "include-customer-entities": "تضمين كيانات العميل",
+        "include-sub-customer-entities": "تضمين كيانات العميل الفرعي",
+        "groups": "المجموعات"
+    },
+    "entity-group": {
+        "entity-group": "مجموعة الكيان",
+        "details": "التفاصيل",
+        "columns": "الأعمدة",
+        "add-column": "إضافة عمود",
+        "column-value": "القيمة",
+        "column-value-required": "قيمة العمود مطلوبة.",
+        "column-title": "العنوان",
+        "default-sort-order": "ترتيب الفرز الافتراضي",
+        "default-sort-order-required": "ترتيب الفرز الافتراضي مطلوب.",
+        "hide-in-mobile-view": "مخفي في عرض الجوال",
+        "use-cell-style-function": "استخدم دالة أنماط الخلية",
+        "use-cell-content-function": "استخدم دالة محتوى الخلية",
+        "edit-column": "تحرير العمود",
+        "column-details": "تفاصيل العمود",
+        "actions": "الإجراءات",
+        "settings": "الإعدادات",
+        "search": "بحث في مجموعات الكيان",
+        "delete": "حذف مجموعة الكيان",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256",
+        "description": "الوصف",
+        "add": "إضافة مجموعة كيان",
+        "open-entity-group": "فتح مجموعة الكيان",
+        "add-entity-group-text": "إضافة مجموعة كيان جديدة",
+        "no-entity-groups-text": "لم يتم العثور على مجموعات كيان",
+        "entity-group-details": "تفاصيل مجموعة الكيان",
+        "selected-entity-groups": "{ count, plural, =1 {1 مجموعة كيان} other {# مجموعات كيان} } محددة",
+        "delete-entity-groups": "حذف مجموعات الكيان",
+        "delete-entity-group-title": "هل أنت متأكد أنك تريد حذف مجموعة الكيان '{{entityGroupName}}'؟",
+        "delete-entity-group-text": "كن حذرًا، بعد التأكيد سيتم حذف مجموعة الكيان وجميع البيانات المتعلقة بها بشكل لا رجعة فيه.",
+        "delete-entity-groups-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 مجموعة كيان} other {# مجموعات كيان} }؟",
+        "delete-entity-groups-action-title": "حذف { count, plural, =1 {1 مجموعة كيان} other {# مجموعات كيان} }",
+        "delete-entity-groups-text": "كن حذرًا، بعد التأكيد سيتم حذف جميع مجموعات الكيان المحددة وجميع البيانات المتعلقة بها بشكل لا رجعة فيه.",
+        "device-groups": "مجموعات الأجهزة",
+        "shared-device-groups": "مجموعات الأجهزة المشتركة",
+        "asset-groups": "مجموعات الأصول",
+        "shared-asset-groups": "مجموعات الأصول المشتركة",
+        "customer-groups": "مجموعات العملاء",
+        "shared-customer-groups": "مجموعات العملاء المشتركة",
+        "device-group": "مجموعة الأجهزة",
+        "asset-group": "مجموعة الأصول",
+        "user-group": "مجموعة المستخدمين",
+        "user-groups": "مجموعات المستخدمين",
+        "customer-group": "مجموعة العملاء",
+        "entity-view-groups": "مجموعات عرض الكيان",
+        "shared-entity-view-groups": "مجموعات عرض الكيان المشتركة",
+        "entity-view-group": "مجموعة عرض الكيان",
+        "edge-groups": "مجموعات الحافة",
+        "shared-edge-groups": "مجموعات الحافة المشتركة",
+        "edge-group": "مجموعة الحافة",
+        "dashboard-groups": "مجموعات لوحة التحكم",
+        "shared-dashboard-groups": "مجموعات لوحة التحكم المشتركة",
+        "dashboard-group": "مجموعة لوحة التحكم",
+        "fetch-more": "جلب المزيد",
+        "column-type": {
+            "column-type": "نوع العمود",
+            "client-attribute": "صفة العميل",
+            "shared-attribute": "الصفة المشتركة",
+            "server-attribute": "صفة الخادم",
+            "timeseries": "سلسلة زمنية",
+            "entity-field": "حقل الكيان"
+        },
+        "column-type-required": "نوع العمود مطلوب.",
+        "entity-field": {
+            "created-time": "وقت الإنشاء",
+            "name": "الاسم",
+            "type": "النوع",
+            "device_profile": "ملف تعريف الجهاز",
+            "asset_profile": "ملف تعريف الأصول",
+            "assigned_customer": "العميل المعين",
+            "authority": "السلطة",
+            "first_name": "الاسم الأول",
+            "last_name": "الاسم الأخير",
+            "email": "البريد الإلكتروني",
+            "title": "اللقب",
+            "country": "البلد",
+            "state": "الولاية",
+            "city": "المدينة",
+            "address": "العنوان",
+            "address2": "العنوان 2",
+            "zip": "الرمز البريدي",
+            "phone": "الهاتف",
+            "label": "التسمية"
+        },
+        "sort-order": {
+            "asc": "تصاعدي",
+            "desc": "تنازلي",
+            "none": "لا شيء"
+        },
+        "details-mode": {
+            "on-row-click": "عند النقر على الصف",
+            "on-action-button-click": "عند النقر على زر التفاصيل",
+            "disabled": "معطل"
+        },
+        "change-owner": "تغيير المالك",
+        "select-target-owner": "اختر المالك الهدف",
+        "no-owners-matching": "لا يوجد مالكين يطابقون '{{owner}}'.",
+        "target-owner-required": "المالك الهدف مطلوب.",
+        "confirm-change-owner-title": "هل أنت متأكد أنك تريد تغيير المالك لـ { count, plural, =1 {1 كيان مختار} other {# كيانات مختارة} }؟",
+        "confirm-change-owner-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع الكيانات المحددة من المالك الحالي وسيتم وضعها في مجموعة 'الكل' للمالك الهدف.",
+        "add-to-group": "إضافة إلى المجموعة",
+        "move-to-group": "نقل إلى مجموعة",
+        "select-entity-group": "اختر مجموعة الكيان",
+        "no-entity-groups-matching": "لا توجد مجموعات كيان تطابق '{{entityGroup}}'.",
+        "create-new-entity-group": "إنشاء جديد!",
+        "target-entity-group-required": "مجموعة الكيان الهدف مطلوبة.",
+        "select-user-group": "اختر مجموعة المستخدم",
+        "no-user-groups-matching": "لا توجد مجموعات مستخدمين تطابق '{{entityGroup}}'.",
+        "target-user-group-required": "مجموعة المستخدم الهدف مطلوبة.",
+        "remove-from-group": "إزالة من المجموعة",
+        "group-table-title": "عنوان جدول المجموعة",
+        "enable-search": "تمكين بحث الكيانات",
+        "enable-add": "تمكين إضافة الكيانات",
+        "enable-delete": "تمكين حذف الكيانات",
+        "enable-selection": "تمكين تحديد الكيانات",
+        "enable-group-transfer": "تمكين إجراءات نقل المجموعة",
+        "display-pagination": "عرض الترقيم",
+        "default-page-size": "حجم الصفحة الافتراضي",
+        "enable-assignment-actions": "تمكين إجراءات التعيين",
+        "enable-credentials-management": "تمكين إدارة بيانات الاعتماد",
+        "enable-login-as-user": "تمكين تسجيل الدخول كمستخدم",
+        "enable-users-management": "تمكين إدارة المستخدمين",
+        "enable-customers-management": "تمكين إدارة العملاء",
+        "enable-assets-management": "تمكين إدارة الأصول",
+        "enable-devices-management": "تمكين إدارة الأجهزة",
+        "enable-entity-views-management": "تمكين إدارة عرض الكيانات",
+        "enable-edges-management": "تمكين إدارة الحواف",
+        "enable-dashboards-management": "تمكين إدارة لوحات التحكم",
+        "enable-scheduler-events-management": "تمكين إدارة أحداث المجدول",
+        "open-details-on": "فتح تفاصيل الكيان على",
+        "select-existing": "اختر مجموعة الكيان الحالية",
+        "create-new": "إنشاء مجموعة كيان جديدة",
+        "new-entity-group-name": "اسم مجموعة الكيان الجديدة",
+        "entity-group-list": "قائمة مجموعات الكيان",
+        "entity-group-list-empty": "لم يتم اختيار مجموعات الكيان.",
+        "name-starts-with": "اسم مجموعة الكيان يبدأ بـ",
+        "entity-group-name-filter-required": "مطلوب تصفية اسم مجموعة الكيان.",
+        "roles": "الأدوار",
+        "permissions": "الأذونات",
+        "public": "عام",
+        "entity-group-public": "مجموعة الكيان عامة",
+        "make-public": "جعل مجموعة الكيان عامة",
+        "make-private": "جعل مجموعة الكيان خاصة",
+        "make-public-entity-group-title": "هل أنت متأكد أنك تريد جعل مجموعة الكيان '{{entityGroupName}}' عامة؟",
+        "make-public-entity-group-text": "بعد التأكيد، سيتم جعل مجموعة الكيان وجميع كياناتها عامة ومتاحة للآخرين.",
+        "make-private-entity-group-title": "هل أنت متأكد أنك تريد جعل مجموعة الكيان '{{entityGroupName}}' خاصة؟",
+        "make-private-entity-group-text": "بعد التأكيد، سيتم جعل مجموعة الكيان وجميع كياناتها خاصة ولن تكون متاحة للآخرين.",
+        "share": "مشاركة مجموعة الكيان",
+        "copyId": "نسخ معرف مجموعة الكيان",
+        "idCopiedMessage": "تم نسخ معرف مجموعة الكيان إلى الحافظة",
+        "entity-group-name": "اسم مجموعة الكيان",
+        "all-users": "جميع المستخدمين",
+        "owner": "المالك",
+        "owner-required": "المالك مطلوب.",
+        "manage-owner-and-groups": "إدارة المالك والمجموعات",
+        "owner-and-groups": "المالك والمجموعات"
+    },
+    "entity-field": {
+        "created-time": "وقت الإنشاء",
+        "name": "الاسم",
+        "type": "النوع",
+        "first-name": "الاسم الأول",
+        "last-name": "اسم العائلة",
+        "email": "البريد الإلكتروني",
+        "title": "اللقب",
+        "country": "البلد",
+        "state": "الولاية",
+        "city": "المدينة",
+        "address": "العنوان",
+        "address2": "العنوان 2",
+        "zip": "الرمز البريدي",
+        "phone": "الهاتف",
+        "label": "التسمية",
+        "configuration": "التكوين",
+        "schedule": "الجدول",
+        "originatorId": "معرف المنشئ",
+        "originatorType": "نوع المنشئ"
+    },
+    "entity-view": {
+        "all": "الكل",
+        "all-entity-views": "جميع عرض الكيانات",
+        "groups": "المجموعات",
+        "shared": "مشترك",
+        "entity-view": "عرض الكيان",
+        "entity-view-required": "عرض الكيان مطلوب.",
+        "entity-views": "عرض الكيانات",
+        "management": "إدارة عرض الكيان",
+        "view-entity-views": "عرض عرض الكيانات",
+        "entity-view-alias": "اسم مستعار لعرض الكيان",
+        "aliases": "الأسماء المستعارة",
+        "no-alias-matching": "لم يتم العثور على '{{alias}}'.",
+        "no-aliases-found": "لم يتم العثور على أسماء مستعارة.",
+        "no-key-matching": "لم يتم العثور على '{{key}}'.",
+        "no-keys-found": "لم يتم العثور على مفاتيح.",
+        "create-new-alias": "إنشاء جديد!",
+        "create-new-key": "إنشاء جديد!",
+        "duplicate-alias-error": "تم العثور على اسم مستعار مكرر '{{alias}}'.<br> يجب أن تكون الأسماء المستعارة لعرض الكيان فريدة ضمن لوحة القيادة.",
+        "configure-alias": "تكوين '{{alias}}' الاسم المستعار",
+        "no-entity-views-matching": "لم يتم العثور على عرض كيانات يطابق '{{entity}}'.",
+        "public": "عام",
+        "alias": "الاسم المستعار",
+        "alias-required": "اسم مستعار لعرض الكيان مطلوب.",
+        "remove-alias": "إزالة الاسم المستعار لعرض الكيان",
+        "add-alias": "إضافة اسم مستعار لعرض الكيان",
+        "name-starts-with": "تعبير اسم عرض الكيان",
+        "help-text": "استخدم '%' حسب الحاجة: '%entity-view_name_contains%', '%entity-view_name_ends', 'entity-view_starts_with'.",
+        "entity-view-list": "قائمة عرض الكيان",
+        "use-entity-view-name-filter": "استخدم الفلتر",
+        "entity-view-list-empty": "لم يتم اختيار عرض الكيانات.",
+        "entity-view-name-filter-required": "مطلوب فلتر اسم عرض الكيان.",
+        "entity-view-name-filter-no-entity-view-matched": "لم يتم العثور على عرض كيانات يبدأ بـ '{{entityView}}'.",
+        "add": "إضافة عرض كيان",
+        "entity-view-public": "عرض الكيان عام",
+        "assign-to-customer": "تعيين للعميل",
+        "assign-entity-view-to-customer": "تعيين عرض الكيان(ات) للعميل",
+        "assign-entity-view-to-customer-text": "الرجاء تحديد عرض الكيانات لتعيينها للعميل",
+        "no-entity-views-text": "لم يتم العثور على عرض الكيانات",
+        "assign-to-customer-text": "الرجاء تحديد العميل لتعيين عرض الكيان(ات)",
+        "entity-view-details": "تفاصيل عرض الكيان",
+        "add-entity-view-text": "إضافة عرض كيان جديد",
+        "delete": "حذف عرض الكيان",
+        "assign-entity-views": "تعيين عرض الكيانات",
+        "assign-entity-views-text": "تعيين { count, plural, =1 {1 عرض كيان} other {# عرض الكيانات} } للعميل",
+        "delete-entity-views": "حذف عرض الكيانات",
+        "make-public": "جعل عرض الكيان عام",
+        "make-private": "جعل عرض الكيان خاص",
+        "unassign-from-customer": "إلغاء التعيين من العميل",
+        "unassign-entity-views": "إلغاء تعيين عرض الكيانات",
+        "unassign-entity-views-action-title": "إلغاء تعيين { count, plural, =1 {1 عرض كيان} other {# عرض الكيانات} } من العميل",
+        "assign-new-entity-view": "تعيين عرض كيان جديد",
+        "delete-entity-view-title": "هل أنت متأكد أنك تريد حذف عرض الكيان '{{entityViewName}}'؟",
+        "delete-entity-view-text": "كن حذرًا، بعد التأكيد سيتم حذف عرض الكيان وجميع البيانات المتعلقة به ولن يمكن استردادها.",
+        "delete-entity-views-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 عرض كيان} other {# عرض الكيانات} }؟",
+        "delete-entity-views-action-title": "حذف { count, plural, =1 {1 عرض كيان} other {# عرض الكيانات} }",
+        "delete-entity-views-text": "كن حذرًا، بعد التأكيد سيتم حذف جميع عرض الكيانات المحددة وجميع البيانات المتعلقة بها ولن يمكن استردادها.",
+        "make-public-entity-view-title": "هل أنت متأكد أنك تريد جعل عرض الكيان '{{entityViewName}}' عام؟",
+        "make-public-entity-view-text": "بعد التأكيد، سيتم جعل عرض الكيان وجميع بياناته عامة ومتاحة للآخرين.",
+        "make-private-entity-view-title": "هل أنت متأكد أنك تريد جعل عرض الكيان '{{entityViewName}}' خاص؟",
+        "make-private-entity-view-text": "بعد التأكيد، سيتم جعل عرض الكيان وجميع بياناته خاصة ولن تكون متاحة للآخرين.",
+        "unassign-entity-view-title": "هل أنت متأكد أنك تريد إلغاء تعيين عرض الكيان '{{entityViewName}}'؟",
+        "unassign-entity-view-text": "بعد التأكيد، سيتم إلغاء تعيين عرض الكيان ولن يكون متاحًا للعميل.",
+        "unassign-entity-view": "إلغاء تعيين عرض الكيان",
+        "unassign-entity-views-title": "هل أنت متأكد أنك تريد إلغاء تعيين { count, plural, =1 {1 عرض كيان} other {# عرض الكيانات} }؟",
+        "unassign-entity-views-text": "بعد التأكيد، سيتم إلغاء تعيين جميع عرض الكيانات المحددة ولن تكون متاحة للعميل.",
+        "entity-view-type": "نوع عرض الكيان",
+        "entity-view-type-required": "نوع عرض الكيان مطلوب.",
+        "select-entity-view-type": "حدد نوع عرض الكيان",
+        "enter-entity-view-type": "أدخل نوع عرض الكيان",
+        "any-entity-view": "أي عرض كيان",
+        "no-entity-view-types-matching": "لم يتم العثور على أنواع عرض كيان تطابق '{{entitySubtype}}'.",
+        "entity-view-type-list-empty": "لم يتم اختيار أنواع عرض الكيان.",
+        "entity-view-types": "أنواع عرض الكيان",
+        "created-time": "وقت الإنشاء",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256",
+        "type-max-length": "يجب أن يكون نوع عرض الكيان أقل من 256",
+        "description": "الوصف",
+        "events": "الأحداث",
+        "details": "التفاصيل",
+        "copyId": "نسخ معرف عرض الكيان",
+        "idCopiedMessage": "تم نسخ معرف عرض الكيان إلى الحافظة",
+        "assignedToCustomer": "معين للعميل",
+        "unable-entity-view-device-alias-title": "لا يمكن حذف اسم مستعار لعرض الكيان",
+        "unable-entity-view-device-alias-text": "لا يمكن حذف الاسم المستعار للجهاز '{{entityViewAlias}}' لأنه يستخدم بواسطة القطع التالية:<br/>{{widgetsList}}",
+        "select-entity-view": "حدد عرض الكيان",
+        "start-date": "تاريخ البدء",
+        "start-ts": "وقت البدء",
+        "end-date": "تاريخ الانتهاء",
+        "end-ts": "وقت الانتهاء",
+        "date-limits": "حدود التاريخ",
+        "client-attributes": "سمات العميل",
+        "shared-attributes": "سمات مشتركة",
+        "server-attributes": "سمات الخادم",
+        "timeseries": "السلاسل الزمنية",
+        "client-attributes-placeholder": "سمات العميل",
+        "shared-attributes-placeholder": "سمات مشتركة",
+        "server-attributes-placeholder": "سمات الخادم",
+        "timeseries-placeholder": "السلاسل الزمنية",
+        "target-entity": "الكيان الهدف",
+        "attributes-propagation": "انتشار السمات",
+        "attributes-propagation-hint": "سيقوم عرض الكيان تلقائيًا بنسخ السمات المحددة من الكيان الهدف في كل مرة تقوم فيها بحفظ أو تحديث هذا عرض الكيان. لأسباب تتعلق بالأداء، لا يتم انتشار سمات الكيان الهدف إلى عرض الكيان عند كل تغيير في السمة. يمكنك تمكين الانتشار التلقائي عن طريق تكوين عقدة قاعدة \"نسخ إلى العرض\" في سلسلة القواعد الخاصة بك وربط رسائل \"نشر السمات\" و\"تحديث السمات\" بعقدة القاعدة الجديدة.",
+        "timeseries-data": "بيانات السلاسل الزمنية",
+        "timeseries-data-hint": "تكوين مفاتيح بيانات السلاسل الزمنية للكيان الهدف التي ستكون متاحة لعرض الكيان. هذه البيانات للقراءة فقط.",
+        "select-group-to-add": "حدد المجموعة الهدف لإضافة عرض الكيانات المختارة",
+        "select-group-to-move": "حدد المجموعة الهدف لنقل عرض الكيانات المختارة",
+        "remove-entity-views-from-group": "هل أنت متأكد أنك تريد إزالة { count, plural, =1 {1 عرض كيان} other {# عرض الكيانات} } من المجموعة '{{entityGroup}}'؟",
+        "group": "مجموعة عرض الكيانات",
+        "list-of-groups": "{ count, plural, =1 {مجموعة عرض كيان واحدة} other {قائمة مجموعات عرض الكيانات #} }",
+        "group-name-starts-with": "مجموعات عرض الكيانات التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "search": "بحث في عرض الكيانات",
+        "selected-entity-views": "{ count, plural, =1 {1 عرض كيان} other {# عرض الكيانات} } محدد",
+        "assign-entity-view-to-edge": "تعيين عرض الكيان(ات) للحافة",
+        "assign-entity-view-to-edge-text": "الرجاء تحديد عرض الكيانات لتعيينها للحافة",
+        "unassign-entity-view-from-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين عرض الكيان '{{entityViewName}}'؟",
+        "unassign-entity-view-from-edge-text": "بعد التأكيد، سيتم إلغاء تعيين عرض الكيان ولن يكون متاحًا للحافة.",
+        "unassign-entity-views-from-edge-action-title": "إلغاء تعيين { count, plural, =1 {1 عرض كيان} other {# عرض الكيانات} } من الحافة",
+        "unassign-entity-view-from-edge": "إلغاء تعيين عرض الكيان",
+        "unassign-entity-views-from-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين { count, plural, =1 {1 عرض كيان} other {# عرض الكيانات} }؟",
+        "unassign-entity-views-from-edge-text": "بعد التأكيد، سيتم إلغاء تعيين جميع عرض الكيانات المحددة ولن تكون متاحة للحافة."
+    },
+    "event": {
+        "events": "الأحداث",
+        "event-type": "نوع الحدث",
+        "events-filter": "تصفية الأحداث",
+        "clean-events": "مسح الأحداث",
+        "type-error": "خطأ",
+        "type-lc-event": "حدث الدورة الحياة",
+        "type-stats": "إحصائيات",
+        "type-debug-converter": "تصحيح",
+        "type-debug-integration": "تصحيح",
+        "type-debug-rule-node": "تصحيح",
+        "type-debug-rule-chain": "تصحيح",
+        "no-events-prompt": "لم يتم العثور على أحداث",
+        "error": "خطأ",
+        "alarm": "إنذار",
+        "event-time": "وقت الحدث",
+        "server": "الخادم",
+        "body": "الجسم",
+        "method": "الطريقة",
+        "type": "النوع",
+        "in": "داخل",
+        "out": "خارج",
+        "metadata": "البيانات الوصفية",
+        "message": "الرسالة",
+        "entity": "الكيان",
+        "message-id": "معرف الرسالة",
+        "copy-message-id": "نسخ معرف الرسالة",
+        "message-type": "نوع الرسالة",
+        "data-type": "نوع البيانات",
+        "relation-type": "نوع العلاقة",
+        "data": "البيانات",
+        "event": "الحدث",
+        "status": "الحالة",
+        "success": "نجاح",
+        "failed": "فشل",
+        "messages-processed": "الرسائل المعالجة",
+        "max-messages-processed": "أقصى عدد للرسائل المعالجة",
+        "min-messages-processed": "الحد الأدنى للرسائل المعالجة",
+        "errors-occurred": "الأخطاء المحدثة",
+        "max-errors-occurred": "أقصى عدد للأخطاء المحدثة",
+        "min-errors-occurred": "الحد الأدنى للأخطاء المحدثة",
+        "min-value": "القيمة الدنيا هي 0.",
+        "all-events": "الكل",
+        "has-error": "يحتوي على خطأ",
+        "entity-id": "معرف الكيان",
+        "copy-entity-id": "نسخ معرف الكيان",
+        "entity-type": "نوع الكيان",
+        "clear-filter": "مسح التصفية",
+        "clear-request-title": "مسح كافة الأحداث",
+        "clear-request-text": "هل أنت متأكد أنك تريد مسح كافة الأحداث؟",
+        "started": "بدأت",
+        "updated": "تم التحديث",
+        "stopped": "توقفت"
+    },
+    "extension": {
+        "extensions": "الامتدادات",
+        "selected-extensions": "{ count, plural, =1 {1 امتداد} other {# امتدادات} } محددة",
+        "type": "النوع",
+        "key": "المفتاح",
+        "value": "القيمة",
+        "id": "المعرف",
+        "extension-id": "معرف الامتداد",
+        "extension-type": "نوع الامتداد",
+        "transformer-json": "JSON *",
+        "unique-id-required": "معرف الامتداد الحالي موجود بالفعل.",
+        "delete": "حذف الامتداد",
+        "add": "إضافة امتداد",
+        "edit": "تعديل الامتداد",
+        "view": "عرض الامتداد",
+        "delete-extension-title": "هل أنت متأكد أنك تريد حذف الامتداد '{{extensionId}}'؟",
+        "delete-extension-text": "كن حذرًا، بعد التأكيد سيصبح الامتداد وجميع البيانات ذات الصلة غير قابلة للاسترداد.",
+        "delete-extensions-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 امتداد} other {# امتدادات} }؟",
+        "delete-extensions-text": "كن حذرًا، بعد التأكيد سيتم إزالة كافة الامتدادات المحددة.",
+        "converters": "محولات",
+        "converter-id": "معرف المحول",
+        "configuration": "التكوين",
+        "converter-configurations": "تكوينات المحول",
+        "token": "رمز الأمان",
+        "add-converter": "إضافة محول",
+        "add-config": "إضافة تكوين المحول",
+        "device-name-expression": "تعبير اسم الجهاز",
+        "device-type-expression": "تعبير نوع الجهاز",
+        "custom": "مخصص",
+        "to-double": "إلى عدد عشري",
+        "transformer": "محول",
+        "json-required": "مطلوب JSON المحول.",
+        "json-parse": "غير قادر على تحليل JSON المحول.",
+        "attributes": "السمات",
+        "add-attribute": "إضافة سمة",
+        "add-map": "إضافة عنصر تخطيط",
+        "timeseries": "سلاسل زمنية",
+        "add-timeseries": "إضافة سلسلة زمنية",
+        "field-required": "الحقل مطلوب",
+        "brokers": "وسطاء",
+        "add-broker": "إضافة وسيط",
+        "host": "المضيف",
+        "port": "المنفذ",
+        "port-range": "يجب أن يكون المنفذ في نطاق من 1 إلى 65535.",
+        "ssl": "SSL",
+        "credentials": "بيانات الاعتماد",
+        "username": "اسم المستخدم",
+        "password": "كلمة المرور",
+        "retry-interval": "فترة إعادة المحاولة بالميللي ثانية",
+        "sas": "التوقيع المشترك للوصول",
+        "anonymous": "مجهول",
+        "basic": "أساسي",
+        "pem": "PEM",
+        "ca-cert": "ملف شهادة السلطة الشهادة *",
+        "private-key": "ملف المفتاح الخاص *",
+        "cert": "ملف الشهادة *",
+        "no-file": "لم يتم تحديد ملف.",
+        "drop-file": "إسقاط ملف أو انقر لتحديد ملف للتحميل.",
+        "mapping": "تعيين",
+        "topic-filter": "مرشح الموضوع",
+        "converter-type": "نوع المحول",
+        "converter-json": "Json",
+        "json-name-expression": "تعبير JSON اسم الجهاز",
+        "topic-name-expression": "تعبير موضوع اسم الجهاز",
+        "json-type-expression": "تعبير JSON نوع الجهاز",
+        "topic-type-expression": "تعبير موضوع نوع الجهاز",
+        "attribute-key-expression": "تعبير مفتاح السمة",
+        "attr-json-key-expression": "تعبير JSON مفتاح السمة",
+        "attr-topic-key-expression": "تعبير موضوع مفتاح السمة",
+        "request-id-expression": "تعبير معرف الطلب",
+        "request-id-json-expression": "تعبير JSON معرف الطلب",
+        "request-id-topic-expression": "تعبير موضوع معرف الطلب",
+        "response-topic-expression": "تعبير موضوع الرد",
+        "value-expression": "تعبير القيمة",
+        "topic": "الموضوع",
+        "timeout": "مهلة زمنية بالميللي ثانية",
+        "converter-json-required": "مطلوب JSON المحول.",
+        "converter-json-parse": "غير قادر على تحليل JSON المحول.",
+        "filter-expression": "تعبير التصفية",
+        "connect-requests": "طلبات الاتصال",
+        "add-connect-request": "إضافة طلب اتصال",
+        "disconnect-requests": "طلبات الافصال",
+        "add-disconnect-request": "إضافة طلب فصل",
+        "attribute-requests": "طلبات السمة",
+        "add-attribute-request": "إضافة طلب سمة",
+        "attribute-updates": "تحديثات السمة",
+        "add-attribute-update": "إضافة تحديث سمة",
+        "server-side-rpc": "الخادم جانب إجراءات الاتصال البعيد",
+        "add-server-side-rpc-request": "إضافة طلب جانب الخادم",
+        "device-name-filter": "مرشح اسم الجهاز",
+        "attribute-filter": "مرشح السمة",
+        "method-filter": "مرشح الطريقة",
+        "request-topic-expression": "تعبير موضوع الطلب",
+        "response-timeout": "مهلة الاستجابة بالميللي ثانية",
+        "topic-expression": "تعبير الموضوع",
+        "client-scope": "نطاق العميل",
+        "add-device": "إضافة جهاز",
+        "opc-server": "الخوادم",
+        "opc-add-server": "إضافة خادم",
+        "opc-add-server-prompt": "يرجى إضافة خادم",
+        "opc-application-name": "اسم التطبيق",
+        "opc-application-uri": "معرف التطبيق",
+        "opc-scan-period-in-seconds": "فترة المسح بالثواني",
+        "opc-security": "الأمان",
+        "opc-identity": "الهوية",
+        "opc-keystore": "متجر المفاتيح",
+        "opc-type": "النوع",
+        "opc-keystore-type": "النوع",
+        "opc-keystore-location": "الموقع *",
+        "opc-keystore-password": "كلمة المرور",
+        "opc-keystore-alias": "الاسم المستعار",
+        "opc-keystore-key-password": "كلمة مرور المفتاح",
+        "opc-device-node-pattern": "نمط عقدة الجهاز",
+        "opc-device-name-pattern": "نمط اسم الجهاز",
+        "modbus-server": "الخوادم / العبيد",
+        "modbus-add-server": "إضافة خادم / عبد",
+        "modbus-add-server-prompt": "يرجى إضافة خادم / عبد",
+        "modbus-transport": "النقل",
+        "modbus-tcp-reconnect": "إعادة الاتصال تلقائيًا",
+        "modbus-rtu-over-tcp": "RTU عبر TCP",
+        "modbus-port-name": "اسم المنفذ التسلسلي",
+        "modbus-encoding": "الترميز",
+        "modbus-parity": "الزوجية",
+        "modbus-baudrate": "معدل الباود",
+        "modbus-databits": "بتات البيانات",
+        "modbus-stopbits": "بتات التوقف",
+        "modbus-databits-range": "يجب أن تكون بتات البيانات في نطاق من 7 إلى 8.",
+        "modbus-stopbits-range": "يجب أن تكون بتات التوقف في نطاق من 1 إلى 2.",
+        "modbus-unit-id": "معرف الوحدة",
+        "modbus-unit-id-range": "يجب أن يكون معرف الوحدة في نطاق من 1 إلى 247.",
+        "modbus-device-name": "اسم الجهاز",
+        "modbus-poll-period": "فترة الاستطلاع (مللي ثانية)",
+        "modbus-attributes-poll-period": "فترة الاستطلاع للسمات (مللي ثانية)",
+        "modbus-timeseries-poll-period": "فترة الاستطلاع لسلاسل الزمنية (مللي ثانية)",
+        "modbus-poll-period-range": "يجب أن تكون فترة الاستطلاع قيمة إيجابية.",
+        "modbus-tag": "علامة",
+        "modbus-function": "الوظيفة",
+        "modbus-register-address": "عنوان التسجيل",
+        "modbus-register-address-range": "يجب أن يكون عنوان التسجيل في نطاق من 0 إلى 65535.",
+        "modbus-register-bit-index": "مؤشر البت التسجيل",
+        "modbus-register-bit-index-range": "يجب أن يكون مؤشر البت في نطاق من 0 إلى 15.",
+        "modbus-register-count": "عدد التسجيل",
+        "modbus-register-count-range": "يجب أن يكون عدد التسجيل قيمة إيجابية.",
+        "modbus-byte-order": "ترتيب البايت",
+        "sync": {
+            "status": "الحالة",
+            "sync": "مزامنة",
+            "not-sync": "غير متزامن",
+            "last-sync-time": "وقت آخر مزامنة",
+            "not-available": "غير متاح"
+        },
+        "export-extensions-configuration": "تصدير تكوينات التمديدات",
+        "import-extensions-configuration": "استيراد تكوينات التمديدات",
+        "import-extensions": "استيراد التمديدات",
+        "import-extension": "استيراد التمديد",
+        "export-extension": "تصدير التمديد",
+        "file": "ملف التمديدات",
+        "invalid-file-error": "ملف تمديد غير صالح",
+        "text": "نص",
+        "json": "JSON",
+        "binary": "ثنائي",
+        "hex": "سداسي عشري"
+    },
+    "feature": {
+        "advanced-features": "ميزات متقدمة"
+    },
+    "filter": {
+        "add": "إضافة فلتر",
+        "edit": "تعديل الفلتر",
+        "name": "اسم الفلتر",
+        "name-required": "اسم الفلتر مطلوب.",
+        "duplicate-filter": "الفلتر بنفس الاسم موجود بالفعل.",
+        "filters": "الفلاتر",
+        "unable-delete-filter-title": "غير قادر على حذف الفلتر",
+        "unable-delete-filter-text": "لا يمكن حذف الفلتر '{{filter}}' لأنه يتم استخدامه من قبل العناصر التالية:<br/>{{widgetsList}}",
+        "duplicate-filter-error": "تم العثور على فلتر مكرر '{{filter}}'.<br>يجب أن تكون الفلاتر فريدة ضمن لوحة القيادة.",
+        "missing-key-filters-error": "الفلاتر المفتاحية مفقودة للفلتر '{{filter}}'.",
+        "filter": "فلتر",
+        "editable": "قابل للتحرير",
+        "no-filters-found": "لم يتم العثور على فلاتر.",
+        "no-filter-text": "لم يتم تحديد فلتر",
+        "add-filter-prompt": "يرجى إضافة فلتر",
+        "no-filter-matching": "لم يتم العثور على '{{filter}}'.",
+        "create-new-filter": "أنشئ واحدًا جديدًا!",
+        "create-new": "إنشاء جديد",
+        "filter-required": "الفلتر مطلوب.",
+        "operation": {
+            "operation": "العملية",
+            "equal": "متساوي",
+            "not-equal": "غير متساوي",
+            "starts-with": "يبدأ بـ",
+            "ends-with": "ينتهي بـ",
+            "contains": "يحتوي على",
+            "not-contains": "لا يحتوي على",
+            "greater": "أكبر من",
+            "less": "أقل من",
+            "greater-or-equal": "أكبر من أو يساوي",
+            "less-or-equal": "أقل من أو يساوي",
+            "and": "و",
+            "or": "أو",
+            "in": "في",
+            "not-in": "ليس في"
+        },
+        "ignore-case": "تجاهل الحالة",
+        "value": "القيمة",
+        "remove-filter": "إزالة الفلتر",
+        "duplicate-filter-action": "تكرار الفلتر",
+        "preview": "معاينة الفلتر",
+        "no-filters": "لم يتم تكوين أي فلاتر",
+        "add-filter": "إضافة فلتر",
+        "add-complex-filter": "إضافة فلتر معقد",
+        "add-complex": "إضافة معقدة",
+        "complex-filter": "فلتر معقد",
+        "edit-complex-filter": "تحرير الفلتر المعقد",
+        "edit-filter-user-params": "تعديل معلمات مستخدم الفلتر الفعلي",
+        "filter-user-params": "معلمات مستخدم الفلتر الفعلي",
+        "user-parameters": "معلمات المستخدم",
+        "display-label": "تسمية للعرض",
+        "autogenerated-label": "إنشاء تسمية تلقائية",
+        "order-priority": "أولوية ترتيب الحقل",
+        "key-filter": "فلتر المفتاح",
+        "key-filters": "فلاتر المفاتيح",
+        "key-name": "اسم المفتاح",
+        "key-name-required": "اسم المفتاح مطلوب.",
+        "key-type": {
+            "key-type": "نوع المفتاح",
+            "attribute": "سمة",
+            "timeseries": "سلاسل زمنية",
+            "entity-field": "حقل الكيان",
+            "constant": "ثابت",
+            "client-attribute": "سمة العميل",
+            "server-attribute": "سمة الخادم",
+            "shared-attribute": "سمة مشتركة"
+        },
+        "value-type": {
+            "value-type": "نوع القيمة",
+            "string": "سلسلة",
+            "numeric": "رقمي",
+            "boolean": "منطقي",
+            "date-time": "تاريخ ووقت"
+        },
+        "value-type-required": "نوع قيمة المفتاح مطلوب.",
+        "key-value-type-change-title": "هل أنت متأكد أنك تريد تغيير نوع قيمة المفتاح؟",
+        "key-value-type-change-message": "إذا قمت بتأكيد نوع القيمة الجديدة، سيتم إزالة جميع فلاتر المفتاح المدخلة.",
+        "no-key-filters": "لم يتم تكوين أي فلاتر مفتاح.",
+        "add-key-filter": "إضافة فلتر مفتاح",
+        "remove-key-filter": "إزالة فلتر المفتاح",
+        "edit-key-filter": "تعديل فلتر المفتاح",
+        "date": "تاريخ",
+        "time": "وقت",
+        "current-tenant": "المستأجر الحالي",
+        "current-customer": "العميل الحالي",
+        "current-user": "المستخدم الحالي",
+        "current-device": "الجهاز الحالي",
+        "default-value": "القيمة الافتراضية",
+        "dynamic-source-type": "نوع مصدر القيمة الديناميكية",
+        "dynamic-value": "القيمة الديناميكية",
+        "no-dynamic-value": "لا توجد قيمة ديناميكية",
+        "source-attribute": "سمة المصدر",
+        "switch-to-dynamic-value": "التبديل إلى القيمة الديناميكية",
+        "switch-to-default-value": "التبديل إلى القيمة الافتراضية",
+        "inherit-owner": "الميراث من المالك",
+        "source-attribute-not-set": "إذا لم يتم تعيين سمة المصدر"
+    },
+    "fullscreen": {
+        "expand": "توسيع إلى وضع ملء الشاشة",
+        "exit": "الخروج من وضع ملء الشاشة",
+        "toggle": "تبديل وضع ملء الشاشة",
+        "fullscreen": "ملء الشاشة"
+    },
+    "function": {
+        "function": "الوظيفة"
+    },
+    "gateway": {
+        "add-entry": "إضافة تكوين",
+        "advanced": "متقدم",
+        "checking-device-activity": "فحص نشاط الجهاز",
+        "command": "أوامر Docker",
+        "command-copied-message": "تم نسخ أمر Docker إلى الحافظة",
+        "configuration": "التكوين",
+        "connector-add": "إضافة موصل جديد",
+        "connector-enabled": "تمكين الموصل",
+        "connector-name": "اسم الموصل",
+        "connector-name-required": "اسم الموصل مطلوب.",
+        "connector-type": "نوع الموصل",
+        "connector-type-required": "نوع الموصل مطلوب.",
+        "connectors": "الموصلات",
+        "connectors-config": "تكوينات الموصلات",
+        "connectors-table-enabled": "ممكّن",
+        "connectors-table-name": "الاسم",
+        "connectors-table-type": "النوع",
+        "connectors-table-status": "الحالة",
+        "connectors-table-actions": "الإجراءات",
+        "connectors-table-key": "المفتاح",
+        "connectors-table-class": "الفئة",
+        "rpc-command-send": "إرسال",
+        "rpc-command-result": "الاستجابة",
+        "rpc-command-edit-params": "تحرير المعلمات",
+        "gateway-configuration": "تكوين عام",
+        "docker-label": "استخدم التعليمات التالية لتشغيل IoT Gateway في Docker compose مع بيانات اعتماد للجهاز المحدد",
+        "install-docker-compose": "استخدم التعليمات لتنزيل وتثبيت وإعداد docker compose",
+        "download-configuration-file": "تنزيل ملف التكوين",
+        "download-docker-compose": "تنزيل docker-compose.yml لبوابتك",
+        "launch-gateway": "تشغيل البوابة",
+        "launch-docker-compose": "بدء تشغيل البوابة باستخدام الأمر التالي في الطرفية من المجلد الذي يحتوي على ملف docker-compose.yml",
+        "create-new-gateway": "إنشاء بوابة جديدة",
+        "create-new-gateway-text": "هل أنت متأكد أنك تريد إنشاء بوابة جديدة باسم: '{{gatewayName}}'؟",
+        "created-time": "وقت الإنشاء",
+        "configuration-delete-dialog-header": "سيتم حذف التكوينات",
+        "configuration-delete-dialog-body": "يمكن تعطيل التكوين عن بُعد فقط إذا كان هناك وصول جسدي إلى البوابة. ستتم حذف جميع التكوينات السابقة.<br><br> \n لتعطيل التكوين، أدخل اسم البوابة أدناه",
+        "configuration-delete-dialog-input": "اسم البوابة",
+        "configuration-delete-dialog-input-required": "اسم البوابة إلزامي",
+        "configuration-delete-dialog-confirm": "إيقاف التشغيل",
+        "delete": "حذف التكوين",
+        "download-tip": "تنزيل ملف التكوين",
+        "drop-file": "أفلق الملف هنا أو",
+        "gateway": "البوابة",
+        "gateway-exists": "الجهاز بنفس الاسم موجود بالفعل.",
+        "gateway-name": "اسم البوابة",
+        "gateway-name-required": "اسم البوابة مطلوب.",
+        "gateway-saved": "تم حفظ تكوين البوابة بنجاح.",
+        "grpc": "GRPC",
+        "grpc-keep-alive-timeout": "مهلة البقاء على قيد الحياة (بالمللي ثانية)",
+        "grpc-keep-alive-timeout-required": "مهلة البقاء على قيد الحياة مطلوبة",
+        "grpc-keep-alive-timeout-min": "مهلة البقاء على قيد الحياة لا يمكن أن تكون أقل من 1",
+        "grpc-keep-alive-timeout-pattern": "مهلة البقاء على قيد الحياة غير صالحة",
+        "grpc-keep-alive": "البقاء على قيد الحياة (بالمللي ثانية)",
+        "grpc-keep-alive-required": "البقاء على قيد الحياة مطلوب",
+        "grpc-keep-alive-min": "البقاء على قيد الحياة لا يمكن أن يكون أقل من 1",
+        "grpc-keep-alive-pattern": "البقاء على قيد الحياة غير صالح",
+        "grpc-min-time-between-pings": "الحد الأدنى للوقت بين البينغات (بالمللي ثانية)",
+        "grpc-min-time-between-pings-required": "الحد الأدنى للوقت بين البينغات مطلوب",
+        "grpc-min-time-between-pings-min": "الحد الأدنى للوقت بين البينغات لا يمكن أن يكون أقل من 1",
+        "grpc-min-time-between-pings-pattern": "الحد الأدنى للوقت بين البينغات غير صالح",
+        "grpc-min-ping-interval-without-data": "الحد الأدنى لفاصل البينغ بدون بيانات (بالمللي ثانية)",
+        "grpc-min-ping-interval-without-data-required": "الحد الأدنى لفاصل البينغ بدون بيانات مطلوب",
+        "grpc-min-ping-interval-without-data-min": "الحد الأدنى لفاصل البينغ بدون بيانات لا يمكن أن يكون أقل من 1",
+        "grpc-min-ping-interval-without-data-pattern": "الحد الأدنى لفاصل البينغ بدون بيانات غير صالح",
+        "grpc-max-pings-without-data": "الحد الأقصى لعدد البينغات بدون بيانات",
+        "grpc-max-pings-without-data-required": "الحد الأقصى لعدد البينغات بدون بيانات مطلوب",
+        "grpc-max-pings-without-data-min": "الحد الأقصى لعدد البينغات بدون بيانات لا يمكن أن يكون أقل من 1",
+        "grpc-max-pings-without-data-pattern": "الحد الأقصى لعدد البينغات بدون بيانات غير صالح",
+        "inactivity-check-period-seconds": "فترة فحص الخمول (بالثواني)",
+        "inactivity-check-period-seconds-required": "فترة فحص الخمول مطلوبة",
+        "inactivity-check-period-seconds-min": "فترة فحص الخمول لا يمكن أن تكون أقل من 1",
+        "inactivity-check-period-seconds-pattern": "فترة فحص الخمول غير صالحة",
+        "inactivity-timeout-seconds": "فترة الخمول (بالثواني)",
+        "inactivity-timeout-seconds-required": "فترة الخمول مطلوبة",
+        "inactivity-timeout-seconds-min": "فترة الخمول لا يمكن أن تكون أقل من 1",
+        "inactivity-timeout-seconds-pattern": "فترة الخمول غير صالحة",
+        "json-parse": "JSON غير صالح.",
+        "json-required": "الحقل لا يمكن أن يكون فارغًا.",
+        "logs": {
+            "logs": "السجلات",
+            "days": "أيام",
+            "hours": "ساعات",
+            "minutes": "دقائق",
+            "seconds": "ثواني",
+            "date-format": "تنسيق التاريخ",
+            "date-format-required": "تنسيق التاريخ مطلوب",
+            "log-format": "تنسيق السجل",
+            "log-type": "نوع السجل",
+            "log-format-required": "تنسيق السجل مطلوب",
+            "remote": "التسجيل عن بُعد",
+            "remote-logs": "السجلات عن بُعد",
+            "local": "التسجيل المحلي",
+            "level": "مستوى السجل",
+            "file-path": "مسار الملف",
+            "file-path-required": "مسار الملف مطلوب",
+            "saving-period": "فترة حفظ السجل",
+            "saving-period-min": "فترة حفظ السجل لا يمكن أن تكون أقل من 1",
+            "saving-period-required": "فترة حفظ السجل مطلوبة",
+            "backup-count": "عدد النسخ الاحتياطية",
+            "backup-count-min": "عدد النسخ الاحتياطية لا يمكن أن يكون أقل من 1",
+            "backup-count-required": "عدد النسخ الاحتياطية مطلوب"
+        },
+        "min-pack-send-delay": "الحد الأدنى لتأخير إرسال الحزمة (بالمللي ثانية)",
+        "min-pack-send-delay-required": "الحد الأدنى لتأخير إرسال الحزمة مطلوب",
+        "min-pack-send-delay-min": "لا يمكن أن يكون الحد الأدنى لتأخير إرسال الحزمة أقل من 0",
+        "no-connectors": "لا توجد موصلات",
+        "no-data": "لا توجد تكوينات",
+        "no-gateway-found": "لم يتم العثور على بوابة.",
+        "no-gateway-matching": "'{{item}}' غير موجود.",
+        "path-logs": "مسار إلى ملفات السجل",
+        "path-logs-required": "المسار مطلوب.",
+        "permit-without-calls": "البقاء على الحياة يسمح بدون مكالمات",
+        "remote": "التكوين عن بُعد",
+        "remote-logging-level": "مستوى التسجيل",
+        "remove-entry": "إزالة التكوين",
+        "remote-shell": "قشرة عن بُعد",
+        "remote-configuration": "التكوين عن بُعد",
+        "other": "آخر",
+        "save-tip": "حفظ ملف التكوين",
+        "security-type": "نوع الأمان",
+        "security-types": {
+            "access-token": "رمز الوصول",
+            "username-password": "اسم المستخدم وكلمة المرور",
+            "tls": "TLS",
+            "tls-access-token": "TLS + رمز الوصول",
+            "tls-private-key": "TLS + المفتاح الخاص"
+        },
+        "server-port": "منفذ الخادم",
+        "statistics": {
+            "statistic": "إحصائية",
+            "statistics": "الإحصائيات",
+            "statistic-commands-empty": "لا تتوفر إحصائيات",
+            "commands": "الأوامر",
+            "send-period": "فترة إرسال الإحصائيات (بالثواني)",
+            "send-period-required": "فترة إرسال الإحصائيات مطلوبة",
+            "send-period-min": "لا يمكن أن تكون فترة إرسال الإحصائيات أقل من 60",
+            "send-period-pattern": "فترة إرسال الإحصائيات غير صالحة",
+            "check-connectors-configuration": "فترة فحص تكوين الموصلات (بالثواني)",
+            "check-connectors-configuration-required": "فترة فحص تكوين الموصلات مطلوبة",
+            "check-connectors-configuration-min": "لا يمكن أن تكون فترة فحص تكوين الموصلات أقل من 1",
+            "check-connectors-configuration-pattern": "فترة فحص تكوين الموصلات غير صالحة",
+            "add": "إضافة أمر",
+            "timeout": "المهلة",
+            "timeout-ms": "المهلة (بالمللي ثانية)",
+            "timeout-required": "المهلة مطلوبة",
+            "timeout-min": "لا يمكن أن تكون المهلة أقل من 1",
+            "timeout-pattern": "المهلة غير صالحة",
+            "attribute-name": "اسم السمة",
+            "attribute-name-required": "اسم السمة مطلوب",
+            "command": "الأمر",
+            "command-required": "الأمر مطلوب",
+            "command-pattern": "الأمر غير صالح",
+            "remove": "إزالة الأمر"
+        },
+        "storage": "التخزين",
+        "storage-max-file-records": "السجلات القصوى في الملف",
+        "storage-max-files": "الحد الأقصى لعدد الملفات",
+        "storage-max-files-min": "الحد الأدنى هو 1.",
+        "storage-max-files-pattern": "العدد غير صالح.",
+        "storage-max-files-required": "العدد مطلوب.",
+        "storage-max-records": "السجلات القصوى في التخزين",
+        "storage-max-records-min": "الحد الأدنى لعدد السجلات هو 1.",
+        "storage-max-records-pattern": "العدد غير صالح.",
+        "storage-max-records-required": "السجلات القصوى مطلوبة.",
+        "storage-read-record-count": "عدد قراءة السجلات في التخزين",
+        "storage-read-record-count-min": "الحد الأدنى لعدد السجلات هو 1.",
+        "storage-read-record-count-pattern": "العدد غير صالح.",
+        "storage-read-record-count-required": "عدد قراءة السجلات مطلوب.",
+        "storage-max-read-record-count": "الحد الأقصى لعدد قراءة السجلات في التخزين",
+        "storage-max-read-record-count-min": "الحد الأدنى لعدد السجلات هو 1.",
+        "storage-max-read-record-count-pattern": "العدد غير صالح.",
+        "storage-max-read-record-count-required": "عدد القراءة القصوى مطلوب.",
+        "storage-data-folder-path": "مسار مجلد البيانات",
+        "storage-data-folder-path-required": "مسار مجلد البيانات مطلوب.",
+        "storage-pack-size": "الحد الأقصى لحجم حزمة الحدث",
+        "storage-pack-size-min": "الحد الأدنى هو 1.",
+        "storage-pack-size-pattern": "العدد غير صالح.",
+        "storage-pack-size-required": "الحجم الأقصى لحزمة الحدث مطلوب.",
+        "storage-path": "مسار التخزين",
+        "storage-path-required": "مسار التخزين مطلوب.",
+        "storage-type": "نوع التخزين",
+        "storage-types": {
+            "file-storage": "تخزين الملفات",
+            "memory-storage": "تخزين الذاكرة",
+            "sqlite": "SQLITE"
+        },
+        "thingsboard": "ثينغزبورد",
+        "general": "عام",
+        "thingsboard-host": "مضيف ثينغزبورد",
+        "thingsboard-host-required": "المضيف مطلوب.",
+        "thingsboard-port": "منفذ ثينغزبورد",
+        "thingsboard-port-max": "الحد الأقصى لرقم المنفذ هو 65535.",
+        "thingsboard-port-min": "الحد الأدنى لرقم المنفذ هو 1.",
+        "thingsboard-port-pattern": "المنفذ غير صالح.",
+        "thingsboard-port-required": "المنفذ مطلوب.",
+        "tidy": "ترتيب",
+        "tidy-tip": "ترتيب تكوين JSON",
+        "title-connectors-json": "تكوين موصل {{typeName}}",
+        "tls-path-ca-certificate": "المسار إلى شهادة CA على البوابة",
+        "tls-path-client-certificate": "المسار إلى شهادة العميل على البوابة",
+        "messages-ttl-check-in-hours": "فحص TTL الرسائل بالساعات",
+        "messages-ttl-check-in-hours-required": "يجب تحديد فحص TTL الرسائل بالساعات.",
+        "messages-ttl-check-in-hours-min": "الحد الأدنى هو 1.",
+        "messages-ttl-check-in-hours-pattern": "الرقم غير صالح.",
+        "messages-ttl-in-days": "TTL الرسائل بالأيام",
+        "messages-ttl-in-days-required": "يجب تحديد TTL الرسائل بالأيام.",
+        "messages-ttl-in-days-min": "الحد الأدنى هو 1.",
+        "messages-ttl-in-days-pattern": "الرقم غير صالح.",
+        "mqtt-qos": "جودة الخدمة (QoS)",
+        "mqtt-qos-required": "جودة الخدمة (QoS) مطلوبة",
+        "mqtt-qos-range": "تتراوح قيم جودة الخدمة (QoS) من 0 إلى 1",
+        "tls-path-private-key": "المسار إلى المفتاح الخاص على البوابة",
+        "toggle-fullscreen": "تبديل وضع ملء الشاشة",
+        "transformer-json-config": "تكوين JSON*",
+        "update-config": "إضافة/تحديث تكوين JSON",
+        "hints": {
+            "remote-configuration": "يمكنك تمكين التكوين وإدارة البوابة عن بُعد",
+            "remote-shell": "يمكنك تمكين التحكم البعيد في نظام التشغيل مع البوابة من عنصر واجهة المستخدم قشرة عن بُعد",
+            "host": "اسم المضيف أو عنوان IP لخادم ثينغزبورد",
+            "port": "منفذ خدمة MQTT على خادم ثينغزبورد",
+            "token": "رمز الوصول للبوابة من خادم ثينغزبورد",
+            "client-id": "معرف عميل MQTT للبوابة من خادم ثينغزبورد",
+            "username": "اسم المستخدم MQTT للبوابة من خادم ثينغزبورد",
+            "password": "كلمة المرور MQTT للبوابة من خادم ثينغزبورد",
+            "ca-cert": "المسار إلى ملف شهادة CA",
+            "date-form": "تنسيق التاريخ في رسالة السجل",
+            "data-folder": "المسار إلى المجلد الذي سيحتوي على البيانات (نسبي أو مطلق)",
+            "log-format": "تنسيق رسالة السجل",
+            "remote-log": "يمكنك تمكين التسجيل البعيد وقراءة السجلات من البوابة",
+            "backup-count": "إذا كان عدد النسخ الاحتياطية > 0، عند عملية تدوير، لا يتم الاحتفاظ بأكثر من عدد النسخ الاحتياطية المحددة - يتم حذف الأقدم",
+            "storage": "يوفر تكوينًا لحفظ البيانات الواردة قبل إرسالها إلى المنصة",
+            "max-file-count": "العدد الأقصى لعدد الملفات التي سيتم إنشاؤها",
+            "max-read-count": "عدد الرسائل للحصول عليها من التخزين وإرسالها إلى ثينغزبورد",
+            "max-records": "العدد الأقصى للسجلات التي ستخزن في ملف واحد",
+            "read-record-count": "عدد الرسائل للحصول عليها من التخزين وإرسالها إلى ثينغزبورد",
+            "max-records-count": "العدد الأقصى للبيانات في التخزين قبل إرسالها إلى ثينغزبورد",
+            "ttl-check-hour": "كم مرة سيتحقق البوابة من البيانات القديمة",
+            "ttl-messages-day": "الحد الأقصى لعدد الأيام التي ستحتفظ فيها التخزين بالبيانات",
+            "commands": "الأوامر لجمع الإحصائيات الإضافية",
+            "attribute": "مفتاح تلقي الإحصائيات",
+            "timeout": "مهلة زمنية لتنفيذ الأمر",
+            "command": "سيتم استخدام نتيجة تنفيذ الأمر كقيمة لتلقي الإحصائيات",
+            "check-device-activity": "يمكنك تمكين مراقبة نشاط كل جهاز متصل",
+            "inactivity-timeout": "الوقت بعد الذي ستفصل البوابة الجهاز",
+            "inactivity-period": "تكرار فحص نشاط الجهاز",
+            "minimal-pack-delay": "التأخير بين إرسال حزم الرسائل (يؤدي تقليل هذا الإعداد إلى زيادة استخدام وحدة المعالجة المركزية)",
+            "qos": "جودة الخدمة في رسائل MQTT (0 - على الأكثر مرة واحدة، 1 - على الأقل مرة واحدة)",
+            "server-port": "منفذ الشبكة الذي سيستمع فيه خادم GRPC للاستفسارات الواردة.",
+            "grpc-keep-alive-timeout": "الحد الأقصى للوقت الذي يجب أن ينتظره الخادم لاستجابة رسالة الحفاظ على الاتصال قبل اعتبار الاتصال ميتًا.",
+            "grpc-keep-alive": "المدة بين رسائل حفظ الاتصال المتعاقبة عند عدم وجود استدعاء RPC نشط.",
+            "grpc-min-time-between-pings": "الحد الأدنى للوقت الذي يجب فيه أن ينتظر الخادم بين إرسال رسائل حفظ الاتصال",
+            "grpc-max-pings-without-data": "الحد الأقصى لعدد رسائل حفظ الاتصال التي يمكن للخادم إرسالها دون تلقي أي بيانات قبل اعتبار الاتصال ميتًا.",
+            "grpc-min-ping-interval-without-data": "الحد الأدنى للوقت الذي يجب فيه أن ينتظر الخادم بين إرسال رسائل حفظ الاتصال عند عدم إرسال أو استلام بيانات.",
+            "permit-without-calls": "السماح للخادم بإبقاء اتصال GRPC حيًا حتى عندما لا تكون هناك استدعاءات RPC نشطة."
+        }
+    },
+    "grid": {
+        "delete-item-title": "هل أنت متأكد أنك تريد حذف هذا العنصر؟",
+        "delete-item-text": "كن حذرًا، بعد التأكيد سيصبح هذا العنصر وجميع البيانات المتعلقة به لا يمكن استعادتها.",
+        "delete-items-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 عنصر} other {# عناصر} }؟",
+        "delete-items-action-title": "حذف { count, plural, =1 {1 عنصر} other {# عناصر} }",
+        "delete-items-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع العناصر المحددة وسيصبح جميع البيانات المتعلقة بها لا يمكن استعادتها.",
+        "add-item-text": "إضافة عنصر جديد",
+        "no-items-text": "لا توجد عناصر",
+        "item-details": "تفاصيل العنصر",
+        "delete-item": "حذف العنصر",
+        "delete-items": "حذف العناصر",
+        "scroll-to-top": "التمرير إلى الأعلى"
+    },
+    "help": {
+        "goto-help-page": "الانتقال إلى صفحة المساعدة",
+        "show-help": "عرض المساعدة"
+    },
+    "home": {
+        "home": "الرئيسية",
+        "profile": "الملف الشخصي",
+        "logout": "تسجيل الخروج",
+        "menu": "القائمة",
+        "avatar": "الصورة الرمزية",
+        "open-user-menu": "فتح قائمة المستخدم"
+    },
+    "file-input": {
+        "browse-file": "استعراض الملف",
+        "browse-files": "استعراض الملفات"
+    },
+    "image": {
+        "gallery": "معرض الصور",
+        "search": "البحث عن صورة",
+        "selected-images": "{ count, plural, =1 {صورة واحدة} other {# صور} } محددة",
+        "created-time": "وقت الإنشاء",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "resolution": "الدقة",
+        "size": "الحجم",
+        "system": "النظام",
+        "download-image": "تحميل الصورة",
+        "export-image": "تصدير الصورة إلى JSON",
+        "import-image": "استيراد الصورة من JSON",
+        "upload-image": "رفع الصورة",
+        "edit-image": "تحرير الصورة",
+        "image-details": "تفاصيل الصورة",
+        "no-images": "لا توجد صور",
+        "delete-image": "حذف الصورة",
+        "delete-image-title": "هل أنت متأكد أنك تريد حذف الصورة '{{imageTitle}}'؟",
+        "delete-image-text": "كن حذرًا، بعد التأكيد ستصبح الصورة لا يمكن استعادتها.",
+        "delete-images-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {صورة واحدة} other {# صور} }؟",
+        "delete-images-text": "كن حذرًا، بعد التأكيد ستتم إزالة جميع الصور المحددة وسيصبح جميع البيانات المتعلقة بها لا يمكن استعادتها.",
+        "list-mode": "عرض القائمة",
+        "grid-mode": "عرض الشبكة",
+        "image-preview": "معاينة الصورة",
+        "update-image": "تحديث الصورة",
+        "export-failed-error": "غير قادر على تصدير الصورة: {{error}}",
+        "image-json-file": "ملف JSON للصورة",
+        "invalid-image-json-file-error": "غير قادر على استيراد الصورة من JSON: هيكل بيانات JSON غير صالح للصورة.",
+        "image-is-in-use": "الصورة قيد الاستخدام من قبل كيانات أخرى",
+        "images-are-in-use": "الصور مستخدمة من قبل كيانات أخرى",
+        "image-is-in-use-text": "لم يتم حذف الصورة <b>'{{title}}'</b> لأنها مستخدمة من قبل الكيانات التالية:",
+        "images-are-in-use-text": "لم يتم حذف جميع الصور بسبب استخدامها من قبل كيانات أخرى.</br>يمكنك عرض الكيانات المرجعية بالنقر على زر <b>المراجع</b> في صف الصورة المقابل.</br>إذا كنت ترغب في حذف هذه الصور بعد ذلك، حدد الصور في الجدول أدناه وانقر على الزر <b>حذف المحدد</b>.",
+        "delete-image-in-use-text": "إذا كنت لا تزال ترغب في حذف الصورة، انقر فوق الزر <b>حذف على أي حال</b>.",
+        "system-entities": "كيانات النظام:",
+        "entities": "الكيانات:",
+        "references": "المراجع",
+        "include-system-images": "تضمين الصور النظامية",
+        "clear-image": "مسح الصورة",
+        "no-image": "لا توجد صورة",
+        "no-image-selected": "لم يتم اختيار أي صورة",
+        "browse-from-gallery": "استعراض من المعرض",
+        "set-link": "تعيين الرابط",
+        "image-link": "رابط الصورة",
+        "link": "رابط",
+        "copy-image-link": "نسخ رابط الصورة",
+        "embed-image": "تضمين الصورة",
+        "embed-to-html": "تضمين إلى HTML",
+        "embed-to-html-hint": "ستتاح هذه الميزة لأي مستخدم غير مصرح له.",
+        "embed-to-html-text": "باستخدام مقطع الكود التالي، يمكنك تضمين صورة في المكونات التي تعتمد على HTML العادي.<br/>تشمل هذه المكونات عناصر بطاقة HTML، ووظائف محتوى الخلية، وما إلى ذلك.",
+        "embed-to-angular-template": "تضمين إلى قالب HTML للأنغولار",
+        "embed-to-angular-template-text": "باستخدام مقطع الكود التالي، يمكنك تضمين صورة في قالب HTML للأنغولار.<br/>تشمل هذه المكونات عنصر العلامة التجارية، والقسم HTML في محرر الويدجت، والإجراءات المخصصة، وما إلى ذلك."
+    },
+    "image-input": {
+        "drop-images-or": "اسحب وأسقط الصور أو",
+        "drag-and-drop": "اسحب وأسقط",
+        "or": "أو",
+        "browse": "استعرض",
+        "no-images": "لم يتم تحديد أي صور",
+        "images": "الصور"
+    },
+    "import": {
+        "no-file": "لم يتم تحديد أي ملف",
+        "drop-file": "اسحب ملف JSON أو انقر لتحديد ملف لتحميله.",
+        "drop-csv-file": "اسحب ملف CSV أو انقر لتحديد ملف لتحميله.",
+        "drop-json-file-or": "اسحب ملف JSON أو",
+        "drop-file-csv": "اسحب ملف CSV أو انقر لتحديد ملف لتحميله.",
+        "drop-file-csv-or": "اسحب ملف CSV أو",
+        "column-value": "القيمة",
+        "column-title": "العنوان",
+        "column-example": "قيمة مثالية للبيانات",
+        "column-key": "السمة / مفتاح البيانات",
+        "credentials": "بيانات الاعتماد",
+        "csv-delimiter": "فاصل CSV",
+        "csv-first-line-header": "السطر الأول يحتوي على أسماء الأعمدة",
+        "csv-update-data": "تحديث السمات / البيانات",
+        "details": "التفاصيل",
+        "import-csv-number-columns-error": "يجب أن يحتوي الملف على على الأقل عمودين",
+        "import-csv-invalid-format-error": "تنسيق الملف غير صالح. السطر: '{{line}}'",
+        "column-type": {
+            "name": "الاسم",
+            "type": "النوع",
+            "label": "التسمية",
+            "column-type": "نوع العمود",
+            "client-attribute": "سمة العميل",
+            "shared-attribute": "سمة مشتركة",
+            "server-attribute": "سمة الخادم",
+            "timeseries": "سلسلة زمنية",
+            "entity-field": "حقل الكيان",
+            "access-token": "رمز الوصول",
+            "x509": "X.509",
+            "mqtt": {
+                "client-id": "معرف عميل MQTT",
+                "user-name": "اسم مستخدم MQTT",
+                "password": "كلمة مرور MQTT"
+            },
+            "lwm2m": {
+                "client-endpoint": "اسم نقطة نهاية عميل LwM2M",
+                "security-config-mode": "وضع تكوين أمان LwM2M",
+                "client-identity": "هوية عميل LwM2M",
+                "client-key": "مفتاح عميل LwM2M",
+                "client-cert": "شهادة عميل LwM2M العامة",
+                "bootstrap-server-security-mode": "وضع أمان خادم التمهيد LwM2M",
+                "bootstrap-server-secret-key": "مفتاح سري لخادم التمهيد LwM2M",
+                "bootstrap-server-public-key-id": "المفتاح العام أو معرف خادم التمهيد LwM2M",
+                "lwm2m-server-security-mode": "وضع أمان خادم LwM2M",
+                "lwm2m-server-secret-key": "مفتاح سري لخادم LwM2M",
+                "lwm2m-server-public-key-id": "المفتاح العام أو معرف خادم LwM2M"
+            },
+            "snmp": {
+                "host": "مضيف SNMP",
+                "port": "منفذ SNMP",
+                "version": "إصدار SNMP (v1، v2c أو v3)",
+                "community-string": "سلسلة المجتمع SNMP"
+            },
+            "isgateway": "هل هو بوابة",
+            "activity-time-from-gateway-device": "وقت النشاط من جهاز البوابة",
+            "description": "الوصف",
+            "edge-license-key": "مفتاح الترخيص",
+            "cloud-endpoint": "نقطة نهاية السحابة",
+            "routing-key": "مفتاح الحافة",
+            "secret": "السر"
+        },
+        "stepper-text": {
+            "select-file": "اختر ملف",
+            "configuration": "استيراد التكوين",
+            "column-type": "حدد نوع الأعمدة",
+            "creat-entities": "إنشاء كيانات جديدة"
+        },
+        "message": {
+            "create-entities": "تم إنشاء {{count}} كيانات جديدة بنجاح.",
+            "update-entities": "تم تحديث {{count}} كيان بنجاح.",
+            "error-entities": "حدث خطأ أثناء إنشاء {{count}} كيان."
+        }
+    },
+    "integration": {
+        "integration": "التكامل",
+        "integrations": "التكاملات",
+        "integrations-center": "مركز التكاملات",
+        "select-integration": "اختر التكامل",
+        "no-integrations-matching": "لم يتم العثور على تكاملات تطابق '{{entity}}'.",
+        "integration-required": "التكامل مطلوب",
+        "delete": "حذف التكامل",
+        "management": "إدارة التكاملات",
+        "add-integration-text": "إضافة تكامل جديد",
+        "no-integrations-text": "لم يتم العثور على تكاملات",
+        "data-convertor-name": "محول البيانات {{convertorType}} لـ {{integrationName}}",
+        "integration-name": "تكامل {{integrationType}}",
+        "selected-integrations": "{ count, plural, =1 {1 تكامل} other {# تكاملات} } محددة",
+        "delete-integration-title": "هل أنت متأكد أنك تريد حذف التكامل '{{integrationName}}'؟",
+        "delete-integration-text": "كن حذراً، بعد التأكيد سيتم حذف التكامل وجميع البيانات المتعلقة به نهائياً.",
+        "delete-integrations-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 تكامل} other {# تكاملات} }؟",
+        "delete-integrations-action-title": "حذف { count, plural, =1 {1 تكامل} other {# تكاملات} }",
+        "delete-integrations-text": "كن حذراً، بعد التأكيد سيتم حذف جميع التكاملات المحددة وجميع البيانات المتعلقة بها نهائياً.",
+        "events": "الأحداث",
+        "enabled": "تمكين التكامل",
+        "allow-create-devices-or-assets": "السماح بإنشاء أجهزة أو أصول",
+        "all-types": "جميع أنواع التكامل",
+        "add": "إضافة تكامل",
+        "search": "بحث عن التكاملات",
+        "integration-details": "تفاصيل التكامل",
+        "details": "التفاصيل",
+        "copyId": "نسخ معرف التكامل",
+        "idCopiedMessage": "تم نسخ معرف التكامل إلى الحافظة",
+        "debug-mode": "وضع تصحيح الأخطاء",
+        "enable-security": "تمكين الأمان",
+        "enable-security-new": "تمكين الأمان لتحديثات الرمز التلقائية",
+        "headers-filter": "تصفية الرؤوس",
+        "header": "الرأس",
+        "no-headers-filter": "لا توجد عمليات تصفية للرؤوس",
+        "downlink-url": "رابط الاتصال الهابط",
+        "downlink-url-required": "رابط الاتصال الهابط مطلوب",
+        "create-loriot-output": "إنشاء مخرجات تطبيق Loriot",
+        "send-downlink": "إرسال رابط الاتصال الهابط",
+        "allow-downlink": "السماح بالاتصال الهابط",
+        "server": "الخادم",
+        "server-required": "الخادم مطلوب",
+        "domain": "النطاق",
+        "app-id": "معرف التطبيق",
+        "app-id-required": "معرف التطبيق مطلوب",
+        "app-token": "رمز الوصول للتطبيق",
+        "app-token-required": "رمز الوصول للتطبيق مطلوب",
+        "email": "البريد الإلكتروني",
+        "email-required": "البريد الإلكتروني مطلوب",
+        "application-uri": "عنوان تطبيق",
+        "as-id": "معرف AS",
+        "as-id-required": "معرف AS مطلوب.",
+        "as-key": "AS مفتاح",
+        "as-key-required": "AS مفتاح مطلوب.",
+        "client-id-new": "معرف العميل",
+        "client-id-new-required": "معرف العميل (تسجيل الدخول) مطلوب (تسجيل الدخول).",
+        "client-secret": "سر العميل",
+        "client-secret-required": "سر العميل (كلمة المرور) مطلوب (كلمة المرور).",
+        "max-time-diff-in-seconds": "أقصى فارق زمني (ثواني)",
+        "max-time-diff-in-seconds-required": "الفارق الزمني الأقصى مطلوب.",
+        "created-time": "وقت الإنشاء",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256",
+        "description": "الوصف",
+        "base-url": "الرابط الأساسي",
+        "base-url-required": "الرابط الأساسي مطلوب",
+        "security-key": "مفتاح الأمان",
+        "http-endpoint": "رابط نقطة النهاية HTTP",
+        "replace-no-content-to-ok": "استبدال حالة الرد من 'لا محتوى' إلى 'موافق'",
+        "copy-http-endpoint-url": "نسخ رابط نقطة النهاية HTTP",
+        "http-endpoint-url-copied-message": "تم نسخ رابط نقطة النهاية HTTP إلى الحافظة",
+        "host": "المضيف",
+        "host-required": "المضيف مطلوب.",
+        "host-private": "يجب أن يكون المضيف في الشبكة العامة.",
+        "url-private": "يجب أن يكون الرابط في الشبكة العامة.",
+        "host-type": "نوع المضيف",
+        "host-type-required": "نوع المضيف مطلوب.",
+        "api-version": "استخدم API v3",
+        "custom-host": "مضيف مخصص",
+        "custom-host-required": "المضيف المخصص مطلوب.",
+        "port": "المنفذ",
+        "port-required": "المنفذ مطلوب.",
+        "port-range": "يجب أن يكون المنفذ في نطاق من 1 إلى 65535.",
+        "connect-timeout": "مهلة الاتصال (ثانية)",
+        "connect-timeout-required": "مهلة الاتصال مطلوبة.",
+        "connect-timeout-range": "يجب أن تكون مهلة الاتصال في نطاق من 1 إلى 200.",
+        "client-id": "معرف العميل",
+        "client-id-required": "معرف العميل مطلوب.",
+        "client-id-hint": "تلميح: اختياري. اتركه فارغًا للحصول على معرف عميل مولد تلقائيًا. كن حذرًا عند تحديد معرف العميل. سيمنع معظم خوادم MQTT الاتصالات المتعددة بنفس معرف العميل. للاتصال بمثل هذه الخوادم ، يجب أن يكون معرف عميل MQTT الخاص بك فريدًا.",
+        "max-bytes-in-message": "الحد الأقصى للبيانات في الرسالة",
+        "max-bytes-in-message-range": "يجب أن تكون الحد الأقصى للبيانات في الرسالة في نطاق من 1 إلى 256000000.",
+        "device-id": "معرف الجهاز",
+        "device-id-required": "معرف الجهاز مطلوب.",
+        "device-id-range": "يجب أن يكون معرف الجهاز في نطاق من 1 إلى 65535 حرفًا.",
+        "device-id-pattern": "يجب أن يتكون معرف الجهاز من أرقام وأحرف كبيرة وصغيرة. [MQTT-3.1.3-5]",
+        "group-id": "معرف المجموعة",
+        "group-id-required": "معرف المجموعة مطلوب.",
+        "topics": "المواضيع",
+        "topics-required": "الموضوع مطلوب.",
+        "routing-keys": "مفاتيح التوجيه",
+        "routing-keys-required": "مفتاح التوجيه مطلوب.",
+        "queues": "الطوابير",
+        "queues-required": "اسم الطابور مطلوب.",
+        "durable": "دائم",
+        "exclusive": "حصري",
+        "autoDelete": "حذف تلقائي",
+        "exchange-name": "اسم التبادل",
+        "exchange-name-required": "اسم التبادل مطلوب.",
+        "downlink-topic": "موضوع الاتصال الهابط",
+        "connection-timeout": "مهلة الاتصال، مللي ثانية",
+        "connection-timeout-min": "قيمة غير صالحة لمهلة الاتصال.",
+        "handshake-timeout": "مهلة المصافحة، مللي ثانية",
+        "handshake-timeout-min": "قيمة غير صالحة لمهلة المصافحة.",
+        "virtual-host": "المضيف الافتراضي",
+        "rabbit-mq-poll-interval": "فاصل استطلاع، مللي ثانية",
+        "rabbit-mq-poll-interval-min": "قيمة غير صالحة لفاصل الاستطلاع.",
+        "application-server-url": "رابط خادم التطبيق",
+        "application-server-url-required": "رابط خادم التطبيق مطلوب.",
+        "application-server-api-token": "رمز API لخادم التطبيق",
+        "application-server-api-token-required": "رمز API لخادم التطبيق مطلوب.",
+        "use-api-four-plus": "استخدم واجهة برمجة التطبيقات لـ ChirpStack 4+",
+        "bootstrap-servers": "خوادم البدء",
+        "bootstrap-servers-required": "خوادم البدء مطلوبة.",
+        "poll-interval": "فاصل الاستطلاع",
+        "poll-interval-required": "فاصل الاستطلاع مطلوب.",
+        "poll-interval-min-value": "لا يمكن أن يكون قيمة فاصل الاستطلاع أقل من 1",
+        "auto-create-topics": "إنشاء المواضيع تلقائيًا",
+        "clean-session": "جلسة نظيفة",
+        "enable-ssl": "تمكين SSL",
+        "credentials": "بيانات الاعتماد",
+        "credentials-type": "نوع بيانات الاعتماد",
+        "credentials-type-required": "نوع بيانات الاعتماد مطلوب.",
+        "username": "اسم المستخدم",
+        "username-required": "اسم المستخدم مطلوب.",
+        "password": "كلمة المرور",
+        "password-required": "كلمة المرور مطلوبة.",
+        "destination-shared-secret": "سر المشاركة المقصد",
+        "destination-shared-secret-required": "سر المشاركة المقصد مطلوب",
+        "customer-id": "معرف العميل",
+        "grip-tenant-id": "معرف المستأجر GRIP",
+        "api-id": "معرف الواجهة",
+        "azure-ca-cert": "ملف شهادة CA",
+        "ca-cert": "ملف شهادة CA",
+        "private-key": "ملف المفتاح الخاص",
+        "private-key-password": "كلمة مرور المفتاح الخاص",
+        "cert": "ملف الشهادة",
+        "no-file": "لم يتم تحديد ملف.",
+        "drop-file": "أفلق ملفًا أو انقر لتحديد ملف لتحميله.",
+        "drop-file-or": "اسحب وأفلق ملفًا أو",
+        "check-connection": "تحقق من الاتصال",
+        "check-success": "تم إنشاء الاتصال بنجاح.",
+        "topic-filters": "مرشحات الموضوع",
+        "remove-topic-filter": "إزالة مرشح الموضوع",
+        "add-topic-filter": "إضافة مرشح الموضوع",
+        "add-topic-filter-prompt": "يرجى إضافة مرشح الموضوع",
+        "topic": "الموضوع",
+        "mqtt-qos": "جودة الخدمة",
+        "mqtt-qos-required": "جودة الخدمة مطلوبة",
+        "mqtt-qos-range": "تتراوح قيم جودة الخدمة من 0 إلى 2",
+        "mqtt-qos-at-most-once": "في الغالب مرة واحدة",
+        "mqtt-qos-at-least-once": "على الأقل مرة واحدة",
+        "mqtt-qos-exactly-once": "بالضبط مرة واحدة",
+        "downlink-topic-pattern": "نمط موضوع الاتصال الهابط",
+        "downlink-topic-pattern-required": "نمط موضوع الاتصال الهابط مطلوب.",
+        "retained-message": "الرسالة المُحتفظ بها",
+        "aws-access-key-id": "معرف مفتاح الوصول إلى AWS",
+        "aws-secret-access-key": "مفتاح الوصول السري لـ AWS",
+        "aws-region": "المنطقة",
+        "aws-iot-endpoint": "نقطة النهاية لخدمة AWS IoT",
+        "aws-iot-endpoint-required": "نقطة النهاية لخدمة AWS IoT مطلوبة.",
+        "aws-iot-credentials": "بيانات اعتماد AWS IoT",
+        "aws-sqs-polling-period-in-seconds": "فترة الاستطلاع في ثوانٍ",
+        "aws-sqs-queue-url": "عنوان URL لطابور SQS",
+        "aws-sqs-queue-url-required": "عنوان URL لطابور SQS مطلوب",
+        "aws-sqs-access-key-id-required": "معرف مفتاح الوصول مطلوب",
+        "aws-sqs-secret-access-key-required": "مفتاح الوصول السري مطلوب",
+        "application-credentials": "بيانات اعتماد التطبيق",
+        "api-key": "مفتاح API",
+        "api-key-required": "مفتاح API مطلوب.",
+        "api-key-format": "تنسيق مفتاح API غير صالح.",
+        "auth-token": "رمز المصادقة",
+        "auth-token-required": "رمز المصادقة مطلوب.",
+        "region": "المنطقة",
+        "region-required": "المنطقة مطلوبة.",
+        "application-id": "معرف التطبيق",
+        "application-id-required": "معرف التطبيق مطلوب.",
+        "access-id": "معرف الوصول",
+        "access-id-required": "معرف الوصول مطلوب.",
+        "access-key": "مفتاح الوصول",
+        "access-key-required": "مفتاح الوصول مطلوب.",
+        "access-key-min-length": "مفتاح الوصول قصير جدًا.",
+        "access-key-max-length": "مفتاح الوصول طويل جدًا.",
+        "connection-parameters": "معلمات الاتصال",
+        "service-bus-namespace-name": "اسم مساحة أسماء خدمة الحافلة",
+        "service-bus-namespace-name-required": "اسم مساحة أسماء خدمة الحافلة مطلوب.",
+        "connection-string": "سلسلة الاتصال",
+        "consumer-group": "مجموعة المستهلكين",
+        "connection-string-required": "سلسلة الاتصال مطلوبة!",
+        "event-hub-name": "اسم نقطة النهاية للحدث",
+        "event-hub-name-required": "اسم نقطة النهاية للحدث مطلوب.",
+        "event-iot-hub-name-required": "اسم Hub IoT مطلوب للاتصال الهابط",
+        "sas-key-name": "اسم مفتاح SAS",
+        "sas-key-name-required": "اسم مفتاح SAS مطلوب.",
+        "sas-key": "مفتاح SAS",
+        "sas-key-required": "مفتاح SAS مطلوب.",
+        "iot-hub-name": "اسم Hub IoT (مطلوب للاتصال الهابط)",
+        "hostname": "اسم المضيف",
+        "hostname-required": "اسم المضيف مطلوب",
+        "integration-clazz": "فئة التكامل",
+        "integration-clazz-required": "فئة التكامل مطلوبة",
+        "integration-configuration": "تكوين JSON للتكامل",
+        "metadata": "البيانات الوصفية",
+        "type": "نوع التكامل",
+        "select-integration-type": "حدد نوع التكامل",
+        "type-required": "نوع التكامل مطلوب.",
+        "type-not-found": "نوع التكامل غير موجود",
+        "uplink-converter": "محول البيانات الصاعدة",
+        "uplink-converter-required": "محول البيانات الصاعدة مطلوب.",
+        "downlink-converter": "محول البيانات الهابطة",
+        "type-http": "HTTP",
+        "type-http-description": "بروتوكول نقل الملفات النصي أو متعدد الوسائط.",
+        "type-ocean-connect": "OceanConnect",
+        "type-ocean-connect-description": "تكامل الأجهزة ذات القدرات المختلفة مع منصة الإنترنت من الأشياء.",
+        "type-sigfox": "SigFox",
+        "type-sigfox-description": "بروتوكول خفيف الوزن للتعامل مع عمليات نقل البيانات الصغيرة.",
+        "type-thingpark": "ThingPark",
+        "type-thingpark-description": "بروتوكول النقل الموجه نحو الرسائل.",
+        "type-loriot": "Loriot",
+        "type-loriot-description": "بنية LoRaWAN الموزعة.",
+        "type-thingpark-enterprise": "ThingParkEnterprise",
+        "type-thingpark-enterprise-description": "منصة الرسائل للشبكة LPWA.",
+        "type-tmobile-iot-cdp": "iotcreators.com (T-Mobile – IoT CDP)",
+        "type-tmobile-iot-cdp-description": "خدمة الاتصال بالإنترنت IoT للجوال.",
+        "type-mqtt": "MQTT",
+        "type-mqtt-description": "بروتوكول شبكة الآلات إلى الآلات.",
+        "type-aws-iot": "AWS IoT",
+        "type-aws-iot-description": "خدمة الإدارة والتخزين والتحليل.",
+        "type-aws-sqs": "AWS SQS",
+        "type-aws-sqs-description": "خدمة إدارة الرسائل المُدارة بالكامل.",
+        "type-aws-kinesis": "AWS Kinesis",
+        "type-aws-kinesis-description": "خدمة للفيديو والبيانات في الوقت الفعلي.",
+        "type-ibm-watson-iot": "IBM Watson IoT",
+        "type-ibm-watson-iot-description": "خدمة مُدارة بالكامل على السحابة.",
+        "type-ttn": "The Things Stack Community",
+        "type-ttn-description": "شبكة LoRaWAN المفتوحة والمركزة.",
+        "type-tti": "The Things Stack Industries",
+        "type-tti-description": "برنامج لتشغيل شبكات LoRaWAN الخاصة بنطاق واسع.",
+        "type-chirpstack": "ChirpStack",
+        "type-chirpstack-description": "خادم تكوين شبكة LoRaWAN.",
+        "type-particle": "Particle",
+        "type-particle-description": "منصة تمكين IoT كخدمة.",
+        "type-kpn": "KPN Things",
+        "type-kpn-description": "منصة IoT المقدمة من KPN، تقدم حلولًا قوية للتوصيل وإدارة البيانات لأجهزة IoT.",
+        "type-azure-event-hub": "Azure Event Hub",
+        "type-azure-event-hub-description": "منصة بيانات كبيرة للتدفق وخدمة استيعاب الأحداث.",
+        "type-azure-iot-hub": "Azure IoT Hub",
+        "type-azure-iot-hub-description": "خدمة الرسائل المُستضافة في السحابة.",
+        "type-opc-ua": "OPC-UA",
+        "type-opc-ua-description": "منصة عبر النطاق لتبادل البيانات من الحساسات إلى تطبيقات السحابة.",
+        "type-custom": "مخصص",
+        "type-coap": "CoAP",
+        "type-coap-description": "بروتوكول شبكة الآلات إلى الآلات للأجهزة المقيدة.",
+        "type-udp": "UDP",
+        "type-udp-description": "بروتوكول النقل الموجه نحو الرسائل.",
+        "type-tcp": "TCP",
+        "type-tcp-description": "بروتوكول موجه نحو الاتصال.",
+        "type-kafka": "Kafka",
+        "type-kafka-description": "منصة لتحليل البيانات بالتدفق وتكامل البيانات.",
+        "type-rabbitmq": "RabbitMQ",
+        "type-rabbitmq-description": "سمسار الرسائل الذي يدعم عدة بروتوكولات للرسائل.",
+        "type-pubsub": "Pub/Sub",
+        "type-pubsub-description": "خدمة للرسائل اللازمة بين التطبيقات بشكل غير متزامن.",
+        "type-apache-pulsar": "Apache Pulsar",
+        "type-apache-pulsar-description": "منصة الرسائل العامة والتدفق الموزعة.",
+        "type-tuya": "Tuya",
+        "type-tuya-description": "رسائل مستضافة في السحابة. منصة الجهاز.",
+        "type-azure-service-bus": "Azure Service Bus",
+        "type-azure-service-bus-description": "سمسار الرسائل الشركية المدارة بالكامل مع طوابير الرسائل ومواضيع النشر والاشتراك.",
+        "opc-ua-application-name": "اسم التطبيق",
+        "opc-ua-application-uri": "عنوان التطبيق URI",
+        "opc-ua-scan-period-in-seconds": "فترة المسح بالثواني",
+        "opc-ua-scan-period-in-seconds-required": "الفترة المسحية مطلوبة",
+        "opc-ua-timeout": "المهلة الزمنية بالميلي ثانية",
+        "opc-ua-timeout-required": "المهلة الزمنية مطلوبة",
+        "opc-ua-security": "الأمان",
+        "opc-ua-security-required": "الأمان مطلوب",
+        "opc-ua-identity": "الهوية",
+        "opc-ua-identity-required": "الهوية مطلوبة",
+        "opc-ua-keystore": "مخزن المفاتيح",
+        "add-opc-ua-keystore-prompt": "الرجاء إضافة ملف مخزن المفاتيح",
+        "opc-ua-keystore-required": "مخزن المفاتيح مطلوب",
+        "opc-ua-type": "النوع",
+        "opc-ua-keystore-type": "النوع",
+        "opc-ua-keystore-type-required": "النوع مطلوب",
+        "opc-ua-keystore-location": "الموقع *",
+        "opc-ua-keystore-password": "كلمة المرور",
+        "opc-ua-keystore-password-required": "كلمة المرور مطلوبة",
+        "opc-ua-keystore-alias": "اسم الرمز",
+        "opc-ua-keystore-alias-required": "الرمز مطلوب",
+        "opc-ua-keystore-key-password": "كلمة مرور المفتاح",
+        "opc-ua-keystore-key-password-required": "كلمة مرور المفتاح مطلوبة",
+        "opc-ua-mapping": "التصفيف",
+        "add-opc-ua-mapping-prompt": "الرجاء إضافة تصفيف",
+        "opc-ua-mapping-type": "نوع التصفيف",
+        "opc-ua-mapping-type-required": "نوع التصفيف مطلوب",
+        "opc-ua-device-node-pattern": "نمط الجهاز الفرعي",
+        "opc-ua-device-node-pattern-required": "نمط الجهاز الفرعي مطلوب",
+        "opc-ua-namespace": "مساحة الأسماء",
+        "opc-ua-add-map": "إضافة عنصر التصفيف",
+        "kinesis-stream-name": "اسم التيار",
+        "kinesis-stream-name-required": "اسم التيار مطلوب",
+        "kinesis-region": "المنطقة",
+        "kinesis-region-required": "المنطقة مطلوبة",
+        "kinesis-access-key-id": "معرف مفتاح الوصول",
+        "kinesis-access-key-id-required": "معرف مفتاح الوصول مطلوب",
+        "kinesis-secret-access-key": "مفتاح الوصول السري",
+        "kinesis-secret-access-key-required": "مفتاح الوصول السري مطلوب",
+        "kinesis-use-consumers-with-enhanced-fan-out": "استخدم المستهلكين مع تعزيز النافذة",
+        "kinesis-use-credentials-from-instance-metadata": "استخدم بيانات اعتماد من خدمة معاد بيانات الواجهة EC2 من Amazon",
+        "kinesis-application-name": "اسم التطبيق (بشكل افتراضي يساوي اسم التيار)",
+        "kinesis-initial-position-in-stream": "الموضع الأولي في التيار",
+        "kinesis-initial-position-in-stream-required": "الموضع الأولي في التيار مطلوب",
+        "kinesis-max-records": "الحد الأقصى للسجلات",
+        "kinesis-max-records-required": "الحد الأقصى للسجلات مطلوب",
+        "kinesis-max-records-length-range": "يجب أن يكون طول السجل الأقصى في نطاق من 1 إلى 10000",
+        "kinesis-request-timeout": "مهلة زمنية للطلب بالثواني",
+        "kinesis-request-timeout-required": "مهلة الطلب مطلوبة",
+        "other-properties": "خصائص أخرى",
+        "subscription-tags": "علامات الاشتراك",
+        "remove-subscription-tag": "إزالة علامة الاشتراك",
+        "add-subscription-tag": "إضافة علامة الاشتراك",
+        "add-subscription-tag-prompt": "الرجاء إضافة علامة الاشتراك",
+        "key": "مفتاح",
+        "path": "المسار",
+        "required": "مطلوب",
+        "integration-key": "مفتاح التكامل",
+        "copy-integration-key": "نسخ مفتاح التكامل",
+        "integration-key-copied-message": "تم نسخ مفتاح التكامل إلى الحافظة",
+        "integration-secret": "سر التكامل",
+        "copy-integration-secret": "نسخ سر التكامل",
+        "integration-secret-copied-message": "تم نسخ سر التكامل إلى الحافظة",
+        "execute-remotely": "تنفيذ عن بُعد",
+        "remote": "بُعد",
+        "handler-configuration": "تكوين المعالج",
+        "handler-configuration-type": "نوع المعالج",
+        "so-broadcast": "تمكين البث - التكامل سيقبل حزم العنوان العام",
+        "so-keepalive-option": "تمكين إرسال رسائل البقاء على الاتصال في مقابس التوجيه",
+        "so-reuse-addr": "ربط العملية بمنفذ",
+        "tcp-no-delay": "يجبر المقبس على إرسال البيانات دون تخزينها (تعطيل خوارزمية التخزين المؤقت Nagle)",
+        "fail-fast": "إرسال استثناء عندما يلاحظ فك الترميز أن طول الإطار سيتجاوز الحد الأقصى",
+        "strip-delimiter": "شطب الفاصل",
+        "length-field-offset": "إزاحة حقل الطول",
+        "length-field-offset-required": "إزاحة حقل الطول مطلوبة.",
+        "length-field-offset-range": "يجب أن تكون إزاحة حقل الطول في نطاق من 0 إلى 8.",
+        "length-field-length": "طول حقل الطول",
+        "length-field-length-required": "طول حقل الطول مطلوب.",
+        "length-field-length-range": "يجب أن يكون طول حقل الطول في نطاق من 0 إلى 8.",
+        "length-adjustment": "ضبط الطول (القيمة التعويضية لإضافتها إلى قيمة حقل الطول)",
+        "length-adjustment-required": "ضبط الطول مطلوب.",
+        "length-adjustment-range": "يجب أن يكون ضبط الطول في نطاق من 0 إلى 8.",
+        "byte-order": "ترتيب البايت لحقل الطول",
+        "initial-bytes-to-strip": "عدد البايتات الأولى لشطبها من الإطار المفكك",
+        "initial-bytes-to-strip-required": "عدد البايتات الأولى لشطبها من الإطار المفكك مطلوب.",
+        "initial-bytes-to-strip-range": "يجب أن يكون عدد البايتات الأولى لشطبها من الإطار المفكك في نطاق من 0 إلى 8.",
+        "so-backlog-option": "الحد الأقصى لعدد الاتصالات المعلقة على المقبس",
+        "so-backlog-option-required": "الحد الأقصى لعدد الاتصالات المعلقة على المقبس مطلوب.",
+        "so-backlog-option-range": "يجب أن يكون الحد الأقصى لعدد الاتصالات المعلقة على المقبس في نطاق من 1 إلى 65535.",
+        "so-rcv-buf": "حجم الذاكرة المؤقتة للمقبس الواردة (بالكيلوبايت)",
+        "so-rcv-buf-required": "حجم الذاكرة المؤقتة للمقبس الواردة (بالكيلوبايت) مطلوب.",
+        "so-rcv-buf-range": "يجب أن يكون حجم الذاكرة المؤقتة للمقبس الواردة (بالكيلوبايت) في نطاق من 1 إلى 65535.",
+        "so-snd-buf": "حجم الذاكرة المؤقتة للمقبس الصادرة (بالكيلوبايت)",
+        "so-snd-buf-required": "حجم الذاكرة المؤقتة للمقبس الصادرة (بالكيلوبايت) مطلوب.",
+        "so-snd-buf-range": "يجب أن يكون حجم الذاكرة المؤقتة للمقبس الصادرة (بالكيلوبايت) في نطاق من 1 إلى 65535.",
+        "charset-name": "اسم الترميز الحرفي",
+        "charset-name-required": "اسم الترميز الحرفي مطلوب.",
+        "message-separator": "فاصل الرسالة",
+        "message-separator-required": "فاصل الرسالة مطلوب.",
+        "character-sequence": "تسلسل الحرف",
+        "character-sequence-required": "تسلسل الحرف مطلوب.",
+        "max-frame-length": "الحد الأقصى لطول الإطار (بالبايت)",
+        "max-frame-length-required": "الحد الأقصى لطول الإطار (بالبايت) مطلوب.",
+        "max-frame-length-range": "يجب أن يكون الحد الأقصى لطول الإطار (بالبايت) في نطاق من 1 إلى 65535.",
+        "handler-type": "نوع المعالج",
+        "message-size": "حجم الرسالة",
+        "message-size-required": "حجم الرسالة مطلوب.",
+        "service-url": "عنوان URL للخدمة",
+        "service-url-required": "عنوان URL للخدمة مطلوب.",
+        "subscription-name": "اسم الاشتراك",
+        "subscription-name-required": "اسم الاشتراك مطلوب.",
+        "max-num-messages": "الحد الأقصى لعدد الرسائل",
+        "max-num-messages-required": "الحد الأقصى لعدد الرسائل مطلوب.",
+        "max-num-bytes": "الحد الأقصى لعدد البايتات",
+        "max-num-bytes-required": "الحد الأقصى لعدد البايتات مطلوب.",
+        "timeout-in-ms": "المهلة الزمنية بالميلي ثانية",
+        "timeout-in-ms-required": "المهلة الزمنية بالميلي ثانية مطلوبة.",
+        "user-id": "معرف المستخدم",
+        "user-id-required": "معرف المستخدم مطلوب.",
+        "token": "رمز",
+        "token-required": "الرمز مطلوب.",
+        "project-id": "معرف المشروع",
+        "project-id-required": "معرف المشروع مطلوب.",
+        "subscription-id": "معرف الاشتراك",
+        "subscription-id-required": "معرف الاشتراك مطلوب.",
+        "service-account-key": "ملف مفتاح حساب الخدمة",
+        "service-account-key-required": "ملف مفتاح حساب الخدمة مطلوب.",
+        "tcp": {
+            "system-line-separator": "فاصل السطر النظامي",
+            "nul-delimiter": "محدد NUL",
+            "byte-order-little-endian": "ترتيب البايتات الصغيرة",
+            "byte-order-big-endian": "ترتيب البايتات الكبيرة"
+        },
+        "cache-size": "حجم الذاكرة المؤقتة",
+        "cache-time-to-live": "مدة حياة البيانات في الذاكرة المؤقتة بالدقائق",
+        "min-cache-size": "لا يمكن أن يكون حجم الذاكرة المؤقتة أقل من 0",
+        "min-cache-time-to-live": "لا يمكن أن تكون مدة حياة البيانات في الذاكرة المؤقتة أقل من 0",
+        "max-cache-time-to-live": "مدة حياة البيانات في الذاكرة المؤقتة غير صالحة، يرجى تحديد قيمة بين 0 و 525600",
+        "coap-security-mode": "وضع الأمان في CoAP",
+        "coap-security-mode-required": "وضع الأمان في CoAP مطلوب",
+        "coap-security-mode-no-secure": "غير آمن",
+        "coap-security-mode-dtls": "DTLS",
+        "coap-security-mode-mixed": "مختلط",
+        "coap-endpoint": "عنوان URL النقطة النهائية لـ CoAP",
+        "coap-endpoint-url-copied-message": "تم نسخ عنوان URL النقطة النهائية لـ CoAP إلى الحافظة",
+        "copy-coap-endpoint-url": "نسخ عنوان URL النقطة النهائية لـ CoAP",
+        "copy-coap-dtls-endpoint-url": "نسخ عنوان URL النقطة النهائية لـ CoAP DTLS",
+        "coap-dtls-base-url": "عنوان URL الأساسي لـ DTLS",
+        "coap-dtls-base-url-required": "عنوان URL الأساسي لـ DTLS مطلوب",
+        "coap-dtls-endpoint": "عنوان URL النقطة النهائية لـ CoAP DTLS",
+        "coap-dtls-endpoint-url-copied-message": "تم نسخ عنوان URL النقطة النهائية لـ CoAP DTLS إلى الحافظة",
+        "unassign-integration-title": "هل أنت متأكد من رغبتك في إلغاء تعيين التكامل '{{integrationName}}'؟",
+        "unassign-integration-from-edge-text": "بعد التأكيد، سيتم إلغاء تعيين التكامل ولن يكون متاحًا للحافة.",
+        "unassign-integrations-from-edge-title": "هل أنت متأكد من رغبتك في إلغاء تعيين { count, plural, =1 {1 تكامل} other {# تكاملات} }؟",
+        "unassign-integrations-from-edge-text": "بعد التأكيد، سيتم إلغاء تعيين جميع التكاملات المحددة ولن تكون متاحة للحافة.",
+        "unassign-integrations": "إلغاء تعيين التكاملات",
+        "edge-placeholder-hint": "يمكنك استخدام العنصر النائب ${{ATTRIBUTE_KEY}} لاستبدال حقل التكامل بقيمة السمة من كيان الحافة المحدد. على سبيل المثال، 'Edge A' لديه سمة 'baseUrl' تساوي 'http://localhost:9999'. يمكنك تعيين ${{baseUrl}} كأحد حقول التكامل، وسيتم استبداله بـ 'http://localhost:9999' أثناء تعيين هذا التكامل لـ 'Edge A'. بالإضافة إلى ذلك، إذا تم تحديث سمة 'baseUrl' لـ 'Edge A' - سيتم إنشاء تكامل مع القيمة المحدثة تلقائيًا لـ 'Edge A'.",
+        "status": {
+            "status": "الحالة",
+            "active": "نشط",
+            "disabled": "معطل",
+            "failed": "فشل",
+            "pending": "قيد الانتظار"
+        },
+        "daily-activity": "النشاط اليومي",
+        "enable-debug-mode": "تمكين وضع التصحيح",
+        "disable-debug-mode": "تعطيل وضع التصحيح",
+        "advanced-settings": "الإعدادات المتقدمة",
+        "basic-settings": "الإعدادات الأساسية",
+        "existing-converter": "تحديد موجود",
+        "new-converter": "إنشاء جديد",
+        "connection": "الاتصال",
+        "connected": "متصل",
+        "not-connected": "غير متصل",
+        "environment": "البيئة",
+        "environment-required": "البيئة مطلوبة.",
+        "region-cn": "الصين",
+        "region-us": "الولايات المتحدة",
+        "region-eu": "أوروبا",
+        "region-in": "الهند",
+        "topic-name": "اسم الموضوع",
+        "topic-name-required": "اسم الموضوع مطلوب",
+        "sub-name": "اسم الاشتراك",
+        "sub-name-required": "اسم الاشتراك مطلوب",
+        "downlink-connection-string": "سلسلة اتصال التنزيل",
+        "downlink-connection-string-required": "سلسلة اتصال التنزيل مطلوبة",
+        "downlink-topic-name": "اسم موضوع التنزيل",
+        "downlink-topic-name-required": "اسم موضوع التنزيل مطلوب"
+    },
+    "item": {
+        "selected": "محدد"
+    },
+    "js-func": {
+        "no-return-error": "يجب على الوظيفة إرجاع قيمة!",
+        "return-type-mismatch": "يجب على الوظيفة إرجاع قيمة من النوع '{{type}}'!",
+        "tidy": "تنظيم",
+        "mini": "مصغر"
+    },
+    "key-val": {
+        "key": "المفتاح",
+        "value": "القيمة",
+        "remove-entry": "إزالة الإدخال",
+        "add-entry": "إضافة إدخال",
+        "no-data": "لا توجد بيانات"
+    },
+    "layout": {
+        "layout": "التخطيط",
+        "layouts": "التخطيطات",
+        "manage": "إدارة التخطيطات",
+        "settings": "إعدادات التخطيط",
+        "color": "اللون",
+        "main": "الرئيسي",
+        "right": "اليمين",
+        "left": "اليسار",
+        "select": "تحديد التخطيط المستهدف",
+        "percentage-width": "العرض بالنسبة المئوية (%)",
+        "fixed-width": "العرض الثابت (بكسل)",
+        "left-width": "نسبة عرض الجهة اليسرى (%)",
+        "right-width": "نسبة عرض الجهة اليمنى (%)",
+        "pick-fixed-side": "الجانب الثابت: ",
+        "layout-fixed-width": "العرض الثابت (بكسل)",
+        "value-min-error": "يجب أن تكون القيمة أكبر من {{min}}{{unit}}",
+        "value-max-error": "يجب أن تكون القيمة أقل من {{max}}{{unit}}",
+        "layout-fixed-width-required": "العرض الثابت مطلوب",
+        "right-width-percentage-required": "النسبة المئوية اليمنى مطلوبة",
+        "left-width-percentage-required": "النسبة المئوية اليسرى مطلوبة",
+        "divider": "فاصل",
+        "right-side": "تخطيط الجهة اليمنى",
+        "left-side": "تخطيط الجهة اليسرى"
+    },
+    "legend": {
+        "direction": "الاتجاه",
+        "position": "الموضع",
+        "show-values": "إظهار القيم",
+        "min-option": "الحد الأدنى",
+        "max-option": "الحد الأقصى",
+        "average-option": "المتوسط",
+        "total-option": "الإجمالي",
+        "latest-option": "الأحدث",
+        "sort-legend": "فرز مفاتيح البيانات في الأسطورة",
+        "show-max": "إظهار القيمة القصوى",
+        "show-min": "إظهار القيمة الدنيا",
+        "show-avg": "إظهار القيمة المتوسطة",
+        "show-total": "إظهار القيمة الإجمالية",
+        "show-latest": "إظهار القيمة الأحدث",
+        "settings": "إعدادات الأسطورة",
+        "min": "الحد الأدنى",
+        "max": "الحد الأقصى",
+        "avg": "المتوسط",
+        "total": "الإجمالي",
+        "latest": "الأحدث",
+        "comparison-time-ago": {
+            "previousInterval": "(الفاصل الزمني السابق)",
+            "customInterval": "(الفاصل الزمني المخصص)",
+            "days": "(قبل يوم)",
+            "weeks": "(قبل أسبوع)",
+            "months": "(قبل شهر)",
+            "years": "(قبل سنة)"
+        }
+    },
+    "login": {
+        "login": "تسجيل الدخول",
+        "request-password-reset": "طلب إعادة تعيين كلمة المرور",
+        "reset-password": "إعادة تعيين كلمة المرور",
+        "create-password": "إنشاء كلمة مرور",
+        "two-factor-authentication": "المصادقة الثنائية العاملة",
+        "passwords-mismatch-error": "يجب أن تكون كلمات المرور المدخلة متطابقة!",
+        "password-again": "إعادة كلمة المرور",
+        "sign-in": "الرجاء تسجيل الدخول",
+        "username": "اسم المستخدم (البريد الإلكتروني)",
+        "remember-me": "تذكرني",
+        "forgot-password": "نسيت كلمة المرور؟",
+        "password-reset": "إعادة تعيين كلمة المرور",
+        "expired-password-reset-message": "انتهت صلاحية بيانات اعتمادك! يرجى إنشاء كلمة مرور جديدة.",
+        "new-password": "كلمة المرور الجديدة",
+        "new-password-again": "تأكيد كلمة المرور الجديدة",
+        "password-link-sent-message": "تم إرسال رابط إعادة التعيين",
+        "email": "البريد الإلكتروني",
+        "no-account": "لا تمتلك حساب؟",
+        "create-account": "إنشاء حساب",
+        "login-with": "تسجيل الدخول باستخدام {{name}}",
+        "or": "أو",
+        "error": "خطأ في تسجيل الدخول",
+        "verify-your-identity": "تحقق من هويتك",
+        "select-way-to-verify": "حدد طريقة التحقق",
+        "resend-code": "إعادة إرسال الرمز",
+        "resend-code-wait": "إعادة إرسال الرمز في { time, plural, =1 {1 ثانية} other {# ثواني} }",
+        "try-another-way": "جرب طريقة أخرى",
+        "totp-auth-description": "الرجاء إدخال رمز الأمان من تطبيق المصادقة الخاص بك.",
+        "totp-auth-placeholder": "الرمز",
+        "sms-auth-description": "تم إرسال رمز أمان إلى هاتفك على {{contact}}.",
+        "sms-auth-placeholder": "رمز الرسالة القصيرة",
+        "email-auth-description": "تم إرسال رمز أمان إلى عنوان البريد الإلكتروني الخاص بك على {{contact}}.",
+        "email-auth-placeholder": "رمز البريد الإلكتروني",
+        "backup-code-auth-description": "الرجاء إدخال أحد رموز الاحتياط الخاصة بك.",
+        "backup-code-auth-placeholder": "رمز الاحتياط"
+    },
+    "signup": {
+        "firstname": "الاسم الأول",
+        "lastname": "الاسم الأخير",
+        "email": "البريد الإلكتروني",
+        "signup": "التسجيل",
+        "create-password": "إنشاء كلمة مرور",
+        "repeat-password": "تكرار كلمة المرور",
+        "have-account": "هل لديك حساب بالفعل؟",
+        "signin": "تسجيل الدخول",
+        "no-captcha-message": "يجب عليك التأكيد بأنك لست روبوتًا",
+        "password-length-message": "يجب أن تتكون كلمة المرور الخاصة بك من ما لا يقل عن 6 أحرف",
+        "email-verification": "تحقق من البريد الإلكتروني",
+        "email-verification-message": "تم إرسال بريد إلكتروني يحتوي على تفاصيل التحقق إلى العنوان البريدي المحدد.<br>يرجى اتباع التعليمات المقدمة في البريد الإلكتروني لإكمال إجراء التسجيل الخاص بك.<br>ملاحظة: إذا لم تر البريد الإلكتروني لفترة من الوقت ، يرجى التحقق من مجلد 'البريد العشوائي' أو محاولة إعادة إرسال البريد الإلكتروني بالنقر فوق زر 'إعادة إرسال'.",
+        "account-activation-title": "تفعيل الحساب",
+        "account-activated": "تم تفعيل الحساب بنجاح!",
+        "account-activated-text": "تهانينا!<br>تم تفعيل حسابك.",
+        "resend": "إعادة الإرسال",
+        "inactive-user-exists-title": "المستخدم غير النشط موجود بالفعل",
+        "inactive-user-exists-text": "هناك مستخدم مسجل بالفعل بعنوان بريد إلكتروني غير مؤكد.<br>انقر فوق الزر 'إعادة الإرسال' إذا كنت ترغب في إعادة إرسال بريد التحقق.",
+        "activating-account": "تفعيل الحساب...",
+        "activating-account-text": "حسابك يقوم بالتفعيل حاليًا. يرجى الانتظار...",
+        "accept-privacy-policy": "قبول سياسة الخصوصية",
+        "accept": "قبول",
+        "privacy-policy": "سياسة الخصوصية",
+        "accept-privacy-policy-message": "يجب عليك قبول سياسة الخصوصية الخاصة بنا",
+        "recaptcha-title": "reCAPTCHA",
+        "terms-of-use": "شروط الاستخدام",
+        "accept-terms-of-use-message": "يجب عليك قبول شروط الاستخدام الخاصة بنا"
+    },
+    "notification": {
+        "action-button": "زر الإجراء",
+        "action-type": "نوع الإجراء",
+        "active": "نشط",
+        "add-notification-recipients-group": "إضافة مجموعة مستلمي الإشعارات",
+        "add-notification-template": "إضافة قالب إشعار",
+        "add-recipient": "إضافة مستلم",
+        "add-recipients": "إضافة المستلمين",
+        "add-rule": "إضافة قاعدة",
+        "add-stage": "إضافة مرحلة",
+        "add-template": "إضافة قالب",
+        "after": "بعد",
+        "alarm-assignment-trigger-settings": "إعدادات تنبيه تعيين المهمة",
+        "alarm-comment-trigger-settings": "إعدادات تنبيه تعليق التنبيه",
+        "alarm-trigger-settings": "إعدادات تنبيه التنبيه",
+        "all": "الكل",
+        "api-feature-hint": "إذا كانت الحقل فارغًا ، فسيتم تطبيق المشغل على جميع ميزات API",
+        "api-usage-trigger-settings": "إعدادات مشغل استخدام API",
+        "new-platform-version-trigger-settings": "إعدادات مشغل الإصدار الجديد للمنصة",
+        "rate-limits-trigger-settings": "إعدادات مشغل تجاوز حدود السرعة",
+        "at-least-one-should-be-selected": "يجب تحديد واحد على الأقل",
+        "basic-settings": "الإعدادات الأساسية",
+        "button-text": "نص الزر",
+        "button-text-required": "نص الزر مطلوب",
+        "button-text-max-length": "يجب أن يكون نص الزر أقل من أو يساوي {{ length }} حرفًا",
+        "compose": "تأليف",
+        "conversation": "المحادثة",
+        "conversation-required": "المحادثة مطلوبة",
+        "copy-notification-template": "نسخ قالب الإشعار",
+        "copy-rule": "نسخ القاعدة",
+        "copy-template": "نسخ القالب",
+        "create-new": "إنشاء جديد",
+        "created": "تم الإنشاء",
+        "delete-notification-text": "كن حذرًا ، بعد التأكيد سيصبح الإشعار غير قابل للاسترداد.",
+        "delete-notification-title": "هل أنت متأكد أنك تريد حذف الإشعار؟",
+        "delete-notifications-text": "كن حذرًا ، بعد التأكيد ستصبح الإشعارات غير قابلة للاسترداد.",
+        "delete-notifications-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 إشعار} other {# إشعارات} }؟",
+        "delete-recipient-text": "كن حذرًا ، بعد التأكيد سيصبح المستلم غير قابل للاسترداد.",
+        "delete-recipient-title": "هل أنت متأكد أنك تريد حذف المستلم '{{recipientName}}'؟",
+        "delete-recipients-text": "كن حذرًا ، بعد التأكيد ستصبح المستلمين غير قابلين للاسترداد.",
+        "delete-recipients-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 مستلم} other {# مستلمين} }؟",
+        "delete-request-text": "كن حذرًا ، بعد التأكيد سيصبح الطلب غير قابل للاسترداد.",
+        "delete-request-title": "هل أنت متأكد أنك تريد حذف الطلب؟",
+        "delete-requests-text": "كن حذرًا ، بعد التأكيد ستصبح الطلبات غير قابلة للاسترداد.",
+        "delete-requests-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 طلب} other {# طلبات} }؟",
+        "delete-rule-text": "كن حذرًا ، بعد التأكيد ستصبح القاعدة غير قابلة للاسترداد.",
+        "delete-rule-title": "هل أنت متأكد أنك تريد حذف القاعدة '{{ruleName}}'؟",
+        "delete-rules-text": "كن حذرًا ، بعد التأكيد ستصبح القواعد غير قابلة للاسترداد.",
+        "delete-rules-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 قاعدة} other {# قواعد} }؟",
+        "delete-template-text": "كن حذرًا ، بعد التأكيد سيصبح القالب غير قابل للاسترداد.",
+        "delete-template-title": "هل أنت متأكد أنك تريد حذف القالب '{{templateName}}'؟",
+        "delete-templates-text": "كن حذرًا ، بعد التأكيد ستصبح القوالب غير قابلة للاسترداد.",
+        "delete-templates-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 قالب} other {# قوالب} }؟",
+        "deleted": "تم الحذف",
+        "delivery-method": {
+            "delivery-method": "طريقة التسليم",
+            "email": "البريد الإلكتروني",
+            "email-preview": "معاينة إشعار البريد الإلكتروني",
+            "slack": "سلاك",
+            "slack-preview": "معاينة إشعار سلاك",
+            "microsoft-teams": "Microsoft Teams",
+            "microsoft-teams-preview": "معاينة إشعار Microsoft Teams",
+            "sms": "رسالة قصيرة",
+            "sms-preview": "معاينة إشعار الرسائل القصيرة",
+            "web": "الويب",
+            "web-preview": "معاينة إشعار الويب"
+        },
+        "delivery-method-not-configure-click": "لم يتم تكوين طريقة التسليم. انقر للإعداد.",
+        "delivery-method-not-configure-contact": "لم يتم تكوين طريقة التسليم. اتصل بمسؤول النظام الخاص بك.",
+        "delivery-methods": "طرق التسليم",
+        "description": "الوصف",
+        "device-activity-trigger-settings": "إعدادات مشغل النشاط الجهاز",
+        "device-list-rule-hint": "إذا كان الحقل فارغًا ، سيتم تطبيق المشغل على جميع الأجهزة",
+        "device-profiles-list-rule-hint": "إذا كان الحقل فارغًا ، سيتم تطبيق المشغل على جميع ملفات تعريف الجهاز",
+        "disabled": "معطل",
+        "edit-notification-recipients-group": "تحرير مجموعة مستلمي الإشعارات",
+        "edit-notification-template": "تحرير قالب الإشعار",
+        "edit-rule": "تحرير القاعدة",
+        "edit-template": "تحرير القالب",
+        "enabled": "مفعل",
+        "entities-limit-trigger-settings": "إعدادات مشغل حدود الكيانات",
+        "entity-action-trigger-settings": "إعدادات مشغل إجراء الكيان",
+        "entity-type": "نوع الكيان",
+        "escalation-chain": "سلسلة التصعيد",
+        "failed-send": "فشل الإرسال",
+        "fails": "{ count, plural, =1 {1 فشل} other {# أخطاء} }",
+        "filter": "مرشح",
+        "first-recipient": "المستلم الأول",
+        "inactive": "غير نشط",
+        "inbox": "صندوق الوارد",
+        "notification-inbox": "الإشعارات / الوارد",
+        "input-field-support-templatization": "دعم الحقول الإدخال للتخطيط.",
+        "input-fields-support-templatization": "تدعم الحقول الإدخال التخطيط.",
+        "integration-action-trigger-settings": "إعدادات مشغل أحداث التكامل",
+        "integration-list-rule-hint": "إذا كان الحقل فارغًا ، سيتم تطبيق المشغل على جميع التكاملات",
+        "link": "رابط",
+        "link-required": "الرابط مطلوب",
+        "link-type": {
+            "dashboard": "فتح لوحة المعلومات",
+            "link": "فتح رابط URL"
+        },
+        "loading-notifications": "تحميل الإشعارات...",
+        "management": "إدارة الإشعارات",
+        "mark-all-as-read": "وضع علامة على الكل كمقروء",
+        "mark-as-read": "وضع علامة كمقروء",
+        "message": "الرسالة",
+        "message-required": "الرسالة مطلوبة",
+        "message-max-length": "يجب أن تكون الرسالة أقل من أو تساوي {{ length }} حرفًا",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب",
+        "new-notification": "إشعار جديد",
+        "no-inbox-notification": "لم يتم العثور على إشعارات",
+        "no-notification-request": "لا توجد طلبات إشعار",
+        "no-notification-templates": "لم يتم العثور على قوالب الإشعار",
+        "no-notifications-yet": "لا توجد إشعارات بعد",
+        "no-recipients-notification": "لا توجد إشعارات للمستلمين",
+        "no-rule": "لم يتم تكوين قاعدة",
+        "no-rules-notification": "لا توجد إشعارات للقواعد",
+        "no-severity-found": "لم يتم العثور على خطورة",
+        "no-severity-matching": "لم يتم العثور على '{{severity}}'.",
+        "no-template-matching": "لم يتم العثور على مورد مطابق لـ '{{template}}'.",
+        "not-found-slack-recipient": "لم يتم العثور على مستلم Slack",
+        "notification": "الإشعار",
+        "notification-center": "مركز الإشعارات",
+        "notify": "إعلام",
+        "notify-again": "إعلام مرة أخرى",
+        "notify-alarm-action": {
+            "acknowledged": "الإنذار تم الاعتراف به",
+            "assigned": "الإنذار تم تعيينه",
+            "cleared": "تم تطهير الإنذار",
+            "created": "تم إنشاء الإنذار",
+            "severity-changed": "تم تغيير خطورة الإنذار",
+            "unassigned": "تم إلغاء تعيين الإنذار"
+        },
+        "notify-on": "الإعلام عند",
+        "notify-on-comment-update": "الإعلام عند تحديث التعليق",
+        "notify-on-required": "الإعلام عند مطلوب",
+        "notify-on-unassign": "الإعلام عند إلغاء التعيين",
+        "notify-only-integrations-errors": "الإعلام فقط في حالة الأخطاء",
+        "notify-only-user-comments": "الإعلام فقط بالتعليقات المستخدمة",
+        "only-rule-chain-lifecycle-failures": "فقط في حالات فشل دورة حياة سلسلة القواعد",
+        "only-rule-node-lifecycle-failures": "فقط في حالات فشل دورة حياة عقدة القاعدة",
+        "platform-users": "مستخدمو المنصة",
+        "rate-limits": "حدود معدل الطلبات",
+        "rate-limits-hint": "إذا كان الحقل فارغًا ، سيتم تطبيق المشغل على جميع حدود معدل الطلبات",
+        "recipient": "المستلم",
+        "recipient-group": "مجموعة المستلمين",
+        "recipient-type": {
+            "affected-tenant-administrators": "مسؤولو المستأجر المتأثرون",
+            "affected-user": "المستخدم المتأثر",
+            "all-users": "جميع المستخدمين",
+            "customer-users": "مستخدمي العملاء",
+            "system-administrators": "مسؤولو النظام",
+            "tenant-administrators": "مسؤولو المستأجر",
+            "user-filters": "تصفية المستخدمين",
+            "user-group-list": "قائمة مجموعات المستخدمين",
+            "user-list": "قائمة المستخدمين",
+            "user-role": "دور المستخدم",
+            "users-entity-owner": "مستخدمو مالك الكيان"
+        },
+        "recipients": "المستلمون",
+        "notification-recipients": "الإشعارات / المستلمون",
+        "recipients-count": "{ count, plural, =1 {1 مستلم} other {# مستلمين} }",
+        "recipients-required": "المستلمون مطلوبون",
+        "refresh-allow-delivery-method": "تحديث السماح بطريقة التسليم",
+        "request-search": "بحث الطلب",
+        "request-status": {
+            "processing": "معالجة",
+            "scheduled": "مجدول",
+            "sent": "مرسل"
+        },
+        "review": "مراجعة",
+        "rule": "القاعدة",
+        "rule-chain-list-rule-hint": "إذا كان الحقل فارغًا ، سيتم تطبيق المشغل على جميع سلاسل القواعد",
+        "rule-engine-events-trigger-settings": "إعدادات مشغلات أحداث محرك القواعد",
+        "rule-engine-filter": "تصفية محرك القواعد",
+        "rule-name": "اسم القاعدة",
+        "rule-name-required": "الاسم مطلوب",
+        "rule-disable": "تعطيل قاعدة الإشعار",
+        "rule-enable": "تمكين قاعدة الإشعار",
+        "rule-node-filter": "تصفية عقدة القاعدة",
+        "rules": "القواعد",
+        "notification-rules": "الإشعارات / القواعد",
+        "scheduler-later": "الجدول الزمني لاحقًا",
+        "search-notification": "بحث في الإشعارات",
+        "search-recipients": "البحث عن المستلمين",
+        "search-rules": "البحث في القواعد",
+        "search-templates": "البحث في القوالب",
+        "see-documentation": "راجع التوثيق",
+        "selected-notifications": "{ count, plural, =1 {1 إشعار} other {# إشعارات} } المحددة",
+        "selected-recipients": "{ count, plural, =1 {1 مستلم} other {# مستلمين} } المحددة",
+        "selected-requests": "{ count, plural, =1 {1 طلب} other {# طلبات} } المحددة",
+        "selected-rules": "{ count, plural, =1 {1 قاعدة} other {# قواعد} } المحددة",
+        "selected-template": "{ count, plural, =1 {1 قالب} other {# قوالب} } المحددة",
+        "send-notification": "إرسال الإشعار",
+        "sent": "تم الإرسال",
+        "notification-sent": "الإشعارات / تم الإرسال",
+        "set-entity-from-notification": "تعيين الكيان من الإشعار إلى حالة لوحة المعلومات",
+        "slack-chanel-type": "نوع قناة Slack",
+        "slack-chanel-types": {
+            "direct": "رسالة مباشرة",
+            "private-channel": "قناة خاصة",
+            "public-channel": "قناة عامة"
+        },
+        "start-from-scratch": "ابدأ من البداية",
+        "status": "الحالة",
+        "stop-escalation-alarm-status-become": "إيقاف التصعيد عندما يصبح حالة الإنذار:",
+        "subject": "الموضوع",
+        "subject-required": "الموضوع مطلوب",
+        "template": "القالب",
+        "template-name": "اسم القالب",
+        "template-required": "القالب مطلوب",
+        "template-type": {
+            "alarm": "إنذار",
+            "alarm-assignment": "تعيين الإنذار",
+            "alarm-comment": "تعليق الإنذار",
+            "api-usage-limit": "حد استخدام واجهة برمجة التطبيقات",
+            "device-activity": "نشاط الجهاز",
+            "entities-limit": "حدود الكيانات",
+            "entity-action": "إجراء الكيان",
+            "general": "عام",
+            "integration-lifecycle-event": "حدث دورة حياة الدمج",
+            "rule-engine-lifecycle-event": "حدث دورة حياة محرك القواعد",
+            "rule-node": "عقدة القاعدة",
+            "new-platform-version": "إصدار المنصة الجديد",
+            "rate-limits": "تجاوز حدود المعدل"
+        },
+        "templates": "القوالب",
+        "notification-templates": "الإشعارات / القوالب",
+        "tenant-profiles-list-rule-hint": "إذا كان الحقل فارغًا ، سيتم تطبيق المشغل على جميع ملفات تعريف المستأجر",
+        "tenants-list-rule-hint": "إذا كان الحقل فارغًا ، سيتم تطبيق المشغل على جميع المستأجرين",
+        "threshold": "الحد الأدنى",
+        "theme-color": "لون السمة",
+        "time": "الوقت",
+        "track-rule-node-events": "تتبع حدث عقدة القاعدة",
+        "trigger": {
+            "alarm": "إنذار",
+            "alarm-assignment": "تعيين الإنذار",
+            "alarm-comment": "تعليق الإنذار",
+            "api-usage-limit": "حد استخدام واجهة برمجة التطبيقات",
+            "device-activity": "نشاط الجهاز",
+            "entities-limit": "حدود الكيانات",
+            "entity-action": "إجراء الكيان",
+            "integration-lifecycle-event": "حدث دورة حياة الدمج",
+            "rule-engine-lifecycle-event": "حدث دورة حياة محرك القواعد",
+            "new-platform-version": "إصدار المنصة الجديد",
+            "rate-limits": "تجاوز حدود المعدل",
+            "trigger": "المشغل",
+            "trigger-required": "المشغل مطلوب"
+        },
+        "type": "النوع",
+        "unread": "غير مقروء",
+        "updated": "مُحدث",
+        "use-template": "استخدم القالب",
+        "view-all": "عرض الكل",
+        "view-notification-recipients-group": "عرض مجموعة مستلمي الإشعار",
+        "view-notification-template": "عرض قالب الإشعار",
+        "view-rule": "عرض القاعدة",
+        "warning": "تحذير",
+        "webhook-url": "رابط ويب هوك",
+        "webhook-url-required": "رابط ويب هوك مطلوب",
+        "channel-name": "اسم القناة",
+        "channel-name-required": "اسم القناة مطلوب",
+        "settings": {
+            "notification-settings": "إعدادات الإشعار",
+            "reset-all": "إعادة تعيين كل الإعدادات",
+            "reset-all-title": "هل أنت متأكد أنك تريد إعادة تعيين النموذج؟",
+            "reset-all-text": "بعد التأكيد ، سيتم إعادة تعيين نموذج الإعدادات إلى القيمة الافتراضية وحفظه.",
+            "type": "النوع",
+            "enable-all": "تمكين الكل",
+            "disable-all": "تعطيل الكل",
+            "delivery-not-configured": "طريقة التسليم غير مكونة"
+        }
+    },
+    "ota-update": {
+        "add": "إضافة حزمة",
+        "assign-firmware": "تعيين البرنامج الثابت",
+        "assign-firmware-required": "تعيين البرنامج الثابت مطلوب",
+        "assign-software": "تعيين البرنامج",
+        "assign-software-required": "تعيين البرنامج مطلوب",
+        "auto-generate-checksum": "توليد تحقق تلقائي للمجموع التكميلي",
+        "cant-applied-group-all": "لا يمكن تطبيقه على المجموعة الكل",
+        "checksum": "التحقق التلقائي للمجموع التكميلي",
+        "checksum-hint": "إذا كان التحقق التلقائي للمجموع التكميلي فارغًا ، فسيتم توليده تلقائيًا",
+        "checksum-algorithm": "خوارزمية التحقق التلقائي للمجموع التكميلي",
+        "checksum-copied-message": "تم نسخ التحقق التلقائي للمجموع التكميلي للحزمة إلى الحافظة",
+        "change-firmware": "تغيير البرنامج الثابت قد يؤدي إلى تحديث { count, plural, =1 {جهاز واحد} other {# أجهزة} }.",
+        "change-software": "تغيير البرنامج قد يؤدي إلى تحديث { count, plural, =1 {جهاز واحد} other {# أجهزة} }.",
+        "chose-compatible-device-profile": "سيكون الملف الذي تم تحميله متاحًا فقط للأجهزة ذات الملف المختار.",
+        "chose-firmware-distributed-device": "اختر البرنامج الثابت الذي سيتم توزيعه على الأجهزة",
+        "chose-software-distributed-device": "اختر البرنامج الذي سيتم توزيعه على الأجهزة",
+        "content-type": "نوع المحتوى",
+        "copy-checksum": "نسخ التحقق التلقائي للمجموع التكميلي",
+        "copy-direct-url": "نسخ عنوان URL المباشر",
+        "copyId": "نسخ معرف الحزمة",
+        "copied": "تم النسخ!",
+        "delete": "حذف الحزمة",
+        "delete-ota-update-text": "تنبيه: بعد التأكيد، لن يمكن استعادة تحديث OTA.",
+        "delete-ota-update-title": "هل أنت متأكد أنك تريد حذف تحديث OTA '{{title}}'؟",
+        "delete-ota-updates-text": "تنبيه: بعد التأكيد، سيتم حذف جميع تحديثات OTA المحددة.",
+        "delete-ota-updates-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {تحديث OTA واحد} other {# تحديثات OTA} }؟",
+        "description": "الوصف",
+        "direct-url": "عنوان URL المباشر",
+        "direct-url-copied-message": "تم نسخ عنوان URL المباشر للحزمة إلى الحافظة",
+        "direct-url-required": "عنوان URL المباشر مطلوب",
+        "download": "تحميل الحزمة",
+        "drop-file": "اسحب وأسقط ملف حزمة أو انقر لتحديد ملف لتحميله.",
+        "drop-package-file-or": "اسحب وأسقط ملف حزمة أو",
+        "file-name": "اسم الملف",
+        "file-size": "حجم الملف",
+        "file-size-bytes": "حجم الملف بالبايت",
+        "idCopiedMessage": "تم نسخ معرف الحزمة إلى الحافظة",
+        "no-firmware-matching": "لم يتم العثور على حزم التحديث التلقائي للبرنامج الثابت المتوافقة مع '{{entity}}'.",
+        "no-firmware-text": "لم يتم توفير أي حزم تحديث تلقائي للبرنامج الثابت المتوافقة.",
+        "no-packages-text": "لم يتم العثور على حزم",
+        "no-software-matching": "لم يتم العثور على حزم التحديث التلقائي للبرنامج المتوافقة مع '{{entity}}'.",
+        "no-software-text": "لم يتم توفير أي حزم تحديث تلقائي للبرنامج المتوافقة.",
+        "ota-update": "تحديث OTA",
+        "ota-update-details": "تفاصيل تحديث OTA",
+        "ota-updates": "تحديثات OTA",
+        "package-file": "ملف الحزمة",
+        "package-type": "نوع الحزمة",
+        "packages-repository": "مستودع الحزم",
+        "search": "البحث في الحزم",
+        "selected-package": "{ count, plural, =1 {حزمة واحدة} other {# حزم} } محددة",
+        "title": "العنوان",
+        "title-required": "العنوان مطلوب.",
+        "title-max-length": "يجب أن يكون العنوان أقل من 256 حرفًا",
+        "types": {
+            "firmware": "البرنامج الثابت",
+            "software": "البرنامج"
+        },
+        "upload-binary-file": "تحميل ملف ثنائي",
+        "use-external-url": "استخدم عنوان URL الخارجي",
+        "version": "الإصدار",
+        "version-required": "الإصدار مطلوب.",
+        "version-tag": "علامة الإصدار",
+        "version-tag-hint": "يجب أن تتطابق العلامة المخصصة مع الإصدار الذي يتم الإبلاغ عنه من قبل جهازك.",
+        "version-max-length": "يجب أن يكون الإصدار أقل من 256 حرفًا",
+        "warning-after-save-no-edit": "بمجرد تحميل الحزمة، لن تتمكن من تعديل العنوان، الإصدار، ملف ملف التعريف الخاص بالجهاز، ونوع الحزمة."
+    },
+    "position": {
+        "top": "أعلى",
+        "bottom": "أسفل",
+        "left": "يسار",
+        "right": "يمين"
+    },
+    "profile": {
+        "profile": "الملف الشخصي",
+        "last-login-time": "آخر تسجيل دخول",
+        "change-password": "تغيير كلمة المرور",
+        "current-password": "كلمة المرور الحالية",
+        "copy-jwt-token": "نسخ رمز JWT",
+        "jwt-token": "رمز JWT",
+        "token-valid-till": "الرمز صالح حتى",
+        "tokenCopiedSuccessMessage": "تم نسخ رمز JWT إلى الحافظة",
+        "tokenCopiedWarnMessage": "انتهت صلاحية رمز JWT! الرجاء، قم بتحديث الصفحة."
+    },
+    "profiles": {
+        "profiles": "الملفات الشخصية"
+    },
+    "security": {
+        "security": "الأمان",
+        "general-settings": "إعدادات الأمان العامة",
+        "access-token": "رمز الوصول",
+        "access-token-required": "رمز الوصول مطلوب",
+        "clientId": "معرف العميل",
+        "clientId-required": "معرف العميل مطلوب",
+        "username": "اسم المستخدم",
+        "username-required": "اسم المستخدم مطلوب",
+        "ca-cert": "شهادة CA",
+        "2fa": {
+            "2fa": "المصادقة ذات العاملين",
+            "2fa-description": "تحمي المصادقة ذات العاملين حسابك من الوصول غير المصرح به. كل ما عليك فعله هو إدخال رمز أمان عند تسجيل الدخول.",
+            "authenticate-with": "يمكنك المصادقة مع:",
+            "disable-2fa-provider-text": "سيجعل تعطيل {{name}} حسابك أقل أمانًا",
+            "disable-2fa-provider-title": "هل أنت متأكد أنك تريد تعطيل {{name}}؟",
+            "get-new-code": "الحصول على رمز جديد",
+            "main-2fa-method": "استخدم كأسلوب أساسي للمصادقة ذات العاملين",
+            "dialog": {
+                "activation-step-description-email": "في المرة القادمة التي تقوم فيها بتسجيل الدخول، سيُطلب منك إدخال الرمز الأمني الذي سيتم إرساله إلى عنوان بريدك الإلكتروني.",
+                "activation-step-description-sms": "في المرة القادمة التي تقوم فيها بتسجيل الدخول، سيُطلب منك إدخال الرمز الأمني الذي سيتم إرساله إلى رقم هاتفك.",
+                "activation-step-description-totp": "في المرة القادمة التي تقوم فيها بتسجيل الدخول، ستحتاج إلى تقديم رمز مصادقة ذو عاملين.",
+                "activation-step-label": "التفعيل",
+                "backup-code-description": "قم بطباعة الرموز حتى تتمكن من الوصول إليها عندما تحتاج إلى استخدامها لتسجيل الدخول إلى حسابك. يمكنك استخدام كل رمز احتياطي مرة واحدة.",
+                "backup-code-warn": "بمجرد مغادرتك لهذه الصفحة، لن يمكن عرض هذه الرموز مرة أخرى. قم بتخزينها بشكل آمن باستخدام الخيارات أدناه.",
+                "download-txt": "تنزيل (txt)",
+                "email-step-description": "أدخل بريدًا إلكترونيًا لاستخدامه كمصادق لك.",
+                "email-step-label": "بريد إلكتروني",
+                "enable-email-title": "تمكين المصادق الإلكتروني",
+                "enable-sms-title": "تمكين المصادق بالرسائل القصيرة",
+                "enable-totp-title": "تمكين تطبيق المصادق",
+                "enter-verification-code": "أدخل الرمز المكون من 6 أرقام هنا",
+                "get-backup-code-title": "الحصول على رمز احتياطي",
+                "next": "التالي",
+                "scan-qr-code": "مسح رمز الاستجابة السريعة هذا باستخدام تطبيق التحقق",
+                "send-code": "إرسال الرمز",
+                "sms-step-description": "أدخل رقم هاتف لاستخدامه كمصادق لك.",
+                "sms-step-label": "رقم الهاتف",
+                "success": "نجاح!",
+                "totp-step-description-install": "يمكنك تثبيت تطبيقات مثل Google Authenticator، Authy، أو Duo.",
+                "totp-step-description-open": "افتح تطبيق المصادق على هاتفك المحمول.",
+                "totp-step-label": "الحصول على التطبيق",
+                "verification-code": "الرمز المكون من 6 أرقام",
+                "verification-code-invalid": "تنسيق رمز التحقق غير صالح",
+                "verification-code-incorrect": "رمز التحقق غير صحيح",
+                "verification-code-many-request": "الكثير من الطلبات لفحص رمز التحقق",
+                "verification-step-description": "أدخل الرمز المكون من 6 أرقام الذي أرسلناه لـ {{address}}",
+                "verification-step-label": "التحقق"
+            },
+            "provider": {
+                "email": "البريد الإلكتروني",
+                "email-description": "استخدم رمز أمان يتم إرساله إلى عنوان بريدك الإلكتروني للمصادقة.",
+                "email-hint": "يتم إرسال رموز المصادقة عبر البريد الإلكتروني إلى {{ info }}",
+                "sms": "الرسائل القصيرة",
+                "sms-description": "استخدم هاتفك للمصادقة. سنرسل لك رمز أمان عبر رسالة نصية عند تسجيل الدخول.",
+                "sms-hint": "يتم إرسال رموز المصادقة عبر الرسائل النصية إلى {{ info }}",
+                "totp": "تطبيق المصادق",
+                "totp-description": "استخدم تطبيقات مثل Google Authenticator، Authy، أو Duo على هاتفك للمصادقة. سيقوم بتوليد رمز أمان لتسجيل الدخول.",
+                "totp-hint": "تم تهيئة تطبيق المصادق لحسابك",
+                "backup_code": "رمز النسخ الاحتياطي",
+                "backup-code-description": "تتيح لك هذه الرموز القابلة للطباعة استخدامها لتسجيل الدخول عندما تكون بعيدًا عن هاتفك، مثل عند السفر.",
+                "backup-code-hint": "{{ info }} من رموز الاستخدام مرة واحدة نشطة في الوقت الحالي"
+            }
+        },
+        "password-requirement": {
+            "at-least": "على الأقل:",
+            "character": "{ count, plural, =1 {حرف واحد} other {# أحرف} }",
+            "digit": "{ count, plural, =1 {رقم واحد} other {# أرقام} }",
+            "incorrect-password-try-again": "كلمة المرور غير صحيحة. حاول مرة أخرى",
+            "lowercase-letter": "{ count, plural, =1 {حرف صغير واحد} other {# حروف صغيرة} }",
+            "new-passwords-not-match": "لم تتطابق كلمة المرور الجديدة",
+            "password-should-not-contain-spaces": "كلمة المرور الخاصة بك لا يجب أن تحتوي على مسافات",
+            "password-not-meet-requirements": "لم تفي كلمة المرور بالمتطلبات",
+            "password-requirements": "متطلبات كلمة المرور",
+            "password-should-difference": "يجب أن تكون كلمة المرور الجديدة مختلفة عن الحالية",
+            "special-character": "{ count, plural, =1 {حرف خاص واحد} other {# أحرف خاصة} }",
+            "uppercase-letter": "{ count, plural, =1 {حرف كبير واحد} other {# حروف كبيرة} }",
+            "at-most": "في الحد الأقصى:"
+        }
+    },
+    "relation": {
+        "relations": "العلاقات",
+        "direction": "الاتجاه",
+        "clear-relation-type": "مسح نوع العلاقة",
+        "search-direction": {
+            "FROM": "من",
+            "TO": "إلى"
+        },
+        "direction-type": {
+            "FROM": "من",
+            "TO": "إلى"
+        },
+        "from-relations": "العلاقات الصادرة",
+        "to-relations": "العلاقات الواردة",
+        "selected-relations": "{ count, plural, =1 {1 علاقة} other {# علاقات} } تم اختيارها",
+        "type": "النوع",
+        "to-entity-type": "نوع الكيان المستلم",
+        "to-entity-name": "اسم الكيان المستلم",
+        "from-entity-type": "نوع الكيان المرسل",
+        "from-entity-name": "اسم الكيان المرسل",
+        "to-entity": "الكيان المستلم",
+        "from-entity": "الكيان المرسل",
+        "delete": "حذف العلاقة",
+        "relation-type": "نوع العلاقة",
+        "relation-type-required": "مطلوب نوع العلاقة.",
+        "relation-type-max-length": "يجب أن يكون طول نوع العلاقة أقل من 256 حرفًا",
+        "any-relation-type": "أي نوع",
+        "add": "إضافة علاقة",
+        "edit": "تحرير العلاقة",
+        "view": "عرض العلاقة",
+        "delete-to-relation-title": "هل أنت متأكد أنك تريد حذف العلاقة إلى الكيان '{{entityName}}'؟",
+        "delete-to-relation-text": "كن حذرًا، بعد التأكيد سيتم فصل الكيان '{{entityName}}' عن الكيان الحالي.",
+        "delete-to-relations-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 علاقة} other {# علاقات} }؟",
+        "delete-to-relations-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع العلاقات المحددة وستفصل الكيانات المقابلة عن الكيان الحالي.",
+        "delete-from-relation-title": "هل أنت متأكد أنك تريد حذف العلاقة من الكيان '{{entityName}}'؟",
+        "delete-from-relation-text": "كن حذرًا، بعد التأكيد سيتم فصل الكيان الحالي عن الكيان '{{entityName}}'.",
+        "delete-from-relations-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 علاقة} other {# علاقات} }؟",
+        "delete-from-relations-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع العلاقات المحددة وستفصل الكيانات الحالية عن الكيانات المقابلة.",
+        "remove-relation-filter": "إزالة فلتر العلاقة",
+        "remove-filter": "إزالة الفلتر",
+        "add-relation-filter": "إضافة فلتر العلاقة",
+        "any-relation": "أي علاقة",
+        "relation-filters": "مرشحات العلاقة",
+        "additional-info": "معلومات إضافية (JSON)",
+        "invalid-additional-info": "تعذر تحليل معلومات JSON الإضافية.",
+        "no-relations-text": "لم يتم العثور على علاقات"
+    },
+    "resource": {
+        "add": "إضافة مورد",
+        "all-types": "الكل",
+        "copyId": "نسخ معرّف المورد",
+        "delete": "حذف المورد",
+        "delete-resource-text": "كن حذرًا، بعد التأكيد سيصبح المورد غير قابل للاسترداد.",
+        "delete-resource-title": "هل أنت متأكد أنك تريد حذف المورد '{{resourceTitle}}'؟",
+        "delete-resources-action-title": "حذف { count, plural, =1 {1 مورد} other {# موارد} }",
+        "delete-resources-text": "يرجى ملاحظة أن الموارد المحددة، حتى لو كانت مستخدمة في ملفات تعريف الجهاز، ستتم حذفها.",
+        "delete-resources-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 مورد} other {# موارد} }؟",
+        "download": "تنزيل المورد",
+        "drop-file": "اسحب ملف مورد أو انقر لتحديد ملف للتحميل.",
+        "drop-resource-file-or": "اسحب وأفلت ملف مورد أو",
+        "empty": "المورد فارغ",
+        "file-name": "اسم الملف",
+        "idCopiedMessage": "تم نسخ معرّف المورد إلى الحافظة",
+        "no-resource-matching": "لم يتم العثور على مورد مطابق لـ '{{widgetsBundle}}'.",
+        "no-resource-text": "لم يتم العثور على موارد",
+        "open-widgets-bundle": "فتح حزمة الودجات",
+        "resource": "مورد",
+        "resource-file": "ملف المورد",
+        "resource-files": "ملفات المورد",
+        "resource-library-details": "تفاصيل المورد",
+        "resource-type": "نوع المورد",
+        "resources-library": "مكتبة الموارد",
+        "search": "البحث في الموارد",
+        "selected-resources": "{ count, plural, =1 {1 مورد} other {# موارد} } تم اختيارها",
+        "system": "النظام",
+        "title": "العنوان",
+        "title-required": "العنوان مطلوب.",
+        "title-max-length": "يجب أن يكون العنوان أقل من 256 حرفًا",
+        "type": {
+            "jks": "JKS",
+            "js-module": "وحدة JS",
+            "lwm2m-model": "نموذج LWM2M",
+            "pkcs-12": "PKCS #12"
+        }
+    },
+    "rulechain": {
+        "rulechain": "سلسلة القواعد",
+        "rulechain-events": "أحداث سلسلة القواعد",
+        "rulechains": "سلاسل القواعد",
+        "root": "الجذر",
+        "delete": "حذف سلسلة القواعد",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256 حرفًا",
+        "description": "الوصف",
+        "add": "إضافة سلسلة قواعد",
+        "set-root": "جعل سلسلة القواعد الجذر",
+        "set-root-rulechain-title": "هل أنت متأكد أنك تريد جعل سلسلة القواعد '{{ruleChainName}}' جذر؟",
+        "set-root-rulechain-text": "بعد التأكيد، ستصبح سلسلة القواعد جذرًا وستتعامل مع جميع رسائل النقل الواردة.",
+        "delete-rulechain-title": "هل أنت متأكد أنك تريد حذف سلسلة القواعد '{{ruleChainName}}'؟",
+        "delete-rulechain-text": "كن حذرًا، بعد التأكيد ستصبح سلسلة القواعد وجميع البيانات المتعلقة بها غير قابلة للاسترداد.",
+        "delete-rulechains-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 سلسلة قواعد} other {# سلاسل القواعد} }؟",
+        "delete-rulechains-action-title": "حذف { count, plural, =1 {1 سلسلة قواعد} other {# سلاسل القواعد} }",
+        "delete-rulechains-text": "كن حذرًا، بعد التأكيد ستتم إزالة جميع سلاسل القواعد المحددة وستصبح جميع البيانات المتعلقة بها غير قابلة للاسترداد.",
+        "add-rulechain-text": "إضافة سلسلة قواعد جديدة",
+        "no-rulechains-text": "لم يتم العثور على سلاسل قواعد",
+        "rulechain-details": "تفاصيل سلسلة القواعد",
+        "details": "تفاصيل",
+        "events": "أحداث",
+        "system": "النظام",
+        "import": "استيراد سلسلة القواعد",
+        "export": "تصدير سلسلة القواعد",
+        "export-failed-error": "يتعذر تصدير سلسلة القواعد: {{error}}",
+        "create-new-rulechain": "إنشاء سلسلة قواعد جديدة",
+        "rulechain-file": "ملف سلسلة القواعد",
+        "invalid-rulechain-file-error": "يتعذر استيراد سلسلة القواعد: هيكل البيانات غير صالح لسلسلة القواعد.",
+        "copyId": "نسخ معرّف سلسلة القواعد",
+        "idCopiedMessage": "تم نسخ معرّف سلسلة القواعد إلى الحافظة",
+        "select-rulechain": "اختر سلسلة القواعد",
+        "no-rulechains-matching": "لم يتم العثور على سلاسل قواعد تطابق '{{entity}}'.",
+        "rulechain-required": "سلسلة القواعد مطلوبة",
+        "management": "إدارة القواعد",
+        "debug-mode": "وضع التصحيح",
+        "search": "البحث في سلاسل القواعد",
+        "selected-rulechains": "{ count, plural, =1 {1 سلسلة قواعد} other {# سلاسل القواعد} } تم اختيارها",
+        "open-rulechain": "فتح سلسلة القواعد",
+        "edge-template-root": "الجذر النموذجي",
+        "assign-to-edge": "تعيين إلى حافة",
+        "edge-rulechain": "سلسلة القواعد الحافة",
+        "unassign-rulechain-from-edge-text": "بعد التأكيد، سيتم إلغاء تعيين سلسلة القواعد ولن تكون متاحة للحافة.",
+        "unassign-rulechains-from-edge-title": "هل أنت متأكد أنك تريد إلغاء تعيين { count, plural, =1 {1 سلسلة قواعد} other {# سلاسل القواعد} }؟",
+        "unassign-rulechains-from-edge-text": "بعد التأكيد، ستتم إلغاء تعيين جميع سلاسل القواعد المحددة ولن تكون متاحة للحافة.",
+        "assign-rulechain-to-edge-title": "تعيين سلسلة القواعد إلى الحافة",
+        "assign-rulechain-to-edge-text": "يرجى تحديد سلاسل القواعد لتعيينها إلى الحافة",
+        "set-edge-template-root-rulechain": "جعل سلسلة القواعد الجذر النموذجي للحافة",
+        "set-edge-tscheduler-eventemplate-root-rulechain": "جعل سلسلة القواعد الجذر النموذجي للحافة",
+        "set-edge-template-root-rulechain-title": "هل أنت متأكد أنك تريد جعل سلسلة القواعد '{{ruleChainName}}' جذرًا نموذجيًا للحافة؟",
+        "set-edge-template-root-rulechain-text": "بعد التأكيد، ستصبح سلسلة القواعد جذرًا نموذجيًا وستكون سلسلة القواعد الجذر للحافة الجديدة.",
+        "invalid-rulechain-type-error": "يتعذر استيراد سلسلة القواعد: نوع سلسلة القواعد غير صالح. النوع المتوقع هو {{expectedRuleChainType}}.",
+        "set-auto-assign-to-edge": "تعيين سلسلة القواعد للحافة عند الإنشاء تلقائيًا",
+        "set-auto-assign-to-edge-title": "هل أنت متأكد أنك تريد تعيين سلسلة القواعد الحافة '{{ruleChainName}}' إلى الحافة عند الإنشاء؟",
+        "set-auto-assign-to-edge-text": "بعد التأكيد، سيتم تعيين سلسلة القواعد الحافة تلقائيًا إلى الحافة عند الإنشاء.",
+        "unset-auto-assign-to-edge": "عدم تعيين سلسلة القواعد للحافة عند الإنشاء",
+        "unset-auto-assign-to-edge-title": "هل أنت متأكد أنك لا تريد تعيين سلسلة القواعد الحافة '{{ruleChainName}}' إلى الحافة عند الإنشاء؟",
+        "unset-auto-assign-to-edge-text": "بعد التأكيد، لن تتم تعيين سلسلة القواعد الحافة تلقائيًا إلى الحافة عند الإنشاء.",
+        "unassign-rulechain-title": "هل أنت متأكد أنك تريد إلغاء تعيين سلسلة القواعد '{{ruleChainName}}'؟",
+        "unassign-rulechains": "إلغاء تعيين سلاسل القواعد"
+    },
+    "rulenode": {
+        "rule-node-events": "أحداث عقدة القاعدة",
+        "details": "تفاصيل",
+        "events": "الأحداث",
+        "search": "البحث عن العقد",
+        "open-node-library": "فتح مكتبة العقد",
+        "close-node-library": "إغلاق مكتبة العقد",
+        "add": "إضافة عقدة قاعدة",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256 حرفًا",
+        "type": "النوع",
+        "rule-node-description": "وصف عقدة القاعدة",
+        "delete": "حذف عقدة القاعدة",
+        "select-all-objects": "تحديد جميع العقد والاتصالات",
+        "deselect-all-objects": "إلغاء تحديد جميع العقد والاتصالات",
+        "delete-selected-objects": "حذف العقد المحدد والاتصالات",
+        "delete-selected": "حذف المحدد",
+        "create-nested-rulechain": "إنشاء سلسلة قواعد متداخلة",
+        "select-all": "تحديد الكل",
+        "copy-selected": "نسخ المحدد",
+        "deselect-all": "إلغاء تحديد الكل",
+        "rulenode-details": "تفاصيل عقدة القاعدة",
+        "debug-mode": "وضع التصحيح",
+        "singleton-mode": "وضع المفرد",
+        "configuration": "التكوين",
+        "link": "رابط",
+        "link-details": "تفاصيل رابط عقدة القاعدة",
+        "add-link": "إضافة رابط",
+        "link-label": "تسمية الرابط",
+        "link-label-required": "تسمية الرابط مطلوبة.",
+        "custom-link-label": "تسمية الرابط المخصصة",
+        "custom-link-label-required": "تسمية الرابط المخصصة مطلوبة.",
+        "link-labels": "تسميات الرابط",
+        "link-labels-required": "تسميات الرابط مطلوبة.",
+        "no-link-labels-found": "لم يتم العثور على تسميات الرابط",
+        "no-link-label-matching": "لم يتم العثور على '{{label}}'.",
+        "create-new-link-label": "إنشاء واحدة جديدة!",
+        "type-filter": "تصفية",
+        "type-filter-details": "تصفية الرسائل الواردة بالشروط المكونة",
+        "type-enrichment": "تحسين",
+        "type-enrichment-details": "إضافة معلومات إضافية إلى بيانات الرسالة",
+        "type-transformation": "تحويل",
+        "type-transformation-details": "تغيير حمولة الرسالة والبيانات الوصفية",
+        "type-action": "إجراء",
+        "type-action-details": "القيام بإجراء خاص",
+        "type-analytics": "تحليلات",
+        "type-analytics-details": "إجراء تحليل للبيانات المبثوثة أو المخزنة",
+        "type-external": "خارجي",
+        "type-external-details": "التفاعل مع النظام الخارجي",
+        "type-rule-chain": "سلسلة القواعد",
+        "type-rule-chain-details": "إعادة توجيه الرسائل الواردة إلى سلسلة قواعد محددة",
+        "type-flow": "تدفق",
+        "type-flow-details": "تنظيم تدفق الرسالة",
+        "type-input": "الإدخال",
+        "type-input-details": "المدخل اللوجي لسلسلة القواعد، يعيد الرسائل الواردة إلى العقدة القاعدية المتصلة التالية",
+        "type-unknown": "غير معروف",
+        "type-unknown-details": "عقدة قاعدة غير محلولة",
+        "directive-is-not-loaded": "تعليمة التكوين المحددة '{{directiveName}}' غير متوفرة.",
+        "ui-resources-load-error": "فشل في تحميل موارد واجهة المستخدم للتكوين.",
+        "invalid-target-rulechain": "يتعذر حل سلسلة القواعد المستهدفة!",
+        "test-script-function": "وظيفة اختبار النص",
+        "script-lang-java-script": "جافا سكريبت",
+        "script-lang-tbel": "TBEL",
+        "message": "الرسالة",
+        "message-type": "نوع الرسالة",
+        "select-message-type": "حدد نوع الرسالة",
+        "message-type-required": "نوع الرسالة مطلوب",
+        "metadata": "البيانات الوصفية",
+        "metadata-required": "يجب ألا تكون إدخالات البيانات الوصفية فارغة.",
+        "output": "الإخراج",
+        "test": "اختبار",
+        "help": "مساعدة",
+        "reset-debug-mode": "إعادة تعيين وضع التصحيح في جميع العقد",
+        "test-with-this-message": "{{test}} مع هذه الرسالة"
+    },
+    "role": {
+        "role": "الدور",
+        "roles": "الأدوار",
+        "management": "إدارة الأدوار",
+        "view-roles": "عرض الأدوار",
+        "no-roles-matching": "لا توجد أدوار تطابق '{{entity}}' تم العثور عليها.",
+        "role-list": "قائمة الأدوار",
+        "role-list-required": "قائمة الأدوار مطلوبة",
+        "add": "إضافة دور",
+        "view": "عرض الدور",
+        "search": "البحث عن الأدوار",
+        "selected-roles": "{ count, plural, =1 {1 دور} other {# أدوار} } تم اختيارها",
+        "no-roles-text": "لا توجد أدوار متاحة",
+        "role-details": "تفاصيل الدور",
+        "add-role-text": "إضافة دور جديد",
+        "delete": "حذف الدور",
+        "delete-roles": "حذف الأدوار",
+        "delete-role-title": "هل أنت متأكد أنك تريد حذف الدور '{{roleName}}'؟",
+        "delete-role-text": "تنبيه، بعد التأكيد سيتم حذف الدور وجميع البيانات المرتبطة به نهائياً.",
+        "delete-roles-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 دور} other {# أدوار} }؟",
+        "delete-roles-action-title": "حذف { count, plural, =1 {1 دور} other {# أدوار} }",
+        "delete-roles-text": "تنبيه، بعد التأكيد سيتم حذف جميع الأدوار المحددة وجميع البيانات المرتبطة بها نهائياً.",
+        "role-type": "نوع الدور",
+        "role-type-required": "نوع الدور مطلوب.",
+        "select-role-type": "حدد نوع الدور",
+        "enter-role-type": "أدخل نوع الدور",
+        "any-role": "أي دور",
+        "no-role-types-matching": "لا توجد أنواع أدوار تطابق '{{entitySubtype}}' تم العثور عليها.",
+        "role-type-list-empty": "لم يتم اختيار أنواع الأدوار.",
+        "role-types": "أنواع الأدوار",
+        "created-time": "وقت الإنشاء",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256 حرفًا",
+        "description": "الوصف",
+        "events": "الأحداث",
+        "details": "تفاصيل",
+        "copyId": "نسخ معرف الدور",
+        "idCopiedMessage": "تم نسخ معرف الدور إلى الحافظة",
+        "permissions": "الأذونات",
+        "role-required": "الدور مطلوب",
+        "roles-required": "الأدوار مطلوبة",
+        "display-type": {
+            "GENERIC": "عام",
+            "GROUP": "مجموعة"
+        }
+    },
+    "group-permission": {
+        "user-group-roles": "أدوار مجموعة المستخدمين",
+        "entity-group-permissions": "أذونات مجموعة الكيانات",
+        "role-type": "نوع الدور",
+        "role-name": "اسم الدور",
+        "group-type": "نوع المجموعة",
+        "group-name": "اسم المجموعة",
+        "group-owner": "مالك المجموعة",
+        "user-group-name": "اسم مجموعة المستخدمين",
+        "user-group-owner": "مالك مجموعة المستخدمين",
+        "edit": "تعديل الأذونات",
+        "delete": "حذف الأذونات",
+        "selected-group-permissions": "{ count, plural, =1 {1 أذن مجموعة} other {# أذونات مجموعة} } محددة",
+        "delete-group-permission-title": "هل أنت متأكد أنك تريد حذف إذن المجموعة '{{roleName}}'؟",
+        "delete-group-permission-text": "تنبيه، بعد التأكيد سيتم حذف إذن المجموعة وجميع البيانات المرتبطة به نهائياً.",
+        "delete-group-permission": "حذف إذن المجموعة",
+        "delete-group-permissions-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 أذن مجموعة} other {# أذن مجموعة} }؟",
+        "delete-group-permissions-text": "تنبيه، بعد التأكيد سيتم حذف جميع أذونات المجموعة المحددة وسيفقد المستخدمون المقابلين الوصول إلى الموارد المحددة.",
+        "delete-group-permissions": "حذف أذونات المجموعة",
+        "add-group-permission": "إضافة إذن مجموعة",
+        "edit-group-permission": "تعديل إذن مجموعة",
+        "entity-group": "مجموعة الكيان",
+        "user-group": "مجموعة المستخدمين",
+        "no-owners-matching": "لم يتم العثور على مالكين مطابقين '{{owner}}'.",
+        "target-owner-required": "مالك مجموعة الكيان مطلوب.",
+        "target-user-group-owner-required": "مالك مجموعة المستخدمين مطلوب.",
+        "no-group-permissions-text": "لم يتم العثور على أذونات المجموعة"
+    },
+    "permission": {
+        "permissions-required": "يجب تحديد مدخل واحد على الأقل للإذن.",
+        "remove-permission": "إزالة مدخل الإذن",
+        "add-permission": "إضافة مدخل الإذن",
+        "other": "آخر",
+        "resource": {
+            "resource": "المورد",
+            "select-resource": "حدد المورد",
+            "resource-required": "المورد مطلوب",
+            "no-resources-matching": "لم يتم العثور على موارد تطابق '{{resource}}'.",
+            "display-type": {
+                "ALL": "الكل",
+                "PROFILE": "الملف الشخصي",
+                "ADMIN_SETTINGS": "إعدادات المسؤول",
+                "ALARM": "التنبيه",
+                "DEVICE": "الجهاز",
+                "DEVICE_PROFILE": "ملف الجهاز",
+                "ASSET": "الأصل",
+                "CUSTOMER": "العميل",
+                "DASHBOARD": "لوحة المعلومات",
+                "ENTITY_VIEW": "عرض الكيان",
+                "EDGE": "الحافة",
+                "TENANT": "المستأجر",
+                "TENANT_PROFILE": "ملف المستأجر",
+                "RULE_CHAIN": "سلسلة القواعد",
+                "USER": "المستخدم",
+                "WIDGETS_BUNDLE": "حزمة الودجات",
+                "WIDGET_TYPE": "نوع الودجة",
+                "CONVERTER": "المحول",
+                "INTEGRATION": "التكامل",
+                "SCHEDULER_EVENT": "حدث المجدول",
+                "BLOB_ENTITY": "كيان البيانات الكبيرة",
+                "CUSTOMER_GROUP": "مجموعة العملاء",
+                "DEVICE_GROUP": "مجموعة الأجهزة",
+                "ASSET_GROUP": "مجموعة الأصول",
+                "USER_GROUP": "مجموعة المستخدمين",
+                "ENTITY_VIEW_GROUP": "مجموعة عرض الكيان",
+                "DASHBOARD_GROUP": "مجموعة لوحة المعلومات",
+                "ROLE": "الدور",
+                "GROUP_PERMISSION": "إذن المجموعة",
+                "WHITE_LABELING": "العلامات البيضاء",
+                "AUDIT_LOG": "سجل التدقيق",
+                "API_USAGE_STATE": "حالة استخدام واجهة البرمجة",
+                "TB_RESOURCE": "المورد",
+                "EDGE_GROUP": "مجموعة الحافة",
+                "OTA_PACKAGE": "حزمة OTA",
+                "QUEUE": "الطابور",
+                "VERSION_CONTROL": "التحكم في الإصدارات",
+                "ASSET_PROFILE": "ملف الأصول",
+                "NOTIFICATION": "الإشعار"
+            }
+        },
+        "operation": {
+            "operation": "العملية",
+            "operations": "العمليات",
+            "operations-required": "يجب تحديد عملية واحدة على الأقل.",
+            "enter-operation": "أدخل العملية",
+            "no-operations-matching": "لم يتم العثور على عمليات تطابق '{{operation}}'.",
+            "display-type": {
+                "ALL": "الكل",
+                "CREATE": "إنشاء",
+                "READ": "قراءة",
+                "WRITE": "كتابة",
+                "DELETE": "حذف",
+                "ASSIGN_TO_CUSTOMER": "تعيين للعميل",
+                "UNASSIGN_FROM_CUSTOMER": "إلغاء التعيين من العميل",
+                "RPC_CALL": "استدعاء RPC",
+                "READ_CREDENTIALS": "قراءة الاعتمادات",
+                "WRITE_CREDENTIALS": "كتابة الاعتمادات",
+                "READ_ATTRIBUTES": "قراءة السمات",
+                "WRITE_ATTRIBUTES": "كتابة السمات",
+                "READ_TELEMETRY": "قراءة البيانات الحيوية",
+                "WRITE_TELEMETRY": "كتابة البيانات الحيوية",
+                "CLAIM_DEVICES": "مطالبة الأجهزة",
+                "IMPERSONATE": "تقمص الشخصية",
+                "CHANGE_OWNER": "تغيير المالك",
+                "ADD_TO_GROUP": "إضافة إلى المجموعة",
+                "REMOVE_FROM_GROUP": "إزالة من المجموعة",
+                "SHARE_GROUP": "مشاركة المجموعة",
+                "ASSIGN_TO_TENANT": "تعيين للمستأجر"
+            }
+        }
+    },
+    "scheduler": {
+        "scheduler": "الجدول الزمني",
+        "scheduler-event": "حدث الجدول الزمني",
+        "select-scheduler-event": "حدد حدث الجدول الزمني",
+        "no-scheduler-events-matching": "لم يتم العثور على أحداث جدول زمني تطابق '{{entity}}'.",
+        "scheduler-event-required": "حدث الجدول الزمني مطلوب",
+        "management": "إدارة الجدول الزمني",
+        "scheduler-events": "أحداث الجدول الزمني",
+        "add-scheduler-event": "إضافة حدث جدول زمني",
+        "search-scheduler-events": "بحث عن أحداث جدول زمني",
+        "created-time": "وقت الإنشاء",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256 حرفًا",
+        "type": "النوع",
+        "created_customer": "تم إنشاؤه بواسطة العميل",
+        "edit-scheduler-event": "تحرير حدث الجدول الزمني",
+        "view-scheduler-event": "عرض حدث الجدول الزمني",
+        "delete-scheduler-event": "حذف حدث الجدول الزمني",
+        "no-scheduler-events": "لا توجد أحداث جدول زمني",
+        "selected-scheduler-events": "{ count, plural, =1 {1 حدث جدول زمني} other {# أحداث جدول زمني} } محددة",
+        "delete-scheduler-event-title": "هل أنت متأكد أنك تريد حذف حدث الجدول الزمني '{{schedulerEventName}}'؟",
+        "delete-scheduler-event-text": "تنبيه، بعد التأكيد سيتم حذف حدث الجدول الزمني وجميع البيانات المرتبطة به نهائياً.",
+        "delete-scheduler-events-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 حدث جدول زمني} other {# أحداث جدول زمني} }؟",
+        "delete-scheduler-events-text": "تنبيه، بعد التأكيد سيتم حذف جميع أحداث الجدول الزمني المحددة وسيتم حذف جميع البيانات المرتبطة بها نهائياً.",
+        "create": "إنشاء حدث جدول زمني",
+        "edit": "تحرير حدث جدول زمني",
+        "view": "عرض حدث جدول زمني",
+        "configuration": "التكوين",
+        "schedule": "الجدول",
+        "start-time": "وقت البدء",
+        "repeat": "كرر",
+        "repeats": "تكرارات",
+        "daily": "يومياً",
+        "every-n-days": "كل يوم",
+        "every-n-days-text": "كل { days, plural, =1 {يوم} other {# أيام} }",
+        "weekly": "أسبوعياً",
+        "every-n-weeks": "كل أسبوع",
+        "every-n-weeks-text": "كل { weeks, plural, =1 {أسبوع} other {# أسابيع} }",
+        "monthly": "شهرياً",
+        "yearly": "سنوياً",
+        "timer": "بناءً على المؤقت",
+        "repeats-required": "التكرارات مطلوبة.",
+        "repeat-on": "تكرار على",
+        "repeat-every": "كرر كل",
+        "repeat-every-n-days": "كرر كل يوم",
+        "repeat-days-required": "عدد الأيام للتكرار مطلوب.",
+        "invalid-repeat-days-value": "يجب أن يكون عدد الأيام للتكرار عددًا صحيحًا إيجابيًا.",
+        "repeat-every-n-weeks": "كرر كل أسبوع",
+        "repeat-weeks-required": "عدد الأسابيع للتكرار مطلوب.",
+        "invalid-repeat-weeks-value": "يجب أن يكون عدد الأسابيع للتكرار عددًا صحيحًا إيجابيًا.",
+        "ends-on": "ينتهي في",
+        "sunday-label": "ح",
+        "monday-label": "ن",
+        "tuesday-label": "ث",
+        "wednesday-label": "ر",
+        "thursday-label": "خ",
+        "friday-label": "ج",
+        "saturday-label": "س",
+        "repeat-on-sunday": "كرر يوم الأحد",
+        "repeat-on-monday": "كرر يوم الاثنين",
+        "repeat-on-tuesday": "كرر يوم الثلاثاء",
+        "repeat-on-wednesday": "كرر يوم الأربعاء",
+        "repeat-on-thursday": "كرر يوم الخميس",
+        "repeat-on-friday": "كرر يوم الجمعة",
+        "repeat-on-saturday": "كرر يوم السبت",
+        "event-type": "نوع الحدث",
+        "select-event-type": "حدد نوع الحدث",
+        "event-type-required": "نوع الحدث مطلوب.",
+        "event-type-max-length": "يجب أن يكون نوع الحدث أقل من 256 حرفًا.",
+        "list-mode": "عرض القائمة",
+        "calendar-mode": "عرض التقويم",
+        "calendar-view-type": "نوع عرض التقويم",
+        "month": "شهر",
+        "week": "أسبوع",
+        "day": "يوم",
+        "agenda-week": "جدول أسبوع",
+        "agenda-day": "جدول يوم",
+        "list-year": "قائمة السنة",
+        "list-month": "قائمة الشهر",
+        "list-week": "قائمة الأسبوع",
+        "list-day": "قائمة اليوم",
+        "today": "اليوم",
+        "navigate-before": "التنقل قبل",
+        "navigate-next": "التنقل التالي",
+        "starting-from": "ابتداءً من",
+        "until": "حتى",
+        "on": "في",
+        "sunday": "الأحد",
+        "monday": "الاثنين",
+        "tuesday": "الثلاثاء",
+        "wednesday": "الأربعاء",
+        "thursday": "الخميس",
+        "friday": "الجمعة",
+        "saturday": "السبت",
+        "originator": "المبدأ",
+        "single-entity": "كيان فردي",
+        "group-of-entities": "مجموعة من الكيانات",
+        "entities-group-owner": "مالك مجموعة الكيانات",
+        "single-device": "جهاز فردي",
+        "group-of-devices": "مجموعة من الأجهزة",
+        "devices-group-owner": "مالك مجموعة الأجهزة",
+        "message-body": "نص الرسالة",
+        "target": "الهدف",
+        "rpc-method": "الطريقة",
+        "rpc-method-required": "الطريقة مطلوبة",
+        "rpc-method-white-space": "لا يُسمح بالمسافات البيضاء.",
+        "rpc-params": "المعلمات",
+        "select-dashboard-state": "حدد حالة لوحة التحكم",
+        "hours": "ساعات",
+        "minutes": "دقائق",
+        "seconds": "ثواني",
+        "time-interval-required": "فترة الزمن مطلوبة",
+        "time-unit-required": "وحدة الزمن مطلوبة",
+        "every-hour": "كل { count, plural, =1 {ساعة} other {# ساعات} }",
+        "every-minute": "كل { count, plural, =1 {دقيقة} other {# دقائق} }",
+        "every-second": "كل { count, plural, =1 {ثانية} other {# ثواني} }",
+        "invalid-time": "وقت غير صالح",
+        "rpc-request-timeout": "مهلة طلب RPC (مللي ثانية)",
+        "rpc-request-persistent": "طلب RPC دائم",
+        "rpc-request-oneway-command": "طلب RPC في اتجاه واحد",
+        "rpc-value-min-error": "يجب أن تكون القيمة أكبر من {{min}} مللي ثانية.",
+        "set": "تعيين",
+        "rpc-settings": "إعدادات RPC"
+    },
+    "report": {
+        "report-config": "تكوين التقرير",
+        "email-config": "تكوين البريد الإلكتروني",
+        "dashboard-state-param": "قيمة معلمة حالة لوحة التحكم",
+        "base-url": "عنوان URL الأساسي",
+        "base-url-required": "عنوان URL الأساسي مطلوب.",
+        "use-dashboard-timewindow": "استخدم نافذة الوقت للوحة التحكم",
+        "timewindow": "نافذة الوقت",
+        "name-pattern": "نمط اسم التقرير",
+        "name-pattern-required": "نمط اسم التقرير مطلوب",
+        "type": "نوع التقرير",
+        "use-current-user-credentials": "استخدم بيانات اعتماد المستخدم الحالي",
+        "customer-user-credentials": "بيانات اعتماد مستخدم العميل",
+        "customer-user-credentials-required": "بيانات اعتماد مستخدم العميل مطلوبة",
+        "generate-test-report": "إنشاء تقرير اختباري",
+        "send-email": "إرسال بريد إلكتروني",
+        "from": "من",
+        "from-required": "المرسل مطلوب.",
+        "to": "إلى",
+        "to-required": "المرسل إليه مطلوب.",
+        "cc": "نسخة",
+        "bcc": "نسخة مخفية",
+        "subject": "الموضوع",
+        "subject-required": "الموضوع مطلوب.",
+        "body": "النص",
+        "body-required": "النص مطلوب."
+    },
+    "blob-entity": {
+        "blob-entity": "كيان بيانات كبيرة",
+        "select-blob-entity": "حدد كيان بيانات كبيرة",
+        "no-blob-entities-matching": "لم يتم العثور على كيانات بيانات كبيرة تطابق '{{entity}}'.",
+        "blob-entity-required": "الكيان بيانات كبيرة مطلوب",
+        "files": "الملفات",
+        "search": "البحث عن ملفات",
+        "clear-search": "مسح البحث",
+        "no-blob-entities-prompt": "لم يتم العثور على ملفات",
+        "report": "تقرير",
+        "created-time": "وقت الإنشاء",
+        "name": "الاسم",
+        "type": "النوع",
+        "created_customer": "تم الإنشاء بواسطة العميل",
+        "selected-blob-entities": "{ count, plural, =1 {ملف واحد} other {# ملفات} } محددة",
+        "download-blob-entity": "تنزيل الملف",
+        "delete-blob-entity": "حذف الملف",
+        "delete-blob-entity-title": "هل أنت متأكد أنك تريد حذف الملف '{{blobEntityName}}'؟",
+        "delete-blob-entity-text": "كن حذرًا، بعد التأكيد ستصبح بيانات الملف غير قابلة للاسترداد.",
+        "delete-blob-entities-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {ملف واحد} other {# ملفات} }؟",
+        "delete-blob-entities-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع الملفات المحددة وستصبح جميع البيانات ذات الصلة غير قابلة للاسترداد."
+    },
+    "timezone": {
+        "timezone": "المنطقة الزمنية",
+        "select-timezone": "حدد المنطقة الزمنية",
+        "no-timezones-matching": "لم يتم العثور على مناطق زمنية تطابق '{{timezone}}'.",
+        "timezone-required": "المنطقة الزمنية مطلوبة.",
+        "browser-time": "وقت المتصفح"
+    },
+    "queue": {
+        "queue-name": "اسم الطابور",
+        "no-queues-found": "لم يتم العثور على أي طوابور.",
+        "no-queues-matching": "لم يتم العثور على أي طوابور مطابقة لـ '{{queue}}'.",
+        "select-name": "حدد اسم الطابور",
+        "name": "الاسم",
+        "name-required": "اسم الطابور مطلوب!",
+        "name-unique": "اسم الطابور غير فريد!",
+        "name-pattern": "اسم الطابور يحتوي على حرف غير الأحرف الأبجدية الرقمية ASCII و '.', '_' و '-'!",
+        "queue-required": "الطابور مطلوب!",
+        "topic-required": "موضوع الطابور مطلوب!",
+        "poll-interval-required": "فاصل التصويت مطلوب!",
+        "poll-interval-min-value": "لا يمكن أن يكون قيمة فاصل التصويت أقل من 1",
+        "partitions-required": "التقسيمات مطلوبة!",
+        "partitions-min-value": "لا يمكن أن تكون قيمة التقسيمات أقل من 1",
+        "pack-processing-timeout-required": "مهلة معالجة الحزمة مطلوبة",
+        "pack-processing-timeout-min-value": "لا يمكن أن تكون قيمة مهلة معالجة الحزمة أقل من 1",
+        "batch-size-required": "حجم الدفعة مطلوب!",
+        "batch-size-min-value": "لا يمكن أن يكون حجم الدفعة أقل من 1",
+        "retries-required": "عدد محاولات إعادة المحاولة مطلوب!",
+        "retries-min-value": "لا يمكن أن يكون قيمة إعادة المحاولة سالبة",
+        "failure-percentage-required": "نسبة الفشل مطلوبة!",
+        "failure-percentage-min-value": "لا يمكن أن تكون قيمة نسبة الفشل أقل من 0",
+        "failure-percentage-max-value": "لا يمكن أن تكون قيمة نسبة الفشل أكثر من 100",
+        "pause-between-retries-required": "وقت التوقف بين المحاولات مطلوب!",
+        "pause-between-retries-min-value": "لا يمكن أن يكون وقت التوقف بين المحاولات أقل من 1",
+        "max-pause-between-retries-required": "الحد الأقصى لوقت التوقف بين المحاولات مطلوب!",
+        "max-pause-between-retries-min-value": "لا يمكن أن يكون الحد الأقصى لوقت التوقف بين المحاولات أقل من 1",
+        "submit-strategy-type-required": "نوع استراتيجية الإرسال مطلوب!",
+        "processing-strategy-type-required": "نوع استراتيجية المعالجة مطلوب!",
+        "queues": "الطوابور",
+        "selected-queues": "{ count, plural, =1 {1 طابور} other {# طوابور} } تم تحديدها",
+        "delete-queue-title": "هل أنت متأكد أنك تريد حذف الطابور '{{queueName}}'؟",
+        "delete-queues-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 طابور} other {# طوابور} }؟",
+        "delete-queue-text": "كن حذرًا، بعد التأكيد سيصبح الطابور وجميع البيانات ذات الصلة غير قابلة للاسترداد.",
+        "delete-queues-text": "بعد التأكيد سيتم حذف جميع الطوابور المحددة ولن يمكن الوصول إليها.",
+        "search": "البحث عن طابور",
+        "add": "إضافة طابور",
+        "details": "تفاصيل الطابور",
+        "topic": "الموضوع",
+        "submit-settings": "إعدادات الإرسال",
+        "submit-strategy": "نوع الاستراتيجية *",
+        "grouping-parameter": "معلمة التجميع",
+        "processing-settings": "إعدادات معالجة إعادة المحاولة",
+        "processing-strategy": "نوع المعالجة *",
+        "retries-settings": "إعدادات إعادة المحاولة",
+        "polling-settings": "إعدادات التصويت",
+        "batch-processing": "معالجة دفعة",
+        "poll-interval": "فاصل التصويت",
+        "partitions": "التقسيمات",
+        "immediate-processing": "المعالجة الفورية",
+        "consumer-per-partition": "إرسال رسالة تصويت لكل مستهلك",
+        "consumer-per-partition-hint": "تمكين مستهلك (أو مستهلكين) منفصلين لكل قسم",
+        "processing-timeout": "المعالجة ضمن، مللي ثانية",
+        "batch-size": "حجم الدفعة",
+        "retries": "عدد محاولات الإعادة (0 - غير محدود)",
+        "failure-percentage": "نسبة الرسائل الفاشلة لتخطي محاولات الإعادة",
+        "pause-between-retries": "التوقف بين المحاولات، ثانية",
+        "max-pause-between-retries": "التوقف الأقصى بين المحاولات، ثانية",
+        "delete": "حذف الطابور",
+        "copyId": "نسخ معرّف الطابور",
+        "idCopiedMessage": "تم نسخ معرّف الطابور إلى الحافظة",
+        "description": "الوصف",
+        "description-hint": "سيتم عرض هذا النص في وصف الطابور بدلاً من الاستراتيجية المحددة",
+        "alt-description": "استراتيجية الإرسال: {{submitStrategy}}, استراتيجية المعالجة: {{processingStrategy}}",
+        "custom-properties": "خصائص مخصصة",
+        "custom-properties-hint": "خصائص إنشاء طابور (موضوع) مخصصة، على سبيل المثال 'retention.ms:604800000;retention.bytes:1048576000'",
+        "strategies": {
+            "sequential-by-originator-label": "تسلسلي حسب المبادر",
+            "sequential-by-originator-hint": "لا يتم تقديم رسالة جديدة عن طريق الجهاز أ حتى يتم الاعتراف بالرسالة السابقة للجهاز أ",
+            "sequential-by-tenant-label": "تسلسلي حسب المستأجر",
+            "sequential-by-tenant-hint": "لا يتم تقديم رسالة جديدة للمستأجر أ حتى يتم الاعتراف بالرسالة السابقة للمستأجر أ",
+            "sequential-label": "تسلسلي",
+            "sequential-hint": "لا يتم تقديم رسالة جديدة حتى يتم الاعتراف بالرسالة السابقة",
+            "burst-label": "انفجار",
+            "burst-hint": "تتم تقديم جميع الرسائل إلى سلاسل القواعد بالترتيب الذي يصلون به",
+            "batch-label": "دفعة",
+            "batch-hint": "لا يتم تقديم دفعة جديدة حتى يتم الاعتراف بالدفعة السابقة",
+            "skip-all-failures-label": "تخطي جميع الفشل",
+            "skip-all-failures-hint": "تجاهل جميع الأخطاء",
+            "skip-all-failures-and-timeouts-label": "تخطي جميع الفشل والمهلات",
+            "skip-all-failures-and-timeouts-hint": "تجاهل جميع الأخطاء والمهلات",
+            "retry-all-label": "إعادة المحاولة للجميع",
+            "retry-all-hint": "إعادة محاولة جميع الرسائل من حزمة المعالجة",
+            "retry-failed-label": "إعادة محاولة الفشل",
+            "retry-failed-hint": "إعادة محاولة جميع الرسائل الفاشلة من حزمة المعالجة",
+            "retry-timeout-label": "إعادة المحاولة للمهلة",
+            "retry-timeout-hint": "إعادة محاولة جميع الرسائل المنتهية المهلة من حزمة المعالجة",
+            "retry-failed-and-timeout-label": "إعادة المحاولة للفشل والمهلة",
+            "retry-failed-and-timeout-hint": "إعادة محاولة جميع الرسائل الفاشلة والمنتهية المهلة من حزمة المعالجة"
+        }
+    },
+    "server-error": {
+        "general": "خطأ عام في الخادم",
+        "authentication": "خطأ في المصادقة",
+        "jwt-token-expired": "انتهت صلاحية رمز JWT",
+        "tenant-trial-expired": "انتهت مدة التجربة للمستأجر",
+        "credentials-expired": "انتهت صلاحية الاعتمادات",
+        "permission-denied": "رفض الإذن",
+        "invalid-arguments": "وسيطات غير صالحة",
+        "bad-request-params": "معلمات الطلب غير صالحة",
+        "item-not-found": "العنصر غير موجود",
+        "too-many-requests": "الكثير من الطلبات",
+        "too-many-updates": "الكثير من التحديثات"
+    },
+    "tenant": {
+        "tenant": "المستأجر",
+        "tenants": "المستأجرون",
+        "management": "إدارة المستأجرين",
+        "add": "إضافة مستأجر",
+        "admins": "المسؤولون",
+        "manage-tenant-admins": "إدارة مسؤولي المستأجر",
+        "delete": "حذف المستأجر",
+        "add-tenant-text": "إضافة مستأجر جديد",
+        "no-tenants-text": "لم يتم العثور على مستأجرين",
+        "tenant-details": "تفاصيل المستأجر",
+        "title-max-length": "يجب أن يكون العنوان أقل من 256 حرفًا",
+        "delete-tenant-title": "هل أنت متأكد أنك تريد حذف المستأجر '{{tenantTitle}}'؟",
+        "delete-tenant-text": "كن حذرًا، بعد التأكيد سيصبح المستأجر وجميع البيانات ذات الصلة غير قابلة للاسترداد.",
+        "delete-tenants-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {1 مستأجر} other {# مستأجرون} }؟",
+        "delete-tenants-action-title": "حذف { count, plural, =1 {1 مستأجر} other {# مستأجرون} }",
+        "delete-tenants-text": "بعد التأكيد سيتم حذف جميع المستأجرين المحددين ولن يمكن الوصول إليها.",
+        "title": "العنوان",
+        "title-required": "العنوان مطلوب.",
+        "description": "الوصف",
+        "details": "تفاصيل",
+        "events": "الأحداث",
+        "copyId": "نسخ معرّف المستأجر",
+        "idCopiedMessage": "تم نسخ معرّف المستأجر إلى الحافظة",
+        "select-tenant": "تحديد المستأجر",
+        "no-tenants-matching": "لم يتم العثور على مستأجرين مطابقين لـ '{{entity}}'.",
+        "tenant-required": "المستأجر مطلوب",
+        "allow-white-labeling": "السماح بالتسمية البيضاء",
+        "allow-customer-white-labeling": "السماح بالتسمية البيضاء للعميل",
+        "search": "البحث عن المستأجرين",
+        "selected-tenants": "{ count, plural, =1 {1 مستأجر} other {# مستأجرون} } تم تحديدها",
+        "isolated-tb-rule-engine": "استخدام طوابور محرك قواعد ThingsBoard المعزولة",
+        "isolated-tb-rule-engine-details": "سيكون لكل مستأجر طوابور محرك قواعد مخصصة"
+    },
+    "tenant-profile": {
+        "tenant-profile": "ملف المستأجر",
+        "tenant-profiles": "ملفات المستأجرين",
+        "add": "إضافة ملف مستأجر",
+        "add-profile": "إضافة ملف",
+        "edit": "تعديل ملف المستأجر",
+        "tenant-profile-details": "تفاصيل ملف المستأجر",
+        "no-tenant-profiles-text": "لم يتم العثور على ملفات مستأجرين",
+        "name-max-length": "يجب أن يكون الاسم أقل من 256",
+        "search": "بحث في ملفات المستأجرين",
+        "selected-tenant-profiles": "{ count, plural, =1 {ملف مستأجر واحد} other {# من ملفات المستأجرين} } مُحدد",
+        "no-tenant-profiles-matching": "لم يتم العثور على ملف مستأجر يطابق '{{entity}}'.",
+        "tenant-profile-required": "ملف المستأجر مطلوب",
+        "idCopiedMessage": "تم نسخ معرف ملف المستأجر إلى الحافظة",
+        "set-default": "جعل ملف المستأجر افتراضي",
+        "delete": "حذف ملف المستأجر",
+        "copyId": "نسخ معرف ملف المستأجر",
+        "name": "الاسم",
+        "name-required": "الاسم مطلوب.",
+        "data": "بيانات الملف",
+        "profile-configuration": "تهيئة الملف",
+        "description": "الوصف",
+        "default": "افتراضي",
+        "delete-tenant-profile-title": "هل أنت متأكد أنك تريد حذف ملف المستأجر '{{tenantProfileName}}'؟",
+        "delete-tenant-profile-text": "كن حذرًا، بعد التأكيد سيصبح ملف المستأجر وجميع البيانات ذات الصلة غير قابلة للاسترداد.",
+        "delete-tenant-profiles-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {ملف مستأجر واحد} other {# من ملفات المستأجرين} }؟",
+        "delete-tenant-profiles-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع ملفات المستأجرين المحددة وستصبح جميع البيانات ذات الصلة غير قابلة للاسترداد.",
+        "set-default-tenant-profile-title": "هل أنت متأكد أنك تريد جعل ملف المستأجر '{{tenantProfileName}}' افتراضي؟",
+        "set-default-tenant-profile-text": "بعد التأكيد، سيتم وضع علامة على ملف المستأجر كافتراضي وسيتم استخدامه للمستأجرين الجدد بدون ملف محدد.",
+        "no-tenant-profiles-found": "لم يتم العثور على ملفات مستأجرين.",
+        "create-new-tenant-profile": "إنشاء واحد جديد!",
+        "create-tenant-profile": "إنشاء ملف مستأجر جديد",
+        "import": "استيراد ملف المستأجر",
+        "export": "تصدير ملف المستأجر",
+        "export-failed-error": "تعذر تصدير ملف المستأجر: {{error}}",
+        "tenant-profile-file": "ملف مستأجر",
+        "invalid-tenant-profile-file-error": "تعذر استيراد ملف المستأجر: هيكل بيانات ملف المستأجر غير صالح.",
+        "advanced-settings": "الإعدادات المتقدمة",
+        "entities": "الكيانات",
+        "rule-engine": "محرك القواعد",
+        "time-to-live": "الوقت حتى الحياة",
+        "alarms-and-notifications": "التنبيهات والإخطارات",
+        "ota-files-in-bytes": "الملفات",
+        "ws-title": "WS",
+        "unlimited": "(0 - غير محدود)",
+        "maximum-devices": "الحد الأقصى لعدد الأجهزة",
+        "maximum-devices-required": "الحد الأقصى لعدد الأجهزة مطلوب.",
+        "maximum-devices-range": "لا يمكن أن يكون الحد الأقصى لعدد الأجهزة سالبًا",
+        "maximum-assets": "الحد الأقصى لعدد الأصول",
+        "maximum-assets-required": "الحد الأقصى لعدد الأصول مطلوب.",
+        "maximum-assets-range": "لا يمكن أن يكون الحد الأقصى لعدد الأصول سالبًا",
+        "maximum-customers": "الحد الأقصى لعدد العملاء",
+        "maximum-customers-required": "الحد الأقصى لعدد العملاء مطلوب.",
+        "maximum-customers-range": "لا يمكن أن يكون الحد الأقصى لعدد العملاء سالبًا",
+        "maximum-users": "الحد الأقصى لعدد المستخدمين",
+        "maximum-users-required": "الحد الأقصى لعدد المستخدمين مطلوب.",
+        "maximum-users-range": "لا يمكن أن يكون الحد الأقصى لعدد المستخدمين سالبًا",
+        "maximum-dashboards": "الحد الأقصى لعدد لوحات التحكم",
+        "maximum-dashboards-required": "الحد الأقصى لعدد لوحات التحكم مطلوب.",
+        "maximum-dashboards-range": "لا يمكن أن يكون الحد الأقصى لعدد لوحات التحكم سالبًا",
+        "maximum-rule-chains": "الحد الأقصى لعدد سلاسل القواعد",
+        "maximum-rule-chains-required": "الحد الأقصى لعدد سلاسل القواعد مطلوب.",
+        "maximum-rule-chains-range": "لا يمكن أن يكون الحد الأقصى لعدد سلاسل القواعد سالبًا",
+        "maximum-integrations": "الحد الأقصى لعدد التكاملات",
+        "maximum-integrations-required": "الحد الأقصى لعدد التكاملات مطلوب.",
+        "maximum-integrations-range": "لا يمكن أن يكون الحد الأقصى لعدد التكاملات سالبًا",
+        "maximum-converters": "الحد الأقصى لعدد المحولات",
+        "maximum-converters-required": "الحد الأقصى لعدد المحولات مطلوب.",
+        "maximum-converters-range": "لا يمكن أن يكون الحد الأقصى لعدد المحولات سالبًا",
+        "maximum-scheduler-events": "الحد الأقصى لعدد أحداث المجدول",
+        "maximum-scheduler-events-required": "الحد الأقصى لعدد أحداث المجدول مطلوب.",
+        "maximum-scheduler-events-range": "لا يمكن أن يكون الحد الأقصى لعدد أحداث المجدول سالبًا",
+        "maximum-resources-sum-data-size": "الحجم الإجمالي الأقصى لملفات الموارد (بايت)",
+        "maximum-resources-sum-data-size-required": "الحجم الإجمالي الأقصى لملفات الموارد مطلوب.",
+        "maximum-resources-sum-data-size-range": "لا يمكن أن يكون الحجم الإجمالي الأقصى لملفات الموارد سالبًا",
+        "maximum-resource-size": "الحد الأقصى لحجم ملف المورد (بايت)",
+        "maximum-resource-size-required": "الحد الأقصى لحجم ملف المورد مطلوب",
+        "maximum-resource-size-range": "لا يمكن أن يكون الحد الأقصى لحجم ملف المورد سالبًا",
+        "maximum-ota-packages-sum-data-size": "الحجم الإجمالي الأقصى لملفات حزم OTA (بايت)",
+        "maximum-ota-package-sum-data-size-required": "الحجم الإجمالي الأقصى لملفات حزم OTA مطلوب.",
+        "maximum-ota-package-sum-data-size-range": "لا يمكن أن يكون الحجم الإجمالي الأقصى لملفات حزم OTA سالبًا",
+        "rest-requests-for-tenant": "طلبات REST للمستأجر",
+        "transport-tenant-telemetry-msg-rate-limit": "رسائل تليمتري المستأجر عبر النقل",
+        "transport-tenant-telemetry-data-points-rate-limit": "نقاط بيانات تليمتري المستأجر عبر النقل",
+        "transport-device-msg-rate-limit": "رسائل الجهاز عبر النقل",
+        "transport-device-telemetry-msg-rate-limit": "رسائل تليمتري الجهاز عبر النقل",
+        "transport-device-telemetry-data-points-rate-limit": "نقاط بيانات تليمتري الجهاز عبر النقل",
+        "tenant-entity-export-rate-limit": "إنشاء نسخة الكيان",
+        "tenant-entity-import-rate-limit": "تحميل نسخة الكيان",
+        "tenant-notification-request-rate-limit": "طلبات الإخطار",
+        "tenant-notification-requests-per-rule-rate-limit": "طلبات الإخطار لكل قاعدة إخطار",
+        "integration-msgs-per-tenant-rate-limit": "رسائل التكامل لكل مستأجر",
+        "integration-msgs-per-device-rate-limit": "رسائل التكامل لكل جهاز",
+        "max-transport-messages": "الحد الأقصى لعدد رسائل النقل",
+        "max-transport-messages-required": "الحد الأقصى لعدد رسائل النقل مطلوب.",
+        "max-transport-messages-range": "لا يمكن أن يكون الحد الأقصى لعدد رسائل النقل سالبًا",
+        "max-transport-data-points": "الحد الأقصى لعدد نقاط بيانات النقل",
+        "max-transport-data-points-required": "الحد الأقصى لعدد نقاط بيانات النقل مطلوب.",
+        "max-transport-data-points-range": "لا يمكن أن يكون الحد الأقصى لعدد نقاط بيانات النقل سالبًا",
+        "max-r-e-executions": "الحد الأقصى لعدد تنفيذات محرك القواعد",
+        "max-r-e-executions-required": "الحد الأقصى لعدد تنفيذات محرك القواعد مطلوب.",
+        "max-r-e-executions-range": "لا يمكن أن يكون الحد الأقصى لعدد تنفيذات محرك القواعد سالبًا",
+        "max-j-s-executions": "الحد الأقصى لعدد تنفيذات JavaScript",
+        "max-j-s-executions-required": "الحد الأقصى لعدد تنفيذات JavaScript مطلوب.",
+        "max-j-s-executions-range": "لا يمكن أن يكون الحد الأقصى لعدد تنفيذات JavaScript سالبًا",
+        "max-tbel-executions": "الحد الأقصى لعدد تنفيذات TBEL",
+        "max-tbel-executions-required": "الحد الأقصى لعدد تنفيذات TBEL مطلوب.",
+        "max-tbel-executions-range": "لا يمكن أن يكون الحد الأقصى لعدد تنفيذات TBEL سالبًا",
+        "max-d-p-storage-days": "الحد الأقصى لعدد أيام تخزين نقاط البيانات",
+        "max-d-p-storage-days-required": "الحد الأقصى لعدد أيام تخزين نقاط البيانات مطلوب.",
+        "max-d-p-storage-days-range": "لا يمكن أن يكون الحد الأقصى لعدد أيام تخزين نقاط البيانات سالبًا",
+        "default-storage-ttl-days": "أيام TTL التخزين بشكل افتراضي",
+        "default-storage-ttl-days-required": "أيام TTL التخزين بشكل افتراضي مطلوبة.",
+        "default-storage-ttl-days-range": "لا يمكن أن تكون أيام TTL التخزين بشكل افتراضي سالبة",
+        "alarms-ttl-days": "أيام TTL التنبيهات",
+        "alarms-ttl-days-required": "أيام TTL التنبيهات مطلوبة",
+        "alarms-ttl-days-days-range": "لا يمكن أن تكون أيام TTL التنبيهات سالبة",
+        "rpc-ttl-days": "أيام TTL RPC",
+        "rpc-ttl-days-required": "أيام TTL RPC مطلوبة",
+        "rpc-ttl-days-days-range": "لا يمكن أن تكون أيام TTL RPC سالبة",
+        "queue-stats-ttl-days": "أيام TTL إحصائيات الطابور",
+        "queue-stats-ttl-days-required": "أيام TTL إحصائيات الطابور مطلوبة",
+        "queue-stats-ttl-days-range": "لا يمكن أن تكون أيام TTL إحصائيات الطابور سالبة",
+        "rule-engine-exceptions-ttl-days": "أيام TTL استثناءات محرك القواعد",
+        "rule-engine-exceptions-ttl-days-required": "أيام TTL استثناءات محرك القواعد مطلوبة",
+        "rule-engine-exceptions-ttl-days-range": "لا يمكن أن تكون أيام TTL استثناءات محرك القواعد سالبة",
+        "max-rule-node-executions-per-message": "الحد الأقصى لعدد تنفيذات عقدة القاعدة لكل رسالة",
+        "max-rule-node-executions-per-message-required": "الحد الأقصى لعدد تنفيذات عقدة القاعدة لكل رسالة مطلوب.",
+        "max-rule-node-executions-per-message-range": "لا يمكن أن يكون الحد الأقصى لعدد تنفيذات عقدة القاعدة لكل رسالة سالبًا",
+        "max-emails": "الحد الأقصى لعدد الرسائل الإلكترونية المرسلة",
+        "max-emails-required": "الحد الأقصى لعدد الرسائل الإلكترونية المرسلة مطلوب.",
+        "max-emails-range": "لا يمكن أن يكون الحد الأقصى لعدد الرسائل الإلكترونية المرسلة سالبًا",
+        "sms-enabled": "تمكين SMS",
+        "max-sms": "الحد الأقصى لعدد الرسائل القصيرة المرسلة",
+        "max-sms-required": "الحد الأقصى لعدد الرسائل القصيرة المرسلة مطلوب.",
+        "max-sms-range": "لا يمكن أن يكون الحد الأقصى لعدد الرسائل القصيرة المرسلة سالبًا",
+        "max-created-alarms": "الحد الأقصى لعدد التنبيهات المُنشأة",
+        "max-created-alarms-required": "الحد الأقصى لعدد التنبيهات المُنشأة مطلوب.",
+        "max-created-alarms-range": "لا يمكن أن يكون الحد الأقصى لعدد التنبيهات المُنشأة سالبًا",
+        "no-queue": "لم يتم تكوين طابور",
+        "add-queue": "إضافة طابور",
+        "queues-with-count": "الطوابير ({{count}})",
+        "tenant-rest-limits": "طلبات REST للمستأجر",
+        "customer-rest-limits": "طلبات REST للعميل",
+        "incorrect-pattern-for-rate-limits": "التنسيق هو أزواج مفصولة بفواصل من السعة والفترة (بالثواني) مع وضع نقطتين بينهما، مثل 100:1,2000:60",
+        "too-small-value-zero": "يجب أن تكون القيمة أكبر من 0",
+        "too-small-value-one": "يجب أن تكون القيمة أكبر من 1",
+        "queue-size-is-limited-by-system-configuration": "حجم الطابور محدود أيضًا بواسطة تكوين النظام.",
+        "cassandra-tenant-limits-configuration": "استعلام Cassandra للمستأجر",
+        "ws-limit-max-sessions-per-tenant": "الحد الأقصى لعدد الجلسات لكل مستأجر",
+        "ws-limit-max-sessions-per-customer": "الحد الأقصى لعدد الجلسات لكل عميل",
+        "ws-limit-max-sessions-per-regular-user": "الحد الأقصى لعدد الجلسات لكل مستخدم عادي",
+        "ws-limit-max-sessions-per-public-user": "الحد الأقصى لعدد الجلسات لكل مستخدم عام",
+        "ws-limit-queue-per-session": "الحد الأقصى لحجم طابور الرسائل لكل جلسة",
+        "ws-limit-max-subscriptions-per-tenant": "الحد الأقصى لعدد الاشتراكات لكل مستأجر",
+        "ws-limit-max-subscriptions-per-customer": "الحد الأقصى لعدد الاشتراكات لكل عميل",
+        "ws-limit-max-subscriptions-per-regular-user": "الحد الأقصى لعدد الاشتراكات لكل مستخدم عادي",
+        "ws-limit-max-subscriptions-per-public-user": "الحد الأقصى لعدد الاشتراكات لكل مستخدم عام",
+        "ws-limit-updates-per-session": "تحديثات WS لكل جلسة",
+        "rate-limits": {
+            "add-limit": "إضافة حد",
+            "advanced-settings": "الإعدادات المتقدمة",
+            "edit-limit": "تعديل الحد",
+            "but-less-than": "ولكن أقل من",
+            "edit-transport-tenant-msg-title": "تعديل حدود معدل رسائل نقل المستأجر",
+            "edit-transport-tenant-telemetry-msg-title": "تعديل حدود معدل رسائل تليمتري نقل المستأجر",
+            "edit-transport-tenant-telemetry-data-points-title": "تعديل حدود معدل نقاط بيانات تليمتري نقل المستأجر",
+            "edit-transport-device-msg-title": "تعديل حدود معدل رسائل نقل الجهاز",
+            "edit-transport-device-telemetry-msg-title": "تعديل حدود معدل رسائل تليمتري نقل الجهاز",
+            "edit-transport-device-telemetry-data-points-title": "تعديل حدود معدل نقاط بيانات تليمتري نقل الجهاز",
+            "edit-tenant-rest-limits-title": "تعديل حدود معدل طلبات REST للمستأجر",
+            "edit-customer-rest-limits-title": "تعديل حدود معدل طلبات REST للعميل",
+            "edit-ws-limit-updates-per-session-title": "تعديل حدود معدل تحديثات WS لكل جلسة",
+            "edit-cassandra-tenant-limits-configuration-title": "تعديل حدود معدل استعلام Cassandra للمستأجر",
+            "edit-tenant-entity-export-rate-limit-title": "تعديل حدود معدل إنشاء نسخة الكيان",
+            "edit-tenant-entity-import-rate-limit-title": "تعديل حدود معدل تحميل نسخة الكيان",
+            "edit-tenant-notification-request-rate-limit-title": "تعديل حدود معدل طلبات الإخطار",
+            "edit-tenant-notification-requests-per-rule-rate-limit-title": "تعديل حدود معدل طلبات الإخطار لكل قاعدة إخطار",
+            "edit-integration-msgs-per-tenant-rate-limit-title": "تعديل حدود معدل رسائل التكامل لكل مستأجر",
+            "edit-integration-msgs-per-device-rate-limit-title": "تعديل حدود معدل رسائل التكامل لكل جهاز",
+            "messages-per": "رسائل لكل",
+            "not-set": "غير مضبوط",
+            "number-of-messages": "عدد الرسائل",
+            "number-of-messages-required": "عدد الرسائل مطلوب.",
+            "number-of-messages-min": "القيمة الدنيا هي 1.",
+            "preview": "معاينة",
+            "per-seconds": "لكل ثانية",
+            "per-seconds-required": "معدل الزمن مطلوب.",
+            "per-seconds-min": "القيمة الدنيا هي 1.",
+            "rate-limits": "حدود المعدل",
+            "remove-limit": "إزالة الحد",
+            "transport-tenant-msg": "رسائل نقل المستأجر",
+            "transport-tenant-telemetry-msg": "رسائل تليمتري نقل المستأجر",
+            "transport-tenant-telemetry-data-points": "نقاط بيانات تليمتري نقل المستأجر",
+            "transport-device-msg": "رسائل نقل الجهاز",
+            "transport-device-telemetry-msg": "رسائل تليمتري نقل الجهاز",
+            "transport-device-telemetry-data-points": "نقاط بيانات تليمتري نقل الجهاز",
+            "sec": "ثانية"
+        }
+    },
+    "timeinterval": {
+        "seconds-interval": "{ seconds, plural, =1 {1 second} other {# seconds} }",
+        "minutes-interval": "{ minutes, plural, =1 {1 minute} other {# minutes} }",
+        "hours-interval": "{ hours, plural, =1 {1 hour} other {# hours} }",
+        "days-interval": "{ days, plural, =1 {1 day} other {# days} }",
+        "days": "أيام",
+        "hours": "ساعات",
+        "minutes": "دقائق",
+        "seconds": "ثواني",
+        "advanced": "متقدم",
+        "predefined": {
+            "yesterday": "الأمس",
+            "day-before-yesterday": "قبل يومين",
+            "this-day-last-week": "هذا اليوم من الأسبوع الماضي",
+            "previous-week": "الأسبوع السابق (الأحد - السبت)",
+            "previous-week-iso": "الأسبوع السابق (الاثنين - الأحد)",
+            "previous-month": "الشهر السابق",
+            "previous-quarter": "الربع السابق",
+            "previous-half-year": "نصف السنة السابق",
+            "previous-year": "السنة السابقة",
+            "current-hour": "الساعة الحالية",
+            "current-day": "اليوم الحالي",
+            "current-day-so-far": "حتى الآن في اليوم الحالي",
+            "current-week": "الأسبوع الحالي (الأحد - السبت)",
+            "current-week-iso": "الأسبوع الحالي (الاثنين - الأحد)",
+            "current-week-so-far": "حتى الآن في الأسبوع الحالي (الأحد - السبت)",
+            "current-week-iso-so-far": "حتى الآن في الأسبوع الحالي (الاثنين - الأحد)",
+            "current-month": "الشهر الحالي",
+            "current-month-so-far": "حتى الآن في الشهر الحالي",
+            "current-quarter": "الربع الحالي",
+            "current-quarter-so-far": "حتى الآن في الربع الحالي",
+            "current-half-year": "نصف السنة الحالي",
+            "current-half-year-so-far": "حتى الآن في نصف السنة الحالي",
+            "current-year": "السنة الحالية",
+            "current-year-so-far": "حتى الآن في السنة الحالية"
+        }
+    },
+    "timeunit": {
+        "milliseconds": "ميلي ثانية",
+        "seconds": "ثواني",
+        "minutes": "دقائق",
+        "hours": "ساعات",
+        "days": "أيام"
+    },
+    "timewindow": {
+        "timewindow": "نافذة الوقت",
+        "years": "{ years, plural, =1 { سنة } other {# سنوات } }",
+        "years-short": "{{ years }}س",
+        "months": "{ months, plural, =1 { شهر } other {# أشهر } }",
+        "months-short": "{{ months }}ش",
+        "weeks": "{ weeks, plural, =1 { أسبوع } other {# أسابيع } }",
+        "weeks-short": "{{ weeks }}أ",
+        "days": "{ days, plural, =1 { يوم } other {# أيام } }",
+        "days-short": "{{ days }}ي",
+        "hours": "{ hours, plural, =0 { ساعة } =1 {1 ساعة } other {# ساعات } }",
+        "hr": "{{ hr }} ساعة",
+        "hr-short": "{{ hr }}س",
+        "minutes": "{ minutes, plural, =0 { دقيقة } =1 {1 دقيقة } other {# دقائق } }",
+        "min": "{{ min }} دقيقة",
+        "min-short": "{{ min }}د",
+        "seconds": "{ seconds, plural, =0 { ثانية } =1 {1 ثانية } other {# ثواني } }",
+        "sec": "{{ sec }} ثانية",
+        "sec-short": "{{ sec }}ث",
+        "short": {
+            "days": "{ days, plural, =1 {1 يوم } other {# أيام } }",
+            "hours": "{ hours, plural, =1 {1 ساعة } other {# ساعات } }",
+            "minutes": "{{minutes}} دقيقة",
+            "seconds": "{{seconds}} ثانية"
+        },
+        "realtime": "فوري",
+        "history": "تاريخ",
+        "last-prefix": "الأخير",
+        "period": "من {{ startTime }} إلى {{ endTime }}",
+        "edit": "تعديل نافذة الوقت",
+        "date-range": "نطاق التاريخ",
+        "for-all-time": "لكل الوقت",
+        "last": "الأخير",
+        "time-period": "فترة زمنية",
+        "hide": "إخفاء",
+        "interval": "فاصل",
+        "just-now": "الآن",
+        "just-now-lower": "الآن",
+        "ago": "منذ",
+        "style": "نمط نافذة الوقت",
+        "icon": "أيقونة",
+        "icon-position": "موقع الأيقونة",
+        "icon-position-left": "اليسار",
+        "icon-position-right": "اليمين",
+        "font": "الخط",
+        "color": "اللون",
+        "displayTypePrefix": "عرض البادئة الفوري/التاريخي",
+        "preview": "معاينة"
+    },
+    "unit": {
+        "millimeter": "مليمتر",
+        "centimeter": "سنتيمتر",
+        "angstrom": "أنغستروم",
+        "nanometer": "نانومتر",
+        "micrometer": "ميكرومتر",
+        "meter": "متر",
+        "kilometer": "كيلومتر",
+        "inch": "بوصة",
+        "foot": "قدم",
+        "yard": "ياردة",
+        "mile": "ميل",
+        "nautical-mile": "الميل البحري",
+        "astronomical-unit": "الوحدة الفلكية",
+        "reciprocal-metre": "المتر المعكوس",
+        "meter-per-meter": "متر لكل متر",
+        "steradian": "ستيراديان",
+        "thou": "الحبة",
+        "barleycorn": "حبة الشعير",
+        "hand": "يد",
+        "chain": "سلسلة",
+        "furlong": "فارسخ",
+        "league": "ليغ",
+        "fathom": "قدم مربعة",
+        "cable": "كابل",
+        "link": "رابط",
+        "rod": "عصا",
+        "nanogram": "نانوغرام",
+        "microgram": "ميكروغرام",
+        "milligram": "مليغرام",
+        "gram": "جرام",
+        "kilogram": "كيلوجرام",
+        "tonne": "طن",
+        "ounce": "أونصة",
+        "pound": "رطل",
+        "stone": "حجر",
+        "hundredweight-count": "مئوية الوزن",
+        "short-tons": "أطنان قصيرة",
+        "dalton": "دالتون",
+        "grain": "حبة",
+        "drachm": "دراخم",
+        "quarter": "ربع",
+        "slug": "سلغ",
+        "carat": "قيراط",
+        "cubic-millimeter": "مليمتر مكعب",
+        "cubic-centimeter": "سنتيمتر مكعب",
+        "cubic-meter": "متر مكعب",
+        "cubic-kilometer": "كيلومتر مكعب",
+        "microliter": "ميكروليتر",
+        "milliliter": "مليلتر",
+        "liter": "لتر",
+        "hectoliter": "هكتوليتر",
+        "cubic-inch": "بوصة مكعبة",
+        "cubic-foot": "قدم مكعبة",
+        "cubic-yard": "ياردة مكعبة",
+        "fluid-ounce": "أونصة سائلة",
+        "pint": "باينت",
+        "quart": "كوارت",
+        "gallon": "جالون",
+        "oil-barrels": "برميل نفط",
+        "cubic-meter-per-kilogram": "متر مكعب لكل كيلوجرام",
+        "gill": "جل",
+        "hogshead": "هوغزهيد",
+        "teaspoon": "ملعقة شاي",
+        "tablespoon": "ملعقة طعام",
+        "cup": "كوب",
+        "celsius": "درجة مئوية",
+        "kelvin": "كلفن",
+        "rankine": "رانكين",
+        "fahrenheit": "فهرنهايت",
+        "percent": "بالمئة",
+        "meter-per-second": "متر في الثانية",
+        "kilometer-per-hour": "كيلومتر في الساعة",
+        "foot-per-second": "قدم في الثانية",
+        "mile-per-hour": "ميل في الساعة",
+        "knot": "عقدة",
+        "millimeters-per-minute": "مليمتر في الدقيقة",
+        "kilometer-per-hour-squared": "كيلومتر في الساعة مربع",
+        "foot-per-second-squared": "قدم في الثانية مربع",
+        "pascal": "باسكال",
+        "kilopascal": "كيلوباسكال",
+        "megapascal": "ميجاباسكال",
+        "gigapascal": "جيجاباسكال",
+        "millibar": "مليبار",
+        "bar": "بار",
+        "kilobar": "كيلوبار",
+        "newton": "نيوتن",
+        "newton-meter": "نيوتن متر",
+        "foot-pounds": "قدم-رطل",
+        "inch-pounds": "بوصة-رطل",
+        "newton-per-meter": "نيوتن لكل متر",
+        "atmospheres": "الغلاف الجوي",
+        "pounds-per-square-inch": "رطل لكل بوصة مربعة",
+        "torr": "تور",
+        "inches-of-mercury": "بوصة زئبق",
+        "pascal-per-square-meter": "باسكال لكل متر مربع",
+        "pound-per-square-inch": "رطل لكل بوصة مربعة",
+        "newton-per-square-meter": "نيوتن لكل متر مربع",
+        "kilogram-force-per-square-meter": "قوة كيلوجرام لكل متر مربع",
+        "pascal-per-square-centimeter": "باسكال لكل سنتيمتر مربع",
+        "ton-force-per-square-inch": "قوة الطن لكل بوصة مربعة",
+        "kilonewton-per-square-meter": "كيلونيوتن لكل متر مربع",
+        "newton-per-square-millimeter": "نيوتن لكل مليمتر مربع",
+        "microjoule": "ميكروجول",
+        "millijoule": "ميليجول",
+        "joule": "جول",
+        "kilojoule": "كيلوجول",
+        "megajoule": "ميجاجول",
+        "gigajoule": "جيجاجول",
+        "watt-hour": "واط-ساعة",
+        "kilowatt-hour": "كيلوواط-ساعة",
+        "electron-volts": "إلكترون فولت",
+        "joules-per-coulomb": "جول لكل كولومب",
+        "british-thermal-unit": "وحدة حرارية بريطانية",
+        "foot-pound": "قدم-رطل",
+        "calorie": "كالوري",
+        "small-calorie": "كالوري صغيرة",
+        "kilocalorie": "كيلوكالوري",
+        "joule-per-kelvin": "جول لكل كلفن",
+        "joule-per-kilogram-kelvin": "جول لكل كيلوجرام-كلفن",
+        "joule-per-kilogram": "جول لكل كيلوجرام",
+        "watt-per-meter-kelvin": "واط لكل متر-كلفن",
+        "joule-per-cubic-meter": "جول لكل متر مكعب",
+        "therm": "تيرم",
+        "electric-dipole-moment": "عزم الدب الكهربائي",
+        "magnetic-dipole-moment": "عزم الدب المغناطيسي",
+        "debye": "ديباي",
+        "coulomb-per-square-meter-per-volt": "كولوم لكل متر مربع لكل فولت",
+        "milliwatt": "ميليوات",
+        "microwatt": "ميكرووات",
+        "watt": "واط",
+        "kilowatt": "كيلوواط",
+        "megawatt": "ميغاواط",
+        "gigawatt": "جيغاواط",
+        "metric-horsepower": "قوة حصان متري",
+        "milliwatt-per-square-centimeter": "ميليوات لكل سنتيمتر مربع",
+        "watt-per-square-centimeter": "واط لكل سنتيمتر مربع",
+        "kilowatt-per-square-centimeter": "كيلوواط لكل سنتيمتر مربع",
+        "milliwatt-per-square-meter": "ميليوات لكل متر مربع",
+        "watt-per-square-meter": "واط لكل متر مربع",
+        "kilowatt-per-square-meter": "كيلوواط لكل متر مربع",
+        "watt-per-square-inch": "واط لكل بوصة مربعة",
+        "kilowatt-per-square-inch": "كيلوواط لكل بوصة مربعة",
+        "horsepower": "حصان",
+        "btu-per-hour": "وحدة حرارية بريطانية في الساعة",
+        "coulomb": "كولومب",
+        "millicoulomb": "ميليكولومب",
+        "microcoulomb": "ميكروكولومب",
+        "picocoulomb": "بيكوكولومب",
+        "coulomb-per-meter": "كولومب لكل متر",
+        "coulomb-per-cubic-meter": "كولومب لكل متر مكعب",
+        "coulomb-per-square-meter": "كولومب لكل متر مربع",
+        "square-millimeter": "مليمتر مربع",
+        "square-centimeter": "سنتيمتر مربع",
+        "square-meter": "متر مربع",
+        "hectare": "هكتار",
+        "square-kilometer": "كيلومتر مربع",
+        "square-inch": "بوصة مربعة",
+        "square-foot": "قدم مربعة",
+        "square-yard": "ياردة مربعة",
+        "acre": "فدان",
+        "square-mile": "ميل مربع",
+        "are": "فدان",
+        "barn": "بارن",
+        "circular-inch": "بوصة دائرية",
+        "milliampere-hour": "مللي أمبير-ساعة",
+        "milliampere-hour-tags": "تيار كهربائي، تدفق التيار، شحنة كهربائية، سعة التيار، تدفق الكهرباء، تدفق كهربائي، مللي أمبير-ساعة، مللي أمبير-ساعات، مللي أمبير-ساعة",
+        "ampere-hours": "أمبير-ساعة",
+        "ampere-hours-tags": "تيار كهربائي، تدفق التيار، شحنة كهربائية، سعة التيار، تدفق الكهرباء، تدفق كهربائي، أمبير، أمبير-ساعة، أمبير-ساعة",
+        "kiloampere-hours": "كيلوأمبير-ساعة",
+        "kiloampere-hours-tags": "تيار كهربائي، تدفق التيار، شحنة كهربائية، سعة التيار، تدفق الكهرباء، تدفق كهربائي، كيلوأمبير-ساعة، كيلوأمبير-ساعة، كيلو أمبير-ساعة",
+        "nanoampere": "نانوأمبير",
+        "nanoampere-tags": "تيار، أمبير، نانوأمبير، نانوأمبير",
+        "picoampere": "بيكوأمبير",
+        "picoampere-tags": "تيار، أمبير، بيكوأمبير، بيكوأمبير",
+        "microampere": "ميكروأمبير",
+        "microampere-tags": "تيار كهربائي، ميكروأمبير، ميكروأمبيرات، ميكرو أمبير",
+        "milliampere": "ملليأمبير",
+        "milliampere-tags": "تيار كهربائي، ملليأمبير، مللي أمبير، مللي أمبيرات",
+        "ampere": "أمبير",
+        "ampere-tags": "تيار كهربائي، تدفق التيار، تدفق الكهرباء، تدفق كهربائي، أمبير، أمبيرات، تيار كهربائي، أمبير",
+        "kiloamperes": "كيلوأمبيرات",
+        "kiloamperes-tags": "تيار كهربائي، تدفق التيار، كيلوأمبيرات، كيلو أمبير",
+        "microampere-per-square-centimeter": "ميكروأمبير لكل سنتيمتر مربع",
+        "microampere-per-square-centimeter-tags": "كثافة التيار، ميكروأمبير لكل سنتيمتر مربع، ميكروأمبير لكل سم²",
+        "ampere-per-square-meter": "أمبير لكل متر مربع",
+        "ampere-per-square-meter-tags": "كثافة التيار، التيار لكل وحدة مساحة، أمبير لكل متر مربع",
+        "ampere-per-meter": "أمبير لكل متر",
+        "ampere-per-meter-tags": "قوة المجال المغناطيسي، شدة المجال المغناطيسي، أمبير لكل متر",
+        "oersted": "أورستد",
+        "oersted-tags": "مجال مغناطيسي، أورستد",
+        "bohr-magneton": "مغناطون بور",
+        "bohr-magneton-tags": "فيزياء ذرية، عزم مغناطيسي، مغناطون بور، ميكرو بور",
+        "ampere-meter-squared": "أمبير-متر مربع",
+        "ampere-meter-squared-tags": "عزم مغناطيسي، عزم قطبي، أمبير-متر مربع",
+        "ampere-meter": "أمبير-متر",
+        "ampere-meter-tags": "مجال مغناطيسي، حلقة تيار، أمبير-متر",
+        "nanovolt": "نانوفولت",
+        "picovolt": "بيكوفولت",
+        "millivolts": "ملليفولت",
+        "microvolts": "ميكروفولت",
+        "volt": "فولت",
+        "kilovolts": "كيلوفولت",
+        "dbmV": "ديسيبل ملليفولت",
+        "dbm": "ديسيبل ميلليوات",
+        "volt-meter": "فولت-متر",
+        "kilovolt-meter": "كيلوفولت-متر",
+        "megavolt-meter": "ميغافولت-متر",
+        "microvolt-meter": "ميكروفولت-متر",
+        "millivolt-meter": "ملليفولت-متر",
+        "nanovolt-meter": "نانوفولت-متر",
+        "ohm": "أوم",
+        "microohm": "ميكروأوم",
+        "milliohm": "ملليأوم",
+        "kilohm": "كيلوأوم",
+        "megohm": "ميغاأوم",
+        "gigohm": "جيغاأوم",
+        "hertz": "هرتز",
+        "kilohertz": "كيلوهرتز",
+        "megahertz": "ميغاهرتز",
+        "gigahertz": "جيغاهرتز",
+        "rpm": "دورة في الدقيقة",
+        "candela-per-square-meter": "كانديلا لكل متر مربع",
+        "candela": "كانديلا",
+        "lumen": "لومن",
+        "lux": "لوكس",
+        "foot-candle": "قدم كانديلا",
+        "lumen-per-square-meter": "لومن لكل متر مربع",
+        "lux-second": "لوكس ثانية",
+        "lumen-second": "لومن ثانية",
+        "lumens-per-watt": "لومن لكل واط",
+        "absorbance": "امتصاصية",
+        "mole": "مول",
+        "nanomole": "نانومول",
+        "micromole": "ميكرومول",
+        "millimole": "ملليمول",
+        "kilomole": "كيلومول",
+        "mole-per-cubic-meter": "مول لكل متر مكعب",
+        "rssi": "RSSI",
+        "ppm": "أجزاء في المليون",
+        "ppb": "أجزاء في البليون",
+        "micrograms-per-cubic-meter": "ميكروغرام لكل متر مكعب",
+        "aqi": "مؤشر جودة الهواء",
+        "gram-per-cubic-meter": "جرام لكل متر مكعب",
+        "gram-per-kilogram": "الرطوبة النوعية",
+        "millimeters-per-second": "ملليمتر في الثانية",
+        "neper": "نيبر",
+        "bel": "بيل",
+        "decibel": "ديسيبل",
+        "meters-per-second-squared": "أمتار في الثانية مربع",
+        "becquerel": "بكريل",
+        "curie": "كيوري",
+        "gray": "غراي",
+        "sievert": "سيفيرت",
+        "roentgen": "رينجن",
+        "cps": "عدّات في الثانية",
+        "rad": "راد",
+        "rem": "ريم",
+        "dps": "انحلالات في الثانية",
+        "rutherford": "روثرفورد",
+        "coulombs-per-kilogram": "كولوم لكل كيلوغرام",
+        "becquerels-per-cubic-meter": "بيكريل لكل متر مكعب",
+        "curies-per-liter": "كيوري لكل ليتر",
+        "becquerels-per-second": "بيكريل لكل ثانية",
+        "curies-per-second": "كيوري لكل ثانية",
+        "gy-per-second": "غراي لكل ثانية",
+        "watt-per-steradian": "واط لكل ستيراديان",
+        "watt-per-square-metre-steradian": "واط لكل متر مربع ستيراديان",
+        "ph-level": "مستوى الحموضة",
+        "turbidity": "عكورة",
+        "mg-per-liter": "ملليغرام لكل ليتر",
+        "microsiemens-per-centimeter": "ميكروسيمنز لكل سنتيمتر",
+        "millisiemens-per-meter": "ملليسيمنز لكل متر",
+        "siemens-per-meter": "سيمنز لكل متر",
+        "kilogram-per-cubic-meter": "كيلوغرام لكل متر مكعب",
+        "gram-per-cubic-centimeter": "جرام لكل سنتيمتر مكعب",
+        "kilogram-per-square-meter": "كيلوغرام لكل متر مربع",
+        "milligram-per-milliliter": "ملليغرام لكل ملليلتر",
+        "milligram-per-cubic-meter": "ملليغرام لكل متر مكعب",
+        "pound-per-cubic-foot": "جنيه لكل قدم مكعب",
+        "ounces-per-cubic-inch": "أونصة لكل بوصة مكعبة",
+        "tons-per-cubic-yard": "طن لكل ياردة مكعبة",
+        "particle-density": "كثافة الجسيمات",
+        "kilometers-per-liter": "كيلومتر لكل ليتر",
+        "miles-per-gallon": "ميل لكل جالون",
+        "liters-per-100-km": "ليتر لكل 100 كيلومتر",
+        "gallons-per-mile": "جالون لكل ميل",
+        "liters-per-hour": "ليتر لكل ساعة",
+        "gallons-per-hour": "جالون لكل ساعة",
+        "beats-per-minute": "نبضة في الدقيقة",
+        "millimeters-of-mercury": "ملليمتر زئبق",
+        "milligrams-per-deciliter": "ملليغرام لكل ديسيليتر",
+        "g-force": "قوة الجاذبية",
+        "kilonewton": "كيلونيوتن",
+        "kilogram-force": "كيلوغرام-قوة",
+        "pound-force": "باوند-قوة",
+        "kilopound-force": "كيلوباوند-قوة",
+        "dyne": "دين",
+        "poundal": "باوندل",
+        "kip": "كيب",
+        "gal": "جال",
+        "gravity": "الجاذبية",
+        "hectopascal": "هكتوباسكال",
+        "atmosphere": "الغلاف الجوي",
+        "millibars": "مليبار",
+        "inch-of-mercury": "بوصة زئبق",
+        "richter-scale": "مقياس ريختر",
+        "second": "ثانية",
+        "minute": "دقيقة",
+        "hour": "ساعة",
+        "day": "يوم",
+        "week": "أسبوع",
+        "month": "شهر",
+        "year": "سنة",
+        "cubic-foot-per-minute": "قدم مكعب في الدقيقة",
+        "cubic-meters-per-hour": "متر مكعب في الساعة",
+        "cubic-meters-per-second": "متر مكعب في الثانية",
+        "liter-per-second": "لتر في الثانية",
+        "liter-per-minute": "لتر في الدقيقة",
+        "gallons-per-minute": "جالون في الدقيقة",
+        "cubic-foot-per-second": "قدم مكعب في الثانية",
+        "milliliters-per-minute": "ملليلتر في الدقيقة",
+        "bit": "بت",
+        "byte": "بايت",
+        "kilobyte": "كيلوبايت",
+        "megabyte": "ميجابايت",
+        "gigabyte": "غيغابايت",
+        "terabyte": "تيرابايت",
+        "petabyte": "بيتابايت",
+        "exabyte": "إكسابايت",
+        "zettabyte": "زيتابايت",
+        "yottabyte": "يوتابايت",
+        "bit-per-second": "بت في الثانية",
+        "kilobit-per-second": "كيلوبت في الثانية",
+        "megabit-per-second": "ميجابت في الثانية",
+        "gigabit-per-second": "غيغابت في الثانية",
+        "terabit-per-second": "تيرابت في الثانية",
+        "byte-per-second": "بايت في الثانية",
+        "kilobyte-per-second": "كيلوبايت في الثانية",
+        "megabyte-per-second": "ميجابايت في الثانية",
+        "gigabyte-per-second": "غيغابايت في الثانية",
+        "degree": "درجة",
+        "radian": "راديان",
+        "gradian": "غريد",
+        "mil": "ميل",
+        "revolution": "دورة",
+        "siemens": "سيمنز",
+        "millisiemens": "ميليسيمنز",
+        "microsiemens": "ميكروسيمنز",
+        "kilosiemens": "كيلوسيمنز",
+        "megasiemens": "ميغاسيمنز",
+        "gigasiemens": "جيجاسيمنز",
+        "farad": "فاراد",
+        "millifarad": "مليفاراد",
+        "microfarad": "ميكروفاراد",
+        "nanofarad": "نانوفاراد",
+        "picofarad": "بيكوفاراد",
+        "kilofarad": "كيلوفاراد",
+        "megafarad": "ميغافاراد",
+        "gigafarad": "جيجافاراد",
+        "terfarad": "تيرفاراد",
+        "farad-per-meter": "فاراد لكل متر",
+        "tesla": "تسلا",
+        "gauss": "جاوس",
+        "gauss-per-centimeter": "جاوس لكل سنتيمتر",
+        "gauss-square-centimeter": "جاوس-مربع سنتيمتر",
+        "henry": "هنري",
+        "henry-per-meter": "هنري لكل متر",
+        "kilogauss-square-centimeter": "كيلوغاوس-سنتيمتر مربع",
+        "microhenry": "مايكروهنري",
+        "microweber": "ميكرويبر",
+        "kilogauss": "كيلوجاوس",
+        "millitesla": "ميليتسلا",
+        "microtesla": "ميكروتسلا",
+        "nanotesla": "نانوتسلا",
+        "kilotesla": "كيلوتسلا",
+        "megatesla": "ميغاتسلا",
+        "millitesla-square-meters": "ميليتسلا متر مربع",
+        "millihenry": "ميلي هنري",
+        "gamma": "جاما",
+        "lambda": "لامبدا",
+        "square-meter-per-second": "متر مربع في الثانية",
+        "square-centimeter-per-second": "سنتيمتر مربع في الثانية",
+        "stoke": "ستوك",
+        "centistokes": "سنتيستوك",
+        "square-foot-per-second": "قدم مربع في الثانية",
+        "square-inch-per-second": "بوصة مربعة في الثانية",
+        "pascal-second": "باسكال ثانية",
+        "centipoise": "سنتيبويز",
+        "poise": "بويز",
+        "reynolds": "رينولدز",
+        "pound-per-foot-hour": "جنيه في القدم في الساعة",
+        "newton-second-per-square-meter": "نيوتن ثانية لكل متر مربع",
+        "dyne-second-per-square-centimeter": "دين ثانية لكل سنتيمتر مربع",
+        "kilogram-per-meter-second": "كيلوجرام في المتر في الثانية",
+        "tesla-square-meters": "تسلا متر مربع",
+        "maxwell": "ماكسويل",
+        "tesla-per-meter": "تسلا لكل متر",
+        "gauss-per-oersted": "جاوس لكل أورستد",
+        "kilogram-per-mole": "كيلوجرام لكل مول",
+        "gram-per-mole": "غرام لكل مول",
+        "milligram-per-mole": "ملليغرام لكل مول",
+        "joule-per-mole": "جول لكل مول",
+        "joule-per-mole-kelvin": "جول لكل مول كلفن",
+        "millivolts-per-meter": "مليفولت لكل متر",
+        "volts-per-meter": "فولت لكل متر",
+        "kilovolts-per-meter": "كيلوفولت لكل متر",
+        "radian-per-second": "راديان في الثانية",
+        "radian-per-second-squared": "راديان في الثانية مربعة",
+        "revolutions-per-minute-per-second": "دورة في الدقيقة في الثانية",
+        "revolutions-per-minute-per-second-squared": "دورة في الدقيقة في الثانية مربعة",
+        "deg-per-second": "درجة في الثانية",
+        "milliweber": "ميلي ويبر",
+        "degrees-brix": "درجات بريكس",
+        "nanohenry": "نانوهنري",
+        "tesla-meter-per-ampere": "تسلا متر في الأمبير",
+        "weber": "ويبر",
+        "katal": "كتال",
+        "katal-per-cubic-metre": "كتال لكل متر مكعب"
+    },
+    "user": {
+        "all": "الكل",
+        "all-users": "جميع المستخدمين",
+        "groups": "المجموعات",
+        "user": "المستخدم",
+        "users": "المستخدمون",
+        "management": "إدارة المستخدمين",
+        "customer-users": "مستخدمو العملاء",
+        "tenant-admins": "مسؤولو المستأجر",
+        "sys-admin": "مسؤول النظام",
+        "tenant-admin": "مسؤول المستأجر",
+        "customer": "العميل",
+        "anonymous": "مجهول",
+        "add": "إضافة مستخدم",
+        "delete": "حذف مستخدم",
+        "add-user-text": "إضافة مستخدم جديد",
+        "no-users-text": "لم يتم العثور على مستخدمين",
+        "user-details": "تفاصيل المستخدم",
+        "delete-users": "حذف المستخدمين",
+        "delete-user-title": "هل أنت متأكد أنك تريد حذف المستخدم '{{userEmail}}'؟",
+        "delete-user-text": "كن حذرًا، بعد التأكيد ستصبح بيانات المستخدم وكل البيانات ذات الصلة غير قابلة للاسترداد.",
+        "delete-users-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {مستخدم واحد} other {# مستخدمين} }؟",
+        "delete-users-action-title": "حذف { count, plural, =1 {مستخدم واحد} other {# مستخدمين} }",
+        "delete-users-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع المستخدمين المحددين وستصبح جميع البيانات ذات الصلة غير قابلة للاسترداد.",
+        "activation-email-sent-message": "تم إرسال بريد التنشيط بنجاح!",
+        "resend-activation": "إعادة إرسال التنشيط",
+        "email": "البريد الإلكتروني",
+        "email-required": "البريد الإلكتروني مطلوب.",
+        "invalid-email-format": "تنسيق البريد الإلكتروني غير صالح.",
+        "first-name": "الاسم الأول",
+        "last-name": "الاسم الأخير",
+        "description": "الوصف",
+        "default-dashboard": "لوحة المعلومات الافتراضية",
+        "always-fullscreen": "دائمًا كامل الشاشة",
+        "select-user": "اختيار المستخدم",
+        "no-users-matching": "لم يتم العثور على مستخدمين مطابقين لـ '{{entity}}'.",
+        "user-required": "المستخدم مطلوب",
+        "activation-method": "طريقة التنشيط",
+        "display-activation-link": "عرض رابط التنشيط",
+        "send-activation-mail": "إرسال بريد التنشيط",
+        "activation-link": "رابط تنشيط المستخدم",
+        "activation-link-text": "لتنشيط المستخدم، استخدم الرابط التالي: <a href='{{activationLink}}' target='_blank'>رابط التنشيط</a> :",
+        "copy-activation-link": "نسخ رابط التنشيط",
+        "activation-link-copied-message": "تم نسخ رابط تنشيط المستخدم إلى الحافظة",
+        "details": "التفاصيل",
+        "login-as-tenant-admin": "تسجيل الدخول كمسؤول المستأجر",
+        "login-as-customer-user": "تسجيل الدخول كمستخدم العميل",
+        "select-group-to-add": "حدد المجموعة المستهدفة لإضافة المستخدمين المحددين",
+        "select-group-to-move": "حدد المجموعة المستهدفة لنقل المستخدمين المحددين",
+        "remove-users-from-group": "هل أنت متأكد أنك تريد إزالة { count, plural, =1 {مستخدم واحد} other {# مستخدمين} } من المجموعة '{{entityGroup}}'؟",
+        "group": "مجموعة المستخدمين",
+        "list-of-groups": "{ count, plural, =1 {مجموعة مستخدم واحدة} other {قائمة من # مجموعات المستخدمين} }",
+        "group-name-starts-with": "مجموعات المستخدمين التي تبدأ أسماؤها بـ '{{prefix}}'",
+        "search": "البحث عن المستخدمين",
+        "selected-users": "{ count, plural, =1 {مستخدم واحد} other {# مستخدمين} } محدد",
+        "disable-account": "تعطيل حساب المستخدم",
+        "enable-account": "تمكين حساب المستخدم",
+        "enable-account-message": "تم تمكين حساب المستخدم بنجاح!",
+        "disable-account-message": "تم تعطيل حساب المستخدم بنجاح!",
+        "copyId": "نسخ معرف المستخدم",
+        "idCopiedMessage": "تم نسخ معرف المستخدم إلى الحافظة",
+        "user-list": "قائمة المستخدمين",
+        "user-list-required": "قائمة المستخدمين مطلوبة"
+    },
+    "value": {
+        "type": "نوع القيمة",
+        "string": "سلسلة نصية",
+        "string-value": "قيمة سلسلة نصية",
+        "string-value-required": "القيمة النصية مطلوبة",
+        "integer": "عدد صحيح",
+        "integer-value": "قيمة عدد صحيح",
+        "integer-value-required": "القيمة الصحيحة مطلوبة",
+        "invalid-integer-value": "قيمة عدد صحيح غير صالحة",
+        "double": "عدد عشري",
+        "double-value": "قيمة عدد عشري",
+        "double-value-required": "القيمة العشرية مطلوبة",
+        "boolean": "قيمة منطقية",
+        "boolean-value": "قيمة منطقية",
+        "false": "خطأ",
+        "true": "صحيح",
+        "long": "عدد طويل",
+        "json": "JSON",
+        "json-value": "قيمة JSON",
+        "json-value-invalid": "تنسيق قيمة JSON غير صالح",
+        "json-value-required": "القيمة JSON مطلوبة."
+    },
+    "version-control": {
+        "version-control": "التحكم بالنسخ",
+        "management": "إدارة التحكم بالنسخ",
+        "search": "بحث النسخ",
+        "branch": "فرع",
+        "default": "افتراضي",
+        "select-branch": "اختر فرع",
+        "branch-required": "الفرع مطلوب",
+        "create-entity-version": "إنشاء نسخة الكيان",
+        "version-name": "اسم النسخة",
+        "version-name-required": "اسم النسخة مطلوب",
+        "author": "المؤلف",
+        "export-relations": "تصدير العلاقات",
+        "export-attributes": "تصدير الصفات",
+        "export-credentials": "تصدير بيانات الاعتماد",
+        "export-group-entities": "تصدير مجموعات الكيانات",
+        "export-roles": "تصدير الأدوار",
+        "entity-versions": "نسخ الكيان",
+        "versions": "النسخ",
+        "created-time": "وقت الإنشاء",
+        "version-id": "معرف النسخة",
+        "no-entity-versions-text": "لم يتم العثور على نسخ كيانات",
+        "no-versions-text": "لم يتم العثور على نسخ",
+        "copy-full-version-id": "نسخ معرف النسخة كامل",
+        "create-version": "إنشاء نسخة",
+        "creating-version": "جاري إنشاء النسخة... الرجاء الانتظار",
+        "nothing-to-commit": "لا يوجد تغييرات للتنفيذ",
+        "restore-version": "استعادة النسخة",
+        "restore-entity-from-version": "استعادة الكيان من النسخة '{{versionName}}'",
+        "restoring-entity-version": "جاري استعادة نسخة الكيان... الرجاء الانتظار",
+        "load-relations": "تحميل العلاقات",
+        "load-attributes": "تحميل الصفات",
+        "load-credentials": "تحميل بيانات الاعتماد",
+        "load-group-entities": "تحميل مجموعات الكيانات",
+        "load-roles": "تحميل الأدوار",
+        "compare-with-current": "مقارنة مع الحالي",
+        "diff-entity-with-version": "الفرق مع نسخة الكيان '{{versionName}}'",
+        "previous-difference": "الفرق السابق",
+        "next-difference": "الفرق التالي",
+        "current": "الحالي",
+        "differences": "{ count, plural, =1 {فرق واحد} other {# فروقات} }",
+        "create-entities-version": "إنشاء نسخة الكيانات",
+        "default-sync-strategy": "استراتيجية المزامنة الافتراضية",
+        "sync-strategy-merge": "دمج",
+        "sync-strategy-overwrite": "الكتابة فوق",
+        "entities-to-export": "الكيانات للتصدير",
+        "entities-to-restore": "الكيانات للاستعادة",
+        "sync-strategy": "استراتيجية المزامنة",
+        "all-entities": "جميع الكيانات",
+        "no-entities-to-export-prompt": "يرجى تحديد الكيانات للتصدير",
+        "no-entities-to-restore-prompt": "يرجى تحديد الكيانات للاستعادة",
+        "add-entity-type": "إضافة نوع الكيان",
+        "remove-all": "إزالة الكل",
+        "version-create-result": "{ added, plural, =0 {لم تتم إضافة كيانات} =1 {كيان واحد} other {# كيانات} } تمت إضافته.<br/>{ modified, plural, =0 {لم تتم تعديل كيانات} =1 {كيان واحد} other {# كيانات} } تم تعديله.<br/>{ removed, plural, =0 {لم تتم إزالة كيانات} =1 {كيان واحد} other {# كيانات} } تمت إزالته.",
+        "remove-other-entities": "إزالة الكيانات الأخرى",
+        "find-existing-entity-by-name": "البحث عن كيان موجود بالاسم",
+        "restore-entities-from-version": "استعادة الكيانات من النسخة '{{versionName}}'",
+        "restoring-entities-from-version": "جاري استعادة الكيانات... الرجاء الانتظار",
+        "no-entities-restored": "لم يتم استعادة كيانات",
+        "created": "{{created}} تم الإنشاء",
+        "updated": "{{updated}} تم التحديث",
+        "deleted": "{{deleted}} تم الحذف",
+        "groups-created": "{ created, plural, =1 {مجموعة واحدة} other {# مجموعات} } تم إنشاؤها",
+        "groups-updated": "{ updated, plural, =1 {مجموعة واحدة} other {# مجموعات} } تم تحديثها",
+        "groups-deleted": "{ deleted, plural, =1 {مجموعة واحدة} other {# مجموعات} } تم حذفها",
+        "remove-other-entities-confirm-text": "كن حذرًا! هذا سيحذف بشكل <b>دائم</b> <b>جميع</b> الكيانات الحالية<br/>غير الموجودة في النسخة التي تريد استعادتها.<br/><br/>الرجاء كتابة <b>\"إزالة الكيانات الأخرى\"</b> للتأكيد.",
+        "auto-commit-to-branch": "التنفيذ التلقائي إلى الفرع <b>{{ branch }}</b>",
+        "default-create-entity-version-name": "تحديث {{entityName}}",
+        "sync-strategy-merge-hint": "ينشئ أو يحدث الكيانات المختارة في المستودع. جميع الكيانات الأخرى في المستودع <b>لا يتم تعديلها</b>.",
+        "sync-strategy-overwrite-hint": "ينشئ أو يحدث الكيانات المختارة في المستودع. جميع الكيانات الأخرى في المستودع <b>يتم حذفها</b>.",
+        "device-credentials-conflict": "فشل في تحميل الجهاز بالمعرف الخارجي <b>{{entityId}}</b><br/>بسبب وجود بيانات اعتماد متطابقة في قاعدة البيانات لجهاز آخر.<br/>يرجى النظر في تعطيل إعداد <b>تحميل بيانات الاعتماد</b> في نموذج الاستعادة.",
+        "missing-referenced-entity": "فشل في تحميل <b>{{sourceEntityTypeName}}</b> بالمعرف الخارجي <b>{{sourceEntityId}}</b><br/>لأنه يشير إلى <b>{{targetEntityTypeName}}</b> مفقود بالمعرف <b>{{targetEntityId}}</b>.",
+        "add-entity-groups": "إضافة مجموعات الكيانات",
+        "entity-groups": "مجموعات الكيانات",
+        "integration-routing-key-conflict": "فشل في تحميل التكامل بالمعرف الخارجي <b>{{entityId}}</b><br/>بسبب وجود مفتاح تكامل متطابق في قاعدة البيانات لتكامل آخر.<br/>يرجى النظر في تفعيل إعداد <b>إنشاء مفتاح تكامل تلقائي</b> في نموذج الاستعادة.",
+        "auto-generate-integration-key": "إنشاء مفتاح التكامل تلقائيًا",
+        "runtime-failed": "<b>فشل:</b> {{message}}",
+        "auto-commit-settings-read-only-hint": "ميزة التنفيذ التلقائي لا تعمل مع تفعيل خيار القراءة فقط في إعدادات المستودع."
+    },
+    "widget": {
+        "widget-library": "مكتبة الأدوات",
+        "widget-bundle": "حزمة الأدوات",
+        "all-bundles": "جميع الحزم",
+        "select-widgets-bundle": "اختر حزمة الأدوات",
+        "widgets": "الأدوات",
+        "all-widgets": "جميع الأدوات",
+        "widget": "أداة",
+        "select-widget": "اختر أداة",
+        "no-widgets-matching": "لا توجد أدوات مطابقة لـ '{{entity}}'.",
+        "no-widgets": "لا توجد أدوات بعد",
+        "no-widgets-text": "لم يتم العثور على أدوات",
+        "management": "إدارة الأدوات",
+        "editor": "محرر الأدوات",
+        "confirm-to-exit-editor-html": "لديك إعدادات أداة غير محفوظة.<br>هل أنت متأكد أنك تريد مغادرة هذه الصفحة؟",
+        "widget-type-not-found": "مشكلة في تحميل تكوين الأداة.<br>ربما تم إزالة نوع الأداة المرتبط.",
+        "widget-type-load-error": "لم يتم تحميل الأداة بسبب الأخطاء التالية:",
+        "remove": "إزالة الأداة",
+        "delete": "حذف الأداة",
+        "edit": "تعديل الأداة",
+        "remove-widget-title": "هل أنت متأكد أنك تريد إزالة الأداة '{{widgetTitle}}'؟",
+        "remove-widget-text": "بعد التأكيد، ستصبح الأداة وجميع البيانات ذات الصلة غير قابلة للاسترجاع.",
+        "timeseries": "سلاسل زمنية",
+        "search-data": "بحث البيانات",
+        "no-data-found": "لم يتم العثور على بيانات",
+        "latest": "آخر القيم",
+        "rpc": "أداة التحكم",
+        "alarm": "أداة التنبيه",
+        "static": "أداة ثابتة",
+        "timeseries-short": "سلسلة",
+        "latest-short": "آخر",
+        "rpc-short": "تحكم",
+        "alarm-short": "تنبيه",
+        "static-short": "ثابت",
+        "select-widget-type": "اختر نوع الأداة",
+        "missing-widget-title-error": "يجب تحديد عنوان الأداة!",
+        "widget-saved": "تم حفظ الأداة",
+        "unable-to-save-widget-error": "تعذر حفظ الأداة! الأداة تحتوي على أخطاء!",
+        "save": "حفظ الأداة",
+        "saveAs": "حفظ الأداة باسم",
+        "move": "نقل الأداة",
+        "save-widget-as": "حفظ الأداة باسم",
+        "save-widget-as-text": "الرجاء إدخال عنوان جديد للأداة",
+        "toggle-fullscreen": "تبديل وضع ملء الشاشة",
+        "run": "تشغيل الأداة",
+        "widget-title": "عنوان الأداة",
+        "title": "العنوان",
+        "title-required": "عنوان الأداة مطلوب.",
+        "title-max-length": "يجب أن يكون العنوان أقل من 256",
+        "system": "نظام",
+        "type": "نوع الأداة",
+        "resources": "الموارد",
+        "resource-url": "رابط JavaScript/CSS",
+        "resource-is-module": "هو وحدة",
+        "remove-resource": "إزالة المورد",
+        "add-resource": "إضافة مورد",
+        "html": "HTML",
+        "tidy": "تنظيم",
+        "css": "CSS",
+        "settings-schema": "مخطط الإعدادات",
+        "datakey-settings-schema": "مخطط إعدادات مفتاح البيانات",
+        "latest-datakey-settings-schema": "أحدث مخطط لإعدادات مفتاح البيانات",
+        "widget-settings": "إعدادات الأداة",
+        "description": "الوصف",
+        "tags": "العلامات",
+        "image-preview": "معاينة الصورة",
+        "settings-form-selector": "محدد نموذج الإعدادات",
+        "data-key-settings-form-selector": "محدد نموذج إعدادات مفتاح البيانات",
+        "latest-data-key-settings-form-selector": "محدد نموذج أحدث إعدادات مفتاح البيانات",
+        "all": "الكل",
+        "actual": "فعلي",
+        "deprecated": "مهجور",
+        "has-basic-mode": "يحتوي على وضع أساسي",
+        "basic-mode-form-selector": "محدد نموذج الوضع الأساسي",
+        "basic-mode": "أساسي",
+        "advanced-mode": "متقدم",
+        "javascript": "جافاسكربت",
+        "js": "JS",
+        "delete-widget-title": "هل أنت متأكد أنك تريد حذف الأداة '{{widgetName}}'؟",
+        "delete-widget-text": "بعد التأكيد، ستصبح الأداة وجميع البيانات ذات الصلة غير قابلة للاسترجاع.",
+        "delete-widgets-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {أداة واحدة} other {# أدوات} }؟",
+        "delete-widgets-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع الأدوات المحددة وجميع البيانات ذات الصلة غير قابلة للاسترجاع.",
+        "delete-widget": "حذف الأداة",
+        "widget-template-load-failed-error": "فشل في تحميل قالب الأداة!",
+        "details": "تفاصيل",
+        "widget-details": "تفاصيل الأداة",
+        "add": "إضافة أداة",
+        "add-existing-widget": "إضافة أداة موجودة",
+        "add-new-widget": "إضافة أداة جديدة",
+        "search-widgets": "بحث الأدوات",
+        "selected-widgets": "{ count, plural, =1 {أداة واحدة} other {# أدوات} } مختارة",
+        "undo": "تراجع عن تغييرات الأداة",
+        "export": "تصدير الأداة",
+        "export-widgets": "تصدير الأدوات",
+        "export-data": "تصدير بيانات الأداة",
+        "export-to-csv": "تصدير البيانات إلى CSV...",
+        "export-to-excel": "تصدير البيانات إلى XLS...",
+        "export-to-excel-xlsx": "تصدير البيانات إلى XLSX...",
+        "import": "استيراد أداة",
+        "no-data": "لا توجد بيانات لعرضها على الأداة",
+        "data-overflow": "الأداة تعرض {{count}} من أصل {{total}} كيان",
+        "alarm-data-overflow": "الأداة تعرض تنبيهات لـ {{allowedEntities}} كيانات (الحد الأقصى المسموح) من أصل {{totalEntities}} كيان",
+        "search": "بحث عن أداة",
+        "filter": "نوع فلتر الأداة",
+        "loading-widgets": "جاري تحميل الأدوات...",
+        "widget-template-error": "قالب HTML الأداة غير صالح."
+    },
+    "widget-action": {
+        "header-button": "زر رأس الودجة",
+        "open-dashboard-state": "انتقال إلى حالة لوحة تحكم جديدة",
+        "update-dashboard-state": "تحديث حالة لوحة التحكم الحالية",
+        "open-dashboard": "انتقال إلى لوحة تحكم أخرى",
+        "custom": "إجراء مخصص",
+        "custom-pretty": "إجراء مخصص (مع قالب HTML)",
+        "custom-pretty-error-title": "خطأ في الحوار المخصص",
+        "custom-pretty-template-error": "قالب الحوار المخصص غير صالح.",
+        "custom-pretty-controller-error": "حدث خطأ أثناء تقييم وظيفة الحوار المخصصة.",
+        "mobile-action": "إجراء على الهاتف المحمول",
+        "target-dashboard-state": "حالة لوحة التحكم المستهدفة",
+        "target-dashboard-state-required": "حالة لوحة التحكم المستهدفة مطلوبة",
+        "set-entity-from-widget": "تعيين كيان من الودجة",
+        "target-dashboard": "لوحة تحكم مستهدفة",
+        "open-right-layout": "فتح تخطيط لوحة التحكم اليميني (عرض الجوال)",
+        "state-display-type": "خيار عرض حالة لوحة التحكم",
+        "open-normal": "عادي",
+        "open-in-separate-dialog": "فتح في حوار منفصل",
+        "open-in-popover": "فتح في منبثق",
+        "dialog-title": "عنوان الحوار",
+        "dialog-hide-dashboard-toolbar": "إخفاء شريط أدوات لوحة التحكم في الحوار",
+        "dialog-width": "عرض الحوار بالنسبة لعرض منطقة العرض بالنسبة المئوية",
+        "dialog-height": "ارتفاع الحوار بالنسبة لارتفاع منطقة العرض بالنسبة المئوية",
+        "dialog-size-range-error": "يجب أن تكون قيمة نسبة حجم الحوار في نطاق من 1 إلى 100.",
+        "popover-preferred-placement": "الترتيب المفضل للمنبثق",
+        "popover-placement-top": "أعلى",
+        "popover-placement-topLeft": "أعلى اليسار",
+        "popover-placement-topRight": "أعلى اليمين",
+        "popover-placement-right": "يمين",
+        "popover-placement-rightTop": "أعلى اليمين",
+        "popover-placement-rightBottom": "أسفل اليمين",
+        "popover-placement-bottom": "أسفل",
+        "popover-placement-bottomLeft": "أسفل اليسار",
+        "popover-placement-bottomRight": "أسفل اليمين",
+        "popover-placement-left": "يسار",
+        "popover-placement-leftTop": "أعلى اليسار",
+        "popover-placement-leftBottom": "أسفل اليسار",
+        "popover-hide-on-click-outside": "إخفاء المنبثق عند النقر خارجه",
+        "popover-hide-dashboard-toolbar": "إخفاء شريط أدوات لوحة التحكم في المنبثق",
+        "popover-width": "عرض المنبثق بوحدات المتصفح (على سبيل المثال 100px، 25vw)",
+        "popover-height": "ارتفاع المنبثق بوحدات المتصفح (على سبيل المثال 100px، 25vh)",
+        "popover-style": "نمط المنبثق",
+        "open-new-browser-tab": "فتح في علامة تبويب متصفح جديدة",
+        "mobile": {
+            "action-type": "نوع إجراء الجوال",
+            "action-type-required": "نوع إجراء الجوال مطلوب",
+            "take-picture-from-gallery": "التقاط صورة من المعرض",
+            "take-photo": "التقاط صورة",
+            "map-direction": "فتح اتجاهات الخريطة",
+            "map-location": "فتح موقع الخريطة",
+            "scan-qr-code": "مسح رمز الاستجابة السريعة (QR)",
+            "make-phone-call": "إجراء مكالمة هاتفية",
+            "get-location": "الحصول على موقع الهاتف",
+            "take-screenshot": "التقاط لقطة شاشة"
+        }
+    },
+    "widgets-bundle": {
+        "current": "الحزمة الحالية",
+        "widgets-bundles": "حزم الودجات",
+        "widgets-bundle-widgets": "ودجات حزم الودجات",
+        "add": "إضافة حزمة الودجات",
+        "delete": "حذف حزمة الودجات",
+        "title": "العنوان",
+        "title-required": "العنوان مطلوب.",
+        "title-max-length": "يجب أن يكون العنوان أقل من 256 حرفًا",
+        "description": "الوصف",
+        "image-preview": "معاينة الصورة",
+        "order": "الترتيب",
+        "add-widgets-bundle-text": "إضافة حزمة جديدة من الودجات",
+        "no-widgets-bundles-text": "لم يتم العثور على حزم الودجات",
+        "empty": "حزمة الودجات فارغة",
+        "details": "التفاصيل",
+        "widgets-bundle-details": "تفاصيل حزمة الودجات",
+        "delete-widgets-bundle-title": "هل أنت متأكد أنك تريد حذف حزمة الودجات '{{widgetsBundleTitle}}'؟",
+        "delete-widgets-bundle-text": "كن حذرًا، بعد التأكيد ستصبح حزمة الودجات وجميع البيانات ذات الصلة غير قابلة للاسترداد.",
+        "delete-widgets-bundles-title": "هل أنت متأكد أنك تريد حذف { count, plural, =1 {حزمة واحدة من الودجات} other {# حزمة من الودجات} }؟",
+        "delete-widgets-bundles-action-title": "حذف { count, plural, =1 {حزمة واحدة من الودجات} other {# حزمة من الودجات} }",
+        "delete-widgets-bundles-text": "كن حذرًا، بعد التأكيد سيتم إزالة جميع حزم الودجات المحددة وستصبح جميع البيانات ذات الصلة غير قابلة للاسترداد.",
+        "no-widgets-bundles-matching": "لم يتم العثور على حزم الودجات المطابقة لـ '{{widgetsBundle}}'.",
+        "widgets-bundle-required": "حزمة الودجات مطلوبة.",
+        "system": "النظام",
+        "import": "استيراد حزمة الودجات",
+        "export": "تصدير حزمة الودجات",
+        "export-widgets-bundle-widgets-prompt": "تضمين ودجات الحزمة في البيانات المصدرة (وإلا سيتم تصدير معرفات الودجات المرجعية فقط)",
+        "export-failed-error": "تعذر تصدير حزمة الودجات: {{error}}",
+        "create-new-widgets-bundle": "إنشاء حزمة جديدة من الودجات",
+        "widgets-bundle-file": "ملف حزمة الودجات",
+        "invalid-widgets-bundle-file-error": "تعذر استيراد حزمة الودجات: هيكل بيانات حزمة الودجات غير صالح.",
+        "search": "بحث في حزم الودجات",
+        "selected-widgets-bundles": "{ count, plural, =1 {1 حزمة من الودجات} other {# حزمة من الودجات} } محددة",
+        "open-widgets-bundle": "فتح حزمة الودجات",
+        "loading-widgets-bundles": "جاري تحميل حزم الودجات..."
+    },
+    "widget-config": {
+        "data": "البيانات",
+        "settings": "الإعدادات",
+        "advanced": "متقدم",
+        "appearance": "المظهر",
+        "widget-card": "بطاقة الودجة",
+        "mobile": "الجوال",
+        "title": "العنوان",
+        "title-tooltip": "تلميح العنوان",
+        "general-settings": "الإعدادات العامة",
+        "display-title": "عرض عنوان الودجة",
+        "card-title": "عنوان البطاقة",
+        "drop-shadow": "ظل الانسياب",
+        "enable-fullscreen": "تمكين الشاشة الكاملة",
+        "enable-data-export": "تمكين تصدير البيانات",
+        "data-export": "تصدير البيانات",
+        "background-color": "لون الخلفية",
+        "text-color": "لون النص",
+        "border-radius": "نصف قطر الحدود",
+        "padding": "التباعد الداخلي",
+        "margin": "الهامش",
+        "widget-style": "نمط الودجة",
+        "widget-css": "CSS الخاص بالودجة",
+        "title-style": "نمط العنوان",
+        "mobile-mode-settings": "إعدادات الوضع الجوال",
+        "order": "الترتيب",
+        "height": "الارتفاع",
+        "mobile-hide": "إخفاء الودجة في الوضع الجوال",
+        "desktop-hide": "إخفاء الودجة في الوضع سطح المكتب",
+        "units": "رمز خاص لإظهاره بجانب القيمة",
+        "units-by-default": "الوحدات افتراضيًا",
+        "decimals": "عدد الأرقام بعد الفاصلة العشرية",
+        "decimals-by-default": "الأرقام العشرية افتراضيًا",
+        "default-data-key-parameter-hint": "ينطبق هذا المعلم على جميع قيم الودجة ما لم يتم تجاوزه بواسطة تكوين مفتاح البيانات",
+        "units-short": "الوحدات",
+        "decimals-short": "الأرقام العشرية",
+        "decimals-suffix": "الأرقام العشرية",
+        "timewindow": "نافذة الوقت",
+        "use-dashboard-timewindow": "استخدام نافذة الوقت للوحة التحكم",
+        "use-widget-timewindow": "استخدام نافذة الوقت للودجة",
+        "display-timewindow": "عرض نافذة الوقت",
+        "legend": "وسيلة تعليمية",
+        "display-legend": "عرض الوسيلة التعليمية",
+        "datasources": "مصادر البيانات",
+        "datasource": "مصدر البيانات",
+        "maximum-datasources": "مسموح بأقصى { count, plural, =1 {مصدر بيانات واحد فقط.} other {# مصادر بيانات فقط مسموحة} }",
+        "timeseries-key-error": "يجب تحديد مفتاح بيانات سلاسل زمنية واحد على الأقل",
+        "datasource-type": "النوع",
+        "datasource-parameters": "المعلمات",
+        "remove-datasource": "إزالة مصدر البيانات",
+        "add-datasource": "إضافة مصدر البيانات",
+        "target-device": "الجهاز المستهدف",
+        "alarm-source": "مصدر التنبيه",
+        "actions": "الإجراءات",
+        "action": "الإجراء",
+        "add-action": "إضافة إجراء",
+        "search-actions": "بحث عن الإجراءات",
+        "no-actions-text": "لم يتم العثور على إجراءات",
+        "action-source": "مصدر الإجراء",
+        "action-source-required": "مصدر الإجراء مطلوب.",
+        "action-name": "الاسم",
+        "action-name-required": "اسم الإجراء مطلوب.",
+        "action-name-not-unique": "يوجد إجراء آخر بنفس الاسم بالفعل. <br/> يجب أن يكون اسم الإجراء فريدًا ضمن نفس مصدر الإجراء.",
+        "action-icon": "الرمز",
+        "show-hide-action-using-function": "إظهار/إخفاء الإجراء باستخدام الدالة",
+        "action-type": "النوع",
+        "action-type-required": "نوع الإجراء مطلوب.",
+        "edit-action": "تحرير الإجراء",
+        "delete-action": "حذف الإجراء",
+        "delete-action-title": "حذف إجراء الودجة",
+        "delete-action-text": "هل أنت متأكد أنك تريد حذف إجراء الودجة بالاسم '{{actionName}}'؟",
+        "title-icon": "رمز العنوان",
+        "display-icon": "عرض رمز العنوان",
+        "card-icon": "رمز البطاقة",
+        "icon": "الرمز",
+        "icon-color": "لون الرمز",
+        "icon-size": "حجم الرمز",
+        "advanced-settings": "الإعدادات المتقدمة",
+        "data-settings": "إعدادات البيانات",
+        "limits": "الحدود",
+        "no-data-display-message": "رسالة بديلة \"لا توجد بيانات لعرضها\"",
+        "data-page-size": "أقصى عدد للكيانات لكل مصدر بيانات",
+        "settings-component-not-found": "لم يتم العثور على مكون نموذج الإعدادات للمحدد '{{selector}}'",
+        "preview": "معاينة",
+        "set": "تعيين",
+        "set-message": "رسالة تعيين",
+        "advanced-title-style": "نمط العنوان المتقدم",
+        "card-style": "نمط البطاقة",
+        "text": "النص",
+        "background": "الخلفية",
+        "advanced-widget-style": "نمط الودجة المتقدم",
+        "card-buttons": "أزرار البطاقة",
+        "show-card-buttons": "عرض أزرار البطاقة",
+        "card-border-radius": "نصف قطر حدود البطاقة",
+        "card-appearance": "مظهر البطاقة",
+        "color": "اللون",
+        "tooltip": "تلميح",
+        "units-required": "الوحدة مطلوبة."
+    },
+    "widget-type": {
+        "import": "استيراد نوع الودجة",
+        "export": "تصدير نوع الودجة",
+        "export-failed-error": "تعذر تصدير الودجة: {{error}}",
+        "widget-file": "ملف الودجة",
+        "invalid-widget-file-error": "تعذر استيراد الودجة: هيكل بيانات الودجة غير صالح."
+    },
+    "self-registration": {
+        "self-registration": "التسجيل الذاتي",
+        "self-registration-url": "رابط التسجيل الذاتي",
+        "captcha-version": "إصدار رمز التحقق",
+        "captcha-action": "اسم السجل الرمزي لـ reCAPTCHA",
+        "captcha-site-key": "مفتاح موقع reCAPTCHA",
+        "captcha-secret-key": "المفتاح السري لـ reCAPTCHA",
+        "notification-email": "البريد الإلكتروني للإشعار",
+        "notification-email-invalid": "تنسيق البريد الإلكتروني غير صالح.",
+        "notification-email-required": "البريد الإلكتروني للإشعار مطلوب.",
+        "privacy-policy-text": "نص سياسة الخصوصية",
+        "terms-of-use-text": "نص شروط الاستخدام",
+        "text-message-page": "رسالة نصية لصفحة التسجيل",
+        "enable-mobile-self-registration": "تمكين التسجيل الذاتي من التطبيق المحمول",
+        "mobile-self-registration-title": "إعدادات التسجيل الذاتي للتطبيق المحمول",
+        "mobile-package": "حزمة التطبيق",
+        "mobile-package-placeholder": "مثال: my.example.app",
+        "mobile-package-hint": "لنظام Android: معرف التطبيق الفريد الخاص بك. لنظام iOS: معرف حزمة المنتج.",
+        "mobile-package-required": "حزمة التطبيق مطلوبة",
+        "mobile-app-secret": "التطبيق السري",
+        "invalid-mobile-app-secret": "يجب أن يحتوي التطبيق السري على أحرف أبجدية وأرقام فقط ويجب أن يكون بين 16 و 2048 حرفًا.",
+        "copy-mobile-app-secret": "نسخ التطبيق السري",
+        "mobile-app-scheme": "رابط التطبيق",
+        "mobile-app-scheme-placeholder": "مثال: customscheme",
+        "mobile-app-scheme-required": "رابط التطبيق مطلوب",
+        "mobile-app-host": "اسم المضيف لرابط التطبيق",
+        "mobile-app-host-placeholder": "مثال: my.app.host",
+        "mobile-app-host-required": "اسم المضيف لرابط التطبيق مطلوب",
+        "show-privacy-policy": "عرض سياسة الخصوصية",
+        "show-terms-of-use": "عرض شروط الاستخدام",
+        "domain-settings": "إعدادات النطاق",
+        "general-settings": "الإعدادات العامة"
+    },
+    "solution-template": {
+        "solution-template": "قالب الحل",
+        "solution-templates": "قوالب الحل",
+        "management": "إدارة قوالب الحل",
+        "details": "التفاصيل",
+        "install": "تثبيت",
+        "level": "المستوى",
+        "install-title": "تم تثبيت قالب الحل بنجاح",
+        "install-failed-title": "فشل تثبيت قالب الحل",
+        "instructions": "التعليمات",
+        "goto-main-dashboard": "الانتقال إلى لوحة التحكم الرئيسية",
+        "delete": "حذف",
+        "delete-solution-title": "هل أنت متأكد أنك تريد حذف الحل '{{solutionTitle}}'؟",
+        "delete-solution-text": "كن حذرًا، بعد التأكيد سيتم جعل الحل وجميع البيانات المتعلقة به لا يمكن استردادها.",
+        "installing": "جارٍ تثبيت قالب الحل..."
+    },
+    "markdown": {
+        "edit": "تعديل",
+        "preview": "معاينة",
+        "copy-code": "انقر للنسخ",
+        "copied": "تم النسخ!"
+    },
+    "white-labeling": {
+        "white-labeling": "تسمية بيضاء",
+        "white-labeling-general": "تسمية بيضاء عامة",
+        "login-white-labeling": "تسمية بيضاء لتسجيل الدخول",
+        "general": "عام",
+        "login": "تسجيل الدخول",
+        "preview": "معاينة",
+        "app-title": "عنوان التطبيق",
+        "favicon": "رمز الموقع",
+        "favicon-description": "*.ico، *.gif أو *.png صورة بحجم أقصى {{kbSize}} كيلوبايت.",
+        "favicon-size-error": "صورة الموقع كبيرة جدًا. أقصى حجم مسموح به لصور الموقع {{kbSize}} كيلوبايت.",
+        "favicon-type-error": "تنسيق ملف صورة الموقع غير صالح. يتم قبول صور ICO، GIF أو PNG فقط.",
+        "drop-favicon-image": "اسحب صورة رمز الموقع أو انقر لتحديد ملف للتحميل.",
+        "drop-favicon-image-or": "اسحب وأسقط صورة رمز الموقع أو",
+        "no-favicon-image": "لم يتم اختيار أي رمز",
+        "logo": "شعار",
+        "logo-description": "أي صورة بحجم أقصى {{kbSize}} كيلوبايت.",
+        "logo-size-error": "صورة الشعار كبيرة جدًا. الحجم الأقصى المسموح به لصورة الشعار {{kbSize}} كيلوبايت.",
+        "logo-type-error": "تنسيق ملف الشعار غير صالح. يتم قبول الصور فقط.",
+        "drop-logo-image": "اسحب صورة الشعار أو انقر لتحديد ملف للتحميل.",
+        "drop-logo-image-or": "اسحب وأسقط صورة الشعار أو",
+        "no-logo-image": "لم يتم اختيار أي شعار",
+        "logo-height": "ارتفاع الشعار، بكسل",
+        "primary-palette": "الباليت الأساسي",
+        "accent-palette": "الباليت المثير",
+        "customize-palette": "تخصيص",
+        "advanced-css": "CSS المتقدم",
+        "edit-palette": "تحرير الباليت",
+        "save-palette": "حفظ الباليت",
+        "primary-background": "خلفية أساسية",
+        "secondary-background": "خلفية ثانوية",
+        "hue1": "درجة لون 1",
+        "hue2": "درجة لون 2",
+        "hue3": "درجة لون 3",
+        "page-background-color": "لون خلفية الصفحة",
+        "dark-foreground": "أمامي داكن",
+        "domain-name": "اسم النطاق",
+        "base-url": "عنوان URL الأساسي",
+        "prohibit-different-url": "منع استخدام اسم مضيف من رؤوس الطلبات العميل",
+        "prohibit-different-url-hint": "يجب تمكين هذا الإعداد لبيئات الإنتاج. قد يتسبب في مشاكل أمان عند التعطيل",
+        "help-link-base-url": "عناوين مساعدة الروابط الأساسية",
+        "ui-help-base-url": "عنوان URL الأساسي للمساعدة في واجهة المستخدم",
+        "enable-help-links": "تمكين روابط المساعدة",
+        "error-verification-url": "لا يجب أن يحتوي اسم النطاق على الرموز '/' و ':' . مثال: thingsboard.io",
+        "show-platform-name-version": "عرض اسم المنصة والإصدار",
+        "platform-name": "اسم المنصة",
+        "platform-version": "إصدار المنصة",
+        "version-mask": "{{name}} v.{{version}}",
+        "position": {
+            "label": "موقع اسم المنصة والإصدار",
+            "under-logo": "تحت الشعار",
+            "bottom": "أسفل نموذج تسجيل الدخول"
+        }
+    },
+    "widgets": {
+        "background": {
+            "background": "الخلفية",
+            "background-settings": "إعدادات الخلفية",
+            "background-type-image": "صورة",
+            "background-type-color": "لون",
+            "image-url": "عنوان URL للصورة",
+            "overlay": "تراكب",
+            "enable-overlay": "تمكين التراكب",
+            "blur": "ضبابية",
+            "preview": "معاينة"
+        },
+        "battery-level": {
+            "layout": "التخطيط",
+            "layout-vertical-solid": "عمودي. صلب",
+            "layout-horizontal-solid": "أفقي. صلب",
+            "layout-vertical-divided": "عمودي. مقسم",
+            "layout-horizontal-divided": "أفقي. مقسم",
+            "icon": "أيقونة",
+            "value": "القيمة",
+            "auto-scale": "تحجيم تلقائي",
+            "battery-level-color": "لون مستوى البطارية",
+            "battery-shape-color": "لون شكل البطارية",
+            "battery-level-card-style": "نمط بطاقة مستوى البطارية",
+            "sections-count": "عدد الأقسام"
+        },
+        "signal-strength": {
+            "value": "القيمة",
+            "last-update": "آخر تحديث",
+            "no-signal": "لا إشارة",
+            "layout": "التخطيط",
+            "layout-wifi": "واي فاي",
+            "layout-cellular-bar": "شريط الخلية",
+            "icon": "أيقونة",
+            "date": "التاريخ",
+            "active-bars-color": "لون الشرائط النشطة للإشارة",
+            "inactive-bars-color": "لون الشرائط غير النشطة للإشارة",
+            "tooltip": "تلميح",
+            "background-color": "لون الخلفية",
+            "background-blur": "ضبابية الخلفية",
+            "signal-strength-card-style": "نمط بطاقة قوة الإشارة"
+        },
+        "chart": {
+            "common-settings": "الإعدادات الشائعة",
+            "enable-stacking-mode": "تمكين وضع التراص",
+            "selection": "تحديد نطاق الوقت",
+            "enable-selection-mode": "تمكين وضع التحديد",
+            "line-shadow-size": "حجم ظل الخط",
+            "display-smooth-lines": "عرض الخطوط الناعمة (المنحنية)",
+            "default-bar-width": "العرض الافتراضي للعمود للبيانات غير المجمعة (بالميلي ثانية)",
+            "bar-alignment": "محاذاة العمود",
+            "bar-alignment-left": "يسار",
+            "bar-alignment-right": "يمين",
+            "bar-alignment-center": "وسط",
+            "default-font": "الخط الافتراضي",
+            "default-font-size": "حجم الخط الافتراضي",
+            "default-font-color": "لون الخط الافتراضي",
+            "thresholds-line-width": "عرض الخط الافتراضي لجميع الحدود",
+            "tooltip-settings": "إعدادات التلميح",
+            "tooltip": "تلميح",
+            "show-tooltip": "عرض التلميح",
+            "hover-individual-points": "تحويل مؤشرات فردية",
+            "show-cumulative-values": "عرض القيم التراكمية في وضع التراص",
+            "hide-zero-false-values": "إخفاء القيم الصفرية / الكاذبة من التلميح",
+            "tooltip-value-format-function": "وظيفة تنسيق قيم التلميح",
+            "grid-settings": "إعدادات الشبكة",
+            "show-vertical-lines": "عرض الخطوط الرأسية",
+            "show-horizontal-lines": "عرض الخطوط الأفقية",
+            "grid-outline-border-width": "عرض الحدود / الشبكة (بالبكسل)",
+            "primary-color": "اللون الأساسي",
+            "background-color": "لون الخلفية",
+            "ticks-color": "لون العلامات",
+            "xaxis-settings": "إعدادات المحور الأفقي",
+            "axis-title": "عنوان المحور",
+            "xaxis-tick-labels-settings": "إعدادات تسميات العلامات على المحور الأفقي",
+            "show-tick-labels": "عرض تسميات العلامات",
+            "yaxis-settings": "إعدادات المحور الرأسي",
+            "min-scale-value": "القيمة الدنيا على المقياس",
+            "max-scale-value": "القيمة القصوى على المقياس",
+            "yaxis-tick-labels-settings": "إعدادات تسميات العلامات على المحور الرأسي",
+            "tick-step-size": "الخطوة بين العلامات",
+            "number-of-decimals": "عدد الأرقام العشرية للعرض",
+            "ticks-formatter-function": "وظيفة تنسيق العلامات",
+            "comparison-settings": "إعدادات المقارنة",
+            "enable-comparison": "تمكين المقارنة",
+            "time-for-comparison": "فترة المقارنة",
+            "time-for-comparison-previous-interval": "الفاصل الزمني السابق (الافتراضي)",
+            "time-for-comparison-days": "قبل يوم",
+            "time-for-comparison-weeks": "قبل أسبوع",
+            "time-for-comparison-months": "قبل شهر",
+            "time-for-comparison-years": "قبل سنة",
+            "time-for-comparison-custom-interval": "الفاصل الزمني المخصص",
+            "custom-interval-value": "قيمة الفاصل الزمني المخصصة (بالميلي ثانية)",
+            "comparison-x-axis-settings": "إعدادات محور المقارنة الأفقي",
+            "axis-position": "موضع المحور",
+            "axis-position-top": "أعلى (الافتراضي)",
+            "axis-position-bottom": "أسفل",
+            "custom-legend-settings": "إعدادات الأسطورة المخصصة",
+            "enable-custom-legend": "تمكين الأسطورة المخصصة (سيتيح لك هذا استخدام قيم السمات / السلاسل الزمنية في تسميات المفاتيح)",
+            "key-name": "اسم المفتاح",
+            "key-name-required": "اسم المفتاح مطلوب",
+            "key-type": "نوع المفتاح",
+            "key-type-attribute": "سمة",
+            "key-type-timeseries": "سلسلة زمنية",
+            "label-keys-list": "قائمة المفاتيح لاستخدامها في التسميات",
+            "no-label-keys": "لا توجد مفاتيح مكونة",
+            "add-label-key": "إضافة مفتاح جديد",
+            "line-width": "عرض الخط",
+            "color": "اللون",
+            "data-is-hidden-by-default": "البيانات مخفية افتراضيًا",
+            "disable-data-hiding": "تعطيل إخفاء البيانات",
+            "remove-from-legend": "إزالة مفتاح البيانات من الأسطورة",
+            "exclude-from-stacking": "استبعاد من التراص (متاح في \"التراص\" فقط)",
+            "line-settings": "إعدادات الخط",
+            "show-line": "عرض الخط",
+            "fill-line": "ملء الخط",
+            "fill-line-opacity": "شفافية الملء",
+            "points-settings": "إعدادات النقاط",
+            "show-points": "عرض النقاط",
+            "points-line-width": "عرض الخط للنقاط",
+            "points-radius": "نصف قطر النقاط",
+            "point-shape": "شكل النقطة",
+            "point-shape-circle": "دائرة",
+            "point-shape-cross": "صليب",
+            "point-shape-diamond": "ماسة",
+            "point-shape-square": "مربع",
+            "point-shape-triangle": "مثلث",
+            "point-shape-custom": "وظيفة مخصصة",
+            "point-shape-draw-function": "وظيفة رسم شكل النقطة",
+            "show-separate-axis": "عرض محور منفصل",
+            "axis-position-left": "يسار",
+            "axis-position-right": "يمين",
+            "thresholds": "الحدود",
+            "no-thresholds": "لا توجد حدود مكونة",
+            "add-threshold": "إضافة حد",
+            "show-values-for-comparison": "عرض القيم التاريخية للمقارنة",
+            "comparison-values-label": "تسمية القيم التاريخية",
+            "comparison-line-color": "لون الخط للمقارنة",
+            "threshold-settings": "إعدادات الحدود",
+            "use-as-threshold": "استخدام قيمة المفتاح كحد",
+            "threshold-line-width": "عرض الخط للحد",
+            "threshold-color": "لون الحد",
+            "common-pie-settings": "إعدادات البيتزا الشائعة",
+            "radius": "النصف",
+            "inner-radius": "النصف الداخلي",
+            "tilt": "ميل",
+            "common-pie-settings-range-error": "يجب أن تكون القيمة في النطاق من 0 إلى 1",
+            "stroke-settings": "إعدادات السكتة الدماغية",
+            "width-pixels": "العرض (بالبكسل)",
+            "show-labels": "عرض التسميات",
+            "animation-settings": "إعدادات الرسوم المتحركة",
+            "animated-pie": "تمكين رسوم متحركة للبيتزا (تجريبي)",
+            "border-settings": "إعدادات الحدود",
+            "border-width": "عرض الحدود",
+            "border-color": "لون الحدود",
+            "legend-settings": "إعدادات الأسطورة",
+            "display-legend": "عرض الأسطورة",
+            "labels-font-color": "لون خط التسميات",
+            "series": "سلاسل",
+            "add-series": "إضافة سلسلة",
+            "series-settings": "إعدادات السلاسل",
+            "remove-series": "إزالة السلسلة",
+            "no-series": "لا توجد سلاسل مكونة",
+            "no-series-error": "يجب تحديد سلسلة واحدة على الأقل",
+            "chart-appearance": "مظهر الرسم البياني",
+            "vertical-grid-lines": "خطوط الشبكة العمودية",
+            "horizontal-grid-lines": "خطوط الشبكة الأفقية",
+            "chart-background": "خلفية الرسم البياني",
+            "grid-lines-color": "لون خطوط الشبكة",
+            "border": "حدود",
+            "axis": "محور",
+            "vertical-axis": "المحور العمودي",
+            "ticks": "العلامات",
+            "horizontal-axis": "المحور الأفقي"
+        },
+        "color": {
+            "color-settings": "إعدادات الألوان",
+            "color-type-constant": "ثابت",
+            "color-type-range": "نطاق",
+            "color-type-function": "وظيفة",
+            "color": "اللون",
+            "value-range": "نطاق القيمة",
+            "from": "من",
+            "to": "إلى",
+            "color-function": "وظيفة اللون",
+            "copy-color-settings-from": "نسخ إعدادات الألوان من"
+        },
+        "dashboard-state": {
+            "dashboard-state-settings": "إعدادات حالة لوحة المعلومات",
+            "dashboard-state": "معرف حالة لوحة المعلومات",
+            "autofill-state-layout": "ملء تخطيط الحالة تلقائيًا بالارتفاع الافتراضي",
+            "default-margin": "هامش الودجت الافتراضي",
+            "default-background-color": "لون الخلفية الافتراضي",
+            "sync-parent-state-params": "مزامنة معلمات الحالة مع لوحة المعلومات الأم"
+        },
+        "date-range-navigator": {
+            "date-range-picker-settings": "إعدادات مُحدّد نطاق التاريخ",
+            "hide-date-range-picker": "إخفاء مُحدّد نطاق التاريخ",
+            "picker-one-panel": "مُحدّد نطاق التاريخ بلوحة واحدة",
+            "picker-auto-confirm": "تأكيد تلقائي لمُحدّد نطاق التاريخ",
+            "picker-show-template": "عرض القالب لمُحدّد نطاق التاريخ",
+            "first-day-of-week": "أول يوم في الأسبوع",
+            "interval-settings": "إعدادات الفترة",
+            "hide-interval": "إخفاء الفترة",
+            "initial-interval": "الفترة الابتدائية",
+            "interval-hour": "ساعة",
+            "interval-day": "يوم",
+            "interval-week": "أسبوع",
+            "interval-two-weeks": "أسبوعين",
+            "interval-month": "شهر",
+            "interval-three-months": "3 أشهر",
+            "interval-six-months": "6 أشهر",
+            "step-settings": "إعدادات الخطوة",
+            "hide-step-size": "إخفاء حجم الخطوة",
+            "initial-step-size": "حجم الخطوة الابتدائي",
+            "hide-labels": "إخفاء التسميات",
+            "use-session-storage": "استخدام تخزين الجلسة",
+            "localizationMap": {
+                "Sun": "الأحد",
+                "Mon": "الإثنين",
+                "Tue": "الثلاثاء",
+                "Wed": "الأربعاء",
+                "Thu": "الخميس",
+                "Fri": "الجمعة",
+                "Sat": "السبت",
+                "Jan": "يناير",
+                "Feb": "فبراير",
+                "Mar": "مارس",
+                "Apr": "أبريل",
+                "May": "مايو",
+                "Jun": "يونيو",
+                "Jul": "يوليو",
+                "Aug": "أغسطس",
+                "Sep": "سبتمبر",
+                "Oct": "أكتوبر",
+                "Nov": "نوفمبر",
+                "Dec": "ديسمبر",
+                "January": "يناير",
+                "February": "فبراير",
+                "March": "مارس",
+                "April": "أبريل",
+                "June": "يونيو",
+                "July": "يوليو",
+                "August": "أغسطس",
+                "September": "سبتمبر",
+                "October": "أكتوبر",
+                "November": "نوفمبر",
+                "December": "ديسمبر",
+                "Custom Date Range": "نطاق تاريخ مخصص",
+                "Date Range Template": "قالب نطاق التاريخ",
+                "Today": "اليوم",
+                "Yesterday": "أمس",
+                "This Week": "هذا الأسبوع",
+                "Last Week": "الأسبوع الماضي",
+                "This Month": "هذا الشهر",
+                "Last Month": "الشهر الماضي",
+                "Year": "سنة",
+                "This Year": "هذه السنة",
+                "Last Year": "السنة الماضية",
+                "Date picker": "مُحدّد التاريخ",
+                "Hour": "ساعة",
+                "Day": "يوم",
+                "Week": "أسبوع",
+                "2 weeks": "أسبوعين",
+                "Month": "شهر",
+                "3 months": "3 أشهر",
+                "6 months": "6 أشهر",
+                "Custom interval": "فاصل زمني مخصص",
+                "Interval": "الفاصل الزمني",
+                "Step size": "حجم الخطوة",
+                "Ok": "حسناً"
+            }
+        },
+        "doughnut": {
+            "total": "الإجمالي",
+            "layout": "تخطيط",
+            "layout-default": "افتراضي",
+            "layout-with-total": "مع الإجمالي",
+            "auto-scale": "تحجيم تلقائي",
+            "clockwise-layout": "تخطيط باتجاه العقارب",
+            "sort-series": "فرز السلاسل حسب التسمية",
+            "central-total-value": "قيمة الإجمالي المركزية",
+            "legend-position-top": "أعلى",
+            "legend-position-bottom": "أسفل",
+            "legend-position-left": "يسار",
+            "legend-position-right": "يمين",
+            "legend-label": "التسمية",
+            "legend-value": "القيمة",
+            "tooltip": "تلميح",
+            "tooltip-value": "القيمة",
+            "tooltip-value-type-absolute": "مطلق",
+            "tooltip-value-type-percentage": "نسبة مئوية",
+            "tooltip-background-color": "لون الخلفية",
+            "tooltip-background-blur": "تمويه الخلفية",
+            "doughnut-card-style": "نمط بطاقة الدونات"
+        },
+        "entities-hierarchy": {
+            "hierarchy-data-settings": "إعدادات بيانات التسلسل الهرمي",
+            "relations-query-function": "وظيفة استعلام العلاقات بين العقد",
+            "has-children-function": "وظيفة التحقق من وجود الأطفال في العقد",
+            "node-state-settings": "إعدادات حالة العقد",
+            "node-opened-function": "وظيفة فتح العقد الافتراضية",
+            "node-disabled-function": "وظيفة تعطيل العقد",
+            "display-settings": "إعدادات العرض",
+            "node-icon-function": "وظيفة أيقونة العقد",
+            "node-text-function": "وظيفة نص العقد",
+            "sort-settings": "إعدادات الفرز",
+            "nodes-sort-function": "وظيفة فرز العقد"
+        },
+        "edge": {
+            "display-default-title": "عرض العنوان الافتراضي"
+        },
+        "gateway": {
+            "general-settings": "الإعدادات العامة",
+            "widget-title": "عنوان الودجة",
+            "default-archive-file-name": "اسم ملف الأرشيف الافتراضي",
+            "device-type-for-new-gateway": "نوع الجهاز للبوابة الجديدة",
+            "messages-settings": "إعدادات الرسائل",
+            "save-config-success-message": "رسالة نصية حول حفظ إعدادات بوابة بنجاح",
+            "device-name-exists-message": "رسالة نصية عندما يكون الجهاز بالاسم المدخل موجودًا بالفعل",
+            "gateway-title": "نموذج البوابة",
+            "read-only": "للقراءة فقط",
+            "events-title": "عنوان نموذج أحداث البوابة",
+            "events-filter": "مرشحات الأحداث",
+            "event-key-contains": "مفتاح الحدث يحتوي على...",
+            "show-connector": "إظهار للموصل",
+            "connector-state-param-key": "مفتاح المعلمة الحالية للموصل",
+            "status": "الحالة",
+            "message": "الرسالة",
+            "created-time": "وقت الإنشاء"
+        },
+        "gauge": {
+            "default-color": "اللون الافتراضي",
+            "radial-gauge-settings": "إعدادات العداد الدائري",
+            "ticks-settings": "إعدادات العلامات",
+            "min-value": "القيمة الدنيا",
+            "max-value": "القيمة القصوى",
+            "min-value-short": "الدنيا",
+            "max-value-short": "القصوى",
+            "start-ticks-angle": "زاوية بداية العلامات",
+            "ticks-angle": "زاوية العلامات",
+            "major-ticks": "العلامات الرئيسية",
+            "major-ticks-count": "عدد العلامات الرئيسية",
+            "major-ticks-color": "لون العلامات الرئيسية",
+            "minor-ticks": "العلامات الثانوية",
+            "minor-ticks-count": "عدد العلامات الثانوية",
+            "minor-ticks-color": "لون العلامات الثانوية",
+            "tick-numbers-font": "خط أرقام العلامات",
+            "unit-title-settings": "إعدادات عنوان الوحدة",
+            "show-unit-title": "عرض عنوان الوحدة",
+            "unit-title": "عنوان الوحدة",
+            "title-font": "خط العنوان",
+            "units-settings": "إعدادات الوحدات",
+            "units-font": "خط الوحدات",
+            "value-box-settings": "إعدادات مربع القيمة",
+            "show-value-box": "عرض مربع القيمة",
+            "value-box": "مربع القيمة",
+            "value-int": "عدد الأرقام للجزء الصحيح من القيمة",
+            "value-text": "نص القيمة",
+            "value-text-shadow": "ظل نص القيمة",
+            "value-font": "خط نص القيمة",
+            "rect-stroke-color-start": "لون الإطار المستطيل - بداية التدرج",
+            "rect-stroke-color-end": "لون الإطار المستطيل - نهاية التدرج",
+            "background-color": "لون الخلفية",
+            "shadow-color": "لون الظل",
+            "value-box-rect-stroke-color": "لون إطار مربع القيمة",
+            "value-box-rect-stroke-color-end": "لون إطار مربع القيمة - نهاية التدرج",
+            "value-box-background-color": "لون خلفية مربع القيمة",
+            "value-box-shadow-color": "لون ظل مربع القيمة",
+            "plate-settings": "إعدادات اللوحة",
+            "show-plate-border": "حدود اللوحة",
+            "plate-color": "لون اللوحة",
+            "needle-settings": "إعدادات الإبرة",
+            "needle-circle-size": "حجم دائرة الإبرة",
+            "needle-color": "لون الإبرة",
+            "needle-color-start": "لون الإبرة - بداية التدرج",
+            "needle-color-end": "لون الإبرة - نهاية التدرج",
+            "needle-color-shadow-up": "لون ظل النصف العلوي من الإبرة",
+            "needle-color-shadow-down": "لون الظل المسقط",
+            "highlights-settings": "إعدادات التمييز",
+            "highlights-width": "عرض التمييز",
+            "highlights": "التمييزات",
+            "highlight-from": "من",
+            "highlight-to": "إلى",
+            "highlight-color": "اللون",
+            "no-highlights": "لا يوجد تمييزات مُعدة",
+            "add-highlight": "إضافة تمييز",
+            "animation-settings": "إعدادات الحركة",
+            "enable-animation": "تمكين الحركة",
+            "animation-duration-rule": "مدة الحركة والقاعدة",
+            "animation-duration": "مدة الحركة",
+            "animation-rule": "قاعدة الحركة",
+            "animation-linear": "خطي",
+            "animation-quad": "رباعي",
+            "animation-quint": "خماسي",
+            "animation-cycle": "دورة",
+            "animation-bounce": "ارتداد",
+            "animation-elastic": "مرن",
+            "animation-dequad": "عكس رباعي",
+            "animation-dequint": "عكس خماسي",
+            "animation-decycle": "عكس دورة",
+            "animation-debounce": "عكس ارتداد",
+            "animation-delastic": "عكس مرن",
+            "linear-gauge-settings": "إعدادات العداد الخطي",
+            "bar-stroke": "ضربة الشريط",
+            "bar-stroke-width": "عرض ضربة الشريط",
+            "bar-stroke-color": "لون ضربة الشريط",
+            "bar-background-color": "لون خلفية الشريط - بداية التدرج",
+            "bar-background-color-end": "لون خلفية الشريط - نهاية التدرج",
+            "progress-bar-color": "لون شريط التقدم",
+            "progress-bar": "شريط التقدم",
+            "progress-bar-color-start": "لون شريط التقدم - بداية التدرج",
+            "progress-bar-color-end": "لون شريط التقدم - نهاية التدرج",
+            "major-ticks-names": "أسماء العلامات الرئيسية",
+            "show-stroke-ticks": "عرض ضربات العلامات",
+            "major-ticks-font": "خط العلامات الرئيسية",
+            "border-color": "لون الحدود",
+            "border-width": "عرض الحدود",
+            "needle-circle": "دائرة الإبرة",
+            "needle-circle-color": "لون دائرة الإبرة",
+            "animation-target": "هدف الحركة",
+            "animation-target-needle": "الإبرة",
+            "animation-target-plate": "اللوحة",
+            "common-settings": "إعدادات العداد الشائعة",
+            "gauge-type": "نوع العداد",
+            "gauge-type-arc": "قوس",
+            "gauge-type-donut": "دونات",
+            "gauge-type-horizontal-bar": "شريط أفقي",
+            "gauge-type-vertical-bar": "شريط عمودي",
+            "donut-start-angle": "الزاوية التي تبدأ منها",
+            "bar-settings": "إعدادات شريط العداد",
+            "relative-bar-width": "عرض الشريط النسبي",
+            "neon-glow-brightness": "سطوع تأثير الوهج النيوني، (0-100)، 0 - تعطيل التأثير",
+            "stripes-thickness": "سمك الخطوط، 0 - بدون خطوط",
+            "rounded-line-cap": "عرض نهايات الخطوط المستديرة",
+            "bar-color-settings": "إعدادات لون الشريط",
+            "use-precise-level-color-values": "استخدام مستويات الألوان الدقيقة",
+            "bar-colors": "ألوان الشريط، من الأدنى إلى الأعلى",
+            "color": "اللون",
+            "no-bar-colors": "لم يتم تكوين ألوان للشريط",
+            "add-bar-color": "إضافة لون للشريط",
+            "from": "من",
+            "to": "إلى",
+            "fixed-level-colors": "ألوان الشريط باستخدام قيم الحدود",
+            "gauge-title-settings": "إعدادات عنوان العداد",
+            "show-gauge-title": "عرض عنوان العداد",
+            "gauge-title": "عنوان العداد",
+            "gauge-title-font": "خط عنوان العداد",
+            "unit-title-and-timestamp-settings": "إعدادات عنوان الوحدة والطابع الزمني",
+            "show-timestamp": "عرض طابع الوقت",
+            "timestamp-format": "تنسيق الطابع الزمني",
+            "label-font": "خط التسمية أسفل القيمة",
+            "value-settings": "إعدادات القيمة",
+            "show-value": "عرض نص القيمة",
+            "min-max-settings": "إعدادات تسميات الحد الأدنى/الأقصى",
+            "show-min-max": "عرض القيم الدنيا والقصوى",
+            "min-max-font": "خط تسميات الحد الأدنى والأقصى",
+            "show-ticks": "عرض العلامات",
+            "tick-width": "عرض العلامة",
+            "tick-color": "لون العلامة",
+            "tick-values": "قيم العلامات",
+            "no-tick-values": "لا توجد قيم للعلامات مُكونة",
+            "add-tick-value": "إضافة قيمة علامة",
+            "gauge-appearance": "مظهر العداد",
+            "units-title": "عنوان الوحدات",
+            "value": "القيمة",
+            "ticks": "العلامات",
+            "arrow-and-scale-color": "لون السهم والمقياس الافتراضي",
+            "scale-settings": "إعدادات المقياس",
+            "scale": "المقياس",
+            "scale-color": "ألوان المقياس",
+            "compass-appearance": "مظهر البوصلة",
+            "labels": "التسميات",
+            "label-style": "أسلوب التسمية"
+        },
+        "gpio": {
+            "pin": "الدبوس",
+            "label": "التسمية",
+            "row": "الصف",
+            "column": "العمود",
+            "color": "اللون",
+            "panel-settings": "إعدادات اللوحة",
+            "background-color": "لون الخلفية",
+            "gpio-switches": "مفاتيح GPIO",
+            "no-gpio-switches": "لم يتم تكوين مفاتيح GPIO",
+            "add-gpio-switch": "إضافة مفتاح GPIO",
+            "gpio-status-request": "طلب حالة GPIO",
+            "method-name": "اسم الطريقة",
+            "method-body": "جسم الطريقة",
+            "gpio-status-change-request": "طلب تغيير حالة GPIO",
+            "parse-gpio-status-function": "تحليل وظيفة حالة GPIO",
+            "gpio-leds": "مصابيح GPIO",
+            "no-gpio-leds": "لم يتم تكوين مصابيح GPIO",
+            "add-gpio-led": "إضافة مصباح LED لـ GPIO"
+        },
+        "html-card": {
+            "html": "HTML",
+            "css": "CSS"
+        },
+        "input-widgets": {
+            "attribute-not-allowed": "لا يمكن استخدام معلمة السمة في هذه الأداة",
+            "blocked-location": "تم حظر الموقع الجغرافي في متصفحك",
+            "claim-device": "ادعاء الجهاز",
+            "claim-failed": "فشل في ادعاء الجهاز!",
+            "claim-not-found": "لم يتم العثور على الجهاز!",
+            "claim-successful": "تم ادعاء الجهاز بنجاح!",
+            "date": "التاريخ",
+            "device-name": "اسم الجهاز",
+            "device-name-required": "اسم الجهاز مطلوب",
+            "discard-changes": "تجاهل التغييرات",
+            "entity-attribute-required": "سمة الكيان مطلوبة",
+            "entity-coordinate-required": "كلا الحقلين، خط العرض وخط الطول، مطلوبان",
+            "entity-timeseries-required": "سلسلة زمنية للكيان مطلوبة",
+            "get-location": "الحصول على الموقع الحالي",
+            "invalid-date": "تاريخ غير صالح",
+            "latitude": "خط العرض",
+            "longitude": "خط الطول",
+            "min-value-error": "القيمة الدنيا هي {{value}}",
+            "max-value-error": "القيمة القصوى هي {{value}}",
+            "not-allowed-entity": "الكيان المختار لا يمكن أن يكون له سمات مشتركة",
+            "no-attribute-selected": "لم يتم اختيار سمة",
+            "no-datakey-selected": "لم يتم اختيار مفتاح بيانات",
+            "no-coordinate-specified": "لم يتم تحديد مفتاح بيانات لخط العرض/الطول",
+            "no-entity-selected": "لم يتم اختيار كيان",
+            "no-image": "لا توجد صورة",
+            "no-support-geolocation": "متصفحك لا يدعم الموقع الجغرافي",
+            "no-support-web-camera": "متصفحك لا يدعم الكاميرات",
+            "enable-https-use-widget": "الرجاء تفعيل HTTPS لاستخدام هذه الأداة",
+            "no-found-your-camera": "لا يمكن العثور على كاميرتك",
+            "no-permission-camera": "تم رفض الإذن من قبل المستخدم / هذا الموقع لا يملك إذن استخدام الكاميرا",
+            "no-timeseries-selected": "لم يتم اختيار سلسلة زمنية",
+            "secret-key": "المفتاح السري",
+            "secret-key-required": "المفتاح السري مطلوب",
+            "switch-attribute-value": "تبديل قيمة سمة الكيان",
+            "switch-camera": "تبديل الكاميرا",
+            "switch-timeseries-value": "تبديل قيمة سلسلة زمنية للكيان",
+            "take-photo": "التقاط صورة",
+            "time": "الوقت",
+            "timeseries-not-allowed": "لا يمكن استخدام معلمة سلسلة زمنية في هذه الأداة",
+            "update-failed": "فشل التحديث",
+            "update-successful": "تم التحديث بنجاح",
+            "update-attribute": "تحديث السمة",
+            "update-timeseries": "تحديث السلسلة الزمنية",
+            "value": "القيمة",
+            "general-settings": "الإعدادات العامة",
+            "widget-title": "عنوان الأداة",
+            "claim-button-label": "تسمية زر الادعاء",
+            "show-secret-key-field": "عرض حقل إدخال 'المفتاح السري'",
+            "labels-settings": "إعدادات التسميات",
+            "show-labels": "عرض التسميات",
+            "device-name-label": "تسمية حقل إدخال اسم الجهاز",
+            "secret-key-label": "تسمية حقل إدخال المفتاح السري",
+            "messages-settings": "إعدادات الرسائل",
+            "claim-device-success-message": "رسالة نصية لادعاء الجهاز بنجاح",
+            "claim-device-not-found-message": "رسالة نصية عند عدم العثور على الجهاز",
+            "claim-device-failed-message": "رسالة نصية لفشل ادعاء الجهاز",
+            "claim-device-name-required-message": "رسالة خطأ 'اسم الجهاز مطلوب'",
+            "claim-device-secret-key-required-message": "رسالة خطأ 'المفتاح السري مطلوب'",
+            "relations-settings": "إعدادات العلاقات",
+            "relate-device-to-state-entity": "ربط الجهاز بكيان الحالة الحالي",
+            "relate-direction": "اتجاه الربط",
+            "relate-direction-from": "من",
+            "relate-direction-to": "إلى",
+            "relation-type": "نوع العلاقة",
+            "show-label": "عرض التسمية",
+            "label": "التسمية",
+            "required": "مطلوب",
+            "required-error-message": "رسالة خطأ 'مطلوب'",
+            "show-result-message": "عرض رسالة النتيجة",
+            "integer-field-settings": "إعدادات حقل العدد الصحيح",
+            "min-value": "القيمة الدنيا",
+            "max-value": "القيمة القصوى",
+            "double-field-settings": "إعدادات حقل العدد النقطي",
+            "text-field-settings": "إعدادات حقل النص",
+            "min-length": "الطول الأدنى",
+            "max-length": "الطول الأقصى",
+            "checkbox-settings": "إعدادات مربع الاختيار",
+            "true-label": "تسمية المحدد",
+            "false-label": "تسمية غير المحدد",
+            "image-input-settings": "إعدادات إدخال الصورة",
+            "display-preview": "عرض المعاينة",
+            "display-clear-button": "عرض زر الإزالة",
+            "display-apply-button": "عرض زر التطبيق",
+            "display-discard-button": "عرض زر التجاهل",
+            "datetime-field-settings": "إعدادات حقل التاريخ/الوقت",
+            "display-time-input": "عرض إدخال الوقت",
+            "latitude-key-name": "اسم مفتاح خط العرض",
+            "longitude-key-name": "اسم مفتاح خط الطول",
+            "show-get-location-button": "عرض زر 'الحصول على الموقع الحالي'",
+            "use-high-accuracy": "استخدام دقة عالية",
+            "location-fields-settings": "إعدادات حقول الموقع",
+            "latitude-label": "تسمية خط العرض",
+            "longitude-label": "تسمية خط الطول",
+            "input-fields-alignment": "محاذاة حقول الإدخال",
+            "input-fields-alignment-column": "عمود (افتراضي)",
+            "input-fields-alignment-row": "صف",
+            "layout": "التخطيط",
+            "row-gap": "الفجوة بين الصفوف بالبكسل",
+            "column-gap": "الفجوة بين الأعمدة بالبكسل",
+            "latitude-field-required": "حقل خط العرض مطلوب",
+            "longitude-field-required": "حقل خط الطول مطلوب",
+            "attribute-settings": "إعدادات السمة",
+            "widget-mode": "وضع الأداة",
+            "widget-mode-update-attribute": "تحديث السمة",
+            "widget-mode-update-timeseries": "تحديث السلسلة الزمنية",
+            "attribute-scope": "نطاق السمة",
+            "attribute-scope-server": "سمة الخادم",
+            "attribute-scope-shared": "سمة مشتركة",
+            "value-required": "القيمة مطلوبة",
+            "image-settings": "إعدادات الصورة",
+            "image-format": "تنسيق الصورة",
+            "image-format-jpeg": "JPEG",
+            "image-format-png": "PNG",
+            "image-format-webp": "WEBP",
+            "image-quality": "جودة الصورة التي تستخدم الضغط الخاسر مثل jpeg و webp",
+            "max-image-width": "العرض الأقصى للصورة",
+            "max-image-height": "الارتفاع الأقصى للصورة",
+            "action-buttons": "أزرار العمل",
+            "show-action-buttons": "عرض أزرار العمل",
+            "update-all-values": "تحديث جميع القيم، ليس فقط المعدلة",
+            "save-button-label": "تسمية زر 'حفظ'",
+            "reset-button-label": "تسمية زر 'تراجع'",
+            "group-settings": "إعدادات المجموعة",
+            "show-group-title": "عرض عنوان لمجموعة من الحقول، المتعلقة بكيانات مختلفة",
+            "group-title": "عنوان المجموعة",
+            "fields-alignment": "محاذاة الحقول",
+            "fields-alignment-row": "صف (افتراضي)",
+            "fields-alignment-column": "عمود",
+            "fields-in-row": "عدد الحقول في الصف",
+            "option-value": "القيمة (اكتب 'null' لإنشاء خيار فارغ)",
+            "option-label": "التسمية",
+            "hide-input-field": "إخفاء حقل الإدخال",
+            "datakey-type": "نوع مفتاح البيانات",
+            "datakey-type-server": "سمة الخادم (افتراضي)",
+            "datakey-type-shared": "سمة مشتركة",
+            "datakey-type-timeseries": "سلسلة زمنية",
+            "datakey-value-type": "نوع قيمة مفتاح البيانات",
+            "datakey-value-type-string": "نص",
+            "datakey-value-type-double": "عدد نقطي",
+            "datakey-value-type-integer": "عدد صحيح",
+            "datakey-value-type-json": "JSON",
+            "datakey-value-type-boolean-checkbox": "منطقي (مربع اختيار)",
+            "datakey-value-type-boolean-switch": "منطقي (مفتاح)",
+            "datakey-value-type-date-time": "تاريخ ووقت",
+            "datakey-value-type-date": "تاريخ",
+            "datakey-value-type-time": "وقت",
+            "datakey-value-type-select": "اختيار",
+            "datakey-value-type-color": "لون",
+            "value-is-required": "القيمة مطلوبة",
+            "ability-to-edit-attribute": "القدرة على تعديل السمة",
+            "ability-to-edit-attribute-editable": "قابل للتعديل (افتراضي)",
+            "ability-to-edit-attribute-disabled": "معطل",
+            "ability-to-edit-attribute-readonly": "للقراءة فقط",
+            "disable-on-datakey-name": "تعطيل عند قيمة كاذبة لمفتاح بيانات آخر (حدد اسم مفتاح البيانات)",
+            "field-appearance": "مظهر الحقل",
+            "appearance-fill": "ملء",
+            "appearance-outline": "مخطط",
+            "subscript-sizing": "تحجيم النص الفرعي",
+            "subscript-sizing-fixed": "ثابت",
+            "subscript-sizing-dynamic": "ديناميكي",
+            "slide-toggle-settings": "إعدادات التبديل السلس",
+            "slide-toggle-label-position": "موضع تسمية التبديل السلس",
+            "slide-toggle-label-position-after": "بعد",
+            "slide-toggle-label-position-before": "قبل",
+            "select-options": "خيارات الاختيار",
+            "no-select-options": "لا توجد خيارات اختيار مُكونة",
+            "add-select-option": "إضافة خيار اختيار",
+            "numeric-field-settings": "إعدادات الحقل الرقمي",
+            "step-interval": "الفاصل الزمني بين القيم",
+            "error-messages": "رسائل الخطأ",
+            "min-value-error-message": "رسالة خطأ 'القيمة الدنيا'",
+            "max-value-error-message": "رسالة خطأ 'القيمة القصوى'",
+            "invalid-date-error-message": "رسالة خطأ 'تاريخ غير صالح'",
+            "invalid-JSON-error-message": "رسالة خطأ 'JSON غير صالح'",
+            "icon-settings": "إعدادات الأيقونة",
+            "dialog-editor-settings": "إعدادات محرر الحوار",
+            "use-custom-icon": "استخدام أيقونة مخصصة",
+            "input-cell-icon": "أيقونة لعرضها قبل خلية الإدخال",
+            "value-conversion-settings": "إعدادات تحويل القيمة",
+            "get-value-settings": "إعدادات الحصول على القيمة",
+            "use-get-value-function": "استخدام وظيفة getValue",
+            "get-value-function": "وظيفة getValue",
+            "set-value-settings": "إعدادات تعيين القيمة",
+            "use-set-value-function": "استخدام وظيفة setValue",
+            "set-value-function": "وظيفة setValue",
+            "json-invalid": "القيمة JSON لها تنسيق غير صالح",
+            "title": "العنوان",
+            "cancel-button-label": "تسمية زر 'إلغاء'"
+        },
+        "invalid-qr-code-text": "نص غير صالح لرمز الاستجابة السريعة. يجب أن يكون الإدخال من نوع سلسلة",
+        "qr-code": {
+            "use-qr-code-text-function": "استخدام وظيفة نص رمز الاستجابة السريعة",
+            "qr-code-text-pattern": "نمط نص رمز الاستجابة السريعة (مثل '${entityName} | ${keyName} - بعض النص.')",
+            "qr-code-text-pattern-hint": "يستخدم نمط نص رمز الاستجابة السريعة قيمة المفتاح الأول الموجود في الكيانات في الاسم المستعار للكيان.",
+            "qr-code-text-pattern-required": "نمط نص رمز الاستجابة السريعة مطلوب.",
+            "qr-code-text-function": "وظيفة نص رمز الاستجابة السريعة"
+        },
+        "label-widget": {
+            "label-pattern": "نمط",
+            "label-pattern-hint": "تلميح: على سبيل المثال، 'نص <code><span style=\"color: #000;\">$&#123;</span>keyName<span style=\"color: #000;\">&#125;</span></code> وحدات.' أو <code><span style=\"color: #000;\">$&#123;</span>#&lt;key index&gt;<span style=\"color: #000;\">&#125;</span></code> وحدات'",
+            "label-pattern-required": "النمط مطلوب",
+            "label-position": "الموضع (نسبي إلى الخلفية بالنسبة المئوية)",
+            "x-pos": "X",
+            "y-pos": "Y",
+            "background-color": "لون الخلفية",
+            "font-settings": "إعدادات الخط",
+            "background-image": "صورة الخلفية",
+            "labels": "التسميات",
+            "no-labels": "لم يتم تكوين تسميات",
+            "add-label": "إضافة تسمية"
+        },
+        "navigation": {
+            "title": "العنوان",
+            "navigation-path": "مسار التنقل",
+            "filter-type": "نوع التصفية",
+            "filter-type-all": "جميع العناصر",
+            "filter-type-include": "تضمين العناصر",
+            "filter-type-exclude": "استبعاد العناصر",
+            "items": "العناصر",
+            "enter-urls-to-filter": "أدخل عناوين URL للتصفية..."
+        },
+        "persistent-table": {
+            "rpc-id": "معرف RPC",
+            "message-type": "نوع الرسالة",
+            "method": "الطريقة",
+            "params": "المعلمات",
+            "created-time": "وقت الإنشاء",
+            "expiration-time": "وقت الانتهاء",
+            "retries": "محاولات متكررة",
+            "status": "الحالة",
+            "filter": "تصفية",
+            "refresh": "تحديث",
+            "add": "إضافة طلب RPC",
+            "details": "تفاصيل",
+            "delete": "حذف",
+            "delete-request-title": "حذف طلب RPC دائم",
+            "delete-request-text": "هل أنت متأكد من رغبتك في حذف الطلب؟",
+            "details-title": "تفاصيل معرف RPC: ",
+            "additional-info": "معلومات إضافية",
+            "response": "الاستجابة",
+            "any-status": "أي حالة",
+            "rpc-status-list": "قائمة حالة RPC",
+            "no-request-prompt": "لا يوجد طلب لعرضه",
+            "send-request": "إرسال الطلب",
+            "add-title": "إنشاء طلب RPC دائم",
+            "method-error": "الطريقة مطلوبة.",
+            "timeout-error": "الحد الأدنى لقيمة الوقت المنقضي هو 5000 (5 ثوان).",
+            "white-space-error": "غير مسموح بالمسافات البيضاء.",
+            "rpc-status": {
+                "QUEUED": "في الانتظار",
+                "SENT": "تم الإرسال",
+                "DELIVERED": "تم التوصيل",
+                "SUCCESSFUL": "ناجح",
+                "TIMEOUT": "انتهى الوقت",
+                "EXPIRED": "منتهي الصلاحية",
+                "FAILED": "فشل"
+            },
+            "rpc-search-status-all": "الكل",
+            "message-types": {
+                "false": "اثنين الطريقة",
+                "true": "طريقة واحدة"
+            },
+            "general-settings": "إعدادات عامة",
+            "enable-filter": "تمكين التصفية",
+            "enable-sticky-header": "عرض العنوان أثناء التمرير",
+            "enable-sticky-action": "عرض عمود الإجراءات أثناء التمرير",
+            "display-request-details": "عرض تفاصيل الطلب",
+            "allow-send-request": "السماح بإرسال طلب RPC",
+            "allow-delete-request": "السماح بحذف الطلب",
+            "columns-settings": "إعدادات الأعمدة",
+            "display-columns": "الأعمدة لعرضها",
+            "column": "العمود",
+            "no-columns-found": "لم يتم العثور على أعمدة",
+            "no-columns-matching": "'{{column}}' غير موجود."
+        },
+        "range-chart": {
+            "chart": "رسم بياني",
+            "data-zoom": "تكبير البيانات",
+            "range-colors": "ألوان النطاق",
+            "out-of-range-color": "لون خارج النطاق",
+            "fill-area": "ملء المنطقة",
+            "legend-label": "تسمية العنوان",
+            "tooltip": "تلميح",
+            "tooltip-value": "القيمة",
+            "tooltip-date": "التاريخ",
+            "tooltip-background-color": "لون الخلفية",
+            "tooltip-background-blur": "ضبابية الخلفية",
+            "range-chart-card-style": "نمط بطاقة رسم النطاق"
+        },
+        "rpc": {
+            "value-settings": "إعدادات القيمة",
+            "initial-value": "القيمة الأولية",
+            "retrieve-value-settings": "استرجاع إعدادات قيمة التشغيل/الإيقاف",
+            "retrieve-value-method": "استرجاع القيمة باستخدام طريقة",
+            "retrieve-value-method-none": "لا تسترجع",
+            "retrieve-value-method-rpc": "استدعاء طريقة RPC لاسترجاع القيمة",
+            "retrieve-value-method-attribute": "الاشتراك للحصول على سمة",
+            "retrieve-value-method-timeseries": "الاشتراك للحصول على سلسلة زمنية",
+            "attribute-value-key": "مفتاح السمة",
+            "timeseries-value-key": "مفتاح السلسلة الزمنية",
+            "get-value-method": "طريقة RPC للحصول على القيمة",
+            "parse-value-function": "وظيفة تحليل القيمة",
+            "update-value-settings": "تحديث إعدادات القيمة",
+            "set-value-method": "طريقة RPC لتعيين القيمة",
+            "convert-value-function": "وظيفة تحويل القيمة",
+            "rpc-settings": "إعدادات RPC",
+            "request-timeout": "مهلة طلب RPC (مللي ثانية)",
+            "persistent-rpc-settings": "إعدادات RPC الدائمة",
+            "request-persistent": "طلب RPC دائم",
+            "persistent-polling-interval": "الفاصل الزمني للاستطلاع (مللي ثانية) للحصول على استجابة أمر RPC الدائم",
+            "common-settings": "إعدادات مشتركة",
+            "switch-title": "عنوان المفتاح",
+            "show-on-off-labels": "إظهار تسميات التشغيل/الإيقاف",
+            "slide-toggle-label": "تسمية التبديل الانزلاقي",
+            "label-position": "موقع التسمية",
+            "label-position-before": "قبل",
+            "label-position-after": "بعد",
+            "slider-color": "لون المنزلق",
+            "slider-color-primary": "أساسي",
+            "slider-color-accent": "لهجة",
+            "slider-color-warn": "تحذير",
+            "button-style": "أسلوب الزر",
+            "button-raised": "زر بارز",
+            "button-primary": "لون أساسي",
+            "button-background-color": "لون خلفية الزر",
+            "button-text-color": "لون نص الزر",
+            "widget-title": "عنوان الأداة",
+            "button-label": "تسمية الزر",
+            "device-attribute-scope": "نطاق سمة الجهاز",
+            "server-attribute": "سمة الخادم",
+            "shared-attribute": "سمة مشتركة",
+            "device-attribute-parameters": "معاملات سمة الجهاز",
+            "is-one-way-command": "هو أمر اتجاه واحد",
+            "rpc-method": "طريقة RPC",
+            "rpc-method-params": "معاملات طريقة RPC",
+            "show-rpc-error": "إظهار خطأ تنفيذ أمر RPC",
+            "led-title": "عنوان LED",
+            "led-color": "لون LED",
+            "check-status-settings": "إعدادات التحقق من الحالة",
+            "perform-rpc-status-check": "تنفيذ التحقق من حالة جهاز RPC",
+            "retrieve-led-status-value-method": "استرجاع قيمة حالة LED باستخدام طريقة",
+            "led-status-value-attribute": "سمة الجهاز التي تحتوي على قيمة حالة LED",
+            "led-status-value-timeseries": "سلسلة زمنية للجهاز التي تحتوي على قيمة حالة LED",
+            "check-status-method": "طريقة التحقق من حالة الجهاز RPC",
+            "parse-led-status-value-function": "وظيفة تحليل قيمة حالة LED",
+            "knob-title": "عنوان المقبض",
+            "min-value": "القيمة الدنيا",
+            "max-value": "القيمة القصوى"
+        },
+        "maps": {
+            "select-entity": "اختر كيان",
+            "select-entity-hint": "تلميح: بعد الاختيار، انقر على الخريطة لتعيين الموقع",
+            "tooltips": {
+                "placeMarker": "انقر لوضع '{{entityName}}' كيان",
+                "firstVertex": "مضلع لـ '{{entityName}}': انقر لوضع النقطة الأولى",
+                "firstVertex-cut": "انقر لوضع النقطة الأولى",
+                "continueLine": "مضلع لـ '{{entityName}}': انقر للاستمرار في الرسم",
+                "continueLine-cut": "انقر للاستمرار في الرسم",
+                "finishLine": "انقر على أي علامة موجودة للإنهاء",
+                "finishPoly": "مضلع لـ '{{entityName}}': انقر على العلامة الأولى للإنهاء والحفظ",
+                "finishPoly-cut": "انقر على العلامة الأولى للإنهاء والحفظ",
+                "finishRect": "مضلع لـ '{{entityName}}': انقر للإنهاء والحفظ",
+                "startCircle": "دائرة لـ '{{entityName}}': انقر لوضع مركز الدائرة",
+                "finishCircle": "دائرة لـ '{{entityName}}': انقر لإنهاء الدائرة",
+                "placeCircleMarker": "انقر لوضع علامة دائرية"
+            },
+            "actions": {
+                "finish": "إنهاء",
+                "cancel": "إلغاء",
+                "removeLastVertex": "إزالة آخر نقطة"
+            },
+            "buttonTitles": {
+                "drawMarkerButton": "وضع كيان",
+                "drawPolyButton": "إنشاء مضلع",
+                "drawLineButton": "إنشاء خط متعدد",
+                "drawCircleButton": "إنشاء دائرة",
+                "drawRectButton": "إنشاء مستطيل",
+                "editButton": "وضع التحرير",
+                "dragButton": "وضع السحب والإفلات",
+                "cutButton": "قطع منطقة المضلع",
+                "deleteButton": "إزالة",
+                "drawCircleMarkerButton": "إنشاء علامة دائرية",
+                "rotateButton": "تدوير المضلع"
+            },
+            "map-provider-settings": "إعدادات مزود الخريطة",
+            "map-provider": "مزود الخريطة",
+            "map-provider-google": "خرائط Google",
+            "map-provider-openstreet": "خرائط OpenStreet",
+            "map-provider-here": "خرائط HERE",
+            "map-provider-image": "خريطة الصورة",
+            "map-provider-tencent": "خرائط Tencent",
+            "openstreet-provider": "مزود خريطة OpenStreet",
+            "openstreet-provider-mapnik": "OpenStreetMap.Mapnik (الافتراضي)",
+            "openstreet-provider-hot": "OpenStreetMap.HOT",
+            "openstreet-provider-esri-street": "Esri.WorldStreetMap",
+            "openstreet-provider-esri-topo": "Esri.WorldTopoMap",
+            "openstreet-provider-esri-imagery": "Esri.WorldImagery",
+            "openstreet-provider-cartodb-positron": "CartoDB.Positron",
+            "openstreet-provider-cartodb-dark-matter": "CartoDB.DarkMatter",
+            "use-custom-provider": "استخدام مزود مخصص",
+            "custom-provider-tile-url": "URL بلاط المزود المخصص",
+            "google-maps-api-key": "مفتاح API لخرائط Google",
+            "default-map-type": "نوع الخريطة الافتراضي",
+            "google-map-type-roadmap": "خريطة الطرق",
+            "google-map-type-satelite": "القمر الصناعي",
+            "google-map-type-hybrid": "هجين",
+            "google-map-type-terrain": "التضاريس",
+            "map-layer": "طبقة الخريطة",
+            "here-map-normal-day": "HERE.normalDay (الافتراضي)",
+            "here-map-normal-night": "HERE.normalNight",
+            "here-map-hybrid-day": "HERE.hybridDay",
+            "here-map-terrain-day": "HERE.terrainDay",
+            "credentials": "الاعتمادات",
+            "here-app-id": "معرف تطبيق HERE",
+            "here-app-code": "كود تطبيق HERE",
+            "here-api-key": "مفتاح API لـ HERE",
+            "here-use-new-version-api-3": "استخدم الإصدار 3 من API",
+            "tencent-maps-api-key": "مفتاح API لخرائط Tencent",
+            "tencent-map-type-roadmap": "خريطة الطرق",
+            "tencent-map-type-satelite": "القمر الصناعي",
+            "tencent-map-type-hybrid": "هجين",
+            "image-map-background": "خلفية خريطة الصورة",
+            "image-map-background-from-entity-attribute": "أخذ خلفية خريطة الصورة من سمة الكيان",
+            "image-url-source-entity-alias": "اسم مستعار لكيان مصدر URL الصورة",
+            "image-url-source-entity-attribute": "سمة كيان مصدر URL الصورة",
+            "common-map-settings": "إعدادات الخريطة المشتركة",
+            "x-pos-key-name": "اسم مفتاح الموقع X",
+            "y-pos-key-name": "اسم مفتاح الموقع Y",
+            "latitude-key-name": "اسم مفتاح خط العرض",
+            "longitude-key-name": "اسم مفتاح خط الطول",
+            "default-map-zoom-level": "مستوى تكبير/تصغير الخريطة الافتراضي (0 - 20)",
+            "default-map-center-position": "موضع مركز الخريطة الافتراضي (0,0)",
+            "disable-scroll-zooming": "تعطيل التكبير/التصغير بالتمرير",
+            "disable-double-click-zooming": "تعطيل التكبير بالنقر المزدوج",
+            "disable-zoom-control-buttons": "تعطيل أزرار التحكم في التكبير/التصغير",
+            "fit-map-bounds": "تعديل حدود الخريطة لتغطية جميع العلامات",
+            "use-default-map-center-position": "استخدام موضع مركز الخريطة الافتراضي",
+            "entities-limit": "حد الكيانات للتحميل",
+            "markers-settings": "إعدادات العلامات",
+            "marker-offset-x": "إزاحة العلامة X نسبيًا إلى الموقع مضروبًا في عرض العلامة",
+            "marker-offset-y": "إزاحة العلامة Y نسبيًا إلى الموقع مضروبًا في ارتفاع العلامة",
+            "position-function": "وظيفة تحويل الموقع، يجب أن تعيد الإحداثيات x,y كعدد مزدوج من 0 إلى 1 لكل منهما",
+            "draggable-marker": "علامة قابلة للسحب",
+            "label": "التسمية",
+            "show-label": "إظهار التسمية",
+            "use-label-function": "استخدام وظيفة التسمية",
+            "label-pattern": "التسمية (أمثلة النمط: '${entityName}', '${entityName}: (نص ${keyName} وحدات.)')",
+            "label-function": "وظيفة التسمية",
+            "tooltip": "التلميح",
+            "show-tooltip": "إظهار التلميح",
+            "show-tooltip-action": "الإجراء لعرض التلميح",
+            "show-tooltip-action-click": "إظهار التلميح عند النقر (الافتراضي)",
+            "show-tooltip-action-hover": "إظهار التلميح عند التمرير",
+            "auto-close-tooltips": "إغلاق التلميحات تلقائيًا",
+            "use-tooltip-function": "استخدام وظيفة التلميح",
+            "tooltip-pattern": "التلميح (على سبيل المثال 'نص ${keyName} وحدات.' أو <link-act name='my-action'>نص الرابط</link-act>')",
+            "tooltip-function": "وظيفة التلميح",
+            "tooltip-offset-x": "إزاحة التلميح X نسبيًا إلى مرساة العلامة مضروبًا في عرض العلامة",
+            "tooltip-offset-y": "إزاحة التلميح Y نسبيًا إلى مرساة العلامة مضروبًا في ارتفاع العلامة",
+            "color": "اللون",
+            "use-color-function": "استخدام وظيفة اللون",
+            "color-function": "وظيفة اللون",
+            "marker-image": "صورة العلامة",
+            "use-marker-image-function": "استخدام وظيفة صورة العلامة",
+            "custom-marker-image": "صورة علامة مخصصة",
+            "custom-marker-image-size": "حجم صورة العلامة المخصصة (بكسل)",
+            "marker-image-function": "وظيفة صورة العلامة",
+            "marker-images": "صور العلامات",
+            "polygon-settings": "إعدادات المضلع",
+            "show-polygon": "عرض المضلع",
+            "polygon-key-name": "اسم مفتاح المضلع",
+            "enable-polygon-edit": "تمكين تحرير المضلع",
+            "polygon-label": "تسمية المضلع",
+            "show-polygon-label": "عرض تسمية المضلع",
+            "use-polygon-label-function": "استخدام وظيفة تسمية المضلع",
+            "polygon-label-pattern": "تسمية المضلع (أمثلة النمط: '${entityName}', '${entityName}: (نص ${keyName} وحدات.)')",
+            "polygon-label-function": "وظيفة تسمية المضلع",
+            "polygon-tooltip": "تلميح المضلع",
+            "show-polygon-tooltip": "عرض تلميح المضلع",
+            "auto-close-polygon-tooltips": "إغلاق تلميحات المضلع تلقائيًا",
+            "use-polygon-tooltip-function": "استخدام وظيفة تلميح المضلع",
+            "polygon-tooltip-pattern": "التلميح (على سبيل المثال 'نص ${keyName} وحدات.' أو <link-act name='my-action'>نص الرابط</link-act>')",
+            "polygon-tooltip-function": "وظيفة تلميح المضلع",
+            "polygon-color": "لون المضلع",
+            "polygon-opacity": "شفافية المضلع",
+            "use-polygon-color-function": "استخدام وظيفة لون المضلع",
+            "polygon-color-function": "وظيفة لون المضلع",
+            "polygon-stroke": "ضربة المضلع",
+            "stroke-color": "لون الضربة",
+            "stroke-opacity": "شفافية الضربة",
+            "stroke-weight": "وزن الضربة",
+            "use-polygon-stroke-color-function": "استخدام وظيفة لون ضربة المضلع",
+            "polygon-stroke-color-function": "وظيفة لون ضربة المضلع",
+            "circle-settings": "إعدادات الدائرة",
+            "show-circle": "عرض الدائرة",
+            "circle-key-name": "اسم مفتاح الدائرة",
+            "enable-circle-edit": "تمكين تحرير الدائرة",
+            "circle-label": "تسمية الدائرة",
+            "show-circle-label": "عرض تسمية الدائرة",
+            "use-circle-label-function": "استخدام وظيفة تسمية الدائرة",
+            "circle-label-pattern": "تسمية الدائرة (أمثلة النمط: '${entityName}', '${entityName}: (نص ${keyName} وحدات.)')",
+            "circle-label-function": "وظيفة تسمية الدائرة",
+            "circle-tooltip": "تلميح الدائرة",
+            "show-circle-tooltip": "عرض تلميح الدائرة",
+            "auto-close-circle-tooltips": "إغلاق تلميحات الدائرة تلقائيًا",
+            "use-circle-tooltip-function": "استخدام وظيفة تلميح الدائرة",
+            "circle-tooltip-pattern": "التلميح (على سبيل المثال 'نص ${keyName} وحدات.' أو <link-act name='my-action'>نص الرابط</link-act>')",
+            "circle-tooltip-function": "وظيفة تلميح الدائرة",
+            "circle-fill-color": "لون ملء الدائرة",
+            "circle-fill-color-opacity": "شفافية لون ملء الدائرة",
+            "use-circle-fill-color-function": "استخدام وظيفة لون ملء الدائرة",
+            "circle-fill-color-function": "وظيفة لون ملء الدائرة",
+            "circle-stroke": "ضربة الدائرة",
+            "use-circle-stroke-color-function": "استخدام وظيفة لون ضربة الدائرة",
+            "circle-stroke-color-function": "وظيفة لون ضربة الدائرة",
+            "markers-clustering-settings": "إعدادات تجميع العلامات",
+            "use-map-markers-clustering": "استخدام تجميع العلامات على الخريطة",
+            "zoom-on-cluster-click": "التكبير عند النقر على تجمع",
+            "max-cluster-zoom": "أقصى مستوى تكبير عندما تكون العلامة جزءًا من تجمع (0 - 18)",
+            "max-cluster-radius-pixels": "القطر الأقصى الذي سيغطيه تجمع في البكسل",
+            "cluster-zoom-animation": "إظهار تحريك العلامات عند التكبير",
+            "show-markers-bounds-on-cluster-mouse-over": "عرض حدود العلامات عند تحويل الماوس فوق تجمع",
+            "spiderfy-max-zoom-level": "تشبك عند أقصى مستوى تكبير (لرؤية جميع علامات التجمع)",
+            "load-optimization": "تحسين التحميل",
+            "cluster-chunked-loading": "استخدام قطع لإضافة العلامات بحيث لا يتجمد الصفحة",
+            "cluster-markers-lazy-load": "استخدام التحميل الكسلي لإضافة العلامات",
+            "editor-settings": "إعدادات المحرر",
+            "enable-snapping": "تمكين الالتقاط للرؤوس الأخرى لرسم دقيق",
+            "init-draggable-mode": "تهيئة الخريطة في وضع السحب",
+            "hide-all-edit-buttons": "إخفاء جميع أزرار التحكم في التحرير",
+            "hide-draw-buttons": "إخفاء أزرار الرسم",
+            "hide-edit-buttons": "إخفاء أزرار التحرير",
+            "hide-remove-button": "إخفاء زر الإزالة",
+            "route-map-settings": "إعدادات خريطة المسار",
+            "trip-animation-settings": "إعدادات تحريك الرحلة",
+            "normalization-step": "خطوة التوحيد للبيانات (مللي ثانية)",
+            "tooltip-background-color": "لون خلفية التلميح",
+            "tooltip-font-color": "لون خط التلميح",
+            "tooltip-opacity": "شفافية التلميح (0-1)",
+            "auto-close-tooltip": "إغلاق التلميح تلقائيًا",
+            "rotation-angle": "تعيين زاوية دوران إضافية للعلامة (درجة)",
+            "path-settings": "إعدادات المسار",
+            "path-color": "لون المسار",
+            "use-path-color-function": "استخدام وظيفة لون المسار",
+            "path-color-function": "وظيفة لون المسار",
+            "path-decorator": "زخرفة المسار",
+            "use-path-decorator": "استخدام زخرفة المسار",
+            "decorator-symbol": "رمز الزخرفة",
+            "decorator-symbol-arrow-head": "سهم",
+            "decorator-symbol-dash": "شرطة",
+            "decorator-symbol-size": "حجم رمز الزخرفة (بكسل)",
+            "use-path-decorator-custom-color": "استخدام لون مخصص لزخرفة المسار",
+            "decorator-custom-color": "لون مخصص للزخرفة",
+            "decorator-offset": "إزاحة الزخرفة",
+            "end-decorator-offset": "إزاحة نهاية الزخرفة",
+            "decorator-repeat": "تكرار الزخرفة",
+            "points-settings": "إعدادات النقاط",
+            "show-points": "إظهار النقاط",
+            "point-color": "لون النقطة",
+            "point-size": "حجم النقطة (بكسل)",
+            "use-point-color-function": "استخدام وظيفة لون النقطة",
+            "point-color-function": "وظيفة لون النقطة",
+            "use-point-as-anchor": "استخدام النقطة كمرجع",
+            "point-as-anchor-function": "وظيفة النقطة كمرجع",
+            "independent-point-tooltip": "تلميح النقطة المستقل",
+            "clustering-markers": "تجميع العلامات",
+            "use-icon-create-function": "استخدام وظيفة ألوان العلامات",
+            "marker-color-function": "وظيفة لون العلامة"
+        },
+        "markdown": {
+            "use-markdown-text-function": "استخدام وظيفة قيم التنسيق البسيط/HTML",
+            "markdown-text-function": "وظيفة قيم التنسيق البسيط/HTML",
+            "markdown-text-pattern": "نمط التنسيق البسيط/HTML (تنسيق بسيط أو HTML مع متغيرات، مثلا '${entityName} أو ${keyName} - بعض النص.')",
+            "apply-default-markdown-style": "تطبيق نمط التنسيق البسيط الافتراضي",
+            "markdown-css": "CSS التنسيق البسيط/HTML"
+        },
+        "simple-card": {
+            "label": "التسمية",
+            "label-position": "موضع التسمية",
+            "label-position-left": "يسار",
+            "label-position-top": "أعلى"
+        },
+        "value-card": {
+            "layout": "التخطيط",
+            "layout-square": "مربع",
+            "layout-vertical": "عمودي",
+            "layout-centered": "مركز",
+            "layout-simplified": "مبسط",
+            "layout-horizontal": "أفقي",
+            "layout-horizontal-reversed": "أفقي معكوس",
+            "label": "التسمية",
+            "icon": "الأيقونة",
+            "value": "القيمة",
+            "date": "التاريخ",
+            "value-card-style": "نمط بطاقة القيمة",
+            "auto-scale": "تحجيم تلقائي"
+        },
+        "liquid-level-card": {
+            "layout-simple": "بسيط",
+            "layout-percentage": "نسبة مئوية",
+            "layout-absolute": "مطلق",
+            "layout": "تخطيط",
+            "background-overlay": "تراكب خلفية القيمة",
+            "total-volume": "الحجم الإجمالي",
+            "tank": "خزان",
+            "shape": "الشكل",
+            "datasource-units": "وحدات المصدر",
+            "widget-units": "وحدات الودجة",
+            "decimals": "الأعشار",
+            "liquid": "سائل",
+            "liquid-color": "لون السائل",
+            "value": "القيمة",
+            "value-font": "خط القيمة",
+            "level": "المستوى",
+            "last-update": "آخر تحديث",
+            "shape-by-attribute": "تعيين شكل الخزان بواسطة اسم الخاصية",
+            "tooltip-background": "لون الخلفية",
+            "background-blur": "ضبابية الخلفية",
+            "tank-color": "لون الخزان",
+            "static": "ثابت",
+            "see-examples": "رؤية الأمثلة",
+            "attribute": "الخاصية",
+            "shape-type": "النوع",
+            "v-oval": "بيضاوي رأسي",
+            "v-cylinder": "أسطواني رأسي",
+            "v-capsule": "كبسولة رأسية",
+            "rectangle": "مستطيل",
+            "h-oval": "بيضاوي أفقي",
+            "h-ellipse": "قطع ناقص أفقي",
+            "h-dish-ends": "أطراف طبقية أفقية",
+            "h-cylinder": "أسطواني أفقي",
+            "h-capsule": "كبسولة أفقية",
+            "h-elliptical_2_1": "ناقصة 2:1 أفقية",
+            "icon": "أيقونة البطاقة",
+            "title": "عنوان البطاقة",
+            "units": "الوحدات",
+            "color-and-font": "اللون والخط",
+            "shape-attribute-name": "اسم الخاصية",
+            "total-volume-required": "الحجم الإجمالي مطلوب.",
+            "attribute-name-required": "اسم الخاصية مطلوب.",
+            "attribute-key-not-set": "مفتاح الخاصية '{{attributeName}}' غير مُعيَّن",
+            "attribute-key-invalid": "مفتاح الخاصية '{{attributeName}}' غير صالح"
+        },
+        "aggregated-value-card": {
+            "subtitle": "العنوان الفرعي",
+            "chart": "رسم بياني",
+            "values": "القيم",
+            "value-appearance": "مظهر القيمة",
+            "position": "الموضع",
+            "position-center": "الوسط",
+            "position-right-top": "أعلى اليمين",
+            "position-right-bottom": "أسفل اليمين",
+            "position-left-top": "أعلى اليسار",
+            "position-left-bottom": "أسفل اليسار",
+            "font": "الخط",
+            "color": "اللون",
+            "arrow": "السهم",
+            "display-up-down-arrow": "عرض السهم الصعودي/الهابط",
+            "add-value": "إضافة قيمة",
+            "remove-value": "إزالة القيمة",
+            "no-values": "لا توجد قيم مُكونة",
+            "aggregation": "التجميع",
+            "aggregated-value-card-style": "نمط بطاقة القيمة المجمعة",
+            "auto-scale": "تحجيم تلقائي"
+        },
+        "value-chart-card": {
+            "layout": "التخطيط",
+            "layout-left": "اليسار",
+            "layout-right": "اليمين",
+            "auto-scale": "تحجيم تلقائي",
+            "icon": "الأيقونة",
+            "value": "القيمة",
+            "chart": "الرسم البياني",
+            "value-chart-card-style": "نمط بطاقة القيمة والرسم البياني"
+        },
+        "progress-bar": {
+            "layout": "التخطيط",
+            "layout-default": "الافتراضي",
+            "layout-simplified": "المبسط",
+            "auto-scale": "تحجيم تلقائي",
+            "icon": "الأيقونة",
+            "value": "القيمة",
+            "range": "النطاق",
+            "min": "الحد الأدنى",
+            "max": "الحد الأقصى",
+            "range-ticks": "علامات النطاق",
+            "bar": "الشريط",
+            "bar-color": "لون الشريط",
+            "bar-background": "خلفية الشريط",
+            "progress-bar-card-style": "نمط بطاقة شريط التقدم"
+        },
+        "alarm-count": {
+            "alarm-count-card-style": "نمط بطاقة عدد التنبيهات"
+        },
+        "entity-count": {
+            "entity-count-card-style": "نمط بطاقة عدد الكيانات"
+        },
+        "count": {
+            "layout": "التخطيط",
+            "layout-column": "عمود",
+            "layout-row": "صف",
+            "label": "التسمية",
+            "icon": "الأيقونة",
+            "icon-background": "خلفية الأيقونة",
+            "value": "القيمة",
+            "chevron": "السهم",
+            "auto-scale": "تحجيم تلقائي"
+        },
+        "table": {
+            "common-table-settings": "إعدادات الجدول الشائعة",
+            "enable-search": "تمكين البحث",
+            "enable-sticky-header": "عرض العنوان دائمًا",
+            "enable-sticky-action": "عرض عمود الإجراءات دائمًا",
+            "hidden-cell-button-display-mode": "وضع عرض أزرار الخلية المخفية",
+            "show-empty-space-hidden-action": "عرض المساحة الفارغة بدلاً من إجراء الزر الخفي",
+            "dont-reserve-space-hidden-action": "عدم احتياط مساحة لأزرار الإجراءات المخفية",
+            "display-timestamp": "الطابع الزمني",
+            "display-pagination": "عرض الترقيم",
+            "default-page-size": "حجم الصفحة الافتراضي",
+            "use-entity-label-tab-name": "استخدام تسمية الكيان في اسم التبويب",
+            "hide-empty-lines": "إخفاء الأسطر الفارغة",
+            "row-style": "نمط الصف",
+            "use-row-style-function": "استخدام وظيفة نمط الصف",
+            "row-style-function": "وظيفة نمط الصف",
+            "cell-style": "نمط الخلية",
+            "use-cell-style-function": "استخدام وظيفة نمط الخلية",
+            "cell-style-function": "وظيفة نمط الخلية",
+            "cell-content": "محتوى الخلية",
+            "use-cell-content-function": "استخدام وظيفة محتوى الخلية",
+            "cell-content-function": "وظيفة محتوى الخلية",
+            "show-latest-data-column": "عرض أحدث عمود بيانات",
+            "latest-data-column-order": "ترتيب أحدث عمود بيانات",
+            "entities-table-title": "عنوان جدول الكيانات",
+            "enable-select-column-display": "تمكين اختيار الأعمدة للعرض",
+            "display-entity-name": "عرض عمود اسم الكيان",
+            "entity-name-column-title": "عنوان عمود اسم الكيان",
+            "display-entity-label": "عرض عمود تسمية الكيان",
+            "entity-label-column-title": "عنوان عمود تسمية الكيان",
+            "display-entity-type": "عرض عمود نوع الكيان",
+            "default-sort-order": "الترتيب الافتراضي",
+            "custom-title": "عنوان رأس مخصص",
+            "column-width": "عرض العمود (بكسل أو ٪)",
+            "default-column-visibility": "رؤية العمود الافتراضية",
+            "column-visibility-visible": "مرئي",
+            "column-visibility-hidden": "مخفي",
+            "column-visibility-hidden-mobile": "مخفي في وضع الجوال",
+            "column-selection-to-display": "اختيار العمود في 'الأعمدة المعروضة'",
+            "column-selection-to-display-enabled": "ممكن",
+            "column-selection-to-display-disabled": "معطل",
+            "column-export-option": "تضمين العمود في التصدير",
+            "column-export-option-always": "دائمًا",
+            "column-export-option-only-visible": "فقط إذا كان العمود مرئيًا",
+            "column-export-option-never": "أبدًا",
+            "alarms-table-title": "عنوان جدول التنبيهات",
+            "enable-alarms-selection": "تمكين تحديد التنبيهات",
+            "enable-alarms-search": "تمكين البحث في التنبيهات",
+            "enable-alarm-filter": "تمكين مرشح التنبيه",
+            "display-alarm-details": "عرض تفاصيل التنبيه",
+            "allow-alarms-ack": "السماح بالاعتراف بالتنبيهات",
+            "allow-alarms-clear": "السماح بمسح التنبيهات",
+            "display-alarm-activity": "عرض نشاط التنبيه",
+            "allow-alarms-assign": "السماح بتعيين التنبيهات",
+            "blob-entities-table-title": "عنوان جدول كائنات التدفق",
+            "display-created-time": "عرض عمود الوقت الذي تم إنشاؤه",
+            "display-type": "عرض عمود نوع",
+            "display-customer": "عرض عمود العميل",
+            "no-data-display-message": "رسالة بديلة \"لا توجد بيانات لعرضها\"",
+            "force-default-blob-entity-type": "فرض نوع كائن التدفق الافتراضي",
+            "scheduler-events-table-title": "عنوان جدول أحداث المجدول",
+            "force-default-event-type": "فرض نوع الحدث الافتراضي",
+            "columns": "الأعمدة",
+            "column-settings": "إعدادات العمود",
+            "remove-column": "إزالة العمود",
+            "add-column": "إضافة عمود",
+            "no-columns": "لا توجد أعمدة مكونة",
+            "columns-to-display": "الأعمدة المعروضة",
+            "table-header": "رأس الجدول",
+            "header-buttons": "أزرار الرأس",
+            "table-buttons": "أزرار الجدول",
+            "pagination": "ترقيم الصفحات",
+            "rows": "الصفوف",
+            "timeseries-column-error": "يجب تحديد عمود واحد على الأقل للسلسلة الزمنية",
+            "alarm-column-error": "يجب تحديد عمود واحد على الأقل للتنبيه",
+            "table-tabs": "ألسنة الجدول",
+            "show-cell-actions-menu-mobile": "عرض قائمة الإجراءات في خلية الجدول في وضع الجوال"
+        },
+        "wind-speed-direction": {
+            "layout": "التخطيط",
+            "layout-default": "الافتراضي",
+            "layout-advanced": "المتقدم",
+            "layout-simplified": "المبسط",
+            "values": "القيم",
+            "wind-direction": "اتجاه الرياح",
+            "center-value": "القيمة المركزية",
+            "icon": "الأيقونة",
+            "arrow": "السهم",
+            "ticks": "العلامات",
+            "labels-type": "نوع العلامات",
+            "directional-names": "أسماء الاتجاهات",
+            "degrees": "الدرجات",
+            "major-ticks": "علامات رئيسية",
+            "minor-ticks": "علامات فرعية",
+            "wind-speed-direction-card-style": "نمط بطاقة سرعة الرياح واتجاهها",
+            "ticks-color": "لون العلامات",
+            "ticks-labels-type": "نوع علامات العلامات",
+            "arrow-color": "لون السهم"
+        },
+        "scheduler": {
+            "enabled-scheduler-event-views": "عروض أحداث المجدول الممكنة",
+            "enabled-scheduler-event-views-both": "الكل",
+            "enabled-scheduler-event-views-list": "عرض القائمة فقط",
+            "enabled-scheduler-event-views-calendar": "عرض التقويم فقط",
+            "display-name": "عرض الاسم",
+            "type-name": "اسم النوع",
+            "display-originator-select": "عرض اختيار الكيان المنشئ",
+            "display-message-type-select": "عرض اختيار نوع الرسالة",
+            "display-metadata-table": "عرض جدول بيانات الرسالة",
+            "configuration-html-template": "قالب HTML التكوين",
+            "custom-event-types": "أنواع الأحداث المخصصة",
+            "no-custom-event-types": "لم يتم تكوين أنواع أحداث مخصصة",
+            "add-custom-event-type": "إضافة نوع حدث مخصص"
+        },
+        "value-source": {
+            "value-source": "مصدر القيمة",
+            "predefined-value": "القيمة المحددة مسبقًا",
+            "entity-attribute": "سمة الكيان",
+            "value": "القيمة",
+            "source-entity-alias": "اسم الكيان المصدر",
+            "source-entity-attribute": "سمة الكيان المصدرة"
+        },
+        "widget-font": {
+            "font-settings": "إعدادات الخط",
+            "font-family": "عائلة الخط",
+            "size": "الحجم",
+            "relative-font-size": "الحجم النسبي للخط (بالنسبة المئوية)",
+            "font-style": "النمط",
+            "font-style-normal": "عادي",
+            "font-style-italic": "مائل",
+            "font-style-oblique": "مائل",
+            "font-weight": "الوزن",
+            "font-weight-normal": "عادي",
+            "font-weight-bold": "عريض",
+            "font-weight-bolder": "أكثر سمكا",
+            "font-weight-lighter": "أخف",
+            "color": "اللون",
+            "shadow-color": "لون الظل",
+            "preview": "معاينة",
+            "line-height": "ارتفاع السطر",
+            "auto": "تلقائي"
+        },
+        "home": {
+            "no-data-available": "لا تتوفر بيانات"
+        },
+        "system-info": {
+            "cpu": "وحدة المعالجة المركزية",
+            "ram": "الذاكرة العشوائية",
+            "disk": "القرص",
+            "cpu-warning-text": "ارتفاع استخدام وحدة المعالجة المركزية. لتجنب فشل النظام، قم بتحسين أداء النظام.",
+            "cpu-critical-text": "استخدام وحدة المعالجة المركزية عالٍ للغاية. لتجنب فشل النظام، قم بتحسين أداء النظام.",
+            "ram-warning-text": "انخفاض الذاكرة العشوائية المتاحة. لتجنب فشل النظام، قم بتحسين أداء النظام أو زيادة حجم الذاكرة العشوائية.",
+            "ram-critical-text": "انخفاض حرج في الذاكرة العشوائية المتاحة. لتجنب فشل النظام، قم بتحسين أداء النظام أو زيادة حجم الذاكرة العشوائية.",
+            "disk-warning-text": "انخفاض مساحة القرص المتاحة. لتجنب فقدان البيانات، قم بتحرير المساحة أو زيادة مساحة القرص.",
+            "disk-critical-text": "انخفاض حرج في مساحة القرص المتاحة. لتجنب فقدان البيانات، قم بتحرير المساحة أو زيادة مساحة القرص."
+        },
+        "cluster-info": {
+            "service-id": "معرف الخدمة",
+            "service-type": "نوع الخدمة",
+            "no-data": "لا تتوفر بيانات"
+        },
+        "transport-messages": {
+            "title": "رسائل النقل",
+            "info": "كل الرسائل التي تأتي من الأجهزة"
+        },
+        "activity": {
+            "title": "النشاط"
+        },
+        "documentation": {
+            "title": "التوثيق",
+            "add-link": "إضافة رابط",
+            "add-link-title": "إضافة رابط التوثيق",
+            "name": "الاسم",
+            "name-required": "الاسم مطلوب.",
+            "link": "الرابط",
+            "link-required": "الرابط مطلوب.",
+            "columns": "الأعمدة"
+        },
+        "quick-links": {
+            "title": "روابط سريعة",
+            "add-link": "إضافة رابط",
+            "add-link-title": "إضافة رابط سريع",
+            "quick-link": "رابط سريع",
+            "quick-link-required": "الرابط السريع مطلوب.",
+            "no-links-matching": "لا توجد روابط تطابق '{{name}}'.",
+            "columns": "الأعمدة"
+        },
+        "recent-dashboards": {
+            "title": "لوحات التحكم",
+            "last": "آخر مشاهدة",
+            "starred": "المفضلة",
+            "name": "الاسم",
+            "last-viewed": "آخر مشاهدة",
+            "no-last-viewed-dashboards": "لا توجد لوحات تحكم مشاهدة في الآونة الأخيرة بعد"
+        },
+        "configured-features": {
+            "title": "الميزات المُكوَّنة",
+            "info": "حالة الميزات التي تتطلب تكوينًا",
+            "white-labeling-feature": "العلامة البيضاء",
+            "email-feature": "البريد الإلكتروني",
+            "sms-feature": "رسالة نصية قصيرة (SMS)",
+            "slack-feature": "Slack",
+            "oauth2-feature": "OAuth 2",
+            "2fa-feature": "التحقق الثنائي العامل (2FA)",
+            "feature-configured": "الميزة مكونة.\nانقر لإعدادها",
+            "feature-not-configured": "الميزة غير مكونة.\nانقر لإعدادها"
+        },
+        "version-info": {
+            "title": "الإصدار",
+            "contact-us": "اتصل بنا",
+            "current-version": "الإصدار الحالي",
+            "current": "الحالي",
+            "available-version": "الإصدار المتاح",
+            "available": "متاح",
+            "upgrade": "الترقية",
+            "version-is-up-to-date": "الإصدار محدَّث"
+        },
+        "license-info": {
+            "title": "معلومات الترخيص",
+            "view-all": "عرض الكل",
+            "license-portal": "بوابة الترخيص",
+            "devices-info": "{count} / { max, plural, =0 {∞} other {#} } أجهزة",
+            "assets-info": "{count} / { max, plural, =0 {∞} other {#} } أصول",
+            "dashboards-info": "{count} / { max, plural, =0 {∞} other {#} } لوحات التحكم",
+            "integrations-info": "{count} / { max, plural, =0 {∞} other {#} } التكاملات",
+            "community-support": "دعم المجتمع",
+            "white-labeling": "العلامة البيضاء",
+            "unlimited-datapoints-and-messages": "نقاط البيانات والرسائل غير محدودة",
+            "unlimited-api-calls": "استدعاءات API غير محدودة"
+        },
+        "usage-info": {
+            "title": "استخدام",
+            "entities": "الكيانات",
+            "api-calls": "استدعاءات API"
+        },
+        "functions": {
+            "title": "الوظائف",
+            "pe-feature-tooltip": "فقط على ThingsBoard\nالنسخة المهنية",
+            "switch-to-pe": "التبديل إلى النسخة المهنية",
+            "alarms": "التنبيهات",
+            "dashboards": "لوحات التحكم",
+            "entities-and-relations": "الكيانات والعلاقات",
+            "profiles": "الملفات الشخصية",
+            "advanced-features": "الميزات المتقدمة",
+            "notification-center": "مركز الإشعارات",
+            "api-usage": "استخدام واجهة البرمجة",
+            "customers": "العملاء",
+            "customers-hierarchy": "تسلسل العملاء",
+            "roles-and-permissions": "الأدوار والأذونات",
+            "groups": "المجموعات",
+            "integrations": "التكاملات",
+            "solution-templates": "قوالب الحلول",
+            "scheduler": "المجدول",
+            "white-labeling": "العلامة البيضاء"
+        },
+        "devices": {
+            "view-docs": "عرض الوثائق",
+            "inactive": "غير نشط",
+            "active": "نشط",
+            "total": "الإجمالي"
+        },
+        "alarms": {
+            "critical": "حرجة",
+            "assigned-to-me": "معيَّنة لي",
+            "total": "الإجمالي"
+        },
+        "solution-templates": {
+            "title": "قوالب الحلول",
+            "prototype-plan": "خطة النموذج الأولي",
+            "startup-plan": "خطة البداية"
+        },
+        "getting-started": {
+            "get-started": "البدء",
+            "finish": "انتهاء",
+            "done-welcome-title": "مرحبًا بكم على متن السفينة",
+            "done-welcome-text": "لقد قمت بعمل رائع!",
+            "sys-admin": {
+                "step1": {
+                    "title": "إنشاء مستأجر ومسؤول المستأجر",
+                    "content": "<p>المستأجر هو فرد أو منظمة يمتلك أو ينتج الأجهزة والأصول. يمكن أن يكون للمستأجر مستخدمون مسؤولون متعددون للمستأجر وعملاء وأجهزة وأصول متعددة.</p><p>يمكن لمسؤول المستأجر إنشاء وإدارة الأجهزة والأصول والعملاء ولوحات التحكم داخل حساب المستأجر.</p><p>اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-create-tenant": "كيفية إنشاء مستأجر ومسؤول المستأجر"
+                },
+                "step2": {
+                    "title": "تكوين الميزة: خادم البريد",
+                    "content": "<p>تكوين خادم البريد أمر أساسي لتنشيط المستخدمين، واسترداد كلمات المرور، وتوصيل إشعارات التنبيه.</p><p>اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-configure-mail-server": "كيفية تكوين خادم البريد"
+                },
+                "step3": {
+                    "title": "تكوين الميزة: مزود خدمة SMS",
+                    "content": "<p>قم بتكوين مزودي الخدمة SMS لإخطار العملاء بالتنبيهات عبر الرسائل القصيرة (SMS).</p><p>اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-configure-sms-provider": "كيفية تكوين مزود خدمة SMS"
+                },
+                "step4": {
+                    "title": "تكوين الميزة: العلامة البيضاء",
+                    "content": "<p>قم بتخصيص شعار شركتك أو منتجك ومخطط الألوان بسهولة دون برمجة ودون إعادة تشغيل الخدمة.</p><p>اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-configure-white-labeling": "كيفية تكوين العلامة البيضاء"
+                },
+                "step5": {
+                    "title": "تكوين الميزة: 2FA",
+                    "content": "<p>تحسين أمان حسابات المنصة مع المصادقة ثنائية العامل.</p><p>اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-configure-2fa": "كيفية تكوين 2FA"
+                },
+                "step6": {
+                    "title": "تكوين الميزة: OAuth 2",
+                    "content": "<p>بسهولة تبسيط تسجيل الدخول لمستخدمي المستأجر والعملاء باستخدام وظيفة الاستمارة الواحدة عبر OAuth 2.0.</p><p>اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-configure-oauth2": "كيفية تكوين OAuth 2"
+                },
+                "step7": {
+                    "title": "تكوين الميزة: Slack",
+                    "content": "<p>توزيع الإشعارات إلى مستخدمي المستأجر والعملاء عبر Slack وفقًا لقواعد الإشعار التي تعيِّنها.</p><p>اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-configure-notifications": "كيفية تكوين Slack"
+                }
+            },
+            "tenant-admin": {
+                "step1": {
+                    "title": "إنشاء جهاز",
+                    "content": "<p>دعونا نقوم بتوفير أول جهاز لك على المنصة عبر واجهة المستخدم. اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-create-device": "كيفية إنشاء جهاز"
+                },
+                "step2": {
+                    "title": "الاتصال بالجهاز",
+                    "content-before": "<p>للاتصال بالجهاز، تحتاج إلى الحصول على بيانات اعتماد الجهاز. نوصي باستخدام بيانات الاعتماد الافتراضية المولدة تلقائيًا وهي رمز الوصول لهذا الدليل.</p><ul><li>انتقل إلى جدول الجهاز</li><li>انقر على صف الجهاز لفتح تفاصيل الجهاز</li><li>اضغط على الزر \"نسخ رمز الوصول\"</li></ul><p>استخدم الأوامر البسيطة لنشر البيانات عبر HTTP. لا تنسى استبدال <em>$ACCESS_TOKEN</em> برمز الوصول لجهازك:</p>",
+                    "ubuntu": {
+                        "install-curl": "تثبيت cURL لنظام Ubuntu:"
+                    },
+                    "macos": {
+                        "install-curl": "تثبيت cURL لنظام MacOS:"
+                    },
+                    "windows": {
+                        "install-curl": "بدءًا من Windows 10 b17063، يتوفر cURL افتراضيًا."
+                    },
+                    "replace-access-token": "استبدل <em>$ACCESS_TOKEN</em> برمز الوصول لجهازك:",
+                    "content-after": "<p>يمكنك أيضًا استخدام بروتوكولات أخرى مثل MQTT، CoAP، إلخ.</p><p>اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-connect-device": "كيفية الاتصال بالجهاز"
+                },
+                "step3": {
+                    "title": "إنشاء لوحة تحكم",
+                    "content": "<p>إنشاء لوحة تحكم لتصور البيانات من الكيانات مثل الأصول والأجهزة، إلخ.</p><p>اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-create-dashboard": "كيفية إنشاء لوحة تحكم"
+                },
+                "step4": {
+                    "title": "تكوين قواعد التنبيه",
+                    "alarm-rules": "قواعد التنبيه",
+                    "content": "<p>لنقم برفع تنبيه عندما تصل درجة الحرارة إلى 25 درجة مئوية. اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-configure-alarm-rules": "كيفية تكوين قواعد التنبيه"
+                },
+                "step5": {
+                    "title": "إنشاء تنبيه",
+                    "content-before": "<p>لتشغيل التنبيه، قم بإرسال قيمة تلميم جديدة تبلغ 26 درجة مئوية أو أعلى.</p>",
+                    "replace-access-token": "استبدل <em>$ACCESS_TOKEN</em> برمز الوصول لجهازك:",
+                    "content-after": "<p>اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-create-alarm": "كيفية إنشاء تنبيه"
+                },
+                "step6": {
+                    "title": "إنشاء عميل ومشاركة لوحة التحكم",
+                    "content": "<p>من خلال إنشاء لوحات تحكم للمستخدمين النهائيين، يمكن للمستخدمين العملاء رؤية أجهزتهم فقط، وسيتم إخفاء البيانات من عميل آخر.</p><p>اتبع الوثائق حول كيفية القيام بذلك:</p>",
+                    "how-to-create-customer-and-share-dashboard": "كيفية إنشاء عميل ومشاركة لوحة التحكم"
+                }
+            }
+        }
+    },
+    "icon": {
+        "icon": "أيقونة",
+        "icons": "الأيقونات",
+        "select-icon": "اختر أيقونة",
+        "material-icons": "أيقونات مادية",
+        "show-all": "عرض جميع الأيقونات",
+        "search-icon": "بحث عن أيقونة",
+        "no-icons-found": "لم يتم العثور على أيقونات لـ '{{iconSearch}}'"
+    },
+    "subscription": {
+        "entity-limit-text": "ومع ذلك، يمكنك ترقية خطة اشتراكك لزيادة حدودك.",
+        "upgrade-your-plan": "ترقية خطة الاشتراك",
+        "white-labeling-feature": "ميزة التسمية البيضاء",
+        "white-labeling-text-full": "قم بإعادة تسمية واجهة ويب منصة ThingsBoard باستخدام شعار شركتك أو منتجك ونظام ألوانك في 2 دقيقة.<br><br>إزالة عبارة 'Powered By' في تذييل لوحات القيادة.<br>لا تحتاج إلى برمجة أو إعادة تشغيل الخدمة. اسمح لعملائك أيضًا بتسمية واجهتهم بالأبيض.",
+        "enable-white-labeling": "قم بتمكين ميزة التسمية البيضاء الآن من خلال ترقية خطة اشتراكك!",
+        "read-more": "اقرأ المزيد",
+        "white-labeling-video-text": "انظر إلى البرنامج التعليمي الفيديو أدناه لمعرفة كيفية عمل هذه الميزة!"
+    },
+    "subscription-error": {
+        "title": "انتهاك الاشتراك",
+        "warning-title": "تحذير بخصوص الاشتراك",
+        "upgrade-subscription-plan": "الرجاء ترقية خطة اشتراكك",
+        "upgrade-subscription-plan-to-install-solution-template": "من أجل تثبيت الحل <b>{{solutionTemplateName}}</b> يجب عليك ترقية اشتراكك على الأقل إلى خطة <b>{{planName}}</b>!",
+        "limit-reached": {
+            "device-count": "لقد وصلت إلى الحد الأقصى للأجهزة ({{value}}) المسموح بها بخطة الاشتراك الخاصة بك!",
+            "asset-count": "لقد وصلت إلى الحد الأقصى للأصول ({{value}}) المسموح بها بخطة الاشتراك الخاصة بك!"
+        },
+        "feature-disabled": {
+            "white-labeling": "ميزة التسمية البيضاء غير مسموح بها بواسطة خطة الاشتراك الخاصة بك!"
+        }
+    },
+    "phone-input": {
+        "phone-input-label": "رقم الهاتف",
+        "phone-input-required": "رقم الهاتف مطلوب",
+        "phone-input-validation": "رقم الهاتف غير صالح أو غير ممكن",
+        "phone-input-pattern": "رقم الهاتف غير صالح. يجب أن يكون بتنسيق E.164، مثل {{phoneNumber}}",
+        "phone-input-hint": "رقم الهاتف بتنسيق E.164، مثل {{phoneNumber}}"
+    },
+    "custom": {
+        "widget-action": {
+            "action-cell-button": "زر العملية في الخلية",
+            "row-click": "عند النقر على الصف",
+            "polygon-click": "عند النقر على المضلع",
+            "marker-click": "عند النقر على العلامة",
+            "circle-click": "عند النقر على الدائرة",
+            "tooltip-tag-action": "إجراء الوسم التوضيحي",
+            "node-selected": "عند تحديد العقدة",
+            "element-click": "عند النقر على عنصر HTML",
+            "pie-slice-click": "عند النقر على قطاع البيتزا",
+            "row-double-click": "عند النقر المزدوج على الصف",
+            "card-click": "عند النقر على البطاقة"
+        }
+    },
+    "paginator": {
+        "items-per-page": "العناصر في كل صفحة:",
+        "first-page-label": "الصفحة الأولى",
+        "last-page-label": "الصفحة الأخيرة",
+        "next-page-label": "الصفحة التالية",
+        "previous-page-label": "الصفحة السابقة",
+        "items-per-page-separator": "من"
+    },
+    "language": {
+        "language": "اللغة"
+    }
+}
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index f8f752b5b3..7485ba64f1 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -283,6 +283,7 @@
           "domain-schema-https": "HTTPS",
           "domain-schema-mixed": "HTTP+HTTPS",
           "enable": "Enable OAuth2 settings",
+          "edge-enable": "Propagate to Edge",
           "domains": "Domains",
           "mobile-apps": "Mobile applications",
           "no-mobile-apps": "No applications configured",
@@ -804,7 +805,6 @@
         "email-messages": "Email messages",
         "email-messages-daily-activity": "Email messages daily activity",
         "email-messages-monthly-activity": "Email messages monthly activity",
-        "exceptions": "Exceptions",
         "executions": "Executions",
         "scripts": "Scripts",
         "scripts-hourly-activity": "Scripts hourly activity",
@@ -822,9 +822,7 @@
         "permanent-failures": "${entityName} Permanent Failures",
         "permanent-timeouts": "${entityName} Permanent Timeouts",
         "processing-failures": "${entityName} Processing Failures",
-        "processing-failures-and-timeouts": "Processing Failures and Timeouts",
         "processing-timeouts": "${entityName} Processing Timeouts",
-        "queue-stats": "Queue Stats",
         "rule-chain": "Rule Chain",
         "rule-engine": "Rule Engine",
         "rule-engine-daily-activity": "Rule Engine daily activity",
@@ -2244,6 +2242,8 @@
         "type-ota-package": "OTA package",
         "type-rpc": "RPC",
         "type-queue": "Queue",
+        "type-queue-stats": "Queue statistics",
+        "type-queues-stats": "Queues statistics",
         "type-notification": "Notification",
         "type-notification-rule": "Notification rule",
         "type-notification-rules": "Notification rules",
@@ -2271,7 +2271,9 @@
         "address2": "Address 2",
         "zip": "Zip",
         "phone": "Phone",
-        "label": "Label"
+        "label": "Label",
+        "queue-name": "Queue name",
+        "service-id": "Service Id"
     },
     "entity-view": {
         "entity-view": "Entity view",
@@ -2730,7 +2732,7 @@
         "rpc-command-result": "Response",
         "rpc-command-edit-params": "Edit parameters",
         "gateway-configuration": "General Configuration",
-        "docker-label": "Use the following instruction to run IoT Gateway in in Docker compose with credentials for selected device",
+        "docker-label": "Use the following instruction to run IoT Gateway in Docker compose with credentials for selected device",
         "install-docker-compose": "Use the instructions to download, install and setup docker compose",
         "download-configuration-file": "Download configuration file",
         "download-docker-compose": "Download docker-compose.yml for your gateway",
@@ -3287,6 +3289,7 @@
             "months": "(month ago)",
             "years": "(year ago)"
         },
+        "column-title": "Column title",
         "label": "Label",
         "value": "Value"
     },
@@ -3308,6 +3311,7 @@
         "new-password-again": "Confirm new password",
         "password-link-sent-message": "Reset link has been sent",
         "email": "Email",
+        "invalid-email-format": "Invalid email format.",
         "login-with": "Login with {{name}}",
         "or": "or",
         "error": "Login error",
@@ -4447,6 +4451,7 @@
         "trigger": "Trigger",
         "trigger-point": "Point",
         "trigger-axis": "Axis",
+        "label": "Label",
         "value": "Value",
         "date": "Date",
         "show-date-time-interval": "Show date time interval",
@@ -5015,7 +5020,9 @@
         "device-credentials-conflict": "Failed to load the device with external id <b>{{entityId}}</b><br/>due to the same credentials are already present in the database for another device.<br/>Please consider disabling the <b>load credentials</b> setting in the restore form.",
         "missing-referenced-entity": "Failed to load the <b>{{sourceEntityTypeName}}</b> with external id <b>{{sourceEntityId}}</b><br/>because it references missing <b>{{targetEntityTypeName}}</b> with id <b>{{targetEntityId}}</b>.",
         "runtime-failed": "<b>Failed:</b> {{message}}",
-        "auto-commit-settings-read-only-hint": "Auto-commit feature doesn't work with enabled read-only option in Repository settings."
+        "auto-commit-settings-read-only-hint": "Auto-commit feature doesn't work with enabled read-only option in Repository settings.",
+        "rollback-on-error": "Rollback on error",
+        "rollback-on-error-hint": "If you have a large amount of entities to restore, consider disabling this option to increase performance.\n Note, if an error occurs over the course of version loading, already persisted entities (with relations, attributes, etc.) will stay as is"
     },
     "widget": {
         "widget-library": "Widgets library",
@@ -5422,7 +5429,7 @@
             "bar-appearance": "Bar appearance",
             "label-on-bar": "Label on bar",
             "value-on-bar": "Value on bar",
-            "bar-chart-card-style": "Bar chart card style"
+            "bar-chart-style": "Bar chart style"
         },
         "battery-level": {
             "layout": "Layout",
@@ -5452,6 +5459,25 @@
             "signal-strength-card-style": "Signal strength card style",
             "no-signal-rssi-value": "\"No signal\" rssi value"
         },
+        "status-widget": {
+            "behavior": "Behavior",
+            "layout": "Layout",
+            "layout-default": "Default",
+            "layout-center": "Center",
+            "layout-icon": "Icon",
+            "on": "On",
+            "off": "Off",
+            "label": "Label",
+            "status": "Status",
+            "icon": "Icon",
+            "color-palette": "Color palette",
+            "disabled-color-palette": "Disabled color palette",
+            "primary": "Primary",
+            "primary-color-hint": "Color of icon and label",
+            "secondary": "Secondary",
+            "secondary-color-hint": "Color of status",
+            "background": "Background"
+        },
         "chart": {
             "common-settings": "Common settings",
             "enable-stacking-mode": "Enable stacking mode",
@@ -5684,16 +5710,10 @@
             }
         },
         "doughnut": {
-            "total": "Total",
             "layout": "Layout",
             "layout-default": "Default",
             "layout-with-total": "With total",
-            "auto-scale": "Auto scale",
-            "clockwise-layout": "Clockwise layout",
-            "sort-series": "Sort series by label",
             "central-total-value": "Central total value",
-            "tooltip-value-type-absolute": "Absolute",
-            "tooltip-value-type-percentage": "Percentage",
             "doughnut-card-style": "Doughnut card style"
         },
         "entities-hierarchy": {
@@ -6172,10 +6192,14 @@
         "range-chart": {
             "chart": "Chart",
             "data-zoom": "Data zoom",
+            "range-chart-appearance": "Range chart appearance",
             "range-colors": "Range colors",
             "out-of-range-color": "Out of range color",
+            "show-range-thresholds": "Show range thresholds",
+            "range-thresholds-settings": "Range thresholds settings",
             "fill-area": "Fill area",
-            "range-chart-card-style": "Range chart card style"
+            "fill-area-opacity": "Fill area opacity",
+            "range-chart-style": "Range chart style"
         },
         "rpc": {
             "value-settings": "Value settings",
@@ -6706,6 +6730,34 @@
             "table-tabs": "Table tabs",
             "show-cell-actions-menu-mobile": "Show cell actions dropdown menu in mobile mode"
         },
+        "echarts": {
+            "animation": {
+              "animation": "Animation",
+              "animation-threshold": "Animation threshold",
+              "animation-duration": "Animation duration",
+              "animation-easing": "Animation easing",
+              "animation-delay": "Animation delay",
+              "update-animation-duration": "Update animation duration",
+              "update-animation-easing": "Update animation easing",
+              "update-animation-delay": "Update animation delay"
+            }
+        },
+        "latest-chart": {
+            "total": "Total",
+            "auto-scale": "Auto scale",
+            "clockwise-layout": "Clockwise layout",
+            "sort-series": "Sort series by label",
+            "tooltip-value-type-absolute": "Absolute",
+            "tooltip-value-type-percentage": "Percentage"
+        },
+        "pie-chart": {
+            "label": "Label",
+            "label-position-outside": "Outside",
+            "label-position-inside": "Inside",
+            "border": "Border",
+            "radius": "Radius",
+            "pie-chart-card-style": "Pie chart card style"
+        },
         "time-series-chart": {
             "chart": "Chart",
             "chart-style": "Chart style",
@@ -6738,6 +6790,15 @@
             "bar-width": "Bar width",
             "bar-width-relative": "Percentage of time window",
             "bar-width-absolute": "Absolute (ms)",
+            "comparison": {
+              "comparison": "Comparison",
+              "show": "Show",
+              "settings": "Comparison settings",
+              "show-values-for-comparison": "Show historical data for comparison",
+              "comparison-values-label": "Comparison key label",
+              "comparison-values-label-auto": "Auto",
+              "comparison-data-color": "Comparison data color"
+            },
             "threshold": {
               "thresholds": "Thresholds",
               "source": "Source",
@@ -6769,13 +6830,34 @@
               "label-position-inside-middle-bottom": "Inside middle bottom",
               "label-position-inside-end": "Inside end",
               "label-position-inside-end-top": "Inside end top",
-              "label-position-inside-end-bottom": "Inside end bottom"
+              "label-position-inside-end-bottom": "Inside end bottom",
+              "label-background": "Label background"
+            },
+            "state": {
+              "states": "States",
+              "label": "Label",
+              "ticks-value": "Ticks value",
+              "source": "Source",
+              "value-range": "Value / Range",
+              "no-states": "No states configured",
+              "add-state": "Add state",
+              "type-constant": "Constant",
+              "type-range": "Range",
+              "from": "From",
+              "to": "To",
+              "remove-state": "Remove state"
+            },
+            "grid": {
+              "grid": "Grid",
+              "background-color": "Background color",
+              "border": "Border"
             },
             "axis": {
               "axes": "Axes",
               "x-axis": "X axis",
               "y-axis": "Y axis",
               "y-axis-settings": "Y axis settings",
+              "comparison-x-axis-settings": "Comparison X axis settings",
               "remove-y-axis": "Remove Y axis",
               "id": "Id",
               "label": "Label",
@@ -6786,6 +6868,7 @@
               "position-bottom": "Bottom",
               "tick-labels": "Tick labels",
               "ticks-formatter-function": "Ticks formatter function",
+              "ticks-generator-function": "Ticks generator function",
               "show-ticks": "Show ticks",
               "show-line": "Show line",
               "show-split-lines": "Show split lines",
@@ -6804,16 +6887,6 @@
               "show": "Show",
               "add-y-axis": "Add Y axis"
             },
-            "animation": {
-              "animation": "Animation",
-              "animation-threshold": "Animation threshold",
-              "animation-duration": "Animation duration",
-              "animation-easing": "Animation easing",
-              "animation-delay": "Animation delay",
-              "update-animation-duration": "Update animation duration",
-              "update-animation-easing": "Update animation easing",
-              "update-animation-delay": "Update animation delay"
-            },
             "series": {
               "legend-settings": "Legend settings",
               "show-in-legend": "Show in legend",
@@ -6850,6 +6923,7 @@
                 "show-points": "Show points",
                 "point-label": "Point label",
                 "point-label-hint": "Display label with value over the series point.",
+                "point-label-background": "Point label background",
                 "point-shape": "Point shape",
                 "point-size": "Point size"
               },
@@ -6858,7 +6932,8 @@
                 "border-width": "Border width",
                 "border-radius": "Border radius",
                 "label": "Label",
-                "label-hint": "Display label with value over the bar."
+                "label-hint": "Display label with value over the bar.",
+                "label-background": "Label background"
               }
             }
         },
@@ -7216,6 +7291,7 @@
     "language": {
         "language": "Language",
         "locales": {
+            "ar_AR": "اَلْعَرَبِيَّةُ",
             "ca_ES": "Catalan",
             "cs_CZ": "Česky",
             "da_DK": "Dansk",
diff --git a/ui-ngx/src/assets/locale/locale.constant-pl_PL.json b/ui-ngx/src/assets/locale/locale.constant-pl_PL.json
index bd6f60c0aa..118f8697da 100644
--- a/ui-ngx/src/assets/locale/locale.constant-pl_PL.json
+++ b/ui-ngx/src/assets/locale/locale.constant-pl_PL.json
@@ -6517,18 +6517,23 @@
         },
         "base-url-required": "Podstawowy adres URL jest wymagany."
     },
-    "widgets": {
-        "background": {
-            "background": "Background",
-            "background-settings": "Background settings",
-            "background-type-image": "Upload image",
-            "background-type-image-url": "Image URL",
-            "background-type-color": "Solid color",
-            "image-url": "Image URL",
-            "overlay": "Overlay",
-            "enable-overlay": "Enable overlay",
-            "blur": "Blur",
-            "preview": "Preview"
+    "widgets":{
+        "background":{
+            "background":"Tło",
+            "background-settings":"Ustawienia tła",
+            "background-type-image":"Obraz",
+            "background-type-color":"Kolor",
+            "image-url":"URL obrazu",
+            "overlay":"Nakładka",
+            "enable-overlay":"Włącz nakładkę",
+            "blur":"Rozmycie",
+            "preview":"Podgląd"
+        },
+        "bar-chart":{
+            "bar-appearance":"Wygląd słupka",
+            "label-on-bar":"Etykieta na słupku",
+            "value-on-bar":"Wartość na słupku",
+            "bar-chart-style":"Styl wykresu słupkowego"
         },
         "battery-level": {
             "layout": "Layout",
@@ -7211,18 +7216,26 @@
                 "false": "Dwukierunkowe",
                 "true": "Jednokierunkowa"
             },
-            "general-settings": "Ustawienia główne",
-            "enable-filter": "Włącz filtr",
-            "enable-sticky-header": "Wyświetlaj nagłówek podczas przewijania",
-            "enable-sticky-action": "Wyświetlaj kolumnę działań podczas przewijania",
-            "display-request-details": "Wyświetl szczegóły żądania",
-            "allow-send-request": "Zezwalaj na wysyłanie żądania RPC",
-            "allow-delete-request": "Zezwól na żądanie usunięcia",
-            "columns-settings": "Ustawienia kolumn",
-            "display-columns": "Kolumny do wyświetlenia",
-            "column": "Kolumna",
-            "no-columns-found": "Nie znaleziono kolumn",
-            "no-columns-matching": "Nie znaleziono kolumny '{{column}}'."
+            "general-settings":"Ustawienia ogólne",
+            "enable-filter":"Włącz filtr",
+            "enable-sticky-header":"Wyświetl nagłówek podczas przewijania",
+            "enable-sticky-action":"Wyświetl kolumnę akcji podczas przewijania",
+            "display-request-details":"Wyświetl szczegóły żądania",
+            "allow-send-request":"Zezwalaj na wysyłanie żądań RPC",
+            "allow-delete-request":"Zezwalaj na usuwanie żądań",
+            "columns-settings":"Ustawienia kolumn",
+            "display-columns":"Wyświetlane kolumny",
+            "column":"Kolumna",
+            "no-columns-found":"Nie znaleziono kolumn",
+            "no-columns-matching":"'{{column}}' nie znaleziono."
+        },
+        "range-chart":{
+            "chart":"Wykres",
+            "data-zoom":"Powiększenie danych",
+            "range-colors":"Kolory zakresu",
+            "out-of-range-color":"Kolor poza zakresem",
+            "fill-area":"Wypełnij obszar",
+            "range-chart-style":"Styl wykresu zakresu"
         },
         "rpc": {
             "value-settings": "Ustawienia wartości",
diff --git a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
index fdc0274cdf..886151fdf2 100644
--- a/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
+++ b/ui-ngx/src/assets/locale/locale.constant-zh_CN.json
@@ -5491,7 +5491,7 @@
             "range-colors": "范围颜色",
             "out-of-range-color": "超出范围颜色",
             "fill-area": "填充区域",
-            "range-chart-card-style": "范围图表卡片样式"
+            "range-chart-style": "范围图样式"
         },
         "rpc": {
             "value-settings": "值设置",
diff --git a/ui-ngx/src/assets/widget/status-widget/center-layout.svg b/ui-ngx/src/assets/widget/status-widget/center-layout.svg
new file mode 100644
index 0000000000..27e174a619
--- /dev/null
+++ b/ui-ngx/src/assets/widget/status-widget/center-layout.svg
@@ -0,0 +1,20 @@
+<svg width="146" height="143" viewBox="0 0 146 143" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_5952_143934)">
+<rect x="11" y="7" width="124" height="124" rx="4" fill="#3F52DD"/>
+<path d="M85.3719 42.3776H60.6282V40.1282H85.3719V42.3776ZM61.7529 63.7472H66.2518C66.2518 60.3731 64.0023 58.1236 64.0023 58.1236C70.7506 53.6248 71.8753 43.5023 71.8753 43.5023H61.7529V63.7472ZM84.2472 43.5023H74.1248C74.1248 43.5023 75.2495 53.6248 81.9978 58.1236C81.9978 58.1236 79.7484 60.3731 79.7484 63.7472H84.2472V43.5023Z" fill="white"/>
+<path d="M59.9715 93.0374V93.3772C59.9715 93.8756 59.905 94.3241 59.7721 94.7228C59.6392 95.1185 59.4505 95.4553 59.2058 95.7332C58.9611 96.0111 58.6697 96.224 58.3314 96.372C57.9931 96.52 57.617 96.594 57.2032 96.594C56.7955 96.594 56.4209 96.52 56.0796 96.372C55.7413 96.224 55.4483 96.0111 55.2006 95.7332C54.953 95.4553 54.7612 95.1185 54.6252 94.7228C54.4893 94.3241 54.4214 93.8756 54.4214 93.3772V93.0374C54.4214 92.536 54.4893 92.0875 54.6252 91.6918C54.7612 91.2961 54.9515 90.9593 55.1961 90.6814C55.4408 90.4005 55.7322 90.1861 56.0705 90.0381C56.4119 89.8901 56.7864 89.8161 57.1942 89.8161C57.608 89.8161 57.984 89.8901 58.3223 90.0381C58.6606 90.1861 58.9521 90.4005 59.1967 90.6814C59.4444 90.9593 59.6347 91.2961 59.7676 91.6918C59.9035 92.0875 59.9715 92.536 59.9715 93.0374ZM58.7119 93.3772V93.0284C58.7119 92.6689 58.6787 92.3533 58.6123 92.0814C58.5458 91.8066 58.4477 91.5755 58.3178 91.3882C58.1879 91.201 58.0278 91.0605 57.8375 90.9669C57.6472 90.8702 57.4328 90.8219 57.1942 90.8219C56.9525 90.8219 56.7381 90.8702 56.5508 90.9669C56.3665 91.0605 56.2095 91.201 56.0796 91.3882C55.9497 91.5755 55.85 91.8066 55.7806 92.0814C55.7141 92.3533 55.6809 92.6689 55.6809 93.0284V93.3772C55.6809 93.7336 55.7141 94.0493 55.7806 94.3241C55.85 94.599 55.9497 94.8316 56.0796 95.0219C56.2125 95.2091 56.3726 95.3511 56.5599 95.4478C56.7471 95.5444 56.9616 95.5927 57.2032 95.5927C57.4449 95.5927 57.6593 95.5444 57.8466 95.4478C58.0338 95.3511 58.1909 95.2091 58.3178 95.0219C58.4477 94.8316 58.5458 94.599 58.6123 94.3241C58.6787 94.0493 58.7119 93.7336 58.7119 93.3772ZM63.9861 94.0976H62.2871V93.119H63.9861C64.264 93.119 64.489 93.0737 64.6612 92.983C64.8364 92.8894 64.9648 92.7626 65.0463 92.6025C65.1279 92.4394 65.1686 92.2536 65.1686 92.0452C65.1686 91.8428 65.1279 91.654 65.0463 91.4789C64.9648 91.3037 64.8364 91.1617 64.6612 91.053C64.489 90.9442 64.264 90.8899 63.9861 90.8899H62.6949V96.5034H61.4489V89.9067H63.9861C64.4996 89.9067 64.9376 89.9988 65.3 90.1831C65.6655 90.3643 65.9434 90.6165 66.1337 90.9397C66.327 91.2599 66.4236 91.6253 66.4236 92.0361C66.4236 92.462 66.327 92.829 66.1337 93.1371C65.9434 93.4452 65.6655 93.6823 65.3 93.8484C64.9376 94.0145 64.4996 94.0976 63.9861 94.0976ZM72.1962 95.5248V96.5034H68.6894V95.5248H72.1962ZM69.07 89.9067V96.5034H67.824V89.9067H69.07ZM71.7386 92.6297V93.5856H68.6894V92.6297H71.7386ZM72.1826 89.9067V90.8899H68.6894V89.9067H72.1826ZM78.7843 89.9067V96.5034H77.5338L74.7293 91.9274V96.5034H73.4833V89.9067H74.7293L77.5428 94.4872V89.9067H78.7843ZM84.8468 95.5248V96.5034H81.34V95.5248H84.8468ZM81.7206 89.9067V96.5034H80.4746V89.9067H81.7206ZM84.3892 92.6297V93.5856H81.34V92.6297H84.3892ZM84.8332 89.9067V90.8899H81.34V89.9067H84.8332ZM88.1048 96.5034H86.6821L86.6912 95.5248H88.1048C88.4884 95.5248 88.8101 95.4402 89.0698 95.2711C89.3296 95.0989 89.5259 94.8527 89.6588 94.5326C89.7917 94.2094 89.8582 93.8227 89.8582 93.3727V93.0329C89.8582 92.6855 89.8204 92.379 89.7449 92.1132C89.6694 91.8473 89.5576 91.6238 89.4096 91.4426C89.2646 91.2614 89.0849 91.1239 88.8705 91.0303C88.656 90.9367 88.4098 90.8899 88.132 90.8899H86.6549V89.9067H88.132C88.573 89.9067 88.9747 89.9807 89.3371 90.1287C89.7026 90.2767 90.0183 90.4896 90.2841 90.7675C90.5529 91.0424 90.7583 91.3716 90.9002 91.7552C91.0452 92.1388 91.1177 92.5677 91.1177 93.0419V93.3727C91.1177 93.8439 91.0452 94.2728 90.9002 94.6594C90.7583 95.043 90.5529 95.3722 90.2841 95.6471C90.0183 95.922 89.7011 96.1334 89.3326 96.2814C88.9641 96.4294 88.5548 96.5034 88.1048 96.5034ZM87.3799 89.9067V96.5034H86.1339V89.9067H87.3799Z" fill="white" fill-opacity="0.8"/>
+<path d="M30.9681 111.887L32.4014 106.307H33.1527L33.0687 107.745L31.5365 113.503H30.7556L30.9681 111.887ZM29.8955 106.307L31.0571 111.843L31.1609 113.503H30.3305L28.6648 106.307H29.8955ZM34.7788 111.828L35.9255 106.307H37.1612L35.4955 113.503H34.6652L34.7788 111.828ZM33.4443 106.307L34.8629 111.902L35.0705 113.503H34.2895L32.782 107.745L32.7029 106.307H33.4443ZM39.4479 108.156V113.503H38.2518V108.156H39.4479ZM38.1728 106.752C38.1728 106.571 38.2321 106.421 38.3507 106.302C38.4726 106.18 38.6407 106.119 38.8548 106.119C39.0657 106.119 39.2321 106.18 39.354 106.302C39.476 106.421 39.5369 106.571 39.5369 106.752C39.5369 106.93 39.476 107.078 39.354 107.197C39.2321 107.315 39.0657 107.375 38.8548 107.375C38.6407 107.375 38.4726 107.315 38.3507 107.197C38.2321 107.078 38.1728 106.93 38.1728 106.752ZM42.145 109.297V113.503H40.9538V108.156H42.0758L42.145 109.297ZM41.9324 110.632L41.5469 110.627C41.5502 110.248 41.6029 109.9 41.7051 109.584C41.8105 109.268 41.9555 108.996 42.14 108.768C42.3278 108.541 42.5519 108.366 42.8122 108.244C43.0725 108.119 43.3625 108.057 43.6821 108.057C43.9391 108.057 44.1714 108.093 44.379 108.165C44.5899 108.235 44.7695 108.348 44.9178 108.506C45.0693 108.665 45.1847 108.871 45.2637 109.124C45.3428 109.375 45.3824 109.683 45.3824 110.049V113.503H44.1863V110.044C44.1863 109.787 44.1484 109.584 44.0726 109.436C44.0001 109.284 43.893 109.177 43.7513 109.114C43.6129 109.048 43.4399 109.016 43.2323 109.016C43.028 109.016 42.8452 109.058 42.6837 109.144C42.5222 109.23 42.3855 109.347 42.2735 109.495C42.1647 109.643 42.0807 109.815 42.0214 110.009C41.9621 110.203 41.9324 110.411 41.9324 110.632ZM50.0712 112.396V105.912H51.2674V113.503H50.1849L50.0712 112.396ZM46.5917 110.889V110.785C46.5917 110.38 46.6394 110.011 46.735 109.678C46.8305 109.342 46.9689 109.053 47.1502 108.813C47.3314 108.569 47.5522 108.383 47.8125 108.254C48.0728 108.123 48.3661 108.057 48.6923 108.057C49.0152 108.057 49.2986 108.119 49.5424 108.244C49.7862 108.37 49.9938 108.549 50.1652 108.783C50.3365 109.014 50.4732 109.291 50.5754 109.614C50.6775 109.933 50.75 110.289 50.7929 110.681V111.012C50.75 111.395 50.6775 111.744 50.5754 112.06C50.4732 112.377 50.3365 112.65 50.1652 112.881C49.9938 113.111 49.7846 113.289 49.5374 113.414C49.2936 113.54 49.0086 113.602 48.6824 113.602C48.3595 113.602 48.0678 113.535 47.8075 113.4C47.5505 113.265 47.3314 113.075 47.1502 112.831C46.9689 112.587 46.8305 112.301 46.735 111.971C46.6394 111.638 46.5917 111.278 46.5917 110.889ZM47.7828 110.785V110.889C47.7828 111.133 47.8042 111.36 47.8471 111.571C47.8932 111.782 47.9641 111.968 48.0596 112.129C48.1552 112.288 48.2787 112.413 48.4303 112.505C48.5852 112.594 48.7697 112.638 48.9839 112.638C49.2541 112.638 49.4765 112.579 49.6511 112.461C49.8258 112.342 49.9625 112.182 50.0614 111.981C50.1635 111.777 50.2327 111.549 50.269 111.299V110.404C50.2492 110.21 50.208 110.029 50.1454 109.861C50.0861 109.693 50.0053 109.546 49.9032 109.421C49.8011 109.292 49.6742 109.193 49.5226 109.124C49.3743 109.052 49.1981 109.016 48.9938 109.016C48.7763 109.016 48.5918 109.062 48.4402 109.154C48.2886 109.246 48.1634 109.373 48.0646 109.535C47.969 109.696 47.8982 109.884 47.852 110.098C47.8059 110.312 47.7828 110.541 47.7828 110.785ZM52.4964 110.889V110.775C52.4964 110.39 52.5524 110.032 52.6645 109.703C52.7765 109.37 52.938 109.081 53.1488 108.838C53.363 108.59 53.6233 108.399 53.9298 108.264C54.2395 108.126 54.5888 108.057 54.9776 108.057C55.3697 108.057 55.719 108.126 56.0254 108.264C56.3352 108.399 56.5971 108.59 56.8113 108.838C57.0255 109.081 57.1886 109.37 57.3006 109.703C57.4127 110.032 57.4687 110.39 57.4687 110.775V110.889C57.4687 111.274 57.4127 111.632 57.3006 111.961C57.1886 112.291 57.0255 112.579 56.8113 112.826C56.5971 113.07 56.3368 113.261 56.0304 113.4C55.7239 113.535 55.3763 113.602 54.9875 113.602C54.5954 113.602 54.2445 113.535 53.9347 113.4C53.6283 113.261 53.368 113.07 53.1538 112.826C52.9396 112.579 52.7765 112.291 52.6645 111.961C52.5524 111.632 52.4964 111.274 52.4964 110.889ZM53.6876 110.775V110.889C53.6876 111.129 53.7123 111.357 53.7617 111.571C53.8112 111.785 53.8886 111.973 53.994 112.134C54.0995 112.296 54.2346 112.423 54.3993 112.515C54.5641 112.607 54.7601 112.653 54.9875 112.653C55.2083 112.653 55.3994 112.607 55.5608 112.515C55.7256 112.423 55.8607 112.296 55.9661 112.134C56.0716 111.973 56.149 111.785 56.1984 111.571C56.2511 111.357 56.2775 111.129 56.2775 110.889V110.775C56.2775 110.538 56.2511 110.314 56.1984 110.103C56.149 109.889 56.0699 109.699 55.9612 109.535C55.8557 109.37 55.7206 109.241 55.5559 109.149C55.3944 109.053 55.2017 109.006 54.9776 109.006C54.7535 109.006 54.5591 109.053 54.3944 109.149C54.2329 109.241 54.0995 109.37 53.994 109.535C53.8886 109.699 53.8112 109.889 53.7617 110.103C53.7123 110.314 53.6876 110.538 53.6876 110.775ZM60.1311 112.317L61.3667 108.156H62.1279L61.9203 109.401L60.6748 113.503H59.9927L60.1311 112.317ZM59.4045 108.156L60.3683 112.337L60.4474 113.503H59.6863L58.2381 108.156H59.4045ZM63.2845 112.288L64.2186 108.156H65.3801L63.9369 113.503H63.1757L63.2845 112.288ZM62.2564 108.156L63.4772 112.268L63.6305 113.503H62.9484L61.688 109.396L61.4804 108.156H62.2564ZM70.4084 105.912V113.503H69.2123V105.912H70.4084ZM74.2818 113.602C73.8864 113.602 73.5288 113.538 73.2092 113.41C72.8929 113.278 72.6227 113.095 72.3986 112.861C72.1779 112.627 72.0082 112.352 71.8895 112.035C71.7709 111.719 71.7116 111.378 71.7116 111.012V110.815C71.7116 110.396 71.7726 110.017 71.8945 109.678C72.0164 109.338 72.1861 109.048 72.4036 108.808C72.621 108.564 72.8781 108.378 73.1746 108.249C73.4712 108.121 73.7924 108.057 74.1384 108.057C74.5207 108.057 74.8551 108.121 75.1418 108.249C75.4284 108.378 75.6657 108.559 75.8535 108.793C76.0446 109.024 76.1863 109.299 76.2786 109.619C76.3741 109.938 76.4219 110.291 76.4219 110.676V111.185H72.2899V110.33H75.2456V110.236C75.239 110.022 75.1961 109.821 75.1171 109.633C75.0413 109.446 74.9243 109.294 74.7661 109.179C74.608 109.063 74.3971 109.006 74.1335 109.006C73.9358 109.006 73.7595 109.048 73.6046 109.134C73.4531 109.217 73.3262 109.337 73.224 109.495C73.1219 109.653 73.0428 109.844 72.9868 110.068C72.9341 110.289 72.9077 110.538 72.9077 110.815V111.012C72.9077 111.246 72.939 111.464 73.0016 111.665C73.0675 111.862 73.1631 112.035 73.2883 112.184C73.4135 112.332 73.5651 112.449 73.743 112.535C73.921 112.617 74.1236 112.658 74.351 112.658C74.6376 112.658 74.893 112.601 75.1171 112.485C75.3411 112.37 75.5355 112.207 75.7003 111.996L76.328 112.604C76.2127 112.772 76.0627 112.933 75.8782 113.088C75.6937 113.24 75.468 113.363 75.2011 113.459C74.9375 113.554 74.631 113.602 74.2818 113.602ZM79.1733 113.503H77.9821V107.641C77.9821 107.243 78.0563 106.908 78.2045 106.638C78.3561 106.365 78.5719 106.159 78.852 106.02C79.1321 105.879 79.4633 105.808 79.8455 105.808C79.9641 105.808 80.0811 105.816 80.1964 105.832C80.3117 105.846 80.4238 105.867 80.5325 105.897L80.5029 106.816C80.4369 106.8 80.3645 106.788 80.2854 106.781C80.2096 106.775 80.1272 106.772 80.0382 106.772C79.857 106.772 79.7005 106.806 79.5687 106.875C79.4402 106.941 79.3413 107.038 79.2721 107.167C79.2062 107.296 79.1733 107.454 79.1733 107.641V113.503ZM80.2755 108.156V109.025H77.1617V108.156H80.2755ZM83.8029 108.156V109.025H80.7879V108.156H83.8029ZM81.6578 106.846H82.8489V112.026C82.8489 112.19 82.872 112.317 82.9181 112.406C82.9676 112.492 83.0351 112.549 83.1208 112.579C83.2065 112.609 83.307 112.624 83.4223 112.624C83.5047 112.624 83.5837 112.619 83.6595 112.609C83.7353 112.599 83.7963 112.589 83.8424 112.579L83.8473 113.489C83.7485 113.518 83.6332 113.545 83.5014 113.568C83.3729 113.591 83.2246 113.602 83.0565 113.602C82.783 113.602 82.5408 113.554 82.33 113.459C82.1191 113.36 81.9543 113.2 81.8357 112.98C81.7171 112.759 81.6578 112.465 81.6578 112.1V106.846ZM89.8493 112.653C90.0437 112.653 90.2184 112.615 90.3732 112.54C90.5314 112.461 90.6582 112.352 90.7538 112.213C90.8527 112.075 90.907 111.915 90.9169 111.734H92.0389C92.0323 112.08 91.9301 112.395 91.7324 112.678C91.5347 112.961 91.2728 113.187 90.9466 113.355C90.6204 113.52 90.2595 113.602 89.8641 113.602C89.4555 113.602 89.0997 113.533 88.7965 113.395C88.4934 113.253 88.2413 113.059 88.0403 112.811C87.8393 112.564 87.6877 112.279 87.5856 111.956C87.4867 111.633 87.4373 111.287 87.4373 110.918V110.745C87.4373 110.376 87.4867 110.03 87.5856 109.707C87.6877 109.381 87.8393 109.095 88.0403 108.847C88.2413 108.6 88.4934 108.408 88.7965 108.269C89.0997 108.128 89.4539 108.057 89.8592 108.057C90.2876 108.057 90.6632 108.142 90.9861 108.314C91.309 108.482 91.5627 108.717 91.7473 109.02C91.9351 109.32 92.0323 109.67 92.0389 110.068H90.9169C90.907 109.871 90.8576 109.693 90.7686 109.535C90.683 109.373 90.561 109.245 90.4029 109.149C90.248 109.053 90.0618 109.006 89.8444 109.006C89.6038 109.006 89.4045 109.055 89.2463 109.154C89.0881 109.249 88.9646 109.381 88.8756 109.549C88.7866 109.714 88.7224 109.9 88.6829 110.108C88.6466 110.312 88.6285 110.525 88.6285 110.745V110.918C88.6285 111.139 88.6466 111.353 88.6829 111.561C88.7191 111.769 88.7817 111.955 88.8707 112.119C88.9629 112.281 89.0881 112.411 89.2463 112.51C89.4045 112.606 89.6055 112.653 89.8493 112.653ZM92.9368 110.889V110.775C92.9368 110.39 92.9928 110.032 93.1048 109.703C93.2169 109.37 93.3783 109.081 93.5892 108.838C93.8034 108.59 94.0637 108.399 94.3701 108.264C94.6799 108.126 95.0292 108.057 95.418 108.057C95.8101 108.057 96.1594 108.126 96.4658 108.264C96.7755 108.399 97.0375 108.59 97.2517 108.838C97.4659 109.081 97.629 109.37 97.741 109.703C97.853 110.032 97.9091 110.39 97.9091 110.775V110.889C97.9091 111.274 97.853 111.632 97.741 111.961C97.629 112.291 97.4659 112.579 97.2517 112.826C97.0375 113.07 96.7772 113.261 96.4708 113.4C96.1643 113.535 95.8167 113.602 95.4279 113.602C95.0358 113.602 94.6848 113.535 94.3751 113.4C94.0686 113.261 93.8083 113.07 93.5942 112.826C93.38 112.579 93.2169 112.291 93.1048 111.961C92.9928 111.632 92.9368 111.274 92.9368 110.889ZM94.128 110.775V110.889C94.128 111.129 94.1527 111.357 94.2021 111.571C94.2515 111.785 94.329 111.973 94.4344 112.134C94.5398 112.296 94.6749 112.423 94.8397 112.515C95.0044 112.607 95.2005 112.653 95.4279 112.653C95.6486 112.653 95.8397 112.607 96.0012 112.515C96.166 112.423 96.3011 112.296 96.4065 112.134C96.5119 111.973 96.5894 111.785 96.6388 111.571C96.6915 111.357 96.7179 111.129 96.7179 110.889V110.775C96.7179 110.538 96.6915 110.314 96.6388 110.103C96.5894 109.889 96.5103 109.699 96.4016 109.535C96.2961 109.37 96.161 109.241 95.9963 109.149C95.8348 109.053 95.642 109.006 95.418 109.006C95.1939 109.006 94.9995 109.053 94.8348 109.149C94.6733 109.241 94.5398 109.37 94.4344 109.535C94.329 109.699 94.2515 109.889 94.2021 110.103C94.1527 110.314 94.128 110.538 94.128 110.775ZM100.314 109.174V113.503H99.1233V108.156H100.26L100.314 109.174ZM101.95 108.121L101.941 109.228C101.868 109.215 101.789 109.205 101.703 109.198C101.621 109.192 101.539 109.189 101.456 109.189C101.252 109.189 101.072 109.218 100.917 109.277C100.763 109.334 100.632 109.416 100.527 109.525C100.425 109.63 100.346 109.759 100.29 109.91C100.234 110.062 100.201 110.231 100.191 110.419L99.919 110.439C99.919 110.103 99.952 109.792 100.018 109.505C100.084 109.218 100.183 108.966 100.314 108.749C100.45 108.531 100.618 108.361 100.819 108.24C101.023 108.118 101.258 108.057 101.525 108.057C101.598 108.057 101.675 108.063 101.758 108.076C101.843 108.09 101.908 108.104 101.95 108.121ZM104.089 109.297V113.503H102.898V108.156H104.02L104.089 109.297ZM103.876 110.632L103.491 110.627C103.494 110.248 103.547 109.9 103.649 109.584C103.754 109.268 103.899 108.996 104.084 108.768C104.272 108.541 104.496 108.366 104.756 108.244C105.017 108.119 105.306 108.057 105.626 108.057C105.883 108.057 106.115 108.093 106.323 108.165C106.534 108.235 106.713 108.348 106.862 108.506C107.013 108.665 107.129 108.871 107.208 109.124C107.287 109.375 107.326 109.683 107.326 110.049V113.503H106.13V110.044C106.13 109.787 106.092 109.584 106.017 109.436C105.944 109.284 105.837 109.177 105.695 109.114C105.557 109.048 105.384 109.016 105.176 109.016C104.972 109.016 104.789 109.058 104.628 109.144C104.466 109.23 104.329 109.347 104.217 109.495C104.109 109.643 104.025 109.815 103.965 110.009C103.906 110.203 103.876 110.411 103.876 110.632ZM111.111 113.602C110.715 113.602 110.358 113.538 110.038 113.41C109.722 113.278 109.452 113.095 109.228 112.861C109.007 112.627 108.837 112.352 108.719 112.035C108.6 111.719 108.541 111.378 108.541 111.012V110.815C108.541 110.396 108.602 110.017 108.723 109.678C108.845 109.338 109.015 109.048 109.233 108.808C109.45 108.564 109.707 108.378 110.004 108.249C110.3 108.121 110.621 108.057 110.967 108.057C111.35 108.057 111.684 108.121 111.971 108.249C112.257 108.378 112.495 108.559 112.682 108.793C112.874 109.024 113.015 109.299 113.108 109.619C113.203 109.938 113.251 110.291 113.251 110.676V111.185H109.119V110.33H112.075V110.236C112.068 110.022 112.025 109.821 111.946 109.633C111.87 109.446 111.753 109.294 111.595 109.179C111.437 109.063 111.226 109.006 110.962 109.006C110.765 109.006 110.588 109.048 110.434 109.134C110.282 109.217 110.155 109.337 110.053 109.495C109.951 109.653 109.872 109.844 109.816 110.068C109.763 110.289 109.737 110.538 109.737 110.815V111.012C109.737 111.246 109.768 111.464 109.831 111.665C109.896 111.862 109.992 112.035 110.117 112.184C110.242 112.332 110.394 112.449 110.572 112.535C110.75 112.617 110.953 112.658 111.18 112.658C111.467 112.658 111.722 112.601 111.946 112.485C112.17 112.37 112.365 112.207 112.529 111.996L113.157 112.604C113.042 112.772 112.892 112.933 112.707 113.088C112.523 113.24 112.297 113.363 112.03 113.459C111.766 113.554 111.46 113.602 111.111 113.602ZM115.587 109.174V113.503H114.396V108.156H115.533L115.587 109.174ZM117.223 108.121L117.213 109.228C117.141 109.215 117.062 109.205 116.976 109.198C116.894 109.192 116.811 109.189 116.729 109.189C116.525 109.189 116.345 109.218 116.19 109.277C116.035 109.334 115.905 109.416 115.8 109.525C115.697 109.63 115.618 109.759 115.562 109.91C115.506 110.062 115.473 110.231 115.464 110.419L115.192 110.439C115.192 110.103 115.225 109.792 115.291 109.505C115.356 109.218 115.455 108.966 115.587 108.749C115.722 108.531 115.89 108.361 116.091 108.24C116.296 108.118 116.531 108.057 116.798 108.057C116.871 108.057 116.948 108.063 117.03 108.076C117.116 108.09 117.18 108.104 117.223 108.121Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_5952_143934" x="0.877551" y="0.251701" width="144.245" height="144.245" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="3.37415"/>
+<feGaussianBlur stdDeviation="5.06122"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.06 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_5952_143934"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_5952_143934" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/ui-ngx/src/assets/widget/status-widget/default-layout.svg b/ui-ngx/src/assets/widget/status-widget/default-layout.svg
new file mode 100644
index 0000000000..08cb74e595
--- /dev/null
+++ b/ui-ngx/src/assets/widget/status-widget/default-layout.svg
@@ -0,0 +1,20 @@
+<svg width="145" height="143" viewBox="0 0 145 143" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_5952_143928)">
+<rect x="10.3334" y="7" width="124" height="124" rx="4" fill="#3F52DD"/>
+<path d="M49.6985 23.8707H24.9547V21.6213H49.6985V23.8707ZM26.0794 45.2403H30.5783C30.5783 41.8662 28.3289 39.6167 28.3289 39.6167C35.0772 35.1179 36.2019 24.9954 36.2019 24.9954H26.0794V45.2403ZM48.5738 24.9954H38.4513C38.4513 24.9954 39.576 35.1179 46.3243 39.6167C46.3243 39.6167 44.0749 41.8662 44.0749 45.2403H48.5738V24.9954Z" fill="white"/>
+<path d="M26.3655 94.8872L27.7989 89.307H28.5501L28.4661 90.7453L26.9339 96.5034H26.153L26.3655 94.8872ZM25.293 89.307L26.4545 94.8427L26.5583 96.5034H25.7279L24.0623 89.307H25.293ZM30.1763 94.8279L31.3229 89.307H32.5586L30.8929 96.5034H30.0626L30.1763 94.8279ZM28.8418 89.307L30.2603 94.902L30.4679 96.5034H29.6869L28.1794 90.7453L28.1004 89.307H28.8418ZM34.8454 91.1555V96.5034H33.6493V91.1555H34.8454ZM33.5702 89.7518C33.5702 89.5706 33.6295 89.4207 33.7481 89.302C33.87 89.1801 34.0381 89.1192 34.2523 89.1192C34.4631 89.1192 34.6295 89.1801 34.7515 89.302C34.8734 89.4207 34.9343 89.5706 34.9343 89.7518C34.9343 89.9298 34.8734 90.078 34.7515 90.1967C34.6295 90.3153 34.4631 90.3746 34.2523 90.3746C34.0381 90.3746 33.87 90.3153 33.7481 90.1967C33.6295 90.078 33.5702 89.9298 33.5702 89.7518ZM37.5424 92.2973V96.5034H36.3512V91.1555H37.4732L37.5424 92.2973ZM37.3299 93.6318L36.9443 93.6268C36.9476 93.2479 37.0003 92.9003 37.1025 92.5839C37.2079 92.2676 37.3529 91.9958 37.5374 91.7684C37.7253 91.541 37.9493 91.3664 38.2096 91.2445C38.4699 91.1193 38.7599 91.0567 39.0795 91.0567C39.3365 91.0567 39.5688 91.0929 39.7764 91.1654C39.9873 91.2346 40.1669 91.3483 40.3152 91.5064C40.4668 91.6646 40.5821 91.8706 40.6612 92.1243C40.7402 92.3747 40.7798 92.6828 40.7798 93.0485V96.5034H39.5837V93.0436C39.5837 92.7866 39.5458 92.5839 39.47 92.4357C39.3975 92.2841 39.2904 92.177 39.1487 92.1144C39.0103 92.0485 38.8373 92.0155 38.6298 92.0155C38.4255 92.0155 38.2426 92.0584 38.0811 92.144C37.9197 92.2297 37.7829 92.3467 37.6709 92.495C37.5622 92.6432 37.4781 92.8146 37.4188 93.009C37.3595 93.2034 37.3299 93.411 37.3299 93.6318ZM45.4687 95.3963V88.9116H46.6648V96.5034H45.5823L45.4687 95.3963ZM41.9891 93.8888V93.785C41.9891 93.3797 42.0369 93.0106 42.1324 92.6778C42.228 92.3417 42.3664 92.0534 42.5476 91.8129C42.7288 91.5691 42.9496 91.3829 43.2099 91.2544C43.4702 91.1226 43.7635 91.0567 44.0897 91.0567C44.4126 91.0567 44.696 91.1193 44.9398 91.2445C45.1836 91.3697 45.3912 91.5493 45.5626 91.7832C45.7339 92.0139 45.8707 92.2907 45.9728 92.6136C46.075 92.9332 46.1475 93.2891 46.1903 93.6812V94.0123C46.1475 94.3946 46.075 94.7439 45.9728 95.0602C45.8707 95.3765 45.7339 95.65 45.5626 95.8807C45.3912 96.1113 45.182 96.2892 44.9349 96.4145C44.691 96.5397 44.406 96.6023 44.0798 96.6023C43.7569 96.6023 43.4653 96.5347 43.205 96.3996C42.9479 96.2645 42.7288 96.0751 42.5476 95.8312C42.3664 95.5874 42.228 95.3007 42.1324 94.9712C42.0369 94.6384 41.9891 94.2776 41.9891 93.8888ZM43.1802 93.785V93.8888C43.1802 94.1326 43.2017 94.36 43.2445 94.5709C43.2906 94.7817 43.3615 94.9679 43.457 95.1294C43.5526 95.2875 43.6762 95.4128 43.8277 95.505C43.9826 95.594 44.1671 95.6385 44.3813 95.6385C44.6515 95.6385 44.8739 95.5792 45.0485 95.4605C45.2232 95.3419 45.3599 95.1821 45.4588 94.9811C45.5609 94.7768 45.6301 94.5494 45.6664 94.299V93.4044C45.6466 93.21 45.6054 93.0288 45.5428 92.8607C45.4835 92.6927 45.4028 92.546 45.3006 92.4208C45.1985 92.2923 45.0716 92.1935 44.92 92.1243C44.7718 92.0518 44.5955 92.0155 44.3912 92.0155C44.1737 92.0155 43.9892 92.0617 43.8376 92.1539C43.686 92.2462 43.5608 92.3731 43.462 92.5345C43.3664 92.696 43.2956 92.8838 43.2494 93.098C43.2033 93.3121 43.1802 93.5412 43.1802 93.785ZM47.8938 93.8888V93.7751C47.8938 93.3896 47.9499 93.0321 48.0619 92.7026C48.1739 92.3698 48.3354 92.0814 48.5463 91.8376C48.7604 91.5905 49.0208 91.3994 49.3272 91.2643C49.6369 91.1259 49.9862 91.0567 50.375 91.0567C50.7671 91.0567 51.1164 91.1259 51.4229 91.2643C51.7326 91.3994 51.9945 91.5905 52.2087 91.8376C52.4229 92.0814 52.586 92.3698 52.698 92.7026C52.8101 93.0321 52.8661 93.3896 52.8661 93.7751V93.8888C52.8661 94.2743 52.8101 94.6318 52.698 94.9613C52.586 95.2908 52.4229 95.5792 52.2087 95.8263C51.9945 96.0701 51.7342 96.2612 51.4278 96.3996C51.1214 96.5347 50.7737 96.6023 50.3849 96.6023C49.9928 96.6023 49.6419 96.5347 49.3321 96.3996C49.0257 96.2612 48.7654 96.0701 48.5512 95.8263C48.337 95.5792 48.1739 95.2908 48.0619 94.9613C47.9499 94.6318 47.8938 94.2743 47.8938 93.8888ZM49.085 93.7751V93.8888C49.085 94.1293 49.1097 94.3567 49.1591 94.5709C49.2086 94.785 49.286 94.9729 49.3914 95.1343C49.4969 95.2958 49.632 95.4226 49.7967 95.5149C49.9615 95.6072 50.1575 95.6533 50.3849 95.6533C50.6057 95.6533 50.7968 95.6072 50.9583 95.5149C51.123 95.4226 51.2581 95.2958 51.3635 95.1343C51.469 94.9729 51.5464 94.785 51.5958 94.5709C51.6486 94.3567 51.6749 94.1293 51.6749 93.8888V93.7751C51.6749 93.5379 51.6486 93.3138 51.5958 93.1029C51.5464 92.8887 51.4673 92.6993 51.3586 92.5345C51.2532 92.3698 51.1181 92.2412 50.9533 92.149C50.7918 92.0534 50.5991 92.0057 50.375 92.0057C50.151 92.0057 49.9565 92.0534 49.7918 92.149C49.6303 92.2412 49.4969 92.3698 49.3914 92.5345C49.286 92.6993 49.2086 92.8887 49.1591 93.1029C49.1097 93.3138 49.085 93.5379 49.085 93.7751ZM55.5285 95.3172L56.7642 91.1555H57.5253L57.3177 92.4011L56.0722 96.5034H55.3901L55.5285 95.3172ZM54.8019 91.1555L55.7658 95.337L55.8448 96.5034H55.0837L53.6355 91.1555H54.8019ZM58.6819 95.2875L59.616 91.1555H60.7776L59.3343 96.5034H58.5732L58.6819 95.2875ZM57.6538 91.1555L58.8747 95.2678L59.0279 96.5034H58.3458L57.0854 92.3961L56.8778 91.1555H57.6538ZM65.8058 88.9116V96.5034H64.6097V88.9116H65.8058ZM69.6792 96.6023C69.2838 96.6023 68.9263 96.538 68.6066 96.4095C68.2903 96.2777 68.0201 96.0948 67.796 95.8609C67.5753 95.6269 67.4056 95.3518 67.287 95.0355C67.1683 94.7191 67.109 94.3781 67.109 94.0123V93.8146C67.109 93.3962 67.17 93.0172 67.2919 92.6778C67.4138 92.3385 67.5835 92.0485 67.801 91.8079C68.0185 91.5641 68.2755 91.3779 68.572 91.2494C68.8686 91.1209 69.1899 91.0567 69.5358 91.0567C69.9181 91.0567 70.2525 91.1209 70.5392 91.2494C70.8259 91.3779 71.0631 91.5592 71.2509 91.7931C71.442 92.0238 71.5837 92.2989 71.676 92.6185C71.7715 92.9382 71.8193 93.2907 71.8193 93.6762V94.1853H67.6873V93.3303H70.643V93.2364C70.6364 93.0222 70.5936 92.8212 70.5145 92.6334C70.4387 92.4455 70.3217 92.294 70.1636 92.1786C70.0054 92.0633 69.7945 92.0057 69.5309 92.0057C69.3332 92.0057 69.1569 92.0485 69.002 92.1342C68.8505 92.2165 68.7236 92.3368 68.6215 92.495C68.5193 92.6531 68.4402 92.8442 68.3842 93.0683C68.3315 93.2891 68.3051 93.5379 68.3051 93.8146V94.0123C68.3051 94.2463 68.3364 94.4638 68.399 94.6648C68.4649 94.8625 68.5605 95.0355 68.6857 95.1837C68.8109 95.332 68.9625 95.449 69.1404 95.5347C69.3184 95.617 69.521 95.6582 69.7484 95.6582C70.035 95.6582 70.2904 95.6006 70.5145 95.4852C70.7385 95.3699 70.933 95.2068 71.0977 94.9959L71.7254 95.6039C71.6101 95.7719 71.4602 95.9334 71.2756 96.0882C71.0911 96.2398 70.8654 96.3634 70.5985 96.4589C70.3349 96.5545 70.0285 96.6023 69.6792 96.6023ZM74.5707 96.5034H73.3795V90.6415C73.3795 90.2428 73.4537 89.9083 73.602 89.6381C73.7535 89.3647 73.9694 89.1587 74.2494 89.0203C74.5295 88.8786 74.8607 88.8078 75.2429 88.8078C75.3615 88.8078 75.4785 88.816 75.5938 88.8325C75.7092 88.8457 75.8212 88.8671 75.9299 88.8968L75.9003 89.8161C75.8344 89.7996 75.7619 89.7881 75.6828 89.7815C75.607 89.7749 75.5246 89.7716 75.4357 89.7716C75.2544 89.7716 75.0979 89.8062 74.9661 89.8754C74.8376 89.9413 74.7388 90.0385 74.6696 90.167C74.6037 90.2955 74.5707 90.4537 74.5707 90.6415V96.5034ZM75.6729 91.1555V92.0254H72.5591V91.1555H75.6729ZM79.2003 91.1555V92.0254H76.1853V91.1555H79.2003ZM77.0552 89.8457H78.2464V95.0256C78.2464 95.1903 78.2694 95.3172 78.3156 95.4062C78.365 95.4918 78.4325 95.5495 78.5182 95.5792C78.6039 95.6088 78.7044 95.6236 78.8197 95.6236C78.9021 95.6236 78.9812 95.6187 79.0569 95.6088C79.1327 95.5989 79.1937 95.589 79.2398 95.5792L79.2448 96.4886C79.1459 96.5182 79.0306 96.5446 78.8988 96.5677C78.7703 96.5907 78.622 96.6023 78.4539 96.6023C78.1805 96.6023 77.9383 96.5545 77.7274 96.4589C77.5165 96.3601 77.3517 96.2003 77.2331 95.9795C77.1145 95.7587 77.0552 95.4655 77.0552 95.0997V89.8457ZM85.2467 95.6533C85.4411 95.6533 85.6158 95.6154 85.7706 95.5396C85.9288 95.4605 86.0557 95.3518 86.1512 95.2134C86.2501 95.075 86.3044 94.9152 86.3143 94.734H87.4363C87.4297 95.0799 87.3276 95.3946 87.1299 95.678C86.9322 95.9614 86.6702 96.1871 86.344 96.3551C86.0178 96.5199 85.657 96.6023 85.2616 96.6023C84.853 96.6023 84.4971 96.5331 84.194 96.3947C83.8908 96.253 83.6387 96.0586 83.4377 95.8115C83.2367 95.5643 83.0852 95.2793 82.983 94.9564C82.8842 94.6335 82.8347 94.2875 82.8347 93.9184V93.7454C82.8347 93.3764 82.8842 93.0304 82.983 92.7075C83.0852 92.3813 83.2367 92.0946 83.4377 91.8475C83.6387 91.6004 83.8908 91.4076 84.194 91.2692C84.4971 91.1275 84.8513 91.0567 85.2566 91.0567C85.685 91.0567 86.0606 91.1423 86.3835 91.3137C86.7064 91.4817 86.9602 91.7173 87.1447 92.0205C87.3325 92.3203 87.4297 92.6696 87.4363 93.0683H86.3143C86.3044 92.8706 86.255 92.6927 86.1661 92.5345C86.0804 92.3731 85.9585 92.2445 85.8003 92.149C85.6454 92.0534 85.4593 92.0057 85.2418 92.0057C85.0012 92.0057 84.8019 92.0551 84.6437 92.1539C84.4856 92.2495 84.362 92.3813 84.273 92.5493C84.1841 92.7141 84.1198 92.9003 84.0803 93.1079C84.044 93.3121 84.0259 93.5247 84.0259 93.7454V93.9184C84.0259 94.1392 84.044 94.3534 84.0803 94.561C84.1165 94.7686 84.1791 94.9547 84.2681 95.1195C84.3604 95.2809 84.4856 95.4111 84.6437 95.51C84.8019 95.6055 85.0029 95.6533 85.2467 95.6533ZM88.3342 93.8888V93.7751C88.3342 93.3896 88.3902 93.0321 88.5023 92.7026C88.6143 92.3698 88.7757 92.0814 88.9866 91.8376C89.2008 91.5905 89.4611 91.3994 89.7676 91.2643C90.0773 91.1259 90.4266 91.0567 90.8154 91.0567C91.2075 91.0567 91.5568 91.1259 91.8632 91.2643C92.173 91.3994 92.4349 91.5905 92.6491 91.8376C92.8633 92.0814 93.0264 92.3698 93.1384 92.7026C93.2504 93.0321 93.3065 93.3896 93.3065 93.7751V93.8888C93.3065 94.2743 93.2504 94.6318 93.1384 94.9613C93.0264 95.2908 92.8633 95.5792 92.6491 95.8263C92.4349 96.0701 92.1746 96.2612 91.8682 96.3996C91.5617 96.5347 91.2141 96.6023 90.8253 96.6023C90.4332 96.6023 90.0822 96.5347 89.7725 96.3996C89.4661 96.2612 89.2058 96.0701 88.9916 95.8263C88.7774 95.5792 88.6143 95.2908 88.5023 94.9613C88.3902 94.6318 88.3342 94.2743 88.3342 93.8888ZM89.5254 93.7751V93.8888C89.5254 94.1293 89.5501 94.3567 89.5995 94.5709C89.6489 94.785 89.7264 94.9729 89.8318 95.1343C89.9373 95.2958 90.0724 95.4226 90.2371 95.5149C90.4019 95.6072 90.5979 95.6533 90.8253 95.6533C91.046 95.6533 91.2372 95.6072 91.3986 95.5149C91.5634 95.4226 91.6985 95.2958 91.8039 95.1343C91.9094 94.9729 91.9868 94.785 92.0362 94.5709C92.0889 94.3567 92.1153 94.1293 92.1153 93.8888V93.7751C92.1153 93.5379 92.0889 93.3138 92.0362 93.1029C91.9868 92.8887 91.9077 92.6993 91.799 92.5345C91.6935 92.3698 91.5584 92.2412 91.3937 92.149C91.2322 92.0534 91.0395 92.0057 90.8154 92.0057C90.5913 92.0057 90.3969 92.0534 90.2322 92.149C90.0707 92.2412 89.9373 92.3698 89.8318 92.5345C89.7264 92.6993 89.6489 92.8887 89.5995 93.1029C89.5501 93.3138 89.5254 93.5379 89.5254 93.7751ZM95.7119 92.1737V96.5034H94.5207V91.1555H95.6575L95.7119 92.1737ZM97.3479 91.1209L97.338 92.2281C97.2655 92.2149 97.1864 92.205 97.1007 92.1984C97.0184 92.1918 96.936 92.1885 96.8536 92.1885C96.6493 92.1885 96.4697 92.2182 96.3149 92.2775C96.16 92.3335 96.0298 92.4159 95.9244 92.5246C95.8222 92.6301 95.7432 92.7586 95.6871 92.9101C95.6311 93.0617 95.5982 93.2314 95.5883 93.4192L95.3165 93.439C95.3165 93.1029 95.3494 92.7915 95.4153 92.5049C95.4812 92.2182 95.5801 91.9661 95.7119 91.7486C95.847 91.5312 96.015 91.3615 96.216 91.2395C96.4203 91.1176 96.6559 91.0567 96.9228 91.0567C96.9953 91.0567 97.0727 91.0633 97.1551 91.0764C97.2408 91.0896 97.305 91.1044 97.3479 91.1209ZM99.4864 92.2973V96.5034H98.2952V91.1555H99.4172L99.4864 92.2973ZM99.2738 93.6318L98.8883 93.6268C98.8916 93.2479 98.9443 92.9003 99.0465 92.5839C99.1519 92.2676 99.2969 91.9958 99.4814 91.7684C99.6692 91.541 99.8933 91.3664 100.154 91.2445C100.414 91.1193 100.704 91.0567 101.024 91.0567C101.281 91.0567 101.513 91.0929 101.72 91.1654C101.931 91.2346 102.111 91.3483 102.259 91.5064C102.411 91.6646 102.526 91.8706 102.605 92.1243C102.684 92.3747 102.724 92.6828 102.724 93.0485V96.5034H101.528V93.0436C101.528 92.7866 101.49 92.5839 101.414 92.4357C101.341 92.2841 101.234 92.177 101.093 92.1144C100.954 92.0485 100.781 92.0155 100.574 92.0155C100.369 92.0155 100.187 92.0584 100.025 92.144C99.8636 92.2297 99.7269 92.3467 99.6149 92.495C99.5061 92.6432 99.4221 92.8146 99.3628 93.009C99.3035 93.2034 99.2738 93.411 99.2738 93.6318ZM106.508 96.6023C106.113 96.6023 105.755 96.538 105.436 96.4095C105.119 96.2777 104.849 96.0948 104.625 95.8609C104.404 95.6269 104.235 95.3518 104.116 95.0355C103.997 94.7191 103.938 94.3781 103.938 94.0123V93.8146C103.938 93.3962 103.999 93.0172 104.121 92.6778C104.243 92.3385 104.412 92.0485 104.63 91.8079C104.847 91.5641 105.104 91.3779 105.401 91.2494C105.698 91.1209 106.019 91.0567 106.365 91.0567C106.747 91.0567 107.081 91.1209 107.368 91.2494C107.655 91.3779 107.892 91.5592 108.08 91.7931C108.271 92.0238 108.413 92.2989 108.505 92.6185C108.601 92.9382 108.648 93.2907 108.648 93.6762V94.1853H104.516V93.3303H107.472V93.2364C107.465 93.0222 107.423 92.8212 107.343 92.6334C107.268 92.4455 107.151 92.294 106.993 92.1786C106.834 92.0633 106.623 92.0057 106.36 92.0057C106.162 92.0057 105.986 92.0485 105.831 92.1342C105.679 92.2165 105.553 92.3368 105.45 92.495C105.348 92.6531 105.269 92.8442 105.213 93.0683C105.16 93.2891 105.134 93.5379 105.134 93.8146V94.0123C105.134 94.2463 105.165 94.4638 105.228 94.6648C105.294 94.8625 105.389 95.0355 105.515 95.1837C105.64 95.332 105.791 95.449 105.969 95.5347C106.147 95.617 106.35 95.6582 106.577 95.6582C106.864 95.6582 107.119 95.6006 107.343 95.4852C107.568 95.3699 107.762 95.2068 107.927 94.9959L108.554 95.6039C108.439 95.7719 108.289 95.9334 108.105 96.0882C107.92 96.2398 107.694 96.3634 107.427 96.4589C107.164 96.5545 106.857 96.6023 106.508 96.6023ZM110.985 92.1737V96.5034H109.793V91.1555H110.93L110.985 92.1737ZM112.621 91.1209L112.611 92.2281C112.538 92.2149 112.459 92.205 112.373 92.1984C112.291 92.1918 112.209 92.1885 112.126 92.1885C111.922 92.1885 111.742 92.2182 111.588 92.2775C111.433 92.3335 111.302 92.4159 111.197 92.5246C111.095 92.6301 111.016 92.7586 110.96 92.9101C110.904 93.0617 110.871 93.2314 110.861 93.4192L110.589 93.439C110.589 93.1029 110.622 92.7915 110.688 92.5049C110.754 92.2182 110.853 91.9661 110.985 91.7486C111.12 91.5312 111.288 91.3615 111.489 91.2395C111.693 91.1176 111.929 91.0567 112.195 91.0567C112.268 91.0567 112.345 91.0633 112.428 91.0764C112.513 91.0896 112.578 91.1044 112.621 91.1209Z" fill="white"/>
+<path d="M29.2215 108.34V108.67C29.2215 109.123 29.1625 109.529 29.0444 109.889C28.9263 110.249 28.7575 110.555 28.5378 110.807C28.3209 111.06 28.06 111.254 27.7552 111.388C27.4504 111.52 27.1127 111.586 26.742 111.586C26.374 111.586 26.0377 111.52 25.7329 111.388C25.4308 111.254 25.1686 111.06 24.9462 110.807C24.7237 110.555 24.5508 110.249 24.4272 109.889C24.3064 109.529 24.246 109.123 24.246 108.67V108.34C24.246 107.887 24.3064 107.482 24.4272 107.125C24.548 106.765 24.7183 106.459 24.9379 106.207C25.1603 105.951 25.4226 105.758 25.7246 105.626C26.0294 105.491 26.3658 105.424 26.7337 105.424C27.1044 105.424 27.4422 105.491 27.747 105.626C28.0518 105.758 28.314 105.951 28.5337 106.207C28.7533 106.459 28.9222 106.765 29.0403 107.125C29.1611 107.482 29.2215 107.887 29.2215 108.34ZM28.1877 108.67V108.332C28.1877 107.997 28.1547 107.702 28.0888 107.446C28.0257 107.188 27.9309 106.973 27.8046 106.8C27.6811 106.624 27.5287 106.492 27.3474 106.404C27.1662 106.314 26.9616 106.268 26.7337 106.268C26.5058 106.268 26.3026 106.314 26.1241 106.404C25.9457 106.492 25.7933 106.624 25.667 106.8C25.5434 106.973 25.4487 107.188 25.3828 107.446C25.3169 107.702 25.2839 107.997 25.2839 108.332V108.67C25.2839 109.005 25.3169 109.301 25.3828 109.559C25.4487 109.817 25.5448 110.036 25.6711 110.214C25.8001 110.39 25.9539 110.523 26.1324 110.614C26.3109 110.702 26.5141 110.746 26.742 110.746C26.9726 110.746 27.1772 110.702 27.3557 110.614C27.5342 110.523 27.6852 110.39 27.8088 110.214C27.9323 110.036 28.0257 109.817 28.0888 109.559C28.1547 109.301 28.1877 109.005 28.1877 108.67ZM32.9548 109.267H31.3938V108.447H32.9548C33.2267 108.447 33.4463 108.403 33.6138 108.315C33.7813 108.228 33.9035 108.107 33.9804 107.953C34.06 107.796 34.0999 107.618 34.0999 107.418C34.0999 107.228 34.06 107.051 33.9804 106.886C33.9035 106.719 33.7813 106.584 33.6138 106.483C33.4463 106.381 33.2267 106.33 32.9548 106.33H31.7109V111.503H30.6771V105.506H32.9548C33.4189 105.506 33.8129 105.589 34.1369 105.754C34.4637 105.916 34.7122 106.141 34.8824 106.429C35.0527 106.715 35.1378 107.041 35.1378 107.409C35.1378 107.796 35.0527 108.129 34.8824 108.406C34.7122 108.683 34.4637 108.896 34.1369 109.044C33.8129 109.193 33.4189 109.267 32.9548 109.267ZM40.4116 110.684V111.503H37.2277V110.684H40.4116ZM37.5201 105.506V111.503H36.4863V105.506H37.5201ZM39.9956 108.011V108.818H37.2277V108.011H39.9956ZM40.391 105.506V106.33H37.2277V105.506H40.391ZM46.4349 105.506V111.503H45.4011L42.7115 107.207V111.503H41.6777V105.506H42.7115L45.4094 109.811V105.506H46.4349ZM52.0135 110.684V111.503H48.8296V110.684H52.0135ZM49.1221 105.506V111.503H48.0882V105.506H49.1221ZM51.5975 108.011V108.818H48.8296V108.011H51.5975ZM51.9929 105.506V106.33H48.8296V105.506H51.9929ZM55.0219 111.503H53.7409L53.7492 110.684H55.0219C55.3926 110.684 55.7029 110.603 55.9527 110.441C56.2054 110.279 56.3948 110.047 56.5211 109.745C56.6502 109.443 56.7147 109.083 56.7147 108.666V108.34C56.7147 108.016 56.6777 107.729 56.6035 107.479C56.5321 107.229 56.425 107.019 56.2823 106.849C56.1422 106.679 55.9692 106.55 55.7633 106.462C55.5601 106.374 55.3253 106.33 55.059 106.33H53.7162V105.506H55.059C55.4571 105.506 55.8209 105.574 56.1505 105.708C56.48 105.84 56.7642 106.031 57.0031 106.281C57.2447 106.531 57.43 106.83 57.5591 107.179C57.6882 107.527 57.7527 107.917 57.7527 108.348V108.666C57.7527 109.097 57.6882 109.487 57.5591 109.835C57.43 110.184 57.2447 110.483 57.0031 110.733C56.7614 110.98 56.4731 111.171 56.1381 111.306C55.8058 111.438 55.4338 111.503 55.0219 111.503ZM54.3135 105.506V111.503H53.2796V105.506H54.3135Z" fill="white" fill-opacity="0.8"/>
+</g>
+<defs>
+<filter id="filter0_d_5952_143928" x="0.210925" y="0.251701" width="144.245" height="144.245" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="3.37415"/>
+<feGaussianBlur stdDeviation="5.06122"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.06 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_5952_143928"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_5952_143928" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/ui-ngx/src/assets/widget/status-widget/icon-layout.svg b/ui-ngx/src/assets/widget/status-widget/icon-layout.svg
new file mode 100644
index 0000000000..690c374ed9
--- /dev/null
+++ b/ui-ngx/src/assets/widget/status-widget/icon-layout.svg
@@ -0,0 +1,18 @@
+<svg width="141" height="140" viewBox="0 0 141 140" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_5952_143941)">
+<rect x="8.66675" y="4" width="124" height="124" rx="4" fill="#3F52DD"/>
+<path d="M83.0387 55.8776H58.2949V53.6282H83.0387V55.8776ZM59.4196 77.2472H63.9185C63.9185 73.8731 61.6691 71.6236 61.6691 71.6236C68.4174 67.1248 69.5421 57.0023 69.5421 57.0023H59.4196V77.2472ZM81.914 57.0023H71.7915C71.7915 57.0023 72.9162 67.1248 79.6645 71.6236C79.6645 71.6236 77.4151 73.8731 77.4151 77.2472H81.914V57.0023Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_5952_143941" x="0.666748" y="0" width="140" height="140" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="4"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_5952_143941"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_5952_143941" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/ui-ngx/src/form.scss b/ui-ngx/src/form.scss
index e2390c795d..1f9ca93c88 100644
--- a/ui-ngx/src/form.scss
+++ b/ui-ngx/src/form.scss
@@ -216,6 +216,18 @@
         flex: 1;
         width: auto;
       }
+      &.flex-xs {
+        @media #{$mat-xs} {
+          width: auto;
+          flex: 1;
+        }
+      }
+      &.flex-lt-md {
+        @media #{$mat-lt-md} {
+          width: auto;
+          flex: 1;
+        }
+      }
     }
     .fixed-title-width {
       min-width: 200px;
@@ -588,9 +600,13 @@
       bottom: 0;
       background: $tb-primary-color;
       mask-image: url(/assets/home/no_data_folder_bg.svg);
+      -webkit-mask-image: url(/assets/home/no_data_folder_bg.svg);
       mask-repeat: no-repeat;
+      -webkit-mask-repeat: no-repeat;
       mask-size: contain;
+      -webkit-mask-size: contain;
       mask-position: center;
+      -webkit-mask-position: center;
     }
   }
 
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index ca5c179ad5..68e9ea2523 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -1582,10 +1582,10 @@
   dependencies:
     tslib "^2.2.0"
 
-"@geoman-io/leaflet-geoman-free@^2.13.0":
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/@geoman-io/leaflet-geoman-free/-/leaflet-geoman-free-2.16.0.tgz#c8a92fcc2cdd5770ebf43f8ef9f03cc8ef842359"
-  integrity sha512-BnKAAoTXraWVFfhX/0gT/iBgAz1BPfpbdQ9dJamEFI4lIku9UNXXluu/E0k7YkZETq0tENX2GPnKLB4p+VgrSw==
+"@geoman-io/leaflet-geoman-free@2.14.2":
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/@geoman-io/leaflet-geoman-free/-/leaflet-geoman-free-2.14.2.tgz#c84c2115c263f34d11dc0b43859551639fe3d56b"
+  integrity sha512-6lIyG8RvSVdFjVjiQgBPyNASjymSyqzsiUeBW0pA+q41lB5fAg4SDC6SfJvWdEyDHa81Jb5FWjUkCc9O+u0gbg==
   dependencies:
     "@turf/boolean-contains" "^6.5.0"
     "@turf/kinks" "^6.5.0"
@@ -2572,13 +2572,6 @@
   dependencies:
     tslib "^2.3.0"
 
-"@ngx-translate/http-loader@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@ngx-translate/http-loader/-/http-loader-7.0.0.tgz#905f38d8d13342621516635bf480ff9a4f73e9fc"
-  integrity sha512-j+NpXXlcGVdyUNyY/qsJrqqeAdJdizCd+GKh3usXExSqy1aE9866jlAIL+xrfDU4w+LiMoma5pgE4emvFebZmA==
-  dependencies:
-    tslib "^2.3.0"
-
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -3079,28 +3072,28 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/leaflet-polylinedecorator@^1.6.1":
+"@types/leaflet-polylinedecorator@1.6.4":
   version "1.6.4"
   resolved "https://registry.yarnpkg.com/@types/leaflet-polylinedecorator/-/leaflet-polylinedecorator-1.6.4.tgz#2270b84585bd28bbf1fef237be8480196c44ac06"
   integrity sha512-meH/jC58Drt/9aqLhuzMCUQjHgMTud+UuQBK5gT6E8M6OfM/rftz/VgvdxOCCAQC9isrp4pqahDgEswesb5X3A==
   dependencies:
     "@types/leaflet" "*"
 
-"@types/leaflet-providers@^1.2.1":
+"@types/leaflet-providers@1.2.4":
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/@types/leaflet-providers/-/leaflet-providers-1.2.4.tgz#284e8a197d4c2dbfeda436842e03b2adb502be16"
   integrity sha512-4wYEpreixp+G5t510s202eQ5eubOmxHevIfCNrzUZbzp50XQsC9lSetX7MnPl3ANRJnUBbCWOzZ9EQFiH0Jm+g==
   dependencies:
     "@types/leaflet" "*"
 
-"@types/leaflet.gridlayer.googlemutant@^0.4.6":
+"@types/leaflet.gridlayer.googlemutant@0.4.9":
   version "0.4.9"
   resolved "https://registry.yarnpkg.com/@types/leaflet.gridlayer.googlemutant/-/leaflet.gridlayer.googlemutant-0.4.9.tgz#9090ddf4578ce631d22b8aafc5ed12525b4fbf90"
   integrity sha512-u/5Avs1KKkeABRDixGbGp2ldFs67+fYIATpkvvFgN+LQPNfq7dFd5adkksshiQBfYJ4SaQg1VJgN2dNirIC0aQ==
   dependencies:
     "@types/leaflet" "*"
 
-"@types/leaflet.markercluster@^1.5.1":
+"@types/leaflet.markercluster@1.5.4":
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/@types/leaflet.markercluster/-/leaflet.markercluster-1.5.4.tgz#2ab43417cf3f6a42d0f1baf4e1c8f659cf1dc3a1"
   integrity sha512-tfMP8J62+wfsVLDLGh5Zh1JZxijCaBmVsMAX78MkLPwvPitmZZtSin5aWOVRhZrCS+pEOZwNzexbfWXlY+7yjg==
@@ -3114,7 +3107,7 @@
   dependencies:
     "@types/geojson" "*"
 
-"@types/leaflet@~1.8.0":
+"@types/leaflet@1.8.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.8.0.tgz#dc92d3e868fb6d5067b4b59fa08cd4441f84fabe"
   integrity sha512-+sXFmiJTFdhaXXIGFlV5re9AdqtAODoXbGAvxx02e5SHXL3ir7ClP5J7pahO8VmzKY3dth4RUS1nf2BTT+DW1A==
@@ -5437,10 +5430,9 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-echarts@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.5.0.tgz#c13945a7f3acdd67c134d8a9ac67e917830113ac"
-  integrity sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==
+"echarts@https://github.com/thingsboard/echarts/archive/5.5.0-TB.tar.gz":
+  version "5.5.0-TB"
+  resolved "https://github.com/thingsboard/echarts/archive/5.5.0-TB.tar.gz#d1017728576b3fd65532eb17e503d1349f7feaed"
   dependencies:
     tslib "2.3.0"
     zrender "5.5.0"
@@ -7750,14 +7742,14 @@ lcov-parse@1.0.0:
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
   integrity sha512-aprLII/vPzuQvYZnDRU78Fns9I2Ag3gi4Ipga/hxnVMCZC8DnR2nI7XBqrPoywGfxqIx/DgarGvDJZAD3YBTgQ==
 
-leaflet-polylinedecorator@^1.6.0:
+leaflet-polylinedecorator@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/leaflet-polylinedecorator/-/leaflet-polylinedecorator-1.6.0.tgz#9ef79fd1b5302d67b72efe959a8ecd2553f27266"
   integrity sha512-kn3krmZRetgvN0wjhgYL8kvyLS0tUogAl0vtHuXQnwlYNjbl7aLQpkoFUo8UB8gVZoB0dhI4Tb55VdTJAcYzzQ==
   dependencies:
     leaflet-rotatedmarker "^0.2.0"
 
-leaflet-providers@^1.13.0:
+leaflet-providers@1.13.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/leaflet-providers/-/leaflet-providers-1.13.0.tgz#10c843a23d5823a65096d40ad53f27029e13434b"
   integrity sha512-f/sN5wdgBbVA2jcCYzScIfYNxKdn2wBJP9bu+5cRX9Xj6g8Bt1G9Sr8WgJAt/ckIFIc3LVVxCBNFpSCfTuUElg==
@@ -7767,17 +7759,17 @@ leaflet-rotatedmarker@^0.2.0:
   resolved "https://registry.yarnpkg.com/leaflet-rotatedmarker/-/leaflet-rotatedmarker-0.2.0.tgz#4467f49f98d1bfd56959bd9c6705203dd2601277"
   integrity sha512-yc97gxLXwbZa+Gk9VCcqI0CkvIBC9oNTTjFsHqq4EQvANrvaboib4UdeQLyTnEqDpaXHCqzwwVIDHtvz2mUiDg==
 
-leaflet.gridlayer.googlemutant@^0.13.5:
-  version "0.13.5"
-  resolved "https://registry.yarnpkg.com/leaflet.gridlayer.googlemutant/-/leaflet.gridlayer.googlemutant-0.13.5.tgz#7182c26f479e726bff8b85a7ebf9d3f44dd3ea57"
-  integrity sha512-DHUEXpo1t0WZ9tpdLUHHkrTK7LldCXr/gqkV5E/4hHidDJB2srceLLCZj4PV/pl0jPdTkVBT+Lr8nL9EZDB5hw==
+leaflet.gridlayer.googlemutant@0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/leaflet.gridlayer.googlemutant/-/leaflet.gridlayer.googlemutant-0.14.1.tgz#c282209aa1a39eb2f87d8aaa4e9894181c9e20a0"
+  integrity sha512-/OYxEjmgxO1U1KOhTzg+m8c0b95J0943LU8DXQmdJu/x2f+1Ur78rvEPO2QCS0cmwZ3m6FvE5I3zXnBzJNWRCA==
 
-leaflet.markercluster@^1.5.3:
+leaflet.markercluster@1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/leaflet.markercluster/-/leaflet.markercluster-1.5.3.tgz#9cdb52a4eab92671832e1ef9899669e80efc4056"
   integrity sha512-vPTw/Bndq7eQHjLBVlWpnGeLa3t+3zGiuM7fJwCkiMFq+nmRuG3RI3f7f4N4TDX7T4NpbAXpR2+NTRSEGfCSeA==
 
-leaflet@~1.8.0:
+leaflet@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.8.0.tgz#4615db4a22a304e8e692cae9270b983b38a2055e"
   integrity sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA==